diff --git a/Manifest.files.gz b/Manifest.files.gz
index 61e00fbf93dc..2021080b4bc9 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 3a8976db06dd..1cebdf8792cb 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/avahi-autoipd/Manifest b/acct-group/avahi-autoipd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/avahi-autoipd/avahi-autoipd-0.ebuild b/acct-group/avahi-autoipd/avahi-autoipd-0.ebuild
new file mode 100644
index 000000000000..6edacda8f27c
--- /dev/null
+++ b/acct-group/avahi-autoipd/avahi-autoipd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi-autoipd"
+ACCT_GROUP_ID=62
diff --git a/acct-group/avahi-autoipd/metadata.xml b/acct-group/avahi-autoipd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/avahi-autoipd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/avahi/Manifest b/acct-group/avahi/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/avahi/avahi-0.ebuild b/acct-group/avahi/avahi-0.ebuild
new file mode 100644
index 000000000000..1f8226758b90
--- /dev/null
+++ b/acct-group/avahi/avahi-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for avahi"
+ACCT_GROUP_ID=61
diff --git a/acct-group/avahi/metadata.xml b/acct-group/avahi/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/avahi/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/netdev/Manifest b/acct-group/netdev/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/netdev/metadata.xml b/acct-group/netdev/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-group/netdev/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-group/netdev/netdev-0.ebuild b/acct-group/netdev/netdev-0.ebuild
new file mode 100644
index 000000000000..fcb3bae88525
--- /dev/null
+++ b/acct-group/netdev/netdev-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="group for netdev (avahi)"
+ACCT_GROUP_ID=64
diff --git a/acct-group/openntpd/Manifest b/acct-group/openntpd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/openntpd/metadata.xml b/acct-group/openntpd/metadata.xml
new file mode 100644
index 000000000000..4fb2c3dd4699
--- /dev/null
+++ b/acct-group/openntpd/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ henson@acm.org
+ Paul B. Henson
+
+
+ junghans@gentoo.org
+ Christoph Junghans (proxy)
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/openntpd/openntpd-0.ebuild b/acct-group/openntpd/openntpd-0.ebuild
new file mode 100644
index 000000000000..dedb1ece2420
--- /dev/null
+++ b/acct-group/openntpd/openntpd-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=321
diff --git a/acct-group/redmine/Manifest b/acct-group/redmine/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/redmine/metadata.xml b/acct-group/redmine/metadata.xml
new file mode 100644
index 000000000000..3ed2aa9f8eb4
--- /dev/null
+++ b/acct-group/redmine/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ azamat.hackimov@gmail.com
+ Azamat H. Hackimov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/redmine/redmine-0.ebuild b/acct-group/redmine/redmine-0.ebuild
new file mode 100644
index 000000000000..8dac6049726c
--- /dev/null
+++ b/acct-group/redmine/redmine-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=451
diff --git a/acct-group/tss/Manifest b/acct-group/tss/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/tss/metadata.xml b/acct-group/tss/metadata.xml
new file mode 100644
index 000000000000..52d5228a45d4
--- /dev/null
+++ b/acct-group/tss/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ salah.coronya@gmail.com
+ Salah Coronya
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/tss/tss-0.ebuild b/acct-group/tss/tss-0.ebuild
new file mode 100644
index 000000000000..63c0050b301d
--- /dev/null
+++ b/acct-group/tss/tss-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Trusted Software Stack for TPMs group"
+ACCT_GROUP_ID=59
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 4e765bd0cbd5..d204ee89dd86 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/avahi-autoipd/Manifest b/acct-user/avahi-autoipd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/avahi-autoipd/avahi-autoipd-0.ebuild b/acct-user/avahi-autoipd/avahi-autoipd-0.ebuild
new file mode 100644
index 000000000000..eea5d1cf78ad
--- /dev/null
+++ b/acct-user/avahi-autoipd/avahi-autoipd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi-autoipd"
+ACCT_USER_ID=62
+ACCT_USER_GROUPS=( avahi-autoipd )
+
+acct-user_add_deps
diff --git a/acct-user/avahi-autoipd/metadata.xml b/acct-user/avahi-autoipd/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-user/avahi-autoipd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-user/avahi/Manifest b/acct-user/avahi/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/avahi/avahi-0.ebuild b/acct-user/avahi/avahi-0.ebuild
new file mode 100644
index 000000000000..196115d0a812
--- /dev/null
+++ b/acct-user/avahi/avahi-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for avahi"
+ACCT_USER_ID=61
+ACCT_USER_GROUPS=( avahi )
+
+acct-user_add_deps
diff --git a/acct-user/avahi/metadata.xml b/acct-user/avahi/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/acct-user/avahi/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/acct-user/openntpd/Manifest b/acct-user/openntpd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/openntpd/metadata.xml b/acct-user/openntpd/metadata.xml
new file mode 100644
index 000000000000..4fb2c3dd4699
--- /dev/null
+++ b/acct-user/openntpd/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ henson@acm.org
+ Paul B. Henson
+
+
+ junghans@gentoo.org
+ Christoph Junghans (proxy)
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/openntpd/openntpd-0.ebuild b/acct-user/openntpd/openntpd-0.ebuild
new file mode 100644
index 000000000000..3658f986a7ea
--- /dev/null
+++ b/acct-user/openntpd/openntpd-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for openntpd daemon"
+ACCT_USER_ID=321
+ACCT_USER_GROUPS=( openntpd )
+ACCT_USER_HOME=/var/lib/openntpd/chroot
+ACCT_USER_HOME_OWNER=root:root
+
+acct-user_add_deps
diff --git a/acct-user/redmine/Manifest b/acct-user/redmine/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/redmine/metadata.xml b/acct-user/redmine/metadata.xml
new file mode 100644
index 000000000000..2c1710e359d4
--- /dev/null
+++ b/acct-user/redmine/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ azamat.hackimov@gmail.com
+ Azamat H. Hackimov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/redmine/redmine-0.ebuild b/acct-user/redmine/redmine-0.ebuild
new file mode 100644
index 000000000000..cb92a6fedf57
--- /dev/null
+++ b/acct-user/redmine/redmine-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Redmine application user"
+ACCT_USER_ID=451
+ACCT_USER_GROUPS=( redmine )
+acct-user_add_deps
diff --git a/acct-user/tss/Manifest b/acct-user/tss/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/tss/metadata.xml b/acct-user/tss/metadata.xml
new file mode 100644
index 000000000000..52d5228a45d4
--- /dev/null
+++ b/acct-user/tss/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ salah.coronya@gmail.com
+ Salah Coronya
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/tss/tss-0.ebuild b/acct-user/tss/tss-0.ebuild
new file mode 100644
index 000000000000..f6726ec183dd
--- /dev/null
+++ b/acct-user/tss/tss-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Trusted Software Stack for TPMs user"
+ACCT_USER_ID=59
+ACCT_USER_GROUPS=( tss )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 77db54da85a4..18a26d74f111 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
index f71cd9e95db4..eb3a3124531e 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
RDEPEND="
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
index 09737b71d1b7..5e34b940026b 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
RDEPEND="
>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/orca/orca-3.32.0.ebuild b/app-accessibility/orca/orca-3.32.0.ebuild
index 62a38fbeb256..825a0593022c 100644
--- a/app-accessibility/orca/orca-3.32.0.ebuild
+++ b/app-accessibility/orca/orca-3.32.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+braille"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b4f7a3400400..36147a7cd675 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/augeas/augeas-1.11.0-r1.ebuild b/app-admin/augeas/augeas-1.11.0-r1.ebuild
index 75dcd83cc457..c65ef253f0bc 100644
--- a/app-admin/augeas/augeas-1.11.0-r1.ebuild
+++ b/app-admin/augeas/augeas-1.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,7 @@ SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
IUSE="static-libs test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/libxml2
diff --git a/app-admin/augeas/augeas-1.11.0.ebuild b/app-admin/augeas/augeas-1.11.0.ebuild
index 2c3ae1c6c1bc..4712c7e3ec80 100644
--- a/app-admin/augeas/augeas-1.11.0.ebuild
+++ b/app-admin/augeas/augeas-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,6 +13,7 @@ SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
IUSE="static-libs test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/libxml2
diff --git a/app-admin/augeas/augeas-1.12.0.ebuild b/app-admin/augeas/augeas-1.12.0.ebuild
index 215eeb6342e1..b8d173872da7 100644
--- a/app-admin/augeas/augeas-1.12.0.ebuild
+++ b/app-admin/augeas/augeas-1.12.0.ebuild
@@ -13,6 +13,7 @@ SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="static-libs test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/libxml2
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 3cfe85f452f6..19cd08fe4faf 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,2 +1,3 @@
+DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
similarity index 54%
rename from app-admin/diamond/diamond-9999.ebuild
rename to app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 57df76bc0741..a05de260f80f 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
if [[ ${PV} = 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
S=${WORKDIR}/diamond-${PV}
else
- SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- S=${WORKDIR}/Diamond-${PV}
+ GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7 # python3 branch
+ SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ S=${WORKDIR}/Diamond-${GHASH}
fi
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 prefix
@@ -41,6 +42,34 @@ src_prepare() {
# adjust for Prefix
hprefixify bin/diamond*
+ # fix the version (not set in GitHub archive)
+ sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+ echo "${PV}" > version.txt || die
+ # fix psutil usage
+ sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
+ src/collectors/network/network.py || die
+ # fix symlink out of place
+ rm README.md || die
+ cp docs/index.md README.md || die
+
+ # this module isn't Python3 yet (lambda), if you use this and have a
+ # fix, let me know
+ rm src/diamond/handler/rrdtool.py || die
+
+ # forgotten conversion
+ sed -i \
+ -e 's/import Queue/import queue/' \
+ -e 's/Queue\.Full/queue.Full/' \
+ src/diamond/handler/queue.py || die
+ # fix usage of map as list
+ sed -i \
+ -e '/paths = map(str.strip, paths)/d' \
+ src/diamond/utils/classes.py || die
+ # send data as bytes
+ sed -i \
+ -e '/self.socket.sendall/s/data/str.encode(data)/' \
+ src/diamond/handler/graphite.py || die
+
distutils-r1_src_prepare
}
@@ -55,6 +84,7 @@ python_test() {
python_install() {
export VIRTUAL_ENV=1
distutils-r1_python_install
+ python_optimize
mv "${ED}"/usr/etc "${ED}"/ || die
rm "${ED}"/etc/diamond/*.windows # won't need these
sed -i \
diff --git a/app-admin/helm/metadata.xml b/app-admin/helm/metadata.xml
index 5ea3d38e4538..689215a977a4 100644
--- a/app-admin/helm/metadata.xml
+++ b/app-admin/helm/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ williamh@gentoo.org
+ William Hubbs
+
helm/helm
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 4ec9acb7a691..2ddd7a7efc8a 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 6af7a532eee7..38bb06b3e977 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,4 +1,5 @@
DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
DIST clamav-0.101.3.tar.gz 21389753 BLAKE2B f254846dad40bd9dda650ece9dd672ca040fe4779b4f46a5cfa087808711055745d02c65f24da9589420e979a777bc435f68d25f6940ebf283cd0a8f240908b5 SHA512 285e6011ef5b68683daae7287005b2a615d7ee2fb9dac28d6db347cf7fe101da627aaec800366e83551f41afb78c6b08517def7aa30d0f0c347e54344b0b14d3
DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3
+DIST clamav-0.101.5.tar.gz 21423304 BLAKE2B b6468595f79f2040b414bf288efcfcd41ffcba377595b5d829a3bc24ab92c4ad7585f5f15b55430f591c50e85a47d49e1597264249b80dfe931a449086de1077 SHA512 14e2f79573ed8bf885e4ba47ac22e713060d46e1704467f6c83c3a3abf37ffbd3a1b20bb0de87059a8df6faca9c10efe0f01cdfee54edb62ad863679013e1966
DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90
diff --git a/app-antivirus/clamav/clamav-0.101.5.ebuild b/app-antivirus/clamav/clamav-0.101.5.ebuild
new file mode 100644
index 000000000000..4872ce687bf5
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.101.5.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic user systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+
+CDEPEND="bzip2? ( app-arch/bzip2 )
+ clamdtop? ( sys-libs/ncurses:0 )
+ iconv? ( virtual/libiconv )
+ metadata-analysis-api? ( dev-libs/json-c:= )
+ milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+ >=sys-libs/zlib-1.2.2:=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sys-devel/libtool
+ || ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+ dev-libs/libmspack
+ xml? ( dev-libs/libxml2 )
+ elibc_musl? ( sys-libs/fts-standalone )
+ !!> "${ED}"/etc/conf.d/clamd <<-EOF
+ MILTER_NICELEVEL=19
+ START_MILTER=no
+ EOF
+
+ systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+ fi
+
+ if use doc; then
+ einstalldocs
+ doman docs/man/*.[1-8]
+ fi
+
+ for i in clamd freshclam clamav-milter
+ do
+ [[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+ done
+
+ prune_libtool_files --all
+}
+
+src_test() {
+ emake quick-check
+}
+
+pkg_postinst() {
+ if use milter ; then
+ elog "For simple instructions how to setup the clamav-milter read the"
+ elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+ fi
+ if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+ ewarn "You must run freshclam manually to populate the virus database files"
+ ewarn "before starting clamav for the first time.\n"
+ fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ad41d0d96d43..4387ec289694 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/file-roller/file-roller-3.32.2-r1.ebuild b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
index cc5f90b30467..6b9ff1f80b9f 100644
--- a/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
diff --git a/app-arch/gcab/gcab-1.3.ebuild b/app-arch/gcab/gcab-1.3.ebuild
index cde2e418f9fb..4ab82e430928 100644
--- a/app-arch/gcab/gcab-1.3.ebuild
+++ b/app-arch/gcab/gcab-1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
LICENSE="LGPL-2.1+"
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="gtk-doc +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index 0cdd2da33f04..517bfa843fb1 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/metadata.xml
@@ -5,6 +5,6 @@
hanno@gentoo.org
- theunarchiver
+ MacPaw/XADMaster
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index db358a2cdce7..4a59021a57d5 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index dd3a3d4598d5..c8600db1ee7b 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,3 +1 @@
-DIST cdemu-client-3.2.1.tar.bz2 43584 BLAKE2B d34c09203b7b4e70161d62aee48d531b083952174fd2357bf0fc7b69a0fd59200bedb9ca87fe2d2c18c953979c84e9db3fec4d5fb500375f0bcc155dcaf5cedb SHA512 913c26754d16c339d7ddb4e00cc7d5b754ad6cc7f1a156c9448b51ed09468cf9e8a2bc74ed123a621278d2ad281e447d33ee06c3416bc1d0d2e6c2becd539154
-DIST cdemu-client-3.2.2.tar.bz2 44305 BLAKE2B 3a656bfda48a502752cb2b14df413a26467a1512b867cc1519f3dfd21b764a8086135a70b13272f258eb079ce169f58af55665e56238a7ba57cf4e9d84f07751 SHA512 ab5c1b1c741945618581bedb18a6eebdcb55915dc811e4247f0c3afe17729f7fbfaaaec10302e444a2f237c5a1401aa402a614685a84c63442907982e759ff41
DIST cdemu-client-3.2.3.tar.bz2 44311 BLAKE2B 23451618897a5281478c9d70ded357089a4baaf47b22f36b4add9c5d2c899478629ce034cce0e593b501a127cdc1f5527f0aaf1951f709bf4c2d131e898045a2 SHA512 5d98870fa42bb639009dc6971747f252f3403eda882bffacf55f647193a1a9fb7a75ad69a7512da3abdcdeb64510b0f163ea997c4d75a804fa93880b62b03dd6
diff --git a/app-cdr/cdemu/cdemu-3.2.1.ebuild b/app-cdr/cdemu/cdemu-3.2.1.ebuild
deleted file mode 100644
index 2a76ff1648ec..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="
- dev-util/desktop-file-utils
- >=dev-util/intltool-0.21
- >=sys-devel/gettext-0.18
- virtual/pkgconfig"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- python_fix_shebang src/cdemu
-}
-
-src_configure() {
- local mycmakeargs=(
- -DPOST_INSTALL_HOOKS=OFF
- -DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-cdr/cdemu/cdemu-3.2.2.ebuild b/app-cdr/cdemu/cdemu-3.2.2.ebuild
deleted file mode 100644
index 76a0b4986339..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="
- dev-util/desktop-file-utils
- >=dev-util/intltool-0.21
- >=sys-devel/gettext-0.18
- virtual/pkgconfig"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
- cmake-utils_src_prepare
-
- python_fix_shebang src/cdemu
-}
-
-src_configure() {
- local mycmakeargs=(
- -DPOST_INSTALL_HOOKS=OFF
- -DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-cdr/cdemu/cdemu-3.2.3.ebuild b/app-cdr/cdemu/cdemu-3.2.3.ebuild
index 0929becda5a1..9786afa05476 100644
--- a/app-cdr/cdemu/cdemu-3.2.3.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
@@ -19,7 +19,9 @@ IUSE="+cdemu-daemon"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
DEPEND="
dev-util/desktop-file-utils
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 9850e9e6c623..8af625059d01 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,3 +1 @@
-DIST gcdemu-3.2.1.tar.bz2 52231 BLAKE2B f6b0025f6c5e79fe7312bf15b467327152e561db33f6190847e4e702cb98ff8005b37fe997c721b5c76cd64d64bafef1c015a9151c0ee200c52efcb849c93dba SHA512 c2da75d985981ccd0b44f210745670501fecd0ae7c60bde783fc5f91ab4c629c6eab9e8b35df906b5669b6518d3bdf36c5814b513c0f3e2d703659d23df1c82e
-DIST gcdemu-3.2.2.tar.bz2 52251 BLAKE2B 9defe9972e0ec1a594cc354113ef4877846a9abc152ea6768e7089c76b20e8cb488e2c988d92cc459abd10fbf4cdd9d2f5ad425b1ffd23dffca75d18352a0a3e SHA512 831c49e7929c379585fa48b0860054b8246c1798c783dc390edd781fca0e8c85450cb49d1e920e3f0ff29130c1049cd12e0c117851377557826803dfad9e8a8f
DIST gcdemu-3.2.3.tar.bz2 52229 BLAKE2B 9f8d0b6e04b438c0637f42875b144ad4d1a643b8f1216d868040121e417203ffedbf983fec235eb30bf9d11bcfe142e52c1c89966ac3b64442071d0897a9e8bf SHA512 1d31b9edeb111145c7dd438fc645c7513877fe89f78cf262c282bba2d2e7f9a99a8499e607bf00f880186bd4a37a8ebbcc5ba14e1e014254e767a8335396d6e2
diff --git a/app-cdr/gcdemu/gcdemu-3.2.1.ebuild b/app-cdr/gcdemu/gcdemu-3.2.1.ebuild
deleted file mode 100644
index 07325dc46248..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
- app-cdr/cdemu-daemon:0/7
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- gnome-base/librsvg:2
- x11-libs/gdk-pixbuf[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]"
-DEPEND="
- dev-util/desktop-file-utils
- >=dev-util/intltool-0.21
- sys-devel/gettext
- virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
- cmake-utils_src_prepare
- python_fix_shebang src/gcdemu
-}
-
-src_configure() {
- local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
diff --git a/app-cdr/gcdemu/gcdemu-3.2.2.ebuild b/app-cdr/gcdemu/gcdemu-3.2.2.ebuild
deleted file mode 100644
index 1e96f5a37523..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
- app-cdr/cdemu-daemon:0/7
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- gnome-base/librsvg:2
- x11-libs/gdk-pixbuf[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]"
-DEPEND="
- dev-util/desktop-file-utils
- >=dev-util/intltool-0.21
- sys-devel/gettext
- virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
- cmake-utils_src_prepare
- python_fix_shebang src/gcdemu
-}
-
-src_configure() {
- local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_schemas_update
-}
diff --git a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
index c5330923b91f..0b62f16b24be 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
@@ -20,7 +20,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# librsvg for pixbuf-loader
RDEPEND="${PYTHON_DEPS}
app-cdr/cdemu-daemon:0/7
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
gnome-base/librsvg:2
x11-libs/gdk-pixbuf[introspection]
x11-libs/gtk+:3[introspection]
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c1f97f50799a..1bb0f8890db9 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/seahorse/seahorse-3.32.2.ebuild b/app-crypt/seahorse/seahorse-3.32.2.ebuild
index ff2d19dfe21b..a23ee02bd5aa 100644
--- a/app-crypt/seahorse/seahorse-3.32.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.44:2
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..535dcd41a597
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-apps/dbus:=
+ dev-libs/glib:=
+ app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+ acct-group/tss
+ acct-user/tss
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+ dev-util/gdbus-codegen"
+
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test unit) \
+ --disable-defaultflags \
+ --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+ --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+ --with-systemdpresetdisable \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..e2b86a17e071
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.2.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/0" # sublot is libtss2-sys number
+KEYWORDS="~amd64"
+IUSE="doc +gcrypt openssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ gcrypt? ( !openssl )
+ openssl? ( !gcrypt )
+ || ( gcrypt openssl )"
+
+RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
+ openssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ acct-group/tss
+ acct-user/tss
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+ local CONFIG_CHECK=" \
+ ~TCG_TPM
+ "
+ linux-info_pkg_setup
+ kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_configure() {
+ econf \
+ $(use_enable doc doxygen-doc) \
+ $(use_enable static-libs static) \
+ $(use_enable test unit) \
+ --disable-defaultflags \
+ --with-crypto="$(usex gcrypt gcrypt ossl)" \
+ --with-udevrulesdir="$(get_udevdir)/rules.d" \
+ --with-udevrulesprefix=60-
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
new file mode 100644
index 000000000000..384d8736beb8
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info readme.gentoo-r1 systemd udev
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net"
+SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE="doc libressl selinux" # gtk
+
+# gtk support presently does NOT compile.
+# gtk? ( >=x11-libs/gtk+-2 )
+
+DEPEND="acct-group/tss
+ acct-user/tss
+ >=dev-libs/glib-2
+ !libressl? ( >=dev-libs/openssl-0.9.7:0= )
+ libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-tcsd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
+ "${FILESDIR}/${P}-libressl.patch"
+)
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+ If you have problems starting tcsd, please check permissions and
+ ownership on /dev/tpm* and ~tss/system.data
+"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+ # Check for driver (not sure it can be an rdep, because ot depends on the
+ # version of virtual/linux-sources... Is that supported by portage?)
+ linux-info_pkg_setup
+ local tpm_kernel_version tpm_kernel_present tpm_module
+ kernel_is ge 2 6 12 && tpm_kernel_version="yes"
+ if linux_config_exists; then
+ linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
+ else
+ ewarn "No kernel configuration could be found."
+ fi
+ has_version app-crypt/tpm-emulator && tpm_module="yes"
+ if [[ -n "${tpm_kernel_present}" ]]; then
+ einfo "Good, you seem to have in-kernel TPM support."
+ elif [[ -n "${tpm_module}" ]]; then
+ einfo "Good, you seem to have TPM support with the external module."
+ if [[ -n "${tpm_kernel_version}" ]]; then
+ elog
+ elog "Note that since you have a >=2.6.12 kernel, you could use"
+ elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
+ fi
+ elif [[ -n "${tpm_kernel_version}" ]]; then
+ eerror
+ eerror "To use this package, you will have to activate TPM support"
+ eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
+ eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
+ eerror
+ else
+ eerror
+ eerror "To use this package, you should install a TPM driver."
+ eerror "You can have the following options:"
+ eerror " - install app-crypt/tpm-emulator"
+ eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
+ eerror
+ fi
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # econf --with-gui=$(usex gtk gtk openssl)
+ econf --with-gui=openssl
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+
+ keepdir /var/lib/tpm
+ use doc && dodoc doc/*
+ newinitd "${FILESDIR}"/tcsd.initd tcsd
+ newconfd "${FILESDIR}"/tcsd.confd tcsd
+ systemd_dounit "${FILESDIR}"/tcsd.service
+ udev_dorules "${FILESDIR}"/61-trousers.rules
+ fowners tss:tss /var/lib/tpm
+ readme.gentoo_create_doc
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 54cc7883fd35..d320bf7e3039 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index e7275cf1c9fc..9024553a992c 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1 +1,2 @@
+DIST gimp-help-2.10.0.tar.bz2 187092180 BLAKE2B 29a7fbe3fcb6f3210aeda4bc514d7e0eeca05f9fabd3b9022c7ed1e5a9432876cc3bf530632648e2eb50509add4e387106d9705a1c17469e33496daec737d21b SHA512 2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a
DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
diff --git a/app-doc/gimp-help/gimp-help-2.10.0.ebuild b/app-doc/gimp-help/gimp-help-2.10.0.ebuild
new file mode 100644
index 000000000000..7041b5998ba7
--- /dev/null
+++ b/app-doc/gimp-help/gimp-help-2.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1
+
+DESCRIPTION="GNU Image Manipulation Program help files"
+HOMEPAGE="https://docs.gimp.org/"
+SRC_URI="mirror://gimp/help/${P}.tar.bz2"
+
+LICENSE="FDL-1.2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+ sys-devel/gettext
+"
+
+DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
+ dev-libs/libxslt
+"
+
+src_configure() {
+ econf --without-gimp
+}
diff --git a/app-doc/gimp-help/metadata.xml b/app-doc/gimp-help/metadata.xml
index 6f49eba8f496..e7e7a5da0ad0 100644
--- a/app-doc/gimp-help/metadata.xml
+++ b/app-doc/gimp-help/metadata.xml
@@ -1,5 +1,12 @@
-
+
+ torokhov-s-a@yandex.ru
+ Sergey Torokhov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index aba478636ca6..66e094e100b0 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 8227d4b3a671..9a48a465e91e 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -82,9 +82,6 @@ BDEPEND="alsa? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )"
-RDEPEND="${RDEPEND}
- ! ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="sys-apps/texinfo"
diff --git a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
index e5370dc7ea27..61bda5369fd0 100644
--- a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
+++ b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,9 +13,6 @@ LICENSE="HPND"
SLOT="0"
KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86"
-DEPEND="! ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="doc? (
- >=dev-python/docutils-0.7
- virtual/latex-base )
-"
-RDEPEND=""
-
-DISTUTILS_IN_SOURCE_BUILD=1
-SITEFILE="50${PN}-gentoo.el"
-
-python_prepare_all() {
- sed \
- -e '/pymacs-python-command/s/@PYTHON@/python/' \
- -i pymacs.el.in || die
- distutils-r1_python_prepare_all
-}
-
-# called by distutils-r1 for every python implementation
-python_configure() {
- # pre-process the files but don't run distutils
- emake PYSETUP=: PYTHON=${EPYTHON}
-}
-
-# called once
-python_compile_all() {
- elisp_src_compile
- if use doc; then
- VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
- fi
-}
-
-python_install_all() {
- elisp_src_install
-
- distutils-r1_python_install_all
- dodoc pymacs.rst
- use doc && dodoc pymacs.pdf
-}
diff --git a/app-emacs/with-editor/with-editor-2.8.3.ebuild b/app-emacs/with-editor/with-editor-2.8.3.ebuild
index 910b1f782755..2a7e31b64419 100644
--- a/app-emacs/with-editor/with-editor-2.8.3.ebuild
+++ b/app-emacs/with-editor/with-editor-2.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 82783db56113..0f11ca194c3b 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
index 909cd4f9426f..ed26fecf1f8a 100644
--- a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
@@ -12,8 +12,7 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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"
-RDEPEND="!=app-admin/eselect-1.2.3"
+RDEPEND=">=app-admin/eselect-1.2.3"
S="${WORKDIR}/${MY_P}"
diff --git a/app-eselect/eselect-repository/eselect-repository-7.ebuild b/app-eselect/eselect-repository/eselect-repository-7.ebuild
index f5e003885de3..c1f815b46494 100644
--- a/app-eselect/eselect-repository/eselect-repository-7.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-7.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7,3_8} )
inherit python-single-r1
DESCRIPTION="Manage repos.conf via eselect"
@@ -18,7 +18,9 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="${PYTHON_DEPS}
app-admin/eselect
- dev-python/lxml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
net-misc/wget"
src_compile() {
diff --git a/app-eselect/eselect-repository/eselect-repository-9999.ebuild b/app-eselect/eselect-repository/eselect-repository-9999.ebuild
deleted file mode 100644
index e5180bc8bea0..000000000000
--- a/app-eselect/eselect-repository/eselect-repository-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/eselect-repository.git"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-inherit git-r3 python-single-r1
-
-DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
- app-admin/eselect
- dev-python/lxml[${PYTHON_USEDEP}]
- net-misc/wget"
-
-src_compile() {
- MAKEARGS=(
- PREFIX="${EPREFIX}/usr"
- SYSCONFDIR="${EPREFIX}/etc"
- SHAREDSTATEDIR="${EPREFIX}/var"
- ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
- )
-
- emake "${MAKEARGS[@]}"
- python_fix_shebang eselect-repo-helper
-}
-
-src_install() {
- emake "${MAKEARGS[@]}" DESTDIR="${D}" install
- keepdir /var/db/repos
- einstalldocs
-}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index af3e7f01fc1b..9835140de4a0 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/honggfuzz/Manifest b/app-forensics/honggfuzz/Manifest
index 126fd2351cf5..90bef5d92c06 100644
--- a/app-forensics/honggfuzz/Manifest
+++ b/app-forensics/honggfuzz/Manifest
@@ -1,2 +1,2 @@
-DIST honggfuzz-1.8.tar.gz 78491883 BLAKE2B 359bc3c78046bded1003d08795f5c1eb65b2dc9e7e0952bb772d73840c3886acd370bce3973693b45b0db3607bb8b5c3a648dbbad5e6b8278000762f126731e5 SHA512 4643deca357dccaa6f229b6c56a040b6b16682a3de7396dcbecb7fba6075beef8381a8c4699b602c8677e06e90b7c870393b027126242fcc326c485b741352f0
DIST honggfuzz-1.9.tar.gz 78491908 BLAKE2B 961562d87e063804cb6a91d6ba0cffd0a4c3b3cb140f93a9362bd6749b8da251f7203e9ff7643bbad561620a8fdb9ca755758beb45fc46194c5907ecafcf0d2a SHA512 07ee10de723b14bc8ed9df9de196bcf308d8c10a825ba18b20d4f881d22c4254a45455bcbf965653572d9f71b2bff009284a34d0d5a6f879114b149b456c2eda
+DIST honggfuzz-2.0.tar.gz 65205954 BLAKE2B fb01fdb12cd5bf9a7c316c9df3a4ac9eb91ee535cbcdbb93436e7abcb81405a3af0fb5140b935abe44d11f5917f6f5189d697e86d3e81abfd9da38db2f899c36 SHA512 91e633ffe439aae6cb944f71cd5998f8adc2f1e6892c17b6d7876d707b3f167008a0574ad4b5671b82371cbe21e6c536acb148c0b844665fb3789c5e7fda52ba
diff --git a/app-forensics/honggfuzz/files/honggfuzz-2.0-no-werror.patch b/app-forensics/honggfuzz/files/honggfuzz-2.0-no-werror.patch
new file mode 100644
index 000000000000..c5d6b8060450
--- /dev/null
+++ b/app-forensics/honggfuzz/files/honggfuzz-2.0-no-werror.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,7 @@ LD = $(CC)
+ BIN := honggfuzz
+ HFUZZ_CC_BIN := hfuzz_cc/hfuzz-cc
+ HFUZZ_CC_SRCS := hfuzz_cc/hfuzz-cc.c
+-COMMON_CFLAGS := -std=c11 -I/usr/local/include -D_GNU_SOURCE -Wall -Wextra -Werror -Wno-format-truncation -Wno-override-init -I.
++COMMON_CFLAGS := -std=c11 -I/usr/local/include -D_GNU_SOURCE -Wall -Wextra -Wno-format-truncation -Wno-override-init -I.
+ COMMON_LDFLAGS := -pthread -lm
+ COMMON_SRCS := $(sort $(wildcard *.c))
+ CFLAGS ?= -O3 -mtune=native -funroll-loops
diff --git a/app-forensics/honggfuzz/honggfuzz-1.8.ebuild b/app-forensics/honggfuzz/honggfuzz-2.0.ebuild
similarity index 91%
rename from app-forensics/honggfuzz/honggfuzz-1.8.ebuild
rename to app-forensics/honggfuzz/honggfuzz-2.0.ebuild
index 4aea054863e9..c6f560e1a1ed 100644
--- a/app-forensics/honggfuzz/honggfuzz-1.8.ebuild
+++ b/app-forensics/honggfuzz/honggfuzz-2.0.ebuild
@@ -16,7 +16,7 @@ IUSE=""
RDEPEND="
>=sys-libs/binutils-libs-2.29:=
- sys-libs/libunwind
+ sys-libs/libunwind:=
"
DEPEND="${RDEPEND}"
@@ -29,7 +29,7 @@ DOCS=(
)
PATCHES=(
- "${FILESDIR}"/${PN}-1.7-no-werror.patch
+ "${FILESDIR}"/${PN}-2.0-no-werror.patch
"${FILESDIR}"/${PN}-1.1-binutils-2.29.patch
)
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 60bb0a9381b8..2c3039532c4f 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index a54eae337fe9..771ae28c8441 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,4 +1,2 @@
-DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a
-DIST librime-1.3.1.tar.gz 8598357 BLAKE2B cd6bc6b63a89f7f11e78ceaf92007c099be34ce38f26d611b67a3d8f868a27a0e4de7b94da44d8483618f37a0c2bcfd3a1bc1c1ecb4f81829f8e12fdd777e283 SHA512 b35d3635fd776ed9be32c0998e4aac441433bc9e624765a57582690108cccf5c3beaedad4f8f1682d99533384cd10996ee8c18fd5adcea70878d6a410124922e
DIST librime-1.4.0.tar.gz 8609316 BLAKE2B cce58c398057ac82f076e3b9e9a25cd6410e738460bd58277a9e3ed6cd11e80922bbb30e8b42828cdd5dd83f6058794b4b32fedb359315186b018ca88161794d SHA512 da68983638c6f25d994060a607f2ccab8917a71dbf10b9c6f1140c87c9ef4124e29a1d0ef16bbd0edc9a3a22bd5845aa894888d678607db372750f300638f562
DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild
deleted file mode 100644
index da4b3ecb895a..000000000000
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2012-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Rime Input Method Engine, the core library"
-HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
-SRC_URI="https://github.com/rime/${PN}/archive/rime-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-i18n/opencc:=
- dev-cpp/glog:=
- dev-cpp/yaml-cpp:=
- ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-i18n/opencc:=
- dev-cpp/glog:=
- dev-cpp/yaml-cpp:=
-
-
+
+ kripton@kripserver.net
+ Jannis Achstetter
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
mcallegari/qlcplus
diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
index 3f618215d189..41463fba3ff4 100644
--- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
@@ -12,7 +12,9 @@ SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.t
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
RDEPEND="
|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
diff --git a/app-misc/qlcplus/qlcplus-4.12.2.ebuild b/app-misc/qlcplus/qlcplus-4.12.2.ebuild
new file mode 100644
index 000000000000..9b5db416960b
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.12.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev virtualx xdg
+
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
+S="${WORKDIR}/qlcplus-QLC-_${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
+RDEPEND="
+ dev-embedded/libftdi:=
+ dev-libs/glib:2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ media-libs/alsa-lib
+ media-libs/libmad
+ media-libs/libsndfile
+ sci-libs/fftw:3.0
+ virtual/libusb:0
+ virtual/libusb:1
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+"
+
+src_prepare() {
+ default
+
+ sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+ -i variables.pri || die
+
+ ## Remove Werror-flag since there are some warnings with gcc-9.x
+ sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
+ -i variables.pri || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+ virtx emake check
+}
diff --git a/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild b/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
new file mode 100644
index 000000000000..269ea246700c
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-5.0.0_alpha3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils udev virtualx xdg
+
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
+SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz"
+S="${WORKDIR}/qlcplus-QLC-_${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
+RDEPEND="
+ dev-embedded/libftdi:=
+ dev-libs/glib:2
+ dev-qt/qt3d:5[qml]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets,qml]
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ media-libs/alsa-lib
+ media-libs/libmad
+ media-libs/libsndfile
+ sci-libs/fftw:3.0
+ virtual/libusb:0
+ virtual/libusb:1
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+"
+
+src_prepare() {
+ default
+
+ sed -e "/UDEVRULESDIR/s:/etc/udev/rules.d:$(get_udevdir)/rules.d:" \
+ -i variables.pri || die
+
+ ## Remove Werror-flag since there are some warnings with gcc-9.x
+ sed -e "s/QMAKE_CXXFLAGS += -Werror/#&/g" \
+ -i variables.pri || die
+}
+
+src_configure() {
+ eqmake5 CONFIG+=qmlui
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+src_test() {
+ virtx emake check
+}
+
+pkg_postinst() {
+ elog "Some configurations of KDE Plasma break the layout of"
+ elog "QLC+ 5's QML UI."
+ elog "As a workaround, try those environment variables:"
+ elog " export XDG_CURRENT_DESKTOP=GNOME"
+ elog "OR"
+ elog " export QT_QPA_PLATFORMTHEME=gtk3"
+}
diff --git a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
index bba9670ab646..f99327779e48 100644
--- a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist ra
REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
RDEPEND="
diff --git a/app-misc/tracker/tracker-2.2.2.ebuild b/app-misc/tracker/tracker-2.2.2.ebuild
index 83eff7211bab..0000cf23c6b1 100644
--- a/app-misc/tracker/tracker-2.2.2.ebuild
+++ b/app-misc/tracker/tracker-2.2.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/2.0"
IUSE="gtk-doc +miners networkmanager stemmer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
#RESTRICT="!test? ( test )"
PV_SERIES=$(ver_cut 1-2)
diff --git a/app-misc/votrify/votrify-5.ebuild b/app-misc/votrify/votrify-5.ebuild
index 179f0affaf98..9715317888eb 100644
--- a/app-misc/votrify/votrify-5.ebuild
+++ b/app-misc/votrify/votrify-5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
inherit python-single-r1
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 5fe30076aaa2..c37864e2bc40 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index bc1bb961c1a7..e8d12ffa74f8 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,2 +1 @@
DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
-DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
deleted file mode 100644
index d62db93663ef..000000000000
--- a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Thu, 2 May 2019 00:08:12 +0200
-Subject: [PATCH] Fix build with poppler-0.76
-
-findPage(int num, int gen) -> findPage(const Ref ref)
-
-https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e
----
- scribus/plugins/import/pdf/slaoutput.cpp | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index fe9794a65..b25082de6 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -429,8 +429,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- {
- if (dst->isPageRef())
- {
-- Ref dstr = dst->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dst->getPageRef());
- }
- else
- pagNum = dst->getPageNum();
-@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- {
- if (dstn->isPageRef())
- {
-- Ref dstr = dstn->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dstn->getPageRef());
- }
- else
- pagNum = dstn->getPageNum();
-@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- {
- if (dst->isPageRef())
- {
-- Ref dstr = dst->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dst->getPageRef());
- }
- else
- pagNum = dst->getPageNum();
-@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- {
- if (dstn->isPageRef())
- {
-- Ref dstr = dstn->getPageRef();
-- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+ pagNum = pdfDoc->findPage(dstn->getPageRef());
- }
- else
- pagNum = dstn->getPageNum();
---
-2.21.0
-
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
deleted file mode 100644
index 1926b62bb623..000000000000
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=a6cf8dce47922ebe3fca131316236e3aa7ca2d9b
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
- local lang=${1/_/-}
- case $1 in
- # Retain the following, which have a specific subtag
- de_*|en_*|pt_*|zh_*) ;;
- # Consider all other xx_XX as duplicates of the generic xx tag
- *_*) lang=${1%%_*} ;;
- esac
- echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
- l=$(map_lang ${l})
- [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
- prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="${PYTHON_DEPS}
- app-text/libmspub
- app-text/libqxp
- app-text/poppler:=
- dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
- dev-libs/librevenge
- dev-libs/libxml2
- dev-qt/qtcore:5
- dev-qt/qtgui:5[-gles2]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:0=[icu]
- media-libs/lcms:2
- media-libs/libcdr
- media-libs/libfreehand
- media-libs/libpagemaker
- media-libs/libpng:0=
- media-libs/libvisio
- media-libs/libzmf
- media-libs/tiff:0
- net-print/cups
- sys-libs/zlib[minizip]
- virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.62:= )
- hunspell? ( app-text/hunspell:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )
- osg? ( dev-games/openscenegraph:= )
- pdf? ( app-text/podofo:0= )
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/ghostscript-gpl
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.3-docdir.patch
- "${FILESDIR}"/${PN}-1.5.3-fpic.patch
-)
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-src_prepare() {
- rm -r codegen/cheetah || die
- cat > cmake/modules/FindZLIB.cmake <<- EOF || die
- find_package(PkgConfig)
- pkg_check_modules(ZLIB minizip zlib)
- SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
- SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
- MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
- EOF
-
- sed \
- -e "/^\s*unzip\.[ch]/d" \
- -e "/^\s*ioapi\.[ch]/d" \
- -i scribus/CMakeLists.txt Scribus.pro || die
- rm scribus/ioapi.[ch] || die
-
- sed \
- -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
- -i resources/templates/CMakeLists.txt || die
-
- sed \
- -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
- -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-
- has_version ">=app-text/poppler-0.76.0" && PATCHES+=( "${FILESDIR}"/${P}-poppler-0.76.patch )
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # bug #550818
- append-cppflags -DHAVE_MEMRCHR
-
- local _lang lang langs
- for _lang in ${IUSE_L10N}; do
- lang=$(map_lang ${_lang})
- if use l10n_${lang}; then
- # From the CMakeLists.txt
- # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
- langs+=";${_lang}"
- else
- # Don't install localized documentation
- sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
- safe_delete \
- ./resources/dicts/README_${_lang}.txt \
- ./resources/dicts/README_hyph_${_lang}.txt \
- ./resources/dicts/hyph_${_lang}.dic \
- ./resources/loremipsum/${_lang}.xml
- fi
- sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
- safe_delete \
- ./resources/dicts/README_en_EN.txt \
- ./resources/dicts/README_hyph_en_EN.txt \
- ./resources/dicts/hyph_en_EN.dic \
- ./resources/loremipsum/en_EN.xml
- done
-
- local mycmakeargs=(
- -DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DWANT_DISTROBUILD=ON
- -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
- -DWANT_GUI_LANG="${langs#;};en"
- -DWITH_PODOFO="$(usex pdf)"
- -DWITH_BOOST="$(usex boost)"
- -DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
- -DWANT_NOOSG="$(usex !osg)"
- -DWANT_DEBUG="$(usex debug)"
- -DWANT_HEADERINSTALL="$(usex !minimal)"
- -DWANT_HUNSPELL="$(usex hunspell)"
- -DWANT_NOEXAMPLES="$(usex !examples)"
- -DWANT_NOTEMPLATES="$(usex !templates)"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- local lang _lang
- # en_EN can be deleted always
- for _lang in ${IUSE_L10N}; do
- lang=$(map_lang ${_lang})
- if ! use l10n_${lang}; then
- safe_delete "${ED%/}"/usr/share/man/${_lang}
- fi
- done
-
- if ! use scripts; then
- rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
- elif ! use tk; then
- rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
- fi
-
- use scripts && \
- python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
- python_optimize "${ED%/}"/usr/share/scribus/scripts
-
- mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
- ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
- cat >> "${T}"/COPYING <<- EOF || die
- ${PN} is licensed under the "${LICENSE}".
- Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
- EOF
- dodoc "${T}"/COPYING
- docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
- local size
- for size in 16 32 128 256; do
- newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
- done
- newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
- doicon resources/iconsets/*/scribus.png
- domenu scribus.desktop
-}
-
-safe_delete () {
- local x
- for x in ${@}; do
- if [[ -d "${x}" ]]; then
- ebegin "Deleting ${x} recursively"
- rm -r "${x}" || die
- eend $?
- elif [[ -f "${x}" ]]; then
- ebegin "Deleting ${x}"
- rm "${x}" || die
- eend $?
- fi
- done
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 3be62d55ad9c..82ccdadb9c69 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index c2c1a1925d4b..5da14753b7aa 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,2 +1 @@
-DIST gverify-1.tar.gz 4558 BLAKE2B 193fb63dd3816b4577314199e4f8606a20f60d883f22f36636f1dba4c3fe4a701e89fd352b33ee3ce5bfb10b39e351f971aa55c8cd6eef493fc492e2c4c5d17e SHA512 f666306973bf173683edd845499ea1b244ffc9254ed0d816660022f871e7cec480d452fd962db5417b23d3101496b80a49caece29cbddf3058e2a21ec945a268
DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
diff --git a/app-portage/gverify/gverify-1.ebuild b/app-portage/gverify/gverify-1.ebuild
deleted file mode 100644
index 43ea384eac01..000000000000
--- a/app-portage/gverify/gverify-1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit python-single-r1
-
-DESCRIPTION="gentoo.git signature verification tool"
-HOMEPAGE="https://github.com/mgorny/gverify"
-SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
- app-crypt/gnupg
- dev-vcs/git"
-DEPEND="${PYTHON_DEPS}"
-
-src_compile() {
- emake PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
- emake install DESTDIR="${D}" PREFIX=/usr
- dodoc README
-}
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index 18068b633e4c..0d9a0cfd660a 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
inherit python-single-r1
DESCRIPTION="gentoo.git signature verification tool"
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
index 13bc05bbc7b7..6a24d09cce3a 100644
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ b/app-portage/kuroo/kuroo-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ESVN_REPO_URI="https://svn.code.sf.net/p/kuroo/code/kuroo4/trunk"
-inherit cmake-utils subversion xdg-utils
+inherit ecm subversion
DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
HOMEPAGE="https://sourceforge.net/projects/kuroo/"
@@ -14,12 +14,8 @@ KEYWORDS=""
SLOT="0"
IUSE=""
-BDEPEND="
- kde-frameworks/extra-cmake-modules:5
-"
DEPEND="
dev-db/sqlite:3
- dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
kde-frameworks/kauth:5
@@ -48,11 +44,5 @@ pkg_postinst() {
elog "portage's summary.log size reasonable to view in the history page."
fi
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
+ ecm_pkg_postinst
}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 4958fa0590cd..9752e4094223 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index e53bcde1d09c..cb45623e7ccd 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,2 +1,3 @@
+DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7
DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
diff --git a/app-shells/bash-completion/bash-completion-2.10.ebuild b/app-shells/bash-completion/bash-completion-2.10.ebuild
new file mode 100644
index 000000000000..0c09bd75cb84
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.10.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASHCOMP_P=bashcomp-2.0.3
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit bash-completion-r1 python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+ https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+ eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE="+eselect test"
+RESTRICT="test"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+ sys-apps/miscfiles
+ !!net-fs/mc"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ app-misc/dtach
+ dev-util/dejagnu
+ dev-tcltk/tcllib
+ $(python_gen_any_dep '
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ ')
+ )"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+strip_completions() {
+ # Remove unwanted completions.
+ local strip_completions=(
+ # Slackware package stuff, quite generic names cause collisions
+ # (e.g. with sys-apps/pacman)
+ explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+ # Debian/Red Hat network stuff
+ ifdown ifup ifquery ifstatus
+
+ # Installed in app-editors/vim-core
+ xxd
+
+ # Now-dead symlinks to deprecated completions
+ hd ncal
+ )
+ if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
+ strip_completions+=(
+ freebsd-update kldload kldunload portinstall portsnap
+ pkg_deinstall pkg_delete pkg_info
+ )
+ fi
+
+ local file
+ for file in "${strip_completions[@]}"; do
+ rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+ die "stripping ${file} failed"
+ done
+
+ # remove deprecated completions (moved to other packages)
+ rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+python_check_deps() {
+ has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ use eselect &&
+ eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
+ # Bug 543100, update bug 601194
+ eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+ eapply_user
+}
+
+src_test() {
+ # Tests need an interactive shell, #477066
+ # idea stolen from:
+ # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+ # real-time output of the log ;-)
+ touch "${T}/dtach-test.log" || die
+ tail -f "${T}/dtach-test.log" &
+ local tail_pid=${!}
+
+ # override the default expect timeout and buffer size to avoid tests
+ # failing randomly due to cold cache, busy system or just more output
+ # than upstream anticipated (they run tests on pristine docker
+ # installs of binary distros)
+ nonfatal dtach -N "${T}/dtach.sock" \
+ bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \
+ &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+ kill "${tail_pid}"
+ [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+ [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+ # work-around race conditions, bug #526996
+ mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+ emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+ strip_completions
+
+ dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+ # install the eselect module
+ if use eselect; then
+ insinto /usr/share/eselect/modules
+ doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+ doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+ fi
+}
+
+pkg_postinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -lt 2.1-r90; then
+ ewarn "For bash-completion autoloader to work, all completions need to"
+ ewarn "be installed in /usr/share/bash-completion/completions. You may"
+ ewarn "need to rebuild packages that installed completions in the old"
+ ewarn "location. You can do this using:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+ ewarn
+ ewarn "After the rebuild, you should remove the old setup symlinks:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+ fi
+ done
+
+ if has_version 'app-shells/zsh'; then
+ elog
+ elog "If you are interested in using the provided bash completion functions with"
+ elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+ elog " http://www.zsh.org/mla/workers/2003/msg00046.html"
+ elog
+ fi
+}
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
index 220069bc3750..a49edc05f8d6 100644
--- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -22,7 +22,6 @@ RESTRICT="test"
# completion collision with net-fs/mc
RDEPEND=">=app-shells/bash-4.3_p30-r1:0
sys-apps/miscfiles
- !app-eselect/eselect-bashcomp
!!net-fs/mc"
DEPEND="app-arch/xz-utils
test? (
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index ee27e7fcf8fe..4fdb9c19f7fd 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
# completion collision with net-fs/mc
RDEPEND=">=app-shells/bash-4.3_p30-r1:0
sys-apps/miscfiles
- !app-eselect/eselect-bashcomp
!!net-fs/mc"
DEPEND="
test? (
@@ -93,6 +92,11 @@ src_prepare() {
eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
fi
+ # our setup is close enough to container to cause the same tests
+ # to fail
+ sed -i -e '/def in_container/a \
+ return True' test/t/conftest.py || die
+
eautoreconf
}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2e8f3e2a190b..b621684aeeb5 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 272fed2bb5cb..33b91a41bf4e 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,8 +23,7 @@ RDEPEND="app-text/ghostscript-gpl
emacs? ( virtual/emacs )
latex? ( virtual/latex-base )
nls? ( virtual/libintl )
- userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
- userland_BSD? ( sys-freebsd/freebsd-ubin )"
+ userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )"
DEPEND="${RDEPEND}
>=dev-util/gperf-2.7.2
virtual/yacc
@@ -77,6 +76,9 @@ src_prepare() {
# fix CVE-2001-1593, bug 507024
eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
+ # specify encoding explicitly, bug #695918
+ eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
+
# fix building with sys-devel/automake >= 1.12, bug 420503
rm -f {.,ogonkify}/aclocal.m4 || die
sed -i \
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
new file mode 100644
index 000000000000..df2a60f395c5
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/695918
+
+The patchs fixes build failure against texinfo-6.7+:
+```
+Malformed UTF-8 character: \xcb\xeb (unexpected non-continuation byte 0xeb, immediately after start byte 0xcb;
+need 2 bytes, got 1) in pattern match (m//) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
+Malformed UTF-8 character (fatal) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
+make[2]: *** [Makefile:472: a2ps.info] Error 25
+```
+
+Fixed-by: Neil Bothwick
+--- a/doc/a2ps.texi~ 2019-11-24 18:51:07.000000000 +0000
++++ a/doc/a2ps.texi 2019-11-24 18:56:30.390438433 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo @c -*- texinfo -*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename a2ps.info
+ @settitle General Purpose PostScript Generating Utility
+ @c @setchapternewpage odd
+
+--- a/doc/regex.texi~ 2002-03-04 18:46:24.000000000 +0000
++++ a/doc/regex.texi 2019-11-24 18:56:42.861052598 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename regex.info
+ @settitle Regex
+ @c %**end of header
+
+--- a/ogonkify/doc/ogonkify.texi~ 2007-12-29 02:09:38.000000000 +0000
++++ a/ogonkify/doc/ogonkify.texi 2019-11-24 18:57:03.173424149 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename ogonkify.info
+ @settitle Ogonkify
+ @setchapternewpage off
diff --git a/app-text/evince/evince-3.32.1.ebuild b/app-text/evince/evince-3.32.1.ebuild
index c236ab722168..e572562893a4 100644
--- a/app-text/evince/evince-3.32.1.ebuild
+++ b/app-text/evince/evince-3.32.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
index 5e70c5b990bd..7246b7297e28 100644
--- a/app-text/poppler/poppler-0.82.0.ebuild
+++ b/app-text/poppler/poppler-0.82.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 ~sh sparc ~x86 ~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 s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/92" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r4.ebuild
index 417f19df1af8..ae11755e6dd6 100644
--- a/app-text/texlive-core/texlive-core-2019-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r4.ebuild
@@ -83,7 +83,6 @@ MODULAR_X_DEPEND="X? (
)"
COMMON_DEPEND="${MODULAR_X_DEPEND}
- !dev-tex/luatex
sys-libs/zlib
>=media-libs/libpng-1.2.43-r2:0=
media-libs/gd[png]
@@ -95,12 +94,12 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
dev-libs/mpfr:0=
xetex? (
>=media-libs/harfbuzz-1.4.5[icu,graphite]
- >=dev-libs/icu-50:=
>=app-text/teckit-2.5.3
media-libs/fontconfig
media-gfx/graphite2
)
media-libs/freetype:2
+ >=dev-libs/icu-50:=
>=dev-libs/kpathsea-6.2.3
cjk? ( >=dev-libs/ptexenc-1.3.7 )
>=app-text/poppler-0.76.1:="
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
deleted file mode 100644
index a0065346f730..000000000000
--- a/app-text/wklej/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wklej-0.2.1.tar.gz 4370 BLAKE2B 616126936c37f8f727167745eecca27b7f1ba844b7396bbd2c205c804c90c2632dddb1b74bd9d66cd040c7eaa9a8e179281372b96eeb6d3d8f09ae27250563c7 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c
diff --git a/app-text/wklej/metadata.xml b/app-text/wklej/metadata.xml
deleted file mode 100644
index a6ba9840e60b..000000000000
--- a/app-text/wklej/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
-
-
diff --git a/app-text/wklej/wklej-0.2.1-r1.ebuild b/app-text/wklej/wklej-0.2.1-r1.ebuild
deleted file mode 100644
index 1fbdd5b27cc5..000000000000
--- a/app-text/wklej/wklej-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
-
-inherit python-single-r1
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+vim"
-# the vim script is python2-only...
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- vim? ( ^^ ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- vim? ( app-editors/vim[python,$(python_gen_usedep 'python2*')] )"
-
-S=${WORKDIR}
-
-src_install() {
- if use vim; then
- insinto /usr/share/vim/vimfiles/plugin
- doins ${PN}.vim
- fi
-
- python_doscript ${PN}
- dodoc README wklejrc
-}
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index d4510ed309d3..71cc8d75627a 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 0f408b3c8b1e..3e7269286952 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
deleted file mode 100644
index 25a018e0d31e..000000000000
--- a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
-
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
-
- tools:
- @echo "====== Building tools ====="
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
-
- build_library_type/%: src/gtkada-intl.adb
- @echo "====== Building $(@F) libraries ====="
-- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
-
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
-- gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-+ $(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
-- gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-+ $(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-
- tests: testgtk/opengl/view_gl.adb
- @echo "====== Building tests ====="
-- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+ cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
-
- install/%: force
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -121,9 +121,6 @@
- install: install-clean
- ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- --mode=usage -Psrc/tools/tools.gpr
-- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-- --mode=usage --exec-subdir=${DESTDIR}${exampledir} \
-- -Ptestgtk.gpr -aP ../src
-
- @echo '-----------------------------------------------------------------------'
- @echo '-- GtkAda has now been installed. --'
diff --git a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
deleted file mode 100644
index 439b85026d5f..000000000000
--- a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/Makefile.in 2017-12-04 20:09:23.730805855 +0100
-+++ b/Makefile.in 2017-12-04 20:09:51.586331155 +0100
-@@ -62,7 +62,8 @@
-
- # Rebuild the tests (and not the XML/Ada code itself)
- test: force
-+ GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
- ${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
- -XTESTS_ACTIVATED=Only xmlada.gpr
-
- # Run the tests. This requires an install of XML/Ada first
---- a/tests/Makefile 2017-12-04 21:38:29.722818904 +0100
-+++ b/tests/Makefile 2017-12-04 21:38:54.229382658 +0100
-@@ -1,8 +1,6 @@
- TESTS= test_unicode \
- test_state \
-- test_xml \
- test_adacore_dom \
-- test_schema \
- test_date_time \
- test_numbers \
- test_adacore_schema \
-@@ -71,6 +71,7 @@
- test_multiple_xsd:
- @echo "multiple xsd"
- @cd schema/multiple_xsd; \
-+ GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
- gprbuild -q -Pdefault.gpr; \
- ./validate > $(RESULTS)/multiple_xsd.out; \
- cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
---- a/input_sources/input_sources-http.adb 2019-05-29 10:18:23.428517625 +0200
-+++ b/input_sources/input_sources-http.adb 2019-05-29 10:17:53.451007226 +0200
-@@ -191,7 +191,7 @@
-
- Create_Socket (Socket);
- Set_Socket_Option (Socket, Socket_Level, (Reuse_Address, True));
-- Set_Socket_Option (Socket, Option => (Receive_Buffer, 3000));
-+ Set_Socket_Option (Socket, Socket_Level, (Receive_Buffer, 3000));
- Connect_Socket (Socket, Addr);
-
- Channel := Stream (Socket);
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 1413f20adc6a..abdcc63b3917 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/glibmm/glibmm-2.60.1.ebuild b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
index d742fe267822..771caabedbf7 100644
--- a/dev-cpp/glibmm/glibmm-2.60.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.60.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RDEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
index 718df300c7f2..8b38d170c4b4 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aqua doc test wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 8d82f1fb4b22..5ee663c7444f 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/ezlib/ezlib-1.0.2.ebuild b/dev-erlang/ezlib/ezlib-1.0.2.ebuild
index 4503232bcf55..8f0b847b543e 100644
--- a/dev-erlang/ezlib/ezlib-1.0.2.ebuild
+++ b/dev-erlang/ezlib/ezlib-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-DEPEND=">=dev-lang/erlang-17.1
+DEPEND=">=dev-lang/erlang-17.1:=
sys-libs/zlib"
RDEPEND="${DEPEND}"
diff --git a/dev-erlang/ezlib/ezlib-1.0.6.ebuild b/dev-erlang/ezlib/ezlib-1.0.6.ebuild
index 1e81db0e50b6..e3d64871c7f0 100644
--- a/dev-erlang/ezlib/ezlib-1.0.6.ebuild
+++ b/dev-erlang/ezlib/ezlib-1.0.6.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-DEPEND=">=dev-lang/erlang-17.1
+DEPEND=">=dev-lang/erlang-17.1:=
sys-libs/zlib"
RDEPEND="${DEPEND}"
diff --git a/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild b/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
index 4b5487d8a9f7..1e08fcb61750 100644
--- a/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
+++ b/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
IUSE="libressl"
DEPEND=">=dev-erlang/p1_utils-1.0.13
- >=dev-lang/erlang-17.1
+ >=dev-lang/erlang-17.1:=
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )"
RDEPEND="${DEPEND}"
diff --git a/dev-erlang/fast_tls/fast_tls-1.1.2.ebuild b/dev-erlang/fast_tls/fast_tls-1.1.2.ebuild
index a51677b11bc7..0d41ea22677f 100644
--- a/dev-erlang/fast_tls/fast_tls-1.1.2.ebuild
+++ b/dev-erlang/fast_tls/fast_tls-1.1.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
IUSE="libressl"
DEPEND=">=dev-erlang/p1_utils-1.0.16
- >=dev-lang/erlang-17.1
+ >=dev-lang/erlang-17.1:=
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )"
RDEPEND="${DEPEND}"
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
index 7993c1a6baba..3c58b4d946c8 100644
--- a/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
+++ b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-DEPEND=">=dev-lang/erlang-17.1"
+DEPEND=">=dev-lang/erlang-17.1:="
RDEPEND="${DEPEND}"
DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.16.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.16.ebuild
index 04a3ef4486a6..5a8880ed5cfa 100644
--- a/dev-erlang/p1_utils/p1_utils-1.0.16.ebuild
+++ b/dev-erlang/p1_utils/p1_utils-1.0.16.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-DEPEND=">=dev-lang/erlang-17.1"
+DEPEND=">=dev-lang/erlang-17.1:="
RDEPEND="${DEPEND}"
DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/proper/proper-1.2.ebuild b/dev-erlang/proper/proper-1.2.ebuild
index 32dd1572bac1..6e489aec399a 100644
--- a/dev-erlang/proper/proper-1.2.ebuild
+++ b/dev-erlang/proper/proper-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-DEPEND=">=dev-lang/erlang-17.1"
+DEPEND=">=dev-lang/erlang-17.1:="
RDEPEND="${DEPEND}"
DOCS=( README.md THANKS )
diff --git a/dev-erlang/proper/proper-1.3.ebuild b/dev-erlang/proper/proper-1.3.ebuild
index 050bf653bc01..6e489aec399a 100644
--- a/dev-erlang/proper/proper-1.3.ebuild
+++ b/dev-erlang/proper/proper-1.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-DEPEND=">=dev-lang/erlang-17.1"
+DEPEND=">=dev-lang/erlang-17.1:="
RDEPEND="${DEPEND}"
DOCS=( README.md THANKS )
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 08834ff26d37..16ba4c15215b 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/c-intercal/c-intercal-30.0.ebuild b/dev-lang/c-intercal/c-intercal-30.0.ebuild
index 52876eed0055..26692e4f5704 100644
--- a/dev-lang/c-intercal/c-intercal-30.0.ebuild
+++ b/dev-lang/c-intercal/c-intercal-30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -64,10 +64,7 @@ src_install() {
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r pit
- fi
+ use examples && dodoc -r pit
}
pkg_postinst() {
diff --git a/dev-lang/c-intercal/c-intercal-31.0.ebuild b/dev-lang/c-intercal/c-intercal-31.0.ebuild
index 53c680992b5b..d8304c53a3d3 100644
--- a/dev-lang/c-intercal/c-intercal-31.0.ebuild
+++ b/dev-lang/c-intercal/c-intercal-31.0.ebuild
@@ -63,10 +63,7 @@ src_install() {
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r pit
- fi
+ use examples && dodoc -r pit
}
pkg_postinst() {
diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild
index d04a12e309c4..45a87c37a08e 100644
--- a/dev-lang/erlang/erlang-21.1.1.ebuild
+++ b/dev-lang/erlang/erlang-21.1.1.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code. See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-22.1.1.ebuild b/dev-lang/erlang/erlang-22.1.1.ebuild
index 26e520c173d5..8e47b9bf050d 100644
--- a/dev-lang/erlang/erlang-22.1.1.ebuild
+++ b/dev-lang/erlang/erlang-22.1.1.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code. See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-22.1.4.ebuild b/dev-lang/erlang/erlang-22.1.4.ebuild
index f05b9a30c7e4..cef8524a7f61 100644
--- a/dev-lang/erlang/erlang-22.1.4.ebuild
+++ b/dev-lang/erlang/erlang-22.1.4.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code. See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-22.1.7.ebuild b/dev-lang/erlang/erlang-22.1.7.ebuild
index edcb9b79b605..36b698f35975 100644
--- a/dev-lang/erlang/erlang-22.1.7.ebuild
+++ b/dev-lang/erlang/erlang-22.1.7.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code. See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-22.1.8-r1.ebuild b/dev-lang/erlang/erlang-22.1.8-r1.ebuild
index 744465e2be1b..9f0146d89695 100644
--- a/dev-lang/erlang/erlang-22.1.8-r1.ebuild
+++ b/dev-lang/erlang/erlang-22.1.8-r1.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code. See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-22.1.8.ebuild b/dev-lang/erlang/erlang-22.1.8.ebuild
index edcb9b79b605..36b698f35975 100644
--- a/dev-lang/erlang/erlang-22.1.8.ebuild
+++ b/dev-lang/erlang/erlang-22.1.8.ebuild
@@ -18,7 +18,10 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
LICENSE="Apache-2.0"
-SLOT="0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code. See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-ustat.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-ustat.patch
deleted file mode 100644
index ee0d22dcc9fd..000000000000
--- a/dev-lang/gnat-gpl/files/gnat-gpl-2016-ustat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/gcc-4.9-gpl-2016-src/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-04-19 20:53:11.382114157 +0200
-+++ b/gcc-4.9-gpl-2016-src/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-04-19 20:57:10.725037767 +0200
-@@ -81,7 +81,6 @@
- #include
- #include
- #include
--#include
- #include
- #include
- #include
-@@ -163,7 +162,19 @@
- unsigned struct_old_utsname_sz = sizeof(struct old_utsname);
- unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname);
- unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
-- unsigned struct_ustat_sz = sizeof(struct ustat);
-+ // Use pre-computed size of struct ustat to avoid which
-+ // has been removed from glibc 2.28.
-+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
-+ || defined(__x86_64__)
-+#define SIZEOF_STRUCT_USTAT 32
-+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
-+ || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
-+#define SIZEOF_STRUCT_USTAT 20
-+#else
-+#error Unknown size of struct ustat
-+#endif
-+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
- #endif // SANITIZER_LINUX
-
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
diff --git a/dev-lang/perl/perl-5.30.1.ebuild b/dev-lang/perl/perl-5.30.1.ebuild
index 29d27690b807..0f88b1d56858 100644
--- a/dev-lang/perl/perl-5.30.1.ebuild
+++ b/dev-lang/perl/perl-5.30.1.ebuild
@@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0/${SUBSLOT}"
if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 ~riscv s390 sh 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"
fi
IUSE="berkdb debug doc gdbm ithreads"
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 0921ae884b13..97483d2f99be 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,11 +1,7 @@
DIST vala-0.36.18.tar.xz 2905668 BLAKE2B ed7f8a38e99fd75945071cf54190631b0ccddbb682da9790bb07b4d334063679bfb002bcf6e5c6c1807ca2b1c4e80659441779c113a7b05f9b4ff291f5ada201 SHA512 69d76fddee8e52e54dc8a3dbe1c0ffc5aeaede096f52614c3a7e18d28ec7a6a31aa617719a4d27a7a15867cd740888f5b381cd612d8fc010f1ea9fd9389d0655
-DIST vala-0.36.19.tar.xz 2909240 BLAKE2B 8b41ab516a6e5c9eef6e4f5590cfa49892e69a8bf28837c2816fb2024a91d614df3b0007554aad3ab8a87b18f174c5571289e0264d3a724fb223276d03a3001b SHA512 cb275146537f3cf0678d7de5c0ee1b1b364fef11099f3c3aaba48c1d0b839fd313cc04bef981f36e5f08b3cbb08cd3aef930357e4ee1ed52fefef446aede6449
DIST vala-0.36.20.tar.xz 2918672 BLAKE2B 9c2c46992444fafd173f767a4a10ac185b0c49db0ede3cb52dec10da08ab3370adb4445087b24c91c9126e8586418a149ac783b3de92cac6c4badd488f3dc56f SHA512 21ca0573a2f9d945a362f7f15da7db25532fd7b19a0aa0442243b95df0568b7a88ae94d0659af44f6f57e364f4370de361102e7e46a070487985e7cb5d81277c
DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
-DIST vala-0.40.15.tar.xz 3406020 BLAKE2B aaa2967a140fae94b4609f4b54f2e37c71fe79453cb3ea30568ee018d2227d1c45061440ad632bcfc53650fbe4dba2f062d8095f95936623a49efb5e97f2c2bb SHA512 abb918b00afab7a85586f9bd26b78be87e19b725752cbb77dd428da2e6241b1f3d4aaa70e3e6daf6f373562d02f1ff8016e6c9107e2bf088d9b84334adecdda2
DIST vala-0.40.16.tar.xz 3412776 BLAKE2B 0cfe072ce3dfd8b95e804582899ff002869bc005b93ad1ba68e9b085e12444a3ef967c6282d65bab7f8302018edc075077ae8de65182b9123f8f74a91ea062bf SHA512 e37c8573fe6104c0ad6f29748cd28564638d62ebe499ce084481c74d2601a19334c431575904fbbed490b44ea117246516580a5d658dfba30c63de7e7c3fa3e0
DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
-DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.44.8.tar.xz 3360352 BLAKE2B da1c8bd909db712567fecee138b464bb304628c6bff1e33901c788728ae0abea9e2df85263b60d97053cd6b25c0fd434f2df0c81b8e8af46e76f588850f945c7 SHA512 75d0e3815e958c2067764069d3582186a4ae025f2a7bb1f7aa184af51d8d0797be9c21d6bb1485c8e2102fb6fee2d39b3b373660e80f2ad6b0336ba772e01062
DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
DIST vala-0.46.3.tar.xz 3367124 BLAKE2B 795e1615c91ac0324df2f5304951204caf9c024ca9e0d1ba768d0613f6e21393648bc3654c8cc9d386a8bef2009b4c842b1b924b1fd079e2689e6c64a7e7749b SHA512 f932fbcd42e6c82c4543efcc507abdb1e1d1af9c0eac125981c55cb052357e7723cb2a08a5aa56c02ac5228d0125c9906a133ce66f8b59fca84c773060174d0c
diff --git a/dev-lang/vala/vala-0.36.19.ebuild b/dev-lang/vala/vala-0.36.19.ebuild
deleted file mode 100644
index 51d63a02f966..000000000000
--- a/dev-lang/vala/vala-0.36.19.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.36"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
- !${CATEGORY}/${PN}:0
- dev-libs/libxslt
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- test? (
- dev-libs/dbus-glib
- >=dev-libs/glib-2.26:2
- dev-libs/gobject-introspection )
-"
-
-src_configure() {
- # weasyprint enables generation of PDF from HTML
- gnome2_src_configure \
- --disable-unversioned \
- VALAC=: \
- WEASYPRINT=:
-}
diff --git a/dev-lang/vala/vala-0.40.15.ebuild b/dev-lang/vala/vala-0.40.15.ebuild
deleted file mode 100644
index f8c03b63981e..000000000000
--- a/dev-lang/vala/vala-0.40.15.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.40"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
-IUSE="test valadoc"
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/vala-common-${PV}
- valadoc? ( >=media-gfx/graphviz-2.16 )
-"
-DEPEND="${RDEPEND}
- !${CATEGORY}/${PN}:0
- dev-libs/libxslt
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- test? (
- dev-libs/dbus-glib
- >=dev-libs/glib-2.26:2
- dev-libs/gobject-introspection )
-"
-
-PATCHES=(
- # From master
- "${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch
- # Add missing bits to make valadoc parallel installable
- "${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch
-)
-
-src_configure() {
- # weasyprint enables generation of PDF from HTML
- gnome2_src_configure \
- --disable-unversioned \
- $(use_enable valadoc) \
- VALAC=: \
- WEASYPRINT=:
-}
-
-src_install() {
- default
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-lang/vala/vala-0.44.7.ebuild b/dev-lang/vala/vala-0.44.7.ebuild
deleted file mode 100644
index d4c1d505902e..000000000000
--- a/dev-lang/vala/vala-0.44.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.44"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
-IUSE="test valadoc"
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/vala-common-${PV}
- valadoc? ( >=media-gfx/graphviz-2.16 )
-"
-DEPEND="${RDEPEND}
- !${CATEGORY}/${PN}:0
- dev-libs/libxslt
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- test? (
- dev-libs/dbus-glib
- >=dev-libs/glib-2.26:2
- dev-libs/gobject-introspection )
-"
-
-PATCHES=(
- # Add missing bits to make valadoc parallel installable
- "${FILESDIR}"/0.44-valadoc-doclets-data-parallel-installable.patch
-)
-
-src_configure() {
- # weasyprint enables generation of PDF from HTML
- gnome2_src_configure \
- --disable-unversioned \
- $(use_enable valadoc) \
- VALAC=: \
- WEASYPRINT=:
-}
-
-src_install() {
- default
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-lang/vala/vala-0.44.8.ebuild b/dev-lang/vala/vala-0.44.8.ebuild
deleted file mode 100644
index d4c1d505902e..000000000000
--- a/dev-lang/vala/vala-0.44.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.44"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
-IUSE="test valadoc"
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/vala-common-${PV}
- valadoc? ( >=media-gfx/graphviz-2.16 )
-"
-DEPEND="${RDEPEND}
- !${CATEGORY}/${PN}:0
- dev-libs/libxslt
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- test? (
- dev-libs/dbus-glib
- >=dev-libs/glib-2.26:2
- dev-libs/gobject-introspection )
-"
-
-PATCHES=(
- # Add missing bits to make valadoc parallel installable
- "${FILESDIR}"/0.44-valadoc-doclets-data-parallel-installable.patch
-)
-
-src_configure() {
- # weasyprint enables generation of PDF from HTML
- gnome2_src_configure \
- --disable-unversioned \
- $(use_enable valadoc) \
- VALAC=: \
- WEASYPRINT=:
-}
-
-src_install() {
- default
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-lang/vala/vala-0.44.9.ebuild b/dev-lang/vala/vala-0.44.9.ebuild
index d4c1d505902e..a3dabfe3e74d 100644
--- a/dev-lang/vala/vala-0.44.9.ebuild
+++ b/dev-lang/vala/vala-0.44.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.44"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~x86-linux"
IUSE="test valadoc"
RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7885a18b7190..137dff0cc3f9 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 1f0c98bf665c..d9f15891bbc8 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index c189b10ccc4c..1d6132910028 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,3 +1 @@
-DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
-DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
deleted file mode 100644
index 7db346d24331..000000000000
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
- !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
- python? ( ${PYTHON_DEPS} )
- app-arch/bzip2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- !app-admin/eselect-boost"
-DEPEND="${RDEPEND}
- =dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
- mpi? ( threads )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
- "${FILESDIR}/${PN}-1.55.0-context-x32.patch"
- "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
- "${FILESDIR}/${PN}-1.65.0-fix-python.patch"
-)
-
-python_bindings_needed() {
- multilib_is_native_abi && use python
-}
-
-tools_needed() {
- multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
- local compiler compiler_version compiler_executable
-
- if [[ ${CHOST} == *-darwin* ]]; then
- compiler="darwin"
- compiler_version="$(gcc-fullversion)"
- compiler_executable="$(tc-getCXX)"
- else
- compiler="gcc"
- compiler_version="$(gcc-version)"
- compiler_executable="$(tc-getCXX)"
- fi
- local mpi_configuration python_configuration
-
- if use mpi; then
- mpi_configuration="using mpi ;"
- fi
-
- if python_bindings_needed; then
- # boost expects libpython$(pyver) and doesn't allow overrides
- # and the build system is so creepy that it's easier just to
- # provide a symlink (linker's going to use SONAME anyway)
- # TODO: replace it with proper override one day
- ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
-
- if tc-is-cross-compiler; then
- python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
- else
- # note: we need to provide version explicitly because of
- # a bug in the build system:
- # https://github.com/boostorg/build/pull/104
- python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
- fi
- fi
-
- cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
-using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
- # Bail out on unsupported build configuration, bug #456792
- if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
- grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
- (
- eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
- eerror "Boost can not be built in such configuration."
- eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
- die
- )
- fi
-}
-
-src_prepare() {
- default
-
- # Do not try to build missing 'wave' tool, bug #522682
- # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
- sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
- multilib_copy_sources
-}
-
-ejam() {
- local b2_opts=(
- "--user-config=${BOOST_ROOT}/user-config.jam"
- "$@"
- )
- echo b2 "${b2_opts[@]}"
- b2 "${b2_opts[@]}"
-}
-
-src_configure() {
- # Workaround for too many parallel processes requested, bug #506064
- [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
- OPTIONS=(
- $(usex debug gentoodebug gentoorelease)
- "-j$(makeopts_jobs)"
- -q
- -d+2
- )
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # We need to add the prefix, and in two cases this exceeds, so prepare
- # for the largest possible space allocation.
- append-ldflags -Wl,-headerpad_max_install_names
- elif [[ ${CHOST} == *-winnt* ]]; then
- compiler=parity
- if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
- compilerVersion=trunk
- else
- compilerVersion=$($(tc-getCXX) -v | sed '1q' \
- | sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
- fi
- compilerExecutable=$(tc-getCXX)
- fi
-
- # bug 298489
- if use ppc || use ppc64; then
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
- fi
-
- # Use C++14 globally as of 1.62
- append-cxxflags -std=c++14
-
- use icu && OPTIONS+=(
- "-sICU_PATH=${EPREFIX}/usr"
- )
- use icu || OPTIONS+=(
- --disable-icu
- boost.locale.icu=off
- )
- use mpi || OPTIONS+=(
- --without-mpi
- )
- use nls || OPTIONS+=(
- --without-locale
- )
- use context || OPTIONS+=(
- --without-context
- --without-coroutine
- --without-fiber
- )
- use threads || OPTIONS+=(
- --without-thread
- )
-
- OPTIONS+=(
- pch=off
- --boost-build="${EPREFIX}"/usr/share/boost-build
- --prefix="${ED%/}/usr"
- --layout=system
- # building with threading=single is currently not possible
- # https://svn.boost.org/trac/boost/ticket/7105
- threading=multi
- link=$(usex static-libs shared,static shared)
- )
-
- [[ ${CHOST} == *-winnt* ]] && OPTIONS+=(
- -sNO_BZIP2=1
- )
-}
-
-multilib_src_compile() {
- local -x BOOST_ROOT="${BUILD_DIR}"
- PYTHON_DIRS=""
- MPI_PYTHON_MODULE=""
-
- building() {
- create_user-config.jam
-
- local PYTHON_OPTIONS
- if python_bindings_needed; then
- PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
- else
- PYTHON_OPTIONS=" --without-python"
- fi
-
- ejam \
- "${OPTIONS[@]}" \
- ${PYTHON_OPTIONS} \
- || die "Building of Boost libraries failed"
-
- if python_bindings_needed; then
- if [[ -z "${PYTHON_DIRS}" ]]; then
- PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
- else
- if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
- die "Inconsistent structure of build directories"
- fi
- fi
-
- local dir
- for dir in ${PYTHON_DIRS}; do
- mv ${dir} ${dir}-${EPYTHON} \
- || die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
- done
-
- if use mpi; then
- if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
- MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
- if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
- die "Multiple mpi.so files found"
- fi
- else
- if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
- die "Inconsistent structure of build directories"
- fi
- fi
-
- mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
- || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
- fi
- fi
- }
- if python_bindings_needed; then
- python_foreach_impl building
- else
- building
- fi
-
- if tools_needed; then
- pushd tools >/dev/null || die
-
- ejam \
- "${OPTIONS[@]}" \
- ${PYTHON_OPTIONS} \
- || die "Building of Boost tools failed"
- popd >/dev/null || die
- fi
-}
-
-multilib_src_install_all() {
- if ! use python; then
- rm -r "${ED%/}"/usr/include/boost/python* || die
- fi
-
- if ! use nls; then
- rm -r "${ED%/}"/usr/include/boost/locale || die
- fi
-
- if ! use context; then
- rm -r "${ED%/}"/usr/include/boost/context || die
- rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
- rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
- fi
-
- if use doc; then
- # find extraneous files that shouldn't be installed
- # as part of the documentation and remove them.
- find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
- find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
- find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
- docinto html
- dodoc *.{htm,html,png,css}
- dodoc -r doc libs more tools
-
- # To avoid broken links
- dodoc LICENSE_1_0.txt
-
- dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
- fi
-}
-
-multilib_src_install() {
- local -x BOOST_ROOT="${BUILD_DIR}"
- installation() {
- create_user-config.jam
-
- local PYTHON_OPTIONS
- if python_bindings_needed; then
- local dir
- for dir in ${PYTHON_DIRS}; do
- cp -pr ${dir}-${EPYTHON} ${dir} \
- || die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
- done
-
- if use mpi; then
- cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
- cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
- || die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
- fi
- PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
- else
- PYTHON_OPTIONS=" --without-python"
- fi
-
- ejam \
- "${OPTIONS[@]}" \
- ${PYTHON_OPTIONS} \
- --includedir="${ED%/}/usr/include" \
- --libdir="${ED%/}/usr/$(get_libdir)" \
- install || die "Installation of Boost libraries failed"
-
- if python_bindings_needed; then
- rm -r ${PYTHON_DIRS} || die
-
- # Move mpi.so Python module to Python site-packages directory.
- # https://svn.boost.org/trac/boost/ticket/2838
- if use mpi; then
- local moddir=$(python_get_sitedir)/boost
- # moddir already includes eprefix
- mkdir -p "${D}${moddir}" || die
- mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
- cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
- import DLFCN
- flags = sys.getdlopenflags()
- sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
- from . import mpi
- sys.setdlopenflags(flags)
- del DLFCN, flags
-else:
- from . import mpi
-del sys
-EOF
- fi
-
- python_optimize
- fi
- }
- if python_bindings_needed; then
- python_foreach_impl installation
- else
- installation
- fi
-
- pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
-
- local ext=$(get_libname)
- if use threads; then
- local f
- for f in *${ext}; do
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
- done
- fi
-
- popd >/dev/null || die
-
- if tools_needed; then
- dobin dist/bin/*
-
- insinto /usr/share
- doins -r dist/share/boostbook
- fi
-
- # boost's build system truely sucks for not having a destdir. Because for
- # this reason we are forced to build with a prefix that includes the
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
- # DESTROOT instread of the actual EPREFIX. There is no way out of here
- # but to do it the dirty way of manually setting the right install_names.
- if [[ ${CHOST} == *-darwin* ]]; then
- einfo "Working around completely broken build-system(tm)"
- local d
- for d in "${ED%/}"/usr/lib/*.dylib; do
- if [[ -f ${d} ]]; then
- # fix the "soname"
- ebegin " correcting install_name of ${d#${ED}}"
- install_name_tool -id "/${d#${D}}" "${d}"
- eend $?
- # fix references to other libs
- refs=$(otool -XL "${d}" | \
- sed -e '1d' -e 's/^\t//' | \
- grep "^libboost_" | \
- cut -f1 -d' ')
- local r
- for r in ${refs}; do
- ebegin " correcting reference to ${r}"
- install_name_tool -change \
- "${r}" \
- "${EPREFIX}/usr/lib/${r}" \
- "${d}"
- eend $?
- done
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # Yai for having symlinks that are nigh-impossible to remove without
- # resorting to dirty hacks like these. Removes lingering symlinks
- # from the slotted versions.
- local symlink
- for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
- if [[ -L ${symlink} ]]; then
- rm -f "${symlink}" || die
- fi
- done
-
- # some ancient installs still have boost cruft lying around
- # for unknown reasons, causing havoc for reverse dependencies
- # Bug: 607734
- rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
-}
diff --git a/dev-libs/boost/boost-1.70.0.ebuild b/dev-libs/boost/boost-1.70.0.ebuild
deleted file mode 100644
index 4f826fa75b46..000000000000
--- a/dev-libs/boost/boost-1.70.0.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${PN}_$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
-REQUIRED_USE="
- mpi? ( threads )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
- !app-admin/eselect-boost
- !dev-libs/boost-numpy
- bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
- icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
- !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
- python? (
- ${PYTHON_DEPS}
- numpy? ( >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}] )
- )
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch
- "${FILESDIR}"/${PN}-1.69.0-context-x32.patch
- "${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch
-)
-
-python_bindings_needed() {
- multilib_is_native_abi && use python
-}
-
-tools_needed() {
- multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
- local user_config_jam="${BUILD_DIR}"/user-config.jam
- if [[ -s ${user_config_jam} ]]; then
- einfo "${user_config_jam} already exists, skipping configuration"
- return
- else
- einfo "Creating configuration in ${user_config_jam}"
- fi
-
- local compiler compiler_version compiler_executable="$(tc-getCXX)"
- if [[ ${CHOST} == *-darwin* ]]; then
- compiler="darwin"
- compiler_version="$(gcc-fullversion)"
- else
- compiler="gcc"
- compiler_version="$(gcc-version)"
- fi
-
- if use mpi; then
- local mpi_configuration="using mpi ;"
- fi
-
- cat > "${user_config_jam}" <<- __EOF__ || die
- using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;
- ${mpi_configuration}
- __EOF__
-
- if python_bindings_needed; then
- append_to_user_config() {
- local py_config
- if tc-is-cross-compiler; then
- py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
- else
- py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
- fi
- echo "${py_config}" >> "${user_config_jam}" || die
- }
- python_foreach_impl append_to_user_config
- fi
-
- if python_bindings_needed && use numpy; then
- einfo "Enabling support for NumPy extensions in Boost.Python"
- else
- einfo "Disabling support for NumPy extensions in Boost.Python"
-
- # Boost.Build does not allow for disabling of numpy
- # extensions, thereby leading to automagic numpy
- # https://github.com/boostorg/python/issues/111#issuecomment-280447482
- sed \
- -e 's/\[ unless \[ python\.numpy \] : no \]/no/g' \
- -i "${BUILD_DIR}"/libs/python/build/Jamfile || die
- fi
-}
-
-pkg_setup() {
- # Bail out on unsupported build configuration, bug #456792
- if [[ -f "${EROOT}/etc/site-config.jam" ]]; then
- if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}/etc/site-config.jam"; then
- eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
- eerror "Boost can not be built in such configuration."
- eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
- die "Unsupported target in ${EROOT}/etc/site-config.jam"
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # Do not try to build missing 'wave' tool, bug #522682
- # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
- sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
- multilib_copy_sources
-}
-
-ejam() {
- create_user-config.jam
-
- local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
- if python_bindings_needed; then
- append_to_b2_opts() {
- b2_opts+=( python="${EPYTHON#python}" )
- }
- python_foreach_impl append_to_b2_opts
- else
- b2_opts+=( --without-python )
- fi
- b2_opts+=( "$@" )
-
- echo b2 "${b2_opts[@]}" >&2
- b2 "${b2_opts[@]}"
-}
-
-src_configure() {
- # Workaround for too many parallel processes requested, bug #506064
- [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
- OPTIONS=(
- $(usex debug gentoodebug gentoorelease)
- "-j$(makeopts_jobs)"
- -q
- -d+2
- pch=off
- $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
- $(usex mpi '' '--without-mpi')
- $(usex nls '' '--without-locale')
- $(usex context '' '--without-context --without-coroutine --without-fiber')
- $(usex threads '' '--without-thread')
- --without-stacktrace
- --boost-build="${BROOT}"/usr/share/boost-build
- --prefix="${ED}/usr"
- --layout=system
- # CMake has issues working with multiple python impls,
- # disable cmake config generation for the time being
- # https://github.com/boostorg/python/issues/262#issuecomment-483069294
- --no-cmake-config
- # building with threading=single is currently not possible
- # https://svn.boost.org/trac/boost/ticket/7105
- threading=multi
- link=$(usex static-libs shared,static shared)
- # this seems to be the only way to disable compression algorithms
- # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
- -sNO_BZIP2=$(usex bzip2 0 1)
- -sNO_LZMA=$(usex lzma 0 1)
- -sNO_ZLIB=$(usex zlib 0 1)
- -sNO_ZSTD=$(usex zstd 0 1)
- )
-
- if [[ ${CHOST} == *-darwin* ]]; then
- # We need to add the prefix, and in two cases this exceeds, so prepare
- # for the largest possible space allocation.
- append-ldflags -Wl,-headerpad_max_install_names
- fi
-
- # bug 298489
- if use ppc || use ppc64; then
- [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
- fi
-
- # Use C++14 globally as of 1.62
- append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
- ejam "${OPTIONS[@]}" || die
-
- if tools_needed; then
- pushd tools >/dev/null || die
- ejam \
- "${OPTIONS[@]}" \
- || die "Building of Boost tools failed"
- popd >/dev/null || die
- fi
-}
-
-multilib_src_install_all() {
- if ! use numpy; then
- rm -r "${ED}"/usr/include/boost/python/numpy* || die
- fi
-
- if ! use python; then
- rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
- fi
-
- if ! use nls; then
- rm -r "${ED}"/usr/include/boost/locale || die
- fi
-
- if ! use context; then
- rm -r "${ED}"/usr/include/boost/context || die
- rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
- rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
- fi
-
- if use doc; then
- # find extraneous files that shouldn't be installed
- # as part of the documentation and remove them.
- find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
- find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
- find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
- docinto html
- dodoc *.{htm,html,png,css}
- dodoc -r doc libs more tools
-
- # To avoid broken links
- dodoc LICENSE_1_0.txt
-
- dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
- fi
-}
-
-multilib_src_install() {
- ejam \
- "${OPTIONS[@]}" \
- --includedir="${ED}/usr/include" \
- --libdir="${ED}/usr/$(get_libdir)" \
- install || die "Installation of Boost libraries failed"
-
- pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
- local ext=$(get_libname)
- if use threads; then
- local f
- for f in *${ext}; do
- dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
- done
- fi
-
- popd >/dev/null || die
-
- if tools_needed; then
- dobin dist/bin/*
-
- insinto /usr/share
- doins -r dist/share/boostbook
- fi
-
- # boost's build system truely sucks for not having a destdir. Because for
- # this reason we are forced to build with a prefix that includes the
- # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
- # DESTROOT instread of the actual EPREFIX. There is no way out of here
- # but to do it the dirty way of manually setting the right install_names.
- if [[ ${CHOST} == *-darwin* ]]; then
- einfo "Working around completely broken build-system(tm)"
- local d
- for d in "${ED}"/usr/lib/*.dylib; do
- if [[ -f ${d} ]]; then
- # fix the "soname"
- ebegin " correcting install_name of ${d#${ED}}"
- install_name_tool -id "/${d#${D}}" "${d}"
- eend $?
- # fix references to other libs
- refs=$(otool -XL "${d}" | \
- sed -e '1d' -e 's/^\t//' | \
- grep "^libboost_" | \
- cut -f1 -d' ')
- local r
- for r in ${refs}; do
- ebegin " correcting reference to ${r}"
- install_name_tool -change \
- "${r}" \
- "${EPREFIX}/usr/lib/${r}" \
- "${d}"
- eend $?
- done
- fi
- done
- fi
-}
-
-pkg_preinst() {
- # Yai for having symlinks that are nigh-impossible to remove without
- # resorting to dirty hacks like these. Removes lingering symlinks
- # from the slotted versions.
- local symlink
- for symlink in "${EROOT}/usr/include/boost" "${EROOT}/usr/share/boostbook"; do
- if [[ -L ${symlink} ]]; then
- rm -f "${symlink}" || die
- fi
- done
-
- # some ancient installs still have boost cruft lying around
- # for unknown reasons, causing havoc for reverse dependencies
- # Bug: 607734
- rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index 1f0b0e669054..faa5a9609109 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -49,9 +49,9 @@ BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
S="${WORKDIR}/${PN}_${MY_PV}"
PATCHES=(
- "${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch
- "${FILESDIR}"/${PN}-1.69.0-context-x32.patch
- "${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch
+ "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+ "${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+ "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
)
python_bindings_needed() {
@@ -130,11 +130,6 @@ pkg_setup() {
src_prepare() {
default
-
- # Do not try to build missing 'wave' tool, bug #522682
- # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
- sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
multilib_copy_sources
}
diff --git a/dev-libs/boost/files/boost-1.55.0-context-x32.patch b/dev-libs/boost/files/boost-1.55.0-context-x32.patch
deleted file mode 100644
index 5bf740625381..000000000000
--- a/dev-libs/boost/files/boost-1.55.0-context-x32.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/9445
-
-hack to fix x32 builds
-
---- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
-+++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
-@@ -31,6 +31,10 @@
- * *
- * *****************************************************************/
-
-+#ifdef __x86_64__
-+#include "jump_x86_64_sysv_elf_gas.S"
-+#else
-+
- .text
- .globl jump_fcontext
- .align 2
-@@ -73,3 +77,5 @@ jump_fcontext:
-
- /* Mark that we don't need executable stack. */
- .section .note.GNU-stack,"",%progbits
-+
-+#endif
---- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
-+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
-@@ -31,6 +31,10 @@
- * *
- * *****************************************************************/
-
-+#ifdef __x86_64__
-+#include "make_x86_64_sysv_elf_gas.S"
-+#else
-+
- .text
- .globl make_fcontext
- .align 2
-@@ -78,3 +82,5 @@ finish:
-
- /* Mark that we don't need executable stack. */
- .section .note.GNU-stack,"",%progbits
-+
-+#endif
diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
deleted file mode 100644
index 48ca51388713..000000000000
--- a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Build auto_index tool with USE="tools"
-Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066
-
---- a/tools/Jamfile.v2.orig 2014-12-24 12:57:32.290880067 +0300
-+++ b/tools/Jamfile.v2 2014-12-24 12:58:38.403883250 +0300
-@@ -20,6 +20,7 @@
- use-project /boost/regression : regression/build ;
-
- TOOLS =
-+ auto_index/build//auto_index
- bcp//bcp
- inspect/build//inspect
- quickbook//quickbook
diff --git a/dev-libs/boost/files/boost-1.65.0-fix-python.patch b/dev-libs/boost/files/boost-1.65.0-fix-python.patch
deleted file mode 100644
index 079160218ea2..000000000000
--- a/dev-libs/boost/files/boost-1.65.0-fix-python.patch
+++ /dev/null
@@ -1,272 +0,0 @@
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -104,7 +104,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
-- PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+ PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
-
-
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -58,81 +58,50 @@
-
- if [ python.configured ]
- {
-- py2-version = [ py-version 2 ] ;
-- py3-version = [ py-version 3 ] ;
--
-- # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
-- lib_boost_python(2) = boost_python ;
-- lib_boost_python(3) = boost_python3 ;
--
-- lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
-- lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
--
-- lib_boost_mpi_python(2) = boost_mpi_python ;
-- lib_boost_mpi_python(3) = boost_mpi_python3 ;
--
-- lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
-- lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
--
-- for local N in 2 3
-- {
-- if $(py$(N)-version)
-- {
-- lib $(lib_boost_mpi_python($(py$(N)-version)))
-- : # Sources
-- python/serialize.cpp
-- : # Requirements
-- boost_mpi
-- /mpi//mpi [ mpi.extra-requirements ]
-- /boost/python//$(lib_boost_python($(py$(N)-version)))
-- shared:BOOST_MPI_DYN_LINK=1
-- shared:BOOST_MPI_PYTHON_DYN_LINK=1
-- shared:BOOST_PYTHON_DYN_LINK=1
-- BOOST_MPI_PYTHON_SOURCE=1
-- -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-- @$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-- on:BOOST_DEBUG_PYTHON
-- $(py$(N)-version)
-- : # Default build
-- shared
-- : # Usage requirements
-- /mpi//mpi [ mpi.extra-requirements ]
-- ;
--
-- python-extension mpi
-- : # Sources
-- python/collectives.cpp
-- python/py_communicator.cpp
-- python/datatypes.cpp
-- python/documentation.cpp
-- python/py_environment.cpp
-- python/py_nonblocking.cpp
-- python/py_exception.cpp
-- python/module.cpp
-- python/py_request.cpp
-- python/skeleton_and_content.cpp
-- python/status.cpp
-- python/py_timer.cpp
-- : # Requirements
-- /boost/python//$(lib_boost_python($(py$(N)-version)))
-- $(lib_boost_mpi_python($(py$(N)-version)))
-- boost_mpi
-- /mpi//mpi [ mpi.extra-requirements ]
-- shared:BOOST_MPI_DYN_LINK=1
-- shared:BOOST_MPI_PYTHON_DYN_LINK=1
-- shared:BOOST_PYTHON_DYN_LINK=1
-- shared shared
-- on:BOOST_DEBUG_PYTHON
-- $(py$(N)-version)
-- ;
--
-- libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
-- }
-- else
-- {
-- alias $(lib_boost_mpi_python($(N))) ;
-- }
-- }
-+ lib boost_mpi_python
-+ : # Sources
-+ python/serialize.cpp
-+ : # Requirements
-+ boost_mpi
-+ /mpi//mpi [ mpi.extra-requirements ]
-+ /boost/python//boost_python
-+ shared:BOOST_MPI_DYN_LINK=1
-+ shared:BOOST_MPI_PYTHON_DYN_LINK=1
-+ shared:BOOST_PYTHON_DYN_LINK=1
-+ BOOST_MPI_PYTHON_SOURCE=1
-+ -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-+ @$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-+ : # Default build
-+ shared
-+ : # Usage requirements
-+ /mpi//mpi [ mpi.extra-requirements ]
-+ ;
-+ libraries += boost_mpi_python ;
-+
-+ python-extension mpi
-+ : # Sources
-+ python/collectives.cpp
-+ python/py_communicator.cpp
-+ python/datatypes.cpp
-+ python/documentation.cpp
-+ python/py_environment.cpp
-+ python/py_nonblocking.cpp
-+ python/py_exception.cpp
-+ python/module.cpp
-+ python/py_request.cpp
-+ python/skeleton_and_content.cpp
-+ python/status.cpp
-+ python/py_timer.cpp
-+ : # Requirements
-+ /boost/python//boost_python
-+ boost_mpi_python
-+ boost_mpi
-+ /mpi//mpi [ mpi.extra-requirements ]
-+ shared:BOOST_MPI_DYN_LINK=1
-+ shared:BOOST_MPI_PYTHON_DYN_LINK=1
-+ shared:BOOST_PYTHON_DYN_LINK=1
-+ shared shared
-+ ;
- }
- }
- else if ! ( --without-mpi in [ modules.peek : ARGV ] )
---- a/libs/python/build/Jamfile
-+++ b/libs/python/build/Jamfile
-@@ -31,26 +31,23 @@
- ;
- }
-
--py2-version = [ py-version 2 ] ;
--py3-version = [ py-version 3 ] ;
--
- project boost/python
- : source-location ../src
- ;
-
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
--local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } }
--
--lib_boost_python(2) = boost_python ;
--lib_boost_python(3) = boost_python3 ;
--
--lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
--lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
-
--rule lib_boost_python ( version )
-+rule lib_boost_python
- {
-- lib $(lib_boost_python($(version)))
-+ local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+ local python2 ;
-+ if $(python_major_version) = 2
-+ {
-+ python2 = true ;
-+ }
-+
-+ lib boost_python
- : # sources
- list.cpp
- long.cpp
-@@ -96,7 +93,8 @@
- # python_for_extensions is a target defined by Boost.Build to
- # provide the Python include paths, and on Windows, the Python
- # import library, as usage requirements.
-- [ cond [ python.configured ] : /python//python_for_extensions ]
-+ [ cond $(python2) : -fno-strict-aliasing ]
-+ [ cond [ python.configured ] : /python//python ]
-
- # we prevent building when there is no python available
- # as it's not possible anyway, and to cause dependents to
-@@ -105,13 +103,10 @@
- config-warning
-
- on:BOOST_DEBUG_PYTHON
-- $(version)
-
- -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
- @$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-
-- @python.require-py
--
- : # default build
- shared
- : # usage requirements
-@@ -120,68 +115,8 @@
- ;
- }
-
--lib_boost_numpy(2) = boost_numpy ;
--lib_boost_numpy(3) = boost_numpy3 ;
--
--lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
--lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
--
--rule lib_boost_numpy ( version )
--{
-- numpy-include = [ python.numpy-include ] ;
-- lib $(lib_boost_numpy($(version)))
-- : # sources
-- numpy/dtype.cpp
-- numpy/matrix.cpp
-- numpy/ndarray.cpp
-- numpy/numpy.cpp
-- numpy/scalars.cpp
-- numpy/ufunc.cpp
-- : # requirements
-- static:BOOST_NUMPY_STATIC_LIB
-- BOOST_NUMPY_SOURCE
-- [ cond [ python.numpy ] : /python//python_for_extensions ]
-- [ unless [ python.numpy ] : no ]
-- $(numpy-include)
-- $(lib_boost_python($(version)))
-- on:BOOST_DEBUG_PYTHON
-- $(version)
-+libraries = boost_python ;
-
-- -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-- @$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
--
-- @python.require-py
--
-- : # default build
-- shared
-- : # usage requirements
-- static:BOOST_NUMPY_STATIC_LIB
-- on:BOOST_DEBUG_PYTHON
-- ;
--}
--
--libraries = ;
--
--for local N in 2 3
--{
-- if $(py$(N)-version)
-- {
-- lib_boost_python $(py$(N)-version) ;
-- libraries += $(lib_boost_python($(py$(N)-version))) ;
-- }
-- else
-- {
-- alias $(lib_boost_python($(N))) ;
-- }
-- if $(py$(N)-version) && [ python.numpy ]
-- {
-- lib_boost_numpy $(py$(N)-version) ;
-- libraries += $(lib_boost_numpy($(py$(N)-version))) ;
-- }
-- else
-- {
-- alias $(lib_boost_numpy($(N))) ;
-- }
--}
-+lib_boost_python ;
-
- boost-install $(libraries) ;
diff --git a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
new file mode 100644
index 000000000000..ca793b9d06eb
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
@@ -0,0 +1,13 @@
+Build auto_index tool with USE="tools"
+See also: https://bugs.gentoo.org/529066
+
+--- a/tools/Jamfile.v2
++++ b/tools/Jamfile.v2
+@@ -18,6 +18,7 @@
+ ;
+
+ TOOLS =
++ auto_index/build//auto_index
+ bcp//bcp
+ inspect/build//inspect
+ quickbook//quickbook
diff --git a/dev-libs/boost/files/boost-1.69.0-context-x32.patch b/dev-libs/boost/files/boost-1.71.0-context-x32.patch
similarity index 100%
rename from dev-libs/boost/files/boost-1.69.0-context-x32.patch
rename to dev-libs/boost/files/boost-1.71.0-context-x32.patch
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
similarity index 94%
rename from dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
rename to dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
index 23a87830d109..32faf8d0eb31 100644
--- a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
+++ b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
@@ -1,6 +1,6 @@
--- a/libs/locale/build/Jamfile.v2
+++ b/libs/locale/build/Jamfile.v2
-@@ -58,8 +58,8 @@
+@@ -65,8 +65,8 @@
if $(ICU_LINK)
{
@@ -11,7 +11,7 @@
}
else
{
-@@ -117,7 +117,6 @@
+@@ -124,7 +124,6 @@
icuuc/shared/shared
icudt/shared/shared
icuin/shared/shared
@@ -19,7 +19,7 @@
shared ;
-@@ -176,7 +175,6 @@
+@@ -183,7 +182,6 @@
icuuc_64/shared/shared
icudt_64/shared/shared
icuin_64/shared/shared
diff --git a/dev-libs/folks/folks-0.12.1.ebuild b/dev-libs/folks/folks-0.12.1.ebuild
index 0809549521cd..3815c4084e13 100644
--- a/dev-libs/folks/folks-0.12.1.ebuild
+++ b/dev-libs/folks/folks-0.12.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
LICENSE="LGPL-2.1+"
SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
IUSE="bluetooth eds +telepathy test tracker utils"
REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/fribidi/fribidi-1.0.7.ebuild b/dev-libs/fribidi/fribidi-1.0.7.ebuild
index ec4204eaddb6..014880ab59ea 100644
--- a/dev-libs/fribidi/fribidi-1.0.7.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=""
diff --git a/dev-libs/gjs/gjs-1.56.2.ebuild b/dev-libs/gjs/gjs-1.56.2.ebuild
index a29e1c7e479c..ee4274c8267d 100644
--- a/dev-libs/gjs/gjs-1.56.2.ebuild
+++ b/dev-libs/gjs/gjs-1.56.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk readline test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=dev-libs/glib-2.54.0
diff --git a/dev-libs/glib/glib-2.60.7.ebuild b/dev-libs/glib/glib-2.60.7.ebuild
index c3b882a75d1e..094cd061a8db 100644
--- a/dev-libs/glib/glib-2.60.7.ebuild
+++ b/dev-libs/glib/glib-2.60.7.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
# the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gmime/gmime-3.2.4.ebuild b/dev-libs/gmime/gmime-3.2.4.ebuild
index 3ae7bfbbc5f2..f5260c208370 100644
--- a/dev-libs/gmime/gmime-3.2.4.ebuild
+++ b/dev-libs/gmime/gmime-3.2.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
SLOT="3.0"
LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="crypt doc idn static-libs test vala"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
index 223c4d73e3a1..9ccad1da4d11 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
LICENSE="BSD"
SLOT="0/2"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
HTML_DOCS=( doc/jemalloc.html )
PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
index b1e135ac476c..26713eaa276a 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
LICENSE="LGPL-2.1+"
SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk-doc +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index e081ae83d7f7..9392d4f40614 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,8 +23,10 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
introspection? ( dev-libs/gobject-introspection )
lua? ( >=dev-lang/lua-5.1 )
python? ( ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.3:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-2.15.3:2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+ ')
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
index 3c0c4211d2dd..b2f7f97646f2 100644
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
index 688356df7c4d..b32618ea3558 100644
--- a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="gtk-doc +introspection test +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgdata/libgdata-0.17.11.ebuild b/dev-libs/libgdata/libgdata-0.17.11.ebuild
index 72311b208ec4..ee5f06e97fa1 100644
--- a/dev-libs/libgdata/libgdata-0.17.11.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.11.ebuild
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
index a11da8121a77..0402b206bee2 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/"
LICENSE="LGPL-3+"
SLOT="1/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
index 49030f1e61dd..4f7159085e8f 100644
--- a/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-15-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
IUSE="glade gtk-doc +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 3b6a50db076e..4f2d5bac1893 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1 @@
-DIST libtool-1.3.5.tar.gz 538884 BLAKE2B 769c0ab679d5665bb729f97dc5c02b6e8921532788009425195c93971d8886547824e838a4dea559ccb365a86f600a250bccd8cb559e9be2158f9db3463f3ec4 SHA512 e7e693da0e87bc3b178b270c1d5b0d46116d1624f6e3657ad75bc381bcbba8949ab0913fe3985c77e9dd0ee519df7da9c5ee3b4f6030ad1d4651de2e642c4bd6
-DIST libtool-1.5.26.tar.gz 2961939 BLAKE2B c12ea59cc828ee7aa85ef445e3b0586ddfa8629824e308f46c74ac64dd8b73f0e4675d6673c09d76714c841f29b33000318eebfca3c5d28657327017e30b2372 SHA512 fcd39856c8cd457c97f176d5f6ce97fd93108808ce24315d179a7c9ca85bb90e799afaa83bc283ec627d73cfe0e0710d36a1ee8f39c9963cf2e806e64a0e0bcf
DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
diff --git a/dev-libs/libltdl/libltdl-1.3.5.ebuild b/dev-libs/libltdl/libltdl-1.3.5.ebuild
deleted file mode 100644
index 7e48b626acbd..000000000000
--- a/dev-libs/libltdl/libltdl-1.3.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This ebuild provides libltdl.so.0.
-
-EAPI="4"
-
-inherit multilib-minimal
-
-MY_P="libtool-${PV}"
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-SRC_URI="mirror://gnu/libtool/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-# libltdl doesn't have a testsuite.
-RESTRICT="test"
-
-RDEPEND="!sys-devel/libtool:1.3"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --enable-ltdl-install \
- --disable-static
-}
-
-multilib_src_compile() {
- emake -C libltdl
-}
-
-multilib_src_install() {
- emake -C libltdl DESTDIR="${D}" install-exec
- # basically we just install ABI libs for old packages
- rm "${ED}"/usr/$(get_libdir)/libltdl.{la,so} || die
-}
diff --git a/dev-libs/libltdl/libltdl-1.5.26.ebuild b/dev-libs/libltdl/libltdl-1.5.26.ebuild
deleted file mode 100644
index 28eccdaf6bbf..000000000000
--- a/dev-libs/libltdl/libltdl-1.5.26.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This ebuild provides libltdl.so.3.
-
-EAPI="4"
-
-inherit multilib-minimal
-
-MY_P="libtool-${PV}"
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-SRC_URI="mirror://gnu/libtool/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-# libltdl doesn't have a testsuite.
-RESTRICT="test"
-
-RDEPEND="!sys-devel/libtool:1.5"
-
-S="${WORKDIR}/${MY_P}/libltdl"
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --enable-ltdl-install \
- --disable-static
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install-exec
- # basically we just install ABI libs for old packages
- rm "${ED}"/usr/$(get_libdir)/libltdl.{la,so} || die
-}
diff --git a/dev-libs/libmanette/libmanette-0.2.3.ebuild b/dev-libs/libmanette/libmanette-0.2.3.ebuild
index b16aff52e017..e936a0a38c13 100644
--- a/dev-libs/libmanette/libmanette-0.2.3.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="+introspection +udev +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 95c37fc711b5..573822dd1e27 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,2 +1 @@
-DIST libmirage-3.2.2.tar.bz2 234131 BLAKE2B e3f2825b9e799447a6201f8d46fbb8cf229a5393c73d85ee8a230225603f5e42cb07af4e984aa8602fcce667b16c2af7e2ef9d27862022327a39d0b7189c1eb1 SHA512 f41a095d7a9a3bb0d00ac2bfb8ad443d8d065f446ca2635041e24a570b72c14a27d3c3b300d5fa941253284c4b05b1913715c1169cd26a80db920df9d27cd535
DIST libmirage-3.2.3.tar.bz2 234761 BLAKE2B f3fc24dae81643c4fea99d12e4f7f1d600586a7c5e546e854d4391ecb11f39a6d1108ac86c79b917fb96cc53424975ff548522a0f0e035ffd4b99638fc18608a SHA512 25cc3ccfac9332d06edff7e73d992e9d74b7464f61b857c3fb40ec9e2584a8f61b8aaef96a6d6f4b8f3a7c871b6b7b7803502d5e1ef771fc239021a827b90f09
diff --git a/dev-libs/libmirage/libmirage-3.2.2.ebuild b/dev-libs/libmirage/libmirage-3.2.2.ebuild
deleted file mode 100644
index 27a19f3b1757..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
- >=app-arch/xz-utils-5:=
- >=dev-libs/glib-2.38:2
- >=media-libs/libsamplerate-0.1:=
- >=media-libs/libsndfile-1.0:=
- sys-libs/zlib:=
- introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
- dev-util/desktop-file-utils
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )"
-
-src_configure() {
- local mycmakeargs=(
- -DGTKDOC_ENABLED="$(usex doc)"
- -DINTROSPECTION_ENABLED="$(usex introspection)"
- -DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- local DOCS=( AUTHORS README )
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
index 5627f0036e33..1c9c686d0219 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
IUSE="pam python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index d812b9d51a20..11edee2c4032 100644
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
LICENSE="WTFPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc examples static-libs"
src_prepare() {
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
similarity index 95%
rename from dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
rename to dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
index 64d73e237ca9..24baa153a846 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
PYTHON_REQ_USE="xml"
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
+inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
DESCRIPTION="XML C parser and toolkit"
HOMEPAGE="http://www.xmlsoft.org/"
@@ -16,6 +16,7 @@ SLOT="2"
KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh 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="debug examples icu ipv6 lzma python readline static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
XSTS_NAME_1="xmlschema2002-01-16"
@@ -134,7 +135,10 @@ multilib_src_configure() {
libxml2_py_configure() {
mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
- run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
+ run_in_build_dir libxml2_configure \
+ "--with-python=${EPYTHON}" \
+ "--with-python-install-dir=$(python_get_sitedir)"
+ # odd build system, also see bug #582130
}
libxml2_configure --without-python # build python bindings separately
@@ -190,7 +194,7 @@ multilib_src_install_all() {
rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
fi
- prune_libtool_files --modules
+ find "${D}" -name '*.la' -delete || die
}
pkg_postinst() {
diff --git a/dev-libs/libxml2/libxml2-2.9.9.ebuild b/dev-libs/libxml2/libxml2-2.9.9.ebuild
index cc03219b06f0..494a0644ac79 100644
--- a/dev-libs/libxml2/libxml2-2.9.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9.ebuild
@@ -15,6 +15,7 @@ SLOT="2"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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="debug examples icu ipv6 lzma python readline static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
XSTS_NAME_1="xmlschema2002-01-16"
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index 1a8fb3dba125..816afe04d7b1 100644
--- a/dev-libs/newt/newt-0.52.21.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
inherit python-r1 multilib autotools toolchain-funcs
@@ -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"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
index 16398a62cec1..4ad977583d32 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="BSD-2"
SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="crnl-as-line-terminator static-libs"
if [[ "${PV}" != "9999" ]]; then
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index 9cff9ed247c9..f1e73f8d5cc7 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -2,3 +2,4 @@ DIST pigpio-67.tar.gz 369268 BLAKE2B a9d59369f5eed4b733e0e5c0e85013a132e55ff63a2
DIST pigpio-68.tar.gz 371251 BLAKE2B c0118854d18ce158a3d5c96380289cc8bc68f35f72ce28f207dfbb827f97f538acd82cec2af11590e59985b77ef08834d55b3ac7578e1f6b6d1a0b5d5d594632 SHA512 125364eab9dd33c39fda148c6018679ac91b099914d7f0c6362f61566a9c957065189ace03ad4668b29f25d4d542b81d42c0befe0712867b48977b755dc03edc
DIST pigpio-70.tar.gz 374569 BLAKE2B a2caadf0e1307c8c3ce936d5fd4d31e18185aa53900f6b2cf8b92a31f423b9a82bf4d2b7212fa8cd5b2d26773598a138ef8331884410f3f418542f43ca1fe2d4 SHA512 00db37b9c0f9751e6179b19e7018583abd9e11d78d01ff9f99b713004cf4e6a224e93644206599378a34dd46fd75c08557021b706015b0bc2bd8b34e363691db
DIST pigpio-71.tar.gz 374952 BLAKE2B a79a408915285674211e50e30d3cafa433a9ee364cacced501e109d6c31a3a03c14f9d25c3c18e3df252801de65c60ca67cd5f1a8e08f05be8098ad591a14fee SHA512 c3bf029bebff9a7ee02b48597f624a5dcdf277c5c1a7ffa2f6cb83885a93cd6713935d9502127d11c4e9c11e7f6f6be49c8af367707eca2fff469728b5248e2f
+DIST pigpio-72.tar.gz 384220 BLAKE2B ff3466df80adb6ee9bb2f6bc8aa9589bb6789746eedfab410d2a23dcd4986c29297f71469c8330c55603d8aabba7a4b2171390a63c21a12464b45cc4e24645d8 SHA512 c090962cb11204774e4a97a3dec37146882d66abef4d3e4de62e116b64650d6c66f95646f6350e3a45d8b2ba261a8d16c74f7648869cd0e94f42a80d88bb6d6e
diff --git a/dev-libs/pigpio/files/pigpiod.confd b/dev-libs/pigpio/files/pigpiod.confd
index dbcf8a4c3efc..02c1442322ca 100644
--- a/dev-libs/pigpio/files/pigpiod.confd
+++ b/dev-libs/pigpio/files/pigpiod.confd
@@ -1,4 +1,4 @@
# Only listen on local interface by default
# use evironment variables PIGPIO_PORT="8888" and PIGPIO_ADDR="::1" for pigs with local interface
# PIGPIOD_OPTS="-l -p 8888"
-PIGPIOD_OPTS="-l"
+PIGPIOD_OPTS="-l -n 127.0.0.1"
diff --git a/dev-libs/pigpio/pigpio-72.ebuild b/dev-libs/pigpio/pigpio-72.ebuild
new file mode 100644
index 000000000000..f4a86cfd1b13
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-72.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
+SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-70-makefile.patch"
+ eapply_user
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+ use python && distutils-r1_src_compile
+}
+
+src_install() {
+ emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+ libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+ mandir="${EPREFIX}/usr/share/man" install
+ einstalldocs
+ newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+ newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+ systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
+ use python && distutils-r1_src_install
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index e719969cacc9..99e3354309fd 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,6 +1,4 @@
DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
-DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.44.8.tar.xz 3360352 BLAKE2B da1c8bd909db712567fecee138b464bb304628c6bff1e33901c788728ae0abea9e2df85263b60d97053cd6b25c0fd434f2df0c81b8e8af46e76f588850f945c7 SHA512 75d0e3815e958c2067764069d3582186a4ae025f2a7bb1f7aa184af51d8d0797be9c21d6bb1485c8e2102fb6fee2d39b3b373660e80f2ad6b0336ba772e01062
DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
DIST vala-0.46.3.tar.xz 3367124 BLAKE2B 795e1615c91ac0324df2f5304951204caf9c024ca9e0d1ba768d0613f6e21393648bc3654c8cc9d386a8bef2009b4c842b1b924b1fd079e2689e6c64a7e7749b SHA512 f932fbcd42e6c82c4543efcc507abdb1e1d1af9c0eac125981c55cb052357e7723cb2a08a5aa56c02ac5228d0125c9906a133ce66f8b59fca84c773060174d0c
diff --git a/dev-libs/vala-common/vala-common-0.44.7.ebuild b/dev-libs/vala-common/vala-common-0.44.7.ebuild
deleted file mode 100644
index f66b34153af7..000000000000
--- a/dev-libs/vala-common/vala-common-0.44.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
- insinto /usr/share/aclocal
- doins vala.m4 vapigen/vapigen.m4
- insinto /usr/share/vala
- doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.44.8.ebuild b/dev-libs/vala-common/vala-common-0.44.8.ebuild
deleted file mode 100644
index f66b34153af7..000000000000
--- a/dev-libs/vala-common/vala-common-0.44.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
- insinto /usr/share/aclocal
- doins vala.m4 vapigen/vapigen.m4
- insinto /usr/share/vala
- doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.44.9.ebuild b/dev-libs/vala-common/vala-common-0.44.9.ebuild
index f66b34153af7..eae737c31439 100644
--- a/dev-libs/vala-common/vala-common-0.44.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d7ee41ed49ae..704d53b0a3e4 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 6d177ed2d3dc..bf7e25ce4c5b 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,4 +2,4 @@ DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f
DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-DIST llvmorg-9.0.1-rc1.tar.gz 113193716 BLAKE2B 1ab52c778a139d33674589c27bf5a4d619dd4df49344b508c16de3ca6fad09c19480ceb615e0d9cf6d1981c7f28e106f087c0cd7bc2ccb844bec7099f5d227c2 SHA512 ed4b11cadbd57aa5f531d598e320a6bd54c67a8c713671af12ce62bc02283515ecbbc65ccbe3b0db3bad517cc4e6386cc3565be9eb9b9d06ca2a598428abf557
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
index 4b0cb21a9496..9445259b89dd 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
@@ -32,12 +32,10 @@ RDEPEND="
~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
!sys-devel/llvm[ocaml(-)]"
DEPEND="${RDEPEND}"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
BDEPEND="
dev-lang/perl
dev-ml/findlib
test? ( dev-ml/ounit )
- !!=sys-apps/lm-sensors-3"
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index 7608b16acbb9..8f5f4d9ac4d0 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1 +1 @@
-DIST audioread-1.0.1.tar.gz 13004 BLAKE2B e2741e43904ab3eba821118163d019bc336fafc157c0a5ab7ccf09c2622d395da104232d5276fda32cd7e945a4b66279ee028bde502e2359fa58c210b5af7804 SHA512 18e9e696785fe2f1b1d6ad7fe64e2878bf490d72aef7500998bb48b0733b382cf0b171d26c5b1465947de1d5f6ded25e2b57947402c31a440e8f346722fdc533
+DIST audioread-2.1.8.tar.gz 21222 BLAKE2B 78cc55d45dd987fbe0171cd3da9f8441e38b60fa6f1b0ef8b0781abc91e6b447b8cf839437b59bfafdf13ca90bb50a032788e0470250f303122a46ddc24ebd19 SHA512 9db5ad1f8b2047256b5f6b4bbee2366043ed19d35ffd2766ae3ab66bdc5b9f63910bcf449fd42aab074fd8132642bf730c432aa0c8f3c5368cd6ef36d7f4f5a5
diff --git a/dev-python/audioread/audioread-1.0.1-r1.ebuild b/dev-python/audioread/audioread-1.0.1-r1.ebuild
deleted file mode 100644
index 8c7ced9e7c9d..000000000000
--- a/dev-python/audioread/audioread-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for decoding audio files using whichever backend is available"
-HOMEPAGE="https://pypi.org/project/audioread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( dev-python/pymad media-video/ffmpeg )"
-
-PATCHES=(
- "${FILESDIR}/0001-Use-the-print-function-instead-of-the-print-keyword.patch"
- )
-
-pkg_postinst() {
- einfo "You might need to enable additional USE flags in backends to"
- einfo "decode some types of audio files. Priority of backends:"
- einfo " * mad"
- einfo " * ffmpeg"
-}
diff --git a/dev-python/audioread/audioread-2.1.8-r1.ebuild b/dev-python/audioread/audioread-2.1.8-r1.ebuild
new file mode 100644
index 000000000000..9c7a8c2414c5
--- /dev/null
+++ b/dev-python/audioread/audioread-2.1.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 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="Wrapper for audio file decoding using FFmpeg or GStreamer"
+HOMEPAGE="https://pypi.org/project/audioread/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg gstreamer mad test"
+
+BDEPEND="
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? (
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ media-libs/gstreamer:1.0
+ media-plugins/gst-plugins-meta:1.0
+ )
+ mad? ( dev-python/pymad )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-test-deps.patch" ) # git master
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ sed -e "/'pytest-runner'/d" -i setup.py || die
+}
diff --git a/dev-python/audioread/files/0001-Use-the-print-function-instead-of-the-print-keyword.patch b/dev-python/audioread/files/0001-Use-the-print-function-instead-of-the-print-keyword.patch
deleted file mode 100644
index 8feb9d0ca9b6..000000000000
--- a/dev-python/audioread/files/0001-Use-the-print-function-instead-of-the-print-keyword.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3f86133d37d5cc5c8712730de67c23b0d33ce082 Mon Sep 17 00:00:00 2001
-From: Simon Chopin
-Date: Tue, 14 May 2013 12:46:50 +0200
-Subject: [PATCH] Use the print() function instead of the print keyword
-
-Python3 doesn't have the `print foo` statement.
----
- audioread/gstdec.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/audioread/gstdec.py b/audioread/gstdec.py
-index 78285db..fa8078f 100644
---- a/audioread/gstdec.py
-+++ b/audioread/gstdec.py
-@@ -366,8 +366,8 @@ if __name__ == '__main__':
- for path in sys.argv[1:]:
- path = os.path.abspath(os.path.expanduser(path))
- with GstAudioFile(path) as f:
-- print f.channels
-- print f.samplerate
-- print f.duration
-+ print(f.channels)
-+ print(f.samplerate)
-+ print(f.duration)
- for s in f:
-- print len(s), ord(s[0])
-+ print(len(s), ord(s[0]))
---
-1.8.1.5
-
diff --git a/dev-python/audioread/files/audioread-2.1.8-test-deps.patch b/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
new file mode 100644
index 000000000000..0a67767070b1
--- /dev/null
+++ b/dev-python/audioread/files/audioread-2.1.8-test-deps.patch
@@ -0,0 +1,27 @@
+From 5dd6c87a53f3a6c5bfa6ea384598213c49402056 Mon Sep 17 00:00:00 2001
+From: Glen Baker
+Date: Mon, 5 Aug 2019 23:40:27 -0700
+Subject: [PATCH] Correct pytest-runner location in setup.py
+
+Moved pytest-runner from setup_requires to tests_require. It is the tests that require pytest-runner.
+---
+ setup.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index bd90605..6041f6e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,11 +36,8 @@ def _read(fn):
+
+ packages=['audioread'],
+
+- setup_requires=[
+- 'pytest-runner'
+- ],
+-
+ tests_require=[
++ 'pytest-runner',
+ 'pytest'
+ ],
+
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
index e26015bff773..0a904c8635b0 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
RDEPEND="
diff --git a/dev-python/brotlipy/brotlipy-0.7.0.ebuild b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
index 96213cb8edd7..2fdc5f0ea568 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index ace4811162cb..328634f67b8c 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,4 +2,4 @@ DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e3297929
DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
-DIST llvmorg-9.0.1-rc1.tar.gz 113193716 BLAKE2B 1ab52c778a139d33674589c27bf5a4d619dd4df49344b508c16de3ca6fad09c19480ceb615e0d9cf6d1981c7f28e106f087c0cd7bc2ccb844bec7099f5d227c2 SHA512 ed4b11cadbd57aa5f531d598e320a6bd54c67a8c713671af12ce62bc02283515ecbbc65ccbe3b0db3bad517cc4e6386cc3565be9eb9b9d06ca2a598428abf557
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
diff --git a/dev-python/clang-python/clang-python-9.0.1_rc1.ebuild b/dev-python/clang-python/clang-python-9.0.1_rc2.ebuild
similarity index 100%
rename from dev-python/clang-python/clang-python-9.0.1_rc1.ebuild
rename to dev-python/clang-python/clang-python-9.0.1_rc2.ebuild
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index bdacbb26441f..97eaaef0c4e7 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc examples test"
DEPEND="
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 38884a4fcece..4611ad25bf58 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 5982794b9637..bb30e1e514ab 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="~amd64 ~arm ~arm64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~sparc"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/dbus-python/dbus-python-1.2.12.ebuild b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
index e378dd9f92f9..494875ffb628 100644
--- a/dev-python/dbus-python/dbus-python-1.2.12.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.12.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 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
IUSE="doc examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/fasteners/fasteners-0.14.1-r1.ebuild b/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
index 3f62ea4e6d5e..156cb0c19361 100644
--- a/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
+++ b/dev-python/fasteners/fasteners-0.14.1-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
inherit distutils-r1
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="
>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/fasteners/fasteners-0.14.1.ebuild b/dev-python/fasteners/fasteners-0.14.1.ebuild
index c722a8f6fbf9..ef49731e5f0b 100644
--- a/dev-python/fasteners/fasteners-0.14.1.ebuild
+++ b/dev-python/fasteners/fasteners-0.14.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="
>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/filelock/filelock-3.0.10.ebuild b/dev-python/filelock/filelock-3.0.10.ebuild
index d66c2b992d9b..9a5fc2c2bda6 100644
--- a/dev-python/filelock/filelock-3.0.10.ebuild
+++ b/dev-python/filelock/filelock-3.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz ->
LICENSE="Unlicense"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
new file mode 100644
index 000000000000..98fa24ff4f58
--- /dev/null
+++ b/dev-python/flit/Manifest
@@ -0,0 +1 @@
+DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
diff --git a/dev-python/flit/files/flit-2.1.0-tests.patch b/dev-python/flit/files/flit-2.1.0-tests.patch
new file mode 100644
index 000000000000..04cf9839dbc4
--- /dev/null
+++ b/dev-python/flit/files/flit-2.1.0-tests.patch
@@ -0,0 +1,8 @@
+diff --git a/tests/test_inifile.py b/tests/test_inifile.py
+index 150fa47..53ce597 100644
+--- a/tests/test_inifile.py
++++ b/tests/test_inifile.py
+@@ -7,2 +7,3 @@ samples_dir = Path(__file__).parent / 'samples'
+
++@pytest.mark.skip("Needs internet access")
+ def test_invalid_classifier():
diff --git a/dev-python/flit/flit-2.1.0.ebuild b/dev-python/flit/flit-2.1.0.ebuild
new file mode 100644
index 000000000000..ea8427af6c24
--- /dev/null
+++ b/dev-python/flit/flit-2.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules"
+HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/flit_core[${PYTHON_USEDEP}]
+ dev-python/intreehooks[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/requests_download[${PYTHON_USEDEP}]
+ dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+ sys-apps/grep
+ sys-apps/findutils
+ test? (
+ >=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/flit-2.1.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+ dev-python/sphinxcontrib-github-alt \
+ dev-python/pygments-github-lexers \
+
+python_prepare_all() {
+ printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
+ "${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
+
+ # use toml instead of depricated pytoml
+ grep -r -l -Z -F 'pytoml' | xargs -0 \
+ sed -e 's:import pytoml as toml:import toml:' \
+ -e 's:pytoml:toml:' -i || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/flit/metadata.xml b/dev-python/flit/metadata.xml
new file mode 100644
index 000000000000..48a322e099ad
--- /dev/null
+++ b/dev-python/flit/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ chutzpah@gentoo.org
+ Patrick McLean
+
+
+ flit
+ takluyver/flit
+
+
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
new file mode 100644
index 000000000000..ce0f6dfe64da
--- /dev/null
+++ b/dev-python/flit_core/Manifest
@@ -0,0 +1 @@
+DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
diff --git a/dev-python/flit_core/flit_core-2.1.0.ebuild b/dev-python/flit_core/flit_core-2.1.0.ebuild
new file mode 100644
index 000000000000..837b6cc3c505
--- /dev/null
+++ b/dev-python/flit_core/flit_core-2.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="https://pypi.org/project/flit-core/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/intreehooks[${PYTHON_USEDEP}]
+ dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+ test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ printf -- "from setuptools import setup, find_packages\nsetup(name='${PN//_/-}',version='${PV}',%s)" \
+ "packages=find_packages()" > setup.py || die
+
+ # use toml instead of depricated pytoml
+ sed -e 's:import pytoml as toml:import toml:' \
+ -i flit_core/inifile.py || die
+ sed -e 's:pytoml:toml:' \
+ -i flit_core/build_thyself.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/flit_core/metadata.xml b/dev-python/flit_core/metadata.xml
new file mode 100644
index 000000000000..12ad08ae74e2
--- /dev/null
+++ b/dev-python/flit_core/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ chutzpah@gentoo.org
+ Patrick McLean
+
+
+ flit-core
+ takluyver/flit
+
+
diff --git a/dev-python/intreehooks/Manifest b/dev-python/intreehooks/Manifest
new file mode 100644
index 000000000000..cde19e0d6481
--- /dev/null
+++ b/dev-python/intreehooks/Manifest
@@ -0,0 +1 @@
+DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
new file mode 100644
index 000000000000..a2471a84947a
--- /dev/null
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+inherit distutils-r1
+
+DESCRIPTION="Load a PEP 517 backend from inside the source tree"
+HOMEPAGE="https://pypi.org/project/intreehooks https://github.com/takluyver/intreehooks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+ dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # replace pytoml with toml
+ sed -e 's:pytoml:toml:' \
+ -i setup.py intreehooks.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ local -a DOCS=( README.rst )
+ use examples && dodoc -r examples
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/intreehooks/metadata.xml b/dev-python/intreehooks/metadata.xml
new file mode 100644
index 000000000000..34d6356499c1
--- /dev/null
+++ b/dev-python/intreehooks/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ chutzpah@gentoo.org
+ Patrick McLean
+
+
+ intreehooks
+ takluyver/intreehooks
+
+
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 6d177ed2d3dc..bf7e25ce4c5b 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,4 +2,4 @@ DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f
DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-DIST llvmorg-9.0.1-rc1.tar.gz 113193716 BLAKE2B 1ab52c778a139d33674589c27bf5a4d619dd4df49344b508c16de3ca6fad09c19480ceb615e0d9cf6d1981c7f28e106f087c0cd7bc2ccb844bec7099f5d227c2 SHA512 ed4b11cadbd57aa5f531d598e320a6bd54c67a8c713671af12ce62bc02283515ecbbc65ccbe3b0db3bad517cc4e6386cc3565be9eb9b9d06ca2a598428abf557
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
diff --git a/dev-python/lit/lit-9.0.1_rc1.ebuild b/dev-python/lit/lit-9.0.1_rc2.ebuild
similarity index 100%
rename from dev-python/lit/lit-9.0.1_rc1.ebuild
rename to dev-python/lit/lit-9.0.1_rc2.ebuild
diff --git a/dev-python/munkres/munkres-1.1.2.ebuild b/dev-python/munkres/munkres-1.1.2.ebuild
index 4c71cf673103..d0dbb6b1d4aa 100644
--- a/dev-python/munkres/munkres-1.1.2.ebuild
+++ b/dev-python/munkres/munkres-1.1.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
inherit distutils-r1
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 1c8a420e70fb..53dfa03171c4 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,2 +1 @@
-DIST nose2-0.6.5.tar.gz 134808 BLAKE2B 5f094d537ff7c48b7bfaf139b4c96a93875013ca5663d1e5b3feec543e7efd55335488321bcdd5752529cb36685dd28c91bd29665aed9e5f58fef837e5e2944b SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40
DIST nose2-0.9.1.tar.gz 152411 BLAKE2B 39f2d992e5cab4b9e5cd4401ea9285884eeeac7d2e126b5aad5582186efa0f325139480a446950019e91a376b5992fea106064e5170c9ea7961f128b895a335c SHA512 48cfe3956a3cb696e344ea03e5e0ac8d52831b8272b7cad2bdee34681d1e4e7968fe9da9b71cc9db40b6edf289509c2af766e73611f3a6f23ebd5062f4d52c9e
diff --git a/dev-python/nose2/nose2-0.6.5.ebuild b/dev-python/nose2/nose2-0.6.5.ebuild
deleted file mode 100644
index 4e7c882e5f4c..000000000000
--- a/dev-python/nose2/nose2-0.6.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="nose2 is the next generation of nicer testing for Python"
-HOMEPAGE="https://github.com/nose-devs/nose2"
-SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-CDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/six-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${CDEPEND}
- doc? ( >=dev-python/sphinx-1.0.5[${PYTHON_USEDEP}] )
-"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/cov-core-1.12[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- "${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 168828eec91e..7a4e6c5393bf 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
index bf5384344c99..ce2a1bda2eda 100644
--- a/dev-python/progress/progress-1.3.ebuild
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 )
inherit bash-completion-r1 distutils-r1
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index b2cab13fe92e..4ad37cc0f196 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,2 +1 @@
-DIST pyacoustid-1.0.0.tar.gz 10476 BLAKE2B 363bf1bee4c124fc57126febf50c34a395ded074df8d3b9661b015b6b653f473ef79837f2078b7b21375d3b3624f75b1070d3c28ab3fa4d619e1ae088129898c SHA512 4eabf32e7d958bf7330e852184f5ddf3105007179ca2c45b75c1a5b0f0898649e703aa333cffccac85eb7b18b54255f2e5d588897adfb9f0ef2596e9c0b2fe5a
-DIST pyacoustid-1.1.5.tar.gz 11846 BLAKE2B 920894d914f5eac15bd62fab7a018937691e8eb7774fe65821bd6a8088e81dba19d178866bfd01b991750c6298714a1b51f948da987207a6adad1e0c1689afa4 SHA512 5b71446b9adbc73335b5962081e880365580b8e0aac746e8137e8819ba91d73ec41814eba13fd1b04c5bad5f2b5a3aaad57db118981ab4eac9dea12f709afe91
+DIST pyacoustid-1.1.7.tar.gz 14990 BLAKE2B 866fa4a03032f15daa2b8dd06119eb6edc777dec4bc673fe2564363f85906bbe451b2ca16e6911e143e7172c728f1a700f5fc426f9a4de9786c1429e475379cc SHA512 2bd301ce51df8a352c71493dac5b5c15cdd0af0a9a0bf0c8640857a9d99c5f0c9d59c5c2bf8c2aec61689481dacc42948f847e0c11ac7d581a7338e6d1088162
diff --git a/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild b/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
deleted file mode 100644
index b2a85cadc4b2..000000000000
--- a/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for Chromaprint acoustic fingerprinting and the Acoustid API"
-HOMEPAGE="https://pypi.org/project/pyacoustid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="media-libs/chromaprint
- dev-python/audioread[${PYTHON_USEDEP}]"
-
-python_install_all() {
- use examples && local EXAMPLES=( ./aidmatch.py)
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild b/dev-python/pyacoustid/pyacoustid-1.1.7.ebuild
similarity index 84%
rename from dev-python/pyacoustid/pyacoustid-1.1.5.ebuild
rename to dev-python/pyacoustid/pyacoustid-1.1.7.ebuild
index 372951e6c9c2..f5c4e4ee7de1 100644
--- a/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild
+++ b/dev-python/pyacoustid/pyacoustid-1.1.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
@@ -17,9 +17,11 @@ KEYWORDS="~amd64 ~x86"
IUSE="examples"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/audioread[${PYTHON_USEDEP}]
+RDEPEND="
+ dev-python/audioread[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
- media-libs/chromaprint"
+ media-libs/chromaprint
+"
src_install() {
distutils-r1_src_install
diff --git a/dev-python/pyatspi/pyatspi-2.32.1.ebuild b/dev-python/pyatspi/pyatspi-2.32.1.ebuild
index 9476dbba39d6..4ce30738e665 100644
--- a/dev-python/pyatspi/pyatspi-2.32.1.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.32.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
# Note: only some of the tests are GPL-licensed, everything else is LGPL
LICENSE="LGPL-2 GPL-2+"
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="" # test
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index d1e334554fd1..9f1cd5f0198d 100644
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2.ebuild
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND}"
RESTRICT="!test? ( test )"
python_check_deps() {
- use doc && has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+ use doc || return 0
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
}
python_compile_all() {
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index 423ecc934cb7..6cfe1b0d2369 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,2 +1,3 @@
DIST pycdio-0.20.tar.gz 197736 BLAKE2B 98ca603dba80a13dc3d1805869e190b9defa1a5c50b398ac4c7122629101df92ca8ad0071101bd8d53cbf48f41211017350a89944944028052899911b32d54e8 SHA512 b53a535440008dc637b31fd2cda22845c91b98e78c30f90c866af3b9bf7cb3faad39f0784b5063a39bd97bb18fc58c75ad0833d53421182d408c2889c491846b
DIST pycdio-2.0.0.tar.gz 242131 BLAKE2B cbe014ea42ecf2b84f736d4b714f0fa76c94b10e0b16da148334521ac4a141db606793be541ee532b7542e58256377bbc6139945232942ef2ef0beeda4b66ef5 SHA512 b73d49e143e4b5ebf5e8514d526a57f71d004b9ce4298743bb109902ee9551fa586384a236b26da9cd86284b2aa8c31fb02a324a1cebc03f2071d06fbd3e3285
+DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
diff --git a/dev-python/pycdio/pycdio-2.1.0.ebuild b/dev-python/pycdio/pycdio-2.1.0.ebuild
new file mode 100644
index 000000000000..bf82efeba6ad
--- /dev/null
+++ b/dev-python/pycdio/pycdio-2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 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 OO interface to libcdio (CD Input and Control library)"
+HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="dev-lang/swig"
+RDEPEND=">=dev-libs/libcdio-2.0.0"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+ # Remove obsolete sys.path and adjust 'data' paths in examples.
+ sed -i \
+ -e "s:^sys.path.insert.*::" \
+ -e "s:\.\./data:./data:g" \
+ example/*.py || die
+
+ # Disable failing tests.
+ sed -i -e "s/test_get_set/_&/" test/test-cdtext.py || die
+ sed -i -e "s/test_fs/_&/" test/test-isocopy.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_install_all(){
+ distutils-r1_python_install_all
+ if use examples; then
+ docinto examples
+ dodoc -r example/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 8bb21a0e2415..77cf6c59a6e6 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1 +1,2 @@
DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
+DIST pygit2-1.0.0.tar.gz 501473 BLAKE2B 854f53113bda2ec5c1fd2ba7f2dfc4213d31d3e687fa17d8942b03dd685cd37df28fc8347bd63ede9650de00b980a4cf7aa1196b9feb9a2365e1fc118d187121 SHA512 33296f95aacbfc3cbce275f84c2025767499738495941408de15ac14f822de132995c05c713b815732dbfc3094edf64351d6240e7201e472b3c47035a7532eff
diff --git a/dev-python/pygit2/pygit2-1.0.0.ebuild b/dev-python/pygit2/pygit2-1.0.0.ebuild
new file mode 100644
index 000000000000..ade7039d9db1
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,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.28*
+ >=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/pygments-github-lexers/Manifest b/dev-python/pygments-github-lexers/Manifest
new file mode 100644
index 000000000000..cf833a132202
--- /dev/null
+++ b/dev-python/pygments-github-lexers/Manifest
@@ -0,0 +1 @@
+DIST pygments-github-lexers-0.0.5.tar.gz 6337 BLAKE2B 21fb1a0627c9ebf42d86d6cceea3ebec4339ef29b1d881d8b3bd5f90060ec2ba76a69ae4bf9e92420a10950ae20c7ea7ff44d5fccf8add06be1f1353cd8b7800 SHA512 429a8a81eb0228c806b6fafe5e1c64be92e719170b1af666aa9c9c7923ff4058972a167193dd0ab1ace0395fa1f6621212f800b07dcce4e59970fd905e046d71
diff --git a/dev-python/pygments-github-lexers/metadata.xml b/dev-python/pygments-github-lexers/metadata.xml
new file mode 100644
index 000000000000..a3d3849c6879
--- /dev/null
+++ b/dev-python/pygments-github-lexers/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ chutzpah@gentoo.org
+ Patrick McLean
+
+
+ pygments-github-lexers
+ liluo/pygments-github-lexers
+
+
diff --git a/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
new file mode 100644
index 000000000000..33275a6e1148
--- /dev/null
+++ b/dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+inherit distutils-r1
+
+DESCRIPTION="Pygments Github custom lexers"
+HOMEPAGE="https://github.com/liluo/pygments-github-lexers"
+SRC_URI="https://github.com/liluo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+# no tests
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 6ab5387d5efb..4e29ae715def 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~sh ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~sh ~amd64-linux ~x86-linux"
IUSE="doc examples test"
REQUIRED_USE="doc? ( || ( $(python_gen_useflags -3) ) )"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pymad/Manifest b/dev-python/pymad/Manifest
index 5e9db8c08994..1383c899289f 100644
--- a/dev-python/pymad/Manifest
+++ b/dev-python/pymad/Manifest
@@ -1 +1 @@
-DIST pymad-0.6.tar.gz 22099 BLAKE2B d0d63114bc24fd94b0f4b1e0d58324cc625772035315cbb6f62bf496c8090db446966a689de08c079f9389295e8efedd885cba5c989d86c31e3291838eb75103 SHA512 1493925cf0fca3ede8314071795736354e2f036f41a9e72cfcf77f960c84bba8e76b43ce7c389c15dc9f2f619ce77b0afae1b78558b1617240bdde3012ad753c
+DIST pymad-0.10.tar.gz 26815 BLAKE2B df694f1fcc7b2c6d0d0aa064b60d061ade2240085867b6a12b3ed63a93cbcac20ac40b3929fbf5b8d9c7b6dbc52883130d02b309ce7690addda6c78813ca2847 SHA512 68a7c93031d174ab50dfa406eec4166be2158d39c4231baee18b7d9c879692376cbf491bcd3e5747e65c496b07a40d1597532551aedcdf05d0fa46f6e185a3d8
diff --git a/dev-python/pymad/metadata.xml b/dev-python/pymad/metadata.xml
index 9e5274c5b4ae..e24cb2a46b11 100644
--- a/dev-python/pymad/metadata.xml
+++ b/dev-python/pymad/metadata.xml
@@ -5,4 +5,7 @@
python@gentoo.org
Python
+
+ jaqx0r/pymad
+
diff --git a/dev-python/pymad/pymad-0.10.ebuild b/dev-python/pymad/pymad-0.10.ebuild
new file mode 100644
index 000000000000..f05e37f069e7
--- /dev/null
+++ b/dev-python/pymad/pymad-0.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for libmad MP3 decoding in python"
+HOMEPAGE="https://github.com/jaqx0r/pymad"
+SRC_URI="https://github.com/jaqx0r/${PN}/archive/version/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="media-libs/libmad"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-version-${PV}"
diff --git a/dev-python/pymad/pymad-0.6-r1.ebuild b/dev-python/pymad/pymad-0.6-r1.ebuild
deleted file mode 100644
index 3fc1e7624ba2..000000000000
--- a/dev-python/pymad/pymad-0.6-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for libmad MP3 decoding in python"
-HOMEPAGE="http://www.spacepants.org/src/pymad/"
-SRC_URI="http://www.spacepants.org/src/pymad/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/libmad"
-RDEPEND="${DEPEND}"
-
-python_configure_all() {
- set -- "${PYTHON}" config_unix.py --prefix "${EPREFIX}/usr"
- echo "${@}"
- "${@}" || die "Configuration failed"
-}
diff --git a/dev-python/pyproj/pyproj-2.4.1.ebuild b/dev-python/pyproj/pyproj-2.4.1.ebuild
index 4caf7eaf1353..52b61f2b5316 100644
--- a/dev-python/pyproj/pyproj-2.4.1.ebuild
+++ b/dev-python/pyproj/pyproj-2.4.1.ebuild
@@ -31,7 +31,8 @@ BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
distutils_enable_tests pytest
python_check_deps() {
- use doc && has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+ use doc || return 0
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
}
python_prepare_all() {
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
index 7fb26dbc1019..ded39d9392d0 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest/pytest-4.5.0.ebuild b/dev-python/pytest/pytest-4.5.0.ebuild
index 9cb97377cf3d..b0e9367f6a39 100644
--- a/dev-python/pytest/pytest-4.5.0.ebuild
+++ b/dev-python/pytest/pytest-4.5.0.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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index bcbb882f91f6..9f4c5b34b03b 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1 +1,2 @@
DIST python-mpd-0.5.5.tar.gz 46334 BLAKE2B b0345c6ac2027e3881f3f2aaa6d7bc01dcf67b71de9bdd6d6a8b1bbd6f72ff9463100a0850db4320ce7ee818a1212537be68ecb624984e3f40f1ef4102eca075 SHA512 d5eec60045561a8a0e29eda2ec2fc341c9b81d61363260c884f0863e931077c31c32534e3c98a488ef31aa61cd3d21bdcfa625b7b062ef24bf3e8024dc1e7c5a
+DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a63de495ba630eedbda96d1b080cfb1cc635801794a91103bbd4b9145733d63ce3ad252748d01ed596cd3b0f7895 SHA512 5fab12d082be39ac4a3477ea10b5d1fa350ceac23c97fb12a46f6cd0cfa6a83999f31528d6d7f74c1ffe67f4e63dfbe8fd3debcf917a6e3705bcf84a55a458ce
diff --git a/dev-python/python-mpd/metadata.xml b/dev-python/python-mpd/metadata.xml
index 2026acc8e100..ff857238fdf2 100644
--- a/dev-python/python-mpd/metadata.xml
+++ b/dev-python/python-mpd/metadata.xml
@@ -1,12 +1,15 @@
-
- python@gentoo.org
- Python
-
-
- python-mpd
- Mic92/python-mpd2
-
+
+ python@gentoo.org
+ Python
+
+
+ python-mpd
+ Mic92/python-mpd2
+
+
diff --git a/dev-python/python-mpd/python-mpd-1.0.0.ebuild b/dev-python/python-mpd/python-mpd-1.0.0.ebuild
new file mode 100644
index 000000000000..067a3f07ca43
--- /dev/null
+++ b/dev-python/python-mpd/python-mpd-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python MPD client library"
+HOMEPAGE="https://github.com/Mic92/python-mpd2"
+SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test +twisted"
+
+REQUIRED_USE="test? ( twisted )"
+
+BDEPEND="
+ test? (
+ dev-python/filelock[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/toml[${PYTHON_USEDEP}]
+ dev-python/tox[${PYTHON_USEDEP}]
+ )
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/changes.rst doc/topics/{advanced,commands,getting-started,logging}.rst README.rst )
+
+S="${WORKDIR}/${PN}2-${PV}"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ rm tox.ini || die
+}
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
new file mode 100644
index 000000000000..8951ccff9fd3
--- /dev/null
+++ b/dev-python/requests_download/Manifest
@@ -0,0 +1 @@
+DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
diff --git a/dev-python/requests_download/metadata.xml b/dev-python/requests_download/metadata.xml
new file mode 100644
index 000000000000..2d3a29feeb4c
--- /dev/null
+++ b/dev-python/requests_download/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ chutzpah@gentoo.org
+ Patrick McLean
+
+
+ requests_download
+ takluyver/requests_download
+
+
diff --git a/dev-python/requests_download/requests_download-0.1.2.ebuild b/dev-python/requests_download/requests_download-0.1.2.ebuild
new file mode 100644
index 000000000000..231d3877ce3c
--- /dev/null
+++ b/dev-python/requests_download/requests_download-0.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A convenient function to download to a file using requests"
+HOMEPAGE="https://github.com/takluyver/requests_download https://pypi.org/project/requests_download/"
+SRC_URI="https://github.com/takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+# there are no tests upstream
+RESTRICT="test"
+
+DOCS=( README.rst )
+
+python_prepare_all() {
+ printf -- "from setuptools import setup\nsetup(name='%s',version='%s',py_modules=['%s'])" \
+ "${PN}" "${PV}" "${PN}" > setup.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
index 13b4421dc875..7c05e10d5c06 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit distutils-r1
-DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
+DESCRIPTION="Checks PyPI validity of reStructuredText"
HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
MY_P="restructuredtext_lint"
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
index 4a58b6cd328f..dda69c1a6391 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit distutils-r1
-DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
+DESCRIPTION="Checks PyPI validity of reStructuredText"
HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
MY_P="restructuredtext_lint"
@@ -17,6 +17,7 @@ LICENSE="Unlicense"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index d5d482efd58e..a21883a89f89 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
PYTHON_REQ_USE="xml(+)"
diff --git a/dev-python/setuptools/setuptools-41.5.1.ebuild b/dev-python/setuptools/setuptools-41.5.1.ebuild
index ff4a7aa54630..a7b9022b6a0c 100644
--- a/dev-python/setuptools/setuptools-41.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-41.5.1.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
PYTHON_REQ_USE="xml(+)"
diff --git a/dev-python/setuptools/setuptools-42.0.0.ebuild b/dev-python/setuptools/setuptools-42.0.0.ebuild
index e7aa7c945a85..8c33401e75bd 100644
--- a/dev-python/setuptools/setuptools-42.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-42.0.0.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
PYTHON_REQ_USE="xml(+)"
diff --git a/dev-python/setuptools/setuptools-42.0.1.ebuild b/dev-python/setuptools/setuptools-42.0.1.ebuild
index 0c293d1ea950..58369bab16cb 100644
--- a/dev-python/setuptools/setuptools-42.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-42.0.1.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
PYTHON_REQ_USE="xml(+)"
diff --git a/dev-python/setuptools/setuptools-42.0.2.ebuild b/dev-python/setuptools/setuptools-42.0.2.ebuild
index 34e7487de3a6..98b924808219 100644
--- a/dev-python/setuptools/setuptools-42.0.2.ebuild
+++ b/dev-python/setuptools/setuptools-42.0.2.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
PYTHON_REQ_USE="xml(+)"
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index 8d522c4213f5..34b0627c0728 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} )
PYTHON_REQ_USE="xml(+)"
diff --git a/dev-python/soupsieve/soupsieve-1.9.5.ebuild b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
index 7e80f259d202..1888f57b9d04 100644
--- a/dev-python/soupsieve/soupsieve-1.9.5.ebuild
+++ b/dev-python/soupsieve/soupsieve-1.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index 6a10480b0571..4864fcad139b 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
IUSE="test yaml"
RESTRICT="!test? ( test )"
diff --git a/dev-python/toml/toml-0.10.0.ebuild b/dev-python/toml/toml-0.10.0.ebuild
index bc40888db0b3..b1d58275a40d 100644
--- a/dev-python/toml/toml-0.10.0.ebuild
+++ b/dev-python/toml/toml-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86"
# peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
# particularly worth the trouble.
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index 0a16480ed11f..8f133f3ef0d7 100644
--- a/dev-python/tox/tox-3.12.1.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~mips ~sparc ~x86"
# doc disabled because of missing deps in tree
IUSE="test"
diff --git a/dev-python/ttystatus/ttystatus-0.36.ebuild b/dev-python/ttystatus/ttystatus-0.36.ebuild
index a66b335863b5..0329dffa93f1 100644
--- a/dev-python/ttystatus/ttystatus-0.36.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.36.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
LICENSE="GPL-3+"
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=""
python_test() {
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index 694ebe509879..786906f5125b 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="~amd64 ~arm ~arm64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~sparc"
RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
index 082228b83f73..45fecefe1811 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9ace5cd7b37b..a5824d2190ed 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 620de77227b8..2a3332a287fd 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,4 +1,2 @@
-DIST facter-3.14.3.tar.gz 395278 BLAKE2B bda071fb92d337e2d6e58faaa33a6b135b6dfd3b6f4077af3b872bd44191629810fe99a7a1f8d9e3b16c4ff45ba587730bccb0652dcd85f4562120def42c7f38 SHA512 abd7cb3e102bff7635d6b2c17e5650e0a7b7be5ed6b81003df17053f0c9c4887f7db948714daaa313c7569bcc788ab18b0361a57395cd5118a6be38d571794df
DIST facter-3.14.5.tar.gz 395892 BLAKE2B c8f98716f4abca8d5f32c1cbfa79437b4021b1994476a31f7c00fc092f02aa08ed01eff4357368e140763bd3d39a38915c99606914e697ff8c769c9f0dd26638 SHA512 387f3d4c654ce3231129dbf6c22ccb04023d73006e4709b330b11ac01ef55831c618d80171ffb8de455be2a12e339a2b52ab782b0ed97e2dbfeaca2692ed951d
DIST facter-3.14.6.tar.gz 397339 BLAKE2B 74fae02a70194fd85789428c779f000e6b6750f52ecb0c713d6b772b3592a1974835367b148d046f849d61704adf82d93f519b86ecfe0007fb492f880a2aebca SHA512 6c17ba200fe82a2223b76505c29c6fb7bce2bff6e795316ea0b91d2fc8bc42bed9b930ba9c5d7b3851fd36fe93fb20e81a9cbc919589d4012e989234be1ba787
-DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
diff --git a/dev-ruby/facter/facter-3.14.3.ebuild b/dev-ruby/facter/facter-3.14.3.ebuild
deleted file mode 100644
index 30611286b2d5..000000000000
--- a/dev-ruby/facter/facter-3.14.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
- EGIT_BRANCH="master"
-else
- [[ "${PV}" = *_rc* ]] || \
- KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
- SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- >=sys-devel/gcc-4.8:*
- dev-cpp/cpp-hocon"
-COMMON_DEPEND="
- >=dev-libs/leatherman-1.0.0:=
- dev-libs/openssl:0=
- sys-apps/util-linux
- app-emulation/virt-what
- net-misc/curl
- >=dev-libs/boost-1.54:=[nls]
- =dev-cpp/yaml-cpp-0.5.1
- ! 10.1.0/>= 10/' \
- -e '/rspec/ s/2.11.0/2.11/' \
- -e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
- # patches
- default
- cmake-utils_src_prepare
-}
-
-each_ruby_configure() {
- # hack for correct calculation of relative path from facter.rb to
- # libfacter.so
- my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
- ruby-ng_src_configure
-
- local mycmakeargs=(
- -DCMAKE_VERBOSE_MAKEFILE=ON
- -DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
- -DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
- )
- if use debug; then
- mycmakeargs+=(
- -DCMAKE_BUILD_TYPE=Debug
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- addpredict /proc/self/oom_score_adj
- cmake-utils_src_compile
-}
-
-src_test() {
- cmake-utils_src_test
-}
-
-each_ruby_install() {
- doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
- cmake-utils_src_install
- ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.5.ebuild b/dev-ruby/facter/facter-3.14.5.ebuild
index 2e6bb05427ef..dbf4788a2881 100644
--- a/dev-ruby/facter/facter-3.14.5.ebuild
+++ b/dev-ruby/facter/facter-3.14.5.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
BDEPEND="
>=sys-devel/gcc-4.8:*
- dev-cpp/cpp-hocon"
+ >=dev-cpp/cpp-hocon-0.1.4-r1"
COMMON_DEPEND="
>=dev-libs/leatherman-1.0.0:=
dev-libs/openssl:0=
diff --git a/dev-ruby/facter/facter-3.14.6.ebuild b/dev-ruby/facter/facter-3.14.6.ebuild
index de60deb0a216..a4124fce9bdd 100644
--- a/dev-ruby/facter/facter-3.14.6.ebuild
+++ b/dev-ruby/facter/facter-3.14.6.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
BDEPEND="
>=sys-devel/gcc-4.8:*
- dev-cpp/cpp-hocon"
+ >=dev-cpp/cpp-hocon-0.1.4-r1"
COMMON_DEPEND="
>=dev-libs/leatherman-1.0.0:=
dev-libs/openssl:0=
diff --git a/dev-ruby/facter/facter-3.9.2-r1.ebuild b/dev-ruby/facter/facter-3.9.2-r1.ebuild
deleted file mode 100644
index 8d687d2b690d..000000000000
--- a/dev-ruby/facter/facter-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
-
-BDEPEND="
- >=sys-devel/gcc-4.8:*
- >=dev-libs/leatherman-1.0.0
- dev-cpp/cpp-hocon"
-CDEPEND="
- dev-libs/openssl:0=
- sys-apps/util-linux
- app-emulation/virt-what
- net-misc/curl
- >=dev-libs/boost-1.54[nls]
- =dev-cpp/yaml-cpp-0.5.1
- ! "${D}/etc/env.d/00facterdir"
- fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/files/00facterdir b/dev-ruby/facter/files/00facterdir
deleted file mode 100644
index 45e29a2405a8..000000000000
--- a/dev-ruby/facter/files/00facterdir
+++ /dev/null
@@ -1 +0,0 @@
-FACTERDIR=/usr
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 932ab960dc82..f9c43b387b7c 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 09b99954521a..6643907074bc 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -3,3 +3,4 @@ DIST guile-2.0.13.tar.gz 7808173 BLAKE2B e1d59356173b54595512c0322ac596ccf46f566
DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
DIST guile-2.2.4.tar.gz 18094974 BLAKE2B 36e9219bbe675b7ad8a73607a3acddae244a71cac1aff8dac77433da76ecb9f073df723ca3d22a15cf769b2fe5a981aa968bd0983020b3926f08f0b497bdf80e SHA512 a200b83a02ef23c8256d9bfb14a141bb6dbca01279a0587bfb672060429c49093088e4b765b7ee5c85cd587a1aeed77d9438d300d3e67cdd6cebbb794d88171e
+DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
new file mode 100644
index 000000000000..d9730393a3d7
--- /dev/null
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MAJOR="2.2"
+DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
+REQUIRED_USE="regex" # workaround for bug 596322
+RESTRICT="strip"
+
+RDEPEND="
+ >=dev-libs/boehm-gc-7.0:=[threads?]
+ dev-libs/gmp:=
+ virtual/libffi:=
+ dev-libs/libltdl:=
+ dev-libs/libunistring:0=
+ sys-libs/ncurses:0=
+ sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ sys-devel/libtool
+ sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+DOCS=( GUILE-VERSION HACKING README )
+
+src_configure() {
+ # see bug #178499
+ filter-flags -ftree-vectorize
+
+ econf \
+ --disable-error-on-warning \
+ --disable-rpath \
+ --disable-static \
+ --enable-posix \
+ --without-libgmp-prefix \
+ --without-libiconv-prefix \
+ --without-libintl-prefix \
+ --without-libltdl-prefix \
+ --without-libreadline-prefix \
+ --without-libunistring-prefix \
+ $(use_enable debug guile-debug) \
+ $(use_enable debug-malloc) \
+ $(use_enable deprecated) \
+ $(use_enable networking) \
+ $(use_enable nls) \
+ $(use_enable regex) \
+ $(use_with threads)
+}
+
+src_install() {
+ default
+
+ # From Novell
+ # https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
+ dodir /usr/share/gdb/auto-load/$(get_libdir)
+ mv "${ED}"/usr/$(get_libdir)/libguile-*-gdb.scm "${ED}"/usr/share/gdb/auto-load/$(get_libdir) || die
+
+ # necessary for registering slib, see bug 206896
+ keepdir /usr/share/guile/site
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index b1207af3d957..d3881ce2c686 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
new file mode 100644
index 000000000000..918c944b6f69
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4 2019-12-07 22:00:18.094712146 +0100
++++ b/tclconfig/tcl.m4 2019-12-07 22:00:28.961515544 +0100
+@@ -434,7 +434,6 @@
+ AC_SUBST(TCL_STUB_LIB_SPEC)
+
+ AC_MSG_CHECKING([platform])
+- hold_cc=$CC; CC="$TCL_CC"
+ AC_TRY_COMPILE(,[
+ #ifdef _WIN32
+ #error win32
+@@ -446,7 +445,6 @@
+ TEA_PLATFORM="windows"
+ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) ]
+ )
+- CC=$hold_cc
+ AC_MSG_RESULT($TEA_PLATFORM)
+
+ # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.in 2019-12-07 22:06:56.954496437 +0100
++++ b/configure.in 2019-12-07 22:07:53.538472872 +0100
+@@ -33,6 +33,7 @@
+ TEA_INIT([3.13])
+
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+
+ #--------------------------------------------------------------------
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 4f20b7f47608..67ca7a61e0a4 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
dev-libs/expat"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+
src_prepare() {
append-libs -lm
sed \
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index adac1ad5c205..12a8727e94fa 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
deleted file mode 100644
index 6f387746d099..000000000000
--- a/dev-tex/luatex/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST luatex-beta-0.70.1-doc.tar.bz2 1048489 BLAKE2B 199419361348fcb4ff5c591e00adde11787153094ccc4990bdf102a6ddc5a72bca34f87e6391ea3156c43d34f5fb20e5fc7fc26a79351d36bca7bf11bf67dac0 SHA512 eb4de91a80a6afccf5cca5cb05d5c1378a60ec35763e5ef5e9dbadaa2a276758a446e01d66e76a78e91442274778c10c73458b513af903e7221d90beb644afa9
-DIST luatex-beta-0.70.1.tar.bz2 8181155 BLAKE2B ef053914eb2a5c25324bcc406df48b82ff92e8dc88fee929ba760489fadfa9896bd2cb98fd0c7f3092e7efc000a16a10d95aa5d41ca78d0f9bc18af8f19b6f50 SHA512 e04a9b96f349bf9036ef4c01746dee96ebf245cd4da6b719f546223e05cb98fb844e20878a64f80f42c77e220fac01ee2d97ad56939c1fb3af44faab53c603cb
-DIST luatex-beta-0.76.0-doc.tar.bz2 995143 BLAKE2B b3819dc821e637c24bfd5add91466b15e46f4752422b7801cb1bde0bb92a6976ba2219c95b24df7f28cf1cad93ddceb4d30c3ffa513367dfca69379b68caea34 SHA512 cd64e1fea3f631c7c6e268d01285f96966325fd16971d8840eef178ccc11b001b40ae5cfcc6c7c3bb026a3f04c04a16b90813f0b6818383bb80686a89ea48596
-DIST luatex-beta-0.76.0-source.tar.bz2 11748576 BLAKE2B 5ff71ee5a2357d1c48b745b55892bb6b8e96917b8dc778d334f80843d8e2ee829cdb9a7a57b3abd5c99202fec5278b680874e72975d774b7134eaf15b9617de6 SHA512 71ea789a95d419bf177f7f9f8d24d00a9d5639665feadac93cc30c86531e4942d29d848ef39ca3698de3efb1b8da9eb19890b1a06b45664641c7e47a79dd80b0
diff --git a/dev-tex/luatex/files/includes.patch b/dev-tex/luatex/files/includes.patch
deleted file mode 100644
index f93c7312b315..000000000000
--- a/dev-tex/luatex/files/includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: source/texk/web2c/luatexdir/image/pdftoepdf.w
-===================================================================
---- source.orig/texk/web2c/luatexdir/image/pdftoepdf.w
-+++ source/texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -26,6 +26,8 @@ static const char _svn_version[] =
- // define DEBUG
- #define __STDC_FORMAT_MACROS /* for PRId64 etc. */
-
-+#include
-+#include
- #include "image/epdf.h"
-
- // This file is mostly C and not very much C++; it's just used to interface
-Index: source/texk/web2c/luatexdir/image/writejp2.w
-===================================================================
---- source.orig/texk/web2c/luatexdir/image/writejp2.w
-+++ source/texk/web2c/luatexdir/image/writejp2.w
-@@ -30,6 +30,7 @@ ISO/IEC 15444-1, Second edition, 2004-09
- @c
- #include
- #include
-+#include
- #include "ptexlib.h"
- #include "image/image.h"
- #include "image/writejp2.h"
diff --git a/dev-tex/luatex/files/kpathsea2012.patch b/dev-tex/luatex/files/kpathsea2012.patch
deleted file mode 100644
index 80c356d9de80..000000000000
--- a/dev-tex/luatex/files/kpathsea2012.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From TeX Live svn rev 23421.
-Remove unnecessary headers. Fixes build with kpathsea from TeX Live 2012.
-
-
-Index: source/texk/web2c/luatexdir/luatex.c
-===================================================================
---- source/texk/web2c/luatexdir/luatex.c (revision 23420)
-+++ source/texk/web2c/luatexdir/luatex.c (revision 23421)
-@@ -32,7 +32,6 @@
- #include
- #include
- #include
--#include
- #ifdef WIN32
- #include
- #endif
-Index: source/texk/web2c/lib/texmfmp.c
-===================================================================
---- source/texk/web2c/lib/texmfmp.c (revision 23420)
-+++ source/texk/web2c/lib/texmfmp.c (revision 23421)
-@@ -17,7 +17,6 @@
- #include
- #include
- #include
--#include
- #ifdef WIN32
- #include
- #endif
diff --git a/dev-tex/luatex/files/poppler018.patch b/dev-tex/luatex/files/poppler018.patch
deleted file mode 100644
index 0fd55a296711..000000000000
--- a/dev-tex/luatex/files/poppler018.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-by Martin von Gagern
-https://bugs.gentoo.org/show_bug.cgi?id=384875
-http://thread.gmane.org/gmane.comp.tex.luatex/2630
-
---- a/texk/web2c/luatexdir/lua/lepdflib.cc
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -89,7 +89,6 @@ new_poppler_userdata(AnnotBorder);
- new_poppler_userdata(Annots);
- new_poppler_userdata(Array);
- new_poppler_userdata(Catalog);
--new_poppler_userdata(EmbFile);
- new_poppler_userdata(Dict);
- //new_poppler_userdata(GooString);
- new_poppler_userdata(LinkDest);
-@@ -393,7 +392,7 @@ static int m_Annot__gc(lua_State * L)
- printf("\n===== Annot GC ===== uin=<%p>\n", uin);
- #endif
- if (uin->atype == ALLOC_LEPDF)
-- delete(Annot *) uin->d;
-+ ((Annot *) uin->d)->decRefCnt();
- return 0;
- }
-
-@@ -408,34 +407,6 @@ static const struct luaL_Reg Annot_m[] =
- };
-
- //**********************************************************************
--// AnnotBorderStyle
--
--m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth);
--
--m_poppler__tostring(AnnotBorderStyle);
--
--static int m_Annots__gc(lua_State * L)
--{
-- udstruct *uin;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Annots);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
--#ifdef DEBUG
-- printf("\n===== Annots GC ===== uin=<%p>\n", uin);
--#endif
-- if (uin->atype == ALLOC_LEPDF)
-- delete(Annots *) uin->d;
-- return 0;
--}
--
--static const struct luaL_Reg AnnotBorderStyle_m[] = {
-- {"getWidth", m_AnnotBorderStyle_getWidth},
-- {"__tostring", m_AnnotBorderStyle__tostring},
-- {"__gc", m_Annots__gc},
-- {NULL, NULL} // sentinel
--};
--
--//**********************************************************************
- // Annots
-
- m_poppler_get_INT(Annots, getNumAnnots);
-@@ -683,31 +654,6 @@ static int m_Catalog_findDest(lua_State
-
- m_poppler_get_poppler(Catalog, Object, getDests);
- m_poppler_get_INT(Catalog, numEmbeddedFiles);
--
--static int m_Catalog_embeddedFile(lua_State * L)
--{
-- EmbFile *ef;
-- int i, len;
-- udstruct *uin, *uout;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Catalog);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
-- i = luaL_checkint(L, 2);
-- len = ((Catalog *) uin->d)->numEmbeddedFiles();
-- if (i > 0 && i <= len) {
-- ef = ((Catalog *) uin->d)->embeddedFile(i - 1);
-- if (ef != NULL) {
-- uout = new_EmbFile_userdata(L);
-- uout->d = ef;
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-- } else
-- lua_pushnil(L);
-- } else
-- lua_pushnil(L);
-- return 1;
--}
--
- m_poppler_get_INT(Catalog, numJS);
-
- static int m_Catalog_getJS(lua_State * L)
-@@ -749,7 +695,6 @@ static const struct luaL_Reg Catalog_m[]
- {"findDest", m_Catalog_findDest},
- {"getDests", m_Catalog_getDests},
- {"numEmbeddedFiles", m_Catalog_numEmbeddedFiles},
-- {"embeddedFile", m_Catalog_embeddedFile},
- {"numJS", m_Catalog_numJS},
- {"getJS", m_Catalog_getJS},
- {"getOutline", m_Catalog_getOutline},
-@@ -759,49 +704,6 @@ static const struct luaL_Reg Catalog_m[]
- };
-
- //**********************************************************************
--// EmbFile
--
--m_poppler_get_GOOSTRING(EmbFile, name);
--m_poppler_get_GOOSTRING(EmbFile, description);
--m_poppler_get_INT(EmbFile, size);
--m_poppler_get_GOOSTRING(EmbFile, modDate);
--m_poppler_get_GOOSTRING(EmbFile, createDate);
--m_poppler_get_GOOSTRING(EmbFile, checksum);
--m_poppler_get_GOOSTRING(EmbFile, mimeType);
--
--static int m_EmbFile_streamObject(lua_State * L)
--{
-- udstruct *uin, *uout;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_EmbFile);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
-- uout = new_Object_userdata(L);
-- uout->d = new Object(); // automatic init to type "none"
-- ((EmbFile *) uin->d)->streamObject().copy((Object *) uout->d);
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-- return 1;
--}
--
--m_poppler_get_BOOL(EmbFile, isOk);
--
--m_poppler__tostring(EmbFile);
--
--static const struct luaL_Reg EmbFile_m[] = {
-- {"name", m_EmbFile_name},
-- {"description", m_EmbFile_description},
-- {"size", m_EmbFile_size},
-- {"modDate", m_EmbFile_modDate},
-- {"createDate", m_EmbFile_createDate},
-- {"checksum", m_EmbFile_checksum},
-- {"mimeType", m_EmbFile_mimeType},
-- {"streamObject", m_EmbFile_streamObject},
-- {"isOk", m_EmbFile_isOk},
-- {"__tostring", m_EmbFile__tostring},
-- {NULL, NULL} // sentinel
--};
--
--//**********************************************************************
- // Dict
-
- static int m_Dict_incRef(lua_State * L)
-@@ -2683,11 +2585,9 @@ int luaopen_epdf(lua_State * L)
- {
- register_meta(Annot);
- // TODO register_meta(AnnotBorder);
-- register_meta(AnnotBorderStyle);
- register_meta(Annots);
- register_meta(Array);
- register_meta(Catalog);
-- register_meta(EmbFile);
- register_meta(Dict);
- register_meta(GooString);
- register_meta(LinkDest);
diff --git a/dev-tex/luatex/files/poppler020.patch b/dev-tex/luatex/files/poppler020.patch
deleted file mode 100644
index d3db830d3430..000000000000
--- a/dev-tex/luatex/files/poppler020.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=416545
-build with poppler-0.20 by Rafał Mużyło
-
---- source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-18 16:23:53.000000000 +0200
-+++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-18 17:43:12.959843483 +0200
-@@ -151,7 +151,7 @@ static int l_new_Annot(lua_State * L)
- pdfdoc_changed_error(L);
- uout = new_Annot_userdata(L);
- uout->d =
-- new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d,
-+ new Annot(udict->pd->doc, (Dict *) udict->d,
- (Object *) uref->d);
- uout->atype = ALLOC_LEPDF;
- uout->pc = uxref->pc;
-@@ -173,7 +173,7 @@ static int l_new_Annots(lua_State * L)
- pdfdoc_changed_error(L);
- uout = new_Annots_userdata(L);
- uout->d =
-- new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d,
-+ new Annots(uannotsobj->pd->doc,
- (Object *) uannotsobj->d);
- uout->atype = ALLOC_LEPDF;
- uout->pc = uxref->pc;
-@@ -363,7 +363,7 @@ static int m_##type##__tostring(lua_Stat
- // Annot
-
- m_poppler_get_BOOL(Annot, isOk);
--m_poppler_get_OBJECT(Annot, getAppearance);
-+m_poppler_get_OBJECT(Annot, getAppearanceResDict);
- m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
-
- static int m_Annot_match(lua_State * L)
-@@ -398,7 +398,7 @@ static int m_Annot__gc(lua_State * L)
-
- static const struct luaL_Reg Annot_m[] = {
- {"isOk", m_Annot_isOk},
-- {"getAppearance", m_Annot_getAppearance},
-+ {"getAppearanceResDict", m_Annot_getAppearanceResDict},
- {"getBorder", m_Annot_getBorder},
- {"match", m_Annot_match},
- {"__tostring", m_Annot__tostring},
-@@ -1249,7 +1249,7 @@ static int m_Object_getType(lua_State *
-
- static int m_Object_getTypeName(lua_State * L)
- {
-- char *s;
-+ const char *s;
- udstruct *uin;
- uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -1936,7 +1936,7 @@ static int m_Page_getLinks(lua_State * L
- if ((uin->pd != NULL && uin->pd->pc != uin->pc)
- || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
- pdfdoc_changed_error(L);
-- links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d);
-+ links = ((Page *) uin->d)->getLinks();
- if (links != NULL) {
- uout = new_Links_userdata(L);
- uout->d = links;
-@@ -2531,7 +2531,6 @@ m_poppler_get_INT(XRef, getNumObjects);
- m_poppler_get_INT(XRef, getRootNum);
- m_poppler_get_INT(XRef, getRootGen);
- // getStreamEnd
--m_poppler_get_INT(XRef, getSize);
- // getEntry
- m_poppler_get_poppler(XRef, Object, getTrailerDict);
-
-@@ -2558,7 +2557,6 @@ static const struct luaL_Reg XRef_m[] =
- {"getRootNum", m_XRef_getRootNum},
- {"getRootGen", m_XRef_getRootGen},
- //
-- {"getSize", m_XRef_getSize},
- {"getTrailerDict", m_XRef_getTrailerDict},
- {"__tostring", m_XRef__tostring},
- {NULL, NULL} // sentinel
diff --git a/dev-tex/luatex/files/poppler022.patch b/dev-tex/luatex/files/poppler022.patch
deleted file mode 100644
index 75d07b751893..000000000000
--- a/dev-tex/luatex/files/poppler022.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-Patch updating lepdflib.cc to upstream revision 4415, which basically removes
-part of the exported interface and thereby circumvents the changes in
-poppler-0.20 -> 0.22. Experimental, rebased on our existing Gentoo patches
-poppler-0.18.patch and poppler-0.20.patch. Here to solve bug 449538.
-
-diff -ruN luatex-beta-0.70.1.gentoo/source/texk/web2c/luatexdir/lua/lepdflib.cc
-luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
---- a/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:31:22.000000000 +0100
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:47:24.000000000 +0100
-@@ -1,7 +1,7 @@
- /* lepdflib.cc
-
-- Copyright 2009-2011 Taco Hoekwater
-- Copyright 2009-2011 Hartmut Henkel
-+ Copyright 2009-2012 Taco Hoekwater
-+ Copyright 2009-2012 Hartmut Henkel
-
- This file is part of LuaTeX.
-
-@@ -49,15 +49,13 @@
- //**********************************************************************
-
- #define M_Annot "Annot"
--#define M_AnnotBorder "AnnotBorder"
--#define M_AnnotBorderStyle "AnnotBorderStyle"
- #define M_Annots "Annots"
- #define M_Array "Array"
- #define M_Catalog "Catalog"
--#define M_EmbFile "EmbFile"
- #define M_Dict "Dict"
- #define M_GooString "GooString"
- #define M_LinkDest "LinkDest"
-+#define M_Link "Link"
- #define M_Links "Links"
- #define M_Object "Object"
- #define M_Page "Page"
-@@ -65,8 +63,8 @@
- #define M_PDFRectangle "PDFRectangle"
- #define M_Ref "Ref"
- #define M_Stream "Stream"
--#define M_XRef "XRef"
- #define M_XRefEntry "XRefEntry"
-+#define M_XRef "XRef"
-
- //**********************************************************************
-
-@@ -84,13 +82,9 @@
- new_poppler_userdata(PDFDoc);
-
- new_poppler_userdata(Annot);
--new_poppler_userdata(AnnotBorder);
--//new_poppler_userdata(AnnotBorderStyle);
--new_poppler_userdata(Annots);
- new_poppler_userdata(Array);
- new_poppler_userdata(Catalog);
- new_poppler_userdata(Dict);
--//new_poppler_userdata(GooString);
- new_poppler_userdata(LinkDest);
- new_poppler_userdata(Links);
- new_poppler_userdata(Object);
-@@ -99,7 +93,6 @@
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
- new_poppler_userdata(XRef);
--//new_poppler_userdata(XRefEntry);
-
- //**********************************************************************
-
-@@ -134,53 +127,6 @@
- return 1; // doc path
- }
-
--static int l_new_Annot(lua_State * L)
--{
-- udstruct *uxref, *udict, *ucatalog, *uref, *uout;
-- uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
-- udict = (udstruct *) luaL_checkudata(L, 2, M_Dict);
-- ucatalog = (udstruct *) luaL_checkudata(L, 3, M_Catalog);
-- uref = (udstruct *) luaL_checkudata(L, 4, M_Ref);
-- if (uxref->pd != ucatalog->pd || uxref->pd != udict->pd
-- || uxref->pd != uref->pd)
-- pdfdoc_differs_error(L);
-- if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc) ||
-- (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc) ||
-- (udict->pd != NULL && udict->pd->pc != udict->pc) ||
-- (uref->pd != NULL && uref->pd->pc != uref->pc))
-- pdfdoc_changed_error(L);
-- uout = new_Annot_userdata(L);
-- uout->d =
-- new Annot(udict->pd->doc, (Dict *) udict->d,
-- (Object *) uref->d);
-- uout->atype = ALLOC_LEPDF;
-- uout->pc = uxref->pc;
-- uout->pd = uxref->pd;
-- return 1;
--}
--
--static int l_new_Annots(lua_State * L)
--{
-- udstruct *uxref, *ucatalog, *uannotsobj, *uout;
-- uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
-- ucatalog = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
-- uannotsobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
-- if (uxref->pd != ucatalog->pd || uxref->pd != uannotsobj->pd)
-- pdfdoc_differs_error(L);
-- if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc)
-- || (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc)
-- || (uannotsobj->pd != NULL && uannotsobj->pd->pc != uannotsobj->pc))
-- pdfdoc_changed_error(L);
-- uout = new_Annots_userdata(L);
-- uout->d =
-- new Annots(uannotsobj->pd->doc,
-- (Object *) uannotsobj->d);
-- uout->atype = ALLOC_LEPDF;
-- uout->pc = uxref->pc;
-- uout->pd = uxref->pd;
-- return 1;
--}
--
- static int l_new_Array(lua_State * L)
- {
- udstruct *uxref, *uout;
-@@ -235,8 +181,6 @@
-
- static const struct luaL_Reg epdflib[] = {
- {"open", l_open_PDFDoc},
-- {"Annot", l_new_Annot},
-- {"Annots", l_new_Annots},
- {"Array", l_new_Array},
- {"Dict", l_new_Dict},
- {"Object", l_new_Object},
-@@ -359,12 +303,26 @@
- return 1; \
- }
-
-+#define m_poppler_check_string(in, function) \
-+static int m_##in##_##function(lua_State * L) \
-+{ \
-+ const char *s; \
-+ udstruct *uin; \
-+ uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
-+ if (uin->pd != NULL && uin->pd->pc != uin->pc) \
-+ pdfdoc_changed_error(L); \
-+ s = luaL_checkstring(L, 2); \
-+ if (((in *) uin->d)->function((char *) s)) \
-+ lua_pushboolean(L, 1); \
-+ else \
-+ lua_pushboolean(L, 0); \
-+ return 1; \
-+}
-+
- //**********************************************************************
- // Annot
-
- m_poppler_get_BOOL(Annot, isOk);
--m_poppler_get_OBJECT(Annot, getAppearanceResDict);
--m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
-
- static int m_Annot_match(lua_State * L)
- {
-@@ -398,8 +356,6 @@
-
- static const struct luaL_Reg Annot_m[] = {
- {"isOk", m_Annot_isOk},
-- {"getAppearanceResDict", m_Annot_getAppearanceResDict},
-- {"getBorder", m_Annot_getBorder},
- {"match", m_Annot_match},
- {"__tostring", m_Annot__tostring},
- {"__gc", m_Annot__gc},
-@@ -654,6 +610,7 @@
-
- m_poppler_get_poppler(Catalog, Object, getDests);
- m_poppler_get_INT(Catalog, numEmbeddedFiles);
-+
- m_poppler_get_INT(Catalog, numJS);
-
- static int m_Catalog_getJS(lua_State * L)
-@@ -770,20 +727,7 @@
- return 0;
- }
-
--static int m_Dict_is(lua_State * L)
--{
-- const char *s;
-- udstruct *uin;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
-- s = luaL_checkstring(L, 2);
-- if (((Dict *) uin->d)->is((char *) s))
-- lua_pushboolean(L, 1);
-- else
-- lua_pushboolean(L, 0);
-- return 1;
--}
-+m_poppler_check_string(Dict, is);
-
- static int m_Dict_lookup(lua_State * L)
- {
-@@ -894,6 +838,8 @@
- return 1;
- }
-
-+m_poppler_check_string(Dict, hasKey);
-+
- m_poppler__tostring(Dict);
-
- static const struct luaL_Reg Dict_m[] = {
-@@ -910,6 +856,7 @@
- {"getKey", m_Dict_getKey},
- {"getVal", m_Dict_getVal},
- {"getValNF", m_Dict_getValNF},
-+ {"hasKey", m_Dict_hasKey},
- {"__tostring", m_Dict__tostring},
- {NULL, NULL} // sentinel
- };
-@@ -1017,9 +964,13 @@
- //**********************************************************************
- // Links
-
-+m_poppler_get_INT(Links, getNumLinks);
-+
- m_poppler__tostring(Links);
-
- static const struct luaL_Reg Links_m[] = {
-+ {"getNumLinks", m_Links_getNumLinks},
-+ //{"getLink", m_Links_getLink},
- {"__tostring", m_Links__tostring},
- {NULL, NULL} // sentinel
- };
-@@ -1925,28 +1876,6 @@
- m_poppler_get_poppler(Page, Dict, getResourceDict);
- m_poppler_get_OBJECT(Page, getAnnots);
-
--static int m_Page_getLinks(lua_State * L)
--{
-- Links *links;
-- udstruct *uin, *ucat, *uout;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Page);
-- ucat = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
-- if (uin->pd != NULL && ucat->pd != NULL && uin->pd != ucat->pd)
-- pdfdoc_differs_error(L);
-- if ((uin->pd != NULL && uin->pd->pc != uin->pc)
-- || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
-- pdfdoc_changed_error(L);
-- links = ((Page *) uin->d)->getLinks();
-- if (links != NULL) {
-- uout = new_Links_userdata(L);
-- uout->d = links;
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-- } else
-- lua_pushnil(L);
-- return 1;
--}
--
- m_poppler_get_OBJECT(Page, getContents);
-
- m_poppler__tostring(Page);
-@@ -1973,7 +1902,6 @@
- {"getSeparationInfo", m_Page_getSeparationInfo},
- {"getResourceDict", m_Page_getResourceDict},
- {"getAnnots", m_Page_getAnnots},
-- {"getLinks", m_Page_getLinks},
- {"getContents", m_Page_getContents},
- {"__tostring", m_Page__tostring},
- {NULL, NULL} // sentinel
-@@ -2158,19 +2086,23 @@
-
- static int m_PDFDoc_getLinks(lua_State * L)
- {
-- int i;
-+ int i, pages;
- Links *links;
- udstruct *uin, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- i = luaL_checkint(L, 2);
-- links = ((PdfDocument *) uin->d)->doc->getLinks(i);
-- if (links != NULL) {
-- uout = new_Links_userdata(L);
-- uout->d = links;
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-+ pages = ((PdfDocument *) uin->d)->doc->getNumPages();
-+ if (i > 0 && i <= pages) {
-+ links = ((PdfDocument *) uin->d)->doc->getLinks(i);
-+ if (links != NULL) {
-+ uout = new_Links_userdata(L);
-+ uout->d = links;
-+ uout->pc = uin->pc;
-+ uout->pd = uin->pd;
-+ } else
-+ lua_pushnil(L);
- } else
- lua_pushnil(L);
- return 1;
-@@ -2249,6 +2181,8 @@
- m_PDFDoc_INT(getPDFMajorVersion);
- m_PDFDoc_INT(getPDFMinorVersion);
-
-+m_poppler__tostring(PDFDoc);
-+
- static int m_PDFDoc__gc(lua_State * L)
- {
- udstruct *uin;
-@@ -2292,6 +2226,7 @@
- {"getDocInfoNF", m_PDFDoc_getDocInfoNF},
- {"getPDFMajorVersion", m_PDFDoc_getPDFMajorVersion},
- {"getPDFMinorVersion", m_PDFDoc_getPDFMinorVersion},
-+ {"__tostring", m_PDFDoc__tostring},
- {"__gc", m_PDFDoc__gc}, // finalizer
- {NULL, NULL} // sentinel
- };
-@@ -2437,11 +2372,6 @@
- "Flate", "JBIG2", "JPX", "Weird", NULL
- };
-
--#if 0
--static const char *StreamColorSpaceModeNames[] =
-- { "CSNone", "CSDeviceGray", "CSDeviceRGB", "CSDeviceCMYK", NULL };
--#endif
--
- m_poppler_get_INT(Stream, getKind);
-
- static int m_Stream_getKindName(lua_State * L)
-@@ -2527,11 +2457,26 @@
- m_poppler_get_OBJECT(XRef, getDocInfo);
- m_poppler_get_OBJECT(XRef, getDocInfoNF);
- m_poppler_get_INT(XRef, getNumObjects);
--// getLastXRefPos
- m_poppler_get_INT(XRef, getRootNum);
- m_poppler_get_INT(XRef, getRootGen);
- // getStreamEnd
--// getEntry
-+
-+static int m_XRef_getNumEntry(lua_State * L)
-+{
-+ int i, offset;
-+ udstruct *uin;
-+ uin = (udstruct *) luaL_checkudata(L, 1, M_XRef);
-+ if (uin->pd != NULL && uin->pd->pc != uin->pc)
-+ pdfdoc_changed_error(L);
-+ offset = luaL_checkint(L, 2);
-+ i = ((XRef *) uin->d)->getNumEntry(offset);
-+ if (i >= 0)
-+ lua_pushinteger(L, i);
-+ else
-+ lua_pushnil(L);
-+ return 1;
-+}
-+
- m_poppler_get_poppler(XRef, Object, getTrailerDict);
-
- m_poppler__tostring(XRef);
-@@ -2553,10 +2498,10 @@
- {"getDocInfo", m_XRef_getDocInfo},
- {"getDocInfoNF", m_XRef_getDocInfoNF},
- {"getNumObjects", m_XRef_getNumObjects},
-- //
- {"getRootNum", m_XRef_getRootNum},
- {"getRootGen", m_XRef_getRootGen},
-- //
-+ // {"getStreamEnd", m_XRef_getStreamEnd},
-+ {"getNumEntry", m_XRef_getNumEntry},
- {"getTrailerDict", m_XRef_getTrailerDict},
- {"__tostring", m_XRef__tostring},
- {NULL, NULL} // sentinel
-@@ -2565,7 +2510,10 @@
- //**********************************************************************
- // XRefEntry
-
-+m_poppler__tostring(XRefEntry);
-+
- static const struct luaL_Reg XRefEntry_m[] = {
-+ {"__tostring", m_XRefEntry__tostring},
- {NULL, NULL} // sentinel
- };
-
-@@ -2582,7 +2530,6 @@
- int luaopen_epdf(lua_State * L)
- {
- register_meta(Annot);
-- // TODO register_meta(AnnotBorder);
- register_meta(Annots);
- register_meta(Array);
- register_meta(Catalog);
diff --git a/dev-tex/luatex/files/poppler026-backport.patch b/dev-tex/luatex/files/poppler026-backport.patch
deleted file mode 100644
index a32d3e961204..000000000000
--- a/dev-tex/luatex/files/poppler026-backport.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h
---- a/texk/web2c/luatexdir/image/epdf.h 2011-05-19 07:38:37.000000000 +0200
-+++ b/texk/web2c/luatexdir/image/epdf.h 2014-10-11 12:17:00.028331243 +0200
-@@ -33,6 +33,7 @@
- # include
- # include
- # include
-+# include
- # include
- # include
- # include
-diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc
---- a/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:24:52.509357663 +0200
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:42:03.665415321 +0200
-@@ -48,23 +48,24 @@
-
- //**********************************************************************
-
--#define M_Annot "Annot"
--#define M_Annots "Annots"
--#define M_Array "Array"
--#define M_Catalog "Catalog"
--#define M_Dict "Dict"
--#define M_GooString "GooString"
--#define M_LinkDest "LinkDest"
--#define M_Link "Link"
--#define M_Links "Links"
--#define M_Object "Object"
--#define M_Page "Page"
--#define M_PDFDoc "PDFDoc"
--#define M_PDFRectangle "PDFRectangle"
--#define M_Ref "Ref"
--#define M_Stream "Stream"
--#define M_XRefEntry "XRefEntry"
--#define M_XRef "XRef"
-+#define M_Annot "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */
-+#define M_Annots "epdf.Annots"
-+#define M_Array "epdf.Array"
-+#define M_Catalog "epdf.Catalog"
-+#define M_Dict "epdf.Dict"
-+#define M_GooString "epdf.GooString"
-+#define M_LinkDest "epdf.LinkDest"
-+#define M_Link "epdf.Link"
-+#define M_Links "epdf.Links"
-+#define M_Object "epdf.Object"
-+#define M_Page "epdf.Page"
-+#define M_PDFDoc "epdf.PDFDoc"
-+#define M_PDFRectangle "epdf.PDFRectangle"
-+#define M_Ref "epdf.Ref"
-+#define M_Stream "epdf.Stream"
-+#define M_StructTreeRoot "epdf.StructTreeRoot"
-+#define M_XRef "epdf.XRef"
-+#define M_XRefEntry "epdf.XRefEntry"
-
- //**********************************************************************
-
-@@ -92,6 +93,7 @@
- new_poppler_userdata(PDFRectangle);
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
-+new_poppler_userdata(StructTreeRoot);
- new_poppler_userdata(XRef);
-
- //**********************************************************************
-@@ -565,7 +567,11 @@
-
- m_poppler_get_GOOSTRING(Catalog, getBaseURI);
- m_poppler_get_GOOSTRING(Catalog, readMetadata);
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
-+#else
-+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
-+#endif
-
- static int m_Catalog_findPage(lua_State * L)
- {
-@@ -2048,14 +2054,22 @@
-
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- Object *obj;
-+#else
-+ StructTreeRoot *obj;
-+#endif
- udstruct *uin, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
- obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- uout = new_Object_userdata(L);
-+#else
-+ uout = new_StructTreeRoot_userdata(L);
-+#endif
- uout->d = obj;
- uout->pc = uin->pc;
- uout->pd = uin->pd;
diff --git a/dev-tex/luatex/files/poppler026.patch b/dev-tex/luatex/files/poppler026.patch
deleted file mode 100644
index c09ff05e1092..000000000000
--- a/dev-tex/luatex/files/poppler026.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Source: NetBSD CVS
-http://mail-index.netbsd.org/pkgsrc-bugs/2014/04/29/msg053974.html
-http://cvsweb.de.netbsd.org/cgi-bin/cvsweb.cgi/pkgsrc/print/luatex/patches/
-
-
-diff -ruN luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.76.0/source/texk/web2c/luatexdir/image/epdf.h
---- a/texk/web2c/luatexdir/image/epdf.h 2013-04-05 12:58:37.000000000 +0200
-+++ b/texk/web2c/luatexdir/image/epdf.h 2014-05-01 01:39:39.838462783 +0200
-@@ -37,6 +37,7 @@
- # include
- # include
- # include
-+# include
- # include
- # include
- # include
-diff -ruN luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.76.0/source/texk/web2c/luatexdir/lua/lepdflib.cc
---- a/texk/web2c/luatexdir/lua/lepdflib.cc 2013-04-05 12:58:37.000000000 +0200
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2014-05-01 01:40:15.698461067 +0200
-@@ -48,25 +48,26 @@
-
- //**********************************************************************
-
--#define M_Annot "Annot"
--#define M_Annots "Annots"
--#define M_Array "Array"
--#define M_Catalog "Catalog"
--#define M_Dict "Dict"
--#define M_EmbFile "EmbFile"
--#define M_FileSpec "FileSpec"
--#define M_GooString "GooString"
--#define M_LinkDest "LinkDest"
--#define M_Link "Link"
--#define M_Links "Links"
--#define M_Object "Object"
--#define M_Page "Page"
--#define M_PDFDoc "PDFDoc"
--#define M_PDFRectangle "PDFRectangle"
--#define M_Ref "Ref"
--#define M_Stream "Stream"
--#define M_XRefEntry "XRefEntry"
--#define M_XRef "XRef"
-+#define M_Annot "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */
-+#define M_Annots "epdf.Annots"
-+#define M_Array "epdf.Array"
-+#define M_Catalog "epdf.Catalog"
-+#define M_Dict "epdf.Dict"
-+#define M_EmbFile "epdf.EmbFile"
-+#define M_FileSpec "epdf.FileSpec"
-+#define M_GooString "epdf.GooString"
-+#define M_LinkDest "epdf.LinkDest"
-+#define M_Link "epdf.Link"
-+#define M_Links "epdf.Links"
-+#define M_Object "epdf.Object"
-+#define M_Page "epdf.Page"
-+#define M_PDFDoc "epdf.PDFDoc"
-+#define M_PDFRectangle "epdf.PDFRectangle"
-+#define M_Ref "epdf.Ref"
-+#define M_Stream "epdf.Stream"
-+#define M_StructTreeRoot "epdf.StructTreeRoot"
-+#define M_XRefEntry "epdf.XRefEntry"
-+#define M_XRef "epdf.XRef"
-
- //**********************************************************************
-
-@@ -96,6 +97,7 @@
- new_poppler_userdata(PDFRectangle);
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
-+new_poppler_userdata(StructTreeRoot);
- new_poppler_userdata(XRef);
-
- //**********************************************************************
-@@ -573,7 +575,11 @@
-
- m_poppler_get_GOOSTRING(Catalog, getBaseURI);
- m_poppler_get_GOOSTRING(Catalog, readMetadata);
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
-+#else
-+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
-+#endif
-
- static int m_Catalog_findPage(lua_State * L)
- {
-@@ -2146,14 +2152,22 @@
-
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- Object *obj;
-+#else
-+ StructTreeRoot *obj;
-+#endif
- udstruct *uin, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
- obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- uout = new_Object_userdata(L);
-+#else
-+ uout = new_StructTreeRoot_userdata(L);
-+#endif
- uout->d = obj;
- uout->pc = uin->pc;
- uout->pd = uin->pd;
-@@ -2617,6 +2631,15 @@
-
- //**********************************************************************
-
-+#ifdef LuajitTeX
-+#define setfuncs_meta(type) \
-+ luaL_newmetatable(L, M_##type); \
-+ lua_pushvalue(L, -1); \
-+ lua_setfield(L, -2, "__index"); \
-+ lua_pushstring(L, "no user access"); \
-+ lua_setfield(L, -2, "__metatable"); \
-+ luaL_register(L, NULL, type##_m)
-+#else
- #define setfuncs_meta(type) \
- luaL_newmetatable(L, M_##type); \
- lua_pushvalue(L, -1); \
-@@ -2624,6 +2647,7 @@
- lua_pushstring(L, "no user access"); \
- lua_setfield(L, -2, "__metatable"); \
- luaL_setfuncs(L, type##_m, 0)
-+#endif
-
- int luaopen_epdf(lua_State * L)
- {
-@@ -2646,6 +2670,10 @@
- setfuncs_meta(XRef);
- setfuncs_meta(XRefEntry);
-
-+#ifdef LuajitTeX
-+ luaL_register(L, "epdf", epdflib_f);
-+#else
- luaL_newlib(L, epdflib_f);
-+#endif
- return 1;
- }
diff --git a/dev-tex/luatex/files/remove-zlib-version-check.patch b/dev-tex/luatex/files/remove-zlib-version-check.patch
deleted file mode 100644
index f3f21a595a09..000000000000
--- a/dev-tex/luatex/files/remove-zlib-version-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Let soname dictate the ABI and do not check for minor/micro which requires
-needless rebuilds after every zlib update. By Ulrich Müller.
-
-https://bugs.gentoo.org/show_bug.cgi?id=310487
-http://www.ntg.nl/pipermail/dev-luatex/2012-July/004534.html
-
---- a/texk/web2c/luatexdir/luazlib/lzlib.c
-+++ b/texk/web2c/luatexdir/luazlib/lzlib.c
-@@ -549,14 +549,6 @@
-
- /* ====================================================================== */
-
-- /* make sure header and library version are consistent */
-- const char* version = zlibVersion();
-- if (strncmp(version, ZLIB_VERSION, 5))
-- {
-- lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
-- lua_error(L);
-- }
--
- /* create new metatable for zlib compression structures */
- luaL_newmetatable(L, ZSTREAMMETA);
- lua_pushliteral(L, "__index");
diff --git a/dev-tex/luatex/luatex-0.70.1-r3.ebuild b/dev-tex/luatex/luatex-0.70.1-r3.ebuild
deleted file mode 100644
index b06166bb98e8..000000000000
--- a/dev-tex/luatex/luatex-0.70.1-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool texlive-common
-
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
-HOMEPAGE="http://www.luatex.org/"
-SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${PV}.tar.bz2
- http://foundry.supelec.fr/gf/download/frsrelease/392/1732/${PN}-beta-${PV}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
- >=media-libs/libpng-1.4
- app-text/poppler:=[xpdf-headers(+)]
- sys-libs/zlib:*
- >=dev-libs/kpathsea-6.0.1_p20110627"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-beta-${PV}/source"
-PRELIBS="libs/obsdcompat"
-#texk/kpathsea"
-#kpathsea_extraconf="--disable-shared --disable-largefile"
-
-src_prepare() {
- default
- has_version '>=app-text/poppler-0.18.0:0' && eapply "${FILESDIR}/poppler018.patch"
- has_version '>=app-text/poppler-0.20.0:0' && eapply "${FILESDIR}/poppler020.patch"
- has_version '>=app-text/poppler-0.22.0:0' && eapply "${FILESDIR}/poppler022.patch"
- has_version '>=app-text/poppler-0.26.0:0' && eapply "${FILESDIR}/poppler026-backport.patch"
- has_version '>=app-text/poppler-0.57.0:0' && append-cxxflags -std=c++11 # bug 627538
- eapply "${FILESDIR}/kpathsea2012.patch" \
- "${FILESDIR}/remove-zlib-version-check.patch"
- S="${S}/build-aux" elibtoolize --shallow
-}
-
-src_configure() {
- # Too many regexps use A-Z a-z constructs, what causes problems with locales
- # that don't have the same alphabetical order than ascii. Bug #244619
- # So we set LC_ALL to C in order to avoid problems.
- export LC_ALL=C
-
- local myconf
- myconf=""
- #has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
-
- cd "${S}/texk/web2c" || die
- econf \
- --disable-cxx-runtime-hack \
- --disable-all-pkgs \
- --disable-mp \
- --disable-ptex \
- --disable-tex \
- --disable-mf \
- --disable-largefile \
- --disable-ipc \
- --disable-shared \
- --enable-luatex \
- --enable-dump-share \
- --without-mf-x-toolkit \
- --without-x \
- --with-system-kpathsea \
- --with-kpathsea-includes="${EPREFIX}"/usr/include \
- --with-system-gd \
- --with-system-libpng \
- --with-system-teckit \
- --with-system-zlib \
- --with-system-t1lib \
- --with-system-xpdf \
- --with-system-poppler \
- --with-system-zziplib \
- --disable-multiplatform
-
- for i in ${PRELIBS} ; do
- einfo "Configuring $i"
- local j=$(basename $i)_extraconf
- local myconf
- eval myconf=\${$j}
- cd "${S}/${i}" || die
- econf ${myconf}
- done
-}
-
-src_compile() {
- texk/web2c/luatexdir/getluatexsvnversion.sh || die
- for i in ${PRELIBS} ; do
- cd "${S}/${i}" || die
- emake
- done
- cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
- emake luatex
-}
-
-src_install() {
- cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
- emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
- install-exec-am
-
- dodoc "${WORKDIR}/${PN}-beta-${PV}/README"
- doman "${WORKDIR}/texmf/doc/man/man1/"*.1
- if use doc ; then
- dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf
- dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf
- fi
-}
-
-pkg_postinst() {
- if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
- elog "Note that this package does not install many files, mainly just the"
- elog "${PN} executable, which needs other files in order to be"
- elog "useful. Please consider installing a recent TeX distribution such as"
- elog "TeX Live 2008 or later to take advantage of the full power of"
- elog "${PN} ."
- fi
- efmtutil-sys
-}
diff --git a/dev-tex/luatex/luatex-0.76.0-r1.ebuild b/dev-tex/luatex/luatex-0.76.0-r1.ebuild
deleted file mode 100644
index cb38d3df2dea..000000000000
--- a/dev-tex/luatex/luatex-0.76.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool flag-o-matic texlive-common
-
-MY_P=${PN}-beta-${PV}
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
-HOMEPAGE="http://www.luatex.org/"
-SRC_URI="
- http://foundry.supelec.fr/frs/download.php/file/15745/${MY_P}-source.tar.bz2
- http://foundry.supelec.fr/frs/download.php/file/15747/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
- >=media-libs/libpng-1.4:0=
- >=x11-libs/cairo-1.12
- >x11-libs/pixman-0.18
- app-text/poppler:=[xpdf-headers(+)]
- sys-libs/zlib:*
- >=dev-libs/kpathsea-6.1.0_p20120701"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/source"
-
-src_prepare() {
- default
- has_version '>=app-text/poppler-0.26.0:0' && eapply "${FILESDIR}/poppler026.patch"
- has_version '>=app-text/poppler-0.57.0:0' && append-cxxflags -std=c++11 # bug 627538
- eapply "${FILESDIR}/remove-zlib-version-check.patch" \
- "${FILESDIR}/includes.patch"
- S="${S}/build-aux" elibtoolize --shallow
-}
-
-src_configure() {
- # Too many regexps use A-Z a-z constructs, what causes problems with locales
- # that don't have the same alphabetical order than ascii. Bug #244619
- # So we set LC_ALL to C in order to avoid problems.
- export LC_ALL=C
-
- cd "${S}/texk/web2c" || die
- econf \
- --disable-cxx-runtime-hack \
- --disable-all-pkgs \
- --disable-mp \
- --disable-ptex \
- --disable-tex \
- --disable-mf \
- --disable-largefile \
- --disable-ipc \
- --disable-shared \
- --enable-luatex \
- --enable-dump-share \
- --without-mf-x-toolkit \
- --without-x \
- --with-system-kpathsea \
- --with-kpathsea-includes="${EPREFIX}"/usr/include \
- --with-system-cairo \
- --with-system-pixman \
- --with-system-gd \
- --with-system-libpng \
- --with-system-teckit \
- --with-system-zlib \
- --with-system-t1lib \
- --with-system-xpdf \
- --with-system-poppler \
- --with-system-zziplib \
- --with-system-ptexenc \
- --disable-multiplatform
-}
-
-src_compile() {
- texk/web2c/luatexdir/getluatexsvnversion.sh || die
- cd "${WORKDIR}/${MY_P}/source/texk/web2c" || die
- emake luatex
-}
-
-src_install() {
- cd "${WORKDIR}/${MY_P}/source/texk/web2c" || die
- emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
- install-exec-am
-
- dodoc "${WORKDIR}/${MY_P}/README" luatexdir/NEWS
- cp source/texk/web2c/man || die
- cp man/luatex.man "${T}/luatex.1" || die
- doman "${T}/luatex.1"
- use doc && dodoc "${WORKDIR}/${MY_P}/manual/"*.pdf
-}
-
-pkg_postinst() {
- if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
- elog "Note that this package does not install many files, mainly just the"
- elog "${PN} executable, which needs other files in order to be"
- elog "useful. Please consider installing a recent TeX distribution such as"
- elog "TeX Live 2008 or later to take advantage of the full power of"
- elog "${PN} ."
- fi
- efmtutil-sys
-}
diff --git a/dev-tex/luatex/metadata.xml b/dev-tex/luatex/metadata.xml
deleted file mode 100644
index c4cc7073d3f4..000000000000
--- a/dev-tex/luatex/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- tex@gentoo.org
- Gentoo TeX Project
-
-
-An experimental pdfTeX extension that is to eventually
-become its successor. It is developed by a subset of the
-current pdfTeX team.
-
-
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 55d49d2988b8..d640b4e71a2a 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index c189b10ccc4c..1d6132910028 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,3 +1 @@
-DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
-DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
deleted file mode 100644
index 4c164c8d29cf..000000000000
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic prefix python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples python test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
- !/dev/null || die
- eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
- popd >/dev/null || die
-
- # Remove stripping option
- # Fix python components build on multilib systems, bug #496446
- cd "${S}/engine" || die
- sed -i \
- -e 's|-s\b||' \
- -e "/libpython/s/lib ]/$(get_libdir) ]/" \
- build.jam || die "sed failed"
-
- # Force regeneration
- rm jambase.c || die
-
- # This patch allows us to fully control optimization
- # and stripping flags when bjam is used as build-system
- # We simply extend the optimization and debug-symbols feature
- # with empty dummies called 'none'
- cd "${S}" || die
- sed -i \
- -e 's/\(off speed space\)/\1 none/' \
- -e 's/\(debug-symbols : on off\)/\1 none/' \
- tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
- hprefixify engine/Jambase
- if use python; then
- # replace versions by user-selected one (TODO: fix this when slot-op
- # deps are available to always match the best version available)
- sed -i \
- -e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
- engine/build.jam || die "sed failed"
- fi
-}
-
-src_compile() {
- cd engine || die
-
- local toolset
-
- if [[ ${CHOST} == *-darwin* ]]; then
- toolset=darwin
- else
- # Using boost's generic toolset here, which respects CC and CFLAGS
- toolset=cc
- fi
-
- CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
-}
-
-src_install() {
- dobin engine/bin.*/{bjam,b2}
-
- insinto /usr/share/boost-build
- doins -r "${FILESDIR}/site-config.jam" \
- ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
- build kernel options tools util
-
- if ! use python; then
- find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
- fi
-
- dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
- if use examples; then
- docinto examples
- dodoc -r ../example/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-src_test() {
- cd ../test || die
-
- export TMP="${T}"
-
- DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
-
- if [[ -s test_results.txt ]]; then
- eerror "At least one test failed: $(/dev/null || die
- eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
- popd >/dev/null || die
-
- # Remove stripping option
- # Fix python components build on multilib systems, bug #496446
- cd "${S}/engine" || die
- sed -i \
- -e 's|-s\b||' \
- -e "/libpython/s;lib ];$(get_libdir) ];" \
- build.jam || die "sed failed"
-
- # Force regeneration
- rm jambase.c || die
-
- # This patch allows us to fully control optimization
- # and stripping flags when bjam is used as build-system
- # We simply extend the optimization and debug-symbols feature
- # with empty dummies called 'none'
- cd "${S}" || die
- sed -i \
- -e 's/\(off speed space\)/\1 none/' \
- -e 's/\(debug-symbols : on off\)/\1 none/' \
- tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
- hprefixify engine/Jambase
- if use python; then
- # replace versions by user-selected one (TODO: fix this when slot-op
- # deps are available to always match the best version available)
- sed -i \
- -e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
- engine/build.jam || die "sed failed"
- fi
-}
-
-src_compile() {
- cd engine || die
-
- local toolset
-
- if [[ ${CHOST} == *-darwin* ]]; then
- toolset=darwin
- else
- # Using boost's generic toolset here, which respects CC and CFLAGS
- toolset=cc
- fi
-
- CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${ESYSROOT}"/usr) || die "building bjam failed"
-}
-
-src_test() {
- cd ../test || die
-
- local -x TMP="${T}"
-
- DO_DIFF="${EPREFIX}/usr/bin/diff" "${EPYTHON}" test_all.py
-
- if [[ -s test_results.txt ]]; then
- eerror "At least one test failed: $(/dev/null || die
- eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+ eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
popd >/dev/null || die
-
- # remove default -march/-mcpu definitions
- # bjam is trying to be clever and injects -march= in order to
- # optimize code for you. This breaks on 32-bit builds, because
- # -march=i686 will not work on an i486 CHOST.
- # https://bugs.gentoo.org/624616
- sed -e '/^cpu-flags\s*gcc\s*OPTIONS/d' \
- -e '/toolset\.flags\s*gcc\s*OPTIONS/d' \
- -e "/cpu_flags('gcc',\s*'OPTIONS'/d" \
- -i tools/gcc.{jam,py} || die "Failed removing -march/-mcpu"
}
src_configure() {
diff --git a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
deleted file mode 100644
index 8775583cbc00..000000000000
--- a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/engine/build.jam
-+++ b/engine/build.jam
-@@ -3,7 +3,7 @@
- #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-
- # Clean env vars of any "extra" empty values.
--for local v in ARGV CC CFLAGS LIBS
-+for local v in ARGV CC CFLAGS LDFLAGS LIBS
- {
- local values ;
- for local x in $($(v))
-@@ -179,10 +179,10 @@
- if ! $(CC) { CC = cc ; }
- toolset cc $(CC) : "-o " : -D
- : $(CFLAGS)
-- [ opt --release : -s -O ]
-+ [ opt --release : ]
- [ opt --debug : -g ]
- -I$(--python-include) -I$(--extra-include)
-- : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-+ : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
- ## Comeau C/C++ 4.x
- toolset como como : "-o " : -D
- : --c
-@@ -201,11 +201,11 @@
- ## MacOSX Darwin, using GCC 2.9.x, 3.x
- toolset darwin cc : "-o " : -D
- :
-- [ opt --release : -Wl,-x -O3 -finline-functions ]
-+ [ opt --release : -Wl,-x -finline-functions ]
- [ opt --debug : -g -O0 -fno-inline -pg ]
- [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ]
- -I$(--python-include) -I$(--extra-include)
-- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-+ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
- ## GCC 2.x, 3.x, 4.x
- toolset gcc gcc : "-o " : -D
- : -pedantic -fno-strict-aliasing
---- a/engine/build.sh
-+++ b/engine/build.sh
-@@ -224,9 +224,9 @@
- cc)
- if test -z "$CC" ; then CC=cc ; fi
- BOOST_JAM_CC=$CC
-- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
-- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
-- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
-+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS"
-+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS"
-+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS"
- ;;
-
- qcc)
diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
deleted file mode 100644
index cacbe00a7ef9..000000000000
--- a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't look for the framework path, we build Python the UNIX way for
-Gentoo Prefix
-
---- a/engine/build.jam
-+++ b/engine/build.jam
-@@ -82,11 +82,6 @@
- }
- --python-lib = $(--python-lib[1]) ;
- }
-- else if $(OS) = MACOSX
-- {
-- --python-include = [ .path $(python-location) Headers ] ;
-- --python-lib = $(python-location) Python ;
-- }
- else
- {
- --python-include = ;
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
deleted file mode 100644
index a04aa0b7aab1..000000000000
--- a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tools/common.jam
-+++ b/tools/common.jam
-@@ -763,7 +763,15 @@
- switch $(f:G)
- {
- case :
-- result += $(name:B) ;
-+ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
-+ if $(matched) = boost_python || $(matched) = boost_mpi_python
-+ {
-+ result += $(name) ;
-+ }
-+ else
-+ {
-+ result += $(name:B) ;
-+ }
-
- case :
- result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
diff --git a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
deleted file mode 100644
index d8b6a5af1e9c..000000000000
--- a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/10122
-
---- a/engine/mem.h
-+++ b/engine/mem.h
-@@ -8,6 +8,8 @@
- #ifndef BJAM_MEM_H
- #define BJAM_MEM_H
-
-+#include "jam.h"
-+
- #ifdef OPT_BOEHM_GC
-
- /* Use Boehm GC memory allocator. */
diff --git a/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch b/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch
deleted file mode 100644
index a3f450b0edf1..000000000000
--- a/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/tools/gcc.py 2018-09-07 17:44:59.668796217 +0200
-+++ b/tools/gcc.py 2018-09-07 17:45:56.378794314 +0200
-@@ -811,20 +811,6 @@
- # Sparc
- flags('gcc', 'OPTIONS', ['sparc/32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['sparc/64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
- # RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['power/32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['power/64'], ['-m64'])
---- a/tools/gcc.jam 2018-09-07 17:45:12.168795797 +0200
-+++ b/tools/gcc.jam 2018-09-07 17:46:25.498793337 +0200
-@@ -1134,21 +1134,6 @@
- cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
- ##
- cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
--# Sparc
--cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
--cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
--cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
--cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
--cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
--cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
--cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
--cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
--cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
--cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
- # RS/6000 & PowerPC
- cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
- cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
diff --git a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch
similarity index 66%
rename from dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch
rename to dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch
index fd86c9e2fc71..ddd1641d15cc 100644
--- a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch
+++ b/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch
@@ -1,5 +1,3 @@
-diff --git a/tools/features/debug-feature.jam b/tools/features/debug-feature.jam
-index 04958f9a..38b6acf1 100644
--- a/tools/features/debug-feature.jam
+++ b/tools/features/debug-feature.jam
@@ -8,7 +8,7 @@
@@ -11,8 +9,6 @@ index 04958f9a..38b6acf1 100644
: propagated ;
feature.feature profiling
-diff --git a/tools/features/optimization-feature.jam b/tools/features/optimization-feature.jam
-index 761f76f1..fb2a5dec 100644
--- a/tools/features/optimization-feature.jam
+++ b/tools/features/optimization-feature.jam
@@ -8,7 +8,7 @@
diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch
similarity index 93%
rename from dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
rename to dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch
index 032feaf9625f..3693677540a4 100644
--- a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
+++ b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch
@@ -4,7 +4,7 @@ arch, etc.
--- a/tools/darwin.jam
+++ b/tools/darwin.jam
-@@ -227,6 +227,9 @@
+@@ -239,6 +239,9 @@
}
}
@@ -14,7 +14,7 @@ arch, etc.
if $(version-feature)
{
if $(.debug-configuration)
-@@ -387,7 +390,8 @@
+@@ -447,7 +450,8 @@
support-ppc64 = ;
}
}
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch
similarity index 93%
rename from dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
rename to dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch
index 84734f7473fe..b7b47cc93a47 100644
--- a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
+++ b/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch
@@ -1,6 +1,6 @@
--- a/tools/python.jam
+++ b/tools/python.jam
-@@ -961,7 +961,7 @@
+@@ -1000,7 +1000,7 @@
# linux).
: $(usage-requirements)
$(set-PYTHONPATH)
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch
similarity index 100%
rename from dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
rename to dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch
new file mode 100644
index 000000000000..cd184030deeb
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch
@@ -0,0 +1,266 @@
+Prevent bjam from injecting what it thinks are great -march/-mcpu flags
+in order to optimize code for you. This breaks on 32-bit builds, because
+-march=i686 will not work on an i486 CHOST.
+
+See also:
+https://bugs.gentoo.org/624616
+
+--- a/tools/gcc.jam
++++ b/tools/gcc.jam
+@@ -1187,128 +1187,8 @@
+ # x86 and compatible
+ # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.
+ # Use i686 instead for 32-bit.
+-toolset.flags gcc OPTIONS x86/32/ : -march=i686 ;
+-cpu-flags gcc OPTIONS : x86 : native : -march=native ;
+-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
+-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
+-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
+-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ;
+-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ;
+-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ;
+-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ;
+-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ;
+-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ;
+-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ;
+-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ;
+-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
+-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
+-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
+-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ;
+-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ;
+-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ;
+-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ;
+-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ;
+-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
+-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
+-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
+-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
+-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
+-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
+-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
+-cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ;
+-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
+-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
+-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
+-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ;
+-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ;
+-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ;
+-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ;
+-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ;
+ ##
+-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ;
+-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ;
+-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ;
+-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ;
+-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ;
+-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ;
+-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
+-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
+-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
+-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
+-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
+-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
+-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
+-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
+-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
+-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
+-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
+ ##
+-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
+-# Sparc
+-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
+-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
+-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
+-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
+-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
+-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
+-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
+-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
+-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
+-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
+ # RS/6000 & PowerPC
+-cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
+-cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
+-cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ;
+-cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ;
+-cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ;
+-cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ;
+-cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ;
+-cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ;
+-cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ;
+-cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ;
+-cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ;
+-cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ;
+-cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ;
+-cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ;
+-cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ;
+-cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ;
+-cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ;
+-cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ;
+-cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ;
+-cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ;
+-cpu-flags gcc OPTIONS : power : power : -mcpu=power ;
+-cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ;
+-cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ;
+-cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ;
+-cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ;
+-cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ;
+-cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ;
+-cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ;
+-cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ;
+-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
+-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
+-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
+-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
+-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
+-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
+-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
+ # AIX variant of RS/6000 & PowerPC
+ toolset.flags gcc AROPTIONS 64/aix : "-X64" ;
+--- a/tools/gcc.py
++++ b/tools/gcc.py
+@@ -745,125 +745,14 @@
+ # x86 and compatible
+ flags('gcc', 'OPTIONS', ['x86/32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['x86/64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True)
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium2', ['-march=pentium2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3', ['-march=pentium3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3m', ['-march=pentium3m'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-m', ['-march=pentium-m'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon', ['-march=athlon'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-tbird', ['-march=athlon-tbird'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-4', ['-march=athlon-4'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-xp', ['-march=athlon-xp'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-mp', ['-march=athlon-mp'])
+ ##
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2'])
+ ##
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom'])
+ # Sparc
+ flags('gcc', 'OPTIONS', ['sparc/32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['sparc/64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
+ # RS/6000 & PowerPC
+ flags('gcc', 'OPTIONS', ['power/32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['power/64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '403', ['-mcpu=403'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '505', ['-mcpu=505'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '601', ['-mcpu=601'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '602', ['-mcpu=602'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '603', ['-mcpu=603'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '603e', ['-mcpu=603e'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '604', ['-mcpu=604'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '604e', ['-mcpu=604e'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '620', ['-mcpu=620'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '630', ['-mcpu=630'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '740', ['-mcpu=740'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '7400', ['-mcpu=7400'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '7450', ['-mcpu=7450'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '750', ['-mcpu=750'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '801', ['-mcpu=801'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '821', ['-mcpu=821'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '823', ['-mcpu=823'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '860', ['-mcpu=860'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '970', ['-mcpu=970'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '8540', ['-mcpu=8540'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power', ['-mcpu=power'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power2', ['-mcpu=power2'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power3', ['-mcpu=power3'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power4', ['-mcpu=power4'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power5', ['-mcpu=power5'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc', ['-mcpu=powerpc'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc64', ['-mcpu=powerpc64'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rios', ['-mcpu=rios'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rios1', ['-mcpu=rios1'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rios2', ['-mcpu=rios2'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rsc', ['-mcpu=rsc'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rs64a', ['-mcpu=rs64'])
+-cpu_flags('gcc', 'OPTIONS', 's390x', 'z196', ['-march=z196'])
+-cpu_flags('gcc', 'OPTIONS', 's390x', 'zEC12', ['-march=zEC12'])
+-cpu_flags('gcc', 'OPTIONS', 's390x', 'z13', ['-march=z13'])
+-cpu_flags('gcc', 'OPTIONS', 's390x', 'z14', ['-march=z14'])
+ # AIX variant of RS/6000 & PowerPC
+ flags('gcc', 'OPTIONS', ['power/32/aix'], ['-maix32'])
+ flags('gcc', 'OPTIONS', ['power/64/aix'], ['-maix64'])
diff --git a/dev-util/cmdtest/cmdtest-0.32.ebuild b/dev-util/cmdtest/cmdtest-0.32.ebuild
index 5000ea217fad..830d69c66302 100644
--- a/dev-util/cmdtest/cmdtest-0.32.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
LICENSE="GPL-3+"
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"
DEPEND="
dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index adb070087c03..a67e6fd5af6a 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,3 +1,4 @@
DIST creduce-095c551a5f9ccaf2986edb836e7be9872d36c233.tar.gz 724597 BLAKE2B 9d7a57349b8e14599c795a27bdf2cb4536f5b41f02faf10263c3d883bf94efd83ce7483bbf72aee0c2fe00d8515490e5f5a9c8df575abe80e90231a4373c9318 SHA512 a317bae5e47ee85b4be401d8dae490bd0ba86640aff6e7b0e9d6fe14d1f87199b4e12edbfa3eddcb5341b926a753dae17131f5e571362849c01377eda00407fa
DIST creduce-2.8.0.tar.gz 774668 BLAKE2B d799372d107c0cb45e9ed95f82c29634fd9de053c4eda1a2dfce8b2152ca84f7fff5e7b679e21e6dbe869d139e1cfd73963c02751ad30809a3470316ce10e077 SHA512 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
+DIST creduce-2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa.tar.gz 732121 BLAKE2B dad2cf8ec2453a6b210a5303480e7dabfd978b7d7a1326cbc1e4ca40fa7c4e7d18da5f9309ca5f392740bbf55a1c9863e389c9789fceff062a68e9bb9a79de9f SHA512 c598f5c998f0a02d57006e640f88b951cd33a24f24507d6671067842b81bb3fe37c2fccd040b6cedb6fd5857396213e4003ee5fbd3040058050bad67226dc27f
DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
diff --git a/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild b/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild
new file mode 100644
index 000000000000..ade291feb317
--- /dev/null
+++ b/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+inherit cmake-utils llvm
+
+EGIT_COMMIT="2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa"
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="https://embed.cs.utah.edu/creduce/"
+SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LLVM_MAX_SLOT=9
+
+COMMON_DEPEND="
+ >=dev-lang/perl-5.10.0
+ sys-devel/clang:${LLVM_MAX_SLOT}"
+RDEPEND="${COMMON_DEPEND}
+ dev-perl/Exporter-Lite
+ dev-perl/File-Which
+ dev-perl/Getopt-Tabular
+ dev-perl/Regexp-Common"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex"
+
+PATCHES=(
+ "${FILESDIR}"/creduce-2.11.0-link-libs.patch
+)
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
diff --git a/dev-util/creduce/files/creduce-2.11.0-link-libs.patch b/dev-util/creduce/files/creduce-2.11.0-link-libs.patch
new file mode 100644
index 000000000000..3518003760a6
--- /dev/null
+++ b/dev-util/creduce/files/creduce-2.11.0-link-libs.patch
@@ -0,0 +1,7 @@
+diff --git a/clang_delta/CMakeLists.txt b/clang_delta/CMakeLists.txt
+index a94ec0d..764af02 100644
+--- a/clang_delta/CMakeLists.txt
++++ b/clang_delta/CMakeLists.txt
+@@ -263 +263 @@ add_executable(clang_delta
+-target_link_libraries(clang_delta ${CLANG_LIBS})
++target_link_libraries(clang_delta ${CLANG_LIBS} ${LLVM_LIBS})
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index d3ee7921341a..b601e7fadd88 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,2 +1,2 @@
-DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
+DIST edb-debugger-1.1.0.tgz 1244028 BLAKE2B 87311a53f445acb28569952541269ef5ae83219468e18bc1603b6d85225b75fd00723593891e309ccf8c8c3e7a0828cd709444fe27f3328cf4386ed3e1245bea SHA512 5834cf091cd6d84ecc10cec277ec954b936dc61b0809d5f434ba4d604fae63c06ac10852f1a4ea81f150dea82645fa0861d8842eea227cbde681a895c465d744
diff --git a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
deleted file mode 100644
index e6f1a158575f..000000000000
--- a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-
-LICENSE="GPL-2+"
-IUSE="graphviz legacy-mem-write pax_kernel"
-SLOT="0"
-
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/edb-debugger-${PV}"
-
-RDEPEND="
- >=dev-libs/capstone-3.0
- graphviz? ( media-gfx/graphviz )
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- dev-qt/qtnetwork:5
- dev-qt/qtconcurrent:5
- dev-qt/qtgui:5
- dev-qt/qtcore:5
- "
-DEPEND="
- dev-libs/boost
- virtual/pkgconfig
- ${RDEPEND}"
-
-src_prepare() {
- #Remove this in a future version; There won't be any edb48-logo.png
- sed -i '/edb48-logo/d' CMakeLists.txt || die
-
- #Make the desktop's entries somewhat cuter
- sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
- sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_DISABLE_FIND_PACKAGE_GRAPHVIZ=$(usex !graphviz)
- -DQT_VERSION=Qt5
- )
- if use pax_kernel || use legacy-mem-write; then
- mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=Yes )
- else
- mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=No )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cd src/images/ || die
- newicon "edb48-logo.png" "edb.png"
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- if use legacy-mem-write; then
- ewarn "You really do not want to turn on legacy-mem-write unless you need it."
- ewarn "Be sure to test without legacy-mem-write first and only enable if you actually need it."
- else
- ewarn
- ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag"
- ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues"
- ewarn
- fi
-}
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
new file mode 100644
index 000000000000..c5dadbd7bf7f
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+ dev-libs/capstone:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5
+ graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+ dev-libs/boost
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-man1.patch
+ "${FILESDIR}"/${P}-climits.patch
+)
+
+src_prepare() {
+ #Make the desktop's entries somewhat better
+ sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+ sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+ if ! use graphviz; then
+ sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+ fi
+
+ cmake-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild
new file mode 100644
index 000000000000..5b720ad3e0d6
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+ dev-libs/capstone:=
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5
+ graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+ dev-libs/boost
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ #Make the desktop's entries somewhat better
+ sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+ sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+ if ! use graphviz; then
+ sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+ fi
+
+ cmake-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
new file mode 100644
index 000000000000..929492ae670f
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/701112
+
+From f5e0bce1c1d33e11062fd61a3bbad52ee18e8a8b Mon Sep 17 00:00:00 2001
+From: Evan Teran
+Date: Mon, 15 Jul 2019 14:44:25 -0400
+Subject: [PATCH] fix for issue #719
+
+---
+ src/ByteShiftArray.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/ByteShiftArray.cpp
++++ b/src/ByteShiftArray.cpp
+@@ -17,6 +17,7 @@ along with this program. If not, see .
+ */
+
+ #include "ByteShiftArray.h"
++#include
+
+ //------------------------------------------------------------------------------
+ // Name: ByteShiftArray
+--
+2.24.0
+
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
new file mode 100644
index 000000000000..92625ac3701a
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/701080
+
+From c84c5a28adaacaeee65a20e1bd8a90762cbe843c Mon Sep 17 00:00:00 2001
+From: Ruslan Kabatsayev
+Date: Thu, 5 Jul 2018 23:45:03 +0300
+Subject: [PATCH] Fix installation path of the man page
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,6 +123,6 @@ endif()
+ add_subdirectory(src)
+ add_subdirectory(plugins)
+
+-install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
++install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ install (FILES ${CMAKE_SOURCE_DIR}/edb.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/)
+ install (FILES ${CMAKE_SOURCE_DIR}/src/images/edb.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/)
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index d22e537d27af..6506dc772361 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -9,9 +9,11 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
+ slyfox@gentoo.org
+ Sergei Trofimovich
+
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
index e7deb95baca5..063b652c8ea9 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/glib-utils-2.60.7.ebuild b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
index bdeaa203d4f1..721e9c8ba107 100644
--- a/dev-util/glib-utils/glib-utils-2.60.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh 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 ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!...]
# @DESCRIPTION:
@@ -417,6 +486,7 @@ esetup.py() {
[[ ${EAPI} != [45] ]] && die_args+=( -n )
[[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg
+ _distutils_verify_use_setuptools
set -- "${EPYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index b1c7f7f43abc..e0d2bbb5edc0 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -556,6 +556,9 @@ _git-r3_is_local_repo() {
git-r3_fetch() {
debug-print-function ${FUNCNAME} "$@"
+ # disable password prompts, https://bugs.gentoo.org/701276
+ local -x GIT_TERMINAL_PROMPT=0
+
# process repos first since we create repo_name from it
local repos
if [[ ${1} ]]; then
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index edfdfae5cda3..30b67bf7af94 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -66,6 +66,14 @@ inherit eutils ghc-package multilib toolchain-funcs
# Needs working 'diff'.
: ${CABAL_DEBUG_LOOSENING:=}
+# @ECLASS-VARIABLE: CABAL_REPORT_OTHER_BROKEN_PACKAGES
+# @DESCRIPTION:
+# Show other broken packages if 'cabal configure' fails.
+# It should be normally enabled unless you know you are about
+# to try to compile a lot of broken packages. Default value: 'yes'
+# Set to anything else to disable.
+: ${CABAL_REPORT_OTHER_BROKEN_PACKAGES:=yes}
+
HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install pkg_postinst pkg_postrm"
# 'dev-haskell/cabal' passes those options with ./configure-based
@@ -271,6 +279,8 @@ cabal-die-if-nonempty() {
}
cabal-show-brokens() {
+ [[ ${CABAL_REPORT_OTHER_BROKEN_PACKAGES} != yes ]] && return 0
+
elog "ghc-pkg check: 'checking for other broken packages:'"
# pretty-printer
$(ghc-getghcpkg) check 2>&1 \
@@ -283,6 +293,8 @@ cabal-show-brokens() {
}
cabal-show-old() {
+ [[ ${CABAL_REPORT_OTHER_BROKEN_PACKAGES} != yes ]] && return 0
+
cabal-die-if-nonempty 'outdated' \
$("${EPREFIX}"/usr/sbin/haskell-updater --quiet --upgrade --list-only)
}
@@ -395,14 +407,14 @@ cabal-configure() {
--datasubdir=${P}/ghc-$(ghc-version) \
"${cabalconf[@]}" \
${CABAL_CONFIGURE_FLAGS} \
- ${CABAL_EXTRA_CONFIGURE_FLAGS} \
- "$@"
+ "$@" \
+ ${CABAL_EXTRA_CONFIGURE_FLAGS}
echo ./setup "$@"
./setup "$@" || cabal-show-brokens-and-die "setup configure failed"
}
cabal-build() {
- set -- build ${CABAL_EXTRA_BUILD_FLAGS} "$@"
+ set -- build "$@" ${CABAL_EXTRA_BUILD_FLAGS}
echo ./setup "$@"
./setup "$@" \
|| die "setup build failed"
@@ -570,8 +582,8 @@ haskell-cabal_src_test() {
set -- test \
"${cabaltest[@]}" \
${CABAL_TEST_FLAGS} \
- ${CABAL_EXTRA_TEST_FLAGS} \
- "$@"
+ "$@" \
+ ${CABAL_EXTRA_TEST_FLAGS}
echo ./setup "$@"
./setup "$@" || die "cabal test failed"
fi
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 335ae9fe6370..e87b59967cde 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -195,11 +195,7 @@ _python_set_globals() {
# but no point in making this overcomplex, BDEP doesn't hurt anyone
# 2) python-exec should be built with all targets forced anyway
# but if new targets were added, we may need to force a rebuild
- if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then
- die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2"
- else
- deps+=">=dev-lang/python-exec-2:=[${usedep}]"
- fi
+ deps+=">=dev-lang/python-exec-2:=[${usedep}]"
if [[ ${PYTHON_DEPS+1} ]]; then
# IUSE is magical, so we can't really check it
@@ -276,9 +272,47 @@ _python_validate_useflags() {
die "No supported Python implementation in PYTHON_TARGETS."
}
+# @FUNCTION: _python_gen_usedep
+# @INTERNAL
+# @USAGE: [...]
+# @DESCRIPTION:
+# Output a USE dependency string for Python implementations which
+# are both in PYTHON_COMPAT and match any of the patterns passed
+# as parameters to the function.
+#
+# The patterns can be either fnmatch-style patterns (matched via bash
+# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
+# appropriately all enabled Python 2/3 implementations (alike
+# python_is_python3). Remember to escape or quote the fnmatch patterns
+# to prevent accidental shell filename expansion.
+#
+# This is an internal function used to implement python_gen_cond_dep
+# and deprecated python_gen_usedep.
+_python_gen_usedep() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local impl matches=()
+
+ for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
+ if _python_impl_matches "${impl}" "${@}"; then
+ matches+=(
+ "python_targets_${impl}(-)?"
+ "-python_single_target_${impl}(-)"
+ )
+ fi
+ done
+
+ [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}"
+
+ local out=${matches[@]}
+ echo "${out// /,}"
+}
+
# @FUNCTION: python_gen_usedep
# @USAGE: [...]
# @DESCRIPTION:
+# DEPRECATED. Please use python_gen_cond_dep instead.
+#
# Output a USE dependency string for Python implementations which
# are both in PYTHON_COMPAT and match any of the patterns passed
# as parameters to the function.
@@ -306,25 +340,16 @@ _python_validate_useflags() {
python_gen_usedep() {
debug-print-function ${FUNCNAME} "${@}"
- local impl matches=()
-
- for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
- if _python_impl_matches "${impl}" "${@}"; then
- matches+=(
- "python_targets_${impl}(-)?"
- "-python_single_target_${impl}(-)"
- )
- fi
- done
-
- [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}"
-
- local out=${matches[@]}
- echo "${out// /,}"
+ # output only once, during some reasonable phase
+ # (avoid spamming cache regen runs)
+ if [[ ${EBUILD_PHASE} == setup ]]; then
+ eqawarn "python_gen_usedep() is deprecated. Please use python_gen_cond_dep instead."
+ fi
+ _python_gen_usedep "${@}"
}
# @FUNCTION: python_gen_useflags
-# @USAGE: [...]
+# @USAGE: [...]
# @DESCRIPTION:
# Output a list of USE flags for Python implementations which
# are both in PYTHON_COMPAT and match any of the patterns passed
@@ -361,7 +386,7 @@ python_gen_useflags() {
}
# @FUNCTION: python_gen_cond_dep
-# @USAGE: [...]
+# @USAGE: [...]
# @DESCRIPTION:
# Output a list of -ies made conditional to USE flags
# of Python implementations which are both in PYTHON_COMPAT and match
@@ -405,7 +430,7 @@ python_gen_cond_dep() {
# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
# the code is run at most once)
if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
- local usedep=$(python_gen_usedep "${@}")
+ local usedep=$(_python_gen_usedep "${@}")
dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
fi
@@ -457,9 +482,8 @@ python_gen_impl_dep() {
local PYTHON_REQ_USE=${1}
shift
- local patterns=( "${@-*}" )
for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
- if _python_impl_matches "${impl}" "${patterns[@]}"; then
+ if _python_impl_matches "${impl}" "${@}"; then
local PYTHON_PKG_DEP
python_export "${impl}" PYTHON_PKG_DEP
matches+=( "python_targets_${impl}? ( ${PYTHON_PKG_DEP} )" )
@@ -537,7 +561,7 @@ python_gen_any_dep() {
local i PYTHON_PKG_DEP out=
for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
- if _python_impl_matches "${i}" "${@-*}"; then
+ if _python_impl_matches "${i}" "${@}"; then
local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)"
python_export "${i}" PYTHON_PKG_DEP
@@ -734,7 +758,7 @@ python_setup() {
fi
# check patterns
- _python_impl_matches "${impl}" "${@-*}" || continue
+ _python_impl_matches "${impl}" "${@}" || continue
python_export "${impl}" EPYTHON PYTHON
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 8ac17b7815e2..f042bf4e1167 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -12,12 +12,17 @@
# @DESCRIPTION:
# An extension of the python-r1 eclass suite for packages which
# don't support being installed for multiple Python implementations.
-# This mostly includes tools embedding Python.
+# This mostly includes tools embedding Python and packages using foreign
+# build systems.
#
-# This eclass extends the IUSE and REQUIRED_USE set by python-r1
-# to request the PYTHON_SINGLE_TARGET when the inheriting ebuild
-# can be supported by more than one Python implementation. It also
-# replaces PYTHON_USEDEP and PYTHON_DEPS with a more suitable form.
+# This eclass sets correct IUSE. It also provides PYTHON_DEPS
+# and PYTHON_REQUIRED_USE that need to be added to appropriate ebuild
+# metadata variables.
+#
+# The eclass exports PYTHON_SINGLE_USEDEP that is suitable for depending
+# on other packages using the eclass. Dependencies on packages using
+# python-r1 should be created via python_gen_cond_dep() function,
+# using PYTHON_MULTI_USEDEP placeholder.
#
# Please note that packages support multiple Python implementations
# (using python-r1 eclass) can not depend on packages not supporting
@@ -136,6 +141,9 @@ EXPORT_FUNCTIONS pkg_setup
# @ECLASS-VARIABLE: PYTHON_USEDEP
# @DESCRIPTION:
+# DEPRECATED. Use PYTHON_SINGLE_USEDEP or python_gen_cond_dep with
+# PYTHON_MULTI_USEDEP placeholder instead.
+#
# This is an eclass-generated USE-dependency string which can be used to
# depend on another Python package being built for the same Python
# implementations.
@@ -154,6 +162,43 @@ EXPORT_FUNCTIONS pkg_setup
# python_targets_python2_7(-)?,python_single_target_python3_4(+)?
# @CODE
+# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP
+# @DESCRIPTION:
+# This is an eclass-generated USE-dependency string which can be used to
+# depend on another python-single-r1 package being built for the same
+# Python implementations.
+#
+# If you need to depend on a multi-impl (python-r1) package, use
+# python_gen_cond_dep with PYTHON_MULTI_USEDEP placeholder instead.
+#
+# Example use:
+# @CODE
+# RDEPEND="dev-python/foo[${PYTHON_SINGLE_USEDEP}]"
+# @CODE
+#
+# Example value:
+# @CODE
+# python_single_target_python3_4(-)?
+# @CODE
+
+# @ECLASS-VARIABLE: PYTHON_MULTI_USEDEP
+# @DESCRIPTION:
+# This is a placeholder variable supported by python_gen_cond_dep,
+# in order to depend on python-r1 packages built for the same Python
+# implementations.
+#
+# Example use:
+# @CODE
+# RDEPEND="$(python_gen_cond_dep '
+# dev-python/foo[${PYTHON_MULTI_USEDEP}]
+# ')"
+# @CODE
+#
+# Example value:
+# @CODE
+# python_targets_python3_4(-)
+# @CODE
+
# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
# @DESCRIPTION:
# This is an eclass-generated required-use expression which ensures the following
@@ -179,58 +224,42 @@ EXPORT_FUNCTIONS pkg_setup
_python_single_set_globals() {
_python_set_impls
- local i PYTHON_PKG_DEP
-
local flags_mt=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" )
local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_single_target_}" )
local unflags=( "${_PYTHON_UNSUPPORTED_IMPLS[@]/#/-python_single_target_}" )
- local optflags=${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)}
-
- IUSE="${flags_mt[*]}"
-
- local deps requse usedep
if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
- # There is only one supported implementation; set IUSE and other
- # variables without PYTHON_SINGLE_TARGET.
- requse=${flags_mt[*]}
- python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" PYTHON_PKG_DEP
- deps="${flags_mt[*]}? ( ${PYTHON_PKG_DEP} ) "
- # Force on the python_single_target_* flag for this impl, so
- # that any dependencies that inherit python-single-r1 and
- # happen to have multiple implementations will still need
- # to bound by the implementation used by this package.
- optflags+=,${flags[0]/%/(+)}
- else
- # Multiple supported implementations; honor PYTHON_SINGLE_TARGET.
- IUSE+=" ${flags[*]}"
- requse="^^ ( ${flags[*]} )"
- # Ensure deps honor the same python_single_target_* flag as is set
- # on this package.
- optflags+=,${flags[@]/%/(+)?}
-
- for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
- # The chosen targets need to be in PYTHON_TARGETS as well.
- # This is in order to enforce correct dependencies on packages
- # supporting multiple implementations.
- requse+=" python_single_target_${i}? ( python_targets_${i} )"
-
- python_export "${i}" PYTHON_PKG_DEP
- deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) "
- done
- fi
- usedep=${optflags// /,}
-
- # 1) well, python-exec would suffice as an RDEP
- # but no point in making this overcomplex, BDEP doesn't hurt anyone
- # 2) python-exec should be built with all targets forced anyway
- # but if new targets were added, we may need to force a rebuild
- if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then
- die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2"
+ # if only one implementation is supported, use IUSE defaults
+ # to avoid requesting the user to enable it
+ IUSE="+${flags_mt[0]} +${flags[0]}"
else
- deps+=">=dev-lang/python-exec-2:=[${usedep}]"
+ IUSE="${flags_mt[*]} ${flags[*]}"
fi
+ local requse="^^ ( ${flags[*]} )"
+ local optflags="${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)},${flags[@]/%/(+)?}"
+ local usedep="${optflags// /,}"
+ local single_flags="${flags[@]/%/(-)?}"
+ local single_usedep=${single_flags// /,}
+
+ local deps= i PYTHON_PKG_DEP
+ for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
+ # The chosen targets need to be in PYTHON_TARGETS as well.
+ # This is in order to enforce correct dependencies on packages
+ # supporting multiple implementations.
+ requse+=" python_single_target_${i}? ( python_targets_${i} )"
+
+ python_export "${i}" PYTHON_PKG_DEP
+ # 1) well, python-exec would suffice as an RDEP
+ # but no point in making this overcomplex, BDEP doesn't hurt anyone
+ # 2) python-exec should be built with all targets forced anyway
+ # but if new targets were added, we may need to force a rebuild
+ deps+="python_single_target_${i}? (
+ ${PYTHON_PKG_DEP}
+ >=dev-lang/python-exec-2:=[python_targets_${i}]
+ ) "
+ done
+
if [[ ${PYTHON_DEPS+1} ]]; then
if [[ ${PYTHON_DEPS} != "${deps}" ]]; then
eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!"
@@ -253,11 +282,20 @@ _python_single_set_globals() {
eerror "Now : ${usedep}"
die "PYTHON_USEDEP integrity check failed"
fi
+
+ if [[ ${PYTHON_SINGLE_USEDEP} != "${single_usedep}" ]]; then
+ eerror "PYTHON_SINGLE_USEDEP have changed between inherits!"
+ eerror "Before: ${PYTHON_SINGLE_USEDEP}"
+ eerror "Now : ${single_usedep}"
+ die "PYTHON_SINGLE_USEDEP integrity check failed"
+ fi
else
PYTHON_DEPS=${deps}
PYTHON_REQUIRED_USE=${requse}
PYTHON_USEDEP=${usedep}
- readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP
+ PYTHON_SINGLE_USEDEP=${single_usedep}
+ readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP \
+ PYTHON_SINGLE_USEDEP
fi
}
_python_single_set_globals
@@ -265,9 +303,61 @@ unset -f _python_single_set_globals
if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
+# @FUNCTION: _python_gen_usedep
+# @INTERNAL
+# @USAGE: <-s|-u> [...]
+# @DESCRIPTION:
+# Output a USE dependency string for Python implementations which
+# are both in PYTHON_COMPAT and match any of the patterns passed
+# as parameters to the function.
+#
+# The first argument specifies USE-dependency type: '-s' for new-style
+# PYTHON_SINGLE_USEDEP, '-u' for backwards-compatible PYTHON_USEDEP.
+#
+# The patterns can be either fnmatch-style patterns (matched via bash
+# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
+# appropriately all enabled Python 2/3 implementations (alike
+# python_is_python3). Remember to escape or quote the fnmatch patterns
+# to prevent accidental shell filename expansion.
+#
+# This is an internal function used to implement python_gen_cond_dep
+# and deprecated python_gen_usedep.
+_python_gen_usedep() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local mode=${1}
+ shift
+ local impl matches=()
+
+ for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
+ if _python_impl_matches "${impl}" "${@}"; then
+ case ${mode} in
+ -s)
+ matches+=(
+ "python_single_target_${impl}(-)?"
+ )
+ ;;
+ -u)
+ matches+=(
+ "python_targets_${impl}(-)?"
+ "python_single_target_${impl}(+)?"
+ )
+ ;;
+ esac
+ fi
+ done
+
+ [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}"
+
+ local out=${matches[@]}
+ echo "${out// /,}"
+}
+
# @FUNCTION: python_gen_usedep
# @USAGE: [...]
# @DESCRIPTION:
+# DEPRECATED. Please use python_gen_cond_dep instead.
+#
# Output a USE dependency string for Python implementations which
# are both in PYTHON_COMPAT and match any of the patterns passed
# as parameters to the function.
@@ -295,25 +385,16 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
python_gen_usedep() {
debug-print-function ${FUNCNAME} "${@}"
- local impl matches=()
-
- for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
- if _python_impl_matches "${impl}" "${@}"; then
- matches+=(
- "python_targets_${impl}(-)?"
- "python_single_target_${impl}(+)?"
- )
- fi
- done
-
- [[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}"
-
- local out=${matches[@]}
- echo "${out// /,}"
+ # output only once, during some reasonable phase
+ # (avoid spamming cache regen runs)
+ if [[ ${EBUILD_PHASE} == setup ]]; then
+ eqawarn "python_gen_usedep() is deprecated. Please use python_gen_cond_dep instead."
+ fi
+ _python_gen_usedep -u "${@}"
}
# @FUNCTION: python_gen_useflags
-# @USAGE: [...]
+# @USAGE: [...]
# @DESCRIPTION:
# Output a list of USE flags for Python implementations which
# are both in PYTHON_COMPAT and match any of the patterns passed
@@ -338,17 +419,11 @@ python_gen_usedep() {
python_gen_useflags() {
debug-print-function ${FUNCNAME} "${@}"
- local flag_prefix impl matches=()
-
- if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
- flag_prefix=python_targets
- else
- flag_prefix=python_single_target
- fi
+ local impl matches=()
for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
if _python_impl_matches "${impl}" "${@}"; then
- matches+=( "${flag_prefix}_${impl}" )
+ matches+=( "python_single_target_${impl}" )
fi
done
@@ -356,7 +431,7 @@ python_gen_useflags() {
}
# @FUNCTION: python_gen_cond_dep
-# @USAGE: [...]
+# @USAGE: [...]
# @DESCRIPTION:
# Output a list of -ies made conditional to USE flags
# of Python implementations which are both in PYTHON_COMPAT and match
@@ -369,7 +444,8 @@ python_gen_useflags() {
# to prevent accidental shell filename expansion.
#
# In order to enforce USE constraints on the packages, verbatim
-# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency
+# '${PYTHON_USEDEP}', '${PYTHON_SINGLE_USEDEP}'
+# and '${PYTHON_MULTI_USEDEP}' (quoted!) may be placed in the dependency
# specification. It will get expanded within the function into a proper
# USE dependency string.
#
@@ -377,7 +453,7 @@ python_gen_useflags() {
# @CODE
# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
# RDEPEND="$(python_gen_cond_dep \
-# 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy )"
+# 'dev-python/unittest2[${PYTHON_MULTI_USEDEP}]' python2_7 pypy )"
# @CODE
#
# It will cause the variable to look like:
@@ -390,13 +466,7 @@ python_gen_useflags() {
python_gen_cond_dep() {
debug-print-function ${FUNCNAME} "${@}"
- local flag_prefix impl matches=()
-
- if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
- flag_prefix=python_targets
- else
- flag_prefix=python_single_target
- fi
+ local impl matches=()
local dep=${1}
shift
@@ -407,11 +477,17 @@ python_gen_cond_dep() {
# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
# the code is run at most once)
if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
- local usedep=$(python_gen_usedep "${@}")
+ local usedep=$(_python_gen_usedep -u "${@}")
dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
fi
+ if [[ ${dep} == *'${PYTHON_SINGLE_USEDEP}'* ]]; then
+ local usedep=$(_python_gen_usedep -s "${@}")
+ dep=${dep//\$\{PYTHON_SINGLE_USEDEP\}/${usedep}}
+ fi
+ local multi_usedep="python_targets_${impl}(-)"
- matches+=( "${flag_prefix}_${impl}? ( ${dep} )" )
+ matches+=( "python_single_target_${impl}? (
+ ${dep//\$\{PYTHON_MULTI_USEDEP\}/${multi_usedep}} )" )
fi
done
@@ -455,24 +531,17 @@ python_gen_cond_dep() {
python_gen_impl_dep() {
debug-print-function ${FUNCNAME} "${@}"
- local impl pattern
+ local impl
local matches=()
- if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
- flag_prefix=python_targets
- else
- flag_prefix=python_single_target
- fi
-
local PYTHON_REQ_USE=${1}
shift
- local patterns=( "${@-*}" )
for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
- if _python_impl_matches "${impl}" "${patterns[@]}"; then
+ if _python_impl_matches "${impl}" "${@}"; then
local PYTHON_PKG_DEP
python_export "${impl}" PYTHON_PKG_DEP
- matches+=( "${flag_prefix}_${impl}? ( ${PYTHON_PKG_DEP} )" )
+ matches+=( "python_single_target_${impl}? ( ${PYTHON_PKG_DEP} )" )
fi
done
@@ -505,47 +574,35 @@ python_setup() {
return
fi
- if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
- if use "python_targets_${_PYTHON_SUPPORTED_IMPLS[0]}"; then
- # Only one supported implementation, enable it explicitly
- python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" EPYTHON PYTHON
+ local impl
+ for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
+ if use "python_single_target_${impl}"; then
+ if [[ ${EPYTHON} ]]; then
+ eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python"
+ eerror "implementation. Please set it to just one value. If you need"
+ eerror "to override the value for a single package, please use package.env"
+ eerror "or an equivalent solution (man 5 portage)."
+ echo
+ die "More than one implementation in PYTHON_SINGLE_TARGET."
+ fi
+
+ if ! use "python_targets_${impl}"; then
+ eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added"
+ eerror "to PYTHON_TARGETS as well. This is in order to ensure that"
+ eerror "dependencies are satisfied correctly. We're sorry"
+ eerror "for the inconvenience."
+ echo
+ die "Build target (${impl}) not in PYTHON_TARGETS."
+ fi
+
+ python_export "${impl}" EPYTHON PYTHON
python_wrapper_setup
fi
- else
- local impl
- for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
- if use "python_single_target_${impl}"; then
- if [[ ${EPYTHON} ]]; then
- eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python"
- eerror "implementation. Please set it to just one value. If you need"
- eerror "to override the value for a single package, please use package.env"
- eerror "or an equivalent solution (man 5 portage)."
- echo
- die "More than one implementation in PYTHON_SINGLE_TARGET."
- fi
-
- if ! use "python_targets_${impl}"; then
- eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added"
- eerror "to PYTHON_TARGETS as well. This is in order to ensure that"
- eerror "dependencies are satisfied correctly. We're sorry"
- eerror "for the inconvenience."
- echo
- die "Build target (${impl}) not in PYTHON_TARGETS."
- fi
-
- python_export "${impl}" EPYTHON PYTHON
- python_wrapper_setup
- fi
- done
- fi
+ done
if [[ ! ${EPYTHON} ]]; then
eerror "No Python implementation selected for the build. Please set"
- if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
- eerror "the PYTHON_TARGETS variable in your make.conf to include one"
- else
- eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one"
- fi
+ eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one"
eerror "of the following values:"
eerror
eerror "${_PYTHON_SUPPORTED_IMPLS[@]}"
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 4f3ac66f2150..3eadc50f93e6 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -164,11 +164,12 @@ _python_set_impls() {
}
# @FUNCTION: _python_impl_matches
-# @USAGE: ...
+# @USAGE: [...]
# @INTERNAL
# @DESCRIPTION:
# Check whether the specified matches at least one
# of the patterns following it. Return 0 if it does, 1 otherwise.
+# Matches if no patterns are provided.
#
# can be in PYTHON_COMPAT or EPYTHON form. The patterns can be
# either:
@@ -176,7 +177,8 @@ _python_set_impls() {
# b) '-2' to indicate all Python 2 variants (= !python_is_python3)
# c) '-3' to indicate all Python 3 variants (= python_is_python3)
_python_impl_matches() {
- [[ ${#} -ge 2 ]] || die "${FUNCNAME}: takes at least 2 parameters"
+ [[ ${#} -ge 1 ]] || die "${FUNCNAME}: takes at least 1 parameter"
+ [[ ${#} -eq 1 ]] && return 0
local impl=${1} pattern
shift
diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh
index d5f3e2812ca4..d251f85a5eb1 100755
--- a/eclass/tests/distutils-r1.sh
+++ b/eclass/tests/distutils-r1.sh
@@ -47,6 +47,7 @@ test-distutils_enable_tests() {
tend ${ret}
}
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
tbegin "sane function names"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index e95a2027fa4d..c9d9cd44e34c 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.32.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.32.0.ebuild
index f6cf54124354..3050fbed8c83 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.32.0.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-arcade/gnome-robots/gnome-robots-3.32.0.ebuild b/games-arcade/gnome-robots/gnome-robots-3.32.0.ebuild
index 308731472810..c554a4169a39 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.32.0.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 4875467bce2f..de296c20ae6d 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild b/games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild
index 51c29bdc0d51..36ec20a463d2 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
# Code and most themes are GPL-3+, CC-BY-SA-3.0 is user help license in v3.32.0
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-board/gnome-chess/gnome-chess-3.34.0.ebuild b/games-board/gnome-chess/gnome-chess-3.34.0.ebuild
index d8a04a7cdbf1..21d3657db2a1 100644
--- a/games-board/gnome-chess/gnome-chess-3.34.0.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.34.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.34.0.ebuild
index ee68f6793cc6..01b38e5831dd 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.34.0.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-board/gnome-mines/gnome-mines-3.34.0.ebuild b/games-board/gnome-mines/gnome-mines-3.34.0.ebuild
index ab9be1d1c234..2e4b40710274 100644
--- a/games-board/gnome-mines/gnome-mines-3.34.0.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.34.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-board/iagno/iagno-3.32.0.ebuild b/games-board/iagno/iagno-3.32.0.ebuild
index b31292aa8d40..fd83c4d2c120 100644
--- a/games-board/iagno/iagno-3.32.0.ebuild
+++ b/games-board/iagno/iagno-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-board/tali/tali-3.32.1.ebuild b/games-board/tali/tali-3.32.1.ebuild
index 8bff31883409..2e7bb5d65dbc 100644
--- a/games-board/tali/tali-3.32.1.ebuild
+++ b/games-board/tali/tali-3.32.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
DEPEND="
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index f0e623812d1a..11edf31a7b6c 100644
Binary files a/games-kids/Manifest.gz and b/games-kids/Manifest.gz differ
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 7d01c5bb3d7b..35a7333c05cb 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1 +1,2 @@
DIST gcompris-qt-0.96.tar.xz 73221940 BLAKE2B e6d81d1630d962709a1ab27c8735ac42ce67182440f3e78a7d3f39b59b28617211dddf3f6d62a323ee5af7f147e2dc784ff0b305bee7b345d1e59d3ed576ef1a SHA512 980bac743d786d3b35c28cec90bd785d568177c9299f5460918124d111565609fbcd35ec76412776151f6fe12ba9ab3efc77bc5cb05895e54dc7822f9862214c
+DIST gcompris-qt-0.97.tar.xz 75362060 BLAKE2B e6bc429ba4a8a622792935c9b2e68149f5c1f4d9aae4cac84ca517ebe83e59a9b4307f6ce84b36e658256cad5c8bd37b7cbc60a058b6d65be372ad1934cf666f SHA512 23cc807238121a6ea3abb8816795b2f3b243c3be1acf782705468d92758a2032a8cb5393c3c30028877d174ff53ebc3a62f69e9045bc70a5281d1d245b6e4eba
diff --git a/games-kids/gcompris/gcompris-0.97.ebuild b/games-kids/gcompris/gcompris-0.97.ebuild
new file mode 100644
index 000000000000..213187432c4f
--- /dev/null
+++ b/games-kids/gcompris/gcompris-0.97.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Full featured educational application for children from 2 to 10"
+HOMEPAGE="https://gcompris.net/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="https://gcompris.net/download/qt/src/${PN}-qt-${PV}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-qt-${PV}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="kiosk"
+
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+ test? (
+ dev-util/cppcheck
+ sys-devel/clang
+ )
+"
+RDEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsensors-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtmultimedia-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=dev-qt/qtxmlpatterns-${QTMIN}:5
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DQML_BOX2D_MODULE=disabled
+ -DWITH_KIOSK_MODE=$(usex kiosk)
+ )
+ ecm_src_configure
+}
diff --git a/games-kids/gcompris/metadata.xml b/games-kids/gcompris/metadata.xml
index 713d7d0e6cc1..ab0bc780ada9 100644
--- a/games-kids/gcompris/metadata.xml
+++ b/games-kids/gcompris/metadata.xml
@@ -3,10 +3,13 @@
kde@gentoo.org
- Gentoo Games Project
+ Gentoo KDE Project
games@gentoo.org
Gentoo Games Project
+
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 775f3a56f878..86d296558459 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/five-or-more/five-or-more-3.32.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.0.ebuild
index 8f09fbddb449..f11917329034 100644
--- a/games-puzzle/five-or-more/five-or-more-3.32.0.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.34.0.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.34.0.ebuild
index 21a39b74ca12..bb08a715fd0f 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.34.0.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
LICENSE="GPL-3+ FDL-1.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.34.1.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.34.1.ebuild
index b006bda16d9d..1729e98fe793 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.34.1.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.34.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.32.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.32.0.ebuild
index 2492a98105b0..7accbefeaeb3 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.32.0.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.1.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.1.ebuild
index 4eb1559137aa..f0d6efec3ea9 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.1.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/hitori/hitori-3.34.0.ebuild b/games-puzzle/hitori/hitori-3.34.0.ebuild
index e668a7d1294b..7708514c9f78 100644
--- a/games-puzzle/hitori/hitori-3.34.0.ebuild
+++ b/games-puzzle/hitori/hitori-3.34.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
diff --git a/games-puzzle/lightsoff/lightsoff-3.34.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.34.0.ebuild
index d7b3433cde31..4b2be5e28599 100644
--- a/games-puzzle/lightsoff/lightsoff-3.34.0.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
index 9843fdfe04db..9e567600ad00 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
index ca8ce00c843f..1073712ed558 100644
--- a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 98699ed1cc95..6ac6a91618d2 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
index ab376da8bc88..4eecd4fb57d9 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-linux"
RDEPEND="
>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
index 9992b900a0b2..8f67506b507c 100644
--- a/gnome-base/dconf/dconf-0.32.0-r2.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~x86-linux"
IUSE="gtk-doc"
RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
diff --git a/gnome-base/gdm/gdm-3.32.0.ebuild b/gnome-base/gdm/gdm-3.32.0.ebuild
index 9ee9ae70dc7c..737599bc3e4d 100644
--- a/gnome-base/gdm/gdm-3.32.0.ebuild
+++ b/gnome-base/gdm/gdm-3.32.0.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86"
# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
# nspr used by smartcard extension
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
index 28ce0105a7ef..519a34fa4566 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
flickr? ( gnome-online-accounts )
^^ ( elogind systemd )
" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
# kerberos unfortunately means mit-krb5; build fails with heimdal
# display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild
index 4f49c20847aa..202622f5be3d 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild
@@ -11,7 +11,7 @@ IUSE="+bluetooth cups"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
# gnome-color-manager min version enforced here due to control-center pulling it in
RDEPEND="
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
index 5fdcc803674c..29579ea32bbb 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
@@ -11,7 +11,7 @@ IUSE="cups python"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# Note to developers:
# This is a wrapper for the core libraries used by GNOME 3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
index 7e9e3fe09c13..e868c687ed37 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
SLOT="3/17" # subslot = libgnome-desktop-3 soname version
IUSE="debug gtk-doc +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
# cairo[X] needed for gnome-bg
COMMON_DEPEND="
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild
index b32e137b64ea..c1c043271c2f 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild
@@ -9,7 +9,7 @@ LICENSE="metapackage"
SLOT="3.0"
IUSE="+games share +shotwell +tracker"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
# Note to developers:
# This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
index e15406304ac3..adfdeeda515f 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
diff --git a/gnome-base/gnome-light/gnome-light-3.32.2.ebuild b/gnome-base/gnome-light/gnome-light-3.32.2.ebuild
index 8cff177ef28a..289fc899c3cd 100644
--- a/gnome-base/gnome-light/gnome-light-3.32.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.32.2.ebuild
@@ -13,7 +13,7 @@ IUSE="cups +gnome-shell"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
# XXX: Note to developers:
# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-session/gnome-session-3.32.0.ebuild b/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
index 67d00960e131..0e214ba21673 100644
--- a/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="consolekit doc elogind systemd"
# There is a null backend available, thus ?? not ^^
# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
index 60fa4ba9b526..254b5af0fcf5 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
input_devices_wacom? ( udev )
wayland? ( udev )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
# >=polkit-0.114 for ITS translation rules of .policy files
COMMON_DEPEND="
diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
index 52c198b7fd66..af8b5d90b813 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
@@ -16,7 +16,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
# libXfixes-5.0 needed for pointer barriers and #include
# FIXME:
diff --git a/gnome-base/gnome/gnome-3.32.2.ebuild b/gnome-base/gnome/gnome-3.32.2.ebuild
index 51d620967882..f3d4fddd8a2f 100644
--- a/gnome-base/gnome/gnome-3.32.2.ebuild
+++ b/gnome-base/gnome/gnome-3.32.2.ebuild
@@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
IUSE="accessibility +bluetooth +classic cups +extras"
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
index 5e1c2cba5a01..1bf18f79c92c 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
DEPEND="!=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
index c2308713264d..8569891bf153 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
LICENSE="GPL-2+ BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild
index ecafd9e7f217..cc0d5a4eedaa 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
index 49d9ce3beab0..1d3ad6ab0bd2 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="packagekit raw test"
# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
index 77ed3a1356bc..2536630c39c4 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
LICENSE="GPL-2+"
SLOT="0"
IUSE="telepathy v4l"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
VALA_DEPEND="
$(vala_depend)
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
index c1bb640db2df..c040bc6b4468 100644
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=dev-libs/glib-2.35:2
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild
index 43fe7ff7f4c6..11df07c435b9 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
index 876b7d4873df..8a1b1285470b 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
LICENSE="GPL-2+"
SLOT="0"
IUSE="test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
COMMON_DEPEND="
>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
index 0b26bdbc79d9..6b3f4c69b7c7 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
index 9d90af4a1614..2a5ec8b1ed59 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
LICENSE="GPL-2+"
SLOT="0"
IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=dev-cpp/glibmm-2.46:2
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
index d1198e1233ea..79e291ecf8d0 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
COMMON_DEPEND="
${PYTHON_DEPS}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild
index 1b3b568e7019..62f9f25f0601 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
LICENSE="CC-BY-3.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="test"
RDEPEND=""
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild
index 1b435e852738..ad0151207037 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
# FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild
index df53c28f533c..9f8cc535792e 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
DEPEND="
>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
index f12093f2c3f9..966577077e13 100644
--- a/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
+++ b/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Mousetweaks"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/sushi/sushi-3.32.1.ebuild b/gnome-extra/sushi/sushi-3.32.1.ebuild
index 60bf8a759dbd..bcfac9734eab 100644
--- a/gnome-extra/sushi/sushi-3.32.1.ebuild
+++ b/gnome-extra/sushi/sushi-3.32.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="office"
# Optional app-office/libreoffice support (OOo to pdf and then preview)
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
index 02fe26186c4a..6bcb4309fd5b 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/yelp-3.32.2.ebuild b/gnome-extra/yelp/yelp-3.32.2.ebuild
index 0f9ebb4f2a18..b0f547681cb8 100644
--- a/gnome-extra/yelp/yelp-3.32.2.ebuild
+++ b/gnome-extra/yelp/yelp-3.32.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
app-arch/bzip2:=
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b95b0c75b929..18e323d2889a 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/amtk/amtk-5.0.1.ebuild b/gui-libs/amtk/amtk-5.0.1.ebuild
index d40019fdaa5e..5177ff590462 100644
--- a/gui-libs/amtk/amtk-5.0.1.ebuild
+++ b/gui-libs/amtk/amtk-5.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Amtk"
LICENSE="LGPL-2.1+"
SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection"
RDEPEND="
diff --git a/gui-libs/libhandy/libhandy-0.0.9.ebuild b/gui-libs/libhandy/libhandy-0.0.9.ebuild
index 43f9ad68338a..b83d36c74330 100644
--- a/gui-libs/libhandy/libhandy-0.0.9.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2.1+"
SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
# SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="examples glade gtk-doc +introspection test +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 28983e9c56d7..fb2a6bade3e0 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch b/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch
new file mode 100644
index 000000000000..2cae935c7329
--- /dev/null
+++ b/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch
@@ -0,0 +1,32 @@
+From 7ba45fdc2b9d0c599497495387a70d3d5ddad5c4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 8 Dec 2019 15:26:18 +0100
+Subject: [PATCH] Use standard ECMQMLModules
+
+---
+ src/plugins/CMakeLists.txt | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
+index fa4637b..9790e76 100644
+--- a/src/plugins/CMakeLists.txt
++++ b/src/plugins/CMakeLists.txt
+@@ -19,11 +19,10 @@ function(kpackage_install_package dir component root)
+ PATTERN Messages.sh EXCLUDE)
+ endfunction()
+
+-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+-include(QMLModules)
+-find_qmlmodule(Ubuntu.OnlineAccounts 0.1)
+-find_qmlmodule(org.kde.kdeconnect 1.0)
+-find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
++include(ECMQMLModules)
++ecm_find_qmlmodule(Ubuntu.OnlineAccounts 0.1)
++ecm_find_qmlmodule(org.kde.kdeconnect 1.0)
++ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
+
+ find_package(KAccounts)
+ find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED)
+--
+2.24.0
+
diff --git a/kde-frameworks/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml
index 69186b245f38..6732ba335aca 100644
--- a/kde-frameworks/purpose/metadata.xml
+++ b/kde-frameworks/purpose/metadata.xml
@@ -6,6 +6,7 @@
Gentoo KDE Project
diff --git a/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
new file mode 100644
index 000000000000..409caa0c2954
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dolphin +kaccounts"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${PVCUT}:5
+ >=kde-frameworks/ki18n-${PVCUT}:5
+ >=kde-frameworks/kio-${PVCUT}:5
+ >=kde-frameworks/kirigami-${PVCUT}:5
+ dolphin? ( >=kde-frameworks/knotifications-${PVCUT}:5 )
+ kaccounts? (
+ >=kde-apps/kaccounts-integration-19.04.3:5
+ net-libs/accounts-qt
+ )
+"
+RDEPEND="${DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kdeclarative-${PVCUT}:5
+ kaccounts? ( net-libs/accounts-qml )
+"
+
+# requires running environment
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.64.0-ecmqmlmodules.patch" ) # git master
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package dolphin KF5Notifications)
+ $(cmake_use_find_package kaccounts KAccounts)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst(){
+ ecm_pkg_postinst
+
+ if ! has_version "kde-misc/kdeconnect[app]" ; then
+ elog "Optional runtime dependency:"
+ elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
+ fi
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index b4c23c4d3b1d..f4bafaaa5baf 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 4f8053707f5d..a4f5b8482211 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,3 +1,3 @@
DIST latte-dock-0.9.2.tar.xz 708436 BLAKE2B a54d11e5d98e4e9238f26ccee8f3ea67822f44f015a93cf0a4e2a202a5569e766ce0dd651f9ddf2f1251dca9d342dbb3fa58c2cf29bec04f7e24574136b46621 SHA512 3537ec6b9503802a7efbbea7ae6ddf864188ba3b73c8121b434efc527f3c3e8d8f5e68447541a867b4422ccc5e3d2af85f491807a597bdb747960e8ab983bebd
-DIST latte-dock-0.9.3.tar.xz 708252 BLAKE2B e15a3218e675c03167cc3af33eafcefe33863af2847af08441e210e1c710427e3ea2b30b03cf67e568483c5af93c15d94add2e7e94914678f4469e29849cdf76 SHA512 6e9bc41fc6fb2286ea242498771c30da1158dc968809f6685ee8c55191cec2e09a3f78dcb43255a33967e1750855e92e773ebb0eb83829067dd3b6b81ad5e79c
DIST latte-dock-0.9.4.tar.xz 711788 BLAKE2B 0e725da78dd9e243b29bf2721de3e060fe4ee1f7da532c84ba52d582db106257bddc554263575f98324e750b7bcb17ae495eaceebead5ffbd6838311753d9447 SHA512 05b7983db75589e1c2c150167d4aca4b9a4b0025f0de7906441d9a90c69bab9efc716addc53e0262dfaeca89fbaa39d50f938535ce6b8898422e906e9f905687
+DIST latte-dock-0.9.5.tar.xz 715260 BLAKE2B c92f9613851756289bd78a8484490f9237caf02f91c502dd095bfecd10be2ae316fa68430ca9eddbf08bf55ef26b8b4fcb167e07e111727f7b137379465221e8 SHA512 74fc5f53c56ff7c0780089a675aac0714fec46e31b3e32c8ded8e74d77396f3b5959ba2ce60606bfddd930fcb86a45ecd3ee5050e866c1ac334bce191215325f
diff --git a/kde-misc/latte-dock/latte-dock-0.9.3.ebuild b/kde-misc/latte-dock/latte-dock-0.9.3.ebuild
deleted file mode 100644
index 561330830242..000000000000
--- a/kde-misc/latte-dock/latte-dock-0.9.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Elegant dock, based on KDE Frameworks"
-HOMEPAGE="https://store.kde.org/p/1169519/
- https://github.com/psifidotos/Latte-Dock"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kactivities)
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kpackage)
- $(add_frameworks_dep kwayland)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep plasma X)
- $(add_plasma_dep libksysguard)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgraphicaleffects)
- $(add_qt_dep qtgui 'xcb')
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/kde-misc/latte-dock/latte-dock-0.9.5.ebuild b/kde-misc/latte-dock/latte-dock-0.9.5.ebuild
new file mode 100644
index 000000000000..57fdfa1e2a72
--- /dev/null
+++ b/kde-misc/latte-dock/latte-dock-0.9.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Elegant dock, based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.latte-dock"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.14.0
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5=
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5[xcb]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5[X]
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest
index 6144986b6e14..7637ea73c82a 100644
--- a/kde-misc/plasma-pass/Manifest
+++ b/kde-misc/plasma-pass/Manifest
@@ -1 +1,2 @@
DIST plasma-pass-1.0.0.tar.xz 26496 BLAKE2B 290e5f326be3bb7d8a2771dd9481da2721a9a7151d64e9bb4a5b5db3d9d8d03dc5202d4c7ee6def32c7c5a7c01eb602cec62c65bfef4a353db46e733281fb5ca SHA512 b67f3e8e18260564873000aa0b07f24dd95334882f3b81685dc1da59c06315b48112c26aed040f625e7240e3776ed29ec927ee79c81458ed01bb8a98cccbfa44
+DIST plasma-pass-1.1.0.tar.xz 28204 BLAKE2B 69aa9d8f5ece8625c0d371ebfb565b2ce60e0a0fa73458ab30eaa9acf1858f0d9b2e30532d7a56dc821533964f09d9b6fced2b965d5fc9b5c1728e1b79f9a2c6 SHA512 402a19d44028117878214140c4eff74f25775aea6492fd751883e56bfe8ae08b330bb93f0a271c55f942f8ce1ee3de00cb6ad1b7fd4629beb59e898650b8166d
diff --git a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
new file mode 100644
index 000000000000..e3e3a0e453e4
--- /dev/null
+++ b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet to access password from pass"
+HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://cgit.kde.org/plasma-pass.git/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]] ; then
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+IUSE=""
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 25f29a86080d..1ad7e27ea965 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,2 +1,2 @@
DIST tellico-3.2.1.tar.xz 5604632 BLAKE2B 4e0f156a315eca387b60f254df9824615aca3a917a1a256bfd3612e6babd7495e22d79234bdd92297167c323d5a3aabed253ddc38d757e41b64c289392b6e827 SHA512 ada45c66fce2e73f301e3f7d69acb20caf5ebde85ac77bd6e6f0701f55044f5f1a44f8e6ae5d6d6bd244fd6538fba88591caf70178855b6910ce5132508fba9b
-DIST tellico-3.2.2.tar.xz 5589296 BLAKE2B 7a9bb2afd4f0111d4b5173f060bfcf3b0530ddf9582e796adc08d5881da2afdbd689f1527d69e344dbd4daaf2879ba2871b2bda529bad110a6ee2926f3082761 SHA512 20af0a3017054c371dbeae7412d66b7f3cc7f0ab5119079c2da4373c23bd2eaa2f457955f8ace7448cbe69d8f0f4971f87127b25e06e3e26b07cfe47cf93b34b
+DIST tellico-3.2.3.tar.xz 5589552 BLAKE2B e22f0344ccd879694976bc00fa6bcb52e3b878d4ef92c05b9b9a62ab74b1e84cd4b649682a55ee4a1b2da4678676abe8f1da5591f57dbd7db156b5e5bd0b9dd1 SHA512 4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7
diff --git a/kde-misc/tellico/tellico-3.2.2.ebuild b/kde-misc/tellico/tellico-3.2.3.ebuild
similarity index 100%
rename from kde-misc/tellico/tellico-3.2.2.ebuild
rename to kde-misc/tellico/tellico-3.2.3.ebuild
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index ed54309907ca..533557d8c70c 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,2 +1 @@
-DIST zanshin-0.5.0.tar.xz 438300 BLAKE2B 323f7f8545ba59daf2e62af6873be47b81e62b808495757752e4a33e3b0816c63e0e08979695c33cc70b4aebcff6d30814b8cbb400fe64af5329e72501639399 SHA512 9e4f01ee622a07096b7cc234a6a2f0b35501497efb662af590d4c4fa3f55f21acc528bfae10e92da8107f26f3d5f4b777730512c97017c36cad96d6e6cb28e43
DIST zanshin-0.5.71.tar.gz 355173 BLAKE2B 245ccde6b6a68ca0b7093525b2b3d0384b9222efbbb6366060a5061020c565dcd7e6b9b6e4fffadc164bae93783bdcf69e2d02b1df4c9cb382c473dc1a10152b SHA512 c04f280066f97e3984988a86376b6e86b451d0fe5bab31eba4de03f2c2d15e65a3681d3f9f6895bf0750ccac4bf7a4666d742dd9c74028e689d732615cce3e97
diff --git a/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch b/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
deleted file mode 100644
index 6d6facbaeaa2..000000000000
--- a/kde-misc/zanshin/files/zanshin-0.5.0-cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 87e98e6b0aa704558009574eed8d8bdf2bfa0fbb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sat, 22 Jun 2019 12:47:28 +0200
-Subject: [PATCH] Add missing KF5 dependency (fix broken cmake against >=19.04)
-
-Signed-off-by: Andreas Sturmlechner
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6191f54..960fc6c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,6 +67,7 @@ include_directories (
-
- find_package(KF5 REQUIRED COMPONENTS
- AkonadiCalendar
-+ AkonadiContact
- AkonadiNotes
- AkonadiSearch
- IdentityManagement
---
-2.22.0
-
diff --git a/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild b/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild
deleted file mode 100644
index 981efbc3be50..000000000000
--- a/kde-misc/zanshin/zanshin-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
- test? (
hanno@gentoo.org
+
+ courier-pythonfilter
+
diff --git a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild b/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
index a23e682a6f28..8cdb47abe403 100644
--- a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
+++ b/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
inherit autotools
DESCRIPTION="SRS (Sender Rewriting Scheme) wrapper for the courier MTA"
-HOMEPAGE="http://couriersrs.com/"
-SRC_URI="http://couriersrs.com/download/${P}.tar.gz"
+HOMEPAGE="https://couriersrs.com/"
+SRC_URI="https://github.com/mawis/courier-srs/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/mail-filter/couriersrs/metadata.xml b/mail-filter/couriersrs/metadata.xml
index 28ef3c7b080f..270badf0104d 100644
--- a/mail-filter/couriersrs/metadata.xml
+++ b/mail-filter/couriersrs/metadata.xml
@@ -1,5 +1,10 @@
-hanno@gentoo.org
+
+ hanno@gentoo.org
+
+
+ mawis/courier-srs
+
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 76711fb4c49f..c4839867b671 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 33ebd276ac97..db67379a2aa2 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,5 +1,3 @@
DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737459fa27cd2da0622d639cd8207fc69988a7ecbf82993b051435fbf223c1f1178d213aea258a2b57fd3a698eee9cb SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb
-DIST asymptote-2.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d5419b3380bce7962afc9dcdd20ec3bd47b5c4b882f2276a2ac4c0d99e657d7385122d7dc400efbfb52ceec753ee8f4 SHA512 9efc4a70e8d29d6d50ba49c54c48da38beb00f64e5b39f23dbaec5cb12b714e427473fdffbf71f2d636a007cbfc993fa3237a8beab01e3419c1da1287823c159
-DIST asymptote-2.48.src.tgz 3729763 BLAKE2B 5820ddbbd27f6e7296501f50f25051d8417a0ab24d7c4c777013bf23601b5cbe34a69ba781e16e05141fda4e2e7a8bc527a41829f8d9e983aadc19bd05743122 SHA512 cd8b756185ae6627ea66bcaea224152f6644df633fe7ed40c1738f3b2ec31fbaa7ba97f2b1e290b073995779768ee3a264dd942f609b768cab7624d12807583d
-DIST asymptote-2.49.src.tgz 3730453 BLAKE2B b52c2fbac5ea9c6046f2bd2990c7f3792823ae0ecd749c58990bcee898b8af7d26c4b457bee6aa15fb11e3c63a7cdc6d7e4976418ee96fc4470a17f3202d79cd SHA512 08c20e45ab764281b480a97c5e2294cdfcc18b179cbdc85cf9956806b40fe305360d589077bd3ac429985503b0e7d17c889a37349d8c6fdf8ccbd8d822544226
DIST asymptote-2.60.src.tgz 4650347 BLAKE2B d969e4716a2493ae926ea1f58d0b247986e49a6a1902fb94859a45177ece4f149f5875cf788eace1c27c968652c49b2ace7b98aba02380cf8e1e3d4231560476 SHA512 a0653b9647d8c2a77656ea82faf8b69d28a43cf5ac61cfa9c6c62e2c51b4939e83202b95056495d10bee86a81e48b765ed4604a4d882a47a36b1dd6d5f9ad96b
+DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
diff --git a/media-gfx/asymptote/asymptote-2.47.ebuild b/media-gfx/asymptote/asymptote-2.47.ebuild
deleted file mode 100644
index 77448ad65450..000000000000
--- a/media-gfx/asymptote/asymptote-2.47.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit autotools elisp-common latex-package multilib python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- offscreen? ( opengl )
- doc? ( boehm-gc )"
-
-RDEPEND="
- >=sys-libs/ncurses-5.4-r5:0=
- >=sys-libs/readline-4.3-r5:0=
- imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( >=media-libs/mesa-8[X(+)] )
- offscreen? ( media-libs/mesa[osmesa] )
- svg? ( app-text/dvisvgm )
- sigsegv? ( dev-libs/libsigsegv )
- boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
- fftw? ( >=sci-libs/fftw-3.0.1 )
- gsl? ( sci-libs/gsl )
- python? ( ${PYTHON_DEPS} )
- X? (
- ${PYTHON_DEPS}
- dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
- dev-python/numpy
- dev-python/pycson
- >=gnome-base/librsvg-2.40
- )
- latex? (
- virtual/latex-base
- >=dev-texlive/texlive-latexextra-2013
- )
- emacs? ( virtual/emacs )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
- doc? (
- dev-lang/perl
- media-gfx/imagemagick[png]
- virtual/texi2dvi
- virtual/latex-base
- app-text/ghostscript-gpl )
- test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
- # gc.h -> gc/gc.h
- "${FILESDIR}/${P}-configure-ac.patch"
-
- # Changing pdf, ps, image viewers to xdg-open
- "${FILESDIR}/${P}-xdg-utils.patch"
-
- # Bug #322473
- "${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
- sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
- -i configure.ac \
- || die "sed configure.ac failed"
-
- default
- eautoreconf
-}
-
-src_configure() {
- # for the CPPFLAGS see
- # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
- econf \
- CPPFLAGS=-DHAVE_SYS_TYPES_H \
- CFLAGS="${CXXFLAGS}" \
- --disable-gc-debug \
- $(use_enable boehm-gc gc system) \
- $(use_enable fftw) \
- $(use_enable gsl) \
- $(use_enable opengl gl) \
- $(use_enable offscreen) \
- $(use_enable sigsegv)
-}
-
-src_compile() {
- default
-
- cd doc || die
- emake asy.1
- if use doc; then
- # info
- einfo "Making info"
- emake ${PN}.info
- cd FAQ || die
- emake
- cd .. || die
- # pdf
- einfo "Making pdf docs"
- export VARTEXFONTS="${T}"/fonts
- # see bug #260606
- emake -j1 asymptote.pdf
- emake CAD.pdf
- fi
- cd .. || die
-
- if use emacs; then
- einfo "Compiling emacs lisp files"
- elisp-compile base/*.el
- fi
-}
-
-src_install() {
- # the program
- dobin asy
-
- # .asy files
- insinto /usr/share/${PN}
- doins base/*.asy
-
- # documentation
- dodoc BUGS ChangeLog README ReleaseNotes TODO
- doman doc/asy.1
-
- # X GUI
- if use X; then
- insinto /usr/share/${PN}
- doins -r GUI
- chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
- dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
- doman doc/xasy.1x
- fi
-
- # examples
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins \
- examples/*.asy \
- examples/*.eps \
- doc/*.asy \
- doc/*.csv \
- doc/*.dat \
- doc/extra/*.asy
- insinto /usr/share/${PN}/examples/animations
- doins examples/animations/*.asy
- fi
-
- # LaTeX style
- if use latex; then
- cd doc || die
- insinto "${TEXMF}"/tex/latex/${PN}
- doins ${PN}.sty asycolors.sty
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins latexusage.tex
- fi
- cd .. || die
- fi
-
- # asymptote.py
- if use python; then
- python_foreach_impl python_domodule base/${PN}.py
- fi
-
- # emacs mode
- if use emacs; then
- elisp-install ${PN} base/*.el base/*.elc
- elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
- fi
-
- # vim syntax
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins base/asy.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/asy-ftd.vim
- fi
-
- # extra documentation
- if use doc; then
- cd doc || die
- doinfo ${PN}.info*
- cd FAQ || die
- dodoc asy-faq.ascii
- doinfo asy-faq.info
- insinto /usr/share/doc/${PF}/html/FAQ
- doins asy-faq.html/*
- cd .. || die
- insinto /usr/share/doc/${PF}
- doins ${PN}.pdf CAD.pdf
- fi
-}
-
-pkg_postinst() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-
- elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
- elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.48-r1.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
deleted file mode 100644
index 2c4a4f4d8894..000000000000
--- a/media-gfx/asymptote/asymptote-2.48-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit autotools elisp-common latex-package multilib python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- offscreen? ( opengl )
- doc? ( boehm-gc )"
-
-RDEPEND="
- >=sys-libs/ncurses-5.4-r5:0=
- >=sys-libs/readline-4.3-r5:0=
- imagemagick? ( media-gfx/imagemagick[png] )
- opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
- offscreen? ( media-libs/mesa[osmesa] )
- svg? ( app-text/dvisvgm )
- sigsegv? ( dev-libs/libsigsegv )
- boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
- fftw? ( >=sci-libs/fftw-3.0.1 )
- gsl? ( sci-libs/gsl )
- python? ( ${PYTHON_DEPS} )
- X? (
- ${PYTHON_DEPS}
- dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
- dev-python/numpy
- dev-python/pycson
- >=gnome-base/librsvg-2.40
- )
- latex? (
- virtual/latex-base
- >=dev-texlive/texlive-latexextra-2013
- )
- emacs? ( virtual/emacs )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
- doc? (
- dev-lang/perl
- media-gfx/imagemagick[png]
- virtual/texi2dvi
- virtual/latex-base
- app-text/ghostscript-gpl )
- test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
- # gc.h -> gc/gc.h
- "${FILESDIR}/${P}-configure-ac.patch"
-
- # Changing pdf, ps, image viewers to xdg-open
- "${FILESDIR}/${P}-xdg-utils.patch"
-
- # Bug #322473
- "${FILESDIR}/${P}-info.patch"
-)
-
-src_prepare() {
- sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
- -i configure.ac \
- || die "sed configure.ac failed"
-
- default
- eautoreconf
-}
-
-src_configure() {
- # for the CPPFLAGS see
- # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
- econf \
- CPPFLAGS=-DHAVE_SYS_TYPES_H \
- CFLAGS="${CXXFLAGS}" \
- --disable-gc-debug \
- $(use_enable boehm-gc gc system) \
- $(use_enable fftw) \
- $(use_enable gsl) \
- $(use_enable opengl gl) \
- $(use_enable offscreen) \
- $(use_enable sigsegv)
-}
-
-src_compile() {
- default
-
- cd doc || die
- emake asy.1
- if use doc; then
- # info
- einfo "Making info"
- emake ${PN}.info
- cd FAQ || die
- emake
- cd .. || die
- # pdf
- einfo "Making pdf docs"
- export VARTEXFONTS="${T}"/fonts
- # see bug #260606
- emake -j1 asymptote.pdf
- emake CAD.pdf
- fi
- cd .. || die
-
- if use emacs; then
- einfo "Compiling emacs lisp files"
- elisp-compile base/*.el
- fi
-}
-
-src_install() {
- # the program
- dobin asy
-
- # .asy files
- insinto /usr/share/${PN}
- doins base/*.asy
-
- # documentation
- dodoc BUGS ChangeLog README ReleaseNotes TODO
- doman doc/asy.1
-
- # X GUI
- if use X; then
- insinto /usr/share/${PN}
- doins -r GUI
- chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
- dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
- doman doc/xasy.1x
- fi
-
- # examples
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins \
- examples/*.asy \
- examples/*.eps \
- doc/*.asy \
- doc/*.csv \
- doc/*.dat \
- doc/extra/*.asy
- insinto /usr/share/${PN}/examples/animations
- doins examples/animations/*.asy
- fi
-
- # LaTeX style
- if use latex; then
- cd doc || die
- insinto "${TEXMF}"/tex/latex/${PN}
- doins ${PN}.sty asycolors.sty
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins latexusage.tex
- fi
- cd .. || die
- fi
-
- # asymptote.py
- if use python; then
- python_foreach_impl python_domodule base/${PN}.py
- fi
-
- # emacs mode
- if use emacs; then
- elisp-install ${PN} base/*.el base/*.elc
- elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
- fi
-
- # vim syntax
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins base/asy.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}"/asy-ftd.vim
- fi
-
- # extra documentation
- if use doc; then
- cd doc || die
- doinfo ${PN}.info*
- cd FAQ || die
- dodoc asy-faq.ascii
- doinfo asy-faq.info
- insinto /usr/share/doc/${PF}/html/FAQ
- doins asy-faq.html/*
- cd .. || die
- insinto /usr/share/doc/${PF}
- doins ${PN}.pdf CAD.pdf
- fi
-}
-
-pkg_postinst() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-
- elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
- elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
- use latex && latex-package_rehash
- use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.49.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
similarity index 95%
rename from media-gfx/asymptote/asymptote-2.49.ebuild
rename to media-gfx/asymptote/asymptote-2.61.ebuild
index 22a6d01b693b..bef7be52b544 100644
--- a/media-gfx/asymptote/asymptote-2.49.ebuild
+++ b/media-gfx/asymptote/asymptote-2.61.ebuild
@@ -134,7 +134,7 @@ src_install() {
insinto /usr/share/${PN}
doins -r GUI
chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
- dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+ dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
doman doc/xasy.1x
fi
@@ -187,14 +187,12 @@ src_install() {
if use doc; then
cd doc || die
doinfo ${PN}.info*
+ dodoc ${PN}.pdf CAD.pdf
cd FAQ || die
dodoc asy-faq.ascii
doinfo asy-faq.info
- insinto /usr/share/doc/${PF}/html/FAQ
- doins asy-faq.html/*
- cd .. || die
- insinto /usr/share/doc/${PF}
- doins ${PN}.pdf CAD.pdf
+ docinto html/FAQ
+ dodoc asy-faq.html/*
fi
}
diff --git a/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
deleted file mode 100644
index e0c372a095d2..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.47/configure.ac
-===================================================================
---- asymptote-2.47.orig/configure.ac
-+++ asymptote-2.47/configure.ac
-@@ -169,7 +169,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
- fi
- CPPFLAGS_SAVE=$CPPFLAGS
- CPPFLAGS=$CPPFLAGS" $INCL"
-- AC_CHECK_HEADER(gc.h,
-+ AC_CHECK_HEADER([gc/gc.h],
- AC_CHECK_LIB([gc],[GC_malloc],[
- LIBS=$LIBS"-lgc "
- AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
deleted file mode 100644
index d26b6c098d62..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.47/settings.cc
-===================================================================
---- asymptote-2.47.orig/settings.cc
-+++ asymptote-2.47/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
deleted file mode 100644
index ef6fc52c934b..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.48/configure.ac
-===================================================================
---- asymptote-2.48.orig/configure.ac
-+++ asymptote-2.48/configure.ac
-@@ -162,7 +162,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
- fi
- CPPFLAGS_SAVE=$CPPFLAGS
- CPPFLAGS=$CPPFLAGS" $INCL"
-- AC_CHECK_HEADER(gc.h,
-+ AC_CHECK_HEADER([gc/gc.h],
- AC_CHECK_LIB([gc],[GC_malloc],[
- LIBS=$LIBS"-lgc "
- AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.48-info.patch b/media-gfx/asymptote/files/asymptote-2.48-info.patch
deleted file mode 100644
index cd1577037f1f..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.48-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.48/doc/asymptote.texi
-===================================================================
---- asymptote-2.48.orig/doc/asymptote.texi
-+++ asymptote-2.48/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
-
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.49-info.patch b/media-gfx/asymptote/files/asymptote-2.49-info.patch
deleted file mode 100644
index e2b51860c3d6..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.49-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.49/doc/asymptote.texi
-===================================================================
---- asymptote-2.49.orig/doc/asymptote.texi
-+++ asymptote-2.49/doc/asymptote.texi
-@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
-
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
-
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
deleted file mode 100644
index d5d719de25da..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.49/settings.cc
-===================================================================
---- asymptote-2.49.orig/settings.cc
-+++ asymptote-2.49/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.47-info.patch b/media-gfx/asymptote/files/asymptote-2.61-info.patch
similarity index 72%
rename from media-gfx/asymptote/files/asymptote-2.47-info.patch
rename to media-gfx/asymptote/files/asymptote-2.61-info.patch
index dd2850211c1a..0046ab9628a0 100644
--- a/media-gfx/asymptote/files/asymptote-2.47-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.61-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.47/doc/asymptote.texi
+Index: asymptote-2.61/doc/asymptote.texi
===================================================================
---- asymptote-2.47.orig/doc/asymptote.texi
-+++ asymptote-2.47/doc/asymptote.texi
+--- asymptote-2.61.orig/doc/asymptote.texi
++++ asymptote-2.61/doc/asymptote.texi
@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
@dircategory Languages
diff --git a/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
similarity index 64%
rename from media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch
rename to media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
index fe4ca556a73c..269691eecfe9 100644
--- a/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
@@ -1,18 +1,17 @@
-Index: asymptote-2.48/settings.cc
+Index: asymptote-2.61/settings.cc
===================================================================
---- asymptote-2.48.orig/settings.cc
-+++ asymptote-2.48/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
+--- asymptote-2.61.orig/settings.cc
++++ asymptote-2.61/settings.cc
+@@ -98,13 +98,13 @@ string defaultPSViewer="open";
string defaultPDFViewer="open";
+ string defaultHTMLViewer="open";
#else
+-string defaultPSViewer="gv";
-string defaultPDFViewer="acroread";
+-string defaultHTMLViewer="google-chrome";
++string defaultPSViewer="xdg-open";
+string defaultPDFViewer="xdg-open";
++string defaultHTMLViewer="xdg-open";
#endif
string defaultGhostscript="gs";
string defaultGhostscriptLibrary="";
diff --git a/media-gfx/entangle/entangle-2.0.ebuild b/media-gfx/entangle/entangle-2.0.ebuild
index ebb4c3d3cf09..00fd3649f7ac 100644
--- a/media-gfx/entangle/entangle-2.0.ebuild
+++ b/media-gfx/entangle/entangle-2.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=dev-libs/glib-2.36:2
>=dev-libs/gobject-introspection-1.54.0
dev-libs/libgudev:=
- >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_USEDEP}]
+ >=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
>=media-libs/gexiv2-0.10[introspection]
>=media-libs/libgphoto2-2.5.0:=
media-libs/gstreamer:1.0
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
index 9a9245ffc3c8..267d2dfd4e31 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+exif map picasa +python"
REQUIRED_USE="
diff --git a/media-gfx/eog/eog-3.32.2.ebuild b/media-gfx/eog/eog-3.32.2.ebuild
index 88760dd26209..696783af59c4 100644
--- a/media-gfx/eog/eog-3.32.2.ebuild
+++ b/media-gfx/eog/eog-3.32.2.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
REQUIRED_USE="exif? ( jpeg )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
index 7d298e54cbec..eb3984b87024 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
index bf9760240045..0c4a5e48cf04 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="flickr test upnp-av"
DEPEND="
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
index 151a81f1829c..9d6b6a3b2a0b 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
# libcanberra 0.26-r2 is needed for gtk+:3 fixes
DEPEND="
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 553fc9cc6c9c..c16d909bfc25 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,2 +1,3 @@
DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
DIST gscan2pdf-2.6.1.tar.xz 457976 BLAKE2B ae7fb7164c1270ff049dde87eb3bc7bc54f4c7d67a12a36f3b22831f6b77117645d5491c41f97879c428ce28d48271be8aee93e1ac96e3c3d9c064a7963abaaa SHA512 694f1d24b96a60960084e3963073e39fcd01461e9e5f2dc2e71d6821f0a3985dc04810c0404b5a21cb11aaa4adbf5747a3c942d07d259bb9028f078f3147cc85
+DIST gscan2pdf-2.6.2.tar.xz 458920 BLAKE2B e8c54654c10adae7d66844e3814025f8c934df935c315e48b6a2a34810b06b47d22208af22da04d872b2ac9737f5f5cba72d42fb2de92f1fa8110dbe64ba71ba SHA512 7b0bba012eab6edcaede2a2163935947ab9c71b21abb4cde8456f958537f84435a274a0ae6fb3827afd835f376d462ab5402e772307034936ec2b24889ecaec2
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.6.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.6.2.ebuild
new file mode 100644
index 000000000000..2c4c4ca4eca1
--- /dev/null
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.6.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_TEST="do"
+
+inherit eutils perl-module virtualx
+
+DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-perl/Config-General
+ dev-perl/Data-UUID
+ dev-perl/Date-Calc
+ dev-perl/Filesys-Df
+ dev-perl/glib-perl
+ dev-perl/GooCanvas2
+ dev-perl/Gtk3
+ dev-perl/Gtk3-SimpleList
+ dev-perl/HTML-Parser
+ dev-perl/Image-Sane
+ dev-perl/List-MoreUtils
+ dev-perl/Locale-gettext
+ dev-perl/Log-Log4perl
+ dev-perl/PDF-API2
+ dev-perl/Proc-ProcessTable
+ dev-perl/Readonly
+ dev-perl/Set-IntSpan
+ dev-perl/Try-Tiny
+ virtual/perl-Archive-Tar
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-File-Temp
+ virtual/perl-Getopt-Long
+ virtual/perl-threads
+ virtual/perl-threads-shared
+ media-gfx/imagemagick[png,tiff,perl]
+ media-gfx/sane-backends
+ media-libs/tiff"
+
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-perl/Sub-Override
+ media-libs/fontconfig
+
+ app-text/djvu[tiff]
+ app-text/poppler[utils]
+ app-text/tesseract[-opencl,osd(+),tiff]
+ app-text/unpaper
+ media-gfx/imagemagick[djvu,png,tiff,perl]
+ media-gfx/sane-backends[sane_backends_test]
+ media-gfx/sane-frontends
+ )"
+
+PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t )
+
+mydoc="History"
+
+pkg_postinst() {
+ optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
+ optfeature "encrypting PDFs" app-text/pdftk
+ optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
+ optfeature "adding to an existing PDF" app-text/poppler[utils]
+ optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
+ optfeature "scan post-processing" app-text/unpaper
+ optfeature "automatic document feeder support" media-gfx/sane-frontends
+ optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
+}
+
+src_test(){
+ local confdir="${HOME}/.config/ImageMagick"
+ mkdir -p "${confdir}" || die
+ cat > "${confdir}/policy.xml" <<-EOT || die
+
+
+
+
+ EOT
+ virtx perl-module_src_test
+}
diff --git a/media-gfx/shotwell/shotwell-0.30.7.ebuild b/media-gfx/shotwell/shotwell-0.30.7.ebuild
index b5bd37671121..5d15592ff559 100644
--- a/media-gfx/shotwell/shotwell-0.30.7.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="opencv udev"
DEPEND="
diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
index 2c9045ad83f2..79bbc6ac4fd0 100644
--- a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
IUSE="colord webp" # packagekit
COMMON_DEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 52796b9801d4..cfbcaf7cec46 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/cogl/cogl-1.22.4.ebuild b/media-libs/cogl/cogl-1.22.4.ebuild
index f79e884927e8..05c334364057 100644
--- a/media-libs/cogl/cogl-1.22.4.ebuild
+++ b/media-libs/cogl/cogl-1.22.4.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index abe29d87cad3..3b87fa6734a4 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,2 +1 @@
-DIST freeverb3-3.1.2.tar.xz 6015544 BLAKE2B 7589e7aeb04f2253124c94036b53cb86151ffb9f53ae1caefd932ac4ea2c75063a3697101c481e89b7a978044eb02849541b11a7064ede2aec1cd92beba54ad6 SHA512 d3c0b64f14e98f3641b593f3902017fcb457d7a920082bc31e4fc70aaaa11e9172ecabe56bd93c1722b4860239e5ac127c11da6ced6f708def440018451d86bd
DIST freeverb3-3.2.1.tar.xz 6031592 BLAKE2B 8fbabde0e1c359048f4dc2595729ba93323c1f41176aedfaef406b10c570fc15913a63383f5dd054163efc1f2924958871a8e23d5d7edd0d5e07d52553bc7e38 SHA512 7cab3b2389c8d0a60d0c5f809b214677221204727a74a2b8622455b579aa8fcbd6952da3a343d0ff4bd06a386bbaed0371ddac99bb8ee85862b62435eaeba21b
diff --git a/media-libs/freeverb3/freeverb3-3.1.2-r1.ebuild b/media-libs/freeverb3/freeverb3-3.1.2-r1.ebuild
deleted file mode 100644
index 7b94b1aaa39e..000000000000
--- a/media-libs/freeverb3/freeverb3-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)"
-HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
-
-REQUIRED_USE="jack? ( audacious )"
-
-_GTK_DEPEND="
- >=dev-libs/glib-2.4.7:2
- x11-libs/cairo
- x11-libs/gtk+:3
- x11-libs/pango
-"
-RDEPEND="
- sci-libs/fftw:3.0=
- audacious? ( ${_GTK_DEPEND}
- =media-sound/audacious-3.9*[gtk3(+)]
- media-libs/libsndfile
- )
- jack? ( ${_GTK_DEPEND}
- virtual/jack
- media-libs/libsndfile
- )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local myeconfargs=(
- --enable-release
- --enable-undenormal
- --disable-autocflags
- --disable-fma
- --disable-fma4
- --disable-force3dnow
- --disable-pluginit
- --disable-profile
- --disable-sample
- --disable-srcnewcoeffs
- $(use_enable audacious)
- $(use_enable cpu_flags_x86_3dnow 3dnow)
- $(use_enable cpu_flags_x86_avx avx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable cpu_flags_x86_sse2 sse2)
- $(use_enable cpu_flags_x86_sse3 sse3)
- $(use_enable cpu_flags_x86_sse4_1 sse4)
- $(use_enable forcefpu)
- $(use_enable jack)
- $(use_enable openmp omp)
- $(use_enable plugdouble)
- $(use_enable threads pthread)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
-
- if use audacious ; then
- find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die
- fi
-
- insinto /usr/share/${PN}/samples/IR
- doins samples/IR/*.wav
-}
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 2ee30f33a600..654bbe899330 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
-inherit meson gnome2-utils python-any-r1 vala
+inherit meson gnome2-utils python-r1 vala
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -24,21 +24,27 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
svg? ( cairo )
+ test? ( introspection )
vala? ( introspection )
"
+RESTRICT="!test? ( test )"
+
# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
+ ${PYTHON_DEPS}
>=dev-libs/glib-2.44:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.72[introspection?]
media-libs/libnsgif
>=media-libs/libpng-1.6.0:0=
+ >=sys-libs/zlib-1.2.0
virtual/jpeg:0=
>=x11-libs/gdk-pixbuf-2.32:2
>=x11-libs/pango-1.38.0
@@ -59,19 +65,16 @@ RDEPEND="
umfpack? ( sci-libs/umfpack )
v4l? ( >=media-libs/libv4l-1.0.1 )
webp? ( >=media-libs/libwebp-0.5.0:= )
- >=sys-libs/zlib-1.2.0
"
-DEPEND="${RDEPEND}
+
+DEPEND="
+ ${RDEPEND}
dev-lang/perl
>=dev-util/gtk-doc-am-1
>=sys-devel/gettext-0.19.8
- virtual/pkgconfig
>=sys-devel/libtool-2.2
- test? ( ffmpeg? ( media-libs/gexiv2 )
- introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
- )
- )
+ virtual/pkgconfig
+ test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] )
vala? ( $(vala_depend) )
"
@@ -83,10 +86,6 @@ PATCHES=(
"${FILESDIR}"/${P}-meson_cpu_detection.patch
)
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
src_prepare() {
default
@@ -100,6 +99,12 @@ src_prepare() {
-e '/composite-transform.xml/d' \
-i tests/compositions/meson.build || die
+ # fix skipping mipmap tests due to executable not found
+ for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+ sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+ sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+ done
+
gnome2_environment_reset
use vala && vala_src_prepare
@@ -107,13 +112,9 @@ src_prepare() {
src_configure() {
local emesonargs=(
- # disable documentation as the generating is bit automagic
+ # - Disable documentation as the generating is bit automagic
# if anyone wants to work on it just create bug with patch
-Ddocs=false
- # - Parameter -Dworkshop=false disables any use of Lua, effectivly
- -Dworkshop=false
- $(meson_use introspection)
-
-Dexiv2=disabled
-Dgdk-pixbuf=enabled
-Dgexiv2=disabled
@@ -121,32 +122,35 @@ src_configure() {
# which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
-Dgraphviz=disabled
-Djasper=disabled
- $(meson_feature lcms)
- $(meson_feature lensfun)
- $(meson_feature ffmpeg libav)
-Dlibjpeg=enabled
-Dlibpng=enabled
- $(meson_feature raw libraw)
- $(meson_feature svg librsvg)
- # libspiro: not in portage main tree
+ # - libspiro: not in portage main tree
-Dlibspiro=disabled
- $(meson_feature tiff libtiff)
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- $(meson_feature v4l libv4l)
- $(meson_feature v4l libv4l2)
-Dlua=disabled
-Dmrg=disabled
- $(meson_feature openexr)
- $(meson_feature cairo)
-Dpango=enabled
+ -Dsdl2=disabled
+ # - Parameter -Dworkshop=false disables any use of Lua, effectivly
+ -Dworkshop=false
+ $(meson_feature cairo)
$(meson_feature cairo pangocairo)
- $(meson_feature introspection pygobject)
+ $(meson_feature ffmpeg libav)
+ $(meson_feature lcms)
+ $(meson_feature lensfun)
+ $(meson_feature openexr)
+ $(meson_feature raw libraw)
$(meson_feature sdl sdl1)
- -Dsdl2=disabled
+ $(meson_feature svg librsvg)
+ $(meson_feature test pygobject)
+ $(meson_feature tiff libtiff)
$(meson_feature umfpack)
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ $(meson_feature v4l libv4l)
+ $(meson_feature v4l libv4l2)
$(meson_feature vala vapigen)
$(meson_feature webp)
+ $(meson_use introspection)
)
meson_src_configure
}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 015343c90de2..ea450170416a 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
-inherit meson gnome2-utils python-any-r1 vala
+inherit meson gnome2-utils python-r1 vala
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A graph based image processing framework"
@@ -24,21 +24,27 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
svg? ( cairo )
+ test? ( introspection )
vala? ( introspection )
"
+RESTRICT="!test? ( test )"
+
# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
+ ${PYTHON_DEPS}
>=dev-libs/glib-2.44:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.72[introspection?]
media-libs/libnsgif
>=media-libs/libpng-1.6.0:0=
+ >=sys-libs/zlib-1.2.0
virtual/jpeg:0=
>=x11-libs/gdk-pixbuf-2.32:2
>=x11-libs/pango-1.38.0
@@ -59,19 +65,16 @@ RDEPEND="
umfpack? ( sci-libs/umfpack )
v4l? ( >=media-libs/libv4l-1.0.1 )
webp? ( >=media-libs/libwebp-0.5.0:= )
- >=sys-libs/zlib-1.2.0
"
-DEPEND="${RDEPEND}
+
+DEPEND="
+ ${RDEPEND}
dev-lang/perl
>=dev-util/gtk-doc-am-1
>=sys-devel/gettext-0.19.8
- virtual/pkgconfig
>=sys-devel/libtool-2.2
- test? ( ffmpeg? ( media-libs/gexiv2 )
- introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
- )
- )
+ virtual/pkgconfig
+ test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] )
vala? ( $(vala_depend) )
"
@@ -82,10 +85,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
)
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
src_prepare() {
default
@@ -106,13 +105,9 @@ src_prepare() {
src_configure() {
local emesonargs=(
- # disable documentation as the generating is bit automagic
+ # - Disable documentation as the generating is bit automagic
# if anyone wants to work on it just create bug with patch
-Ddocs=false
- # - Parameter -Dworkshop=false disables any use of Lua, effectivly
- -Dworkshop=false
- $(meson_use introspection)
-
-Dexiv2=disabled
-Dgdk-pixbuf=enabled
-Dgexiv2=disabled
@@ -120,32 +115,35 @@ src_configure() {
# which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
-Dgraphviz=disabled
-Djasper=disabled
- $(meson_feature lcms)
- $(meson_feature lensfun)
- $(meson_feature ffmpeg libav)
-Dlibjpeg=enabled
-Dlibpng=enabled
- $(meson_feature raw libraw)
- $(meson_feature svg librsvg)
- # libspiro: not in portage main tree
+ # - libspiro: not in portage main tree
-Dlibspiro=disabled
- $(meson_feature tiff libtiff)
- # - v4l support does not work with our media-libs/libv4l-0.8.9,
- # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
- $(meson_feature v4l libv4l)
- $(meson_feature v4l libv4l2)
-Dlua=disabled
-Dmrg=disabled
- $(meson_feature openexr)
- $(meson_feature cairo)
-Dpango=enabled
+ -Dsdl2=disabled
+ # - Parameter -Dworkshop=false disables any use of Lua, effectivly
+ -Dworkshop=false
+ $(meson_feature cairo)
$(meson_feature cairo pangocairo)
- $(meson_feature introspection pygobject)
+ $(meson_feature ffmpeg libav)
+ $(meson_feature lcms)
+ $(meson_feature lensfun)
+ $(meson_feature openexr)
+ $(meson_feature raw libraw)
$(meson_feature sdl sdl1)
- -Dsdl2=disabled
+ $(meson_feature svg librsvg)
+ $(meson_feature test pygobject)
+ $(meson_feature tiff libtiff)
$(meson_feature umfpack)
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ $(meson_feature v4l libv4l)
+ $(meson_feature v4l libv4l2)
$(meson_feature vala vapigen)
$(meson_feature webp)
+ $(meson_use introspection)
)
meson_src_configure
}
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index edfb95da5b0c..3aa9cb9ab8d7 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ torokhov-s-a@yandex.ru
+ Sergey Torokhov
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+