diff --git a/Manifest.files.gz b/Manifest.files.gz
index d6eb31d1748c..837fa8156064 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 5c7841e82e3a..990c89c44c06 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/ngircd/Manifest b/acct-group/ngircd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/ngircd/metadata.xml b/acct-group/ngircd/metadata.xml
new file mode 100644
index 000000000000..591b1da5e31a
--- /dev/null
+++ b/acct-group/ngircd/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ sam@cmpct.info
+ Sam James
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/ngircd/ngircd-0.ebuild b/acct-group/ngircd/ngircd-0.ebuild
new file mode 100644
index 000000000000..1c17e7915364
--- /dev/null
+++ b/acct-group/ngircd/ngircd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for ngircd (IRC daemon)"
+ACCT_GROUP_ID=413
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 2ffe728e9736..6757c96f7e94 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/ngircd/Manifest b/acct-user/ngircd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/ngircd/metadata.xml b/acct-user/ngircd/metadata.xml
new file mode 100644
index 000000000000..591b1da5e31a
--- /dev/null
+++ b/acct-user/ngircd/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ sam@cmpct.info
+ Sam James
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/ngircd/ngircd-0.ebuild b/acct-user/ngircd/ngircd-0.ebuild
new file mode 100644
index 000000000000..27941496da17
--- /dev/null
+++ b/acct-user/ngircd/ngircd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for ngircd (IRC daemon)"
+ACCT_USER_ID=413
+ACCT_USER_GROUPS=( ngircd )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 004284dd86c1..623da62fbed5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
index e7214b7e32c5..97c6505eb5cf 100644
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@@ -1,12 +1,6 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
+
+
+
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 0953c78bf322..335e9df58373 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1 +1,2 @@
DIST kpcli-3.3.pl 199249 BLAKE2B 6db8dff530c709600ac90ca77c8171bedb98dc0ff3822963cdd177000a0b23c46387613639205b85dfdcb710b5a9804fc5b2e205c1937952e8439f5bebae4900 SHA512 5a837891a29dc65f0900015124fe3fdd1b7b9878ed2094d7c299c24590feee8e704212bcabf45c63064f97deca1dd2da96aa80c5be4305692f181db45b7e241a
+DIST kpcli-3.4.pl 211243 BLAKE2B 4880d832554de1956e033bba2e2021b9dc0b77202585663b0f4ad2acca520bcb430ac974bbea00c21aa37c2c8e8fa8c5cf2e8131542c20ecc3c6b0ac6dd85d9a SHA512 1ec9ea46f769a6891700565a51c592fd4809a0f3bc1d2088ca694233b276652506b470328b8b840cd0876b945faad27a16a5685d8655868cd20760f24619ffaf
diff --git a/app-admin/kpcli/kpcli-3.4.ebuild b/app-admin/kpcli/kpcli-3.4.ebuild
new file mode 100644
index 000000000000..f16419aa05a8
--- /dev/null
+++ b/app-admin/kpcli/kpcli-3.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl
+ dev-perl/Clone
+ dev-perl/Crypt-Rijndael
+ dev-perl/TermReadKey
+ dev-perl/Sort-Naturally
+ dev-perl/Term-ShellUI
+ dev-perl/File-KeePass
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ virtual/perl-Digest-MD5
+ virtual/perl-Digest-SHA
+ virtual/perl-Data-Dumper
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-Piece
+ virtual/perl-Carp"
+
+src_unpack() {
+ mkdir "${S}" || die
+ cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ dobin kpcli
+}
+
+pkg_postinst() {
+ optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
+}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index ddb2bf955f8a..9d0a0c4b61ec 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,13 +1,5 @@
DIST logstash-5.6.15.tar.gz 110086992 BLAKE2B 3047259c4bc5d71b072fa004c44953f84860ec53e051641c4efc903e38243e85b8fdebeaf093c01f5410c1f05a78a8d8aa2282fc45cf5fd784a41ea66ff5b196 SHA512 405039ff988aee8878cbeca96ef0fcbadba762f877eaec36c8a75b010e56a943c2951a8f83f9279d7d9fea99c4f8a200c705f784813a2733289336c58c34ca1e
-DIST logstash-6.8.4.tar.gz 172186036 BLAKE2B b1219dab8dd1f88d01def54306ae09b3e9c1657adc7487e5c024f69e51ce24e66a9a713c8db357f84b19fda5ee3f824845858e34e8b75b8025f87b4d27b69b5d SHA512 6dc33099be2ee3670c00cb4162e3924a97e5548c1b978a50fe3d7ed0745c7f0a3422849c04e3d64f999ed9dcf8efee3fba05d9643fbb759c0e27643235667ee9
-DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
-DIST logstash-7.3.2.tar.gz 171783584 BLAKE2B 0a936edaa57ae5552b79bead754b75c8a8c7a920461b720c58dc8e32c2aae342f3639955b63264e8704093c0d30d5d801f468d1b391e9efb2c5d605dcb2ebf5e SHA512 311b849cb8e1f336908aefa1cb2f0e2d76b696410346dd3fa0560313f9cbd3f098c93aee68c9fead736a3edb39ca543161eb7de115597e034eb0a015904c7417
-DIST logstash-7.4.1.tar.gz 173284835 BLAKE2B d1d3fe199175d57e4b47fe50f26d6d54486182d6e69b6e50cccceecf1cf02484c6d9f1a8cd0ef72ea82b1da9550787cb5ac37bbf93a91b4d0518dde415479a1a SHA512 c89d530f16e5c6953d97708b6ff2f46bbb518a93652f11cad988841a73bf5862beb4a5326de1e63d0ffb65a498fc33235ab4fc950e8087aed5815b3a65e81ef6
-DIST logstash-7.5.2.tar.gz 166254387 BLAKE2B b93cc90ecb8e88cb3dd9970b4e67d950322ad500f94277963d1c7c58b61f0ad816ee030fac25cbff286847484f0d79cb0d34259ab7edc630026ce0fc58a23d7a SHA512 955e546372466fb557eb15b9f466decef24c520c7ff16afd5432d5a8d1dd1f061f11fb9178678bed74b3c16a2d5ee6cd72fc8e4d757c8af36747dc25522c443e
-DIST logstash-7.6.1.tar.gz 172679481 BLAKE2B 2385c5d11dde1f49d3872cfc175166f78a170c1c041117548a00e73876d6f26fa06d955d7c62f6b1102278fd0f46a9119e28b7e244d7f9331b79d44df9d333a1 SHA512 38fe03fbbc3e158925f16420f809e43040817ea2b81defe9a2d6afa821bf293b86764b3327c66e17cc06034af39b13cbfad024e9fec9a73f77fe1a9edb856658
-DIST logstash-oss-6.8.4.tar.gz 172055711 BLAKE2B 696769dbb94ed9a6c9a84fb54ba35fedff360bff39c61ba7ef6a9a5f00e59dbc3c8d15f6b9080e39ce87f17553f04b831f029e8f779c75f0f28b673a2aa2e697 SHA512 6f7fe35f6e84417332093d089dc737f89737f30718d5ce843dfe6d3ba85d098e2a01da6c191729b68a7a326d4d65f6bcbdfeb656d5120401478dacb96b1f0671
-DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
-DIST logstash-oss-7.3.2.tar.gz 171613705 BLAKE2B e1a0c512cadd5855e1a1524e1c44214aeb792361493406c5cacde1bd72243178d03113c08a1fe0d1c2212cec5a2947074911bf19eaaedc636db754081c3fe32c SHA512 3aac74966b27d0d551f49c78c457b18a1a76d0e5a7b2fa1dc9a7776927145b28a6c02f51e4dd7e9ca49dabe5f63effd4227fc6980e522ab7da4ef847da6bda12
-DIST logstash-oss-7.4.1.tar.gz 173114578 BLAKE2B 5530e3275be095168d845381ac2ef92c3fa2e3783b7d9749d88465239751bc74d0483a51fd61ac75f46a569201c5fd34bd1553db32ca84e911dbf34ddd5e6b14 SHA512 26defcb5777c044030081e98cc47a040c72c7a8261f8f2cb9349181ec6a375b4969e1fbd00c8046da2c3fae5a6dea45e53c41d1c84325cd75af766f6a1d4b3c3
-DIST logstash-oss-7.5.2.tar.gz 166077841 BLAKE2B 93a66c1632a41029a954208b1aebb14802bb45c357cc484025d7e06cb11d30d31301dfe44318f1d8db423a9536802e3969a0643dbc4d27a01db45a89cfec5bfb SHA512 34b95e5d8001f1ba361ae41ac2aee495eb46432ecce44455e6dbf63cd9d2fe5175931a6e4eb8be227b28be420111e370599f2e8b1ba7a158ad8504a657e2b1d3
-DIST logstash-oss-7.6.1.tar.gz 172501067 BLAKE2B 119789d887f1d2b08ede33b491895e054be337b1a975815e64546379c21f7804cf2c05a646b22d321f8589c8e764eb62cfaaacb4a7176a39e4c6b1cdcd52eb35 SHA512 dc33fb120c3910ea2cb8616fa52c675fda2381cc0db677cd30950685f0e9df6419d2cc8136ed877eaad67d1b8ffbc07c6d14e86986ba710e2a5098bede89b903
+DIST logstash-6.8.8.tar.gz 179965893 BLAKE2B a56db7b09c7fd59a5496e076ab11bf273265cff7eedfc9c9dfaa117a16baeb9b9c8e97a71eb8ff2a80f379b242d08c2d997476d7a48bab802ff3380d8914f13c SHA512 11c0b9be1d51c3feff82181234d0b5cd838edff78678bdc410f306c52d6345393e9d6c4d6095c2e3aa044f8c5af35d98fa2570891e81e9e3c57907c2baed6100
+DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
+DIST logstash-oss-6.8.8.tar.gz 179836007 BLAKE2B e278d8dd34341bceb506accb3424b4af6db0795b582e1370d60f4a4b68671372449c94ae28f4a7585b8d4f4e63dcf7d6fa80eed37fd4ef8e872414ae2cd15b80 SHA512 ceba8d798c1246c9fd3385bc4b64995fcf9083dc5149211fabc09bfa3208d56bba6d8ae4ab73da5f9968633f30c547e0132f76543e2f9a2a96675ee58df74b09
+DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
deleted file mode 100644
index 6dbbe627a5ad..000000000000
--- a/app-admin/logstash-bin/files/logstash.confd
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# Default settings for logstash
-###############################
-
-# Set a home directory
-#LS_HOME=/var/lib/logstash
-
-# Set data directory
-#LS_DATA_DIR=${LS_HOME}/data
-
-# Arguments to pass to logstash agent
-#LS_OPTS=""
-
-# Arguments to pass to java
-#LS_HEAP_SIZE="500m"
-#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
-
-# user id to be invoked as
-#LS_USER=logstash
-#LS_GROUP=logstash
-
-# logstash logging
-#LS_LOG_DIR=/var/log/logstash
-#LS_USE_GC_LOGGING="true"
-
-# logstash configuration directory
-#LS_CONF_DIR=/etc/logstash/conf.d
-
-# Open file limit
-#LS_OPEN_FILES=16384
-
-# Nice level
-#LS_NICE=19
-
-# If this is set to 1, then when `stop` is called, if the process has
-# not exited within a reasonable time, SIGKILL will be sent next.
-KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
deleted file mode 100644
index 2133421377d6..000000000000
--- a/app-admin/logstash-bin/files/logstash.initd
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LS_USER=${LS_USER:-logstash}
-LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
-LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
-LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
-LS_NICE=${LS_NICE:-19}
-LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
-LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
-LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
-KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
-
-LS_INSTALL_DIR="/opt/logstash"
-
-command="${LS_INSTALL_DIR}/bin/logstash"
-command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} --path.data ${LS_DATA_DIR} ${LS_OPTS}"
-command_background="true"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
- --chdir ${LS_HOME}
- --nicelevel ${LS_NICE}
- --env LS_HEAP_SIZE=${LS_HEAP_SIZE}
- --env LS_JAVA_OPTS=${LS_JAVA_OPTS}
- --env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-checkconfig() {
- if [ ! -f ${LS_CONF_DIR}/* ]; then
- eerror "Please put your configuration in ${LS_CONF_DIR}"
- exit 1
- fi
-
- ebegin "Checking your configuration"
- ${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
- eend $? "Configuration error. Please fix your configuration files."
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading configuration"
- start-stop-daemon --signal HUP --pidfile "${pidfile}"
- eend $?
-}
-
-start_pre() {
- checkconfig || return 1
-
- rc_ulimit="-n ${LS_OPEN_FILES}"
-
- local d
- for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
- checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
- done
-}
-
-stop() {
- ebegin "Stopping logstash"
- if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
- start-stop-daemon --stop \
- --pidfile=${pidfile} \
- --retry=TERM/5/KILL/5
- else
- start-stop-daemon --stop \
- --pidfile=${pidfile}
- fi
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
deleted file mode 100644
index bc5b7769f9ee..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
- !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
- acct-user/logstash
- virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
- keepdir "/var/log/${MY_PN}"
-
- insinto "/usr/share/${MY_PN}"
- newins "${FILESDIR}/agent.conf.sample" agent.conf
-
- rm -v config/{pipelines.yml,startup.options} || die
- insinto /etc/${MY_PN}
- doins -r config/.
- doins "${FILESDIR}/pipelines.yml"
- rm -rv config data || die
-
- insinto "/opt/${MY_PN}"
- doins -r .
- fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
- newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
- newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
- insinto /usr/share/eselect/modules
- doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
- ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
- ewarn "Install the plugins via eselect module that will automatically re-install"
- ewarn "all self installed plugins after Logstash upgrades."
- elog
- elog "Installing plugins:"
- elog "eselect logstash-plugin install logstash-output-gelf"
- elog
-
- elog "Reinstalling self installed plugins (installed via eselect module):"
- eselect logstash-plugin reinstall
-
- elog
- elog "Sample configuration:"
- elog "${EROOT}/usr/share/${MY_PN}"
- elog
- elog "The default pipeline configuration expects the configuration(s) to be found in:"
- elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.6.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
similarity index 99%
rename from app-admin/logstash-bin/logstash-bin-7.6.1.ebuild
rename to app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
index 9e7d19873de3..08167fb02874 100644
--- a/app-admin/logstash-bin/logstash-bin-7.6.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
@@ -24,7 +24,7 @@ QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
RDEPEND="acct-group/logstash
acct-user/logstash
- virtual/jre"
+ virtual/jre:1.8"
S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
deleted file mode 100644
index 16a1b994f632..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
- !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
- acct-user/logstash
- virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
- keepdir "/var/log/${MY_PN}"
-
- insinto "/usr/share/${MY_PN}"
- newins "${FILESDIR}/agent.conf.sample" agent.conf
-
- rm -v config/{pipelines.yml,startup.options} || die
- insinto /etc/${MY_PN}
- doins -r config/.
- doins "${FILESDIR}/pipelines.yml"
- rm -rv config data || die
-
- insinto "/opt/${MY_PN}"
- doins -r .
- fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
- newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
- newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
- insinto /usr/share/eselect/modules
- doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
- ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
- ewarn "Install the plugins via eselect module that will automatically re-install"
- ewarn "all self installed plugins after Logstash upgrades."
- elog
- elog "Installing plugins:"
- elog "eselect logstash-plugin install logstash-output-gelf"
- elog
-
- elog "Reinstalling self installed plugins (installed via eselect module):"
- eselect logstash-plugin reinstall
-
- elog
- elog "Sample configuration:"
- elog "${EROOT}/usr/share/${MY_PN}"
- elog
- elog "The default pipeline configuration expects the configuration(s) to be found in:"
- elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.3.2.ebuild
deleted file mode 100644
index 7b2c36e2a632..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
- !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
- acct-user/logstash
- virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
- keepdir "/var/log/${MY_PN}"
-
- insinto "/usr/share/${MY_PN}"
- newins "${FILESDIR}/agent.conf.sample" agent.conf
-
- rm -v config/{pipelines.yml,startup.options} || die
- insinto /etc/${MY_PN}
- doins -r config/.
- doins "${FILESDIR}/pipelines.yml"
- rm -rv config data || die
-
- insinto "/opt/${MY_PN}"
- doins -r .
- fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
- newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
- newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
- insinto /usr/share/eselect/modules
- doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
- ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
- ewarn "Install the plugins via eselect module that will automatically re-install"
- ewarn "all self installed plugins after Logstash upgrades."
- elog
- elog "Installing plugins:"
- elog "eselect logstash-plugin install logstash-output-gelf"
- elog
-
- elog "Reinstalling self installed plugins (installed via eselect module):"
- eselect logstash-plugin reinstall
-
- elog
- elog "Sample configuration:"
- elog "${EROOT}/usr/share/${MY_PN}"
- elog
- elog "The default pipeline configuration expects the configuration(s) to be found in:"
- elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
deleted file mode 100644
index 7b2c36e2a632..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
- !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
- acct-user/logstash
- virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
- keepdir "/var/log/${MY_PN}"
-
- insinto "/usr/share/${MY_PN}"
- newins "${FILESDIR}/agent.conf.sample" agent.conf
-
- rm -v config/{pipelines.yml,startup.options} || die
- insinto /etc/${MY_PN}
- doins -r config/.
- doins "${FILESDIR}/pipelines.yml"
- rm -rv config data || die
-
- insinto "/opt/${MY_PN}"
- doins -r .
- fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
- newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
- newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
- insinto /usr/share/eselect/modules
- doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
- ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
- ewarn "Install the plugins via eselect module that will automatically re-install"
- ewarn "all self installed plugins after Logstash upgrades."
- elog
- elog "Installing plugins:"
- elog "eselect logstash-plugin install logstash-output-gelf"
- elog
-
- elog "Reinstalling self installed plugins (installed via eselect module):"
- eselect logstash-plugin reinstall
-
- elog
- elog "Sample configuration:"
- elog "${EROOT}/usr/share/${MY_PN}"
- elog
- elog "The default pipeline configuration expects the configuration(s) to be found in:"
- elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.5.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-7.5.2.ebuild
rename to app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index d367e6ce76fe..aab57e899943 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,5 +1 @@
-DIST terraform-0.12.17.tar.gz 10508005 BLAKE2B facef6de57333586445ce8839c03ccd633fe9ac68619e384b71fff921afeaf260e01b8783d61e4cc04882aa644e8eb706b08c88216f093d85e0fd081363c4103 SHA512 6311fdbf6764e585126a1e177dc498634a799ba1a68ba98682e2be29d14b40c09d0a780555f10bbde0587445d31a1e0d9810226f9e6bd3fcb248428ceb864c87
-DIST terraform-0.12.20.tar.gz 10383312 BLAKE2B c9e9c7e8328cfbeb533d12a2acee133cc049b06e9a30c9fdc5708c674c272af264ae34c8c850924ae08885237a2e4d6c55d43d92b350104c6afe66d2f50e31ec SHA512 df92422426e7ebaf2c3a6b953de9fc9fcb461f7227835e728bbccf5b796995d818a39817913d6010fadb8b3618710f77f50e36eb6ce4176e7312b68c7d7f7e96
-DIST terraform-0.12.21.tar.gz 10420614 BLAKE2B 0c10cc7c33381330e7bbf20a1502019a6c651b0b0c5c3ca6713b76dd7f81a5f0d45affede0ba9ea9c2fe66585a87dc1e3be00c930d713a3eaabe865af1eb35ab SHA512 3b0dd3e6d8ae4b172d0be934ada6a8dcadc3024d0f27450ed107d55cf7f08b6b0b5eeb739a210fc9a76db42f7cc75ad5842ca7415afa3d7b17d9a34f23920a59
-DIST terraform-0.12.23.tar.gz 10426601 BLAKE2B 578338591f9cac9f21586e6b4eccf632da350986d14aadea95044a7f343d6e91c307f953459bf49eb7584e61d58c7a11152d56b2f0a84cd088eb91f174556040 SHA512 7598b45a76e0684594067921bc9cd5da954c4590f612dcaf29e77c40c372f15f690732896f90272666ec587a3cb2e07dc556e29e9d029fd019528ae3e3cb0abb
DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27baf61706da3444d4677b3a1b24652c50882601e036841fb004377a57d38918a62a45eb84983f5d8f09138ae2c5b3e77e SHA512 026b4c30438459d5fa433ea606e8e020f2ff71ba6e14a5caeecef32f5800a0699cb192ece4bf9b5005b8e0fb2e375f70602d44d94b0b8efa3bac20f9a30e14e6
diff --git a/app-admin/terraform/terraform-0.12.17.ebuild b/app-admin/terraform/terraform-0.12.17.ebuild
deleted file mode 100644
index 16e496f4ef87..000000000000
--- a/app-admin/terraform/terraform-0.12.17.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
- default
- # the sed command is necessary to generate tests outside of the
- # default git root of `terraform', in our case the working dir
- # is `work/$PN-$PV'
- # sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
- # ./scripts/generate-plugins.go || die
-}
-
-src_compile() {
- GOCACHE="${T}/go-cache" go build \
- -work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
- dobin bin/terraform
-
- einstalldocs
-}
-
-pkg_postinst() {
- elog "If you would like to install shell completions please run:"
- elog " terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.20.ebuild b/app-admin/terraform/terraform-0.12.20.ebuild
deleted file mode 100644
index 4196f78931b6..000000000000
--- a/app-admin/terraform/terraform-0.12.20.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
- default
- # the sed command is necessary to generate tests outside of the
- # default git root of `terraform', in our case the working dir
- # is `work/$PN-$PV'
- # sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
- # ./scripts/generate-plugins.go || die
-}
-
-src_compile() {
- GOCACHE="${T}/go-cache" go build \
- -work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
- dobin bin/terraform
-
- einstalldocs
-}
-
-pkg_postinst() {
- elog "If you would like to install shell completions please run:"
- elog " terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.21.ebuild b/app-admin/terraform/terraform-0.12.21.ebuild
deleted file mode 100644
index 4196f78931b6..000000000000
--- a/app-admin/terraform/terraform-0.12.21.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
- default
- # the sed command is necessary to generate tests outside of the
- # default git root of `terraform', in our case the working dir
- # is `work/$PN-$PV'
- # sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
- # ./scripts/generate-plugins.go || die
-}
-
-src_compile() {
- GOCACHE="${T}/go-cache" go build \
- -work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
- dobin bin/terraform
-
- einstalldocs
-}
-
-pkg_postinst() {
- elog "If you would like to install shell completions please run:"
- elog " terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.23.ebuild b/app-admin/terraform/terraform-0.12.23.ebuild
deleted file mode 100644
index 02737dda10ce..000000000000
--- a/app-admin/terraform/terraform-0.12.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
- default
- # the sed command is necessary to generate tests outside of the
- # default git root of `terraform', in our case the working dir
- # is `work/$PN-$PV'
- # sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
- # ./scripts/generate-plugins.go || die
-}
-
-src_compile() {
- GOCACHE="${T}/go-cache" go build \
- -mod vendor \
- -work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
- dobin bin/terraform
-
- einstalldocs
-}
-
-pkg_postinst() {
- elog "If you would like to install shell completions please run:"
- elog " terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.24.ebuild b/app-admin/terraform/terraform-0.12.24.ebuild
index 3fd839630186..7d194e4e3804 100644
--- a/app-admin/terraform/terraform-0.12.24.ebuild
+++ b/app-admin/terraform/terraform-0.12.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RESTRICT="test"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 83861a6504cc..6cbbacae5ac9 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch b/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
index 085c61aa4e71..cc0c46aee033 100644
--- a/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
@@ -7,7 +7,7 @@ Author: Rafał Mużyło
static const unsigned char magic_gzip[] = { '\037', '\213', '\010' };
static const unsigned char magic_bzip2[] = { 'B', 'Z', 'h' };
static const unsigned char magic_xz[] = { 0xFD, '7', 'z', 'X', 'Z', 0x00 };
-+static const unsigned char magic_zstd[] = { 0x28, 0xB5, 0x2F, 0xFD };
++static const unsigned char magic_zstd[] = { 0x28, 0xB5, 0x2F, 0xFD };
static const magic_t magics[] = {
#define DECLARE_MAGIC_T(t) { .type = #t, .magic = magic_##t, .len = sizeof(magic_##t), },
DECLARE_MAGIC_T(gzip)
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
index 6bc46a104cbd..566a499a68bd 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
@@ -25,6 +25,6 @@ src_compile() {
}
src_install() {
- emake DESTDIR="${D}" install # need explicit install line #397835
+ emake DESTDIR="${ED}" install # need explicit install line #397835
dodoc *.README*
}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index c2b0853839e6..1e5812f84748 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 0594c1e22e39..27492dd43e86 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1 +1,2 @@
DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
+DIST siege-4.0.5.tar.gz 525122 BLAKE2B 6d7410255d9682eeb6755bbf2eb6fd189d1c6e5e4c8bf4ed430e0ad4157ee6af9148a1bfe554167b74a6250b4897a3d34eb1c6c10cc91ff2352419769b9db975 SHA512 61f1b0a9fb4f9738f51932d5203a0ee6435aa413975dc3f5c7afafd74ec206e1ec20f5134171f740f55465e6c015df8bdac1775bc04be50bb10d0516e1a62d53
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
index 6f49eba8f496..67ce38b8d2d8 100644
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/metadata.xml
@@ -1,5 +1,21 @@
-
+
+ andreacerisara@gmail.com
+ Andrea Cerisara
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ Siege is an http load testing and benchmarking utility. It was designed to let
+ web developers measure their code under duress, to see how it will stand up to load on the internet.
+ Siege supports basic authentication, cookies, HTTP, HTTPS and FTP protocols.
+ It lets its user hit a server with a configurable number of simulated clients.
+
+
+ JoeDog/siege
+
diff --git a/app-benchmarks/siege/siege-4.0.5.ebuild b/app-benchmarks/siege/siege-4.0.5.ebuild
new file mode 100644
index 000000000000..57c3d85b8fec
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.0.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ # bundled macros break recent libtool
+ sed -i -e '/AC_PROG_SHELL/d' configure.ac || die
+ rm *.m4 || die "failed to remove bundled macros"
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_with ssl ssl "${EPREFIX}/usr")
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+ newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+ elog "An example ~/.siegerc file has been installed in"
+ elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 9569e4d4c4ce..679b0f6fe4f3 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/bchunk/bchunk-1.2.2.ebuild b/app-cdr/bchunk/bchunk-1.2.2.ebuild
index 6e76146dfccb..1eac28587ce8 100644
--- a/app-cdr/bchunk/bchunk-1.2.2.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
DOCS=( "${PN}.spec" README ChangeLog )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 5612a0148dbc..eeab73deda25 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libb2/files/libb2-0.98.1-distcc.patch b/app-crypt/libb2/files/libb2-0.98.1-distcc.patch
new file mode 100644
index 000000000000..2e6a1671781b
--- /dev/null
+++ b/app-crypt/libb2/files/libb2-0.98.1-distcc.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/704044#c8
+
+Patch by Alexey
+
+--- a/src/Makefile.am 2020-04-26 11:16:22.354103351 +0100
++++ b/src/Makefile.am 2020-04-26 11:16:31.584080899 +0100
+@@ -18,8 +18,7 @@ LDFLAGS += -version-info $(B2_LIBRARY_VE
+ lib_LTLIBRARIES = libb2.la
+ libb2_la_LIBADD = # -lgomp -lpthread
+ libb2_la_CPPFLAGS = -DSUFFIX= \
+- $(LTDLINCL) \
+- ${top_builddir}/src/
++ $(LTDLINCL)
+
+ include_HEADERS = blake2.h
+
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
similarity index 72%
rename from app-crypt/libb2/libb2-0.98.1-r1.ebuild
rename to app-crypt/libb2/libb2-0.98.1-r3.ebuild
index a27fb95fcee3..930713363bac 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools toolchain-funcs
+inherit autotools multilib-minimal toolchain-funcs
DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
HOMEPAGE="https://github.com/BLAKE2/libb2"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs native-cflags openmp"
DEPEND="
@@ -24,6 +24,8 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}-${GITHASH}
+PATCHES=( "${FILESDIR}"/${P}-distcc.patch )
+
pkg_setup() {
if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
ewarn "You are using a compiler without OpenMP support"
@@ -40,7 +42,8 @@ src_prepare() {
eautoreconf # upstream doesn't make releases
}
-src_configure() {
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
econf \
$(use_enable static-libs static) \
$(use_enable native-cflags native) \
@@ -53,15 +56,15 @@ do_make() {
emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@"
}
-src_compile() {
+multilib_src_compile() {
do_make
}
-src_test() {
+multilib_src_test() {
do_make check
}
-src_install() {
- default
- use static-libs || find "${ED}" -name '*.la' -type f -delete || die
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -type f -delete || die
}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 6e2b056a0c86..421f213ea7f2 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/pymacs/pymacs-0.26-r1.ebuild b/app-emacs/pymacs/pymacs-0.26-r1.ebuild
index 0ff10a4675c3..4cf124e76ef2 100644
--- a/app-emacs/pymacs/pymacs-0.26-r1.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
inherit elisp distutils-r1
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 55bf83e092bd..a2fa608f2e83 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild
index 422f22851ddf..89694625d058 100644
--- a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
SRC_URI=""
- KEYWORDS=""
+ KEYWORDS="x86"
SLOT="0"
else
SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
SLOT="0/${PV}"
fi
@@ -77,7 +77,6 @@ RDEPEND="
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( net-libs/libssh )
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
- lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index a761557096f1..7325bbb67914 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -9,7 +9,7 @@ inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-
if [[ ${PV} = *9999* ]]; then
inherit git-r3
- EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+ EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
SRC_URI=""
KEYWORDS=""
SLOT="0"
@@ -77,7 +77,6 @@ RDEPEND="
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
libssh? ( net-libs/libssh )
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
- lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
diff --git a/app-emulation/qemu/qemu-4.2.0-r5.ebuild b/app-emulation/qemu/qemu-4.2.0-r5.ebuild
deleted file mode 100644
index b0b4efc874c5..000000000000
--- a/app-emulation/qemu/qemu-4.2.0-r5.ebuild
+++ /dev/null
@@ -1,833 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-FIRMWARE_ABI_VERSION="4.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1 \
- udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
- EGIT_SUBMODULES=(
- slirp
- tests/fp/berkeley-{test,soft}float-3
- ui/keycodemapdb
- )
- inherit git-r3
- SRC_URI=""
-else
- SRC_URI="https://download.qemu.org/${P}.tar.xz
- https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
- +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
- kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
- plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
- smartcard snappy spice ssh static static-user systemtap tci test usb
- usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
- xfs +xkb"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
- mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
- sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
- lm32 moxie tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
- aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
- tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- qemu_softmmu_targets_arm? ( fdt )
- qemu_softmmu_targets_microblaze? ( fdt )
- qemu_softmmu_targets_mips64el? ( fdt )
- qemu_softmmu_targets_ppc64? ( fdt )
- qemu_softmmu_targets_ppc? ( fdt )
- qemu_softmmu_targets_riscv32? ( fdt )
- qemu_softmmu_targets_riscv64? ( fdt )
- static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
- static-user? ( !plugins )
- virtfs? ( xattr )
- vte? ( gtk )
- plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected). This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
- >=dev-libs/glib-2.0[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- python? ( ${PYTHON_DEPS} )
- systemtap? ( dev-util/systemtap )
- xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
- dev-libs/libxml2[static-libs(+)]
- xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- accessibility? (
- app-accessibility/brltty[api]
- app-accessibility/brltty[static-libs(+)]
- )
- aio? ( dev-libs/libaio[static-libs(+)] )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bzip2? ( app-arch/bzip2[static-libs(+)] )
- capstone? ( dev-libs/capstone:= )
- caps? ( sys-libs/libcap-ng[static-libs(+)] )
- curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
- gnutls? (
- dev-libs/nettle:=[static-libs(+)]
- >=net-libs/gnutls-3.0:=[static-libs(+)]
- )
- gtk? (
- x11-libs/gtk+:3
- vte? ( x11-libs/vte:2.91 )
- )
- infiniband? (
- sys-fabric/libibumad:=[static-libs(+)]
- sys-fabric/libibverbs:=[static-libs(+)]
- sys-fabric/librdmacm:=[static-libs(+)]
- )
- iscsi? ( net-libs/libiscsi )
- jemalloc? ( dev-libs/jemalloc )
- jpeg? ( virtual/jpeg:0=[static-libs(+)] )
- lzo? ( dev-libs/lzo:2[static-libs(+)] )
- ncurses? (
- sys-libs/ncurses:0=[unicode]
- sys-libs/ncurses:0=[static-libs(+)]
- )
- nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- opengl? (
- virtual/opengl
- media-libs/libepoxy[static-libs(+)]
- media-libs/mesa[static-libs(+)]
- media-libs/mesa[egl,gbm]
- )
- png? ( media-libs/libpng:0=[static-libs(+)] )
- pulseaudio? ( media-sound/pulseaudio )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
- sdl? (
- media-libs/libsdl2[X]
- media-libs/libsdl2[static-libs(+)]
- )
- sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
- seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
- smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
- snappy? ( app-arch/snappy:= )
- spice? (
- >=app-emulation/spice-protocol-0.12.3
- >=app-emulation/spice-0.12.0[static-libs(+)]
- )
- ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
- usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
- usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
- vde? ( net-misc/vde[static-libs(+)] )
- virgl? ( media-libs/virglrenderer[static-libs(+)] )
- virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools:= )
- xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-
-X86_FIRMWARE_DEPEND="
- pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-201905[binary]
- ~sys-firmware/ipxe-1.0.0_p20190728[binary]
- ~sys-firmware/seabios-1.12.0[binary,seavgabios]
- ~sys-firmware/sgabios-0.1_pre8[binary]
- )
- !pin-upstream-blobs? (
- sys-firmware/edk2-ovmf
- sys-firmware/ipxe
- >=sys-firmware/seabios-1.10.2[seavgabios]
- sys-firmware/sgabios
- )"
-PPC64_FIRMWARE_DEPEND="
- pin-upstream-blobs? (
- ~sys-firmware/seabios-1.12.0[binary,seavgabios]
- )
- !pin-upstream-blobs? (
- >=sys-firmware/seabios-1.10.2[seavgabios]
- )
-"
-
-BDEPEND="
- $(python_gen_impl_dep)
- dev-lang/perl
- sys-apps/texinfo
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- gtk? ( nls? ( sys-devel/gettext ) )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )
-"
-CDEPEND="
- !static? (
- ${ALL_DEPEND//\[static-libs(+)]}
- ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
- )
- qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
- kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- static? (
- ${ALL_DEPEND}
- ${SOFTMMU_TOOLS_DEPEND}
- )
- static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
- acct-group/kvm
- selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-cflags.patch
- "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
- "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
- "${WORKDIR}"/patches
-)
-
-QA_PREBUILT="
- usr/share/qemu/hppa-firmware.img
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
- usr/share/qemu/s390-ccw.img
- usr/share/qemu/s390-netboot.img
- usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
- usr/bin/qemu-x86_64
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-cris
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-or1k
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc64
- usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
- For AMD CPUs the module is called 'kvm-amd'.
- For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
- $ gpasswd -a kvm
-then have re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it. You can tell udev to reset ownership/perms:
- $ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
- # rc-update add qemu-binfmt
-For systemd:
- # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
- if use kernel_linux && kernel_is lt 2 6 25; then
- eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
- elif use kernel_linux; then
- if ! linux_config_exists; then
- eerror "Unable to check your kernel for KVM support"
- else
- CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
- ERROR_KVM="You must enable KVM in your kernel to continue"
- ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
- ERROR_KVM_AMD+=" your kernel configuration."
- ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
- ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
- ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
- ERROR_TUN+=" into your kernel or loaded as a module to use the"
- ERROR_TUN+=" virtual network device if using -net tap."
- ERROR_BRIDGE="You will also need support for 802.1d"
- ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
- use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
- ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
- ERROR_VHOST_NET+=" support"
-
- if use amd64 || use x86 || use amd64-linux || use x86-linux; then
- if grep -q AuthenticAMD /proc/cpuinfo; then
- CONFIG_CHECK+=" ~KVM_AMD"
- elif grep -q GenuineIntel /proc/cpuinfo; then
- CONFIG_CHECK+=" ~KVM_INTEL"
- fi
- fi
-
- use python && CONFIG_CHECK+=" ~DEBUG_FS"
- ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
- # Now do the actual checks setup above
- check_extra_config
- fi
- fi
-
- if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
- eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
- eerror "instances are still pointing to it. Please update your"
- eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
- eerror "and the right system binary (e.g. qemu-system-x86_64)."
- die "update your virt configs to not use qemu-kvm"
- fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
- local var=$1 mak=$2
- local detected sorted
-
- pushd "${S}"/default-configs >/dev/null || die
-
- # Force C locale until glibc is updated. #564936
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "${var}: ${sorted}"
- eerror "$(printf '%-*s' ${#var} configure): ${detected}"
- die "sync ${var} to the list of targets"
- fi
-
- popd >/dev/null
-}
-
-handle_locales() {
- # Make sure locale list is kept up-to-date.
- local detected sorted
- detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
- sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "PLOCALES: ${sorted}"
- eerror " po/*.po: ${detected}"
- die "sync PLOCALES"
- fi
-
- # Deal with selective install of locales.
- if use nls ; then
- # Delete locales the user does not want. #577814
- rm_loc() { rm po/$1.po || die; }
- l10n_for_each_disabled_locale_do rm_loc
- else
- # Cheap hack to disable gettext .mo generation.
- rm -f po/*.po
- fi
-}
-
-src_prepare() {
- check_targets IUSE_SOFTMMU_TARGETS softmmu
- check_targets IUSE_USER_TARGETS linux-user
-
- default
-
- # Use correct toolchain to fix cross-compiling
- tc-export AR LD NM OBJCOPY PKG_CONFIG RANLIB
- export WINDRES=${CHOST}-windres
-
- # Verbose builds
- MAKEOPTS+=" V=1"
-
- # Run after we've applied all patches.
- handle_locales
-
- # Remove bundled copy of libfdt
- rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- local buildtype=$1
- local builddir="${S}/${buildtype}-build"
-
- mkdir "${builddir}"
-
- local conf_opts=(
- --prefix=/usr
- --sysconfdir=/etc
- --bindir=/usr/bin
- --libdir=/usr/$(get_libdir)
- --datadir=/usr/share
- --docdir=/usr/share/doc/${PF}/html
- --mandir=/usr/share/man
- --with-confsuffix=/qemu
- --localstatedir=/var
- --disable-bsd-user
- --disable-guest-agent
- --disable-strip
- --disable-werror
- # We support gnutls/nettle for crypto operations. It is possible
- # to use gcrypt when gnutls/nettle are disabled (but not when they
- # are enabled), but it's not really worth the hassle. Disable it
- # all the time to avoid automatically detecting it. #568856
- --disable-gcrypt
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- $(use_enable debug debug-info)
- $(use_enable debug debug-tcg)
- $(use_enable doc docs)
- $(use_enable plugins)
- $(use_enable tci tcg-interpreter)
- $(use_enable xattr attr)
- )
-
- # Disable options not used by user targets. This simplifies building
- # static user targets (USE=static-user) considerably.
- conf_notuser() {
- if [[ ${buildtype} == "user" ]] ; then
- echo "--disable-${2:-$1}"
- else
- use_enable "$@"
- fi
- }
- conf_opts+=(
- --disable-bluez
- $(conf_notuser accessibility brlapi)
- $(conf_notuser aio linux-aio)
- $(conf_notuser bzip2)
- $(conf_notuser capstone)
- $(conf_notuser caps cap-ng)
- $(conf_notuser curl)
- $(conf_notuser fdt)
- $(conf_notuser glusterfs)
- $(conf_notuser gnutls)
- $(conf_notuser gnutls nettle)
- $(conf_notuser gtk)
- $(conf_notuser infiniband rdma)
- $(conf_notuser iscsi libiscsi)
- $(conf_notuser jemalloc jemalloc)
- $(conf_notuser jpeg vnc-jpeg)
- $(conf_notuser kernel_linux kvm)
- $(conf_notuser lzo)
- $(conf_notuser ncurses curses)
- $(conf_notuser nfs libnfs)
- $(conf_notuser numa)
- $(conf_notuser opengl)
- $(conf_notuser png vnc-png)
- $(conf_notuser rbd)
- $(conf_notuser sasl vnc-sasl)
- $(conf_notuser sdl)
- $(conf_notuser sdl-image)
- $(conf_notuser seccomp)
- $(conf_notuser smartcard)
- $(conf_notuser snappy)
- $(conf_notuser spice)
- $(conf_notuser ssh libssh)
- $(conf_notuser usb libusb)
- $(conf_notuser usbredir usb-redir)
- $(conf_notuser vde)
- $(conf_notuser vhost-net)
- $(conf_notuser vhost-user-fs)
- $(conf_notuser virgl virglrenderer)
- $(conf_notuser virtfs)
- $(conf_notuser vnc)
- $(conf_notuser vte)
- $(conf_notuser xen)
- $(conf_notuser xen xen-pci-passthrough)
- $(conf_notuser xfs xfsctl)
- $(conf_notuser xkb xkbcommon)
- )
-
- if [[ ${buildtype} == "user" ]] ; then
- conf_opts+=( --disable-libxml2 )
- else
- conf_opts+=( --enable-libxml2 )
- fi
-
- if [[ ! ${buildtype} == "user" ]] ; then
- # audio options
- local audio_opts=(
- # Note: backend order matters here: #716202
- # We iterate from higher-level to lower level.
- $(usex pulseaudio pa "")
- $(usev sdl)
- $(usev alsa)
- $(usev oss)
- )
- conf_opts+=(
- --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
- )
- fi
-
- case ${buildtype} in
- user)
- conf_opts+=(
- --enable-linux-user
- --disable-system
- --disable-blobs
- --disable-tools
- )
- local static_flag="static-user"
- ;;
- softmmu)
- conf_opts+=(
- --disable-linux-user
- --enable-system
- --disable-tools
- )
- local static_flag="static"
- ;;
- tools)
- conf_opts+=(
- --disable-linux-user
- --disable-system
- --disable-blobs
- --enable-tools
- )
- local static_flag="static"
- ;;
- esac
-
- local targets="${buildtype}_targets"
- [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
- # Add support for SystemTAP
- use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
- # We always want to attempt to build with PIE support as it results
- # in a more secure binary. But it doesn't work with static or if
- # the current GCC doesn't have PIE support.
- if use ${static_flag}; then
- conf_opts+=( --static --disable-pie )
- else
- tc-enables-pie && conf_opts+=( --enable-pie )
- fi
-
- echo "../configure ${conf_opts[*]}"
- cd "${builddir}"
- ../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
- local target
-
- python_setup
-
- softmmu_targets= softmmu_bins=()
- user_targets= user_bins=()
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- if use "qemu_softmmu_targets_${target}"; then
- softmmu_targets+=",${target}-softmmu"
- softmmu_bins+=( "qemu-system-${target}" )
- fi
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- if use "qemu_user_targets_${target}"; then
- user_targets+=",${target}-linux-user"
- user_bins+=( "qemu-${target}" )
- fi
- done
-
- softmmu_targets=${softmmu_targets#,}
- user_targets=${user_targets#,}
-
- [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
- [[ -n ${user_targets} ]] && qemu_src_configure "user"
- qemu_src_configure "tools"
-}
-
-src_compile() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- default
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- default
- fi
-
- cd "${S}/tools-build"
- default
-}
-
-src_test() {
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- pax-mark m */qemu-system-* #515550
- emake check
- fi
-}
-
-qemu_python_install() {
- python_domodule "${S}/python/qemu"
-
- python_doscript "${S}/scripts/kvm/vmxcap"
- python_doscript "${S}/scripts/qmp/qmp-shell"
- python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
- local out="${T}/qemu-binfmt"
- local out_systemd="${T}/qemu.conf"
- local d="${T}/binfmt.d"
-
- einfo "Generating qemu binfmt scripts and configuration files"
-
- # Generate the debian fragments first.
- mkdir -p "${d}"
- "${S}"/scripts/qemu-binfmt-conf.sh \
- --debian \
- --exportdir "${d}" \
- --qemu-path "${EPREFIX}/usr/bin" \
- || die
- # Then turn the fragments into a shell script we can source.
- sed -E -i \
- -e 's:^([^ ]+) (.*)$:\1="\2":' \
- "${d}"/* || die
-
- # Generate the init.d script by assembling the fragments from above.
- local f qcpu package interpreter magic mask
- cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
- for f in "${d}"/qemu-* ; do
- source "${f}"
-
- # Normalize the cpu logic like we do in the init.d for the native cpu.
- qcpu=${package#qemu-}
- case ${qcpu} in
- arm*) qcpu="arm";;
- mips*) qcpu="mips";;
- ppc*) qcpu="ppc";;
- s390*) qcpu="s390";;
- sh*) qcpu="sh";;
- sparc*) qcpu="sparc";;
- esac
-
- # we use 'printf' here to be portable across 'sh'
- # implementations: #679168
- cat <>"${out}"
- if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
- printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
- fi
-EOF
-
- echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
- done
- cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- emake DESTDIR="${ED}" install
-
- # Install binfmt handler init script for user targets.
- generate_initd
- doinitd "${T}/qemu-binfmt"
-
- # Install binfmt/qemu.conf.
- insinto "/usr/share/qemu/binfmt.d"
- doins "${T}/qemu.conf"
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- emake DESTDIR="${ED}" install
-
- # This might not exist if the test failed. #512010
- [[ -e check-report.html ]] && dodoc check-report.html
-
- if use kernel_linux; then
- udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
- fi
-
- if use python; then
- python_foreach_impl qemu_python_install
- fi
- fi
-
- cd "${S}/tools-build"
- emake DESTDIR="${ED}" install
-
- # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
- pushd "${ED}"/usr/bin >/dev/null
- pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
- popd >/dev/null
-
- # Install config file example for qemu-bridge-helper
- insinto "/etc/qemu"
- doins "${FILESDIR}/bridge.conf"
-
- cd "${S}"
- dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
- newdoc pc-bios/README README.pc-bios
-
- # Disallow stripping of prebuilt firmware files.
- dostrip -x ${QA_PREBUILT}
-
- if [[ -n ${softmmu_targets} ]]; then
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${ED}/usr/share/qemu/bios.bin"
- rm "${ED}/usr/share/qemu/bios-256k.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
- dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
- fi
-
- # Remove vgabios since we're using the seavgabios packaged one
- rm "${ED}/usr/share/qemu/vgabios.bin"
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
- # PPC64 loads vgabios-stdvga
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
- dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
- dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
- dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
- fi
-
- # Remove sgabios since we're using the sgabios packaged one
- rm "${ED}/usr/share/qemu/sgabios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
- fi
-
- # Remove iPXE since we're using the iPXE packaged one
- rm "${ED}"/usr/share/qemu/pxe-*.rom
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
- fi
- fi
-
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
- local pv
- for pv in ${REPLACING_VERSIONS}; do
- if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
- return 0
- fi
- done
- return 1
-}
-
-pkg_postinst() {
- if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
- udev_reload
- fi
-
- xdg_icon_cache_update
-
- [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
- fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_print_elog
-
- if use pin-upstream-blobs && firmware_abi_change; then
- ewarn "This version of qemu pins new versions of firmware blobs:"
- ewarn " $(best_version sys-firmware/edk2-ovmf)"
- ewarn " $(best_version sys-firmware/ipxe)"
- ewarn " $(best_version sys-firmware/seabios)"
- ewarn " $(best_version sys-firmware/sgabios)"
- ewarn "This might break resume of hibernated guests (started with a different"
- ewarn "firmware version) and live migration to/from qemu versions with different"
- ewarn "firmware. Please (cold) restart all running guests. For functional"
- ewarn "guest migration ensure that all"
- ewarn "hosts run at least"
- ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
- fi
-}
-
-pkg_info() {
- echo "Using:"
- echo " $(best_version app-emulation/spice-protocol)"
- echo " $(best_version sys-firmware/edk2-ovmf)"
- if has_version 'sys-firmware/edk2-ovmf[binary]'; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/ipxe)"
- echo " $(best_version sys-firmware/seabios)"
- if has_version 'sys-firmware/seabios[binary]'; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-emulation/qemu/qemu-4.2.0-r6.ebuild b/app-emulation/qemu/qemu-4.2.0-r6.ebuild
index 3e74e6d3d6ad..8a93874b711e 100644
--- a/app-emulation/qemu/qemu-4.2.0-r6.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0-r6.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} = *9999* ]]; then
else
SRC_URI="https://download.qemu.org/${P}.tar.xz
https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild
index a36f5980fbe3..a6f1f50a2ef7 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild
index accb093039ef..46e94991f5b3 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
LICENSE="GPL-2 PUEL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
RESTRICT="bindist mirror"
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild
index e91c340762ab..4f8d1dba0b26 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
LICENSE="PUEL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="bindist mirror strip"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild
index 31dd32c71431..0950ac45f197 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X"
RDEPEND="
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
index 9a370bd79a45..4d5d660417e6 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="pax_kernel"
RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/virtualbox-5.2.40.ebuild b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
index 44876802ad93..32fb07ec21ef 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
LICENSE="GPL-2 dtrace? ( CDDL )"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/xen/files/xen-4.6-efi.patch b/app-emulation/xen/files/xen-4.6-efi.patch
deleted file mode 100644
index bf888def7d90..000000000000
--- a/app-emulation/xen/files/xen-4.6-efi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/xen/Makefile b/xen/Makefile
-index 4c54e9b..a5cdccd 100644
---- a/xen/Makefile
-+++ b/xen/Makefile
-@@ -41,9 +41,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
- _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
- [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
- $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
-- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
-+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+ else \
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
-+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
-+ fi;
- [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
- $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
- if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
-diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
-index 5f24951..4ec0ee2 100644
---- a/xen/arch/x86/Makefile
-+++ b/xen/arch/x86/Makefile
-@@ -116,7 +116,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o
- $(@D)/.$(@F).1.o -o $@
- rm -f $(@D)/.$(@F).[0-9]*
-
--EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
-+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
- EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
- EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
- EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index a50902a46c9e..590258be859a 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 776eadf9560f..2f8cc20da4f6 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,2 +1,2 @@
DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
-DIST pdfpc-4.3.2.tar.gz 107504 BLAKE2B 5fe9ee096aab205365f93374b8ffe3990cf1aec818bcb36d2f35d572854348087f07f7e99df1c71dfc1b40c1c3c1e9e4e666a698020398416b59d151c74805d4 SHA512 e1e198c4cad996e7818dac10c07133e5c6cccf0333506eecb1090091b5c1de36f27e08178c648587e68816cc7e7d7f1666181c09a01780ea6d620c4c9820674d
+DIST pdfpc-4.4.0.tar.gz 7733136 BLAKE2B e0bae93803561e8d7a96621baef4e8e2d038324dd28c31ce9cc05a8e42dafda101eb7eb2cea258bd66a41dff904c6a95e8c9cb50b236780564b9501edf3aeef8 SHA512 4f5d013ae513ba5f106638401cccd280e1a77535747663963a566c8b9ddc7b87c0ae1859220586ed66d294902674d54cea4256c72320ad3005e3e47cc8ea57a3
diff --git a/app-misc/pdfpc/metadata.xml b/app-misc/pdfpc/metadata.xml
index 6476f3f1f07e..0954067c0543 100644
--- a/app-misc/pdfpc/metadata.xml
+++ b/app-misc/pdfpc/metadata.xml
@@ -1,8 +1,15 @@
-
-
- pdfpc/pdfpc
-
+
+ holgersson@posteo.de
+ Nils Freydank
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ pdfpc/pdfpc
+
diff --git a/app-misc/pdfpc/pdfpc-4.3.2.ebuild b/app-misc/pdfpc/pdfpc-4.4.0.ebuild
similarity index 63%
rename from app-misc/pdfpc/pdfpc-4.3.2.ebuild
rename to app-misc/pdfpc/pdfpc-4.4.0.ebuild
index 14c6cd543088..1aff12796f0b 100644
--- a/app-misc/pdfpc/pdfpc-4.3.2.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.4.0.ebuild
@@ -4,9 +4,9 @@
EAPI=7
VALA_MIN_API_VERSION="0.34"
-VALA_MAX_API_VERSION="0.42" # fix sed line if you increase this
+VALA_MAX_API_VERSION="0.48" # append versions in sed line if increased
-inherit vala cmake
+inherit cmake vala
DESCRIPTION="Presenter console with multi-monitor support for PDF files"
HOMEPAGE="https://pdfpc.github.io"
@@ -17,27 +17,30 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+gstreamer"
-RDEPEND="app-text/poppler:=[cairo]
+RDEPEND="
+ app-text/poppler:=[cairo]
dev-libs/glib:2
- dev-libs/libgee:0.8
+ dev-libs/libgee:0.8=
gnome-base/librsvg
- gstreamer? ( media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
sys-apps/dbus
- x11-libs/gtk+:3"
+ x11-libs/gtk+:3
+ gstreamer? (
+ media-libs/gstreamer:1.0=
+ media-libs/gst-plugins-base:1.0=
+ )
+"
DEPEND="${RDEPEND}"
BDEPEND="$(vala_depend)"
src_prepare() {
cmake_src_prepare
- sed -i -e "s/valac/valac valac-0.42 valac-0.40 valac-0.36 valac-0.34/" cmake/vala/FindVala.cmake || die
+ sed -i -e "s/valac/valac valac-0.48 valac-0.46 valac-0.44 valac-0.40 valac-0.36/" cmake/vala/FindVala.cmake || die
vala_src_prepare
}
src_configure() {
local mycmakeargs=(
- -DSYSCONFDIR="${EPREFIX}/etc"
-DMOVIES=$(usex gstreamer on off)
)
cmake_src_configure
diff --git a/app-misc/rpick/rpick-0.5.1.ebuild b/app-misc/rpick/rpick-0.5.1.ebuild
index 022dde8fb3ea..e1f1cef928b1 100644
--- a/app-misc/rpick/rpick-0.5.1.ebuild
+++ b/app-misc/rpick/rpick-0.5.1.ebuild
@@ -73,7 +73,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
# use cargo-license for a more accurate license picture
LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
DOCS=( CHANGELOG.md README.md )
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index a05be7b60971..497ae4cad961 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/gnupod/gnupod-0.99.8-r1.ebuild b/app-pda/gnupod/gnupod-0.99.8-r2.ebuild
similarity index 66%
rename from app-pda/gnupod/gnupod-0.99.8-r1.ebuild
rename to app-pda/gnupod/gnupod-0.99.8-r2.ebuild
index a9984189905e..69c256e6492f 100644
--- a/app-pda/gnupod/gnupod-0.99.8-r1.ebuild
+++ b/app-pda/gnupod/gnupod-0.99.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,17 +20,21 @@ RDEPEND="dev-perl/TimeDate
dev-perl/Unicode-String
dev-perl/Digest-SHA1
dev-perl/libwww-perl
- ffmpeg? ( virtual/ffmpeg )
- flac? ( dev-perl/Audio-FLAC-Header
- media-libs/flac
- aac? ( >=media-libs/faac-1.24 )
- mp3? ( media-sound/lame )
- !aac? ( media-sound/lame ) )
- ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl
- media-sound/vorbis-tools
- aac? ( >=media-libs/faac-1.24 )
- mp3? ( media-sound/lame )
- !aac? ( media-sound/lame ) )"
+ ffmpeg? ( media-video/ffmpeg )
+ flac? (
+ dev-perl/Audio-FLAC-Header
+ media-libs/flac
+ aac? ( >=media-libs/faac-1.24 )
+ mp3? ( media-sound/lame )
+ !aac? ( media-sound/lame )
+ )
+ ogg? (
+ dev-perl/Ogg-Vorbis-Header-PurePerl
+ media-sound/vorbis-tools
+ aac? ( >=media-libs/faac-1.24 )
+ mp3? ( media-sound/lame )
+ !aac? ( media-sound/lame )
+ )"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 07241b883923..84e3893db907 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/portpeek/portpeek-2.1.27.ebuild b/app-portage/portpeek/portpeek-2.1.27.ebuild
deleted file mode 100644
index 87f1436ad323..000000000000
--- a/app-portage/portpeek/portpeek-2.1.27.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-r1
-
-DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
-HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
-SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- >=app-portage/gentoolkit-0.4.0
- || (
- >=sys-apps/portage-2.3.19-r1[${PYTHON_USEDEP}]
- )"
-
-src_install() {
- python_foreach_impl python_doscript ${PN}
- doman *.[0-9]
-}
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index e998e0c14c15..5786e4c4a61b 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1 git-r3
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ebca06c4d3a9..1fa53d7c169b 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index d40bcd6d09b1..d939664e191b 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -217,7 +217,7 @@ src_install() {
if use examples ; then
for d in examples/{functions,misc,scripts,startup-files} ; do
exeinto /usr/share/doc/${PF}/${d}
- docinto /usr/share/doc/${PF}/${d}
+ docinto ${d}
for f in ${d}/* ; do
if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
doexe ${f}
diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index cf6f13f0d787..6f6fa4bb6e82 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -221,7 +221,7 @@ src_install() {
if use examples ; then
for d in examples/{functions,misc,scripts,startup-files} ; do
exeinto /usr/share/doc/${PF}/${d}
- docinto /usr/share/doc/${PF}/${d}
+ docinto ${d}
for f in ${d}/* ; do
if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
doexe ${f}
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
index cf6f13f0d787..6f6fa4bb6e82 100644
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -221,7 +221,7 @@ src_install() {
if use examples ; then
for d in examples/{functions,misc,scripts,startup-files} ; do
exeinto /usr/share/doc/${PF}/${d}
- docinto /usr/share/doc/${PF}/${d}
+ docinto ${d}
for f in ${d}/* ; do
if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
doexe ${f}
diff --git a/app-shells/bash/bash-5.0_p17.ebuild b/app-shells/bash/bash-5.0_p17.ebuild
index cf6f13f0d787..6f6fa4bb6e82 100644
--- a/app-shells/bash/bash-5.0_p17.ebuild
+++ b/app-shells/bash/bash-5.0_p17.ebuild
@@ -221,7 +221,7 @@ src_install() {
if use examples ; then
for d in examples/{functions,misc,scripts,startup-files} ; do
exeinto /usr/share/doc/${PF}/${d}
- docinto /usr/share/doc/${PF}/${d}
+ docinto ${d}
for f in ${d}/* ; do
if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
doexe ${f}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a645bd8e13c5..24759965ef47 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
deleted file mode 100644
index 1d032f4ac26c..000000000000
--- a/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.7/lib/dbtexmf/core/imagedata.py
---- dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py 2015-08-07 10:47:53.000000000 +0100
-+++ dblatex-0.3.7/lib/dbtexmf/core/imagedata.py 2015-11-08 22:36:41.771457222 +0000
-@@ -66,7 +66,7 @@
-
- class SvgConverter(ImageConverter):
- def convert(self, input, output, format, doexec=1):
-- cmd = "inkscape -z -D --export-%s=%s \"%s\"" % (format, output, input)
-+ cmd = "rsvg-convert -f %s -o \"%s\" \"%s\"" % (format, output, input)
- return self.system(cmd, doexec)
-
-
diff --git a/app-text/enchant/enchant-2.2.8.ebuild b/app-text/enchant/enchant-2.2.8.ebuild
index b02382f35473..710a67b885cb 100644
--- a/app-text/enchant/enchant-2.2.8.ebuild
+++ b/app-text/enchant/enchant-2.2.8.ebuild
@@ -32,9 +32,11 @@ src_configure() {
--disable-static \
$(use_with aspell) \
$(use_with hunspell) \
- --without-hspell \
--without-nuspell \
+ --without-hspell \
--without-voikko \
+ --without-applespell \
+ --without-zemberek \
--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
}
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 8d17856403d5..116c71c3bb07 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1 +1,2 @@
DIST kbibtex-0.9.1.tar.xz 4185284 BLAKE2B 437fb2473095e89bc26446bf4dfcdd56ff0b402e604fe67f2f76073628e8e7f3fc8982c56aa24174303dde101c42d19abfac2b3c1e371bf930ff6bdb4307b7c0 SHA512 710ef3f0ddfe4869f079068723a2056866be9aab5907ea7eb00efb4b597270e4c1ec9464d6a15509e2a62749393d27bf0798022367536d3c879a0cbd10dc3129
+DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
diff --git a/app-text/kbibtex/kbibtex-0.9.2.ebuild b/app-text/kbibtex/kbibtex-0.9.2.ebuild
new file mode 100644
index 000000000000..0c96475da697
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.9.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kbibtex
+https://userbase.kde.org/KBibTeX"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="webengine zotero"
+
+DEPEND="
+ app-text/poppler[qt5]
+ dev-libs/icu:=
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ virtual/tex-base
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+ zotero? (
+ app-crypt/qca[qt5(+)]
+ dev-libs/qoauth:5
+ )
+"
+RDEPEND="${DEPEND}
+ dev-tex/bibtex2html
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ $(cmake_use_find_package zotero Qca-qt5)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+
+ if ! has_version "kde-apps/okular:${SLOT}" ; then
+ elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
+ fi
+}
diff --git a/app-text/kjots/kjots-5.0.2.ebuild b/app-text/kjots/kjots-5.0.2.ebuild
deleted file mode 100644
index 38c0288bc499..000000000000
--- a/app-text/kjots/kjots-5.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Note taking utility by KDE"
-HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-libs/grantlee:5
- dev-libs/libxslt
- >=kde-apps/akonadi-19.04.3:5
- >=kde-apps/akonadi-notes-19.04.3:5
- >=kde-apps/kmime-19.04.3:5
- >=kde-apps/kontactinterface-19.04.3:5
- >=kde-apps/kpimtextedit-19.04.3:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
- !app-text/kjots:4
-"
diff --git a/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
index f7960cab4061..b466589f0a19 100644
--- a/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
+++ b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ppc64 ~sparc x86"
IUSE="+osd"
RDEPEND="!app-text/tessdata_best
diff --git a/app-text/tesseract/tesseract-4.1.1.ebuild b/app-text/tesseract/tesseract-4.1.1.ebuild
index edd2c2c7f0b4..48c0bbe4ec06 100644
--- a/app-text/tesseract/tesseract-4.1.1.ebuild
+++ b/app-text/tesseract/tesseract-4.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ppc64 ~sparc x86"
IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index bf7363e3a231..4e8ce58faa5a 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index 40f7e9fe206b..ccfc208c4040 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1 +1,2 @@
+DIST jedi-0.10.0.tar.gz 36820 BLAKE2B a66f7c58564487d83867d61480d83364af0047cee713c41dbd5c67bff0b2ac33d066c2d0f4367c30059f46fb9f4916fc8d2eb9c64aa6a489e2c16a03f56b0b3c SHA512 65482505446b1001e92870ae64a147b38c0bb4d3151e464d325be741729506a191b284a491f4c3eb77dc46cb9bcd6b8e7bf8689ed95107e89a1f6a05c7fbc9ea
DIST jedi-0.8_p20171015.tar.gz 31593 BLAKE2B a34fc7a7d8211cefbaef0012b801bc2dec2b447d34a1d3c338ed37306d36262694f0d8e771042e899959d04bed8925c5beee32803cb7f56add7a83ceb4bf27d9 SHA512 e4238c745d509d9d7e8c0593a46935f1de3c0cdf8e3893deb156110be53e2c9012d98379a6ca747a0bdab77f1def2a88dd46ce5c7d3936f01f0d9ab597f14182
diff --git a/app-vim/jedi/jedi-0.10.0.ebuild b/app-vim/jedi/jedi-0.10.0.ebuild
new file mode 100644
index 000000000000..b30e03db8527
--- /dev/null
+++ b/app-vim/jedi/jedi-0.10.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: binding to the autocompletion library jedi"
+HOMEPAGE="https://github.com/davidhalter/jedi-vim"
+SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep 'dev-python/jedi[${PYTHON_MULTI_USEDEP}]')
+ app-editors/vim[python]"
+BDEPEND="${PYTHON_DEPS}
+ test? ( dev-python/pytest )"
+
+S="${WORKDIR}/jedi-vim-${PV}"
+
+# Tests are broken.
+RESTRICT="test"
+
+# Makefile tries hard to call tests so let's silence this phase.
+src_compile() { :; }
+
+src_install() {
+ vim-plugin_src_install
+}
+
+src_test() {
+ pytest -vv || die
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ce66e9a72619..99befb4b1a04 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/mariadb-10.1.44-r1.ebuild b/dev-db/mariadb/mariadb-10.1.44-r1.ebuild
index 6ab7fdcf492d..e5a6a820f94a 100644
--- a/dev-db/mariadb/mariadb-10.1.44-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.44-r1.ebuild
@@ -41,7 +41,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.2.31-r1.ebuild b/dev-db/mariadb/mariadb-10.2.31-r1.ebuild
index cf1dcef31889..c3e3f9806f91 100644
--- a/dev-db/mariadb/mariadb-10.2.31-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.31-r1.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.3.22-r1.ebuild b/dev-db/mariadb/mariadb-10.3.22-r1.ebuild
index ca766931b1aa..32f6eb3953ea 100644
--- a/dev-db/mariadb/mariadb-10.3.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.22-r1.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mariadb/mariadb-10.4.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild
index 59c656ba80c7..936b1d4a9188 100644
--- a/dev-db/mariadb/mariadb-10.4.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.12.ebuild
@@ -40,7 +40,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
?? ( tcmalloc jemalloc )
static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index f77278ce4212..823f8bd0e02d 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/idna/idna-6.0.0.ebuild b/dev-erlang/idna/idna-6.0.0.ebuild
index 243854541657..972191568484 100644
--- a/dev-erlang/idna/idna-6.0.0.ebuild
+++ b/dev-erlang/idna/idna-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/benoitc/erlang-idna/archive/${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64"
DEPEND=">=dev-lang/erlang-21.0"
diff --git a/dev-erlang/xmpp/xmpp-1.4.5.ebuild b/dev-erlang/xmpp/xmpp-1.4.5.ebuild
index ffa1a3c2d979..75a3527dfeff 100644
--- a/dev-erlang/xmpp/xmpp-1.4.5.ebuild
+++ b/dev-erlang/xmpp/xmpp-1.4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64"
RDEPEND=">=dev-lang/erlang-20.0
>=dev-erlang/ezlib-1.0.7
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d5cb9f033d2a..e6fa172c1fec 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/go-1.13.10.ebuild b/dev-lang/go/go-1.13.10.ebuild
index bd27c7247540..61fd8ca0e06e 100644
--- a/dev-lang/go/go-1.13.10.ebuild
+++ b/dev-lang/go/go-1.13.10.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
case ${PV} in
*_beta*|*_rc*) ;;
*)
- KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="-* amd64 arm ~arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
# The upstream tests fail under portage but pass if the build is
# run according to their documentation [1].
# I am restricting the tests on released versions until this is
diff --git a/dev-lang/mujs/mujs-1.0.6.ebuild b/dev-lang/mujs/mujs-1.0.6.ebuild
index fdae6f9f0a1b..7a2d6d4e1577 100644
--- a/dev-lang/mujs/mujs-1.0.6.ebuild
+++ b/dev-lang/mujs/mujs-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
# subslot matches SONAME
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
RDEPEND="sys-libs/readline:0="
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 75238a572ad1..5da07d03ba20 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -12,6 +12,6 @@ DIST python-gentoo-patches-3.6.10.tar.xz 10964 BLAKE2B e32c8cb3050c7324ee234f585
DIST python-gentoo-patches-3.7.6.tar.xz 10084 BLAKE2B 220869e85bdaf9c21b1b05e13803bdb6ecc22ac0f69da77e57fd7c1cd93ef45ec43401b62732842e1bb3467feb6d65c8204120e2741e9eb6f4cab673fd3a8d62 SHA512 4c04b0cf7da55fa7973ab178e3ac2c59bc2142924bdced5954c058053280b6c663d7c39912286d10fe0e82ca30af6a0dd6a56fa85433f836217ca3dcbb284def
DIST python-gentoo-patches-3.7.7.tar.xz 14644 BLAKE2B 1a377eac945310082ec9fa257bcb406c7eaf24b5e80469dd49e82a1bc0554b75394678609cae447cb0fc7a19059b29166bf110b6ed99a89a9919b3a56a323f87 SHA512 2c7fbcefd6f4d1674b78f3b67f2be3f1b168e08c318fefe8d4757f2d30c22477f5010ad6f2c0abb265d819ee667617f21f93e002242e216b4ee570200b0ddf74
DIST python-gentoo-patches-3.8.1-r2.tar.xz 10108 BLAKE2B 02d3e2ae95b5cfa67c0ba4ff618fbee51d2342955d0a064b80575beda73902bd72462e4f6dba63743bf9fc031d92c69153ef8bd8a0ab5d6e17bfdf8ed0152da5 SHA512 757f7cf6b0cb6c1493d8ed8e5780780efcb32860a9aeba4f933a3a3fb22c412bebde8854e34609465d8a12cb9545a7b19e5d5dbe87d772bb83acd9fe829b75cc
-DIST python-gentoo-patches-3.8.2.tar.xz 16156 BLAKE2B a0b7bf78731e82da38e638f2984689d350aacd9560df8a05db45ebbdae967d6c1fbf7fc52adc57e715eb52081f46b8fe29342e55c8f2bbb2e1d9ad0afa50d8b0 SHA512 0a54b51a9c672c3fafa5507829b826ebce08aa8d0542d04008ff1743366a7abd18a6df93a1b2d61cc31bb9a555681f67f176e48c061e8d6d825cabf2411c9f8c
+DIST python-gentoo-patches-3.8.2-r1.tar.xz 16112 BLAKE2B 9ae197a56bbd96afa11c4312c68ac030138773df22dedc3a3e6fb9e81b366d6522fb2c147946eb604a87d749cbea7e5e5eed8ae0e737294c0949a8c2791dd327 SHA512 00f31c3b7227dd443f05234fbb7744338ce687e1ea4d236a6b1d386d76082acb34259f59442018c9ace54e0004dea9ac822ae2a4470159b83d00112e258baff0
DIST python-gentoo-patches-3.9.0_alpha2.tar.xz 8340 BLAKE2B b93edca01fa46c8eb4e18e0d92c72a3e4ef8dcebf26c0e1c0fab4c82201645ed4c358cf2311c9eb454f6a261ab514985302f81fc86284d3714d662037928963c SHA512 58b0a64d8747f187e6cc4749dc660a443c066e43f509ecc2976b6406bbfb3851a03f686adc36bd58c7c3142a707a387ac25431ca078980914d2219c49a0f2202
DIST python-gentoo-patches-3.9.0_alpha5.tar.xz 13452 BLAKE2B 58f1c0451ca511aeead1056bfb61f260041b2d73c022da56c970315233d9df66de4e8edc483a906953ae77a9797d556c7d2434c26b7830d984d9483af4d022e2 SHA512 8d148e136ad69685cb40f55d6b2a471cd5c79613cf0d490dfffabc44e8a29c598dc496f507310592b4018008f74a2aea6e3be797c30364010d088785f82c1a58
diff --git a/dev-lang/python/python-2.7.18.ebuild b/dev-lang/python/python-2.7.18.ebuild
index 9fd4db39208c..af2d9b91eb13 100644
--- a/dev-lang/python/python-2.7.18.ebuild
+++ b/dev-lang/python/python-2.7.18.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.10-r2.ebuild b/dev-lang/python/python-3.6.10-r2.ebuild
index 5f6886c22769..a53a3f4617e4 100644
--- a/dev-lang/python/python-3.6.10-r2.ebuild
+++ b/dev-lang/python/python-3.6.10-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.7-r2.ebuild b/dev-lang/python/python-3.7.7-r2.ebuild
index d7b593aea95d..2e138e6c4716 100644
--- a/dev-lang/python/python-3.7.7-r2.ebuild
+++ b/dev-lang/python/python-3.7.7-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.8.2-r2.ebuild b/dev-lang/python/python-3.8.2-r2.ebuild
index 5e4029f89247..aa1362f2ae65 100644
--- a/dev-lang/python/python-3.8.2-r2.ebuild
+++ b/dev-lang/python/python-3.8.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
MY_P="Python-${PV}"
PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.2"
+PATCHSET="python-gentoo-patches-3.8.2-r1"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="https://www.python.org/"
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/rust-bin/rust-bin-1.43.0.ebuild b/dev-lang/rust-bin/rust-bin-1.43.0.ebuild
index 2eced9c11b7a..8596ce253305 100644
--- a/dev-lang/rust-bin/rust-bin-1.43.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.43.0.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
inherit bash-completion-r1 rust-toolchain toolchain-funcs multilib-minimal
MY_P="rust-${PV}"
@@ -53,7 +51,7 @@ multilib_src_install() {
if multilib_is_native_abi; then
# start native abi install
- pushd ${S} >/dev/null || die
+ pushd "${S}" >/dev/null || die
local std
std="$(grep 'std' ./components)"
local components="rustc,cargo,${std}"
diff --git a/dev-lang/rust/files/1.43.0-llvm10-LLVMTimeTraceProfilerInitialize.patch b/dev-lang/rust/files/1.43.0-llvm10-LLVMTimeTraceProfilerInitialize.patch
deleted file mode 100644
index 552edddd4571..000000000000
--- a/dev-lang/rust/files/1.43.0-llvm10-LLVMTimeTraceProfilerInitialize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 724b7ee92f3e83af2a451b726ad990fe7db54528 Mon Sep 17 00:00:00 2001
-From: Nikita Popov
-Date: Tue, 4 Feb 2020 20:35:50 +0100
-Subject: [PATCH] Fix timeTraceProfilerInitialize for LLVM 10
-
----
- src/rustllvm/PassWrapper.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
-index 65071c3ed86e0..ebf4d4017a813 100644
---- a/src/rustllvm/PassWrapper.cpp
-+++ b/src/rustllvm/PassWrapper.cpp
-@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() {
- }
-
- extern "C" void LLVMTimeTraceProfilerInitialize() {
--#if LLVM_VERSION_GE(9, 0)
-+#if LLVM_VERSION_GE(10, 0)
-+ timeTraceProfilerInitialize(
-+ /* TimeTraceGranularity */ 0,
-+ /* ProcName */ "rustc");
-+#elif LLVM_VERSION_GE(9, 0)
- timeTraceProfilerInitialize();
- #endif
- }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fb44aab6a65a..a4ef39e2c1b8 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 67a1a1d250bf..337faaaec06e 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,4 @@
DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
DIST Botan-2.11.0.tar.xz 5765712 BLAKE2B 5602ef9485363b21f6f622f7370e486d834477730c2fc2f0bb9211db944d2b2a6a03d8ae14845cf871f648c76c77fd3e18804bd598f805a5754e3bfadb114d5d SHA512 a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce
+DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
diff --git a/dev-libs/botan/botan-2.14.0.ebuild b/dev-libs/botan/botan-2.14.0.ebuild
new file mode 100644
index 000000000000..6d2a94dea777
--- /dev/null
+++ b/dev-libs/botan/botan-2.14.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+MY_P="Botan-${PV}"
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+ boost? ( >=dev-libs/boost-1.48:= )
+ bzip2? ( >=app-arch/bzip2-1.0.5:= )
+ lzma? ( app-arch/xz-utils:= )
+ sqlite? ( dev-db/sqlite:3= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[bindist=] )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+BDEPEND="
+ dev-lang/python:*
+ doc? ( dev-python/sphinx )
+"
+
+src_configure() {
+ local disable_modules=()
+ use boost || disable_modules+=( "boost" )
+ use bindist && disable_modules+=( "ecdsa" )
+ elog "Disabling modules: ${disable_modules[@]}"
+
+ # Enable v9 instructions for sparc64
+ if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+ CHOSTARCH="sparc32-v9"
+ else
+ CHOSTARCH="${CHOST%%-*}"
+ fi
+
+ local myos=
+ case ${CHOST} in
+ *-darwin*) myos=darwin ;;
+ *) myos=linux ;;
+ esac
+
+ case ${CHOST} in
+ hppa*) CHOSTARCH=parisc ;;
+ esac
+
+ local pythonvers=()
+ if use python; then
+ append() {
+ pythonvers+=( ${EPYTHON/python/} )
+ }
+ python_foreach_impl append
+ fi
+
+ CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+ $(use_enable static-libs static-library) \
+ $(use_with boost) \
+ $(use_with bzip2) \
+ $(use_with doc documentation) \
+ $(use_with doc sphinx) \
+ $(use_with lzma) \
+ $(use_with sqlite sqlite3) \
+ $(use_with ssl openssl) \
+ $(use_with zlib) \
+ $(usex hppa --without-stack-protector '') \
+ --cc=gcc \
+ --cpu=${CHOSTARCH} \
+ --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+ --docdir=share/doc \
+ --libdir=$(get_libdir) \
+ --os=${myos} \
+ --prefix="${EPREFIX}/usr" \
+ --with-endian="$(tc-endian)" \
+ --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+ --without-doxygen \
+ || die "configure.py failed"
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+ default
+ use python && python_foreach_impl python_optimize
+}
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index 53a23c170e3f..7c277893487f 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ sam@cmpct.info
+ Sam James
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
diff --git a/dev-libs/gf2x/Manifest b/dev-libs/gf2x/Manifest
index 28e154527b01..a221ee912f7c 100644
--- a/dev-libs/gf2x/Manifest
+++ b/dev-libs/gf2x/Manifest
@@ -1 +1,2 @@
DIST gf2x-1.2.tar.gz 706519 BLAKE2B 4aa45d10646b51e540be51d0fe3691083c48c666d34e67d50d8f53753c49af2bd9664483618eee5a1883106d1f58ddb28cd4eb02031f13eebe8278630de736f6 SHA512 efddad2b99fa103fa77caed4a62f4a763dbff67bc7cf4527bbbf33ca826829e4a4f94e97454ef1a6498bdc2cee8934ff43f9dabf41a4a4f256721527a1dffa30
+DIST gf2x-1.3.0.tar.gz 727717 BLAKE2B 65f6596a09087708e4ae940b067cb375476c1e7b25a28bf12e9318c752cb326516edeb9363d0f98a9b4173f5bcefd204aa62e1cb87b3f27ad9c30b661edc7451 SHA512 4991568032483e0ecb4552a698e5b7d09f80875e54584a0060a9473be1f87e4e8f714e657f08fec0b9fcf493d969408e5a9000f900623b3694aba1ecf6dc239e
diff --git a/dev-libs/gf2x/files/fno-common.patch b/dev-libs/gf2x/files/fno-common.patch
new file mode 100644
index 000000000000..bcb4c255707d
--- /dev/null
+++ b/dev-libs/gf2x/files/fno-common.patch
@@ -0,0 +1,37 @@
+From 5c8737c5c3170358024a4a969e1386cea15932f3 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Sun, 26 Apr 2020 09:56:34 -0400
+Subject: [PATCH 1/1] src/tunetoom.c: delete duplicate definition of rp.
+
+The "make tune-toom" command has started failing with gcc-10.x because
+of its new default -fno-common behavior,
+
+ * https://gcc.gnu.org/gcc-10/porting_to.html
+ * https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+
+This leads to an error involving the FILE pointer "rp" that is declared
+in global scope in both src/tunetoom.c and src/tuning-common.c. In this
+case, the declaration in src/tunetoom.c is simply redundant: that file
+includes src/tuning-common.h which already declares "rp" as extern.
+
+Deleting the redeclaration in src/tunetoom.c makes the build succeed.
+---
+ src/tunetoom.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/tunetoom.c b/src/tunetoom.c
+index 7553e0c..1140606 100644
+--- a/src/tunetoom.c
++++ b/src/tunetoom.c
+@@ -111,8 +111,6 @@ const char * gf2x_utoom_select_string[] = {
+ [GF2X_SELECT_UNB_TC3U] = "TC3U",
+ };
+
+-FILE *rp;
+-
+ void tunetoom(long tablesz)
+ {
+ long high, n;
+--
+2.24.1
+
diff --git a/dev-libs/gf2x/gf2x-1.3.0.ebuild b/dev-libs/gf2x/gf2x-1.3.0.ebuild
new file mode 100644
index 000000000000..4763099d4a33
--- /dev/null
+++ b/dev-libs/gf2x/gf2x-1.3.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="C/C++ routines for fast arithmetic in GF(2)[x]"
+HOMEPAGE="https://gitlab.inria.fr/thome/gf2x/ http://gforge.inria.fr/projects/gf2x/"
+# The Gitlab release is missing the autotools files.
+SRC_URI="https://gforge.inria.fr/frs/download.php/38243/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # soname major version, defined in configure.ac
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="fft static-libs custom-tune"
+IUSE_CPU_FLAGS=" pclmul sse2 sse3 sse4_1 ssse3"
+IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
+
+PATCHES=( "${FILESDIR}/fno-common.patch" )
+
+src_prepare() {
+ default
+ # fix for cross-compiling, avoid ABI detection
+ sed -e 's/VERIFY_WORDSIZE(\[$ABI\].*/echo "skipping ABI check"/' \
+ -e 's/AC_MSG_ERROR(\[already_t.*/echo "skipping ABI check"/' \
+ -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable cpu_flags_x86_sse2 sse2) \
+ $(use_enable cpu_flags_x86_sse3 sse3) \
+ $(use_enable cpu_flags_x86_ssse3 ssse3) \
+ $(use_enable cpu_flags_x86_sse4_1 sse41) \
+ $(use_enable cpu_flags_x86_pclmul pclmul) \
+ $(use_enable fft fft-interface) \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake
+ if use custom-tune; then
+ einfo "Starting tuning"
+ emake tune-lowlevel
+ emake tune-toom
+ use fft && emake tune-fft
+ fi
+}
+
+src_install() {
+ default
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+}
diff --git a/dev-libs/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
index 179df45f8fc5..f2d210fc84f5 100644
--- a/dev-libs/hsa-ext-rocr/Manifest
+++ b/dev-libs/hsa-ext-rocr/Manifest
@@ -1,2 +1 @@
-DIST hsa-ext-rocr-dev_1.1.30100.0-rocm-rel-3.1-44-ecafeba1_amd64.deb 1209486 BLAKE2B 7aa44fecde68761916100312a58d4d1fc77e9e88e6e322548f0d603fc7a8be4d202b387a1ab823ff784ea6e365297846cd5630997362f8691baf6a5ed226c942 SHA512 1373931b80b2d830de8b4741159dfa46a5d6608886e87c780090a558c0070020b3efbe227c6c6803afbdc632be7f632e03c1a9bbb377949bd14de2d0d7117351
-DIST hsa-ext-rocr-dev_1.1.9-139-g0d1ca36_amd64.deb 1166210 BLAKE2B 3edcc938ec92277a163886df4e83f93f6a38b1ec4e95e719265f7a595d291fe4beef68aeca3fb09f8f56a0abf041a987d57e2469310da8cd16f2352b2af5077c SHA512 dbf7991b404cc371575e5d8c40f438bbead8bfef5c73dfd3b7295d64f800892c1f220a6eff8cc67d99ca4bec819bf1b69e37f85873ec372dca9bdd42542fa320
+DIST hsa-ext-rocr-dev_1.1.30300.0-rocm-rel-3.3-19-23fc088b_amd64.deb 1211350 BLAKE2B 283b6699cd618004bc6086ac2fe991b28093db85bd47e685aaee4e8c38f8069f2fbc7f93618e253ab9ca68872d6ec988350cea5439cf3a9c7b0c1c336984d581 SHA512 550f2fff8f2366c780a0316f656f29d066e23ae37cf588741201ef7c7870e4fc4877722f417856decd716eb925ed145b0b97431472bfe8861bbccf6f7d6fb704
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30100.0.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30300.0.ebuild
similarity index 84%
rename from dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30100.0.ebuild
rename to dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30300.0.ebuild
index 26a9c025988f..82e3a047c4eb 100644
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30100.0.ebuild
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30300.0.ebuild
@@ -5,12 +5,12 @@ EAPI=7
inherit unpacker
-ROCM_VERSION="3.1.0"
-MY_PV="${PV}-rocm-rel-$(ver_cut 1-2 ${ROCM_VERSION})-44-ecafeba1"
+ROCM_VERSION="3.3.0"
+MY_PV="${PV}-rocm-rel-$(ver_cut 1-2 ${ROCM_VERSION})-19-23fc088b"
DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
-SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}_amd64.deb"
+SRC_URI="https://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}_amd64.deb"
LICENSE="AMD-GPU-PRO-EULA"
SLOT="0"
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild
deleted file mode 100644
index ae183be35e81..000000000000
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.139.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-MY_PV=$(ver_rs 3 '-')
-
-DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
-SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}-g0d1ca36_amd64.deb"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="-deprecated"
-
-RESTRICT="bindist strip"
-
-QA_PREBUILT="/opt/${PN}/lib*/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_install() {
- local destdir="/opt/${PN}"
- local soversion=$(ver_cut 1-3)
- local somajor=$(ver_cut 1)
-
- local solibs_to_install=( "libhsa-ext-image64.so" )
- if use deprecated; then
- solibs_to_install+=( "libhsa-runtime-tools64.so" )
- fi
-
- into "${destdir}"
- for solib in ${solibs_to_install[@]}; do
- dolib.so "opt/rocm/hsa/lib/${solib}.${soversion}"
- dosym "../..${destdir}/$(get_libdir)/${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${soversion}"
- dosym "${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${somajor}"
- done
-}
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index da3fb1383987..d9bbf0a28f9b 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,2 +1,3 @@
DIST intel-neo-20.03.15346.tar.gz 2671869 BLAKE2B cf1e242563a377d533b1e5adc89257e3fdd879a0f275f069e9c1c3c8436e269a1ec57e951394d2a487148bfc5393fed0ce1f3feb6954c7ece9de59cccffd628c SHA512 4d2cc8fdcba714832306e6353e8688e12c44eb0f848aad981951ee092274ba8ae032db462b49e874b7ac72e1b8b2b9ba71a84b6715ca241c06a1c70e753e5ed3
DIST intel-neo-20.10.16087.tar.gz 2942516 BLAKE2B ed77e5dfe950794e9e34cc6a0d8c053292b5673b9fa244ef7b861da93bb6aa58161ad890719013c838b0bbd80f3c22aaafc60dcb72a1e1e565cab51e5467c810 SHA512 8a728a3cffb5960dba8e8ecc160a6f0dd9c2cbadead3db3af2df71af492fdb346628a20c55112e64debb32eb25cf549e42dc78a606ef4bb8f746913781dbb446
+DIST intel-neo-20.16.16582.tar.gz 3042531 BLAKE2B adfc0aee2a315e67ccb3e4fe39ab09b618930607d3de931d1367881642d8e542385589299f593d3ab1cd6e16de7a8fce7b55fa1b4259097e15da7e55034d344b SHA512 700bee3ccf72c2bc89f5c8a75591de9dafbfe0a6480e3216258842c6b68ce1b527569d5fe1327a0a80cfbf79dca1d956820f060b602feefa83fc9b47cb46d7d0
diff --git a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
new file mode 100644
index 000000000000..4cad60483991
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for L0 and OpenCL, for Broadwell and beyond"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="l0 vaapi"
+
+BDEPEND="virtual/pkgconfig"
+COMMON=">=virtual/opencl-3
+ >=dev-util/intel-graphics-compiler-1.0.3826
+ >=media-libs/gmmlib-20.1.1
+ l0? ( >=dev-libs/level-zero-0.91.10 )
+ vaapi? (
+ x11-libs/libdrm[video_cards_intel]
+ x11-libs/libva
+ )"
+DEPEND="${COMMON}
+ dev-util/opencl-headers
+ media-libs/mesa" # for Khronos OpenGL headers
+RDEPEND="${COMMON}"
+
+DOCS=(
+ README.md
+ FAQ.md
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+ local mycmakeargs=(
+ -DKHRONOS_HEADERS_DIR="${EPREFIX}/usr/include"
+ # CMake only sets this automatically for bundled OpenCL headers
+ -DNEO_EXTRA_DEFINES="CL_TARGET_OPENCL_VERSION=220"
+ -DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
+ -DBUILD_WITH_L0=$(usex l0)
+ -DDISABLE_LIBVA=$(usex vaapi "no" "yes")
+ # If enabled, tests are automatically run during the compile phase
+ # - and we cannot run them because they require permissions to access
+ # the hardware.
+ -DSKIP_UNIT_TESTS=ON
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/intel-neo/metadata.xml b/dev-libs/intel-neo/metadata.xml
index d7b990043c17..0cb86b121696 100644
--- a/dev-libs/intel-neo/metadata.xml
+++ b/dev-libs/intel-neo/metadata.xml
@@ -5,11 +5,17 @@
marecki@gentoo.org
Marek Szuba
- The Intel Graphics Compute Runtime for OpenCL, informally
- known as NEO, is an open source project to converge Intel's development
- efforts on OpenCL compute stacks supporting Gen8 graphics devices
- (Broadwell architecture) and newer.
+ The Intel Graphics Compute Runtime for for oneAPI Level Zero and
+ OpenCL Driver, informally known as NEO, is an open source project providing
+ compute API support (Level Zero, OpenCL) for Intel graphics hardware
+ architectures (HD Graphics, Xe).
+ For OpenCL, NEO supports Intel Core processors with Gen8 graphics devices
+ (Broadwell architecture) and newer, as well as Intel Atom processors with Gen9
+ graphics devices (Apollo Lake, Gemini Lake).
+ Level Zero support is more limited and as of April 2020 still in early stages,
+ please consult upstream release notices for details.
diff --git a/dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild
index 61611daf6b65..50834f425bc2 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0/4" # libfilezilla .so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
similarity index 97%
rename from dev-libs/libgit2-glib/libgit2-glib-0.99.0.1.ebuild
rename to dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
index 88a9c56932d0..ee114890cc7f 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
>=dev-libs/gobject-introspection-1.54:=
>=dev-libs/glib-2.44.0:2
- =dev-libs/libgit2-0.26.0:0
python? (
${PYTHON_DEPS}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 0e8c90c9ea90..44d732a7aa8f 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,4 +1,3 @@
DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
DIST libgit2-0.28.5.tar.gz 4998481 BLAKE2B 71a3502af125a3d1c91700539d5e235a62922b32ca5e62288581b496f4cb680c01bfe70ae092ab730fc45df1dd96c2c9167f51d551a50acd57c857b4ea07634d SHA512 abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a
-DIST libgit2-0.99.0.tar.gz 5307975 BLAKE2B 2ff6c48d29844c8efd292b636c018403f49ae5eef1ef41e2c8755cc35d935677fa965b52c05724aa133f8542a266bb0e0fabb34fcf710127332bd6137ea4ff12 SHA512 e38e18da0e6ed1e5c8198c9eb2c362b21da2d0b9c8bc23309d2f70183549f4b9f23a6db8ce5f1f0f24b373e6427039c2a845b62dd74f91b02cfe8954f961a91b
DIST libgit2-1.0.0.tar.gz 5312324 BLAKE2B 4106b934d32233e9df8a405570a83c3b7ab097e3301dc973230df511f992733e237e1fdc48924522b16a6d202dc4e81461f522e0f5fd867c9f3ad261921af3ba SHA512 7e3b6582dd1567fd5ebfc829a98e22acfd5566ba08f2fb9b7a6783fa87f5e8952ac67f1a2c13adb543e56753d858e73a03204bac17a096c72f5daf4ba376d904
diff --git a/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch b/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch
deleted file mode 100644
index 4a60037c612a..000000000000
--- a/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From fbda0575b133a57d8f5d264742098994c7624c99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tomasz=20K=C5=82oczko?=
-Date: Wed, 19 Feb 2020 12:54:19 +0000
-Subject: [PATCH] Fix #5410: fix installing libgit2.pc in wrong location
-
-Remove using custom PKG_BUILD_PREFIu, PKG_BUILD_LIBDIR and
-PKG_BUILD_INCLUDEDIR variables.
-Use cmake CMAKE_INSTALL_PREFIX, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR instead.
-This patch fixes install libgit2.pc file in correct location and simpifies
-cmake module.
----
- cmake/Modules/PkgBuildConfig.cmake | 39 +++---------------------------
- 1 file changed, 4 insertions(+), 35 deletions(-)
-
-diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/Modules/PkgBuildConfig.cmake
-index 1c0079eb0..e4c574431 100644
---- a/cmake/Modules/PkgBuildConfig.cmake
-+++ b/cmake/Modules/PkgBuildConfig.cmake
-@@ -1,10 +1,5 @@
- # pkg-config file generation
- #
--# Uses the following globals:
--# - PKG_BUILD_PREFIX: the build location (aka prefix). Defaults to CMAKE_INSTALL_PREFIX
--# - PKG_BUILD_LIBDIR: the libdir location. Defaults to ${prefix}/lib.
--# - PKG_BUILD_INCLUDEDIR: the includedir location. Defaults to ${prefix}/include.
--#
-
- function(pkg_build_config)
- set(options)
-@@ -29,37 +24,11 @@ function(pkg_build_config)
- message(FATAL_ERROR "Missing VERSION argument")
- endif()
-
-- if (DEFINED PKG_BUILD_PREFIX)
-- set(PKGCONFIG_PREFIX "${PKG_BUILD_PREFIX}")
-- else()
-- set(PKGCONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
-- endif()
--
-- if(DEFINED PKG_BUILD_LIBDIR)
-- if (IS_ABSOLUTE ${PKG_BUILD_LIBDIR})
-- set(PKGCONFIG_LIBDIR ${PKG_BUILD_LIBDIR})
-- else()
-- set(PKGCONFIG_LIBDIR "\${prefix}/${PKG_BUILD_LIBDIR}")
-- endif()
-- else()
-- set(PKGCONFIG_LIBDIR "\${prefix}/lib")
-- endif()
--
-- if(DEFINED PKG_BUILD_INCLUDEDIR)
-- if (IS_ABSOLUTE ${PKG_BUILD_INCLUDEDIR})
-- set(PKGCONFIG_INCLUDEDIR ${PKG_BUILD_INCLUDEDIR})
-- else()
-- set(PKGCONFIG_INCLUDEDIR "\${prefix}/${PKG_BUILD_INCLUDEDIR}")
-- endif()
-- else()
-- set(PKGCONFIG_INCLUDEDIR "\${prefix}/include")
-- endif()
--
- # Write .pc "header"
- file(WRITE "${PKGCONFIG_FILE}"
-- "prefix=\"${PKGCONFIG_PREFIX}\"\n"
-- "libdir=\"${PKGCONFIG_LIBDIR}\"\n"
-- "includedir=\"${PKGCONFIG_INCLUDEDIR}\"\n"
-+ "prefix=\"${CMAKE_INSTALL_PREFIX}\"\n"
-+ "libdir=\"${LIB_INSTALL_DIR}\"\n"
-+ "includedir=\"${INCLUDE_INSTALL_DIR}\"\n"
- "\n"
- "Name: ${PKGCONFIG_NAME}\n"
- "Description: ${PKGCONFIG_DESCRIPTION}\n"
-@@ -105,6 +74,6 @@ function(pkg_build_config)
-
- # Install .pc file
- install(FILES "${PKGCONFIG_FILE}"
-- DESTINATION "${PKGCONFIG_PREFIX}/${PKGCONFIG_LIBDIR}/pkgconfig"
-+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
- )
- endfunction()
---
-2.25.1
-
diff --git a/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild b/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild
deleted file mode 100644
index c986f95f0cfa..000000000000
--- a/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/0.99"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- sys-libs/zlib
- net-libs/http-parser:=
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-pkg-config.patch
-)
-
-src_prepare() {
- cmake_src_prepare
- # relying on forked http-parser to support some obscure URI form
- sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DBUILD_CLAR=$(usex test)
- -DENABLE_TRACE=$(usex trace ON OFF)
- -DUSE_GSSAPI=$(usex gssapi ON OFF)
- -DUSE_SSH=$(usex ssh)
- -DTHREADSAFE=$(usex threads)
- -DUSE_HTTP_PARSER=system
- )
- cmake_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake_src_test -R offline
- fi
-}
-
-src_install() {
- cmake_src_install
- dodoc docs/*.{md,txt}
-
- if use examples ; then
- find examples -name '.gitignore' -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index bc627b79369d..093df946f8a4 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1 +1,2 @@
DIST ncnn-20200226.tar.gz 10363010 BLAKE2B 3f5e22ecffc7d36d7babb8c316eb95785f60b2938672cc2fc4a56ae8e4cc79fef8d498032117998a1813b4a5491b4b99f6941ac41be3fe8d6c6e3276ae46396e SHA512 e91694692e2c48ba4b404b26b382939be62c61e8452a09b8c1cdad351adcda1ea8bd19ded671f6c4c6cf979ccc49c181dd47e501a351fe89ecdf17a5395b3fab
+DIST ncnn-20200413.tar.gz 10520160 BLAKE2B 10fc59f3a09d1a6b21a6c73b87dabd450279d2c30923b15266461360c6a63b7cc58f91e33c6563752161de3ca067098ed4f2d22963410fe3f72a8affbd39172e SHA512 3f3610f94cbfa6072347857675865b3b21e4cb330a3b889214e7e8cf6e7a558451979ee4ba727c28fc5919a38b27d3b0288dfbd1bfa06d92d3677b4035b019fd
diff --git a/dev-libs/ncnn/ncnn-20200413.ebuild b/dev-libs/ncnn/ncnn-20200413.ebuild
new file mode 100644
index 000000000000..efda01091014
--- /dev/null
+++ b/dev-libs/ncnn/ncnn-20200413.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A high-performance neural network inference framework"
+HOMEPAGE="https://github.com/Tencent/ncnn"
+
+SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-util/glslang
+ dev-util/vulkan-headers
+ media-libs/vulkan-loader"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+RESTRICT=test # Tests tries to use real GPU.
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
+ -DNCNN_BUILD_EXAMPLES=OFF
+ -DNCNN_BUILD_TOOLS=OFF
+ -DNCNN_VULKAN=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index f389f729ac74..4496c606cedf 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="gpm nls tcl"
RESTRICT="test"
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
index 50046a85221a..617f01ca9a91 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
@@ -88,3 +88,5 @@ src_install() {
newinitd "${FILESDIR}/tntnet.initd" tntnet
fi
}
+
+# @stable ~26may2020
\ No newline at end of file
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..2a1e7bb6230c
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils
+
+DESCRIPTION="Modular, multithreaded web application server extensible with C++"
+HOMEPAGE="http://www.tntnet.org/"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="gnutls libressl server ssl examples"
+
+RDEPEND=">=dev-libs/cxxtools-2.2.1
+ sys-libs/zlib[minizip]
+ ssl? (
+ gnutls? (
+ >=net-libs/gnutls-1.2.0
+ dev-libs/libgcrypt:0
+ )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ app-arch/zip"
+
+src_prepare() {
+ # Both fixed in the next release
+ eapply "${FILESDIR}"/${PN}-2.0-zlib-minizip.patch
+ rm framework/common/{ioapi,unzip}.[ch] || die
+
+ # bug 426262
+ if has_version ">sys-devel/autoconf-2.13"; then
+ mv configure.in configure.ac
+ fi
+
+ # bug 423697
+ sed -e "s:unzip.h:minizip/unzip.h:" -i framework/defcomp/unzipcomp.cpp || die
+
+ eautoreconf
+
+ sed -i -e 's:@localstatedir@:/var:' etc/tntnet/tntnet.xml.in || die
+
+ default
+}
+
+src_configure() {
+ local myconf=""
+
+ # Prefer gnutls above SSL
+ if use gnutls; then
+ einfo "Using gnutls for ssl support."
+ myconf="${myconf} --with-ssl=gnutls"
+ elif use ssl; then
+ einfo "Using openssl for ssl support."
+ myconf="${myconf} --with-ssl=openssl"
+ else
+ myconf="${myconf} --with-ssl=no"
+ fi
+
+ # default enabled, will not compile without sdk
+ myconf="${myconf} --with-sdk"
+
+ econf \
+ $(use_with server) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog README TODO doc/tntnet.pdf
+
+ if use examples; then
+ cd "${S}/sdk/demos"
+ emake clean
+ rm -rf .deps */.deps .libs */.libs
+ cd "${S}"
+
+ docinto examples
+ dodoc -r sdk/demos/*
+ fi
+
+ if use server; then
+ rm -f "${D}/etc/init.d/tntnet"
+ newinitd "${FILESDIR}/tntnet.initd" tntnet
+ fi
+}
diff --git a/dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild b/dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild
index 3d5b6db8bfc4..9206b40f2a4d 100644
--- a/dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild
+++ b/dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,6 +11,7 @@ DESCRIPTION="Simple DNS resolver with caching"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+# License note: says 'perl 5.8.8 or any later' bug #718946
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.300.0.ebuild b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.300.0.ebuild
new file mode 100644
index 000000000000..6146e1053fb8
--- /dev/null
+++ b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.300.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MSCHOUT
+DIST_VERSION=3.30
+inherit perl-module
+
+DESCRIPTION="Perl Authentication and Authorization via cookies"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=www-apache/mod_perl-2
+ virtual/perl-Carp
+ >=dev-perl/Class-Load-0.30.0
+ virtual/perl-Encode
+ dev-perl/HTTP-Body
+ dev-perl/Hash-MultiValue
+ dev-perl/WWW-Form-UrlEncoded
+ >=dev-perl/URI-1.360.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=dev-perl/Apache-Test-1.390.0
+ >=virtual/perl-Test-Simple-0.940.0
+ !www-apache/mpm_itk
+ )
+"
+src_test() {
+ perl_rm_files t/author-* t/signature.t
+ perl-module_src_test
+}
diff --git a/dev-perl/Apache-AuthCookie/Manifest b/dev-perl/Apache-AuthCookie/Manifest
index 32eb04bfbe19..0f76b7d650be 100644
--- a/dev-perl/Apache-AuthCookie/Manifest
+++ b/dev-perl/Apache-AuthCookie/Manifest
@@ -1 +1,2 @@
DIST Apache-AuthCookie-3.27.tar.gz 58156 BLAKE2B b4f0e94ad28616584c77505fdebf393571b7dc3629cbeebad7854dc88ceb1c3f59b313e796d9beefee7dc13a584a013ad970f7283f5e71a372ccb6be8455b41e SHA512 580bea66d52382cda5d0d55bdac1c323d60641de60e670da10d24ee20ef570a6f46f3b3b45a8f11be347af3597494595224e7b27e986eece1650086385e9ecfb
+DIST Apache-AuthCookie-3.30.tar.gz 62722 BLAKE2B cbfc5ac6080611dfbb0f14eadc99887c9652ee96325124f760d49e47e1aeab7c987e4a9814c5cdafad4a85a14ba3a1600cfd928752fbd22422fb8c7e4914d02b SHA512 8a8c2f28718611efab7683590e51c895da0232452be50d50e8c1abea68baec182e99eb72e33d867cbda474f39d9fa377e0048e7c38054e000c0634d7068ad1a0
diff --git a/dev-perl/Email-Address-List/Email-Address-List-0.50.0.ebuild b/dev-perl/Email-Address-List/Email-Address-List-0.50.0.ebuild
deleted file mode 100644
index 76adfddcd442..000000000000
--- a/dev-perl/Email-Address-List/Email-Address-List-0.50.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ALEXMV
-MODULE_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="RFC close address list parsing"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-perl/Email-Address
- test? (
- virtual/perl-Test-Simple
- dev-perl/JSON
- )
-"
-
-SRC_TEST="do"
-
-src_prepare() {
- sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
- die "Can't patch Makefile.PL for 5.26 dot-in-inc"
- perl-module_src_prepare
-}
diff --git a/dev-perl/Email-Address-List/Manifest b/dev-perl/Email-Address-List/Manifest
index 8bd5b314f5d3..a4dd403be49e 100644
--- a/dev-perl/Email-Address-List/Manifest
+++ b/dev-perl/Email-Address-List/Manifest
@@ -1,2 +1 @@
-DIST Email-Address-List-0.05.tar.gz 29394 BLAKE2B b0150c44f9e860a53ef4567bfef6c2ba484653b8350c5f70ebea34b33ec3844ffbbc03f755089832a9b7ed2983b90025c350eecd4ab46c020d0e3d31edcdebf4 SHA512 cfb7ea59de8c164a632afdea2d269213052709d91d56869198e1e788452a1746d8f37ad681c946d4b705363311d95ad2babff6fadabda50818da3d2b9e14cde5
DIST Email-Address-List-0.06.tar.gz 29428 BLAKE2B b5d5a16d4b9e1f1059e8dc6b12bc67365404d5644c315663b0e643ee04d5e168f8f8430e059767afcad54fffaaaf67fc55f69fe5c4cfb7208fbdfd7ee88eff42 SHA512 8a173198bed7b5bf41801de9713f424459366b937493bb15c0362843cfe78ca02ce2709f2fe31f3fd61752c0d52956b059e09c3becdbfab0887e9efae6112141
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 9ab4039fc60a..4f59e5d5db0e 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PDL/PDL-2.17.0.ebuild b/dev-perl/PDL/PDL-2.17.0-r1.ebuild
similarity index 97%
rename from dev-perl/PDL/PDL-2.17.0.ebuild
rename to dev-perl/PDL/PDL-2.17.0-r1.ebuild
index 63488f4cd155..52661b7c5c06 100644
--- a/dev-perl/PDL/PDL-2.17.0.ebuild
+++ b/dev-perl/PDL/PDL-2.17.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -41,7 +41,10 @@ RDEPEND="sys-libs/ncurses:0=
gd? ( media-libs/gd )
gsl? ( sci-libs/gsl )
hdf? ( sci-libs/hdf )
- netpbm? ( media-libs/netpbm virtual/ffmpeg )
+ netpbm? (
+ media-libs/netpbm
+ media-video/ffmpeg
+ )
pdl2? (
>=dev-perl/Devel-REPL-1.3.11
|| ( dev-perl/Term-ReadLine-Perl dev-perl/Term-ReadLine-Gnu )
diff --git a/dev-perl/YAML-PP/YAML-PP-0.18.0-r1.ebuild b/dev-perl/YAML-PP/YAML-PP-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..7db24149237f
--- /dev/null
+++ b/dev-perl/YAML-PP/YAML-PP-0.18.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TINITA
+DIST_VERSION=0.018
+SRC_TEST="do"
+inherit perl-module
+
+DESCRIPTION="YAML 1.2 processor in perl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE='test'
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-Encode
+ virtual/perl-Exporter
+ virtual/perl-MIME-Base64
+ virtual/perl-Module-Load
+ >=virtual/perl-Scalar-List-Utils-1.70.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Spec
+ virtual/perl-IO
+ dev-perl/Test-Deep
+ >=virtual/perl-Test-Simple-0.980.0
+ dev-perl/Test-Warn
+ )
+"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index facc02a0795f..b26c4a177a2c 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 066640b361aa..2963ecd32d73 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -12,7 +12,7 @@ inherit php-ext-source-r3 git-r3 autotools
DESCRIPTION="PHP bindings for libvirt"
HOMEPAGE="http://libvirt.org/php/"
-EGIT_REPO_URI="git://libvirt.org/libvirt-php.git"
+EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-php.git"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild
index ad1c2866a297..6500b6dbc54f 100644
--- a/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86"
MY_PN="xdebug"
MY_PV="${PV/_/}"
diff --git a/dev-php/xdebug/xdebug-2.9.4.ebuild b/dev-php/xdebug/xdebug-2.9.4.ebuild
index 95745e2c779d..6291f0c707fc 100644
--- a/dev-php/xdebug/xdebug-2.9.4.ebuild
+++ b/dev-php/xdebug/xdebug-2.9.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
inherit php-ext-source-r3
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 x86"
DESCRIPTION="A PHP debugging and profiling extension"
HOMEPAGE="https://xdebug.org/"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index eaa22430a60e..067aaa2b333a 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 2facd6041e00..096c3467570e 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,2 +1,3 @@
DIST PyGithub-1.46.gh.tar.gz 2882667 BLAKE2B a65a359750c146947b69ff72a4775f6f1532420c3d15e0d7df34c69c3c552aa201740c1ea2cff2dd40daddf7cdc7743b4354698e1bc701f175a5f7dcfc83dd97 SHA512 1c03920434491b279e1709550a658ff125c0d91390160b1de5e5fadf5cf5eeb722477fd913f47ec686cce052a8c34d916de753ea36fecb227d955e60d064a0b6
DIST PyGithub-1.47.gh.tar.gz 2904408 BLAKE2B 89cac86070cdfe4399b31c5e91a35bb09d2358bde229d30223c5760170fff78b6b6b45327e039976cecc1cb7fe66ad5569428715355c51bf9f2cb20ec7772063 SHA512 2c5804f86e1b3c47eb276dc9256983e3b7b36494e156263cf49b4d2d1e9579194f6d5ed17a7f2a8e9a4eab3824f6c7e8595960b98115feff5acb08bed03d86e3
+DIST PyGithub-1.50.gh.tar.gz 2946932 BLAKE2B 6948a6511246a318b88ac7342d3fb7ec6d69e0c2f19b37257ef65338ade39ff437ac0e9c83df202902258de13a1cf7eb3670fee653b17c76e1a8eead14cbb89c SHA512 c24c8eac0ca73d9fab3f016990a422534f1b7a2d5d840dfeef215ada67f43cdec07031d72f31be9ab4332db358a98b89a08ce158bb8fb652b96720ff1cc6b041
diff --git a/dev-python/PyGithub/PyGithub-1.50.ebuild b/dev-python/PyGithub/PyGithub-1.50.ebuild
new file mode 100644
index 000000000000..cf6f5a658720
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.50.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
+ dev-python/pyjwt[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ >=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
index 0353e48606a3..273eb83ef2ed 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.2.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
IUSE="debug"
REQUIRED_USE="
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..47957f564adc
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
Martiusweb/asynctest
http://asynctest.readthedocs.org/en/latest/
https://github.com/Martiusweb/asynctest/issues
+
diff --git a/dev-python/audioread/audioread-2.1.8-r1.ebuild b/dev-python/audioread/audioread-2.1.8-r2.ebuild
similarity index 92%
rename from dev-python/audioread/audioread-2.1.8-r1.ebuild
rename to dev-python/audioread/audioread-2.1.8-r2.ebuild
index 9c7a8c2414c5..ef3bc88e7429 100644
--- a/dev-python/audioread/audioread-2.1.8-r1.ebuild
+++ b/dev-python/audioread/audioread-2.1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ BDEPEND="
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
RDEPEND="
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
gstreamer? (
dev-python/pygobject:3[${PYTHON_USEDEP}]
media-libs/gstreamer:1.0
diff --git a/dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild b/dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild
index 7cd6af268498..3f600dc16b68 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0-r1.ebuild
@@ -20,21 +20,18 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
# module name collision with app-arch/brotli
RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]
!app-arch/brotli[python]"
DEPEND="
- ${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
)
"
+distutils_enable_tests pytest
+
PATCHES=(
"${FILESDIR}"/brotlipy-0.7.0-test-deadline.patch
)
@@ -49,7 +46,3 @@ src_prepare() {
distutils-r1_src_prepare
}
-
-python_test() {
- pytest -vv || die "Testing failed"
-}
diff --git a/dev-python/brotlipy/metadata.xml b/dev-python/brotlipy/metadata.xml
index e7214b7e32c5..7f4f33c6dbc9 100644
--- a/dev-python/brotlipy/metadata.xml
+++ b/dev-python/brotlipy/metadata.xml
@@ -1,12 +1,8 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ python@gentoo.org
+ Python
diff --git a/dev-python/click-log/click-log-0.3.2.ebuild b/dev-python/click-log/click-log-0.3.2.ebuild
index 8843fc394d46..02484280f727 100644
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ b/dev-python/click-log/click-log-0.3.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
inherit distutils-r1
diff --git a/dev-python/click-threading/click-threading-0.4.4.ebuild b/dev-python/click-threading/click-threading-0.4.4.ebuild
index df97e3b16cc1..28abb2f482f5 100644
--- a/dev-python/click-threading/click-threading-0.4.4.ebuild
+++ b/dev-python/click-threading/click-threading-0.4.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
inherit distutils-r1
diff --git a/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
index 96720e650777..332544bb5dc4 100644
--- a/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
@@ -12,7 +12,6 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
-
IUSE="test"
RESTRICT="!test? ( test )"
@@ -20,7 +19,9 @@ RDEPEND=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}] )"
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ )"
python_test() {
# -s unbreaks some tests
diff --git a/dev-python/colorama/colorama-0.4.3.ebuild b/dev-python/colorama/colorama-0.4.3.ebuild
index e254df275f99..f59dbf44d947 100644
--- a/dev-python/colorama/colorama-0.4.3.ebuild
+++ b/dev-python/colorama/colorama-0.4.3.ebuild
@@ -22,7 +22,10 @@ IUSE="examples test"
RESTRICT="!test? ( test )"
BDEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
"
python_install_all() {
diff --git a/dev-python/colorama/metadata.xml b/dev-python/colorama/metadata.xml
index 447f4b724a90..4e8ba925c267 100644
--- a/dev-python/colorama/metadata.xml
+++ b/dev-python/colorama/metadata.xml
@@ -9,10 +9,6 @@
python@gentoo.org
Python
-
- Makes ANSI escape character sequences, for producing colored terminal text
- and cursor positioning, works under MS Windows.
-
colorama
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 8e75dcda6ff6..63581cb813ec 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
index 6e64e14284fe..97f1e05ef089 100644
--- a/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.4-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
@@ -10,8 +10,14 @@ DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
HOMEPAGE="https://pypi.org/project/css-parser/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="LGPL-3"
+LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+# Tests fail under network-sandbox.
+RESTRICT+=" test"
+
+python_test() {
+ esetup.py test || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dbus-python/dbus-python-1.2.14.ebuild b/dev-python/dbus-python/dbus-python-1.2.14.ebuild
index ebbf71f687a7..c8e13ed29120 100644
--- a/dev-python/dbus-python/dbus-python-1.2.14.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
IUSE="doc examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
index fa828ad70e73..e4c14bfe095e 100644
--- a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
+++ b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
diff --git a/dev-python/flower/metadata.xml b/dev-python/flower/metadata.xml
index 119189addfa1..fc90b8ff79b7 100644
--- a/dev-python/flower/metadata.xml
+++ b/dev-python/flower/metadata.xml
@@ -1,9 +1,7 @@
-
- zmedico@gentoo.org
-
+
mher/flower
flower
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index 12e594273e5d..8725687167ee 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1 +1,2 @@
DIST h11-0.8.1.tar.gz 94009 BLAKE2B 34c43874ba8d1e59f89d9d71a5eb8033583aefc6659f6cf645067267a68769f01864b997623ad175e263d4918e2e572e2af49f4ddf743608fc259ab7b4a51022 SHA512 3310dcd8552de4440ed9669fd37b3fc4d76073a9801decb705bceee3c1e98ff83470bd124ecf36e1ec3457ff2fb4da6f4fbf077daa810c28ab73044dfab709d4
+DIST h11-0.9.0.tar.gz 93331 BLAKE2B 46bc596f110d78ad162daaec68b9fa1e3a5ec828b45d66b6067bbdf27a5e81f110a7c1e1d394a4a11d797b9a6ba69d7c9fb182edbf753c5ea1a66f2cd8c01ed7 SHA512 fb323ebf0cc95d89bb7e73cf1f393d2588961ed6dd95630ad692e36f15141ae1de7a0bfe3ef2855f0e9b7c8cf2abba5cf808547bb4bb4d10ebb525122ac63d4a
diff --git a/dev-python/h11/h11-0.9.0.ebuild b/dev-python/h11/h11-0.9.0.ebuild
new file mode 100644
index 000000000000..42d541a4f8ba
--- /dev/null
+++ b/dev-python/h11/h11-0.9.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
+HOMEPAGE="https://github.com/python-hyper/h11 https://pypi.python.org/pypi/h11"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/h11/metadata.xml b/dev-python/h11/metadata.xml
index e7214b7e32c5..7f4f33c6dbc9 100644
--- a/dev-python/h11/metadata.xml
+++ b/dev-python/h11/metadata.xml
@@ -1,12 +1,8 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ python@gentoo.org
+ Python
diff --git a/dev-python/inflect/inflect-3.0.2.ebuild b/dev-python/inflect/inflect-3.0.2.ebuild
index fb4d41585408..e87f18512a29 100644
--- a/dev-python/inflect/inflect-3.0.2.ebuild
+++ b/dev-python/inflect/inflect-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index a337ababa986..586741402ea0 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7})
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit eutils distutils-r1
@@ -19,5 +19,5 @@ RESTRICT="!test? ( test )"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
- py.test tests.py || die
+ pytest -vv tests.py || die
}
diff --git a/dev-python/kaitaistruct/metadata.xml b/dev-python/kaitaistruct/metadata.xml
index e7214b7e32c5..97c6505eb5cf 100644
--- a/dev-python/kaitaistruct/metadata.xml
+++ b/dev-python/kaitaistruct/metadata.xml
@@ -1,12 +1,6 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
+
+
+
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 924a403235f9..656228deeab4 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1 +1,2 @@
DIST kazoo-2.6.1.tar.gz 157425 BLAKE2B af05ee5fb1d532ebc3352de004062f1ff976825f564212f2db76efc153566106ffa520745a8e8cc6a78ca2bf0d17556f978a6b462e4153e9b3ee5258e78a1d82 SHA512 613e8271bfd6c8f5ee976b6ee460478c7faad46b32995125a64312208b38755888690cd46b913ff44ba52aeb36de3ec3dd8e222985af77e99f43963a3eb48d48
+DIST kazoo-2.7.0.tar.gz 163552 BLAKE2B d117ef62b324d074afae5d17f12e2740ab26076ce8e9ea5b0ec15400d2a57ac89053c92675c7e82f1b54e33d30d6029765ec29a72ad537b5d5cfdca976803b5b SHA512 04c3acef723ce306537114ed0f67e96d6c4c638d5dad12e38fcbf1b4dc3e7a972ca0c950adfbbbec7deb8da910e03e867e26ccb83d39eb1381daf0cb5dd2ac6b
diff --git a/dev-python/kazoo/kazoo-2.6.1.ebuild b/dev-python/kazoo/kazoo-2.6.1.ebuild
index d2233dcf8c20..1e43f82a01ed 100644
--- a/dev-python/kazoo/kazoo-2.6.1.ebuild
+++ b/dev-python/kazoo/kazoo-2.6.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_6 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
inherit distutils-r1
diff --git a/dev-python/kazoo/kazoo-2.7.0.ebuild b/dev-python/kazoo/kazoo-2.7.0.ebuild
new file mode 100644
index 000000000000..5dc5703f6694
--- /dev/null
+++ b/dev-python/kazoo/kazoo-2.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
+HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/graphviz[${PYTHON_USEDEP}]
+ >=dev-python/objgraph-3.4.0[${PYTHON_USEDEP}]
+ )
+"
+
+# requires zookeeper running to test
+RESTRICT="test"
+
+python_compile_all() {
+ if use doc; then
+ sphinx-build -b html docs docs/_build/html || die
+ fi
+}
+
+python_test() {
+ ZOOKEEPER_VERSION="2.6.1" esetup.py test || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ local DOCS=( {CHANGES,CONTRIBUTING,README}.md )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/kazoo/metadata.xml b/dev-python/kazoo/metadata.xml
index 0ac394c9ef1f..f896e6b8c889 100644
--- a/dev-python/kazoo/metadata.xml
+++ b/dev-python/kazoo/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ zmedico@gentoo.org
+ Zac Medico
+
kazoo
python-zk/kazoo
diff --git a/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild
index 607c6f77b7f4..56edf9682f54 100644
--- a/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-6.2.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
SRC_URI=""
- KEYWORDS=""
+ KEYWORDS="x86"
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
RDEPEND="app-emulation/libvirt:0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 607c6f77b7f4..14a5fba8787a 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
- EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+ EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
SRC_URI=""
KEYWORDS=""
RDEPEND="app-emulation/libvirt:=[-python(-)]"
diff --git a/dev-python/moviepy/moviepy-1.0.1.ebuild b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
similarity index 97%
rename from dev-python/moviepy/moviepy-1.0.1.ebuild
rename to dev-python/moviepy/moviepy-1.0.1-r1.ebuild
index 41b2da26b5c7..7621f8f98664 100644
--- a/dev-python/moviepy/moviepy-1.0.1.ebuild
+++ b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
dev-python/tqdm[${PYTHON_USEDEP}]
dev-python/urllib3[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
- virtual/ffmpeg
+ media-video/ffmpeg
"
DEPEND="${RDEPEND}"
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 40f1fcaaf6cd..fa349a9db616 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1 +1,2 @@
DIST parver-0.2.1.tar.gz 25717 BLAKE2B dd55f44b8bb43ca948fa459537385066b811fca4ff68426365b840d704c30c4a258632f1d2ac2a3967acafcbde44151f1d394ffd96a18d03c6a004ce6b29f1b1 SHA512 674e97d5bef6bb02a659ecf5e1a78fa5d597436b656d0251db20fe330a151ae8de52a3f3f0d3732ccb624ad9093116c07837ba0cbe4ae7ae664b4d47ec3333c3
+DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
diff --git a/dev-python/parver/files/parver-0.3-test.patch b/dev-python/parver/files/parver-0.3-test.patch
new file mode 100644
index 000000000000..f062b317f618
--- /dev/null
+++ b/dev-python/parver/files/parver-0.3-test.patch
@@ -0,0 +1,34 @@
+From 83c64f08ea95e40b3fa208c2743b8eaba3296a63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Mon, 27 Apr 2020 08:25:18 +0200
+Subject: [PATCH] Suppress too_slow on test_parse_hypothesis
+
+The generator is apparently too slow on busy systems, so suppress
+the health check to avoid a test failure.
+---
+ tests/test_parse.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_parse.py b/tests/test_parse.py
+index 6d58379..43494e3 100644
+--- a/tests/test_parse.py
++++ b/tests/test_parse.py
+@@ -2,13 +2,14 @@
+ from __future__ import absolute_import, division, print_function
+
+ import pytest
+-from hypothesis import assume, given
++from hypothesis import assume, given, settings, HealthCheck
+
+ from parver import ParseError, Version
+
+ from .strategies import version_string, whitespace
+
+
++@settings(suppress_health_check=[HealthCheck.too_slow])
+ @given(whitespace, version_string(), whitespace)
+ def test_parse_hypothesis(prefix, version, suffix):
+ Version.parse(prefix + version + suffix)
+--
+2.26.2
+
diff --git a/dev-python/parver/metadata.xml b/dev-python/parver/metadata.xml
index f3f1f87ebb33..85a7736752b3 100644
--- a/dev-python/parver/metadata.xml
+++ b/dev-python/parver/metadata.xml
@@ -1,13 +1,9 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ python@gentoo.org
+ Python
RazerM/parver
diff --git a/dev-python/parver/parver-0.3.ebuild b/dev-python/parver/parver-0.3.ebuild
new file mode 100644
index 000000000000..d2af95d88e83
--- /dev/null
+++ b/dev-python/parver/parver-0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Parse and manipulate version numbers"
+HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
+SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ "
+
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # https://github.com/RazerM/parver/pull/6
+ "${FILESDIR}"/${P}-test.patch
+)
+
+src_prepare() {
+ # unlock dependencies
+ sed -i -e 's:~=:>=:g' setup.py || die
+
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 9f6ee255c26f..f0be807095a6 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1 +1,2 @@
DIST peewee-3.1.0.tar.gz 705099 BLAKE2B 1dc528082337ae509fc9f91c521d7bf036179ad6b1a5a93e113d594ce819d3a9cdbb7e687b51acacdaf242d542dad138ce2a21f9dcc19483c7361788329a53ed SHA512 628eea27d51017a6ab87aae9ae851d749b0f437fe1806957b23408ad3c97bbb93e5b84c66c5e70bfb7b55c9f29a0c517b84e65adc0f979da450987d670661e84
+DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
diff --git a/dev-python/peewee/peewee-3.13.2.ebuild b/dev-python/peewee/peewee-3.13.2.ebuild
new file mode 100644
index 000000000000..36f6047511b1
--- /dev/null
+++ b/dev-python/peewee/peewee-3.13.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+
+python_test() {
+ "${EPYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && DOCS=( examples/ )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index d9dcb996f382..8d9dabd2eb31 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,3 +2,4 @@ DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc3
DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
DIST pillow-7.1.1.tar.gz 38933780 BLAKE2B 411e97f7ae26361501e51c1756d9c495b8fe893fdd7eeea5f51e83aab99b04216e9518f54a69a57b482b3f6837a1318daed2963f196fa5c6166d71cb7bba281e SHA512 1f3c0a3c604e95ac60e2b9170fd2f45156a444a2f98dc3afe523178364a38e2f33ca8e312be85d2ec7a13c461236063dc2622db8df7ad7fe393aeb98b5bf2dfa
+DIST pillow-7.1.2.tar.gz 38933761 BLAKE2B b1d8cedeb0e8108af3bc5de672bcf812cb2f5ef8a9a23db45b3d5fc9d383d7d534ee63fbfce27f9ee4318982dec46e1e60eb55ce5aa14588b1468792c8188f5b SHA512 4e20f6dbc3c9d138de6270b14e85911ac5d2953328be4fd4b0754d8fe834625f914ee1f1b2f32cfb26ab57b6ea4b74d14a81a65938cbb94895c0afcd639bb38f
diff --git a/dev-python/pillow/pillow-7.1.2.ebuild b/dev-python/pillow/pillow-7.1.2.ebuild
new file mode 100644
index 000000000000..43f8084cc1ee
--- /dev/null
+++ b/dev-python/pillow/pillow-7.1.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg tiff )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/olefile[${PYTHON_USEDEP}]
+ imagequant? ( media-gfx/libimagequant:0 )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ lcms? ( media-libs/lcms:2= )
+ tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+ truetype? ( media-libs/freetype:2= )
+ webp? ( media-libs/libwebp:0= )
+ xcb? ( x11-libs/libxcb )
+ zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ media-gfx/imagemagick[png]
+ )
+"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx_rtd_theme
+
+python_configure_all() {
+ # It's important that these flags are also passed during the install phase
+ # as well. Make sure of that if you change the lines below. See bug 661308.
+ mydistutilsargs=(
+ build_ext
+ --disable-platform-guessing
+ $(use_enable truetype freetype)
+ $(use_enable jpeg)
+ $(use_enable jpeg2k jpeg2000)
+ $(use_enable lcms)
+ $(use_enable tiff)
+ $(use_enable imagequant)
+ $(use_enable webp)
+ $(use_enable webp webpmux)
+ $(use_enable xcb)
+ $(use_enable zlib)
+ )
+
+ # setup.py sucks at adding the right toolchain paths but it does
+ # accept additional ones from INCLUDE and LIB so set these. You
+ # wouldn't normally need these at all as the toolchain should look
+ # here anyway but this setup.py does stupid things.
+ export \
+ INCLUDE=${ESYSROOT}/usr/include \
+ LIB=${ESYSROOT}/usr/$(get_libdir)
+
+ # We have patched in this env var.
+ tc-export PKG_CONFIG
+}
+
+src_test() {
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+ # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+ pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ python_doheader src/libImaging/*.h
+ distutils-r1_python_install
+}
+
+python_install_all() {
+ if use examples ; then
+ docinto example
+ dodoc docs/example/*
+ docompress -x /usr/share/doc/${PF}/example
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index a00104e673ce..dc4e60cb9335 100644
--- a/dev-python/pip/pip-20.0.2.ebuild
+++ b/dev-python/pip/pip-20.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
# setuptools & wheel .whl files are required for testing, exact version is not very important.
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
SLOT="0"
IUSE="test -vanilla"
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1.ebuild
index b614e2032b34..a07bab9bd9f4 100644
--- a/dev-python/pluggy/pluggy-0.13.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
RDEPEND="$(python_gen_cond_dep \
'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 8295409eafc2..fba5c41c53bf 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,2 @@
DIST pygit2-1.0.3.tar.gz 501720 BLAKE2B ddfe228bb50df08c1b5e880f58be6b0ae111a10235b695ce93ef04b685507bda90cdccdacefd5400807cd19bc9c63b49061c2da73c89641fe9641c52a4ed16ab SHA512 debf4018e6daa938f44cf22f2acec1f850156e30ac44052e2edb8257f86a60453428356851cc495ae234df9cdbee922a6a7ad7886c9a6e3746b7315c71f0a3df
-DIST pygit2-1.1.1.tar.gz 217896 BLAKE2B 0f1a6ea37d0622259b07553253177f7097ba16912306e5dd007a02a238503f879df3eea5b23d197ffee43f83b1409999fec2094d73fe38b30b8e349d37a84ec3 SHA512 e57600f1eb53647106cdc703d8adcdff7742bde8d3d95d8a879275ec1ac4a4a569d6f7da68a9bf49e82f491980e19abf96e55029f3fbae52371632e6bd3b2ab3
DIST pygit2-1.2.0.tar.gz 232458 BLAKE2B ce3bc95e107a572709e14e87f6bc31f6b991da5e541d65e551243a5aefd0a853818aeedeafcd6a6607e32d225f0331bca07015d54d538b0f3d9157255630e0be SHA512 44ed29f8d10f4f784e6192b79f6a3924d64b22297cf335e9d005be578c3e0c77999855db802f71d2fcb5c053593ea2e9711e2cd191b3e185ec01c0d49e2ae1c6
diff --git a/dev-python/pygit2/pygit2-1.1.1.ebuild b/dev-python/pygit2/pygit2-1.1.1.ebuild
deleted file mode 100644
index 9b39d97782d7..000000000000
--- a/dev-python/pygit2/pygit2-1.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- =dev-libs/libgit2-0.99*
- dev-python/cached-property[${PYTHON_USEDEP}]
- >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-src_prepare() {
- distutils-r1_src_prepare
-
- # unconditionally prevent it from using network
- sed -i -e '/def no_network/a \
- return True' test/utils.py || die
-
- # we need to move them away to prevent pytest from forcing '..'
- # for imports
- mkdir hack || die
- mv test hack/ || die
- ln -s hack/test test || die
-}
-
-python_test() {
- pytest -vv hack/test || die
-}
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index a6f46cb48b25..4ad525472404 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1 +1,2 @@
DIST pyotp-2.2.6.tar.gz 10602 BLAKE2B 801f48646ff15a039b9295948ed292c3c432f8b0b629d249554259802335b7430a2c82f8c3bee1f54df71b0972ec293d69a2005c35cac120a51cec1a3548b2c1 SHA512 4f962704411ceebff967cf13af5ec5b815da0f82af665a086c4e5d53acc735453d638c65aa2afa40fe546e92d04a9250f6964cb22270a67c9609f8486eb5ba90
+DIST pyotp-2.3.0.tar.gz 11672 BLAKE2B a3d8ca5296b5a8a7aa053b0a0556285c19f335cb1dfb4f892d40fe2d79cc52313af7b31c6ee4afc4eb8c1cd8cb8248442bd1a4868e2bb921a552332a0a283a44 SHA512 4a7a4206134e9a370f7f3c3a9b7e755b75a84e30a320084faf91af5607c4262a6aa76d7b8cefaf284e4cf01faea1df4ca92d871644a14ab56f04693b227485cf
diff --git a/dev-python/pyotp/metadata.xml b/dev-python/pyotp/metadata.xml
index e7214b7e32c5..7f4f33c6dbc9 100644
--- a/dev-python/pyotp/metadata.xml
+++ b/dev-python/pyotp/metadata.xml
@@ -1,12 +1,8 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ python@gentoo.org
+ Python
diff --git a/dev-python/pyotp/pyotp-2.3.0.ebuild b/dev-python/pyotp/pyotp-2.3.0.ebuild
new file mode 100644
index 000000000000..f6bc189931e0
--- /dev/null
+++ b/dev-python/pyotp/pyotp-2.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords."
+HOMEPAGE="https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pypng/pypng-0.0.20.ebuild b/dev-python/pypng/pypng-0.0.20.ebuild
index 34b8f0314bb6..9bb9cf785ed9 100644
--- a/dev-python/pypng/pypng-0.0.20.ebuild
+++ b/dev-python/pypng/pypng-0.0.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
python_test() {
"${EPYTHON}" code/test_png.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pyrqlite/pyrqlite-9999.ebuild b/dev-python/pyrqlite/pyrqlite-9999.ebuild
index 342b0c8e9e27..4ad296a7f2cd 100644
--- a/dev-python/pyrqlite/pyrqlite-9999.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-9999.ebuild
@@ -17,22 +17,10 @@ HOMEPAGE="https://github.com/rqlite/pyrqlite"
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-cov[${PYTHON_USEDEP}]
- dev-python/pylint[${PYTHON_USEDEP}]
- )"
+distutils_enable_tests pytest
src_prepare() {
sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/${PN}/constants.py || die
distutils-r1_src_prepare
}
-
-python_test() {
- esetup.py test || die "tests failed"
- esetup.py lint -f text -E || die "pylint failed"
-}
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..bdee1047cae3
--- /dev/null
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Py.test plugin to test server connections locally"
+HOMEPAGE="https://pypi.org/project/pytest-localserver/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+
+RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index 0a516a48c81d..2397a128ff90 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
index 7a3edcab327f..8b643a363b3a 100644
--- a/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.11.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-4.6.9.ebuild b/dev-python/pytest/pytest-4.6.9.ebuild
index 88120a1fedc6..620cc642d587 100644
--- a/dev-python/pytest/pytest-4.6.9.ebuild
+++ b/dev-python/pytest/pytest-4.6.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-netlink/python-netlink-0.1.ebuild b/dev-python/python-netlink/python-netlink-0.1.ebuild
index e8268a3cf5d9..3ff964520de1 100644
--- a/dev-python/python-netlink/python-netlink-0.1.ebuild
+++ b/dev-python/python-netlink/python-netlink-0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
inherit distutils-r1
diff --git a/dev-python/python-redmine/python-redmine-2.0.2.ebuild b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
index 004a759abd1c..403396ebdefe 100644
--- a/dev-python/python-redmine/python-redmine-2.0.2.ebuild
+++ b/dev-python/python-redmine/python-redmine-2.0.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
@@ -14,19 +14,10 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-# This package bundles dev-python/requests, so setup.py won't check for
-# it. As a result, we don't need RDEPEND in DEPEND unconditionally.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )"
+distutils_enable_tests nose
python_prepare_all() {
# Remove the bundled copy of dev-python/requests...
@@ -40,7 +31,3 @@ python_prepare_all() {
distutils-r1_python_prepare_all
}
-
-python_test() {
- nosetests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pythondialog/metadata.xml b/dev-python/pythondialog/metadata.xml
index c015a85e3f3a..e657e44db07c 100644
--- a/dev-python/pythondialog/metadata.xml
+++ b/dev-python/pythondialog/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
pythondialog
python2-pythondialog
diff --git a/dev-python/pyzbar/metadata.xml b/dev-python/pyzbar/metadata.xml
index e7214b7e32c5..7f4f33c6dbc9 100644
--- a/dev-python/pyzbar/metadata.xml
+++ b/dev-python/pyzbar/metadata.xml
@@ -1,12 +1,8 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ python@gentoo.org
+ Python
diff --git a/dev-python/pyzbar/pyzbar-0.1.8.ebuild b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
index d6aad680730a..52dfc23d22b7 100644
--- a/dev-python/pyzbar/pyzbar-0.1.8.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
@@ -15,15 +15,12 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
RDEPEND="
dev-python/pillow[${PYTHON_USEDEP}]
media-gfx/zbar
"
-DEPEND="${RDEPEND}
+BDEPEND="
test? (
dev-python/numpy[${PYTHON_USEDEP}]
)
diff --git a/dev-python/ramlfications/metadata.xml b/dev-python/ramlfications/metadata.xml
index c9b67088ebef..287698f5dd9d 100644
--- a/dev-python/ramlfications/metadata.xml
+++ b/dev-python/ramlfications/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
spam@lynnroot.com
diff --git a/dev-python/ratelimit/ratelimit-1.4.1.ebuild b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
index bc4af83a74e6..6974189b99e6 100644
--- a/dev-python/ratelimit/ratelimit-1.4.1.ebuild
+++ b/dev-python/ratelimit/ratelimit-1.4.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
@@ -13,18 +13,11 @@ HOMEPAGE="https://github.com/tomasbasham/ratelimit"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DEPEND="
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
src_prepare() {
default
# remove --cov args injection
rm pytest.ini || die
}
-
-python_test() {
- pytest || die
-}
diff --git a/dev-python/repoze-sphinx-autointerface/metadata.xml b/dev-python/repoze-sphinx-autointerface/metadata.xml
index 0afe86792124..9417931b95b4 100644
--- a/dev-python/repoze-sphinx-autointerface/metadata.xml
+++ b/dev-python/repoze-sphinx-autointerface/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
repoze.sphinx.autointerface
diff --git a/dev-python/riak-python-client/metadata.xml b/dev-python/riak-python-client/metadata.xml
index 6a8aecae126a..da754f1e4d64 100644
--- a/dev-python/riak-python-client/metadata.xml
+++ b/dev-python/riak-python-client/metadata.xml
@@ -1,11 +1,9 @@
+
riak
basho/riak-python-client
-
- zmedico@gentoo.org
-
diff --git a/dev-python/robotframework/metadata.xml b/dev-python/robotframework/metadata.xml
index 1fe8689d18e6..edf63dc9de86 100644
--- a/dev-python/robotframework/metadata.xml
+++ b/dev-python/robotframework/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
robotframework/robotframework
robotframework
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index ceecb3c4bf42..14c1d7cfa6b9 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/serverfiles/serverfiles-0.2.1.ebuild b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
index 6fc585fcc3a0..bfb83aa8637e 100644
--- a/dev-python/serverfiles/serverfiles-0.2.1.ebuild
+++ b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_6)
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Utility for accessing HTTP server and storing files locally for reuse"
@@ -13,15 +13,10 @@ SRC_URI="https://github.com/biolab/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND=">=dev-python/requests-2.11.1[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
+DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-python_test() {
- py.test -v || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/sleekxmpp/metadata.xml b/dev-python/sleekxmpp/metadata.xml
index 4a8bc08fec87..ceff128800ba 100644
--- a/dev-python/sleekxmpp/metadata.xml
+++ b/dev-python/sleekxmpp/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
fritzy/SleekXMPP
diff --git a/dev-python/slimit/slimit-0.8.1-r1.ebuild b/dev-python/slimit/slimit-0.8.1-r1.ebuild
index b5af60f39209..2203965e41d0 100644
--- a/dev-python/slimit/slimit-0.8.1-r1.ebuild
+++ b/dev-python/slimit/slimit-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_6 )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
inherit distutils-r1
diff --git a/dev-python/slixmpp/slixmpp-1.4.2.ebuild b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
index 60a233b71f8e..8bdf1ef5c769 100644
--- a/dev-python/slixmpp/slixmpp-1.4.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.4.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index c5132f939caf..bc90a9dd2048 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
@@ -32,5 +32,5 @@ python_prepare() {
}
python_test() {
- nosetests || die
+ nosetests -v || die
}
diff --git a/dev-python/sphinxcontrib-issuetracker/metadata.xml b/dev-python/sphinxcontrib-issuetracker/metadata.xml
index e27bdf9248f7..a5d53d3b52ad 100644
--- a/dev-python/sphinxcontrib-issuetracker/metadata.xml
+++ b/dev-python/sphinxcontrib-issuetracker/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
sphinxcontrib-issuetracker
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
index 6a9c5db39ea2..be1c7ec77701 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
@@ -18,24 +20,14 @@ SRC_URI="${EGIT_REPO_URI%.git}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
dev-python/pyrqlite[${PYTHON_USEDEP}]
- dev-python/sqlalchemy[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-cov[${PYTHON_USEDEP}]
- dev-python/pylint[${PYTHON_USEDEP}]
- )"
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
src_prepare() {
sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
distutils-r1_src_prepare
}
-
-python_test() {
- esetup.py test || die "tests failed"
- esetup.py lint -f text -E || die "pylint failed"
-}
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
index 8e6f85629134..76e6ab45fc94 100644
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
+++ b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
@@ -17,24 +19,14 @@ HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
dev-python/pyrqlite[${PYTHON_USEDEP}]
- dev-python/sqlalchemy[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-cov[${PYTHON_USEDEP}]
- dev-python/pylint[${PYTHON_USEDEP}]
- )"
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
src_prepare() {
sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
distutils-r1_src_prepare
}
-
-python_test() {
- esetup.py test || die "tests failed"
- esetup.py lint -f text -E || die "pylint failed"
-}
diff --git a/dev-python/subvertpy/subvertpy-0.10.1.ebuild b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
index b184151d78e1..40de035a89c5 100644
--- a/dev-python/subvertpy/subvertpy-0.10.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.10.1.ebuild
@@ -2,7 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
inherit distutils-r1
@@ -13,8 +15,6 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
RDEPEND=">=dev-vcs/subversion-1.4"
DEPEND="${RDEPEND}
diff --git a/dev-python/tappy/tappy-2.4-r1.ebuild b/dev-python/tappy/tappy-2.4-r1.ebuild
index 214efd834439..eb3bd8d6e539 100644
--- a/dev-python/tappy/tappy-2.4-r1.ebuild
+++ b/dev-python/tappy/tappy-2.4-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="yaml"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/textx/textx-1.4.ebuild b/dev-python/textx/textx-1.4.ebuild
index 4434231b96b0..bf660cde8d9d 100644
--- a/dev-python/textx/textx-1.4.ebuild
+++ b/dev-python/textx/textx-1.4.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index 61c40e7cfbc0..f69dee9435d3 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
inherit distutils-r1
@@ -32,8 +32,5 @@ python_prepare_all() {
python_test() {
export TINYCSS_SKIP_SPEEDUPS_TESTS=1
- local test
- for test in ${PN}/tests/test_*.py; do
- py.test $test || die
- done
+ pytest -vv ${PN}/tests/test_*.py || die
}
diff --git a/dev-python/toro/metadata.xml b/dev-python/toro/metadata.xml
index 214465d52996..f9ea20bf41e1 100644
--- a/dev-python/toro/metadata.xml
+++ b/dev-python/toro/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
A set of locking and synchronizing primitives analogous to those in Python’s
threading module or Gevent’s coros, for use with Tornado’s gen.engine.
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 1112e8b1d49f..98fe42f3287c 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
LICENSE="MIT"
SLOT="0"
@@ -86,6 +86,13 @@ python_prepare_all() {
# sphinx (including on py2)
rm src/twisted/python/test/test_release.py || die
+ # Conch doesn't work with latest >=OpenSSH 7.6
+ # - https://twistedmatrix.com/trac/ticket/9311
+ # - https://twistedmatrix.com/trac/ticket/9515
+ rm src/twisted/conch/test/test_ckeygen.py || die
+ rm src/twisted/conch/test/test_conch.py || die
+ rm src/twisted/conch/test/test_cftp.py || die
+
# puts system in EMFILE state, then the exception handler may fail
# trying to open more files due to some gi magic
sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 1f547fbdba48..c35ab596c1cf 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -90,6 +90,13 @@ python_prepare_all() {
# sphinx (including on py2)
rm src/twisted/python/test/test_release.py || die
+ # Conch doesn't work with latest >=OpenSSH 7.6
+ # - https://twistedmatrix.com/trac/ticket/9311
+ # - https://twistedmatrix.com/trac/ticket/9515
+ rm src/twisted/conch/test/test_ckeygen.py || die
+ rm src/twisted/conch/test/test_conch.py || die
+ rm src/twisted/conch/test/test_cftp.py || die
+
# puts system in EMFILE state, then the exception handler may fail
# trying to open more files due to some gi magic
sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
diff --git a/dev-python/txAMQP/metadata.xml b/dev-python/txAMQP/metadata.xml
index 8a4e48b4fcf9..a2a0bedb9376 100644
--- a/dev-python/txAMQP/metadata.xml
+++ b/dev-python/txAMQP/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
txAMQP
txamqp/txamqp
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
index 7a2706920d55..e0888e193800 100644
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
autobahnws@googlegroups.com
diff --git a/dev-python/txgithub/metadata.xml b/dev-python/txgithub/metadata.xml
index 1d02a5eabbe8..663a9febf18b 100644
--- a/dev-python/txgithub/metadata.xml
+++ b/dev-python/txgithub/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
tom.prince@ualberta.net
@@ -13,5 +10,4 @@
txgithub
tomprince/txgithub
- txgithub is a library based on Twisted for accessing GitHub's API version 3
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
index e764dc685968..50ad0fbde272 100644
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_6)
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit eutils distutils-r1
diff --git a/dev-python/txrequests/metadata.xml b/dev-python/txrequests/metadata.xml
index 84fee3958895..4e91cd94a1af 100644
--- a/dev-python/txrequests/metadata.xml
+++ b/dev-python/txrequests/metadata.xml
@@ -1,10 +1,7 @@
-
- python@gentoo.org
- Python
-
+
tardyp@gmail.com
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index 6ef279691f6d..65f635f60cd3 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc"
RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/whelk/metadata.xml b/dev-python/whelk/metadata.xml
index 2bdfb4a473d9..ded56739da1d 100644
--- a/dev-python/whelk/metadata.xml
+++ b/dev-python/whelk/metadata.xml
@@ -1,9 +1,6 @@
-
- python@gentoo.org
-
nicolasbock@gentoo.org
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index c436d65ad6d2..d9e9393a9a2f 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -4,28 +4,21 @@
EAPI=5
COMMIT="0fbd074c257c51b73de05b25ccb6488801320a32"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
HOMEPAGE="https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel"
SRC_URI="https://github.com/methane/wsaccel/archive/${COMMIT}.zip -> ${P}.zip"
+S="${WORKDIR}/${PN}-${COMMIT}"
SLOT="0"
LICENSE="Apache-2.0"
KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND=""
DEPEND="
dev-python/cython[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_test() {
- py.test -v || die
-}
+distutils_enable_tests pytest
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 1173087a7dc9..47b64470b155 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,2 +1 @@
DIST wsproto-0.12.0.tar.gz 45252 BLAKE2B 1be690faba6665b11e2e1c1725935addb132d7008f0ae81e7d5c383a152a5d79389287b3c152cb380e0bdfc97a3438e2a48b62f3c8acf6b501427bc617225ec0 SHA512 159b7f67eff60c2514cfca17036d95017109fe251def6cec132998ac82a037484e3e248d4335539fd03491f56c491a7cf51582aa3f74a44d7d150220a875b18d
-DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
diff --git a/dev-python/wsproto/metadata.xml b/dev-python/wsproto/metadata.xml
index 67543673df39..c86be9415a41 100644
--- a/dev-python/wsproto/metadata.xml
+++ b/dev-python/wsproto/metadata.xml
@@ -1,13 +1,9 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ python@gentoo.org
+ Python
python-hyper/wsproto
@@ -15,3 +11,4 @@
https://github.com/python-hyper/wsproto/issues
+
diff --git a/dev-python/wsproto/wsproto-0.15.0.ebuild b/dev-python/wsproto/wsproto-0.15.0.ebuild
deleted file mode 100644
index e6b15a59a3ea..000000000000
--- a/dev-python/wsproto/wsproto-0.15.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSockets state-machine based protocol implementation"
-HOMEPAGE="https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- =dev-python/h11-0.8*[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-
-python_test() {
- py.test -v || die "Testing failed"
-}
diff --git a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
index d56aaf333fe8..c315ec4d2864 100644
--- a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+++ b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="WWW-Authenticate header parser"
@@ -13,14 +13,5 @@ SRC_URI="https://github.com/alexsdutton/www-authenticate/archive/${PV}.tar.gz ->
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- nosetests tests.py || die
-}
+distutils_enable_tests nose
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 88d0be07904e..a507b44a3d90 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index f57dd06cf81f..0de015b45666 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,2 @@
-DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
deleted file mode 100644
index d7fdaebdb664..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev
-Date: Fri, 23 Aug 2019 15:09:25 +0200
-Subject: Fix compilation with system ICU
-
-ICU upstream now requires that ICU4C API macros are used with a
-trailing semicolon.
-
-- https://unicode-org.atlassian.net/browse/ICU-20601
-- https://github.com/unicode-org/icu/pull/759
-
-Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
-Fixes: QTBUG-78911
-Reviewed-by: Jimi Huotari
-Reviewed-by: Allan Sandfeld Jensen
----
- .../blink/renderer/core/dom/document.cc | 2 +-
- chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++-------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
-index 920dab7c48d..43fd422393c 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
-
- for (unsigned i = 0; i < length;) {
- UChar32 c;
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (c == ':') {
- if (saw_colon)
- return ParseQualifiedNameResult(kQNMultipleColons);
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
deleted file mode 100644
index 7e5b3e377e4d..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm"
-fi
-
-IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtpositioning-${PV}
- ~dev-qt/qtprintsupport-${PV}
- ~dev-qt/qtwebchannel-${PV}[qml]
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
- media-libs/libwebp:=
- media-libs/mesa[egl,X(+)]
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${PV} )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-60.2:= )
- widgets? (
- ~dev-qt/qtdeclarative-${PV}[widgets]
- ~dev-qt/qtwidgets-${PV}
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=app-arch/gzip-1.7
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- sys-devel/bison
-"
-
-PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" )
-
-src_prepare() {
- if ! use jumbo-build; then
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/core/config/common.pri || die
- fi
-
- # bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
-
- qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -opus
- -printing-and-pdf
- -webp
- $(usex alsa '-alsa' '')
- $(usex bindist '' '-proprietary-codecs')
- $(usex pulseaudio '-pulseaudio' '')
- $(usex system-ffmpeg '-ffmpeg' '')
- $(usex system-icu '-webengine-icu' '')
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 601472
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
- fi
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index cb83586546fb..87fc5188a549 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
index 7a0a34f9e5bd..92a68b49adb7 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
@@ -57,4 +57,7 @@ all_ruby_prepare() {
-e '1i gem "actionview", "~> 5.2.0"' \
-e '1i gem "railties", "~> 5.2.0"' \
-i test/abstract_unit.rb || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
}
diff --git a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
index f22c41d0d073..4de989d426cc 100644
--- a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
@@ -52,4 +52,7 @@ all_ruby_prepare() {
-e '/:job/,/end/ s:^:#:' \
-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
rm ../Gemfile.lock || die
+
+ # Use different timezone notation, this changed at some point due to an external dependency changing.
+ sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
}
diff --git a/dev-ruby/actionview/actionview-5.2.4.2.ebuild b/dev-ruby/actionview/actionview-5.2.4.2.ebuild
index 76df6e724c6e..87622071e472 100644
--- a/dev-ruby/actionview/actionview-5.2.4.2.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.4.2.ebuild
@@ -49,12 +49,13 @@ all_ruby_prepare() {
-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
rm ../Gemfile.lock || die
- # Avoid tests failing due to missing logger setup in activerecord,
- # most likely related to test environment setup.
- rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
- sed -e '1igem "actionpack", "~> 5.2.0"' \
- -e '1igem "activemodel", "~> 5.2.0"' \
- -e '1igem "railties", "~> 5.2.0"' \
+ # Avoid activerecord integration tests because they are very sensitive to the specifics
+ # of the environment.
+ sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
+
+ sed -e '2igem "actionpack", "~> 5.2.0"' \
+ -e '2igem "activemodel", "~> 5.2.0"' \
+ -e '2igem "railties", "~> 5.2.0"' \
+ -e '/active_record/ s:^:#:' \
-i test/abstract_unit.rb || die
}
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 790a5263e9e4..13402c80a4c0 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -1,2 +1,3 @@
DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
DIST net-scp-2.0.0.tar.gz 27835 BLAKE2B 2f5c9504ade26226a31fd766869f4deef3b344e99e71f780f184361efc75cad880c0dd266779d7f2550f176a86e89740edf27943c9ed81691378e5c3bf3241f0 SHA512 cd3470dfb2afba91911c429828d158e97e4feb17e211807abb05ab251622dc066e392521de250a8f2d4cf9d53c79598d636ef70c559b6aca7e1e7aa59ea3b36e
+DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
new file mode 100644
index 000000000000..78ae6a9954b5
--- /dev/null
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="net-scp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
+HOMEPAGE="https://github.com/net-ssh/net-scp"
+SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+ doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 ) )
+ test? (
+ || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )
+ dev-ruby/mocha
+ )"
+
+ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )"
+
+all_ruby_prepare() {
+ sed -e "s:_relative ': './:" \
+ -e 's/git ls-files -z/find -print0/' \
+ -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib:test test/test_all.rb || die
+}
diff --git a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild b/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
index bc00e0c81446..9428dfa1bafe 100644
--- a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
+++ b/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="Readme.md"
diff --git a/dev-ruby/rack/rack-2.1.1-r1.ebuild b/dev-ruby/rack/rack-2.1.1-r1.ebuild
index 7b0ca9fd237b..003840877047 100644
--- a/dev-ruby/rack/rack-2.1.1-r1.ebuild
+++ b/dev-ruby/rack/rack-2.1.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.1.1.ebuild
index b17b475e82ca..66993f1521dc 100644
--- a/dev-ruby/rack/rack-2.1.1.ebuild
+++ b/dev-ruby/rack/rack-2.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.2.2.ebuild b/dev-ruby/rack/rack-2.2.2.ebuild
index bf0c5fb5f528..a15d55cc826d 100644
--- a/dev-ruby/rack/rack-2.2.2.ebuild
+++ b/dev-ruby/rack/rack-2.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/tilt/tilt-2.0.10.ebuild b/dev-ruby/tilt/tilt-2.0.10.ebuild
index 56fd1402cb8c..eebbc946617e 100644
--- a/dev-ruby/tilt/tilt-2.0.10.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Block on some of the potential test dependencies. These dependencies
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 308e366fe141..dbf1fc8c1cce 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch b/dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch
deleted file mode 100644
index b0e4a9548755..000000000000
--- a/dev-util/bitcoin-tx/files/0.17.1-no-libevent.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1101,7 +1101,7 @@ if test x$use_pkgconfig = xyes; then
- if test x$use_qr != xno; then
- BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
- fi
-- if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests != xnonononono; then
-+ if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
- PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
- if test x$TARGET_OS != xwindows; then
- PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
-@@ -1126,7 +1126,7 @@ else
- AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
- AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing))
-
-- if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests != xnonononono; then
-+ if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
- AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
- AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
- if test x$TARGET_OS != xwindows; then
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 53a203e919ac..c2c875d3605c 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,2 +1,3 @@
DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14
DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563 SHA512 044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e
+DIST intel-graphics-compiler-1.0.3826.tar.gz 6007014 BLAKE2B fc09d6443818403bca803f3f78fbb9ee9a25ab674372585b880e038227712f8114ca2b17d6b219149f54f9f5856b973d3500f6537027660d1c657d61992f9e9b SHA512 e4f06d6b8d2a7161f80956a8e9cbf23aa7293a31781405bc17ee512d27ca4114facc6bb0fa7f47fde3a37aa79ce288a98aef8b74c4e572e73d70bb50c21f6fbb
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild
new file mode 100644
index 000000000000..ecb03772f069
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+LLVM_MAX_SLOT=9
+
+COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+ <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+)
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+multilib_src_configure() {
+ # Select the same slot as the best opencl-clang
+ local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+ einfo "Selecting $ocl_clang_ver"
+ local llvm_slot=$(ver_cut 5 $ocl_clang_ver)
+ # opencl-clang brings the right slot as dep
+ has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
+ einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
+
+ # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
+ # IGC uses this definition causes problems for some users (see Bug #718824).
+ use debug || append-cppflags -DNDEBUG
+
+ local mycmakeargs=(
+ -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
+ -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+ -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
+ )
+ cmake_src_configure
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 4dfb4a26f6b6..fab95ba0c3e9 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
+DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe
diff --git a/dev-util/meson/meson-0.54.1.ebuild b/dev-util/meson/meson-0.54.1.ebuild
new file mode 100644
index 000000000000..e10747faf81e
--- /dev/null
+++ b/dev-util/meson/meson-0.54.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-util/ninja
+ dev-vcs/git
+ sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
+ )
+"
+
+python_prepare_all() {
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+ # ASAN is unsupported on some targets
+ # https://bugs.gentoo.org/692822
+ sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
+ # Broken due to python2 script created by python_wrapper_setup
+ rm -r "test cases/frameworks/1 boost" || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_test() {
+ tc-export PKG_CONFIG
+ if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+ ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+ else
+ # https://bugs.gentoo.org/687792
+ unset PKG_CONFIG
+ distutils-r1_src_test
+ fi
+}
+
+python_test() {
+ (
+ # test_meson_installed
+ unset PYTHONDONTWRITEBYTECODE
+
+ # test_cross_file_system_paths
+ unset XDG_DATA_HOME
+
+ ${EPYTHON} -u run_tests.py
+ ) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles
+ doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+ insinto /usr/share/zsh/site-functions
+ doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 6352e5adbcad..be6c43320b3e 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,3 +1,4 @@
+DIST spirv-llvm-translator-10.0.0.tar.gz 535828 BLAKE2B 0bce2f663b2f70a2db2b1ef0665d627716d63baa6cb47ced532ac2e30e8b0424934d273135581655445ea87f5c84c9df876da0490d7a302a6d00c86b78e05c22 SHA512 d6400bb3e4df780358b5d6d0af889e7654b7dfd472c8d41b77ff98e7ff1bd017c289ecacb59a3dd7bfddb1a5108e21028aa770bf645e06178610bb322de905be
DIST spirv-llvm-translator-8.0.1.2.tar.gz 461803 BLAKE2B 58814d88bfa555f0deab8d072ecd0b54c1ee22c4f6464a9988d18dad2c99d25a5ed49e506644d01455fb92f476536148e0e0cce2eaca22b4b1c88220724f8d40 SHA512 954d4600f680d3325d4f7ea80551f814f2cee486254227609fc0354c1b112d4dea387736d601750587369a7c4f1c2a528a19f8a969df433649731efdd5ba4c23
DIST spirv-llvm-translator-8.0.1.3.tar.gz 472853 BLAKE2B 3f00aabd46dd43840b8a16f6a9a061e00385bae6d4e608ad1d2e59f943bfca747e1ce6b2f48eee7e124bc3ac47f5895274d9cf7bb587eba7133152b9658f5e9e SHA512 c10a426d83276718b116d664fd32c8457d87e336e7c99b64d323ea9a08330d206dc94e52ce8e7395bcb8ee2ddff49184b5c7810e4848d624396d0574ce48256d
DIST spirv-llvm-translator-9.0.0.1.tar.gz 491089 BLAKE2B ebdab77316608c4a4a48e778abc749ac347d0ee4441c8cb152b303e99cf5c16bd4f883dad519f5d4a96b6d05975a56e8d2fa5b6fa403dedc163cc3611b905d13 SHA512 ad0e9a49440f8dc0a9c973c74245640c8392c8ae85431eb5e0ca6ea98e603cb6fcbfcaa8fa3d455df2f53537c7f61915a557f12744c39a9c9f9e1c400ddd74ad
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
new file mode 100644
index 000000000000..787306f0e0b5
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="10"
+KEYWORDS="~amd64"
+IUSE="test tools"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/clang:10=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+BDEPEND="test? ( dev-python/lit )"
+
+REQUIRED_USE="test? ( tools )"
+
+LLVM_MAX_SLOT=10
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+ append-flags -fPIC
+ cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
+ $(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+ )
+ cmake_src_configure
+}
+
+multilib_src_test() {
+ # Some tests fail on amd64 when ABI==x86
+ if multilib_is_native_abi; then
+ lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+ fi
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5803b34a889d..2f5e6d2c3f49 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/git-2.23.3.ebuild b/dev-vcs/git/git-2.23.3.ebuild
index a34dbe298d99..eb01978045fa 100644
--- a/dev-vcs/git/git-2.23.3.ebuild
+++ b/dev-vcs/git/git-2.23.3.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.24.3.ebuild b/dev-vcs/git/git-2.24.3.ebuild
index b4cba1683a7a..b14f087bb86b 100644
--- a/dev-vcs/git/git-2.24.3.ebuild
+++ b/dev-vcs/git/git-2.24.3.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.25.4.ebuild b/dev-vcs/git/git-2.25.4.ebuild
index b4cba1683a7a..b14f087bb86b 100644
--- a/dev-vcs/git/git-2.25.4.ebuild
+++ b/dev-vcs/git/git-2.25.4.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.26.2.ebuild b/dev-vcs/git/git-2.26.2.ebuild
index b4cba1683a7a..b14f087bb86b 100644
--- a/dev-vcs/git/git-2.26.2.ebuild
+++ b/dev-vcs/git/git-2.26.2.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 809d5b660b6e..6d40afb7782a 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass
index b8d9bb57c0db..42e6fb030cd3 100644
--- a/eclass/mozconfig-v6.52.eclass
+++ b/eclass/mozconfig-v6.52.eclass
@@ -118,7 +118,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
>=dev-libs/glib-2.26:2
>=sys-libs/zlib-1.2.3
>=virtual/libffi-3.0.10
- virtual/ffmpeg
+ media-video/ffmpeg
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXdamage
diff --git a/eclass/rebar.eclass b/eclass/rebar.eclass
index f2a620fd8979..92dd16b08fbf 100644
--- a/eclass/rebar.eclass
+++ b/eclass/rebar.eclass
@@ -32,7 +32,7 @@ esac
EXPORT_FUNCTIONS src_prepare src_compile src_test src_install
-RDEPEND="dev-lang/erlang"
+RDEPEND="dev-lang/erlang:="
DEPEND="${RDEPEND}
dev-util/rebar
>=sys-apps/gawk-4.1"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 523288d0aa18..9bdef8ba5bca 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild b/games-arcade/performous/performous-1.1-r2.ebuild
similarity index 97%
rename from games-arcade/performous/performous-1.1-r1.ebuild
rename to games-arcade/performous/performous-1.1-r2.ebuild
index 7901eeb37e89..5e1eeb5741dd 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -41,7 +41,7 @@ RDEPEND="
media-libs/libsdl2[joystick,video]
media-libs/portaudio
sys-libs/zlib
- virtual/ffmpeg
+ media-video/ffmpeg
virtual/glu
virtual/jpeg:0
virtual/libintl
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 7361b1ea6e7a..0138e86f6212 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild b/games-engines/renpy/renpy-6.99.12.4-r4.ebuild
similarity index 97%
rename from games-engines/renpy/renpy-6.99.12.4-r3.ebuild
rename to games-engines/renpy/renpy-6.99.12.4-r4.ebuild
index c330a8ab54ba..f0c471b474a3 100644
--- a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
+++ b/games-engines/renpy/renpy-6.99.12.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
media-libs/libsdl2[video]
media-libs/freetype:2
sys-libs/zlib
- virtual/ffmpeg"
+ media-video/ffmpeg"
DEPEND="${RDEPEND}
dev-python/cython[${PYTHON_USEDEP}]
virtual/pkgconfig"
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index f840d8569d87..d49bf4772f7c 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/doge/Manifest b/games-misc/doge/Manifest
index 77d8d1535e15..a2f206631f31 100644
--- a/games-misc/doge/Manifest
+++ b/games-misc/doge/Manifest
@@ -1 +1 @@
-DIST doge-3.5.0.tar.gz 16145 BLAKE2B dea9ca7009580a795644413eccc5b0a823b802655bb62464110f8060d35099e91a2b302b62fcfd93cfe0d547031800c9ba1f68aae2dd4933b20bfbb65869de12 SHA512 8e8f27077261626b27d0ce36c827b399345f2e96f157bfdf1b5437c75cf40b285533631ce5ec847b4b99bf87037faf85fb4aa4ab93604f54fbdfba03aa8e5609
+DIST doge-3.6.0.tar.gz 19530 BLAKE2B 016b5d90aa6c1a29ded035de2d17db4ff6470235969ade60d85c4b1d91baba14d635025308dbb072acd3a37da990a5713a281f70774226c5dca7fcad95e3d90d SHA512 6c03b32c03f2503476fdc979053a586bc62cc8f82eba4c4f4bf6d7fc4d37526b0d9fe4c0f5cd709ef983b7e3e3885e60f765bc4aafb58243ff24d92851d6a39f
diff --git a/games-misc/doge/doge-3.5.0.ebuild b/games-misc/doge/doge-3.6.0.ebuild
similarity index 61%
rename from games-misc/doge/doge-3.5.0.ebuild
rename to games-misc/doge/doge-3.6.0.ebuild
index 98fd5ce1c715..4a1d71bdb524 100644
--- a/games-misc/doge/doge-3.5.0.ebuild
+++ b/games-misc/doge/doge-3.6.0.ebuild
@@ -1,22 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="wow very terminal doge"
HOMEPAGE="https://github.com/thiderman/doge https://pypi.org/project/doge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/thiderman/doge/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}
- sys-process/procps
-"
+RDEPEND="sys-process/procps"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index bb72fa6a83b7..e850140ea89d 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
index b904224542e6..95f4eb1d7eb5 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2"
LICENSE="GPL-2 Apache-2.0 FDL-1.3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libav server"
+IUSE="server"
QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
@@ -35,10 +35,8 @@ DEPEND="
media-libs/sdl2-net:=
media-libs/sdl2-ttf:=
sys-libs/zlib
- !x86? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:= )
- )"
+ !x86? ( media-video/ffmpeg:= )
+ "
RDEPEND="${DEPEND}
app-arch/xz-utils
>=media-fonts/dejavu-2.28
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index efc1110b7775..626d1f7af48a 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
index 34f1de4e8784..9eeabf9010d2 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.34.5.ebuild
@@ -53,7 +53,7 @@ DEPEND="
>=media-video/cheese-3.28.0 )
ibus? ( >=app-i18n/ibus-1.5.2 )
networkmanager? (
- >=gnome-extra/nm-applet-1.8.0
+ >=net-libs/libnma-1.8.0
>=net-misc/networkmanager-1.12.0:=[modemmanager]
>=net-misc/modemmanager-0.7.990 )
bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
diff --git a/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
index 59adcea12b4a..74ebb96f0478 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
@@ -39,6 +39,7 @@ DEPEND="
media-libs/gst-plugins-base:1.0
networkmanager? (
>=net-misc/networkmanager-1.10.4:=[introspection]
+ net-libs/libnma[introspection]
>=app-crypt/libsecret-0.18
dev-libs/dbus-glib )
systemd? ( >=sys-apps/systemd-31
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index b0ce74127a90..bd412199101a 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
index 742c547f8567..1c561835f4ff 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 8aeb686d694b..6d3736839135 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,4 +1,4 @@
DIST gnome-shell-extension-dash-to-panel-26.tar.gz 21100594 BLAKE2B da90d4f496e10c14c554edb74065c95bf211f6778c097e3b81d863a46d0d3477f281cebac72f334b461f28b998284a861363b27d6c17ef5b1d47947a1f44bf01 SHA512 45bc148d2419db5943d0c2170ea3739a36c5a928c39d070501c5dfbec3910ba08058af1926c42f75d6b3e5918d8c30aef4f38db0af14115c11027520fa582a2f
-DIST gnome-shell-extension-dash-to-panel-34.tar.gz 21115843 BLAKE2B b1bb021b324fb69d65341aa83c528ef4029a282ea951361bc81860b8941a804b48b3713d095d5f160f8673e6de93855d2d34b63c7a04102f1d8995333cdbcbca SHA512 05acc8607175b99dd501e07624b242994ecdcc8d722081a37d254852de5b23de45ee9846d27ce9440c9a3c5ae4b279e6816c2c8a6fcc048fc5b01c9b72b005f2
DIST gnome-shell-extension-dash-to-panel-35.tar.gz 21115881 BLAKE2B b04e363a0ddfbcc3c9343fb756999d756ced1e2ee24718836acf22e7c8de25d58513caa865b45b0a5b92f5220bf79c120d13763a852933dec3330a66bec90587 SHA512 6d1ed6fac48953d9b15265b969e50e65892ba36cb420794960b789e215f8f69c6f3797065aebb5890aa5e2c23f3e34ec796b76c7972fd2f8cb9a02a422be10a4
+DIST gnome-shell-extension-dash-to-panel-36.tar.gz 21116208 BLAKE2B bb4096cb3f53d62f95096a815b210cf5529895eef322f0927f249a55cd836618701fd30674294d45ff9a66d4b23f79f1f3d0a5486a6a1b93480b0a91a565f25c SHA512 3a883af025ed2d96fe6eeb92ce55b5e9bf9254bb849acc605028bb97c7707189a0445c52fc50aac01745d5b7172c737ac252f3d8a90c9ef002e308f61c770946
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-34.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-36.ebuild
similarity index 100%
rename from gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-34.ebuild
rename to gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-36.ebuild
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 7bbb6fe7064c..0c7d192a9785 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -7,7 +7,6 @@
-
- robbat2@gentoo.org
- LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.
-
OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that
increasing numbers of people on the Internet are coming to rely on. Many users of telnet,
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
index b82c8ca45012..74777d29cf6d 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
@@ -37,13 +37,14 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
|| (
|| (
media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
- ( media-video/libav[encode,faac,mp3,opus,vorbis] )
- ( media-libs/faac
+ (
+ media-libs/faac
media-libs/flac
media-sound/lame
media-sound/opus-tools
media-sound/sox
- media-sound/vorbis-tools )
+ media-sound/vorbis-tools
+ )
)"
DEPEND="${RDEPEND}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 09bcb5e33204..e40690d4ccb3 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -44,14 +44,16 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
|| (
|| (
media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
- media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
- ( media-video/libav[encode,faac,mp3,opus,vorbis] )
- ( media-libs/faac
+ media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
+ )
+ (
+ media-libs/faac
media-libs/flac
media-sound/lame
media-sound/opus-tools
media-sound/sox
- media-sound/vorbis-tools )
+ media-sound/vorbis-tools
+ )
)"
DEPEND="${RDEPEND}
diff --git a/net-misc/streamlink/streamlink-1.3.0-r1.ebuild b/net-misc/streamlink/streamlink-1.3.0-r2.ebuild
similarity index 99%
rename from net-misc/streamlink/streamlink-1.3.0-r1.ebuild
rename to net-misc/streamlink/streamlink-1.3.0-r2.ebuild
index c55072c84f21..6f6674f9723b 100644
--- a/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.0-r2.ebuild
@@ -41,7 +41,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
media-video/rtmpdump
- virtual/ffmpeg
+ media-video/ffmpeg
"
BDEPEND="
$(python_gen_cond_dep '
diff --git a/net-misc/streamlink/streamlink-1.3.1.ebuild b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
similarity index 99%
rename from net-misc/streamlink/streamlink-1.3.1.ebuild
rename to net-misc/streamlink/streamlink-1.3.1-r1.ebuild
index c55072c84f21..6f6674f9723b 100644
--- a/net-misc/streamlink/streamlink-1.3.1.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
@@ -41,7 +41,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
media-video/rtmpdump
- virtual/ffmpeg
+ media-video/ffmpeg
"
BDEPEND="
$(python_gen_cond_dep '
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index c55072c84f21..6f6674f9723b 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
media-video/rtmpdump
- virtual/ffmpeg
+ media-video/ffmpeg
"
BDEPEND="
$(python_gen_cond_dep '
diff --git a/net-misc/you-get/you-get-0.4.1270.ebuild b/net-misc/you-get/you-get-0.4.1270-r1.ebuild
similarity index 95%
rename from net-misc/you-get/you-get-0.4.1270.ebuild
rename to net-misc/you-get/you-get-0.4.1270-r1.ebuild
index de8bde115f56..c8fd8bc47327 100644
--- a/net-misc/you-get/you-get-0.4.1270.ebuild
+++ b/net-misc/you-get/you-get-0.4.1270-r1.ebuild
@@ -18,5 +18,5 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- virtual/ffmpeg
+ media-video/ffmpeg
"
diff --git a/net-misc/you-get/you-get-0.4.1355.ebuild b/net-misc/you-get/you-get-0.4.1355-r1.ebuild
similarity index 95%
rename from net-misc/you-get/you-get-0.4.1355.ebuild
rename to net-misc/you-get/you-get-0.4.1355-r1.ebuild
index 4dbfac016357..1e79ca147fa3 100644
--- a/net-misc/you-get/you-get-0.4.1355.ebuild
+++ b/net-misc/you-get/you-get-0.4.1355-r1.ebuild
@@ -18,5 +18,5 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- virtual/ffmpeg
+ media-video/ffmpeg
"
diff --git a/net-misc/you-get/you-get-0.4.536.ebuild b/net-misc/you-get/you-get-0.4.536-r1.ebuild
similarity index 95%
rename from net-misc/you-get/you-get-0.4.536.ebuild
rename to net-misc/you-get/you-get-0.4.536-r1.ebuild
index 0e14fc8fd496..6a6f50f9d60b 100644
--- a/net-misc/you-get/you-get-0.4.536.ebuild
+++ b/net-misc/you-get/you-get-0.4.536-r1.ebuild
@@ -18,5 +18,5 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="
${PYTHON_DEPS}
- virtual/ffmpeg
+ media-video/ffmpeg
"
diff --git a/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild
index 1f7d1a6c1729..9dc88dfb1591 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild
@@ -58,11 +58,10 @@ pkg_postinst() {
elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
elog
elog "${PN} works fine on its own on most sites. However, if you want"
- elog "to convert video/audio, you'll need avconf (media-video/libav) or"
- elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
- elog "videos can be retrieved in a higher quality format without sound."
- elog "${PN} will detect whether avconv/ffmpeg is present and"
- elog "automatically pick the best option."
+ elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+ elog "On some sites - most notably YouTube - videos can be retrieved in"
+ elog "a higher quality format without sound. ${PN} will detect whether"
+ elog "ffmpeg is present and automatically pick the best option."
elog
elog "Videos or video formats streamed via RTMP protocol can only be"
elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index e469e49163c2..a2a765dd04cb 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -58,11 +58,10 @@ pkg_postinst() {
elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
elog
elog "${PN} works fine on its own on most sites. However, if you want"
- elog "to convert video/audio, you'll need avconf (media-video/libav) or"
- elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
- elog "videos can be retrieved in a higher quality format without sound."
- elog "${PN} will detect whether avconv/ffmpeg is present and"
- elog "automatically pick the best option."
+ elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+ elog "On some sites - most notably YouTube - videos can be retrieved in"
+ elog "a higher quality format without sound. ${PN} will detect whether"
+ elog "ffmpeg is present and automatically pick the best option."
elog
elog "Videos or video formats streamed via RTMP protocol can only be"
elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 2ce3f2aa6ee5..072c96d1c5f6 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch b/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
deleted file mode 100644
index 8a6737f88471..000000000000
--- a/net-p2p/bitcoind/files/0.18.0-daemon-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/support/lockedpool.cpp
-+++ b/src/support/lockedpool.cpp
-@@ -250,9 +250,6 @@ void *PosixLockedPageAllocator::AllocateLocked(size_t len, bool *lockingSuccess)
- addr = mmap(nullptr, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
- if (addr) {
- *lockingSuccess = mlock(addr, len) == 0;
--#ifdef MADV_DONTFORK
-- madvise(addr, len, MADV_DONTFORK);
--#endif
- #ifdef MADV_DONTDUMP
- madvise(addr, len, MADV_DONTDUMP);
- #endif
diff --git a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch b/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
deleted file mode 100644
index 8148d565967e..000000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.18.0-raii_event_tests-always.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://github.com/bitcoin/bitcoin/pull/16564
-
-From 272855746b18de76f51e84945d675904e9b907af Mon Sep 17 00:00:00 2001
-From: Craig Andrews
-Date: Wed, 7 Aug 2019 11:38:11 -0400
-Subject: [PATCH] Always define the raii_event_tests test suite
-
-The test suite must always be defined (even when EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED is not defined) so that the test harness doesn't fail due to not being able to find the raii_event_tests test.
-
-This improves upon 95f97f4 actually fixing https://github.com/bitcoin/bitcoin/issues/9493
----
- src/test/raii_event_tests.cpp | 24 +++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp
-index bdb411d53f57..6691de882930 100644
---- a/src/test/raii_event_tests.cpp
-+++ b/src/test/raii_event_tests.cpp
-@@ -4,20 +4,28 @@
-
- #include
-
-+#include
-+
-+#include
-+
-+BOOST_FIXTURE_TEST_SUITE(raii_event_tests, BasicTestingSetup)
-+
-+#ifndef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+BOOST_AUTO_TEST_CASE(raii_event_creation)
-+{
-+ // dummy; do nothing
-+}
-+#endif // EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
-+
- #ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
--// It would probably be ideal to define dummy test(s) that report skipped, but boost::test doesn't seem to make that practical (at least not in versions available with common distros)
-
- #include
-
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
deleted file mode 100644
index 9946b63c9bba..000000000000
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="NetworkManager"
-MY_P="${P/networkmanager/${MY_PN}}"
-
-DESCRIPTION="NetworkManager StrongSwan plugin"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+glib"
-
-RDEPEND="
- app-crypt/libsecret
- gnome-extra/nm-applet
- net-misc/networkmanager
- net-vpn/strongswan[networkmanager]
- x11-libs/gtk+:3
- glib? ( gnome-extra/nm-applet[gtk]
- (2015-02-10)
-# Missing keywords for media-libs/x265
-media-video/libav x265
-
# Johannes Huber (2015-01-28)
# Missing keyword on dev-libs/botan
app-crypt/qca botan
@@ -345,10 +341,6 @@ media-libs/phonon gstreamer vlc
# remove mask when dev-java/fop is keyworded here
gnome-extra/libgda reports
-# Luca Barbato (2012-11-11)
-# Libav 9 can use fdk-aac
->=media-video/libav-9_beta2 fdk
-
# Robin H Johnson (2012-11-01)
# MySQL 5.5 wants systemtap, tcmalloc & jemalloc
>=dev-db/mysql-5.5 tcmalloc
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index d07c5d1aec84..844b2b43071f 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
#--- END OF EXAMPLES ---
+# Georgy Yakovlev (2020-03-16)
# media-libs/cudnn is keyworded on amd64
sci-physics/root -cudnn
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 73b9af37562d..a2399f7f3f50 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -56,10 +56,6 @@ media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfe
# unmask sssd for sudo
app-admin/sudo -sssd
-# Mikle Kolyada (2018-09-15)
-# the dependency is unstable
-media-video/libav nvidia
-
# Thomas Deutschmann (2018-06-01)
net-analyzer/wireshark -doc
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index b1a50e75446f..4f1fcd7aec11 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -72,7 +72,6 @@ media-sound/mpd fluidsynth
# Alexis Ballier (2017-05-29)
# frei0r-plugins is not stable yet, mask it on stable versions
- (2017-04-01)
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 97105c1da2ff..0a8772400199 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Georgy Yakovlev (2020-04-20)
# Not keyworded on arm64
net-misc/whois xcrypt
@@ -119,11 +123,9 @@ media-libs/mlt -sdl
media-libs/openal -sdl
media-sound/mpg123 -sdl
media-video/ffmpeg -sdl
-media-video/libav -sdl
media-video/mplayer -sdl
media-video/mpv -sdl
media-video/transcode -sdl
-virtual/ffmpeg -sdl
>=x11-libs/wxGTK-3 -sdl
# Roy Bamford (2019-02-24)
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index cd78a95a0758..281b7ebbb183 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Georgy Yakovlev (2020-04-26)
+# static-pie is not implemented on all arches, #719444
+# https://sourceware.org/glibc/wiki/PortStatus
+sys-libs/glibc static-pie
+
# Mart Raudsepp (2020-03-01)
# dev-util/sysprof not keyworded on most arches yet
x11-wm/mutter sysprof
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index f1a3c8be7934..184c14e541c9 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -80,7 +80,6 @@ media-gfx/imagemagick raw
# media-video/faac is not stable.
# media-libs/{libdc1394,x264} is not stable.
# media-libs/game-music-emu is not stable.
-media-video/libav faac ieee1394 x264
media-video/ffmpeg gme ieee1394 x264
# Andreas Sturmlechner (2018-05-06)
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 2600522fbbc5..448e386051dc 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -17,10 +17,6 @@ wayland
curl_ssl_libressl
libressl
-# Rolf Eike Beer (2020-04-11)
-# No stable media-video/libav on hppa
-libav
-
# Rolf Eike Beer (2020-04-11)
# No stable media-libs/libsdl or media-libs/libsdl2 on hppa
sdl
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 70394850894d..9419ae29bb7e 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -346,11 +346,6 @@ dev-haskell/dataenc test
# depends on mono/monodevelop
>=net-irc/hexchat-2.9.4-r1 theme-manager
-# Agostino Sarubbo (2013-02-09)
-# Mask media-video/libav[hardcoded-tables] bug #453328
-# I don't use use.mask because it works on ffmpeg
-media-video/libav hardcoded-tables
-
# Alexandre Rostovtsev (2013-01-31)
# remove mask when net-libs/libqmi is keyworded here
net-misc/modemmanager qmi
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index e080f326a67e..8baff9448146 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,10 +1,6 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Georgy Yakovlev (2020-04-25)
-# static-pie is not fully implemented on ppc/ppc64, bug #719444
-sys-libs/glibc static-pie
-
# Lars Wendler (2020-04-20)
# Not keyworded on ppc
net-misc/whois xcrypt
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index a99ff6b6af0a..5eed363d11a2 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Rolf Eike Beer (2020-04-26)
+# tests optionally depend on dev-ruby/coffee-script needing nodejs
+dev-ruby/tilt test
+
# James Le Cuirot (2020-04-23)
# Requires media-libs/mesa[llvm], which is masked.
dev-python/pyopengl test
@@ -311,10 +315,6 @@ dev-libs/libpeas lua
# Missing ffmpeg deps, bug #510340
media-video/ffmpeg x265
-# Patrick Lauer (2015-02-10)
-# Missing keywords for media-libs/x265
-media-video/libav x265
-
# Pacho Ramos (2014-01-10)
# Missing keywords
net-misc/networkmanager teamd
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 16288fe226f7..b9f6b333ae78 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Georgy Yakovlev (2020-03-11)
# Encrypted Media Extensions (eme-free) can be disabled on x86
www-client/firefox -eme-free
@@ -151,10 +155,6 @@ x11-wm/awesome doc
# nvidia drivers are unmasked here
media-video/ffmpeg -nvenc
-# Luca Barbato (2017-01-22)
-# cuda is not available on x86 nvidia-video-codec depends on it
-media-video/libav nvidia
-
# Andreas Sturmlechner (2016-12-31)
# on behalf of Andreas K. Hüttel (2016-12-14)
# Fails to build with newly unmasked ffmpeg-3, so mask this useflag
diff --git a/profiles/features/hardened/amd64/package.use b/profiles/features/hardened/amd64/package.use
index 944deb8d886c..65830f06ea81 100644
--- a/profiles/features/hardened/amd64/package.use
+++ b/profiles/features/hardened/amd64/package.use
@@ -6,7 +6,6 @@
# Bugs 358929, 490276, 513464, 523736 and 512208.
media-libs/x264 pic
media-video/ffmpeg pic
-media-video/libav pic
media-libs/mesa pic
media-libs/libpostproc pic
media-libs/xvid pic
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/use.force b/profiles/features/prefix/standalone/kernel-2.6.32+/use.force
new file mode 100644
index 000000000000..45cddcc00fa1
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/use.force
@@ -0,0 +1 @@
+old-kernel
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 499da317742f..979bbdccba0c 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -120,7 +120,4 @@ dev-python/pytest-cov
# Zac Medico (2019-12-06)
# These golang libraries should be vendored either by upstream or via
# the EGO_VENDOR variable.
-dev-go/go-crypto
-dev-go/go-net
-dev-go/go-sys
dev-go/go-sqlite3
diff --git a/profiles/package.mask b/profiles/package.mask
index 9550c76bc638..26db9f8d25f2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,84 @@
#--- END OF EXAMPLES ---
+# Michał Górny (2020-04-27)
+# Unmaintained. Unresolved breakage with py3.8 for almost a year.
+# Python upstream included some async testing support in py3.8 too.
+# No revdeps.
+# Removal in 30 days. Bug #719746.
+dev-python/asynctest
+
+# Zac Medico (2020-04-26)
+# Stuck on py3.6. No revdeps.
+# Removal in 30 days. Bug #719540.
+dev-python/riak-python-client
+
+# Zac Medico (2020-04-26)
+# Stuck on py3.6. No revdeps.
+# Removal in 30 days. Bug #718904.
+dev-python/flower
+
+# Sam James (2020-04-24)
+# Out of date with security bugs.
+# Please use www-client/seamonkey instead.
+# Removal in 30 days. Bug #718738.
+www-client/seamonkey-bin
+
+# Zac Medico (2020-04-26)
+# Mask obsolete and vulnerable dev-go/go-crypto, along with obsolete
+# reverse dependencies. Removal in 30 days. Bug #710142.
+dev-go/go-crypto
+dev-go/go-net
+dev-go/go-sys
+=dev-embedded/arduino-builder-1.4.1
+
+# Michał Górny (2020-04-26)
+# Unmaintained. Stuck on py3.6. Missing tests (but having an unused
+# test flag!). The only revdep is app-admin/ara that is masked
+# for removal already.
+# Removal in 30 days. Bug #719660.
+dev-python/xstatic
+dev-python/xstatic-bootstrap-scss
+dev-python/xstatic-datatables
+dev-python/xstatic-jquery
+dev-python/xstatic-patternfly
+dev-python/xstatic-patternfly-bootstrap-treeview
+
+# Michał Górny (2020-04-26)
+# Stuck on py3.6. Failing tests. No revdeps.
+# Removal in 30 days. Bug #639520.
+dev-python/versiontools
+
+# Michał Górny (2020-04-26)
+# Stuck on py3.6. Missing tests. No revdeps.
+# Removal in 30 days. Bug #719616.
+dev-python/utmp
+
+# Michał Górny (2020-04-26)
+# Unmaintained. Stuck on Python 3.6. No revdeps.
+# Removal in 30 days. Bug #719604.
+dev-python/txtorcon
+
+# Michał Górny (2020-04-26)
+# Stuck on Python 3.6. Missing tests. No revdeps.
+# Removal in 30 days. Bug #719568.
+dev-python/sphinxcontrib-googleanalytics
+
+# Michał Górny (2020-04-26)
+# Unmaintained. Stuck on py3.6. Missing tests. No revdeps.
+# Removal in 30 days. Bug #719548.
+dev-python/sdnotify
+
+# Michał Górny (2020-04-26)
+# Unmaintained. Stuck on py3.6. Missing tests. No revdeps.
+# Removal in 30 days. Bug #719546.
+dev-python/scoop
+
+# Michał Górny (2020-04-26)
+# Unmaintained. Stuck on Python 3.6. No tests. No revdeps.
+# Removal in 30 days. Bug #719504.
+dev-python/pythonmagick
+
# Michał Górny (2020-04-26)
# Unmaintained. djvusmooth is stuck on py2, python-djvulibre on py3.6.
# Unresolved test failures. No other revdeps.
@@ -54,6 +132,7 @@ dev-python/pyodbc
# Causes multilib glib failure.
# https://bugs.gentoo.org/719382
=dev-util/meson-0.54.0
+=dev-util/meson-0.54.1
# Michał Górny (2020-04-25)
# Unmaintained. Stuck on Python 3.6. Missing tests. The only revdep
@@ -137,6 +216,11 @@ dev-python/rackspace-novaclient
dev-python/nose-testconfig
dev-python/positional
dev-python/posix_ipc
+dev-python/repoze-who
+dev-python/tablib
+dev-python/rackspace-auth-openstack
+dev-python/rax-default-network-flags-python-novaclient-ext
+dev-python/rax-scheduled-images-python-novaclient-ext
# Michał Górny (2020-04-23)
# Unmaintained. Stuck on Python 3.6. No revdeps.
@@ -328,11 +412,6 @@ media-sound/beets
# Removal in 30 days. Bug #718340.
media-gfx/qrencode-python
-# Michał Górny (2020-04-19)
-# Unmaintained. Stuck on Python 3.6. Last release in 2014.
-# Removal in 30 days. Bug #718312.
-games-misc/doge
-
# Michał Górny (2020-04-19)
# Unmaintained. Stuck on Python 3.6.
# Removal in 30 days. Bug #718308.
@@ -805,12 +884,6 @@ www-servers/tomcat:9
# Fails to automatically launch pipewire for me. Help welcome figuring it out.
net-misc/gnome-remote-desktop
-# Stephan Hartmann (2020-02-16)
-# Dev channel releases are only for people who
-# are developers or want more experimental features
-# and accept a more unstable release.
->=www-client/chromium-82
-
# Stefan Strogin (2020-02-12)
# Mask for testing revdeps.
>=dev-games/mygui-3.4.0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a13d33b939c9..67bda13b0386 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2140,6 +2140,7 @@ dev-libs/hidapi:fox - Build a x11-libs/fox GUI
dev-libs/hsa-ext-rocr:deprecated - Install the deprecated debug/trace/profiling library
dev-libs/input-pad:eekboard - Enable support for dev-libs/eekboard
dev-libs/input-pad:xtest - Enable support for x11-libs/libXtst
+dev-libs/intel-neo:l0 - Install the oneAPI Level Zero driver alongside the OpenCL one
dev-libs/intel-neo:vaapi - Support the sharing of surfaces with Video Acceleration API (OpenCL Extension #36)
dev-libs/jemalloc:hugepages - Enable transparent huge page support
dev-libs/jemalloc:lazy-lock - Enable lazy locking (only lock when multi-threaded)
@@ -3406,7 +3407,6 @@ gnome-extra/libgsf:gtk - Enable use of gdk in thumbnailer
gnome-extra/nemo:packagekit - Use packagekit to search for programs to open unknown file types
gnome-extra/nemo:tracker - Add support for app-misc/tracker search
gnome-extra/nm-applet:gcr - Enable advanced certificate chooser, requires app-crypt/gcr
-gnome-extra/nm-applet:gtk - Enable legacy library libnm-gtk
gnome-extra/nm-applet:lto - Enable link time optimization
gnome-extra/nm-applet:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
gnome-extra/nm-applet:teamd - Enable teamd configuration editor
@@ -4968,32 +4968,6 @@ media-video/handbrake:nvenc - Adds support for NVIDIA Encoder (NVENC) API for ha
media-video/handbrake:x265 - Support for encoding h265 using media-libs/x265.
media-video/kino:gpac - Enable GPAC support when exporting to 3GPP format
media-video/kmplayer:npp - Compile the npp backend that plays xembed style browser plugins.
-media-video/libav:aac - Use external vo-aacenc library for AAC encoding
-media-video/libav:amr - Enable Adaptive Multi-Rate Audio support
-media-video/libav:armv5te - Enable optimizations for armv5te processors
-media-video/libav:armv6 - Enable optimizations for armv6 processors
-media-video/libav:armv6t2 - Enable optimizations for armv6t2 processors
-media-video/libav:armvfp - Enable VFP optimizations for ARM processors
-media-video/libav:bs2b - Enable media-libs/libbs2b based Bauer stereo-to-binaural audio filter
-media-video/libav:cdio - Enable audio CD grabbing with dev-libs/libcdio.
-media-video/libav:cpudetection - Enables runtime CPU detection (useful for bindist, compatibility on other CPUs).
-media-video/libav:faac - Use external faac library for AAC encoding
-media-video/libav:fdk - Use external fdk-aac library for AAC encoding and decoding
-media-video/libav:frei0r - Enable frei0r wrapping in libavfilter
-media-video/libav:gpl - Build all GPL licensed code. Without this flag set the package is build under LGPL license.
-media-video/libav:hardcoded-tables - Use pre-calculated tables rather than calculating them on the fly.
-media-video/libav:network - Enable network streaming support.
-media-video/libav:nvidia - Enable nvidia video codec hardware acceleration support.
-media-video/libav:openssl - Prefer dev-libs/openssl over net-libs/gnutls to provide SSL/TLS support (notice: the resulting binaries are unredistributable).
-media-video/libav:opus - Use the external opus library for encoding and decoding.
-media-video/libav:pic - Force shared libraries to be built as PIC (this is slower).
-media-video/libav:pulseaudio - Enable pulseaudio input support.
-media-video/libav:rtmp - Enable Real Time Messaging Protocol using librtmp instead the native implementation.
-media-video/libav:ssl - Enable SSL/TLS support using dev-libs/openssl or net-libs/gnutls.
-media-video/libav:tools - Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.
-media-video/libav:twolame - Enable MP2 encoding via media-sound/twolame as an alternative to the internal encoder
-media-video/libav:vpx - Enable vp8 encoding support using media-libs/libvpx.
-media-video/libav:x265 - Enable HEVC encoding with media-libs/x265.
media-video/libva-utils:drm - Enables VA/DRM API support.
media-video/mjpegtools:sdlgfx - Enables y4mhist to display a graphical histogram
media-video/mjpg-streamer:input-control - Plugin giving ability to control camera movement (only specific cameras)
@@ -5940,6 +5914,8 @@ net-irc/kvirc:dcc_video - Support video connections over DCC protocol
net-irc/kvirc:phonon - Support Phonon for audio output
net-irc/limnoria:crypt - Enables user authentication with GPG
net-irc/ngircd:ident - Enables support for net-libs/libident
+net-irc/ngircd:irc-plus - Enables support for the IRC+ protocol (needs virtual/libiconv)
+net-irc/ngircd:strict-rfc - Strict RFC compliance; may harm compatibility
net-irc/psybnc:multinetwork - Adds support for multiple networks
net-irc/psybnc:oidentd - Adds support for oidentd
net-irc/psybnc:scripting - Adds scripting support
@@ -6922,7 +6898,6 @@ net-vpn/ipsec-tools:nat - Enable NAT-Traversal
net-vpn/ipsec-tools:rc5 - Enable support for the patented RC5 algorithm
net-vpn/ipsec-tools:stats - Enable statistics reporting
net-vpn/libreswan:dnssec - Use DNSSEC resolver (requires net-dns/unbound)
-net-vpn/networkmanager-strongswan:glib - Enable libnm-glib compatibility.
net-vpn/ocserv:otp - Enable support for one-time passwords
net-vpn/openconnect:gssapi - Build GSSAPI support
net-vpn/openconnect:libproxy - Enable proxy support
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index d063c1d194eb..a3dfe93dd162 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/gazebo/gazebo-10.1.0.ebuild b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
index 7b7aa2a408f5..d9ee47335440 100644
--- a/sci-electronics/gazebo/gazebo-10.1.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-10.1.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
# Subslot = major version = soname of libs
SLOT="0/10"
KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav test"
+IUSE="cpu_flags_x86_sse2 test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -29,8 +29,7 @@ RDEPEND="
=media-libs/freeimage-3.15.4[png]
sci-libs/libccd
- libav? ( >=media-video/libav-9:0= )
- !libav? ( >=media-video/ffmpeg-2.6:0= )
+ >=media-video/ffmpeg-2.6:0=
sci-libs/gts
>=sci-physics/bullet-2.82
>=dev-libs/sdformat-6.0:=
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4e703a1c8e0a..d2638b84675d 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
similarity index 99%
rename from sci-libs/opencascade/opencascade-7.4.0.ebuild
rename to sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
index 871c8a8e49c2..ac229f1e0719 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
virtual/glu
virtual/opengl
x11-libs/libXmu
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
freeimage? ( media-libs/freeimage )
java? ( virtual/jdk:1.8 )
qt5? (
diff --git a/sci-libs/vtk/vtk-8.1.0-r5.ebuild b/sci-libs/vtk/vtk-8.1.0-r6.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-8.1.0-r5.ebuild
rename to sci-libs/vtk/vtk-8.1.0-r6.ebuild
index f1fe50fd32e1..06e69225f0fb 100644
--- a/sci-libs/vtk/vtk-8.1.0-r5.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r6.ebuild
@@ -66,7 +66,7 @@ RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
)
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
gdal? ( sci-libs/gdal )
java? ( >=virtual/jdk-1.7:* )
mysql? ( virtual/mysql )
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ef11ccf14b64..dcec22e50ea2 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index dc1b0ad17310..0c8ef4719264 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,2 +1,2 @@
DIST pari-2.11.2.tar.gz 4433038 BLAKE2B 89fd8c14d6ee8c8640432bec75e10b79897f0180212dcb1b04b654478a3258fc13a7f982bcb400e28997934a21667c0c3cb08fdb2e843a80a24c6499feafb639 SHA512 22f5a6ecad6d9b8b337c2655f538a196a0460f6fe98256d0f49557ce7b843f6b27ad364f45a9472aaafee9506386c886f1f0d62697078e501ec465151d4d10a1
-DIST pari-2.11.3.tar.gz 4441199 BLAKE2B 49b001f2dc27d1be7a742c165881f2b21d55cf387a91d880bd3a16cbc5d69172f931caa779c5ccbe79b6855175695b5e88ff99b420b4f2b7404dd5e4a53a135c SHA512 2624cdd0523ec02324f58af65703003c88ab596bcaa30c366a9ea01123b0ae657285b10016abaa06b6783ba34dd4980f560900b836b8df228b9dbe0ca36a5b11
+DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
diff --git a/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch b/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch
deleted file mode 100644
index 877cc6ace756..000000000000
--- a/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Karim Belabas
-Date: Mon, 9 Sep 2019 15:20:21 +0000 (+0200)
-Subject: fix #2164
-X-Git-Url: https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=commitdiff_plain;h=c7a1d35f382e96ddf14694be27a0ca5746880700
-
-fix #2164
----
-
-diff --git a/src/basemath/buch2.c b/src/basemath/buch2.c
-index a853d3c48..e31b2278b 100644
---- a/src/basemath/buch2.c
-+++ b/src/basemath/buch2.c
-@@ -2136,7 +2136,8 @@ bnfisunit(GEN bnf,GEN x)
- for (i = 1; i < RU; i++)
- if (gexpo(gel(emb,i)) > -1) break;
- p1 = imag_i( row_i(logunit,i, 1,RU-1) );
-- p1 = RgV_dotproduct(p1, ex); if (!R1) p1 = gmul2n(p1, -1);
-+ p1 = RgV_dotproduct(p1, ex);
-+ if (i > R1) p1 = gmul2n(p1, -1);
- p1 = gsub(garg(gel(emb,i),prec), p1);
- /* p1 = arg(the missing root of 1) */
-
-diff --git a/src/test/32/nf b/src/test/32/nf
-index 16bf83ce3..e6c41f8b5 100644
---- a/src/test/32/nf
-+++ b/src/test/32/nf
-@@ -502,6 +502,7 @@ Mod(1/2*x - 1/2, x^2 + 23)
- [1, 1/2*x - 1/2]
- Mod(0, x)
- Mod(-6/5, x)
-+[0, 2, Mod(0, 2)]~
- *** at top-level: nfinit([y^3+2,[1,x]])
- *** ^---------------------
- *** nfinit: incorrect type in nfinit_basic (t_VEC).
-diff --git a/src/test/in/nf b/src/test/in/nf
-index 49148123b..94d5165bc 100644
---- a/src/test/in/nf
-+++ b/src/test/in/nf
-@@ -156,6 +156,10 @@ K.zk
- nfinit(x, 3)[2]
- nfinit(1/2*x + 3/5, 3)[2]
-
-+\\ #2164
-+bnf = bnfinit(y^4-y-1);
-+bnfisunit(bnf,-y^3+2*y^2-1)
-+
- \\ ERRORS: keep at end of file
-
- nfinit([y^3+2,[1,x]])
diff --git a/sci-mathematics/pari/pari-2.11.3.ebuild b/sci-mathematics/pari/pari-2.11.4.ebuild
similarity index 96%
rename from sci-mathematics/pari/pari-2.11.3.ebuild
rename to sci-mathematics/pari/pari-2.11.4.ebuild
index 7f3a302bbe4f..076c2cdc55f9 100644
--- a/sci-mathematics/pari/pari-2.11.3.ebuild
+++ b/sci-mathematics/pari/pari-2.11.4.ebuild
@@ -32,7 +32,6 @@ PATCHES=(
"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
- "${FILESDIR}/${PN}"-2.11.3-incorrect_bnfisunit.patch
)
src_prepare() {
@@ -98,7 +97,6 @@ src_test() {
}
src_install() {
- DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
default
if use doc; then
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 3d6600dbd3e7..7d262f8badb1 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/paraview/paraview-5.8.0-r2.ebuild b/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
similarity index 99%
rename from sci-visualization/paraview/paraview-5.8.0-r2.ebuild
rename to sci-visualization/paraview/paraview-5.8.0-r3.ebuild
index 0de4586ea318..fc460ddd8472 100644
--- a/sci-visualization/paraview/paraview-5.8.0-r2.ebuild
+++ b/sci-visualization/paraview/paraview-5.8.0-r3.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
dev-python/PyQt5
dev-qt/qtgui:5[-gles2-only]
)
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
mpi? ( virtual/mpi[cxx,romio] )
mysql? ( dev-db/mysql-connector-c )
offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bfbb454c4c09..affbdb22fcb4 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/debianutils/debianutils-4.9.1.ebuild b/sys-apps/debianutils/debianutils-4.9.1.ebuild
index 783fe2e21047..fea1a187ce2a 100644
--- a/sys-apps/debianutils/debianutils-4.9.1.ebuild
+++ b/sys-apps/debianutils/debianutils-4.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
LICENSE="BSD GPL-2 SMAIL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
IUSE="+installkernel static"
PDEPEND="
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index dbd5a412b6a5..c6850b20333b 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,3 +1,4 @@
DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
DIST help2man-1.47.12.tar.xz 202252 BLAKE2B 6a474d62999b2fe6750a0ec7662b9b33546d82ce72edd628f41008243cd3467cad783516d5ad06edb37f471a2aaefd837bd9957a7fd10b6e3c3b6dd33398b79b SHA512 fb71e48e4a7a0f4316148295ea539b667a131149f4467da0f3e283389c9d9f2a5f1e9124ca8d64d6c3250d332a713d4e8de204ca9e7088840e74f316fa5221be
DIST help2man-1.47.13.tar.xz 202480 BLAKE2B 0c9e854a29ab563b7bc86d4873b2669c82bbd9226d3940ddf60fcbf8bfc48197013c7cde5b55e47e6463d26e1b3512a24bb9591a77009f47992b2a3df9bde198 SHA512 7bf4c75a42c103dd8413a94505f383c6e2b215f9a4cc506e11935acc7f108caad01a5fa489ee157ebef5fa02299145592f65cc828fc016417af557382975d57a
+DIST help2man-1.47.14.tar.xz 202732 BLAKE2B 73d84774618e44d77d609f1ac562065f651c5ba5ab13d700c8ccdd5abcfda229f89067babceb6fec327663fce744748419ee7204defdcfcc7b631b0720bf00fa SHA512 f3ff59e83e89ff0ed2bf863557c41f25ba79b0398f82cd0e7df459f3c3d2832a48047ff401a5556c3d7d722e48956393a4b70f61e79368a7621621e1834db862
diff --git a/sys-apps/help2man/help2man-1.47.14.ebuild b/sys-apps/help2man/help2man-1.47.14.ebuild
new file mode 100644
index 000000000000..79ed067d1855
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.47.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+ nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i \
+ -e 's/-shared/-bundle/' \
+ Makefile.in || die
+ fi
+ default
+}
+
+src_configure() {
+ # Disable gettext requirement as the release includes the gmo files #555018
+ local myeconfargs=(
+ ac_cv_path_MSGFMT=$(type -P false)
+ $(use_enable nls)
+ )
+ econf "${myeconfargs[@]}"
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index d04177f7896f..6678254eee59 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml
index e1df662ac76a..0b167f715997 100644
--- a/sys-auth/authenticator/metadata.xml
+++ b/sys-auth/authenticator/metadata.xml
@@ -1,14 +1,7 @@
-
- oleksandr.trotsenko@gmail.com
- Oleksandr Trotsenko
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
Bilal Elmoussaoui
@@ -16,3 +9,4 @@
https://gitlab.gnome.org/World/Authenticator/issues
+
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 33ecb57b5588..fd7b763e0e76 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-26.4.3.ebuild
index 26b904c8bf26..3cc3dc65d350 100644
--- a/sys-cluster/galera/galera-26.4.3.ebuild
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="cpu_flags_x86_sse4_2 garbd test"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1d163a456a70..2cd7008eb5e2 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 70cf42f7af5f..b6e98da43b4c 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,4 +1,2 @@
-DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390
-DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03
DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
DIST LVM2.2.03.09.tgz 2476346 BLAKE2B 0987b19bc39ef218fe5a79d6035d6e3d5b59fc75ee94e401148f91437faedfa73295fcaefd97a7606ae9d158b000fa5de4e2a72e89da1e1ad27759f7b821489b SHA512 8540e46a6025ab14b592ccd9493b3224ffc0f962739a0a8de6d7b25c65c6ad96fc83ddb0e3d877b123a5e1b104476d0c20ccee2ead6d322257ec82ad1e3362d4
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.184-r3 b/sys-fs/lvm2/files/lvm.rc-2.02.184-r3
deleted file mode 100644
index b48efb0c99a8..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.184-r3
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-_get_lvm_path() {
- local lvm_path=
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- echo "${lvm_path}"
-}
-
-_need_lvmetad()
-{
- local lvm_path="$(_get_lvm_path)"
- [ ! -x "${lvm_path}" ] && return 1
- ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1'
-}
-
-_need_lvmlockd()
-{
- local lvm_path="$(_get_lvm_path)"
- [ ! -x "${lvm_path}" ] && return 1
- ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
-}
-
-depend() {
- before checkfs fsck
- after modules device-mapper
- # We may use lvmetad based on the configuration. If we added lvmetad
- # support while lvm2 is running then we aren't dependent on it. For the
- # more common case, if its disabled in the config we aren't dependent
- # on it.
- config /etc/lvm/lvm.conf
- local _need=
- if service_started; then
- _need=$(service_get_value need)
- else
- if _need_lvmetad; then
- _need="${_need} lvmetad"
- fi
- if _need_lvmlockd; then
- _need="${_need} lvmlockd"
- fi
- fi
- # Make sure you review /etc/conf.d/lvm as well!
- # Depending on your system, it might also introduce udev & mdraid
- need sysfs ${_need}
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
- local retval=0
- for x in devices misc ; do
- grep -qs 'device-mapper' /proc/${x}
- retval=$((${retval} + $?))
- done
- return ${retval}
-}
-
-start() {
- # LVM support for /usr, /home, /opt ....
- # This should be done *before* checking local
- # volumes, or they never get checked.
-
- # NOTE: Add needed modules for LVM or RAID, etc
- # to /etc/modules.autoload if needed
- lvm_path="$(_get_lvm_path)"
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
- if [ -z "${CDBOOT}" ] ; then
- if [ -e /proc/modules ] && ! dm_in_proc ; then
- modprobe dm-mod 2>/dev/null
- fi
- if [ -d /proc/lvm ] || dm_in_proc ; then
- ebegin "Setting up the Logical Volume Manager"
- #still echo stderr for debugging
- lvm_commands="#!${lvm_path}\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}pvscan --config '${config}'\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgscan --config '${config}' --mknodes\n"
- # And turn them on!
- lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ly\n"
- if _need_lvmlockd; then
- # Start lockd VGs as required
- lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n"
- fi
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 >/dev/null
- eend $? "Failed to setup the LVM"
- fi
- fi
-}
-
-start_post()
-{
- # Save if we needed lvmetad
- if _need_lvmetad; then
- service_set_value need lvmetad
- fi
-}
-
-stop() {
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
-
- # Stop LVM2
- if [ -x /sbin/vgs ] && \
- [ -x /sbin/vgchange ] && \
- [ -x /sbin/lvchange ] && \
- [ -f /etc/lvmtab -o -d /etc/lvm ] && \
- [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
- then
- einfo "Shutting down the Logical Volume Manager"
-
- VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
-
- if [ "$VGS" ]
- then
- local _ending="eend"
- [ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend"
- ebegin " Shutting Down LVs & VGs"
- #still echo stderr for debugging
- lvm_commands="#!${lvm_path}\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
- rc=$?
- msg="Failed (possibly some LVs still needed for /usr or root)"
- [ "$RC_RUNLEVEL" = shutdown ] && msg="${msg} [rc=$rc]" && rc=0
- ${_ending} $rc "${msg}"
- fi
-
- einfo "Finished shutting down the Logical Volume Manager"
- return 0
- fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm.rc-2.03.05 b/sys-fs/lvm2/files/lvm.rc-2.03.05
deleted file mode 100644
index 7b7d90b98269..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.03.05
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-_get_lvm_path() {
- local lvm_path=
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- echo "${lvm_path}"
-}
-
-_need_lvmlockd()
-{
- local lvm_path="$(_get_lvm_path)"
- [ ! -x "${lvm_path}" ] && return 1
- ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
-}
-
-depend() {
- before checkfs fsck
- after modules device-mapper
- config /etc/lvm/lvm.conf
- local _need=
- if service_started; then
- _need=$(service_get_value need)
- else
- if _need_lvmlockd; then
- _need="${_need} lvmlockd"
- fi
- fi
- # Make sure you review /etc/conf.d/lvm as well!
- # Depending on your system, it might also introduce udev & mdraid
- need sysfs ${_need}
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
- local retval=0
- for x in devices misc ; do
- grep -qs 'device-mapper' /proc/${x}
- retval=$((${retval} + $?))
- done
- return ${retval}
-}
-
-start() {
- # LVM support for /usr, /home, /opt ....
- # This should be done *before* checking local
- # volumes, or they never get checked.
-
- # NOTE: Add needed modules for LVM or RAID, etc
- # to /etc/modules.autoload if needed
- lvm_path="$(_get_lvm_path)"
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
- if [ -z "${CDBOOT}" ] ; then
- if [ -e /proc/modules ] && ! dm_in_proc ; then
- modprobe dm-mod 2>/dev/null
- fi
- if [ -d /proc/lvm ] || dm_in_proc ; then
- ebegin "Setting up the Logical Volume Manager"
- #still echo stderr for debugging
- lvm_commands="#!${lvm_path}\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}pvscan --config '${config}'\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgscan --config '${config}' --mknodes\n"
- # And turn them on!
- lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ly\n"
- if _need_lvmlockd; then
- # Start lockd VGs as required
- lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n"
- fi
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 >/dev/null
- eend $? "Failed to setup the LVM"
- fi
- fi
-}
-
-stop() {
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
-
- # Stop LVM2
- if [ -x /sbin/vgs ] && \
- [ -x /sbin/vgchange ] && \
- [ -x /sbin/lvchange ] && \
- [ -f /etc/lvmtab -o -d /etc/lvm ] && \
- [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
- then
- einfo "Shutting down the Logical Volume Manager"
-
- VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
-
- if [ "$VGS" ]
- then
- local _ending="eend"
- [ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend"
- ebegin " Shutting Down LVs & VGs"
- #still echo stderr for debugging
- lvm_commands="#!${lvm_path}\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
- rc=$?
- msg="Failed (possibly some LVs still needed for /usr or root)"
- [ "$RC_RUNLEVEL" = shutdown ] && msg="${msg} [rc=$rc]" && rc=0
- ${_ending} $rc "${msg}"
- fi
-
- einfo "Finished shutting down the Logical Volume Manager"
- return 0
- fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
deleted file mode 100644
index 474d48665589..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
- systemd? ( udev )"
-
-DEPEND_COMMON="
- dev-libs/libaio[static-libs?]
- static? ( dev-libs/libaio[static-libs] )
- !static? ( dev-libs/libaio[static-libs?] )
- readline? ( sys-libs/readline:0= )
- sanlock? ( sys-cluster/sanlock )
- systemd? ( >=sys-apps/systemd-205:0= )
- udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
- >=sys-apps/baselayout-2.2
- !=sys-apps/util-linux-2.16
- lvm2create_initrd? ( sys-apps/makedev )
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
-DEPEND="${DEPEND_COMMON}
- virtual/pkgconfig
- >=sys-devel/binutils-2.20.1-r1
- sys-devel/autoconf-archive
- static? (
- selinux? ( sys-libs/libselinux[static-libs] )
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
- >=sys-apps/util-linux-2.16[static-libs]
- )"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-PATCHES=(
- # Gentoo specific modification(s):
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
-
- # For upstream -- review and forward:
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
- "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
- "${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~SYSVIPC"
-
- if use udev; then
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- fi
- fi
-
- check_extra_config
-
- # 1. Genkernel no longer copies /sbin/lvm blindly.
- if use static; then
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
- elog "their static versions. If you need the static binaries,"
- elog "you must append .static to the filename!"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e "1iAR = $(tc-getAR)" \
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
- make.tmpl.in || die #444082
-
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
-
- if use udev && ! use device-mapper-only; then
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
- elog "if it was previously disabled."
- fi
-
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
- # Without thin-privision-tools, there is nothing to install for target install_man7:
- if ! use thin ; then
- sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- filter-flags -flto
- local myeconfargs=()
-
- # Most of this package does weird stuff.
- # The build options are tristate, and --without is NOT supported
- # options: 'none', 'internal', 'shared'
- myeconfargs+=(
- $(use_enable !device-mapper-only dmfilemapd)
- $(use_enable !device-mapper-only dmeventd)
- $(use_enable !device-mapper-only cmdlib)
- $(use_enable !device-mapper-only applib)
- $(use_enable !device-mapper-only fsadm)
- $(use_enable !device-mapper-only lvmetad)
- $(use_enable !device-mapper-only lvmpolld)
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '')
-
- # This only causes the .static versions to become available
- $(usex static --enable-static_link '')
-
- # dmeventd requires mirrors to be internal, and snapshot available
- # so we cannot disable them
- --with-mirrors="$(usex device-mapper-only none internal)"
- --with-snapshots="$(usex device-mapper-only none internal)"
-
- # disable O_DIRECT support on hppa, breaks pv detection (#99532)
- $(usex hppa --disable-o_direct '')
- )
-
- if use thin; then
- myeconfargs+=( --with-thin=internal --with-cache=internal )
- local texec
- for texec in check dump repair restore; do
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
- done
- else
- myeconfargs+=( --with-thin=none --with-cache=none )
- fi
-
- myeconfargs+=( --with-clvmd=none --with-cluster=none )
-
- myeconfargs+=(
- $(use_enable readline)
- $(use_enable selinux)
- --enable-pkgconfig
- --with-confdir="${EPREFIX}"/etc
- --exec-prefix="${EPREFIX}"
- --sbindir="${EPREFIX}/sbin"
- --with-staticdir="${EPREFIX}"/sbin
- --libdir="${EPREFIX}/$(get_libdir)"
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
- --with-default-dm-run-dir=/run
- --with-default-run-dir=/run/lvm
- --with-default-locking-dir=/run/lock/lvm
- --with-default-pid-dir=/run
- $(use_enable udev udev_rules)
- $(use_enable udev udev_sync)
- $(use_with udev udevdir "$(get_udevdir)"/rules.d)
- $(use_enable sanlock lvmlockd-sanlock)
- $(use_enable systemd udev-systemd-background-jobs)
- $(use_enable systemd notify-dbus)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- CLDFLAGS="${LDFLAGS}"
- )
- # Hard-wire this to bash as some shells (dash) don't know
- # "-o pipefail" #682404
- CONFIG_SHELL="/bin/bash" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- pushd include >/dev/null
- emake
- popd >/dev/null
-
- if use device-mapper-only ; then
- emake device-mapper
- else
- emake
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
- fi
-}
-
-src_install() {
- local inst INSTALL_TARGETS
- INSTALL_TARGETS=( install install_tmpfiles_configuration )
- # install systemd related files only when requested, bug #522430
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
- use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
- for inst in ${INSTALL_TARGETS[@]}; do
- emake DESTDIR="${D}" ${inst}
- done
-
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
- if use !device-mapper-only ; then
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
- newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm
- newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
- if ! use udev ; then
- # We keep the variable but remove udev from it.
- sed -r -i \
- -e '/^rc_need=/s/\//g' \
- "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need"
- fi
-
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
- fi
-
- if use sanlock; then
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
- fi
-
- if use static-libs; then
- dolib.a libdm/ioctl/libdevmapper.a
- if use !device-mapper-only ; then
- dolib.a libdaemon/client/libdaemonclient.a #462908
- dolib.a daemons/dmeventd/libdevmapper-event.a
- fi
- else
- rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
- fi
-
- if use lvm2create_initrd; then
- dosbin scripts/lvm2create_initrd/lvm2create_initrd
- doman scripts/lvm2create_initrd/lvm2create_initrd.8
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
- fi
-
- insinto /etc
- doins "${FILESDIR}"/dmtab
-
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
- ewarn "Make sure the \"lvm\" init script is in the runlevels:"
- ewarn "# rc-update add lvm boot"
- ewarn
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
- ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
- einfo "Tests are disabled because of device-node mucking, if you want to"
- einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
deleted file mode 100644
index b8abffaea8ab..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
- systemd? ( udev )"
-
-DEPEND_COMMON="
- dev-libs/libaio[static-libs?]
- static? ( dev-libs/libaio[static-libs] )
- !static? ( dev-libs/libaio[static-libs?] )
- readline? ( sys-libs/readline:0= )
- sanlock? ( sys-cluster/sanlock )
- systemd? ( >=sys-apps/systemd-205:0= )
- udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
- >=sys-apps/baselayout-2.2
- !=sys-apps/util-linux-2.16
- lvm2create_initrd? ( sys-apps/makedev )
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
-DEPEND="${DEPEND_COMMON}
- >=sys-devel/binutils-2.20.1-r1
- static? (
- selinux? ( sys-libs/libselinux[static-libs] )
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
- >=sys-apps/util-linux-2.16[static-libs]
- )"
-BDEPEND="
- sys-devel/autoconf-archive
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-PATCHES=(
- # Gentoo specific modification(s):
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
-
- # For upstream -- review and forward:
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
- "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
- #"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
- "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
- "${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch #700160
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~SYSVIPC"
-
- if use udev; then
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- fi
- fi
-
- check_extra_config
-
- # 1. Genkernel no longer copies /sbin/lvm blindly.
- if use static; then
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
- elog "their static versions. If you need the static binaries,"
- elog "you must append .static to the filename!"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e "1iAR = $(tc-getAR)" \
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
- make.tmpl.in || die #444082
-
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
-
- if use udev && ! use device-mapper-only; then
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
- elog "if it was previously disabled."
- fi
-
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
- # Don't install thin man page when not requested
- if ! use thin ; then
- sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- filter-flags -flto
- local myeconfargs=()
-
- # Most of this package does weird stuff.
- # The build options are tristate, and --without is NOT supported
- # options: 'none', 'internal', 'shared'
- myeconfargs+=(
- $(use_enable !device-mapper-only dmfilemapd)
- $(use_enable !device-mapper-only dmeventd)
- $(use_enable !device-mapper-only cmdlib)
- $(use_enable !device-mapper-only applib)
- $(use_enable !device-mapper-only fsadm)
- $(use_enable !device-mapper-only lvmetad)
- $(use_enable !device-mapper-only lvmpolld)
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '')
-
- # This only causes the .static versions to become available
- $(usex static --enable-static_link '')
-
- # dmeventd requires mirrors to be internal, and snapshot available
- # so we cannot disable them
- --with-mirrors="$(usex device-mapper-only none internal)"
- --with-snapshots="$(usex device-mapper-only none internal)"
-
- # disable O_DIRECT support on hppa, breaks pv detection (#99532)
- $(usex hppa --disable-o_direct '')
- )
-
- if use thin; then
- myeconfargs+=( --with-thin=internal --with-cache=internal )
- local texec
- for texec in check dump repair restore; do
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
- done
- else
- myeconfargs+=( --with-thin=none --with-cache=none )
- fi
-
- myeconfargs+=( --with-clvmd=none --with-cluster=none )
-
- myeconfargs+=(
- $(use_enable readline)
- $(use_enable selinux)
- --enable-pkgconfig
- --with-confdir="${EPREFIX}"/etc
- --exec-prefix="${EPREFIX}"
- --sbindir="${EPREFIX}/sbin"
- --with-staticdir="${EPREFIX}"/sbin
- --libdir="${EPREFIX}/$(get_libdir)"
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
- --with-default-dm-run-dir=/run
- --with-default-run-dir=/run/lvm
- --with-default-locking-dir=/run/lock/lvm
- --with-default-pid-dir=/run
- $(use_enable udev udev_rules)
- $(use_enable udev udev_sync)
- $(use_with udev udevdir "$(get_udevdir)"/rules.d)
- $(use_enable sanlock lvmlockd-sanlock)
- $(use_enable systemd udev-systemd-background-jobs)
- $(use_enable systemd notify-dbus)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- CLDFLAGS="${LDFLAGS}"
- )
- # Hard-wire this to bash as some shells (dash) don't know
- # "-o pipefail" #682404
- CONFIG_SHELL="/bin/bash" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- pushd include >/dev/null
- emake V=1
- popd >/dev/null
-
- if use device-mapper-only ; then
- emake V=1 device-mapper
- else
- emake V=1
- emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
- fi
-}
-
-src_install() {
- local inst INSTALL_TARGETS
- INSTALL_TARGETS=( install install_tmpfiles_configuration )
- # install systemd related files only when requested, bug #522430
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
- use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
- for inst in ${INSTALL_TARGETS[@]}; do
- emake V=1 DESTDIR="${D}" ${inst}
- done
-
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
- if use !device-mapper-only ; then
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
- newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm
- newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
- if ! use udev ; then
- # We keep the variable but remove udev from it.
- sed -r -i \
- -e '/^rc_need=/s/\//g' \
- "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need"
- fi
-
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
- fi
-
- if use sanlock; then
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
- fi
-
- if use static-libs; then
- dolib.a libdm/ioctl/libdevmapper.a
- if use !device-mapper-only; then
- # depends on lvmetad
- dolib.a libdaemon/client/libdaemonclient.a #462908
- # depends on dmeventd
- dolib.a daemons/dmeventd/libdevmapper-event.a
- fi
- else
- rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
- fi
-
- if use lvm2create_initrd; then
- dosbin scripts/lvm2create_initrd/lvm2create_initrd
- doman scripts/lvm2create_initrd/lvm2create_initrd.8
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
- fi
-
- insinto /etc
- doins "${FILESDIR}"/dmtab
-
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
- ewarn "Make sure the \"lvm\" init script is in the runlevels:"
- ewarn "# rc-update add lvm boot"
- ewarn
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
- ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
- einfo "Tests are disabled because of device-node mucking, if you want to"
- einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.187.ebuild b/sys-fs/lvm2/lvm2-2.02.187.ebuild
deleted file mode 100644
index 687e69b34e6e..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.187.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
- systemd? ( udev )"
-
-DEPEND_COMMON="
- dev-libs/libaio[static-libs?]
- static? ( dev-libs/libaio[static-libs] )
- !static? ( dev-libs/libaio[static-libs?] )
- readline? ( sys-libs/readline:0= )
- sanlock? ( sys-cluster/sanlock )
- systemd? ( >=sys-apps/systemd-205:0= )
- udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
- >=sys-apps/baselayout-2.2
- !=sys-apps/util-linux-2.16
- lvm2create_initrd? ( sys-apps/makedev )
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
-DEPEND="${DEPEND_COMMON}
- >=sys-devel/binutils-2.20.1-r1
- static? (
- selinux? ( sys-libs/libselinux[static-libs] )
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
- >=sys-apps/util-linux-2.16[static-libs]
- )"
-BDEPEND="
- sys-devel/autoconf-archive
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-PATCHES=(
- # Gentoo specific modification(s):
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
-
- # For upstream -- review and forward:
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
- "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
- #"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
- "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
- "${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch #700160
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~SYSVIPC"
-
- if use udev; then
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- fi
- fi
-
- check_extra_config
-
- # 1. Genkernel no longer copies /sbin/lvm blindly.
- if use static; then
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
- elog "their static versions. If you need the static binaries,"
- elog "you must append .static to the filename!"
- fi
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e "1iAR = $(tc-getAR)" \
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
- make.tmpl.in || die #444082
-
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
-
- if use udev && ! use device-mapper-only; then
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
- elog "if it was previously disabled."
- fi
-
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
- # Don't install thin man page when not requested
- if ! use thin ; then
- sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
- fi
-
- eautoreconf
-}
-
-src_configure() {
- filter-flags -flto
- local myeconfargs=()
-
- # Most of this package does weird stuff.
- # The build options are tristate, and --without is NOT supported
- # options: 'none', 'internal', 'shared'
- myeconfargs+=(
- $(use_enable !device-mapper-only dmfilemapd)
- $(use_enable !device-mapper-only dmeventd)
- $(use_enable !device-mapper-only cmdlib)
- $(use_enable !device-mapper-only applib)
- $(use_enable !device-mapper-only fsadm)
- $(use_enable !device-mapper-only lvmetad)
- $(use_enable !device-mapper-only lvmpolld)
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '')
-
- # This only causes the .static versions to become available
- $(usex static --enable-static_link '')
-
- # dmeventd requires mirrors to be internal, and snapshot available
- # so we cannot disable them
- --with-mirrors="$(usex device-mapper-only none internal)"
- --with-snapshots="$(usex device-mapper-only none internal)"
-
- # disable O_DIRECT support on hppa, breaks pv detection (#99532)
- $(usex hppa --disable-o_direct '')
- )
-
- if use thin; then
- myeconfargs+=( --with-thin=internal --with-cache=internal )
- local texec
- for texec in check dump repair restore; do
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
- done
- else
- myeconfargs+=( --with-thin=none --with-cache=none )
- fi
-
- myeconfargs+=( --with-clvmd=none --with-cluster=none )
-
- myeconfargs+=(
- $(use_enable readline)
- $(use_enable selinux)
- --enable-pkgconfig
- --with-confdir="${EPREFIX}"/etc
- --exec-prefix="${EPREFIX}"
- --sbindir="${EPREFIX}/sbin"
- --with-staticdir="${EPREFIX}"/sbin
- --libdir="${EPREFIX}/$(get_libdir)"
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
- --with-default-dm-run-dir=/run
- --with-default-run-dir=/run/lvm
- --with-default-locking-dir=/run/lock/lvm
- --with-default-pid-dir=/run
- $(use_enable udev udev_rules)
- $(use_enable udev udev_sync)
- $(use_with udev udevdir "$(get_udevdir)"/rules.d)
- $(use_enable sanlock lvmlockd-sanlock)
- $(use_enable systemd udev-systemd-background-jobs)
- $(use_enable systemd notify-dbus)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- CLDFLAGS="${LDFLAGS}"
- )
- # Hard-wire this to bash as some shells (dash) don't know
- # "-o pipefail" #682404
- CONFIG_SHELL="/bin/bash" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- pushd include >/dev/null
- emake V=1
- popd >/dev/null
-
- if use device-mapper-only ; then
- emake V=1 device-mapper
- else
- emake V=1
- emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
- fi
-}
-
-src_install() {
- local inst INSTALL_TARGETS
- INSTALL_TARGETS=( install install_tmpfiles_configuration )
- # install systemd related files only when requested, bug #522430
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
- use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
- for inst in ${INSTALL_TARGETS[@]}; do
- emake V=1 DESTDIR="${D}" ${inst}
- done
-
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
- if use !device-mapper-only ; then
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
- newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm
- newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
- if ! use udev ; then
- # We keep the variable but remove udev from it.
- sed -r -i \
- -e '/^rc_need=/s/\//g' \
- "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need"
- fi
-
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
- fi
-
- if use sanlock; then
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
- fi
-
- if use static-libs; then
- dolib.a libdm/ioctl/libdevmapper.a
- if use !device-mapper-only; then
- # depends on lvmetad
- dolib.a libdaemon/client/libdaemonclient.a #462908
- # depends on dmeventd
- dolib.a daemons/dmeventd/libdevmapper-event.a
- fi
- else
- rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
- fi
-
- if use lvm2create_initrd; then
- dosbin scripts/lvm2create_initrd/lvm2create_initrd
- doman scripts/lvm2create_initrd/lvm2create_initrd.8
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
- fi
-
- insinto /etc
- doins "${FILESDIR}"/dmtab
-
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
- ewarn "Make sure the \"lvm\" init script is in the runlevels:"
- ewarn "# rc-update add lvm boot"
- ewarn
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
- ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
- einfo "Tests are disabled because of device-node mucking, if you want to"
- einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.03.09.ebuild b/sys-fs/lvm2/lvm2-2.03.09.ebuild
index 17bc946ea786..40418f6bae35 100644
--- a/sys-fs/lvm2/lvm2-2.03.09.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.09.ebuild
@@ -211,7 +211,7 @@ src_install() {
if use !device-mapper-only ; then
newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
- newinitd "${FILESDIR}"/lvm.rc-2.03.05 lvm
+ newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
if ! use udev ; then
# We keep the variable but remove udev from it.
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 27dbc2a09a0a..4f1011bcbb2e 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -184,12 +184,6 @@ pkg_postinst() {
elog " sys-kernel/dracut"
elog " sys-kernel/genkernel"
fi
-
- if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
- einfo "genkernel version 3.5.3.3 and earlier does NOT support"
- einfo " unlocking pools with native zfs encryption enabled at boot"
- einfo " use dracut or >=genkernel-4 if you requre this functionality"
- fi
fi
if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a994676fedc2..dba5e23cf161 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 2d4cdfd13a37..e087b4ff88dd 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,3 +1,4 @@
DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
DIST patch-5.7-rc1.patch 39521598 BLAKE2B d9cc47f8f075262b5b67035cc4d552303a57fd396f3a813ac36dedb9efc09650d51b2880ded146ebd1e639288991fa9775b7820d2360d6303e8d4c82968e1ce2 SHA512 5a9bc1a7aa4cbc06c0a0644c4d03994016e67b51bfc9c130545dea94bb4cc2be7ee00846abdb4be438af1714eb1ea5269c957edd17440d8e48addb68d101b177
DIST patch-5.7-rc2.patch 39838150 BLAKE2B 86a9b1fdb1a0ffdeb5ba8ff0dd7afa0058a3b2be49862001541102b915ad792ae00f1e6f9c671b5f7112cc266ee8697f648584b21d5dcb787e2beaf5c991e29c SHA512 c677ce84cd7616e8840a131b3fab3a647e9778a6b6e7315f7f6a128a32cd699b04f62c5cbed0221339e20ca60d35a95efb188af5e93f8a83e3e323810cfbd469
+DIST patch-5.7-rc3.patch 40283173 BLAKE2B c8f85c4a52156d6590f60464ceba4144fa7562e3a23584d29f20e8f31e66c315d83dd7f171780fbdc5a9b9487677322b6a9e35e50c78fd39130bfc0337a6c93e SHA512 c298a70d8b1d90824a8da8d1b99dac5a2436bbd0bcefdc08712626daf1d4d6c692b1d1c80133bff5429502ebf1932801725d53c9882a34cbe7b9739add19852a
diff --git a/sys-kernel/git-sources/git-sources-5.7_rc3.ebuild b/sys-kernel/git-sources/git-sources-5.7_rc3.ebuild
new file mode 100644
index 000000000000..73b080b1d066
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.7_rc3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.6"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+ postinst_sources
+}
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
index 623b362328c1..c30f84004297 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mgorny/installkernel-gentoo/archive/v${PV}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
RDEPEND="
>=sys-apps/debianutils-4.9-r1
diff --git a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
index 6d413fcfe1d5..26fa69439278 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
+++ b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-0.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="|| ( sys-apps/systemd sys-boot/systemd-boot )
!hydrapolic@gmail.com
Tomáš Mózes
+
+ erkiferenc@gmail.com
+ Ferenc Erki
+
proxy-maint@gentoo.org
Proxy Maintainers
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 5698a9979b03..755a78113596 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bb677b2c3a02..5208c9699e6d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,3 @@
DIST chromium-81.0.4044.122.tar.xz 786010072 BLAKE2B bf9106aefb09d48a1e517840aab3e14d477275cb06d73b2400ff7414e61a7e13a420ee286a580922f7e3512da765bc7348ed714c4b8505bd2e778c5b50ea16da SHA512 483fe530d2d60032cd3c79731840f6387036bc87c1002544d57744eaefec187dd8d9e0dd903f057df826fd59b3bf307b88d1596047ee65f4f8c0172389c546f8
-DIST chromium-83.0.4103.14.tar.xz 802476760 BLAKE2B bf8df2572018a99e735bcf6fe017db8b3832205e69073091b868c8a147419dabd480420a652761a4386fd2f1671c803c8f903bf3f9381b9059d251cb9d9773a9 SHA512 7fa4848a332c2c5cee3b946d82f83e8d1fc561e8c94682400e12dd1cd2df9a53c140f331dfc570d4b968bd54f283c57c61f52cca9f91d627c92b56ff0e23191d
+DIST chromium-83.0.4103.23.tar.xz 802566932 BLAKE2B 00c9105a9b5e9cebc8adeb8a61b4491f0ca7cc95da9595506c77d556c0ee07074da0da506831bec1b390a39c7535220ab5c6d06ce784e6b20d2694f94d3b0a76 SHA512 08a50372570aa9da5fb9ccc6dfc3d949e84cb401d62d650132aa4edea2b1658fb56a81854fde11690d040e3b36b9d20da1ad7f83e47ffca77893ab57620c2a3e
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-83.0.4103.14.ebuild b/www-client/chromium/chromium-83.0.4103.23.ebuild
similarity index 94%
rename from www-client/chromium/chromium-83.0.4103.14.ebuild
rename to www-client/chromium/chromium-83.0.4103.23.ebuild
index fbb86c05a27c..2056dda0889a 100644
--- a/www-client/chromium/chromium-83.0.4103.14.ebuild
+++ b/www-client/chromium/chromium-83.0.4103.23.ebuild
@@ -29,12 +29,9 @@ COMMON_DEPEND="
>=dev-libs/atk-2.26
dev-libs/expat:=
dev-libs/glib:2
- system-icu? ( >=dev-libs/icu-65:= )
>=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/libxslt:=
dev-libs/nspr:=
>=dev-libs/nss-3.26:=
- >=dev-libs/re2-0.2019.08.01:=
>=media-libs/alsa-lib-1.0.19:=
media-libs/fontconfig:=
media-libs/freetype:=
@@ -42,7 +39,6 @@ COMMON_DEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:=
system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
- >=media-libs/openh264-1.6.0:=
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? (
>=media-video/ffmpeg-4:=
@@ -70,7 +66,6 @@ COMMON_DEPEND="
x11-libs/libXScrnSaver:=
x11-libs/libXtst:=
x11-libs/pango:=
- app-arch/snappy:=
media-libs/flac:=
>=media-libs/libwebp-0.4.0:=
sys-libs/zlib:=[minizip]
@@ -108,12 +103,32 @@ BDEPEND="
)
"
-: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_CLANG=yes}
+: ${CHROMIUM_FORCE_LIBCXX=yes}
if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
BDEPEND+=" >=sys-devel/clang-9"
fi
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+ RDEPEND+=" >=sys-libs/libcxx-9"
+ DEPEND+=" >=sys-libs/libcxx-9"
+ BDEPEND+="
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+ "
+else
+ COMMON_DEPEND="
+ app-arch/snappy:=
+ dev-libs/libxslt:=
+ >=dev-libs/re2-0.2019.08.01:=
+ >=media-libs/openh264-1.6.0:=
+ system-icu? ( >=dev-libs/icu-65:= )
+ "
+ RDEPEND+="${COMMON_DEPEND}"
+ DEPEND+="${COMMON_DEPEND}"
+fi
+
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -433,7 +448,16 @@ src_prepare() {
if use tcmalloc; then
keeplibs+=( third_party/tcmalloc )
fi
-
+ if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+ keeplibs+=( third_party/libxml )
+ keeplibs+=( third_party/libxslt )
+ keeplibs+=( third_party/openh264 )
+ keeplibs+=( third_party/re2 )
+ keeplibs+=( third_party/snappy )
+ if use system-icu; then
+ keeplibs+=( third_party/icu )
+ fi
+ fi
# Remove most bundled libraries. Some are still needed.
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
}
@@ -457,6 +481,9 @@ src_configure() {
if tc-is-clang; then
myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
else
+ if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+ die "Compiling with sys-libs/libcxx requires clang."
+ fi
myconf_gn+=" is_clang=false"
fi
@@ -502,11 +529,6 @@ src_configure() {
libjpeg
libpng
libwebp
- libxml
- libxslt
- openh264
- re2
- snappy
yasm
zlib
)
@@ -519,6 +541,14 @@ src_configure() {
if use system-libvpx; then
gn_system_libraries+=( libvpx )
fi
+ if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+ # unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+ gn_system_libraries+=( libxml )
+ gn_system_libraries+=( libxslt )
+ gn_system_libraries+=( openh264 )
+ gn_system_libraries+=( re2 )
+ gn_system_libraries+=( snappy )
+ fi
build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
# See dependency logic in third_party/BUILD.gn
@@ -580,6 +610,11 @@ src_configure() {
fi
fi
+ if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+ append-flags -stdlib=libc++
+ append-ldflags -stdlib=libc++
+ fi
+
if [[ $myarch = amd64 ]] ; then
myconf_gn+=" target_cpu=\"x64\""
ffmpeg_target_arch=x64
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 30c8e36cc9f7..f999e0e34a63 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -91,7 +91,7 @@ DIST firefox-52.9.0esr-xh.xpi 441173 BLAKE2B 3e1b907a7659c639d17d25a1825f4728532
DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721bae06694768316e31a2aed608e3050f585a9603375cd35b90affca11b3e5e44401b1e676f9c8050ade287ed0feb442a7a SHA512 ca62e0e2ab075086741159b185b5eba44c6bdfc29fd9ba1cf25808f127c1aed8875ea61c1c33e4f742fa26af4455a8873730f96ad9c7bec1f66aed0595f253f1
DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
DIST firefox-52.9.0esr.source.tar.xz 214087304 BLAKE2B eba5305ae3fc9a4306cbcbcd8d4610272ca5b75e369367961e9d94919b003de8aae8f3c58fe1c628787d98105a85fab575ae2b051e92a0b35bbb8b402c100766 SHA512 bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
-DIST firefox-68.0-patches-12.tar.xz 17476 BLAKE2B bd788e24820f902f4ca908b0cf7a49a4c57e058915af1eb87233d19d91271092676c1ee4c67e88df2411ecccea47c4e735efdf95945954f2d9aac5cc2f9051f2 SHA512 8033a3c445eaddd28188b338534da16a4130b679a5f6673b3094524e47435890e6d454d7b67f81bbe21f80ef1b65fa7e6c27d71191ba70dd8ea87fc68463f9a7
+DIST firefox-68.0-patches-13.tar.xz 18160 BLAKE2B e77d63787ac5f2f1900325f03b2f905e65a5f767349fcec283ae6e5aadb77489f55551065a1867f697af47570127f3a81620f2bf79d2ff98a5ddf4d05ea6cf5c SHA512 fc900c31e01c8a093cac42acbb2289cc20d000367a02f6e490980a8897dec120657b1981bd2a5999d1d18923c71a320dfba925ca0b8714c60495fac293be78bd
DIST firefox-68.7.0esr-ach.xpi 471587 BLAKE2B 9e861b74ffa84542ea771d885741e3ddbce78b825bafd58f186548c7239f03ed70cf1876dc1659d4edb07d48ad1f35e000d787ed09cfcd44c8f7a2debdef1009 SHA512 b44d38184513bbb94f3f6b64b6dfe8440678e90f3e1c73bab8955d165e6265a319b0cf9a322101f51f3c4356525f58c773a3051fd01fec3a7903d7dbc8ee1aeb
DIST firefox-68.7.0esr-af.xpi 450295 BLAKE2B c5af1d5f9c2a24f82799c946b6a27a262e0989f92d167005699f87f2f2f82e2c078f9d984ad605275ab2a7b3962adae700d68ec4aee6fa288dff10a6b5151bce SHA512 1ec8cd04df2ea4b127f4018e45d5e4824c9ca427ae068e9ef1be4c75e5a152a99421e3c35b2045ecbbe3c4452cd430774672ede59fb1023333cf3b21d00c0c5d
DIST firefox-68.7.0esr-an.xpi 482752 BLAKE2B b1a54dbafb8d8bae3a1762fe553a414f7fb8130d01817beec88eb40353dc3a085f3834125ef0f7f1b73f39a9794e4179331df7e5099a2fb558fb87d1f96b6faa SHA512 1bd397eb917f86b609f464a50fa3e90d50e7faabde5cf1fbe73268421ba4f6a5af839c8d0f09d57671717f9ee831989896f5e467c635aff3acd4f3873d826399
@@ -251,7 +251,7 @@ DIST firefox-75.0-nl.xpi 542960 BLAKE2B dd99446c967bbb8bfa020037a65b0d3b94396e8f
DIST firefox-75.0-nn-NO.xpi 542310 BLAKE2B e9c3c2065075fb4971135a4ce8497938a96327a09e987c35d08fbf9c74209c0ea48004758104ef980ae8ab7fd43cb3d156fbd20837e989b06ac529190c787e8a SHA512 b004e60bb1ce787c2029282c2f4f35700ab57e02ef9860335879abd8c891cce7c65906fd0f65a525fb90ec34f1fbab509dae3ff51798b582cd1b24229a3d9ea8
DIST firefox-75.0-oc.xpi 557492 BLAKE2B b44b802726e7f094d74130ea21995e6763918223c329904bbeb0155883cb921cd5d9cb127dc65ae539e0c1928341d97a82b164b16be9c03020c0081d5d30c47c SHA512 f7ab0a605d306bf4ba0c481c46ed79be79650f4cb282a55f7cd81b204ffe6484a61d035ea5b939875eda87df8b86d64098aafe6f57a3c25e11994bd38ed283fb
DIST firefox-75.0-pa-IN.xpi 594370 BLAKE2B c6fac1aa54d523ee6110120b45d50acb0fd2ad28d0c0b3be0711dee927565a378b8f5f63612c1902f341df48716f423fcf2c1a95de94fe1f176926db34fefb73 SHA512 3f65e017ee5d4e0b7fca64d7a23eee8e263a85043fbe7a939e835070cc1c8361f93f13955d047aa2410ee08d9998fbfd1b710c6632aa06183792b3a9e1439e6a
-DIST firefox-75.0-patches-5.tar.xz 19792 BLAKE2B 8ec82a451f6b4287cd3ddda92a94859dcb86ce1880e38a7764ebc241d337bbd887bfd6556a361bb9e426ab85f0cba21e11263800157160196d5bd15d218811ed SHA512 ba47a65fc8b7dbcc92fae235ad44e943785ef67acaabead4ad1a3ea326663c08171e35281444d5831fbee923fd93fe085a413f6ab461e1574a649a8682399319
+DIST firefox-75.0-patches-6.tar.xz 21244 BLAKE2B 6951ec9646372845a85ce793ac80e9888d75a6740595e2ddaea38e7c610fe19bd817fe34e7ca9ea1c9de3c9efa21d658ac13f48d94497f39ac4266fdbf8b9376 SHA512 3a3ccad1b17808b3dbcf7ba5dd55a1de275e1e3b225ad2077160638fad97c032c4084c2cb43a85cc39a0ec6d2333943692f6dcad081f9b1e1bdd5608b65d8b1a
DIST firefox-75.0-pl.xpi 556350 BLAKE2B de3951ced01eabbdca3c9db581f26e4d445352c8c376c9214450b7a465ee00c62659c856d8cc9c1bb22ebc0d71387ee2c30407139569a2f7e9616201f95b0713 SHA512 0e806776db435d9357d1c24c9466483ade5069176852cdf1728ee33e2f1ceff6d8690db5915939542ec393683e9d260b4323ca1ab27b9fee78cc9efa6e751e24
DIST firefox-75.0-pt-BR.xpi 543958 BLAKE2B 4fbe69cef2c73a25c58268eb8b43b9240963877efff7a568f47499afbf956b45f09de5944e6def489150964d24a8d71c02583b3b168177b7e985af9d93903009 SHA512 5b53ad15b4ff101fde2b9c90ccd2fbf827e77c6b5664987b51334fe935a834b2fc564ac4a26a75024e65a2c7b10e1078a74c95ebc7307d59c59a5545d4882332
DIST firefox-75.0-pt-PT.xpi 554698 BLAKE2B ede9681582b6213c0d089081ae8b7d5c0b1f13c737e8f7086909caf1ab5cae297a5a7828932e9554793380d758556154f8eb57693270b0a6b51d5256f5a337ff SHA512 e224d9c26f9706940ac59651bf32fb8aad36ef3fbcab0c50ae5de00b9136bcc75235aaa9139494c7f2043270a03125ec90e33f2defbd83480d1b80cfaa7d8915
diff --git a/www-client/firefox/firefox-52.9.0.ebuild b/www-client/firefox/firefox-52.9.0-r1.ebuild
similarity index 100%
rename from www-client/firefox/firefox-52.9.0.ebuild
rename to www-client/firefox/firefox-52.9.0-r1.ebuild
diff --git a/www-client/firefox/firefox-68.7.0.ebuild b/www-client/firefox/firefox-68.7.0-r1.ebuild
similarity index 99%
rename from www-client/firefox/firefox-68.7.0.ebuild
rename to www-client/firefox/firefox-68.7.0-r1.ebuild
index 1d4e4b4ee23d..0d7da91390b3 100644
--- a/www-client/firefox/firefox-68.7.0.ebuild
+++ b/www-client/firefox/firefox-68.7.0-r1.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
fi
# Patch version
-PATCH="${PN}-68.0-patches-12"
+PATCH="${PN}-68.0-patches-13"
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
@@ -91,7 +91,7 @@ CDEPEND="
>=dev-libs/glib-2.26:2
>=sys-libs/zlib-1.2.3
>=virtual/libffi-3.0.10:=
- virtual/ffmpeg
+ media-video/ffmpeg
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXdamage
diff --git a/www-client/firefox/firefox-75.0.ebuild b/www-client/firefox/firefox-75.0-r2.ebuild
similarity index 99%
rename from www-client/firefox/firefox-75.0.ebuild
rename to www-client/firefox/firefox-75.0-r2.ebuild
index 9327b6461110..67294f34ae04 100644
--- a/www-client/firefox/firefox-75.0.ebuild
+++ b/www-client/firefox/firefox-75.0-r2.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
fi
# Patch version
-PATCH="${PN}-75.0-patches-5"
+PATCH="${PN}-75.0-patches-6"
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
@@ -91,7 +91,7 @@ CDEPEND="
>=dev-libs/glib-2.26:2
>=sys-libs/zlib-1.2.3
>=dev-libs/libffi-3.0.10:=
- virtual/ffmpeg
+ media-video/ffmpeg
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXdamage
diff --git a/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild b/www-client/seamonkey/seamonkey-2.49.5-r2.ebuild
similarity index 100%
rename from www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
rename to www-client/seamonkey/seamonkey-2.49.5-r2.ebuild
diff --git a/www-client/seamonkey/seamonkey-2.53.1.ebuild b/www-client/seamonkey/seamonkey-2.53.1-r1.ebuild
similarity index 99%
rename from www-client/seamonkey/seamonkey-2.53.1.ebuild
rename to www-client/seamonkey/seamonkey-2.53.1-r1.ebuild
index 52d455c9477c..75419d2179f3 100644
--- a/www-client/seamonkey/seamonkey-2.53.1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.1-r1.ebuild
@@ -80,7 +80,7 @@ DEPEND="
x11-libs/libXt
>=x11-libs/pango-1.22.0
>=x11-libs/pixman-0.19.2
- virtual/ffmpeg
+ media-video/ffmpeg
virtual/freedesktop-icon-theme
dbus? (
>=dev-libs/dbus-glib-0.72
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 58441e00944f..08b8062018b4 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild b/www-misc/zoneminder/zoneminder-1.30.4-r2.ebuild
similarity index 98%
rename from www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild
rename to www-misc/zoneminder/zoneminder-1.30.4-r2.ebuild
index 046cf31ef6fb..b376f103bc83 100644
--- a/www-misc/zoneminder/zoneminder-1.30.4-r1.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.30.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TO DO:
@@ -57,7 +57,7 @@ DEPEND="
dev-php/pecl-apcu:*
sys-auth/polkit
sys-libs/zlib
- virtual/ffmpeg
+ media-video/ffmpeg
virtual/httpd-php:*
virtual/jpeg:0
virtual/perl-ExtUtils-MakeMaker
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 04bceaeb7350..6656f7808ff0 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9-r1.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9-r1.ebuild
index 488069f26f18..020fa45b2c55 100644
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9-r1.ebuild
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,13 +10,11 @@ HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT=0
-IUSE="gles2-only jack libav libressl pulseaudio v4l vaapi vdpau"
+IUSE="gles2-only jack libressl pulseaudio v4l vaapi vdpau"
KEYWORDS="amd64"
-HWDEC_DEPEND="
- libav? ( media-video/libav:0=[vaapi?,vdpau?] )
- !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
+HWDEC_DEPEND="media-video/ffmpeg:0=[vaapi?,vdpau?]
x11-libs/libvdpau
"
diff --git a/www-plugins/lightspark/lightspark-0.8.2-r1.ebuild b/www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
index 65979256be22..40f32dbcac3c 100644
--- a/www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
+++ b/www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lightspark/lightspark/archive/${PV}.tar.gz -> ${P}.t
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2 curl ffmpeg gles2-only libav nsplugin ppapi profile rtmp"
+IUSE="cpu_flags_x86_sse2 curl ffmpeg gles2-only nsplugin ppapi profile rtmp"
# Note: no LLVM since it's broken upstream
RDEPEND="app-arch/xz-utils:0=
@@ -30,10 +30,7 @@ RDEPEND="app-arch/xz-utils:0=
x11-libs/pango:0=
virtual/jpeg:0=
curl? ( net-misc/curl:0= )
- ffmpeg? (
- libav? ( =media-libs/glew-1.5.3:0=
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d1da6c23c0d8..c7a65226a6ce 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
similarity index 99%
rename from www-servers/cherokee/cherokee-1.2.104-r1.ebuild
rename to www-servers/cherokee/cherokee-1.2.104-r2.ebuild
index 89557f2f8b98..c93835e180e9 100644
--- a/www-servers/cherokee/cherokee-1.2.104-r1.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
${PYTHON_DEPS}
dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
geoip? ( dev-libs/geoip )
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/www-servers/varnish/varnish-6.0.6.ebuild b/www-servers/varnish/varnish-6.0.6.ebuild
index ff890decad93..b2aedc3e93d1 100644
--- a/www-servers/varnish/varnish-6.0.6.ebuild
+++ b/www-servers/varnish/varnish-6.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
LICENSE="BSD-2 GPL-2"
SLOT="0/1"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
IUSE="jemalloc jit static-libs"
CDEPEND="
diff --git a/www-servers/varnish/varnish-6.3.2.ebuild b/www-servers/varnish/varnish-6.3.2.ebuild
index 757d67ff20f5..5d12afb64590 100644
--- a/www-servers/varnish/varnish-6.3.2.ebuild
+++ b/www-servers/varnish/varnish-6.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
LICENSE="BSD-2 GPL-2"
SLOT="0/2"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
IUSE="jemalloc jit static-libs"
CDEPEND="
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index bf21ce029709..ac02aec74a2b 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index 5d0ee8acd421..4bdc1441aaa0 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ RDEPEND="
dev-qt/qtwidgets:5
sys-apps/file
dbus? ( dev-qt/qtdbus:5 )
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
imagemagick? ( >=media-gfx/imagemagick-7:= )
"
DEPEND="
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild
deleted file mode 100644
index b35147bce410..000000000000
--- a/x11-misc/urxvt-perls/urxvt-perls-2.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Perl extensions for rxvt-unicode"
-HOMEPAGE="https://github.com/muennich/urxvt-perls"
-SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="x11-misc/xsel
- x11-terms/rxvt-unicode[perl]"
-
-src_install() {
- insinto /usr/$(get_libdir)/urxvt/perl
- doins keyboard-select
- dodoc README.md
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index ad4304412936..1cab6e5eb8db 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 15b7b5f10e3a..e958c1af17e3 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,2 +1,3 @@
DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
+DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.17.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.17.3.ebuild
new file mode 100644
index 000000000000..b37c1bba5c12
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.17.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/kitty-terminfo-setup-0.17.2.patch
+)
+
+# kitty-terminfo is a split package from kitty that only installs the terminfo
+# file. As tests are designed to be run with the whole package compiled they
+# would fail in this case.
+RESTRICT="test"
+
+src_compile() {
+ "${EPYTHON}" setup.py \
+ --verbose $(usex debug --debug "") \
+ --libdir-name $(get_libdir) \
+ linux-terminfo || die "Failed to compile kitty."
+}
+
+src_install() {
+ insinto /usr
+ doins -r linux-package/*
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index e01a8731b947..5469a2cc936c 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,3 +1,4 @@
DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
+DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
diff --git a/x11-terms/kitty/kitty-0.17.3.ebuild b/x11-terms/kitty/kitty-0.17.3.ebuild
new file mode 100644
index 000000000000..24b10118172e
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.17.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-1.5.0:=
+ media-libs/libcanberra
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ x11-libs/libxcb[xkb]
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libxkbcommon[X]
+ x11-libs/libXrandr
+ x11-terms/kitty-terminfo
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.17
+ )
+ $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_MULTI_USEDEP}]' python3_6)
+"
+
+DEPEND="${RDEPEND}
+ media-libs/mesa[X(+)]
+ sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.17.2-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
+)
+
+src_prepare() {
+ default
+
+ # disable wayland as required
+ if ! use wayland; then
+ sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+ fi
+
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+ tc-export CC
+}
+
+src_compile() {
+ "${EPYTHON}" setup.py \
+ --verbose $(usex debug --debug "") \
+ --libdir-name $(get_libdir) \
+ linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+ export KITTY_CONFIG_DIRECTORY=${T}
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index a5a2a5a2f733..7155186d5b4d 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/fedora-backgrounds/Manifest b/x11-themes/fedora-backgrounds/Manifest
index d0345c9dfa7f..fddb7d5bf7be 100644
--- a/x11-themes/fedora-backgrounds/Manifest
+++ b/x11-themes/fedora-backgrounds/Manifest
@@ -3,4 +3,4 @@ DIST f28-backgrounds-28.1.5.tar.xz 158614448 BLAKE2B 8a2c98c3aa195512c000d2f0cb5
DIST f29-backgrounds-29.1.3.tar.xz 170130460 BLAKE2B dc7e8e25f8d65f9de8939e0468d49986f0228993920b49d53c2cfdc99c108218b338921657b790f30b3997a9dedfa51cae8f0db161b42fb723f2a2e4ea56a6b6 SHA512 707ecc56c5b0070b07f316dd9d24b9bc51a7b77e82049f7f693f4c5a828cba2d7731f14b5f2ea574875c81c60b1a490f55d9b655df936b6052e0bfa23eb171ad
DIST f30-backgrounds-30.1.2.tar.xz 215810052 BLAKE2B 203a8d5213aab09de7e050fceb333092d77df99557d827930542cbe0443ff16f510b0fb66d294e63871ffb6e942e373eb9890e7eb139523b1573bc12e328e9b7 SHA512 a6b2c3d0d38a0bb76f987e85b584afe2ce8079f8667a3ef253deff12b96678f2fb92ab2f6d04770e9154dd3bb4bc0fc871d5c18da989e5fa7f9f61464d7b3322
DIST f31-backgrounds-31.0.4.tar.xz 317019080 BLAKE2B a6d3d8f1e41e5f0186ce4b4ffa052190d8422bf24db3c6fa02f1eda0d016af7cf58f8da9d1a391a8c2a46d1f1b2a21f2c889c6704a9e997262ae9a43447e55dc SHA512 77244938ef3bd3dff8d8327645373b368f10aef78cf15fa56045b3f6c76dee502a6682b4bb756e1c16f4021481f7ee2317a73273bb2e50abc729b5847db23718
-DIST f32-backgrounds-32.1.3.tar.xz 56592244 BLAKE2B 07cfb131c4005ed8659ec58af2062472155c1050e0306fbb531a3978d321cde9665617c49bda0003225cb36638d4b45bd35a32d09835d18e41909c0d95b167fb SHA512 16132bd90f4effbd91ef7695b7bbc69746145a01af7a5b93228250aa1b6fa38f7a741f53c718297fc56f8f39a29ddd2dafad61a6dd48ba5384f64898050f6523
+DIST f32-backgrounds-32.1.4.tar.xz 56592364 BLAKE2B 2dea490c910844ea1a09fec7f0d86b713c76f04979b8ad32f0038122a38585f98bbef837e158f0d7ce2f13ee80a3309cf7ca6dde28a15e60747f6882ca1661f9 SHA512 6ecf33e4810bd504b4ab6bdfc42ef1beab7f77a23ccb33e52641064293586d3328829f07e4988b3358dbca369610bb2bd7553192f4bc0221cbe971c5f6835bca
diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-32.1.3.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-32.1.4.ebuild
similarity index 100%
rename from x11-themes/fedora-backgrounds/fedora-backgrounds-32.1.3.ebuild
rename to x11-themes/fedora-backgrounds/fedora-backgrounds-32.1.4.ebuild
diff --git a/x11-themes/ubuntu-wallpapers/Manifest b/x11-themes/ubuntu-wallpapers/Manifest
index d77a0051d981..e207a3efaa0b 100644
--- a/x11-themes/ubuntu-wallpapers/Manifest
+++ b/x11-themes/ubuntu-wallpapers/Manifest
@@ -1 +1,2 @@
DIST ubuntu-wallpapers_19.10.2.orig.tar.gz 209308453 BLAKE2B 250b386697e6802b13b624206142ad13224c032d9b909ff0de0ae4ecc1a47e99d8ad30933f4967fd8f570bfca728191a7021b1e2cff81a8fc21ddcd0445534f4 SHA512 754902be43064593c303feb87f3de94351cf1067ae08344e65bd420eca57d5cf516996d89c0116887aabedaf0d032132d9139c8ebe414525eda61b16cc8cca9a
+DIST ubuntu-wallpapers_20.04.2.orig.tar.gz 221558552 BLAKE2B 2cec11a04ddec632df811b5764e8e777bb4c0ec03138f1e4f1b50fbd780fd33761b55e5da52d466d000461ad47d0d7c2348992053eb375f4a10f0d9808d0df4b SHA512 89ac61bbccff1226b08b7c1b8714b65829333f1ca7eedfc2f77842e2efc1e4d71509488fc5e902e6b35138df258c06c51a655f1722a13df9f382420c15673c54
diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-20.04.2.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-20.04.2.ebuild
new file mode 100644
index 000000000000..6101cdc76a80
--- /dev/null
+++ b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-20.04.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Ubuntu wallpapers"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers"
+MY_P="${PN}_${PV}"
+SRC_URI="mirror://ubuntu/pool/main/u/${PN}/${MY_P}.orig.tar.gz"
+
+# Review COPYING file for updates
+LICENSE="CC-BY-SA-3.0"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+SLOT="0"
+
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+ insinto /usr/share/backgrounds
+ doins *.jpg *.png
+
+ insinto /usr/share/backgrounds/contest
+ doins contest/*.xml
+
+ for i in *.xml.in; do
+ insinto /usr/share/gnome-background-properties
+ newins ${i} ${i/.in/}
+ done
+
+ einstalldocs
+}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a6c6cd0c6ab6..63e9039a5b07 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
similarity index 85%
rename from x11-wm/xpra/xpra-3.0.2.ebuild
rename to x11-wm/xpra/xpra-3.0.2-r1.ebuild
index 1b1afa0b1211..67c37be000fb 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
clipboard? ( || ( server client ) )
@@ -33,32 +33,20 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXrandr
x11-libs/libXtst
x11-libs/libxkbfile
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_avcodec2? (
- !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] )
- libav? ( media-video/libav:0=[x264,x265] )
- )
- enc_ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.2.2:0= )
- libav? ( media-video/libav:0= )
- )
+ csc? ( >=media-video/ffmpeg-1.2.2:0= )
+ dec_avcodec2? ( >=media-video/ffmpeg-2:0=[x264,x265] )
+ enc_ffmpeg? ( >=media-video/ffmpeg-3.2.2:0= )
enc_x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
- libav? ( media-video/libav:0=[x264] )
- )
+ >=media-video/ffmpeg-1.0.4:0=[x264] )
enc_x265? ( media-libs/x265
- !libav? ( >=media-video/ffmpeg-2:0=[x264] )
- libav? ( media-video/libav:0=[x264] ) )
+ >=media-video/ffmpeg-2:0=[x264] )
jpeg? ( media-libs/libjpeg-turbo )
opengl? ( dev-python/pyopengl )
pulseaudio? ( media-sound/pulseaudio )
sound? ( media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
dev-python/gst-python:1.0 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
+ vpx? ( media-libs/libvpx media-video/ffmpeg )
webp? ( media-libs/libwebp )"
RDEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/xpra/xpra-3.0.5.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
similarity index 90%
rename from x11-wm/xpra/xpra-3.0.5.ebuild
rename to x11-wm/xpra/xpra-3.0.5-r1.ebuild
index f76f7a9fc36f..ab142fb477a1 100644
--- a/x11-wm/xpra/xpra-3.0.5.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
@@ -32,21 +32,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXrandr
x11-libs/libXtst
x11-libs/libxkbfile
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
- libav? ( media-video/libav:0=[x264,x265] )
- )
+ csc? ( >=media-video/ffmpeg-1.2.2:0= )
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
jpeg? ( media-libs/libjpeg-turbo )
opengl? ( dev-python/pyopengl )
pulseaudio? ( media-sound/pulseaudio )
sound? ( media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
dev-python/gst-python:1.0 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
+ vpx? ( media-libs/libvpx media-video/ffmpeg )
webp? ( media-libs/libwebp )
"
RDEPEND="${COMMON_DEPEND}