diff --git a/Manifest.files.gz b/Manifest.files.gz
index ba17a193b927..0feda1e041f5 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 7ef10d3eee80..8371ce9defe0 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/lighttpd/Manifest b/acct-group/lighttpd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/lighttpd/lighttpd-0.ebuild b/acct-group/lighttpd/lighttpd-0.ebuild
new file mode 100644
index 000000000000..16dac2e24281
--- /dev/null
+++ b/acct-group/lighttpd/lighttpd-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=302
diff --git a/acct-group/lighttpd/metadata.xml b/acct-group/lighttpd/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-group/lighttpd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-group/telegraf/Manifest b/acct-group/telegraf/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/telegraf/metadata.xml b/acct-group/telegraf/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/telegraf/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/telegraf/telegraf-0.ebuild b/acct-group/telegraf/telegraf-0.ebuild
new file mode 100644
index 000000000000..c7a063da8332
--- /dev/null
+++ b/acct-group/telegraf/telegraf-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=428
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 53483c59125a..5db916687117 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/lighttpd/Manifest b/acct-user/lighttpd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/lighttpd/lighttpd-0.ebuild b/acct-user/lighttpd/lighttpd-0.ebuild
new file mode 100644
index 000000000000..5534663d206b
--- /dev/null
+++ b/acct-user/lighttpd/lighttpd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for lighttpd"
+ACCT_USER_ID=302
+ACCT_USER_GROUPS=( lighttpd )
+
+acct-user_add_deps
diff --git a/acct-user/lighttpd/metadata.xml b/acct-user/lighttpd/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-user/lighttpd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-user/telegraf/Manifest b/acct-user/telegraf/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/telegraf/metadata.xml b/acct-user/telegraf/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/telegraf/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-user/telegraf/telegraf-0.ebuild b/acct-user/telegraf/telegraf-0.ebuild
new file mode 100644
index 000000000000..7cfacc19c7c4
--- /dev/null
+++ b/acct-user/telegraf/telegraf-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for telegraf"
+ACCT_USER_ID=428
+ACCT_USER_GROUPS=( telegraf )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 0558b3ff4c8a..ad62f13771d1 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 7065ddf75b70..34daef6d0864 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,3 +1,2 @@
-DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B 108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266 SHA512 f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
DIST at-spi2-atk-2.32.0.tar.xz 94952 BLAKE2B 972bb32590a51549eb8b0b3c46a068e95cc43783f0f0e31ca3663ff1669196a88def63342c01d056d45d6f4fb4bcc2127b50a49be37fd45d33aa1daeadca5172 SHA512 095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393
DIST at-spi2-atk-2.34.0.tar.xz 96116 BLAKE2B 242b29b988d97b06ca85495be77f9c4cf1c621d9ff977cd73ea37f97b42fc636474df34429e7397fb3f91d3d11b14ce1b3de5d68c0b30f85877f444c78389564 SHA512 515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
deleted file mode 100644
index aea755f5d6d2..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
- >=dev-libs/atk-2.25.2[${MULTILIB_USEDEP}]
- >=app-accessibility/at-spi2-core-2.25.3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- gnome2_src_configure --enable-p2p $(use_with test tests)
-}
-
-multilib_src_test() {
- virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index a2132eaf7aee..a454af54eeda 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,3 +1,2 @@
-DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc538b38831cc22bbafc7f5d499082007909a82e785184d052f3a62853474cbc4838125540026a6d0e2ac2181e98a6a4c SHA512 cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca
DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
deleted file mode 100644
index 223688c4c8f3..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X +introspection"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
- >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
- >=sys-apps/dbus-1[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.25
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
- # disable teamspaces test since that requires Novell.ICEDesktop.Daemon
- "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
- "${FILESDIR}/${PV}-fix-inverted-logic.patch"
-)
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- $(multilib_native_use_enable introspection) \
- $(use_enable X x11)
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
- fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch b/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
deleted file mode 100644
index 7aa10f8bfc2b..000000000000
--- a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2e87fe00b596dba20c9d57d406ab8faa744b15a Mon Sep 17 00:00:00 2001
-From: Maya Rashish
-Date: Sat, 2 Dec 2017 13:24:29 +0200
-Subject: [PATCH] Fix inverted logic.
-
-Don't write more into a buffer than it can hold.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=791124
----
- bus/at-spi-bus-launcher.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
-index 261353f..eb2b8e3 100644
---- a/bus/at-spi-bus-launcher.c
-+++ b/bus/at-spi-bus-launcher.c
-@@ -244,7 +244,7 @@ unix_read_all_fd_to_string (int fd,
- {
- ssize_t bytes_read;
-
-- while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1))))
-+ while (max_bytes > 1 && (bytes_read = read (fd, buf, MIN (4096, max_bytes - 1))))
- {
- if (bytes_read < 0)
- return FALSE;
---
-2.18.0
-
diff --git a/app-accessibility/orca/orca-3.32.0.ebuild b/app-accessibility/orca/orca-3.32.0-r1.ebuild
similarity index 68%
rename from app-accessibility/orca/orca-3.32.0.ebuild
rename to app-accessibility/orca/orca-3.32.0-r1.ebuild
index f5dff9cf8b0d..052a2b319bd4 100644
--- a/app-accessibility/orca/orca-3.32.0.ebuild
+++ b/app-accessibility/orca/orca-3.32.0-r1.ebuild
@@ -23,19 +23,26 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-accessibility/at-spi2-core-2.32:2[introspection]
>=dev-libs/atk-2.32
>=dev-libs/glib-2.28:2
- dev-python/gst-python:1.0[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
media-libs/gstreamer:1.0[introspection]
>=x11-libs/gtk+-3.6.2:3[introspection]
+ $(python_gen_cond_dep '
+ dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
+ ')
braille? (
- >=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
- dev-libs/liblouis[python,${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ >=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
+ dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${COMMON_DEPEND}
- >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
dev-libs/atk[introspection]
- >=dev-python/pyatspi-2.32[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pyatspi-2.32[${PYTHON_MULTI_USEDEP}]
+ dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+ ')
x11-libs/libwnck:3[introspection]
x11-libs/pango[introspection]
"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 1493e8dd21b8..fddca9e5fa43 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/abrt/abrt-2.12.0-r1.ebuild b/app-admin/abrt/abrt-2.12.0-r2.ebuild
similarity index 92%
rename from app-admin/abrt/abrt-2.12.0-r1.ebuild
rename to app-admin/abrt/abrt-2.12.0-r2.ebuild
index 2a2d73f27a6a..097383a5b464 100644
--- a/app-admin/abrt/abrt-2.12.0-r1.ebuild
+++ b/app-admin/abrt/abrt-2.12.0-r2.ebuild
@@ -34,19 +34,23 @@ RDEPEND="${COMMON_DEPEND}
app-arch/rpm
dev-libs/elfutils
dev-libs/json-c:0=
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/argh[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
sys-apps/util-linux
>=sys-devel/gdb-7
+ $(python_gen_cond_dep '
+ dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+ dev-python/argh[${PYTHON_MULTI_USEDEP}]
+ dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+ ')
"
DEPEND="${COMMON_DEPEND}
app-text/asciidoc
app-text/xmlto
- dev-libs/satyr[${PYTHON_USEDEP}]
>=dev-util/intltool-0.35.0
virtual/pkgconfig
>=sys-devel/gettext-0.17
+ $(python_gen_cond_dep '
+ dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
+ ')
"
RESTRICT="test" # tests *may* be broken due to all the RHEL crap. explore later.
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
index 41cd0c9ccb81..761bce4eb366 100644
--- a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
+++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="6"
DESCRIPTION="Init script to setup Amazon EC2 instance parameters"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI=""
# Amazon only provides x86 and amd64 Linux Xen guests, possibly FreeBSD,
diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild
index 9fea01c24f62..8ce51a9bf5da 100644
--- a/app-admin/calamares/calamares-3.2.12.ebuild
+++ b/app-admin/calamares/calamares-3.2.12.ebuild
@@ -5,7 +5,7 @@ EAPI=7
KDE_TEST="true"
PYTHON_COMPAT=( python3_6 )
-inherit kde5 python-r1
+inherit kde5 python-single-r1
DESCRIPTION="Distribution-independent installer framework"
HOMEPAGE="https://calamares.io"
@@ -41,13 +41,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
dev-cpp/yaml-cpp:=
- >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
- dev-libs/libpwquality[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+ dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+ ')
sys-apps/dbus
sys-apps/dmidecode
sys-auth/polkit-qt[qt5(+)]
>=sys-libs/kpmcore-4.0.0:5=
- pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+ pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
"
DEPEND="${COMMON_DEPEND}
test? ( $(add_qt_dep qttest) )
@@ -67,7 +69,6 @@ RDEPEND="${COMMON_DEPEND}
src_prepare() {
cmake-utils_src_prepare
- python_setup
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
PYTHON_CFLAGS="$(python_get_CFLAGS)"\
diff --git a/app-admin/calamares/calamares-3.2.17.1.ebuild b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
similarity index 89%
rename from app-admin/calamares/calamares-3.2.17.1.ebuild
rename to app-admin/calamares/calamares-3.2.17.1-r1.ebuild
index e94dcef7f308..de32e110d2e0 100644
--- a/app-admin/calamares/calamares-3.2.17.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
ECM_TEST="true"
PYTHON_COMPAT=( python3_6 )
-inherit ecm python-r1
+inherit ecm python-single-r1
DESCRIPTION="Distribution-independent installer framework"
HOMEPAGE="https://calamares.io"
@@ -22,8 +22,10 @@ BDEPEND="
"
COMMON_DEPEND="${PYTHON_DEPS}
dev-cpp/yaml-cpp:=
- >=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
- dev-libs/libpwquality[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+ dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
@@ -43,7 +45,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
sys-apps/dmidecode
sys-auth/polkit-qt
>=sys-libs/kpmcore-4.0.0:5=
- pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+ pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
"
DEPEND="${COMMON_DEPEND}
test? ( dev-qt/qttest:5 )
@@ -63,7 +65,6 @@ RDEPEND="${COMMON_DEPEND}
src_prepare() {
ecm_src_prepare
- python_setup
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
PYTHON_CFLAGS="$(python_get_CFLAGS)"\
diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 347df5bcfc65..9ef9a87b2017 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
else
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"
+ 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
diff --git a/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302-r1.ebuild
similarity index 90%
rename from app-admin/equo/equo-302.ebuild
rename to app-admin/equo/equo-302-r1.ebuild
index cfe1a7c0ea3c..e962a0d782f6 100644
--- a/app-admin/equo/equo-302.ebuild
+++ b/app-admin/equo/equo-302-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
S="${WORKDIR}/entropy-${PV}"
COMMON_DEPEND="${PYTHON_DEPS}
- ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]"
+ ~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}]"
DEPEND="${COMMON_DEPEND}
app-text/asciidoc"
RDEPEND="${COMMON_DEPEND}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 8b548c23571c..cb7eeb7a7d13 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.9.0.tar.gz 3805146 BLAKE2B d2626270b6caa31a3c6853a0676a70d05a8165da0d229d44a6245840c76b91dcee0f44361373ff9e36138963cae0bb29245287ed49d155073a957f74049e2d08 SHA512 4c0e909ad86b9c6920e6a7ccd165fe126402399ff751add52720a44def6b43498a3bbaf2c70efaf966dbeb5bf3c41f8b8f73e40b70d3b58b732ec7e701e76871
+DIST exo-1.10.0.tar.gz 3805637 BLAKE2B fb74d3dadc8be11134bf5929a4ccfa12ac5e0b04854a0d1d74a63ac0b6a25bb5a0c945dfaf7f60141e2fdc0fa0f797c36edccf5d256f0a041ab726644ca324c4 SHA512 ef2e76e2e3d4b41121c00fa6ca869fe62e79c6790c8d7b44733ab1d9fab582989222852ca87849aa760d32db69b105ee528db5bb3dd0b0514a570d982007eb22
diff --git a/app-admin/exo/exo-1.9.0.ebuild b/app-admin/exo/exo-1.10.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.9.0.ebuild
rename to app-admin/exo/exo-1.10.0.ebuild
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index 29601be94ff0..b65c0a185755 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips 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="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302-r1.ebuild
similarity index 86%
rename from app-admin/matter/matter-302.ebuild
rename to app-admin/matter/matter-302-r1.ebuild
index 23ff9aad401d..9505601252b6 100644
--- a/app-admin/matter/matter-302.ebuild
+++ b/app-admin/matter/matter-302-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
S="${WORKDIR}/entropy-${PV}/${PN}"
DEPEND=""
-RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] )
+RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}] )
sys-apps/file[python]
${PYTHON_DEPS}"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index c09ca90578f0..82667b49c213 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,8 +1,11 @@
DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
DIST mongo-tools-3.6.14.tar.gz 4990861 BLAKE2B 13394a7222e73c0912e7d9d04205b25e5d73d6c72b53521b0749e0998dc52bbe4c7733d460b189aff2401790f537d9aa369b969ed273ea0858520ecd75782b66 SHA512 3e7caaa1d568023d478c77d5e88127796b25d27c71e30af692983f4fd2160887662253ffc67e6e87aa3a7e1fd4ae231de9401b1628412a4561b9595b71df8834
DIST mongo-tools-3.6.16.tar.gz 4990806 BLAKE2B 743c24fe55a0353e3ce31a82a53c94560408725f9fa35d93d5bc136d2b6e465e081c8ad4b00d63826ea45db4431124cdf2b66341eba9be24db890fd80941b728 SHA512 ebb356690c2aeb7d47435ea05f977e9319c915e1af48b89fc9941f72871baabb5faac238b59281330fb46e7340ee354f56f438ea3d0abd97b859e2321b719038
+DIST mongo-tools-3.6.17.tar.gz 4991196 BLAKE2B 53e86b3513aa74ad174801cea987d574c5248f438cb0a9419c2352c04333eae2f92214b11c59ee8688ad7235dc7a4586c39cc27450c654b1fc0e2eec2e4e22e2 SHA512 ea7a010097fdfe7807daf9352519b808b4a7b614b793ee2ac27495207bcf1cf8b4151fecd525946a0d6b8aa9332c205f437d5141b16efb613810963f502061be
DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
DIST mongo-tools-4.0.13.tar.gz 11134653 BLAKE2B b963f2a4ee598f6716c6c678df029040f57e2ad17b0e025139d3ac5049aacefbf5342a455ac58161c11df734da4fe4f62f021c1544eee3542af3aed77a65e6d2 SHA512 0694c7ac5743b04d927e27eb913df1b9b55c6c7a26d2a4dc52af8d2e0a6934416f416da91c57e1e61804ae855ec4bd8facabacf0754f9f924f21602737f29e3c
DIST mongo-tools-4.0.14.tar.gz 11134659 BLAKE2B 9caf119901d528079bb9aefce78d702dc3196cb105ac623137f8ffceffef4f8f6e61c8134470abe11f0bd422df9a6bef0e15331ee71065450b97220431458fc1 SHA512 6a0c39cbca0d51cd42518bb68a36fb7f0ed1e7b1ecf4dcd41256c8ab5c23505ca189b81a88c2a783ad81788bcab81d7e3c69f4788366e10dea744a03a2f3cf1e
+DIST mongo-tools-4.0.16.tar.gz 11139827 BLAKE2B 550acfd7e4434b178170dfd94c65668cb7dd37d128235c63a10f72802e3119f33d5cd2138bfd5b957f6d3813f1d9aff49218c4e122c0cd454b4ea7a969c84d4e SHA512 a75831d9fd0b596bfb7354cbc05d1ecf6871d5a7230a858b09b94d5001d18069c9cbe89c9500e9c1a16fc5186fa7a1ac59c605156666a3f1a2d7c81115a47c16
DIST mongo-tools-4.2.1.tar.gz 14435826 BLAKE2B 8d068cb39957f6773fb6ca186a1eb324e03c21b8472fede407daf7bce091f3d401f0debe6412d70bb8e338101d7ada870e7347782ffb582b58fcafc236ad4932 SHA512 bba754acd9e21f8f832fc2e434720347c2222897b2af08d66f9491110d5491f5475ae2118ff25b263606677da10b0c96b76cc507a01287180096c25c1eab5ced
DIST mongo-tools-4.2.2.tar.gz 14433618 BLAKE2B 7610bd6b386684836e91b6bb7f73e24267fac56ce975263ac2aaeebe51d37123baa8eb2009cf4478af89e6dcc596c9c07126224ad4bd80aee47d03fde9413eca SHA512 661813c70bf891f0a834ac9970cbe390a8616f9e89e4f33918e479ba3f3ce3851edecd63c1e35e65a4dee47419e3ce0fa3186c7ee2326bef11fce3bac8bed0c7
+DIST mongo-tools-4.2.3.tar.gz 15020325 BLAKE2B 8501a3ec6e947112ec561ce62f2ea568984f8ac911a7aff3cb8c08c1f29d2cfc64cf7f4b6a24ba73ae0f9b2b5853480f4fbed51c98fdc8c83cd433ea65e21dba SHA512 772719b450f8b656c22ac0126fee1e0fa58b5320c94ac6414b1d9af13e6437393c2482f2e386f4a73c84a2d1bfe0ea88df117a6a7ae87f4884477505cf662585
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.17.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.17.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.17.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+ mkdir -p "${S%/*}" || die
+ default
+ mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ # allow building with go 1.12 #678924
+ sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+ local myconf=()
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ # build pie to avoid text relocations wrt #582854
+ local buildmode="pie"
+
+ # skip on ppc64 wrt #610984
+ if use ppc64; then
+ buildmode="default"
+ fi
+
+ mkdir -p bin || die
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+ echo "Building $i"
+ GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+ -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+ done
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.16.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.16.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.16.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+ mkdir -p "${S%/*}" || die
+ default
+ mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ # allow building with go 1.12 #678924
+ sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+ local myconf=()
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ # build pie to avoid text relocations wrt #582854
+ local buildmode="pie"
+
+ # skip on ppc64 wrt #610984
+ if use ppc64; then
+ buildmode="default"
+ fi
+
+ mkdir -p bin || die
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+ echo "Building $i"
+ GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+ -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+ done
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+ mkdir -p "${S%/*}" || die
+ default
+ mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ # allow building with go 1.12 #678924
+ sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+ local myconf=()
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ # build pie to avoid text relocations wrt #582854
+ local buildmode="pie"
+
+ # skip on ppc64 wrt #610984
+ if use ppc64; then
+ buildmode="default"
+ fi
+
+ mkdir -p bin || die
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+ echo "Building $i"
+ GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+ -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+ done
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12-r1.ebuild
similarity index 94%
rename from app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
rename to app-admin/packagekit-base/packagekit-base-1.1.12-r1.ebuild
index 41466b8f3d98..679f84cba2da 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -58,10 +58,12 @@ DEPEND="${COMMON_DEPEND}
vala? ( $(vala_depend) )
"
RDEPEND="${COMMON_DEPEND}
- >=app-portage/layman-2[${PYTHON_USEDEP}]
- >=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=app-portage/layman-2[${PYTHON_MULTI_USEDEP}]
+ >=sys-apps/portage-2.2[${PYTHON_MULTI_USEDEP}]
+ ')
consolekit? ( sys-auth/consolekit )
- entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+ entropy? ( >=sys-apps/entropy-234[${PYTHON_SINGLE_USEDEP}] )
"
PATCHES=(
diff --git a/app-admin/ps_mem/ps_mem-3.13.ebuild b/app-admin/ps_mem/ps_mem-3.13-r1.ebuild
similarity index 93%
rename from app-admin/ps_mem/ps_mem-3.13.ebuild
rename to app-admin/ps_mem/ps_mem-3.13-r1.ebuild
index 2152bc741c1b..8a3aea889f12 100644
--- a/app-admin/ps_mem/ps_mem-3.13.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.13-r1.ebuild
@@ -18,8 +18,6 @@ SLOT="0"
KEYWORDS="amd64 sparc x86"
IUSE=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
python_install() {
distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
index c3ccfa108f05..d2f73378485c 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
@@ -45,12 +45,14 @@ DEPEND="${COMMON_DEPEND}
doc? ( dev-python/epydoc )
"
RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycups[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+ ')
gnome-keyring? ( app-crypt/libsecret[introspection] )
policykit? ( net-print/cups-pk-helper )
"
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
similarity index 85%
rename from app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
rename to app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
index ddfedb5f26de..a62572dca403 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
@@ -44,12 +44,14 @@ DEPEND="${COMMON_DEPEND}
doc? ( dev-python/epydoc )
"
RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycups[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+ ')
gnome-keyring? ( app-crypt/libsecret[introspection] )
policykit? ( net-print/cups-pk-helper )
"
diff --git a/app-admin/usbview/usbview-2.0.ebuild b/app-admin/usbview/usbview-2.0.ebuild
index fbabff53c126..760fe40c131c 100644
--- a/app-admin/usbview/usbview-2.0.ebuild
+++ b/app-admin/usbview/usbview-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
RDEPEND="
dev-libs/glib:2
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 5e06542a9755..6e42184a79ba 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
index f9b2425875ad..c082402ee948 100644
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit user
DESCRIPTION="Download and install third-party clamav signatures"
-HOMEPAGE="https://github.com/extremeshok/${PN}"
+HOMEPAGE="https://github.com/extremeshok/clamav-unofficial-sigs"
SRC_URI="https://github.com/extremeshok/clamav-unofficial-sigs/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/app-antivirus/clamav/clamav-0.102.2.ebuild b/app-antivirus/clamav/clamav-0.102.2.ebuild
index ddb5ab7c097c..f9f8087f72c9 100644
--- a/app-antivirus/clamav/clamav-0.102.2.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.2.ebuild
@@ -11,7 +11,7 @@ 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"
+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 clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
RESTRICT="!test? ( test )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f41bfec28967..23144c227556 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/deb2targz/deb2targz-1-r2.ebuild b/app-arch/deb2targz/deb2targz-1-r2.ebuild
deleted file mode 100644
index f2c8a15145e1..000000000000
--- a/app-arch/deb2targz/deb2targz-1-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit base
-
-DESCRIPTION="Convert a .deb file to a .tar.gz archive"
-HOMEPAGE="http://www.miketaylor.org.uk/tech/deb/"
-SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-S=${WORKDIR}
-PATCHES=( "${FILESDIR}/${PN}-any-data.patch" )
-
-src_unpack() {
- cp "${DISTDIR}/${PN}" "${S}"
-}
-
-src_install() {
- dobin ${PN}
-}
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild
index 5cd710f63505..eedf274e20ed 100644
--- a/app-arch/tar/tar-1.32.ebuild
+++ b/app-arch/tar/tar-1.32.ebuild
@@ -38,9 +38,9 @@ src_prepare() {
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
- --bindir="${EPREFIX%/}"/bin
+ --bindir="${EPREFIX}"/bin
--enable-backup-scripts
- --libexecdir="${EPREFIX%/}"/usr/sbin
+ --libexecdir="${EPREFIX}"/usr/sbin
$(usex userland_GNU "" "--program-prefix=g")
$(use_with acl posix-acls)
$(use_enable nls)
diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild
index 3268759cabd2..b0f5ed79c0d8 100644
--- a/app-arch/unzip/unzip-6.0_p25.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
LICENSE="Info-ZIP"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a8f1807a1d0e..6299a160e273 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index b9fa952ae9f5..6a59782d2b1e 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,3 +1,2 @@
-DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
diff --git a/app-crypt/gcr/gcr-3.20.0.ebuild b/app-crypt/gcr/gcr-3.20.0.ebuild
deleted file mode 100644
index 822c8e5baacc..000000000000
--- a/app-crypt/gcr/gcr-3.20.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-
-IUSE="debug gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
- >=app-crypt/p11-kit-0.19
- >=dev-libs/glib-2.38:2
- >=dev-libs/libgcrypt-1.2.2:0=
- >=dev-libs/libtasn1-1:=
- >=sys-apps/dbus-1
- gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !=dev-util/gtk-doc-am-1.9
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-# dev-libs/gobject-introspection-common
-# dev-libs/vala-common
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Disable stupid flag changes
- sed -e 's/CFLAGS="$CFLAGS -g"//' \
- -e 's/CFLAGS="$CFLAGS -O0"//' \
- -i configure.ac configure || die
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_with gtk) \
- $(use_enable introspection) \
- $(use_enable vala) \
- $(usex debug --enable-debug=yes --enable-debug=default) \
- --disable-update-icon-cache \
- --disable-update-mime
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
index 3e79123b9407..ba5cad60e9fc 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit eutils flag-o-matic
DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
similarity index 83%
rename from app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
rename to app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
index 99fb80953a8b..6fb3d2e0e306 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
@@ -17,10 +17,12 @@ KEYWORDS="~amd64"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
DEPEND="${PYTHON_DEPS}
- >=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
- =app-crypt/yubikey-manager-1.0.0[${PYTHON_MULTI_USEDEP}]
+ =sys-libs/ncurses-5.9-r1:0=[unicode?]
+ sys-libs/ncurses:0=[static-libs(+)]
+ magic? ( sys-apps/file[static-libs(+)] )
+ nls? ( virtual/libintl )
+ !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+src_prepare() {
+ default
+ if [[ ${PV} == "9999" ]] ; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myconf=(
+ --bindir="${EPREFIX}"/bin
+ --htmldir=/trash
+ $(use_enable !minimal color)
+ $(use_enable !minimal multibuffer)
+ $(use_enable !minimal nanorc)
+ $(use_enable magic libmagic)
+ $(use_enable spell speller)
+ $(use_enable justify)
+ $(use_enable debug)
+ $(use_enable nls)
+ $(use_enable unicode utf8)
+ $(use_enable minimal tiny)
+ $(usex ncurses --without-slang $(use_with slang))
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ # don't use "${ED}" here or things break (#654534)
+ rm -r "${D}"/trash || die
+
+ dodoc doc/sample.nanorc
+ docinto html
+ dodoc doc/faq.html
+ insinto /etc
+ newins doc/sample.nanorc nanorc
+ if ! use minimal ; then
+ # Enable colorization by default.
+ sed -i \
+ -e '/^# include /s:# *::' \
+ "${ED}"/etc/nanorc || die
+ fi
+
+ use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
index dc52ca6e54cb..322ca70ae4fd 100644
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild
@@ -57,7 +57,7 @@ src_configure() {
use unicode && myconf="${myconf} --enable-widechar"
use tcl && myconf="${myconf} --enable-tclinterp"
- append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX%/}/usr/share/vi/catalog/\\\"\""
+ append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX}/usr/share/vi/catalog/\\\"\""
append-cppflags -I"$(db_includedir)"
# Darwin doesn't have stropts.h, bug #619416
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 80cf57e870f5..e870290ff3c8 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index b28f477fd51b..e9b62a1614ad 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -2,4 +2,5 @@ DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e
DIST buildah-1.11.6.tar.gz 10600477 BLAKE2B b70849ca0121e32cd66da3da282a443688c15a783a1be7d5d3650bf1122c865e9674d0790fb599f6da4c04072a19360aa224ccc76d516e8a8e71061c903dd0e1 SHA512 419d51d0b430dbc38862bad218cf0bb9a698472dd3932e69fa6bcfb2023b9cd10cf03916f2333892cdcc051ce799664619c62941965a59420d81ba4706e9d7be
DIST buildah-1.12.0.tar.gz 10717080 BLAKE2B 67107684d625ef23166d666dba50244861e6903f46315d8bae4d313d3585da154b7ee5f87ae8ab69ca717fdf68b914dee0cbcf2e1e95c34ebfccee4739db1d62 SHA512 ed7d77dfe88f613ef4f756455d889d707707ad16f8f6a9b514a8fbaabb56fef58db54ceb2344954a9311bcc6f1f000b21ac461f9b612b8534ae6a4594ad7a16d
DIST buildah-1.13.1.tar.gz 10928426 BLAKE2B 7f790e2e6499543f6ddae5582f03e4e8a2429783512bf53ffa48d010b1338c4e232117e8b175057205c75ee839981564358239d08d48dbdef8cae80bbacc6554 SHA512 89c02f3c485408f16d6334bb4621accbb7de5f8d3d4458eb4c925468da1f6c14a18132e8f643e965d3054f05a90ada3c4911e539541f9ca045ca606c9ce1bed9
+DIST buildah-1.14.0.tar.gz 10895764 BLAKE2B afc99c12737651997785ce96793afbff24e514a89e445ec5e176940940335b5966cf6e05e3d418d2aad2308d604e05879874eb5d5c07182dc0484e43411628e7 SHA512 c2fe27ccff81cc22dcb398f6d57f618015a1f534510888966483002d552c5f233b8899f639dac15d0f299c6c618e6f1d9889e65c745ce4709e7abd9498258a86
DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
diff --git a/app-emulation/buildah/buildah-1.14.0.ebuild b/app-emulation/buildah/buildah-1.14.0.ebuild
new file mode 100644
index 000000000000..eb7c61b39ef6
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.14.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="selinux"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="5965d9a"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+ app-emulation/skopeo
+ dev-libs/libgpg-error:=
+ dev-libs/libassuan:=
+ sys-fs/lvm2:=
+ sys-libs/libseccomp:=
+ selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+ [[ -f selinux_tag.sh ]] || die
+ use selinux || { echo -e "#!/bin/sh\ntrue" > \
+ selinux_tag.sh || die; }
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME
+ emake all
+}
+
+src_install() {
+ dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+ doman docs/*.1
+ dodoc -r docs/tutorials
+ dobin ${PN} imgtype
+ dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+ emake test-unit
+}
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index 15750dd80789..78d5be269b3e 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
index ba03accfe227..c96c8632eb57 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
index cf4b4f10d80d..7b3f30280c50 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
index c8154f99883d..f5a9ee2ded65 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
index bdb0de9d05d2..71dba5bd4ed3 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
index bdb0de9d05d2..71dba5bd4ed3 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
index 79500b6a3914..35a162c94cac 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
index 00827f7ddb60..d3cb1e980327 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
index a160f02ad3ea..5096405e6199 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
index 006df8e97168..96a7c42364fe 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
RDEPEND="${DEPEND}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
RDEPEND="${DEPEND}
${PYTHON_DEPS}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
RDEPEND="${DEPEND}
${PYTHON_DEPS}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
similarity index 96%
rename from app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
rename to app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
RDEPEND="${DEPEND}
${PYTHON_DEPS}
!prefix? ( sys-libs/glibc )
- >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/desktop-file-utils
!app-emulation/crossover-office-pro-bin
!app-emulation/crossover-office-bin
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
- "-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
"-DXNASONG=$(usex xnasong ON OFF)"
)
if use ffmpeg; then
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" )
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)" )
fi
cmake-utils_src_configure
}
diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-19.09.ebuild
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
- "-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
"-DXNASONG=$(usex xnasong ON OFF)"
)
if use ffmpeg; then
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" )
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)" )
fi
cmake-utils_src_configure
}
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
- "-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
"-DXNASONG=$(usex xnasong ON OFF)"
)
if use ffmpeg; then
- mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)" )
+ mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)" )
fi
cmake-utils_src_configure
}
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild
similarity index 87%
rename from app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild
rename to app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild
index 627ca1b130d8..834209e132d5 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild
@@ -18,10 +18,12 @@ IUSE="lha"
RDEPEND="
app-emulation/fs-uae
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
- dev-python/pyopengl[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,gui,network,opengl,widgets]
+ dev-python/pyopengl[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ lha? ( dev-python/python-lhafile[${PYTHON_MULTI_USEDEP}] )
+ ')
"
DEPEND="
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
similarity index 95%
rename from app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
rename to app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
index 6e00659d3fde..2f365cb6ab41 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -68,16 +68,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
DEPEND="
dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/fdsend[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+ dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+ dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+ dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+ dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+ ')
|| (
net-misc/iputils[arping]
net-analyzer/arping
@@ -157,7 +159,9 @@ RDEPEND="${DEPEND}
DEPEND+="
sys-devel/m4
app-text/pandoc
- dev-python/sphinx[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ ')
media-fonts/urw-fonts
media-gfx/graphviz
>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index bd24dd3fff74..94c05841d25e 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
DEPEND="
dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/fdsend[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+ dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+ dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+ dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+ dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+ ')
|| (
net-misc/iputils[arping]
net-analyzer/arping
@@ -140,7 +142,9 @@ RDEPEND="${DEPEND}
DEPEND+="
sys-devel/m4
app-text/pandoc
- dev-python/sphinx[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ ')
media-fonts/urw-fonts
media-gfx/graphviz
>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index d4baca0d24bf..061cb74ba0f5 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
DEPEND="
dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/fdsend[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+ dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+ dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+ dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+ dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+ ')
|| (
net-misc/iputils[arping]
net-analyzer/arping
@@ -140,7 +142,9 @@ RDEPEND="${DEPEND}
DEPEND+="
sys-devel/m4
app-text/pandoc
- <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ <=dev-python/sphinx-1.3.5[${PYTHON_MULTI_USEDEP}]
+ ')
media-fonts/urw-fonts
media-gfx/graphviz
>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index b0d474451558..504fd208dbf5 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,3 +1,4 @@
DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe
+DIST libpod-1.8.0.tar.gz 8992983 BLAKE2B a3b12dbfbdb0fe01ef8791de2c938cbf21c01ac0b36314d2a170c593d22eea08d912f8547861b239bb982db6acc9d2426adb97ffda4603739321cff0fb9ff1d8 SHA512 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87
diff --git a/app-emulation/libpod/libpod-1.8.0.ebuild b/app-emulation/libpod/libpod-1.8.0.ebuild
new file mode 100644
index 000000000000..502e3dde382a
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.8.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="2ced9094d4728dd09f60a177faa32339a8d0f721"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs +rootless selinux"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-crypt/gpgme:=
+ >=app-emulation/conmon-2.0.0
+ || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ sys-fs/lvm2
+ sys-libs/libseccomp:=
+
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( sys-fs/btrfs-progs )
+ rootless? ( app-emulation/slirp4netns )
+ selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+ default
+
+ # Disable installation of python modules here, since those are
+ # installed by separate ebuilds.
+ sed -e '/^GIT_.*/d' \
+ -e 's:GO111MODULE=off:GO111MODULE=on:' \
+ -e 's/$(GO) build/$(GO) build -v -work -x/' \
+ -e 's/^\(install:.*\) install\.python$/\1/' \
+ -i Makefile || die
+
+ sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+ -i hack/get_release_info.sh || die
+}
+
+src_compile() {
+ # Filter unsupported linker flags
+ filter-flags '-Wl,*'
+
+ [[ -f hack/apparmor_tag.sh ]] || die
+ if use apparmor; then
+ echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+ fi
+
+ [[ -f hack/btrfs_installed_tag.sh ]] || die
+ if use btrfs; then
+ echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+ else
+ echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ hack/btrfs_installed_tag.sh || die
+ fi
+
+ [[ -f hack/selinux_tag.sh ]] || die
+ if use selinux; then
+ echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+ fi
+
+ export -n GOCACHE GOPATH XDG_CACHE_HOME
+ GOBIN="${S}/bin" \
+ emake all \
+ GIT_BRANCH=master \
+ GIT_BRANCH_CLEAN=master \
+ COMMIT_NO="${EGIT_COMMIT}" \
+ GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+ insinto /etc/containers
+ newins test/registries.conf registries.conf.example
+ newins test/policy.json policy.json.example
+
+ insinto /usr/share/containers
+ doins seccomp.json
+
+ newinitd "${FILESDIR}"/podman.initd podman
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/podman.logrotated" podman
+
+ dobashcomp completions/bash/*
+
+ keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+ LIBPOD_ROOTLESS_UPGRADE=false
+ if use rootless; then
+ has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+ fi
+}
+
+pkg_postinst() {
+ local want_newline=false
+ if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+ elog "You need to create the following config files:"
+ elog "/etc/containers/registries.conf"
+ elog "/etc/containers/policy.json"
+ elog "To copy over default examples, use:"
+ elog "cp /etc/containers/registries.conf{.example,}"
+ elog "cp /etc/containers/policy.json{.example,}"
+ want_newline=true
+ fi
+ if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+ ${want_newline} && elog ""
+ elog "For rootless operation, you need to configure subuid/subgid"
+ elog "for user running podman. In case subuid/subgid has only been"
+ elog "configured for root, run:"
+ elog "usermod --add-subuids 1065536-1131071 "
+ elog "usermod --add-subgids 1065536-1131071 "
+ want_newline=true
+ fi
+}
diff --git a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
index d7c477f4bd80..fcb7847aa4e8 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -25,7 +25,9 @@ RDEPEND="${PYTHON_DEPS}
app-arch/unzip
app-crypt/gnupg
virtual/wine
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+ ')
net-misc/wget
x11-apps/mesa-progs
x11-terms/xterm
diff --git a/app-emulation/playonlinux/playonlinux-4.3.4.ebuild b/app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild
similarity index 95%
rename from app-emulation/playonlinux/playonlinux-4.3.4.ebuild
rename to app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild
index f2a319b7bbeb..a1e610f9b4f0 100644
--- a/app-emulation/playonlinux/playonlinux-4.3.4.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,7 +26,9 @@ RDEPEND="${PYTHON_DEPS}
app-arch/unzip
app-crypt/gnupg
app-misc/jq
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+ ')
media-gfx/icoutils
|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
net-misc/wget
diff --git a/app-emulation/protontricks/protontricks-1.3.1.ebuild b/app-emulation/protontricks/protontricks-1.3.1-r1.ebuild
similarity index 94%
rename from app-emulation/protontricks/protontricks-1.3.1.ebuild
rename to app-emulation/protontricks/protontricks-1.3.1-r1.ebuild
index 0b0e576d39a3..69b87925ea07 100644
--- a/app-emulation/protontricks/protontricks-1.3.1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.3.1-r1.ebuild
@@ -19,7 +19,9 @@ IUSE="+gui"
RDEPEND="${PYTHON_DEPS}
app-emulation/winetricks
- dev-python/vdf[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/vdf[${PYTHON_MULTI_USEDEP}]
+ ')
gui? ( gnome-extra/zenity
|| (
app-emulation/winetricks[gtk]
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 01fc9d0acf5f..fe0c84714123 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,3 +1,4 @@
DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3
+DIST skopeo-0.1.41.tar.gz 4692408 BLAKE2B d5e99be0cb478065f1478beda355abc11c8f13ad8446251048502da1b1af38d407ec46d284e59d2018af5d1ca6a953ad6156a306e9bc1acbdb22b447fe17a59f SHA512 924af178eb9621395cfffcf51aa072886dc8c20746bce1599a503df8c54794e34184a1fc6fd9582b889c7c8efecf8cf192797bc8e208b90c71cca31bb970d8e9
diff --git a/app-emulation/skopeo/skopeo-0.1.41.ebuild b/app-emulation/skopeo/skopeo-0.1.41.ebuild
new file mode 100644
index 000000000000..cc09b12134e3
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-0.1.41.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=7d080ca
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+ >=dev-libs/libassuan-2.4.3:=
+ dev-libs/libgpg-error:=
+ >=sys-fs/btrfs-progs-4.0.1
+ >=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+ local BUILDTAGS="containers_image_ostree_stub"
+ set -- env -u GOCACHE -u XDG_CACHE_HOME \
+ go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
+ -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+ -o skopeo ./cmd/skopeo
+ echo "$@"
+ "$@" || die
+ cd docs || die
+ for f in *.1.md; do
+ go-md2man -in ${f} -out ${f%%.md} || die
+ done
+}
+
+src_install() {
+ dobin skopeo
+ doman docs/*.1
+ dobashcomp completions/bash/skopeo
+ insinto /etc/containers
+ newins default-policy.json policy.json
+ insinto /etc/containers/registries.d
+ doins default.yaml
+ keepdir /var/lib/atomic/sigstore
+ einstalldocs
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index eb23f2c54d1e..667dd8b91a8a 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,3 +1,4 @@
DIST slirp4netns-0.3.3.tar.gz 162154 BLAKE2B b4a477ca94ee17e14ae0d255eb1f22713388d32cee1faff308e902a8134bc52e08cfa92537c19fbfc9869d936637c1196fee462d9699c1b5f97a0d0138dc4792 SHA512 9cccbfd30348d895c8c3f6a80ebe7991131c5a5f4907733ec65df5ce70b63427e5f666bf7c4dcb08e8dd50f1769aff0f6642c23c29eb6b9921a2d10f62d46f63
DIST slirp4netns-0.4.1.tar.gz 168785 BLAKE2B 90e2510121177771fb77d5e48baa8a1acb95f9778e72add244b2df10d92c9cc6ef284bfbeef699bd8e58724b50254a4eb6fa485a58c7c8e6cca8469cf722e1f2 SHA512 bb2a0946f4e360eb08efb46e097d21ab1bf05d199d1e3d381e065617eb9ba15434bccb5d1e76ac27664f23c8da79349383095b4d28d2a1a8ddc0fb9675aebf34
DIST slirp4netns-0.4.2.tar.gz 169120 BLAKE2B bbb809da871c885e910be771f3a6e90f7d18880d82ddeb0e569a1db33e38c80cbb1a7279341c0efcd514d88fa2874920ae89365f9fa97a38e3fb09f0eb8e5642 SHA512 87dd032afe6862fc8f7f5c3770a1d939832c29c2f55fa3579a4eac717979442e1b081aa886cc94c5638ec1339ccebe73ed1844af37a479fed2d5826bc761fc05
+DIST slirp4netns-0.4.3.tar.gz 169895 BLAKE2B a8919ced6d9d68823c79396bc8914d32d157c2da566735a495d68c995c5cfafafba7eb1f761cbe9f82c3291afeae4ac55d00de4c094d5f48e2268d540dfca9e6 SHA512 a3415529486f11cf12c799cabc889dca30fbf64d08818359a285ac67c15fc7926d61105291cd8f2652174747e641e159b5b805a8954fd82f7eb9e35058b23265
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild
new file mode 100644
index 000000000000..632654ce2a10
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/glib:2=
+ dev-libs/libpcre:=
+ sys-libs/libseccomp:=
+ sys-libs/libcap:="
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RESTRICT="test"
+
+src_prepare() {
+ eautoreconf
+ default
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "You need to have the tun kernel module loaded in order to have"
+ elog "slirp4netns working"
+ fi
+}
diff --git a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
index 0dedfe355424..05fb004334b4 100644
--- a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
${PYTHON_DEPS}
app-cdr/cdrtools
>=app-emulation/libvirt-glib-1.0.0[introspection]
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+ dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+ dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ ')
>=sys-libs/libosinfo-0.2.10[introspection]
gtk? (
gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
index b5b58cd52a7e..ef3ad18879d6 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
${PYTHON_DEPS}
app-cdr/cdrtools
>=app-emulation/libvirt-glib-1.0.0[introspection]
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+ dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+ dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ ')
>=sys-libs/libosinfo-0.2.10[introspection]
gtk? (
gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild
similarity index 88%
rename from app-emulation/virt-manager/virt-manager-2.2.1.ebuild
rename to app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild
index 9730435dcad8..963b5ecd8dab 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.1.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild
@@ -29,11 +29,13 @@ RDEPEND="!app-emulation/virtinst
${PYTHON_DEPS}
app-cdr/cdrtools
>=app-emulation/libvirt-glib-1.0.0[introspection]
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+ dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ ')
>=sys-libs/libosinfo-0.2.10[introspection]
gtk? (
gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index ca5fdb8b22af..91e2bbc0f7cc 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
${PYTHON_DEPS}
app-cdr/cdrtools
>=app-emulation/libvirt-glib-1.0.0[introspection]
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/libvirt-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+ dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+ dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ ')
>=sys-libs/libosinfo-0.2.10[introspection]
gtk? (
gnome-base/dconf
diff --git a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
similarity index 98%
rename from app-emulation/xen-tools/xen-tools-4.11.3.ebuild
rename to app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
index a089de2905e2..72913356f070 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -81,11 +81,13 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-4.11
- dev-python/lxml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
x86? ( sys-devel/dev86
sys-firmware/ipxe[qemu]
sys-power/iasl )
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
api? ( dev-libs/libxml2
net-misc/curl )
ovmf? (
@@ -103,7 +105,9 @@ DEPEND="${COMMON_DEPEND}
doc? (
app-text/ghostscript-gpl
app-text/pandoc
- dev-python/markdown[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
dev-texlive/texlive-latexextra
media-gfx/transfig
)
diff --git a/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
similarity index 98%
rename from app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
index 83c7552e06e4..86248c171f5c 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -87,11 +87,13 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-4.11
- dev-python/lxml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
x86? ( sys-devel/dev86
system-ipxe? ( sys-firmware/ipxe[qemu] )
sys-power/iasl )
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
api? ( dev-libs/libxml2
net-misc/curl )
ovmf? (
@@ -108,7 +110,9 @@ DEPEND="${COMMON_DEPEND}
doc? (
app-text/ghostscript-gpl
app-text/pandoc
- dev-python/markdown[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
dev-texlive/texlive-latexextra
media-gfx/transfig
)
diff --git a/app-emulation/xen-tools/xen-tools-4.13.0.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
index 0b4a116929ca..47d3fb3608e2 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -91,11 +91,13 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-4.11
- dev-python/lxml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
x86? ( sys-devel/dev86
system-ipxe? ( sys-firmware/ipxe[qemu] )
sys-power/iasl )
- pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
api? ( dev-libs/libxml2
net-misc/curl )
@@ -113,7 +115,9 @@ DEPEND="${COMMON_DEPEND}
doc? (
app-text/ghostscript-gpl
app-text/pandoc
- dev-python/markdown[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
dev-texlive/texlive-latexextra
media-gfx/transfig
)
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 9cd3a0d74210..d00d54eeeabd 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild b/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
index 2e286d365ddf..0f880f9e30fe 100644
--- a/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
+++ b/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages the /usr/bin/audicle symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/audicle.eselect-${PV}.bz2"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
index 8c586b943228..7df2d673c595 100644
--- a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index e2a6d3014878..421bab2d63fb 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="BLAS module for eselect"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI=""
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
index b8f325f48965..0d2658047d3a 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="BLAS/CBLAS module for eselect"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI=""
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
index bdd29ed59d74..8eb63e4cd28d 100644
--- a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
+++ b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages the /usr/bin/chuck symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/chuck.eselect-${PVR}.bz2"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
index ef176b52b9d4..7a1575a04a1f 100644
--- a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
+++ b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Utility to select the default Electron slot"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://github.com/elprans/${PN}/archive/v${PV}.tar.gz -> eselect-electron-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index e86840a37b94..829afa99c50e 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
index ab57eba3daec..fddc8895b926 100644
--- a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
+++ b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages system defaults for GNOME Shell extensions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.tar.xz"
LICENSE="GPL-2+"
diff --git a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
index 3fb1a7a4cd88..0bfeacea131d 100644
--- a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
+++ b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="LAPACK module for eselect"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI=""
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-lua/eselect-lua-1.ebuild b/app-eselect/eselect-lua/eselect-lua-1.ebuild
index afd48782bd6f..fceb0c5efacd 100644
--- a/app-eselect/eselect-lua/eselect-lua-1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
DESCRIPTION="Lua eselect module"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
index d97143730b2f..f4c055924a37 100644
--- a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
+++ b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages the /usr/bin/miniAudicle symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/miniaudicle.eselect-${PV}.bz2"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
index 22f01dfeeacd..76b287ec4c68 100644
--- a/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
+++ b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
index 30461bcff9eb..4e7eb9947256 100644
--- a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
+++ b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit multilib
DESCRIPTION="Utility to change the OpenCL implementation being used"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
# Source:
# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
index a099d83226c4..9735228babca 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Utility to select the default PostgreSQL slot"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
index 93aea5463b32..221dda31124a 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages multiple Ruby versions"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
index a0f2a1ed1ee2..e3a2aca8f500 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages multiple Ruby versions"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
index 28a48e34aca6..7a9e85ae5573 100644
--- a/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
+++ b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
DESCRIPTION="Manages multiple Scala versions"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~gienah/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
index 7e8d5ff92fe3..0eaf9eca8588 100644
--- a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
+++ b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages the /usr/bin/sndpeek symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/sndpeek.eselect-${PVR}.bz2"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
index 5367c3d5ba48..5c3cc37253a8 100644
--- a/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
+++ b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages timezone selection"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
index 9a6f8043a50e..7008ad0b47f7 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Manages configuration of TiMidity++ patchsets"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
index d511fcd6b8f7..dbc480f8b908 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
index 12ceb7e34b39..afcfaaaf779a 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
@@ -4,7 +4,7 @@
EAPI=5
DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
index b9ffbc92c0d4..2036ec1a6c56 100644
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
@@ -30,7 +30,7 @@ pkg_postinst() {
# In /usr/include this breaks gcc build.
# https://bugs.gentoo.org/434180
if [[ $(readlink "${EROOT%/}"/usr/include/wine) == //* ]]; then
- ewarn "Leading double slash in ${EPREFIX%/}/usr/include/wine symlink detected."
+ ewarn "Leading double slash in ${EPREFIX}/usr/include/wine symlink detected."
ewarn "Re-setting wine symlinks..."
eselect wine update --if-unset
fi
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
index f873279cdf0f..ace62783c649 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -8,7 +8,7 @@ inherit multilib
WXWRAP_VER=1.4
DESCRIPTION="Eselect module and wrappers for wxWidgets"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~junghans/dist/${P}.tar.xz
https://dev.gentoo.org/~mgorny/dist/${PN}-files.tar.bz2"
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
index a9e9289104fd..517a5845d4c1 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
@@ -8,7 +8,7 @@ inherit multilib
WXWRAP_VER=1.4
DESCRIPTION="Eselect module and wrappers for wxWidgets"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
https://dev.gentoo.org/~mgorny/dist/${PN}-files.tar.bz2"
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
index 81b05a1fe1da..ac778c24c544 100644
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
DESCRIPTION="Manages XvMC implementations"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI=""
LICENSE="GPL-2"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2ff02b696439..67010687289c 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
similarity index 89%
rename from app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
rename to app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
index 10be5957f6b7..5f0ac86c6339 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
@@ -18,8 +18,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
app-i18n/anthy
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
dev-util/intltool
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
similarity index 89%
rename from app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
rename to app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
index ba81764f9f0d..dbb7bfe3885e 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
@@ -18,8 +18,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
app-i18n/anthy
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
dev-util/intltool
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
similarity index 86%
rename from app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
rename to app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
index 5fae9262586e..a916c7db5b8c 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
@@ -17,8 +17,10 @@ IUSE="nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
>=app-i18n/libhangul-0.1
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
similarity index 91%
rename from app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
rename to app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
index a686aaa32ec4..d66e92b25ef9 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
@@ -23,9 +23,11 @@ IUSE="boost lua opencc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
>=app-i18n/libpinyin-2.1.0:=
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
boost? ( dev-libs/boost:= )
lua? ( dev-lang/lua:0 )
opencc? ( app-i18n/opencc:= )"
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
similarity index 89%
rename from app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
rename to app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
index 510770469de5..f60c0c9f7904 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
@@ -22,12 +22,14 @@ BDEPEND="dev-db/sqlite:3
virtual/pkgconfig"
DEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
>=app-i18n/libpinyin-2.1.0:=
dev-db/sqlite:3
dev-libs/glib:2
- dev-python/pygobject:3[${PYTHON_USEDEP}]
virtual/libintl
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
boost? ( dev-libs/boost:= )
lua? ( dev-lang/lua:0 )
opencc? ( app-i18n/opencc:= )"
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
similarity index 86%
rename from app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
rename to app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
index 2f8dba36e3c9..717341659675 100644
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -17,10 +17,12 @@ IUSE="boost lua nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
app-i18n/pyzy
dev-db/sqlite:3
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
boost? ( dev-libs/boost )
lua? ( =dev-lang/lua-5.1*:= )
nls? ( virtual/libintl )"
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
similarity index 91%
rename from app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
rename to app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
index 70ddc8a973c7..6037fa22fe86 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -20,7 +20,9 @@ IUSE="+nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ ')
~app-i18n/sunpinyin-${PV}:=
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild b/app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild
similarity index 84%
rename from app-i18n/ibus-table/ibus-table-1.9.18.ebuild
rename to app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild
index 025526aa8b12..dcd828dcbbea 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild
@@ -18,8 +18,10 @@ IUSE="nls"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
virtual/libiconv
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild b/app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
similarity index 84%
rename from app-i18n/ibus-table/ibus-table-1.9.21.ebuild
rename to app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
index 7da7fff419c8..9db9ac7acf04 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
@@ -19,8 +19,10 @@ RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
virtual/libiconv
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index e688dbe05e53..784179cf17b6 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-typing-booster-2.6.0.tar.gz 6863400 BLAKE2B e399ebaa19a2949882de41cb3b11dfc161a0ddb300e23daf216857dea9bb4b3d31db6dcd02846214b8ac677df92672a342c7c9e992ab791f97bdf8abc514ba4a SHA512 7e916eaba5d3f14bde383acedd5ce9cd74e72328f25a84936055ee9183b4aeff79d5297fffdd27713491f23a949377cafc39bc52efa0f7d5995672176cb808c8
DIST ibus-typing-booster-2.7.0.tar.gz 7364094 BLAKE2B 60a45121b398032b2581d1f3e5929e74e69ee22bf0807b069529afb30797daacece47e83b0696397e6b9c3f6adc28012c7f2b7102387e03eb360383946e836b2 SHA512 a11d2cad660dc813022eda89bb690e3fe7cd517ad6a3cbc7f31879afb60c5d1628f25beb423f922b26d7dd92c685471c767084cdd3a35aff1e2314a21cd757c1
+DIST ibus-typing-booster-2.8.0.tar.gz 8018809 BLAKE2B 9306b980623094a8b72d6824292d8d52a90df69b7f1f7df11c0df63c5d2c4f2aa1ca4e2765320096915b30cc807fbe24f64a219c3beb1bec4a1d81be4511779a SHA512 64c112275ec63ac3d3c13202256be8bfded152da7b08dde7e6eb01dd38fd48535d63daaa6c2fcc09e64dcd4927931380ccd0a0be739f04330fb15dc0d4fe1823
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
similarity index 70%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
index 55d27fd99d77..99d431fc2d5c 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
@@ -19,12 +19,14 @@ RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
CDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
dev-libs/m17n-lib
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+ ')"
RDEPEND="${CDEPEND}
>=dev-db/m17n-db-1.7"
DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
similarity index 67%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
index 55d27fd99d77..0091f717eeca 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7} )
PYTHON_REQ_USE="sqlite(+)"
inherit python-single-r1
@@ -19,12 +19,14 @@ RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
CDEPEND="${PYTHON_DEPS}
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
dev-libs/m17n-lib
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+ ')"
RDEPEND="${CDEPEND}
>=dev-db/m17n-db-1.7"
DEPEND="${RDEPEND}
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
index be31caf2f266..5fd39a7e384b 100644
--- a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
}
src_configure() {
- econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+ econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
}
src_install() {
diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild
index 296851718916..d55a5638bcfa 100644
--- a/app-i18n/imhangul/imhangul-2.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
}
src_configure() {
- econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+ econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
}
src_install() {
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
index 667c30d3e7f9..6be5482fcaf5 100644
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
}
src_configure() {
- econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
+ econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
}
src_install() {
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 02e7cbbde3bf..63d6cf51df70 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC"
LICENSE="Apache-2.0"
SLOT="0/2"
-KEYWORDS="amd64 arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/app-i18n/pology/pology-0.12-r1.ebuild b/app-i18n/pology/pology-0.12-r2.ebuild
similarity index 95%
rename from app-i18n/pology/pology-0.12-r1.ebuild
rename to app-i18n/pology/pology-0.12-r2.ebuild
index da1015d3f26b..fcb45eb16276 100644
--- a/app-i18n/pology/pology-0.12-r1.ebuild
+++ b/app-i18n/pology/pology-0.12-r2.ebuild
@@ -27,7 +27,9 @@ BDEPEND="
RDEPEND="${PYTHON_DEPS}
dev-libs/libxml2
dev-libs/libxslt
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
sys-devel/gettext
"
DEPEND="${RDEPEND}"
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
index 1670d22e95ef..1347ffb8ba86 100644
--- a/app-i18n/pology/pology-9999.ebuild
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -27,7 +27,9 @@ BDEPEND="
RDEPEND="${PYTHON_DEPS}
dev-libs/libxml2
dev-libs/libxslt
- dev-python/dbus-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
sys-devel/gettext
"
DEPEND="${RDEPEND}"
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
index b7d8a6de5ec8..1365db6b815e 100644
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ b/app-i18n/scim/scim-1.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
IUSE="doc gtk3"
RDEPEND="x11-libs/libX11
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index 027cccdb7177..0cc809f40762 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
IUSE="doc gtk3"
RDEPEND="x11-libs/libX11
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 4e9af7381e74..7373613c283e 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,3 +1,2 @@
-DIST skk-jisyo-201605.tar.xz 6288104 BLAKE2B d68332a4fa0804b596fc42f3dc8231a6eebe8bddacc6e0babec6cc5992ddaadb46e8fa9af742daa30545a585428afe79eab28329ce1d37e0192b08b20d7c584e SHA512 1093d363fe571c3e3e05fa54046fc4b88cbed2fbd104838576c83694556585401c3affa0afb2ed078c6f1b06f62a7b14145b1305f6fef089f160b4073900c7a1
DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
deleted file mode 100644
index 098f596c803f..000000000000
--- a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PN=${PN^^}
-
-DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2 freedist public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="cdb"
-
-DEPEND="virtual/awk
- cdb? (
- || (
- dev-db/tinycdb
- dev-db/cdb
- )
- )"
-RDEPEND=""
-
-DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
-
-src_prepare() {
- rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
-
- default
-}
-
-cdb_make() {
- cdbmake "${1}" "${1}.tmp"
-}
-
-tinycdb_make() {
- cdb -c "${1}"
-}
-
-src_compile() {
- if use cdb; then
- local cdbmake=cdb_make f
- if has_version dev-db/tinycdb; then
- cdbmake=tinycdb_make
- fi
- for f in {,zipcode/}${MY_PN}.*; do
- LC_ALL=C awk '
- /^[^;]/ {
- s = substr($0, index($0, " ") + 1)
- print "+" length($1) "," length(s) ":" $1 "->" s
- }
- END {
- print ""
- }
- ' ${f} | ${cdbmake} ${f}.cdb || die
- done
- fi
-}
-
-src_install() {
- insinto /usr/share/skk
- doins {,zipcode/}${MY_PN}.*
-}
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
similarity index 77%
rename from app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
rename to app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
index 52bdcab8445f..f5a0c638be4f 100644
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -16,12 +16,14 @@ KEYWORDS="amd64 x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_USEDEP}]
+RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_SINGLE_USEDEP}]
x11-libs/gtk+:2
python? (
${PYTHON_DEPS}
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+ ')
)"
DEPEND="${RDEPEND}
dev-util/gtk-doc-am
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
similarity index 92%
rename from app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
rename to app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
index 89645ad03b59..059d1e78dd7d 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -34,8 +34,10 @@ RDEPEND="dev-libs/glib:2
mysql? ( dev-db/mysql-connector-c:= )
python? (
${PYTHON_DEPS}
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+ ')
)
ruby? (
${RUBY_DEPS}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 8e502ad3f697..587a6dd0f13c 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
index 9eb97d143ccf..a6736225131f 100644
--- a/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
+++ b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="OpenGL visualization for HDAPS data"
-HOMEPAGE="https://github.com/linux-thinkpad/${PN}"
+HOMEPAGE="https://github.com/linux-thinkpad/hdaps-gl"
SRC_URI="https://github.com/linux-thinkpad/hdaps-gl/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
diff --git a/app-laptop/hdapsd/hdapsd-20141203.ebuild b/app-laptop/hdapsd/hdapsd-20141203.ebuild
index df52add2e9f8..a3bd8b6ccd89 100644
--- a/app-laptop/hdapsd/hdapsd-20141203.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20141203.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit linux-info readme.gentoo systemd
DESCRIPTION="IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon"
-HOMEPAGE="https://github.com/evgeni/${PN}/"
+HOMEPAGE="https://github.com/evgeni/hdapsd/"
SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8d50a8ef3910..1eea5ccc87d2 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild
index 7a709e1e39e3..7e5c0bc5b290 100644
--- a/app-misc/anki/anki-2.1.0_beta25.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,17 +23,19 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}]
- >=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/send2trash[${PYTHON_USEDEP}]
- recording? (
- media-sound/lame
- >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
- )
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[gui,svg,webkit,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+ recording? (
+ media-sound/lame
+ >=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
sound? ( media-video/mplayer )
latex? (
app-text/texlive
@@ -41,7 +43,11 @@ RDEPEND="${PYTHON_DEPS}
)
"
DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
PATCHES=( "${FILESDIR}"/${P}-web-folder.patch )
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
index 341c641fe86e..9b0a46164d62 100644
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,23 +23,25 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- || (
- (
- >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ || (
+ (
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+ )
+ =dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/send2trash[${PYTHON_USEDEP}]
- recording? (
- media-sound/lame
- >=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
- )
+ >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+ recording? (
+ media-sound/lame
+ >=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
sound? ( media-video/mplayer )
latex? (
app-text/texlive
@@ -47,7 +49,11 @@ RDEPEND="${PYTHON_DEPS}
)
"
DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
diff --git a/app-misc/anki/anki-2.1.13.ebuild b/app-misc/anki/anki-2.1.13-r1.ebuild
similarity index 71%
rename from app-misc/anki/anki-2.1.13.ebuild
rename to app-misc/anki/anki-2.1.13-r1.ebuild
index 15c2f2cdf075..9c1a33eea458 100644
--- a/app-misc/anki/anki-2.1.13.ebuild
+++ b/app-misc/anki/anki-2.1.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,19 +22,21 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- || (
- (
- >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
- dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ || (
+ (
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+ )
+ =dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/send2trash[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+ ')
recording? ( media-sound/lame )
sound? ( media-video/mpv )
latex? (
@@ -43,7 +45,11 @@ RDEPEND="${PYTHON_DEPS}
)
"
DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
diff --git a/app-misc/byobu/byobu-5.123.ebuild b/app-misc/byobu/byobu-5.123-r1.ebuild
similarity index 89%
rename from app-misc/byobu/byobu-5.123.ebuild
rename to app-misc/byobu/byobu-5.123-r1.ebuild
index 33c36ce0cdc5..058f7590d893 100644
--- a/app-misc/byobu/byobu-5.123.ebuild
+++ b/app-misc/byobu/byobu-5.123-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,9 @@ IUSE="screen"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/newt[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+ ')
screen? ( app-misc/screen )
!screen? ( app-misc/tmux )"
diff --git a/app-misc/byobu/byobu-5.124.ebuild b/app-misc/byobu/byobu-5.124.ebuild
index f67cbf99d559..b8e2216b67cf 100644
--- a/app-misc/byobu/byobu-5.124.ebuild
+++ b/app-misc/byobu/byobu-5.124.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,9 @@ IUSE="screen"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/newt[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+ ')
screen? ( app-misc/screen )
!screen? ( app-misc/tmux )"
diff --git a/app-misc/byobu/byobu-5.125.ebuild b/app-misc/byobu/byobu-5.125.ebuild
index d3b11ec6f89f..b8e2216b67cf 100644
--- a/app-misc/byobu/byobu-5.125.ebuild
+++ b/app-misc/byobu/byobu-5.125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,9 @@ IUSE="screen"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/newt[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+ ')
screen? ( app-misc/screen )
!screen? ( app-misc/tmux )"
diff --git a/app-misc/byobu/byobu-5.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
index ccb44bcb8188..2719fbfec1c4 100644
--- a/app-misc/byobu/byobu-5.129.ebuild
+++ b/app-misc/byobu/byobu-5.129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,9 @@ IUSE="screen"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/newt[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+ ')
screen? ( app-misc/screen )
!screen? ( app-misc/tmux )"
diff --git a/app-misc/byobu/byobu-5.130.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
similarity index 92%
rename from app-misc/byobu/byobu-5.130.ebuild
rename to app-misc/byobu/byobu-5.130-r1.ebuild
index 9a6ddebbb407..59b72cc7ec64 100644
--- a/app-misc/byobu/byobu-5.130.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -17,7 +17,9 @@ IUSE="screen"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/newt[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+ ')
screen? ( app-misc/screen )
!screen? ( app-misc/tmux )"
diff --git a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
index 8ab769b33c37..06cbb0e81cb7 100644
--- a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
+++ b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- media-libs/portaudio-18
media-libs/alsa-lib
)
- dev-python/pyyaml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+ ')
ftdi? ( dev-embedded/libftdi:0 )
systemd? ( sys-apps/systemd )
usb? ( virtual/libusb:0 )
@@ -52,7 +54,9 @@ COMMON_DEPEND="
DEPEND="
${COMMON_DEPEND}
dev-libs/libxslt
- dev-python/setuptools[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')
doc? ( app-doc/doxygen )
sys-apps/kmod
sys-kernel/linux-headers
@@ -62,7 +66,9 @@ RDEPEND="
${COMMON_DEPEND}
gtk? (
x11-libs/vte[introspection]
- dev-python/pygobject[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+ ')
)
inputlirc? ( app-misc/inputlircd )
"
diff --git a/app-misc/lirc/lirc-0.10.1-r2.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
similarity index 94%
rename from app-misc/lirc/lirc-0.10.1-r2.ebuild
rename to app-misc/lirc/lirc-0.10.1-r4.ebuild
index 8454fbe9244e..52fbdf73aa50 100644
--- a/app-misc/lirc/lirc-0.10.1-r2.ebuild
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -38,7 +38,9 @@ COMMON_DEPEND="
>media-libs/portaudio-18
media-libs/alsa-lib
)
- dev-python/pyyaml[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+ ')
ftdi? ( dev-embedded/libftdi:0 )
systemd? ( sys-apps/systemd )
usb? ( virtual/libusb:0 )
@@ -52,7 +54,9 @@ COMMON_DEPEND="
DEPEND="
${COMMON_DEPEND}
dev-libs/libxslt
- dev-python/setuptools[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')
doc? ( app-doc/doxygen )
sys-apps/kmod
sys-kernel/linux-headers
@@ -62,7 +66,9 @@ RDEPEND="
${COMMON_DEPEND}
gtk? (
x11-libs/vte[introspection]
- dev-python/pygobject[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+ ')
)
inputlirc? ( app-misc/inputlircd )
"
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index ae37d7aea7ad..ff58dab0f42e 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -38,7 +38,9 @@ COMMON_DEPEND="
>media-libs/portaudio-18
media-libs/alsa-lib
)
- =dev-qt/qtconcurrent-${QTMIN}:5
- www-client/weboob[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ www-client/weboob[${PYTHON_MULTI_USEDEP}]
+ ')
)
"
DEPEND="${COMMON_DEPEND}
diff --git a/app-office/kmymoney/kmymoney-5.0.8.ebuild b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
similarity index 97%
rename from app-office/kmymoney/kmymoney-5.0.8.ebuild
rename to app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
index 62e386a04571..b1446f406c74 100644
--- a/app-office/kmymoney/kmymoney-5.0.8.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://kmymoney.org"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
LICENSE="GPL-2"
@@ -83,7 +83,9 @@ COMMON_DEPEND="
weboob? (
${PYTHON_DEPS}
>=dev-qt/qtconcurrent-${QTMIN}:5
- www-client/weboob[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ www-client/weboob[${PYTHON_MULTI_USEDEP}]
+ ')
)
"
DEPEND="${COMMON_DEPEND}
diff --git a/app-office/ledger/ledger-3.1.2.ebuild b/app-office/ledger/ledger-3.1.2-r1.ebuild
similarity index 95%
rename from app-office/ledger/ledger-3.1.2.ebuild
rename to app-office/ledger/ledger-3.1.2-r1.ebuild
index 38cba372bc38..df1fb4549849 100644
--- a/app-office/ledger/ledger-3.1.2.ebuild
+++ b/app-office/ledger/ledger-3.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,9 @@ RDEPEND="
dev-libs/gmp:0=
dev-libs/mpfr:0=
python? (
- dev-libs/boost:=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+ ')
dev-python/cheetah
${PYTHON_DEPS}
)
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-6.3.4.2.ebuild
rename to app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
index d4ce61a869a0..13de879df386 100644
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ accessibility? (
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index bc4dff890b8f..d552a76a932d 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ accessibility? (
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3c04bc1de8e6..f38debf301b9 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ accessibility? (
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
diff --git a/app-office/moneyguru/moneyguru-2.13.1-r1.ebuild b/app-office/moneyguru/moneyguru-2.13.1-r2.ebuild
similarity index 83%
rename from app-office/moneyguru/moneyguru-2.13.1-r1.ebuild
rename to app-office/moneyguru/moneyguru-2.13.1-r2.ebuild
index 5e3aaab58e12..31987d2240e4 100644
--- a/app-office/moneyguru/moneyguru-2.13.1-r1.ebuild
+++ b/app-office/moneyguru/moneyguru-2.13.1-r2.ebuild
@@ -21,11 +21,15 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
RDEPEND="${PYTHON_DEPS}
dev-db/sqlite:3
dev-libs/glib:2
- dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,printsupport]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,widgets,printsupport]
+ ')
dev-qt/qttranslations"
DEPEND="${RDEPEND}
test? (
- =app-text/recode-3.6-r1
app-text/rarian
dev-libs/glib:2
- dev-python/gconf-python:2[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.24.0:2[${PYTHON_USEDEP}]
- >=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/gconf-python:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygtk-2.24.0:2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-bibtex-1.2.5[${PYTHON_MULTI_USEDEP}]
+ ')
"
DEPEND="${RDEPEND}
app-text/yelp-tools
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index fa0caa4e2469..ca708fa897bc 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -60,7 +60,11 @@ DEPEND="${PYTHON_DEPS}
graphicsmagick? ( media-gfx/graphicsmagick:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+ scripts? (
+ $(python_gen_cond_dep '
+ dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${DEPEND}
app-text/ghostscript-gpl
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 2fc0d1910082..97d62f8d370d 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -62,7 +62,11 @@ DEPEND="${PYTHON_DEPS}
graphicsmagick? ( media-gfx/graphicsmagick:= )
osg? ( dev-games/openscenegraph:= )
pdf? ( app-text/podofo:0= )
- scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+ scripts? (
+ $(python_gen_cond_dep '
+ dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${DEPEND}
app-text/ghostscript-gpl
diff --git a/app-office/skrooge/skrooge-2.21.1.ebuild b/app-office/skrooge/skrooge-2.21.1.ebuild
index 913f2d0c35a5..e78009944068 100644
--- a/app-office/skrooge/skrooge-2.21.1.ebuild
+++ b/app-office/skrooge/skrooge-2.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://skrooge.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
LICENSE="GPL-2"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2827d147e267..3a7eecc83574 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
similarity index 83%
rename from app-portage/elogviewer/elogviewer-2.9.ebuild
rename to app-portage/elogviewer/elogviewer-2.9-r1.ebuild
index 33df6b190e26..8d932e8dbeed 100644
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
@@ -20,12 +20,17 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- >=sys-apps/portage-2.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ >=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+ ')
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
"
DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')
+"
DOC_CONTENTS="In order to use this software, you need to activate
Portage's elog features. Required is
diff --git a/app-portage/elogviewer/elogviewer-3.0.ebuild b/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
similarity index 83%
rename from app-portage/elogviewer/elogviewer-3.0.ebuild
rename to app-portage/elogviewer/elogviewer-3.0-r1.ebuild
index 40533d03c311..aca7afc730bb 100644
--- a/app-portage/elogviewer/elogviewer-3.0.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
@@ -20,12 +20,17 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- >=sys-apps/portage-2.1[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ >=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+ ')
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
"
DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')
+"
DOC_CONTENTS="In order to use this software, you need to activate
Portage's elog features. Required is
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index e3277fd1030d..dc6afb3eda28 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions"
DEPEND="app-arch/xz-utils"
src_compile() {
- emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+ emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
}
src_install() {
- emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+ emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
}
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 83c31abb0a3b..69f1f1e61fb5 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions"
DEPEND="app-arch/xz-utils"
src_compile() {
- emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+ emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
}
src_install() {
- emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+ emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
}
diff --git a/app-portage/portpeek/portpeek-2.1.27-r1.ebuild b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
new file mode 100644
index 000000000000..a1b5331b43d8
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ >=app-portage/gentoolkit-0.4.7
+ || (
+ >=sys-apps/portage-2.3.85[${PYTHON_USEDEP}]
+ )"
+
+src_install() {
+ python_foreach_impl python_doscript ${PN}
+ doman *.[0-9]
+}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
similarity index 88%
rename from app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
rename to app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
index f8585615353b..fd0b8bdca31e 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
@@ -17,7 +17,9 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- sys-apps/portage[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+ ')"
src_test() {
# tests are docker-based
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
index fbbc79d8b0ff..9820f661ba52 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
@@ -18,7 +18,9 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- sys-apps/portage[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+ ')"
src_install() {
python_doscript unsymlink-lib
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 22072ea222d5..83268eeaaf7e 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 74d012490034..ba78d14db0bd 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -319,3 +319,8 @@ DIST bash50-008 2622 BLAKE2B 9919e24840f32a44a9040fd8fa9fb482da1859223e70e75d21d
DIST bash50-009 1095 BLAKE2B 4a9b2035173dd23f9c8ac5474e573080112d9edcf918816b5dd41e880f212f66c2c80dd41793ec62449c487fec1ad2c57b353a00c0976a782098fa6be76d0f23 SHA512 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
DIST bash50-010 6407 BLAKE2B 94792141dedbb8d2c9f9355c94eec56b1fa84459291c61ac31e9ee9a67e80edb95234b67ab59c5f3f039d596275c9b154544439bc730256beaf303e6cbf99c4c SHA512 8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2
DIST bash50-011 1870 BLAKE2B 7307aa709810ea3e9fbc0db6a558cb6a660736677edf56904721599be5c0a6e69b74cc01fb3988f1b06e7f8bcce512a3b5d773b7ebb3a7397a0e4815e84f48ce SHA512 05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e
+DIST bash50-012 1571 BLAKE2B 3a107454439fa84b1416d0b17b81fd86cfd4cc046bb4c4ca820e09b4595f4bc95dd188f2957b2f2c83937a776eee3db19a7c070403014bfeb5d5778b26705aa1 SHA512 24d67358eec07cc4cd0457ec0c296567558f20bf713b917fc8a8e5095a83f1c5db880bb863d483ca0c9e003972ac5f56596a2eb10c26c82bf6326d0475784e7e
+DIST bash50-013 2328 BLAKE2B 8797fe0b8e01027222af9798ee8d57d161bfbedb617b257e91402ef60e7010dd32fc68e2477487813746842800387c5ea0cdd853e039cf7065a2786fd6d6a182 SHA512 38fff9856c2259fbba607aacee027dd61e8733c6e5f476b7491bc43755fb5a63e82372f9f18663ec81e7480f0738b296271c948e1932e851f68f53cf3a1935b5
+DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa56fd44916ead691e4d698de3ba118ff0f8fc8eadade7a980551134eb0daf18b0767ff9601a4b4 SHA512 e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
+DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
+DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
diff --git a/app-shells/bash/bash-5.0_p9.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
similarity index 98%
rename from app-shells/bash/bash-5.0_p9.ebuild
rename to app-shells/bash/bash-5.0_p16.ebuild
index e112f72e3aa0..dadb54e7e863 100644
--- a/app-shells/bash/bash-5.0_p9.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -67,7 +67,6 @@ PATCHES=(
# Patches from Chet sent to bashbug ml
"${FILESDIR}"/${PN}-5.0-history-append.patch
"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
- "${FILESDIR}"/${PN}-5.0-assignment-preceding-builtin.patch
)
pkg_setup() {
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
index 7dd04476f8d2..049875ede2c9 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit bash-completion-r1
DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 7e03f0ec3362..eb66ceedc060 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit bash-completion-r1
DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/app-shells/ksh/files/CVE-2019-14868.patch b/app-shells/ksh/files/CVE-2019-14868.patch
new file mode 100644
index 000000000000..d5c80566bafc
--- /dev/null
+++ b/app-shells/ksh/files/CVE-2019-14868.patch
@@ -0,0 +1,89 @@
+From c7de8b641266bac7c77942239ac659edfee9ecd2 Mon Sep 17 00:00:00 2001
+From: Kurtis Rader
+Date: Thu, 12 Dec 2019 18:46:50 -0800
+Subject: [PATCH] Harden env var imports
+
+---
+ src/cmd/ksh93/sh/arith.c | 37 ++++++++++++++++++++++-----------
+ src/cmd/ksh93/tests/subshell.sh | 23 ++++++++++++++++++++
+
+diff --git a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c
+index 30b3067590a2..8e68cbdc868a 100644
+--- a/src/cmd/ksh93/sh/arith.c
++++ b/src/cmd/ksh93/sh/arith.c
+@@ -567,19 +567,32 @@ Sfdouble_t sh_strnum(Shell_t *shp, const char *str, char **ptr, int mode) {
+ char *last;
+
+ if (*str == 0) {
+- if (ptr) *ptr = (char *)str;
+- return 0;
+- }
+- errno = 0;
+- d = number(str, &last, shp->inarith ? 0 : 10, NULL);
+- if (*last) {
+- if (*last != '.' || last[1] != '.') {
+- d = strval(shp, str, &last, arith, mode);
+- Varsubscript = true;
++ d = 0.0;
++ last = (char *)str;
++ } else {
++ d = number(str, &last, shp->inarith ? 0 : 10, NULL);
++ if (*last && !shp->inarith && sh_isstate(shp, SH_INIT)) {
++ // This call is to handle "base#value" literals if we're importing untrusted env vars.
++ d = number(str, &last, 0, NULL);
++ }
++ if (*last) {
++ if (sh_isstate(shp, SH_INIT)) {
++ // Initializing means importing untrusted env vars. Since the string does not appear
++ // to be a recognized numeric literal give up. We can't safely call strval() since
++ // that allows arbitrary expressions which would create a security vulnerability.
++ d = 0.0;
++ } else {
++ if (*last != '.' || last[1] != '.') {
++ d = strval(shp, str, &last, arith, mode);
++ Varsubscript = true;
++ }
++ if (!ptr && *last && mode > 0) {
++ errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str);
++ }
++ }
++ } else if (d == 0.0 && *str == '-') {
++ d = -0.0;
+ }
+- if (!ptr && *last && mode > 0) errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str);
+- } else if (!d && *str == '-') {
+- d = -0.0;
+ }
+ if (ptr) *ptr = last;
+ return d;
+diff --git a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh
+index b63a8051ed5c..3faba475d6de 100644
+--- a/src/cmd/ksh93/tests/subshell.sh
++++ b/src/cmd/ksh93/tests/subshell.sh
+@@ -856,3 +856,26 @@ for exp in 65535 65536
+ do got=$($SHELL -c 'x=$(printf "%.*c" '$exp' x); print ${#x}' 2>&1)
+ [[ $got == $exp ]] || log_error "large command substitution failed" "$exp" "$got"
+ done
++
++# ==========
++# Verify that importing untrusted env vars does not allow evaluating arbitrary expressions but does
++# recognize all integer literals recognized by ksh.
++expect=8
++actual=$(env SHLVL='7' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "decimal int literal not recognized" "$expect" "$actual"
++
++expect=14
++actual=$(env SHLVL='013' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "leading zeros int literal not recognized" "$expect" "$actual"
++
++expect=4
++actual=$(env SHLVL='2#11' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "base#value int literal not recognized" "$expect" "$actual"
++
++expect=12
++actual=$(env SHLVL='16#B' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "base#value int literal not recognized" "$expect" "$actual"
++
++expect=1
++actual=$(env SHLVL="2#11+x[\$($bin_echo DANGER WILL ROBINSON >&2)0]" $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "expression allowed on env var import" "$expect" "$actual"
diff --git a/app-shells/ksh/ksh-2020.0.0.ebuild b/app-shells/ksh/ksh-2020.0.0-r1.ebuild
similarity index 93%
rename from app-shells/ksh/ksh-2020.0.0.ebuild
rename to app-shells/ksh/ksh-2020.0.0-r1.ebuild
index 6b40cd312997..3c4891ea637e 100644
--- a/app-shells/ksh/ksh-2020.0.0.ebuild
+++ b/app-shells/ksh/ksh-2020.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,6 +27,7 @@ RDEPEND="!app-shells/pdksh"
PATCHES=(
"${FILESDIR}"/ksh-2020.0.0-ensure-user-set.patch
"${FILESDIR}"/ksh-2020.0.0-skip-api-test.patch
+ "${FILESDIR}"/CVE-2019-14868.patch
)
src_test() {
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
new file mode 100644
index 000000000000..a557f61f9dd0
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -0,0 +1 @@
+DIST zsh-syntax-highlighting-0.7.0_beta1.tar.gz 130063 BLAKE2B cf0f6319af22b47cb8a280de682a69b0479dc59033be5ce84840507b77dd2df0441b8d260af55bccb303c87d7f5a7e4cc6db9f46860aee040b4b8115c76f5e07 SHA512 1692015aad58103c752e2dd4161ea87f26aaa09d34eb2faec1f651fea1d9bfad29226455468017160a5393a87c1f7ed0514b09b0802b1810377beef72bfa6c87
diff --git a/app-shells/zsh-syntax-highlighting/metadata.xml b/app-shells/zsh-syntax-highlighting/metadata.xml
new file mode 100644
index 000000000000..203fa55c746f
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
new file mode 100644
index 000000000000..8ca8ffb2e2b8
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+if [[ -z ${PV%%*9999} ]]; then
+ EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
+ inherit git-r3
+else
+ MY_PV=$(ver_rs 3 -)
+ SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Fish shell like syntax highlighting for zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
+at the end of your ~/.zshrc"
+
+src_prepare() {
+ sed -i -e 's/COPYING.md//' Makefile || die
+ default
+}
+
+src_install() {
+ emake \
+ SHARE_DIR="${ED}/usr/share/zsh/site-functions" \
+ DOC_DIR="${ED}/usr/share/doc/${PF}" \
+ install
+ readme.gentoo_create_doc
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ca903f530c03..40e60bfdfdcc 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
similarity index 96%
rename from app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
rename to app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
index 5f5423e5152c..efbd0590a066 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
@@ -29,7 +29,9 @@ RDEPEND="
highlight? (
|| (
dev-util/source-highlight
- dev-python/pygments[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+ ')
app-text/highlight
)
)"
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 393a4c1a5437..ecc34eac2e3b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
-DIST calibre-4.10.0.tar.xz 37021688 BLAKE2B 80a8ee99d07b73bb770df54d57ad43d48407909822b0d1a101e3ece328935910e5197df531b0730faf0131eee2ae853c3606894fb46d438f7d0c00bc0fedd7e4 SHA512 71777151130fdafa4c4540017f0b9353811cfed68daf69d6d832151651010bb903d91866c1fde30df9fdea85a10b6350bdfd4838547f81af3ff540d674096c6e
+DIST calibre-4.10.1.tar.xz 37012272 BLAKE2B e5d9421ed986da8ec7d814f364702fe04bcbb76b5e08dedfadd7164c81943cdfe6f012042e82a4715e3ccda284efdf44340af0bde9d03cbc7c22cbcf10136a55 SHA512 eb6f4fd458da3e3e1121ff72da0dfb2bdc38cec98bdaf538e6761563aa176aae2439e4949424795c239a8fa8ebde507564452495ef71f3f7f19b25435e10a41a
DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
diff --git a/app-text/calibre/calibre-3.48.0-r1.ebuild b/app-text/calibre/calibre-3.48.0-r2.ebuild
similarity index 84%
rename from app-text/calibre/calibre-3.48.0-r1.ebuild
rename to app-text/calibre/calibre-3.48.0-r2.ebuild
index 750bc132087d..4aac7817f183 100644
--- a/app-text/calibre/calibre-3.48.0-r1.ebuild
+++ b/app-text/calibre/calibre-3.48.0-r2.ebuild
@@ -44,28 +44,30 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2=
>=dev-libs/icu-57.1:=
dev-libs/libinput:=
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
>=dev-libs/dbus-glib-0.106
>=sys-apps/dbus-1.10.8
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+ dev-python/regex[${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtcore:5=
dev-qt/qtdbus:5=
dev-qt/qtgui:5=
@@ -94,8 +96,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
RDEPEND="${COMMON_DEPEND}
udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
>=virtual/podofo-build-0.9.6_pre20171027
virtual/pkgconfig"
diff --git a/app-text/calibre/calibre-4.10.0.ebuild b/app-text/calibre/calibre-4.10.1-r1.ebuild
similarity index 83%
rename from app-text/calibre/calibre-4.10.0.ebuild
rename to app-text/calibre/calibre-4.10.1-r1.ebuild
index 96f088d77812..876531012345 100644
--- a/app-text/calibre/calibre-4.10.0.ebuild
+++ b/app-text/calibre/calibre-4.10.1-r1.ebuild
@@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/hyphen:=
>=dev-libs/icu-57.1:=
dev-libs/libinput:=
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
>=dev-libs/dbus-glib-0.106
>=sys-apps/dbus-1.10.8
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
- >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+ dev-python/regex[${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtcore:5=
dev-qt/qtdbus:5=
dev-qt/qtgui:5=
@@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
RDEPEND="${COMMON_DEPEND}
udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
>=virtual/podofo-build-0.9.6_pre20171027
virtual/pkgconfig"
diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r1.ebuild
index 96f088d77812..10509962f2ee 100644
--- a/app-text/calibre/calibre-4.9.1-r1.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r1.ebuild
@@ -31,7 +31,7 @@ LICENSE="
OFL-1.1
PSF-2
"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
SLOT="0"
IUSE="ios +udisks"
@@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/hyphen:=
>=dev-libs/icu-57.1:=
dev-libs/libinput:=
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
>=dev-libs/dbus-glib-0.106
>=sys-apps/dbus-1.10.8
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
- >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+ dev-python/regex[${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtcore:5=
dev-qt/qtdbus:5=
dev-qt/qtgui:5=
@@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
RDEPEND="${COMMON_DEPEND}
udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
>=virtual/podofo-build-0.9.6_pre20171027
virtual/pkgconfig"
diff --git a/app-text/calibre/calibre-4.9.1.ebuild b/app-text/calibre/calibre-4.9.1.ebuild
deleted file mode 100644
index 1b5faed75d37..000000000000
--- a/app-text/calibre/calibre-4.9.1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
- GPL-3+
- GPL-3
- GPL-2+
- GPL-2
- GPL-1+
- LGPL-3+
- LGPL-2.1+
- LGPL-2.1
- BSD
- MIT
- Old-MIT
- Apache-2.0
- public-domain
- || ( Artistic GPL-1+ )
- CC-BY-3.0
- OFL-1.1
- PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-text/hunspell-1.7:=
- >=app-text/podofo-0.9.6_pre20171027:=
- >=app-text/poppler-0.26.5[qt5]
- >=dev-libs/chmlib-0.40:=
- dev-libs/glib:2=
- dev-libs/hyphen:=
- >=dev-libs/icu-57.1:=
- dev-libs/libinput:=
- >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
- >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
- >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
- >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
- >=dev-libs/dbus-glib-0.106
- >=sys-apps/dbus-1.10.8
- dev-python/dnspython[${PYTHON_USEDEP}]
- >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
- >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
- >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
- >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
- >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
- >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
- >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- dev-qt/qtcore:5=
- dev-qt/qtdbus:5=
- dev-qt/qtgui:5=
- >=dev-qt/qtwebengine-5.12
- dev-qt/qtwidgets:5=
- dev-util/desktop-file-utils
- dev-util/gtk-update-icon-cache
- media-fonts/liberation-fonts
- media-libs/fontconfig:=
- >=media-libs/freetype-2:=
- >=media-libs/libmtp-1.1.11:=
- >=media-libs/libwmf-0.2.8
- >=media-gfx/optipng-0.7.6
- >=sys-libs/zlib-1.2.11:=
- virtual/libusb:1=
- x11-libs/libxkbcommon:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXrender:=
- x11-misc/shared-mime-info
- >=x11-misc/xdg-utils-1.0.2-r2
- ios? (
- >=app-pda/usbmuxd-1.0.8
- >=app-pda/libimobiledevice-1.2.0
- )
- udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
- udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- >=virtual/podofo-build-0.9.6_pre20171027
- virtual/pkgconfig"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
- eerror "Calibre cannot be built with this version of gcc."
- eerror "You need at least gcc-6.0"
- die "Your C compiler is too old for this package."
- fi
-}
-
-src_prepare() {
- # no_updates: do not annoy user with "new version is availible all the time
- # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
- eapply \
- "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
-
- eapply_user
-
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|, PreserveMIMEDefaults():|:|" \
- -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
- -e "s|cmd\[2\]|cmd[4]|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # Disable unnecessary privilege dropping for bug #287067.
- sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
- -i setup/install.py || die "sed failed to patch install.py"
-
- sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
- # Bypass kbuildsycoca and update-mime-database in order to
- # avoid sandbox violations if xdg-mime tries to call them.
- cat - > "${T}/kbuildsycoca" <<-EOF
- #!${BASH}
- echo $0 : $@
- exit 0
- EOF
-
- cp "${T}"/{kbuildsycoca,update-mime-database} || die
- chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
- export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
- # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
- # violation with kbuildsycoca as in bug #287067, comment #13.
- export -n DISPLAY
-
- # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANG LANGUAGE ${!LC_*}
- export LC_ALL=C #684484
-
- # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
- # variables to point to our fake temporary $HOME.
- export HOME="${T}/fake_homedir"
- export XDG_CONFIG_HOME="${HOME}/.config"
- export XDG_DATA_HOME="${HOME}/.local/share"
- export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
- mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
- tc-export CC CXX
- # Bug #334243 - respect LDFLAGS when building extensions
- export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- addpredict /dev/dri #665310
-
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- "${PYTHON}" setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}/usr" \
- --staging-libdir="${ED}/usr/${libdir}" || die
-
- rm "${ED}/usr/share/applications/defaults.list" || die
- find "${ED}"/usr/share -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- einfo "Converting python shebangs"
- python_fix_shebang --force "${ED}"
-
- einfo "Compiling python modules"
- python_optimize "${ED}"/usr/lib/calibre
-
- newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
- newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
- bashcomp_alias calibre \
- lrfviewer \
- calibre-debug \
- ebook-meta \
- calibre-server \
- ebook-viewer \
- ebook-polish \
- fetch-ebook-metadata \
- lrf2lrs \
- ebook-convert \
- ebook-edit \
- calibre-smtp \
- ebook-device
-
-}
-
-pkg_preinst() {
- # Indentify stray directories from upstream's "Binary install"
- # method (see bug 622728).
- CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
- CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
- printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
- [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
- local x
- for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
- if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
- elog "Purging '${x}'"
- rm -rf "${x}"
- fi
- done
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
index b7c0b37e37f2..1e0aa58e0412 100644
--- a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,10 +19,12 @@ SLOT="0"
IUSE="nls"
RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- dev-python/pygtksourceview:2[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-text/cherrytree/cherrytree-0.38.9.ebuild b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
similarity index 76%
rename from app-text/cherrytree/cherrytree-0.38.9.ebuild
rename to app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
index 80af20d9208c..3451ffc2b7e6 100644
--- a/app-text/cherrytree/cherrytree-0.38.9.ebuild
+++ b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,11 +19,13 @@ SLOT="0"
IUSE="nls"
RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pyenchant[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
index 5127655c04ef..e106b612cca9 100644
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
inherit wxwidgets
DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://vslavik.github.io/${PN}/ https://github.com/vslavik/${PN}/"
+HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
# The COPYING.icons file states that two icons were taken from
diff --git a/app-text/discount/discount-2.2.6.ebuild b/app-text/discount/discount-2.2.6.ebuild
index 9d8ffa589581..5188f84a09a9 100644
--- a/app-text/discount/discount-2.2.6.ebuild
+++ b/app-text/discount/discount-2.2.6.ebuild
@@ -47,14 +47,16 @@ src_configure() {
"${configure_call[@]}" || die
}
+src_compile() {
+ emake libmarkdown
+ emake
+}
+
src_install() {
emake \
DESTDIR="${D}" \
$(usex minimal install install.everything) \
SAMPLE_PFX="${PN}-"
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins libmarkdown.pc
}
pkg_postinst() {
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
deleted file mode 100644
index 3ee15e26d65c..000000000000
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '-')"
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
- >=dev-libs/glib-2.6:2
- aspell? ( app-text/aspell )
- hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
- virtual/pkgconfig
-"
-# test? ( dev-libs/unittest++ )
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
-)
-
-src_prepare() {
- default
- sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
-}
-
-src_configure() {
- econf \
- $(use_enable aspell) \
- $(use_enable hunspell myspell) \
- $(use_enable static-libs static) \
- --disable-hspell \
- --disable-ispell \
- --disable-uspell \
- --disable-voikko \
- --with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index e2851ea43dee..b57d54a8d44f 100644
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index db2f17b17ddc..a1f40688379d 100644
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
index f3f0116c21a5..ebf1a3373666 100644
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="doc test tools"
RESTRICT="!test? ( test )"
diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild
index 0ea1f591f0ef..a9c9bdde4c33 100644
--- a/app-text/liblangtag/liblangtag-0.6.3.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
LICENSE="|| ( LGPL-3 MPL-2.0 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
IUSE="debug doc introspection static-libs test"
BDEPEND="
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index 45620397cd35..c50e69eaad26 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="Library parsing QuarkXpress documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index c925f2b1adb3..31e3767691ea 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
inherit toolchain-funcs
DESCRIPTION="Enable colorization of man pages"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/pastebinit/pastebinit-1.5.ebuild b/app-text/pastebinit/pastebinit-1.5-r1.ebuild
similarity index 94%
rename from app-text/pastebinit/pastebinit-1.5.ebuild
rename to app-text/pastebinit/pastebinit-1.5-r1.ebuild
index c707cb302333..39e4f9f2810d 100644
--- a/app-text/pastebinit/pastebinit-1.5.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5-r1.ebuild
@@ -19,7 +19,9 @@ IUSE="crypt"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/configobj[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+ ')
crypt? ( app-crypt/gnupg )"
DEPEND="app-text/docbook-xsl-stylesheets"
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r2.ebuild
similarity index 84%
rename from app-text/pylize/pylize-1.3b-r1.ebuild
rename to app-text/pylize/pylize-1.3b-r2.ebuild
index 799e97bf41da..1dc2b94a9c30 100644
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ b/app-text/pylize/pylize-1.3b-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,8 +16,11 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-DEPEND="dev-python/empy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/empy[${PYTHON_MULTI_USEDEP}]
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ ')"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16-r1.ebuild
similarity index 84%
rename from app-text/sigil/sigil-0.9.16.ebuild
rename to app-text/sigil/sigil-0.9.16-r1.ebuild
index a712ce00178e..a9492f58a94c 100644
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ b/app-text/sigil/sigil-0.9.16-r1.ebuild
@@ -24,9 +24,10 @@ RDEPEND="
dev-libs/boost:=[threads]
dev-libs/libpcre:3=[pcre16]
dev-libs/xerces-c[icu]
- dev-python/css-parser[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep \
+ 'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_MULTI_USEDEP}]')
>=dev-qt/qtconcurrent-5.12:5
>=dev-qt/qtcore-5.12:5
>=dev-qt/qtgui-5.12:5
@@ -35,14 +36,13 @@ RDEPEND="
>=dev-qt/qtwidgets-5.12:5
>=dev-qt/qtxmlpatterns-5.12:5
sys-libs/zlib[minizip]
- plugins? (
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cssutils[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- )
+ plugins? ( $(python_gen_cond_dep \
+ 'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+ dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
+ dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
+ dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
system-mathjax? ( dev-libs/mathjax )
"
DEPEND="${RDEPEND}"
diff --git a/app-text/sigil/sigil-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
index ee2155ae5c35..697fccf8b9f1 100644
--- a/app-text/sigil/sigil-0.9.18.ebuild
+++ b/app-text/sigil/sigil-0.9.18.ebuild
@@ -24,9 +24,10 @@ RDEPEND="
dev-libs/boost:=[threads]
dev-libs/libpcre:3=[pcre16]
dev-libs/xerces-c[icu]
- dev-python/css-parser[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep \
+ 'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_MULTI_USEDEP}]')
>=dev-qt/qtconcurrent-5.12:5
>=dev-qt/qtcore-5.12:5
>=dev-qt/qtgui-5.12:5
@@ -34,14 +35,13 @@ RDEPEND="
>=dev-qt/qtwebengine-5.12:5[widgets]
>=dev-qt/qtwidgets-5.12:5
sys-libs/zlib[minizip]
- plugins? (
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/cssselect[${PYTHON_USEDEP}]
- dev-python/cssutils[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/regex[${PYTHON_USEDEP}]
- )
+ plugins? ( $(python_gen_cond_dep \
+ 'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+ dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
+ dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
+ dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
system-mathjax? ( dev-libs/mathjax )
"
DEPEND="${RDEPEND}"
diff --git a/app-text/wscr/wscr-1.2-r1.ebuild b/app-text/wscr/wscr-1.2-r1.ebuild
index 70eae73fb6be..b68efd0dc49a 100644
--- a/app-text/wscr/wscr-1.2-r1.ebuild
+++ b/app-text/wscr/wscr-1.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit toolchain-funcs
DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
index 3a34f41b57d3..1760d0f73dd2 100644
--- a/app-text/wscr/wscr-1.2-r2.ebuild
+++ b/app-text/wscr/wscr-1.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit toolchain-funcs
DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
diff --git a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
similarity index 87%
rename from app-text/xiphos/xiphos-4.0.6a-r1.ebuild
rename to app-text/xiphos/xiphos-4.0.6a-r2.ebuild
index c131ac2b16a7..4ca64d0c5aae 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,24 +21,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
>=app-text/sword-1.7.4
dev-libs/glib:2
- dev-libs/libxml2:2[${PYTHON_USEDEP}]
- gnome-base/gconf[${PYTHON_USEDEP}]
gnome-extra/gtkhtml:4.0
>=gnome-extra/libgsf-1.14
net-libs/webkit-gtk:4
x11-libs/gtk+:3
+ $(python_gen_cond_dep '
+ dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
+ gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
+ ')
dbus? ( dev-libs/dbus-glib )
"
DEPEND="${RDEPEND}
app-text/docbook2X
- app-text/gnome-doc-utils[${PYTHON_USEDEP}]
app-text/rarian
- dev-libs/libxslt[${PYTHON_USEDEP}]
dev-util/intltool
dev-util/glib-utils
>=net-libs/biblesync-1.1.2-r1[-static]
virtual/pkgconfig
sys-devel/gettext
+ $(python_gen_cond_dep '
+ app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
+ dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
+ ')
"
pkg_setup() {
diff --git a/app-text/xiphos/xiphos-4.1.0-r1.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
similarity index 86%
rename from app-text/xiphos/xiphos-4.1.0-r1.ebuild
rename to app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 355ed3f118cb..159e9351269a 100644
--- a/app-text/xiphos/xiphos-4.1.0-r1.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,24 +19,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
>=app-text/sword-1.8.0
dev-libs/glib:2
- dev-libs/libxml2:2[${PYTHON_USEDEP}]
- gnome-base/gconf[${PYTHON_USEDEP}]
gnome-extra/gtkhtml:4.0
>=gnome-extra/libgsf-1.14
net-libs/webkit-gtk:4
x11-libs/gtk+:3
+ $(python_gen_cond_dep '
+ dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
+ gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
+ ')
dbus? ( dev-libs/dbus-glib )
"
DEPEND="${RDEPEND}
app-text/docbook2X
- app-text/gnome-doc-utils[${PYTHON_USEDEP}]
app-text/rarian
- dev-libs/libxslt[${PYTHON_USEDEP}]
dev-util/glib-utils
dev-util/intltool
>=net-libs/biblesync-1.1.2-r1[-static]
virtual/pkgconfig
sys-devel/gettext
+ $(python_gen_cond_dep '
+ app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
+ dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
+ ')
"
pkg_setup() {
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index a3e3ff6228f9..1d02eba32a17 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild b/app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild
similarity index 73%
rename from app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
rename to app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild
index d3a67dadea3a..d32b783b6b13 100644
--- a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
+++ b/app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,11 +17,17 @@ S=${WORKDIR}
VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+RDEPEND="
+ || (
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+ )
!app-vim/vim-latex
app-vim/align
app-text/wdiff
- dev-python/psutil[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+ ')
dev-tex/latexmk
dev-tex/detex
virtual/tex-base
diff --git a/app-vim/colorv/colorv-3.0.2-r1.ebuild b/app-vim/colorv/colorv-3.0.2-r2.ebuild
similarity index 76%
rename from app-vim/colorv/colorv-3.0.2-r1.ebuild
rename to app-vim/colorv/colorv-3.0.2-r2.ebuild
index 7f371d403d8d..2f7155bb1008 100644
--- a/app-vim/colorv/colorv-3.0.2-r1.ebuild
+++ b/app-vim/colorv/colorv-3.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,10 +19,15 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
RDEPEND="
${PYTHON_DEPS}
- || (
- app-editors/vim[python,${PYTHON_USEDEP}]
- ( app-editors/gvim[python,${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] )
- )"
+ $(python_gen_cond_dep '
+ || (
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ (
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+ )
+ )
+ ')"
src_prepare() {
eapply_user
diff --git a/app-vim/conque/conque-2.3-r1.ebuild b/app-vim/conque/conque-2.3-r1.ebuild
index 970df3e6eb86..ff3d95216cca 100644
--- a/app-vim/conque/conque-2.3-r1.ebuild
+++ b/app-vim/conque/conque-2.3-r1.ebuild
@@ -15,7 +15,11 @@ LICENSE="MIT"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+RDEPEND="
+ || (
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+ )
${PYTHON_DEPS}"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
index a3f80d6cb8c4..006508da113a 100644
--- a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@@ -17,10 +17,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
- dev-python/editorconfig-core-py[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/editorconfig-core-py[${PYTHON_MULTI_USEDEP}]
+ ')
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)"
RDEPEND="${DEPEND}"
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index ea10ddd21780..f6378382284d 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit eutils vim-plugin
DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settings"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="vim"
diff --git a/app-vim/gundo/gundo-2.6.2.ebuild b/app-vim/gundo/gundo-2.6.2-r2.ebuild
similarity index 86%
rename from app-vim/gundo/gundo-2.6.2.ebuild
rename to app-vim/gundo/gundo-2.6.2-r2.ebuild
index 0c3b69a6049a..4dfdca739ac5 100644
--- a/app-vim/gundo/gundo-2.6.2.ebuild
+++ b/app-vim/gundo/gundo-2.6.2-r2.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)
${PYTHON_DEPS}"
diff --git a/app-vim/gundo/gundo-2.6.2-r1.ebuild b/app-vim/gundo/gundo-2.6.2-r3.ebuild
similarity index 87%
rename from app-vim/gundo/gundo-2.6.2-r1.ebuild
rename to app-vim/gundo/gundo-2.6.2-r3.ebuild
index 3140f0d8ba4b..fa78d2605c20 100644
--- a/app-vim/gundo/gundo-2.6.2-r1.ebuild
+++ b/app-vim/gundo/gundo-2.6.2-r3.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)
${PYTHON_DEPS}"
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild
similarity index 86%
rename from app-vim/slimv/slimv-0.9.13_p20170910.ebuild
rename to app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild
index ab6f8f4b3d30..82a26de9ea02 100644
--- a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
+++ b/app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,8 +17,8 @@ KEYWORDS="amd64 x86"
RDEPEND="
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)
${PYTHON_DEPS}
|| (
diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0-r2.ebuild
similarity index 84%
rename from app-vim/splice/splice-1.1.0.ebuild
rename to app-vim/splice/splice-1.1.0-r2.ebuild
index cdcb146ca4aa..84be23b68c94 100644
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)"
VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/splice/splice-1.1.0-r1.ebuild b/app-vim/splice/splice-1.1.0-r3.ebuild
similarity index 88%
rename from app-vim/splice/splice-1.1.0-r1.ebuild
rename to app-vim/splice/splice-1.1.0-r3.ebuild
index e23492a64dc3..3593b4bec5ff 100644
--- a/app-vim/splice/splice-1.1.0-r1.ebuild
+++ b/app-vim/splice/splice-1.1.0-r3.ebuild
@@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)"
VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vim-latex/vim-latex-1.10.0.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
similarity index 93%
rename from app-vim/vim-latex/vim-latex-1.10.0.ebuild
rename to app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
index 58de37ae2552..3543ff2aafe0 100644
--- a/app-vim/vim-latex/vim-latex-1.10.0.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)
virtual/latex-base
!app-vim/vimtex"
diff --git a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild b/app-vim/vimcalc/vimcalc-1.3-r3.ebuild
similarity index 84%
rename from app-vim/vimcalc/vimcalc-1.3-r2.ebuild
rename to app-vim/vimcalc/vimcalc-1.3-r3.ebuild
index 151fa8451f7a..dcf1201a0108 100644
--- a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
+++ b/app-vim/vimcalc/vimcalc-1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,7 +20,10 @@ DEPEND="
${PYTHON_DEPS}"
RDEPEND="
- || ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+ || (
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+ )
${PYTHON_DEPS}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
similarity index 94%
rename from app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
rename to app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
index 4168f3a1c1b7..517d6a36c565 100644
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
@@ -21,7 +21,9 @@ VIM_PLUGIN_MESSAGES="filetype"
PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
RDEPEND="${PYTHON_DEPS}
- dev-python/autopep8[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/autopep8[${PYTHON_MULTI_USEDEP}]
+ ')"
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
similarity index 90%
rename from app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
rename to app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
index 91f8bce967ca..c6da5e2e298a 100644
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,9 @@ VIM_PLUGIN_HELPFILES="vimoutliner"
VIM_PLUGIN_MESSAGES="filetype"
RDEPEND="${PYTHON_DEPS}
- dev-python/autopep8[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/autopep8[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
src_prepare() {
diff --git a/app-vim/vimpress/vimpress-3.2.0.ebuild b/app-vim/vimpress/vimpress-3.2.0-r1.ebuild
similarity index 62%
rename from app-vim/vimpress/vimpress-3.2.0.ebuild
rename to app-vim/vimpress/vimpress-3.2.0-r1.ebuild
index 863178d710d4..e7e8ba8673dd 100644
--- a/app-vim/vimpress/vimpress-3.2.0.ebuild
+++ b/app-vim/vimpress/vimpress-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,9 +12,15 @@ LICENSE="vim"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+RDEPEND="
+ || (
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+ )
${PYTHON_DEPS}
- dev-python/markdown[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/voom/voom-5.1-r1.ebuild b/app-vim/voom/voom-5.1-r2.ebuild
similarity index 76%
rename from app-vim/voom/voom-5.1-r1.ebuild
rename to app-vim/voom/voom-5.1-r2.ebuild
index 661ae4f5bd8b..53ff9daabbe1 100644
--- a/app-vim/voom/voom-5.1-r1.ebuild
+++ b/app-vim/voom/voom-5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,6 +17,6 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
RDEPEND="${PYTHON_DEPS}
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)"
diff --git a/app-vim/voom/voom-5.3.ebuild b/app-vim/voom/voom-5.3-r1.ebuild
similarity index 85%
rename from app-vim/voom/voom-5.3.ebuild
rename to app-vim/voom/voom-5.3-r1.ebuild
index 78f809834f6f..af13fa790883 100644
--- a/app-vim/voom/voom-5.3.ebuild
+++ b/app-vim/voom/voom-5.3-r1.ebuild
@@ -18,8 +18,8 @@ VIM_PLUGIN_HELPFILES="${PN}.txt"
RDEPEND="${PYTHON_DEPS}
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)"
S=${WORKDIR}/VOoM-${PV}
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
index 90bc485b4174..29e5f6c94260 100644
--- a/app-vim/youcompleteme/youcompleteme-20130910.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,13 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
clang? ( >=sys-devel/clang-3.3 )
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)"
DEPEND="${RDEPEND}
test? (
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}]
+ ')
)"
CMAKE_IN_SOURCE_BUILD=1
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
index 987fec6263bf..c5e133ef7435 100644
--- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,26 +26,32 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEPEND="
${PYTHON_DEPS}
clang? ( >=sys-devel/clang-3.3 )
- dev-libs/boost[python,threads,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/boost[python,threads,${PYTHON_MULTI_USEDEP}]
+ ')
|| (
- app-editors/vim[python,${PYTHON_USEDEP}]
- app-editors/gvim[python,${PYTHON_USEDEP}]
+ app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
)
"
RDEPEND="
${COMMON_DEPEND}
- dev-python/bottle[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- dev-python/jedi[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sh[${PYTHON_USEDEP}]
- dev-python/waitress[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/bottle[${PYTHON_MULTI_USEDEP}]
+ virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+ dev-python/jedi[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ dev-python/sh[${PYTHON_MULTI_USEDEP}]
+ dev-python/waitress[${PYTHON_MULTI_USEDEP}]
+ ')
"
DEPEND="
${COMMON_DEPEND}
test? (
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}]
+ ')
>=dev-cpp/gtest-1.8.0
)
"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index ec17447ff02e..f85ceaccdbe8 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gnat-suite-bin/Manifest b/dev-ada/gnat-suite-bin/Manifest
index 596defa1e822..7e40913c9dc2 100644
--- a/dev-ada/gnat-suite-bin/Manifest
+++ b/dev-ada/gnat-suite-bin/Manifest
@@ -3,3 +3,4 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
DIST gnat-suite-bin-2018.txz 337235688 BLAKE2B cf1b8f0253907b8fc97b9c7218b23dcda8f1557be5e12293eab59e09427418a8814c1bafbcb3f89c1e5dd755a161c5dfa8a852631d137f17acb3167bf51dadbb SHA512 9b57709c05a121b0a0adabe3232128e3f27659d1928857fbd6883b73a7487c3d457317e8f236df3d16ced635514af8afbafc584cc74d865e11288820ac9c4f77
+DIST gnat-suite-bin-2019.txz 518461388 BLAKE2B 31ca194d15cafd66abe1d0896f1444e746c1484149db26545855561512c251b84eea5b4d0932860dfed23cac7f0b3c94a9884c586f509ceb6da8b9becd29e913 SHA512 a640e451a1badc2a9c64abb80f1ae1b49b5389e265d14dfe9b22891d23b3d13a9770841a43cc50ceba81c2728777ed9da854654afe6198c79dd4e0fed536907c
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild
new file mode 100644
index 000000000000..587a7e9955f3
--- /dev/null
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MYP=gnat-gpl-${PV}
+DESCRIPTION="GNAT Ada suite"
+HOMEPAGE="http://libre.adacore.com/"
+# Extracted and repacked from gnat-community-2019-20190517-x86_64-linux-bin
+SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${P}.txz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ sys-devel/binutils
+ sys-devel/gdb"
+
+PREFIX=/opt/${P}
+
+src_prepare() {
+ default
+ rm Makefile
+ cd share/examples/gnat
+ cat header.xml \
+ full_project/full.xml \
+ options/options.xml \
+ other_languages/cpp_main/cpp_main.xml \
+ other_languages/cpp_pragmas/cpp_pragmas.xml \
+ other_languages/import_from_c/import_from_c.xml \
+ plugins/plugins.xml \
+ stream_io/stream_io.xml \
+ simple_project/simple_project.xml \
+ starter/starter.xml \
+ xml_stream/xml_stream.xml \
+ containers/anagram/anagram.xml \
+ containers/genealogy/genealogy.xml \
+ containers/hash/hash.xml \
+ containers/library/library.xml \
+ containers/shapes/shapes.xml \
+ containers/spellcheck/spellcheck.xml \
+ containers/wordcount/wordcount.xml \
+ containers/wordfreq/wordfreq.xml \
+ oo_interfaces/oo_interfaces.xml \
+ oo_airline/oo_airline.xml \
+ altivec/altivec.xml \
+ footer.xml \
+ > gnat-examples.xml \
+ || die
+ sed -i \
+ -e "s:PREFIX:${PREFIX}:" \
+ gnat-examples.xml || die
+}
+
+src_install() {
+ into ${PREFIX}
+ dobin bin/*
+ insinto ${PREFIX}
+ doins -r etc include lib* share
+ insinto ${PREFIX}/share/gps/plug-ins
+ doins share/examples/gnat/gnat-examples.xml
+ basever=8.3.1
+ machine=x86_64-pc-linux-gnu
+ fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
+ fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
+ fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
+ fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
+ fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
+ fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
+ fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
+ fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
+ fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
+}
+
+pkg_postinst () {
+ einfo "GNAT GPL is now installed. To launch it, you must put"
+ einfo " ${PREFIX}/bin"
+ einfo "in front of your PATH environment variable. The following"
+ einfo "commands enable you to do this:"
+ einfo " PATH=${PREFIX}/bin:\$PATH; export PATH (Bourne shell)"
+ einfo " setenv PATH ${PREFIX}/bin:\$PATH (C shell)"
+ einfo " Thank you for installing GNAT GPL Edition"
+}
diff --git a/dev-ada/gps/gps-2018-r2.ebuild b/dev-ada/gps/gps-2018-r3.ebuild
similarity index 94%
rename from dev-ada/gps/gps-2018-r2.ebuild
rename to dev-ada/gps/gps-2018-r3.ebuild
index 1551312c0378..49dd272c9a9d 100644
--- a/dev-ada/gps/gps-2018-r2.ebuild
+++ b/dev-ada/gps/gps-2018-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,8 +33,10 @@ RDEPEND="${PYTHON_DEPS}
sys-devel/clang:=
x11-themes/adwaita-icon-theme
x11-themes/hicolor-icon-theme
- dev-python/pep8[${PYTHON_USEDEP}]
- dev-python/jedi[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/pep8[${PYTHON_MULTI_USEDEP}]
+ dev-python/jedi[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
diff --git a/dev-ada/gps/gps-2019.ebuild b/dev-ada/gps/gps-2019-r1.ebuild
similarity index 95%
rename from dev-ada/gps/gps-2019.ebuild
rename to dev-ada/gps/gps-2019-r1.ebuild
index 2f20596db004..1985f108d722 100644
--- a/dev-ada/gps/gps-2019.ebuild
+++ b/dev-ada/gps/gps-2019-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,8 +38,10 @@ RDEPEND="${PYTHON_DEPS}
sys-devel/clang:=
x11-themes/adwaita-icon-theme
x11-themes/hicolor-icon-theme
- dev-python/pep8[${PYTHON_USEDEP}]
- dev-python/jedi[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/pep8[${PYTHON_MULTI_USEDEP}]
+ dev-python/jedi[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 2047f5c2c600..05bd7bbc6c07 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
index 508260ba6e47..7aa82f9f4e76 100644
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
COMMON_DEPEND="
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 95f370a46488..42cb60b844e7 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,3 +1,2 @@
DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
index 40b8fe7867d4..719b4a6451a2 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
deleted file mode 100644
index ddafc05c9c0e..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-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"
-
-IUSE="aqua doc test wayland X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
- >=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}]
- >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
- >=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}]
- >=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
- >=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
- >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- media-gfx/graphviz
- dev-libs/libxslt
- app-doc/doxygen )
-"
-# eautoreconf needs mm-common
-
-src_prepare() {
- if ! use test; then
- # don't waste time building tests
- sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
- || die "sed 1 failed"
- fi
-
- # don't waste time building examples
- sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
- || die "sed 2 failed"
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" gnome2_src_configure \
- --enable-api-atkmm \
- $(multilib_native_use_enable doc documentation) \
- $(use_enable aqua quartz-backend) \
- $(use_enable wayland wayland-backend) \
- $(use_enable X x11-backend)
-}
-
-multilib_src_test() {
- virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
- find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
- dodoc -r demos
-}
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
index 3568cb9aae51..5bbe4bfaf43f 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.4"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7a81d9408d5d..315e1e600128 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index c4997d7b9543..11f78ab3576b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -71,7 +71,7 @@ multilib_src_configure() {
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-DWITH_CURL=$(usex curl ON OFF)
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
- -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index bd01fadd2b56..07de6ddfdd2c 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -288,8 +288,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -301,15 +300,15 @@ src_configure(){
-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_ZLIB=system
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild
index efd07a576537..d131c0c4cb07 100644
--- a/dev-db/mariadb/mariadb-10.1.43.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.43.ebuild
@@ -293,8 +293,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -306,15 +305,15 @@ src_configure(){
-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_ZLIB=system
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild
index 4e0e9491bb2a..b68568b59247 100644
--- a/dev-db/mariadb/mariadb-10.1.44.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.44.ebuild
@@ -297,8 +297,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -310,15 +309,15 @@ src_configure(){
-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_ZLIB=system
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index ce87ebab1b39..79d8b88b16d4 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -326,7 +326,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.2.29.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild
index 7b99a2969bbd..fc259fc3c054 100644
--- a/dev-db/mariadb/mariadb-10.2.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.29.ebuild
@@ -335,7 +335,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.2.31.ebuild b/dev-db/mariadb/mariadb-10.2.31.ebuild
index b95e1279e5c7..8e713f24f7cd 100644
--- a/dev-db/mariadb/mariadb-10.2.31.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.31.ebuild
@@ -336,7 +336,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild b/dev-db/mariadb/mariadb-10.3.20.ebuild
index 7fb13269e69d..cc2498f533dd 100644
--- a/dev-db/mariadb/mariadb-10.3.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.20.ebuild
@@ -325,7 +325,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.3.22.ebuild b/dev-db/mariadb/mariadb-10.3.22.ebuild
index cf26f76d0451..f65deda16f81 100644
--- a/dev-db/mariadb/mariadb-10.3.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.22.ebuild
@@ -326,7 +326,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild b/dev-db/mariadb/mariadb-10.4.10.ebuild
index c479a1ae70d5..c5d00cd5a4e2 100644
--- a/dev-db/mariadb/mariadb-10.4.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.10.ebuild
@@ -335,7 +335,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.4.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild
index 13396dc69603..10c241797c7d 100644
--- a/dev-db/mariadb/mariadb-10.4.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.12.ebuild
@@ -336,7 +336,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-5.5.66.ebuild b/dev-db/mariadb/mariadb-5.5.66.ebuild
index 2cd8c6360ff0..17ef7180271b 100644
--- a/dev-db/mariadb/mariadb-5.5.66.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.66.ebuild
@@ -254,8 +254,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +265,15 @@ src_configure(){
-DINSTALL_MYSQLSHAREDIR=share/mariadb
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_ZLIB=system
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
# The build forces this to be defined when cross-compiling. We pass it
# all the time for simplicity and to make sure it is actually correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mariadb/mariadb-5.5.67.ebuild b/dev-db/mariadb/mariadb-5.5.67.ebuild
index 414400eba524..fbd7f924edf8 100644
--- a/dev-db/mariadb/mariadb-5.5.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.67.ebuild
@@ -254,8 +254,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +265,15 @@ src_configure(){
-DINSTALL_MYSQLSHAREDIR=share/mariadb
-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-DINSTALL_SCRIPTDIR=share/mariadb/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_ZLIB=system
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
- -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
# The build forces this to be defined when cross-compiling. We pass it
# all the time for simplicity and to make sure it is actually correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index fab53f85351a..fc2f7104f2bc 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,8 +1,11 @@
DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82 SHA512 eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
DIST mongodb-src-r3.6.14.tar.gz 40895581 BLAKE2B 3cfe2aedd11a67a01ddee9eba36d99bad5fe8c7891e953cbdae9200427638e1acc1555c8d39df0217a48a95428838d573c90381698361f954d9aab860449cfcd SHA512 2bdc0ee86625724f64b7af2962b19b13cefb21d58d45c7b22fe2e01bd021f2427236c279c89785ede7c6986742127160b032294fbb652c55ce42f8d941a18cfe
DIST mongodb-src-r3.6.16.tar.gz 40927975 BLAKE2B bcd129d43eea24da3afe69c887bcd22116e0eb7e1f3f274fb8f51260625d17607b0d1eb31fb23a4f97c88e2c86b3d7a880cb05b0e77385d115cf9486d66f1249 SHA512 eb00f3a612942ad5f947583e92fca5b877b40d75132fa5a97989d81dd55925f5a112400eec8a43b2043bb0236b3228a670a888c41a374b0a60e8a3c26076b1e8
+DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb4574243ad234d1cd14ffef864d7fd2d60841866fd5a1966eae8f14266a9648deb62b7b55386d41338b515d5e6849e980143d42 SHA512 b4d9e9bfc7ff886532641058c99da29420d1aa472cb4cf2b254e0fd0af5ecc72ac8bf28dcd55ab738b799b00132ffacddd154dea37ccfbf459c7cc603c2582e0
DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
DIST mongodb-src-r4.0.13.tar.gz 50006727 BLAKE2B bf47bd32cf50c24084091a1baa811690c50586352307deb80876bb1bad539e90de77f85fc591960d6ae871e0a6f22d5d2f05bb340218784b642e3529d0c64bb6 SHA512 2a74ac8648cde6d9b5aa33da195b22eca926ef5ff85d4140e0a1ba978e3d13d410f4d7d7e102e35f994ef3b848333a4ef4bacfec9e2ac1b1288cbee885875ef7
DIST mongodb-src-r4.0.14.tar.gz 50088053 BLAKE2B af7dc930dd7a469c06cf26201e3329967a664585b9964732c57ed283f323d4dc7fde3ea62ad4f1e8ca763360aeb614c2f77f98867031083d83808acd19e97539 SHA512 3d5d73a816a00887a8851e2e79919b2646f6cc34fd9b8acb255a52e2e71407a4728a80a81112bdbe0a92ba9f71e856ac7a2229741273e8485806cda2cb018d8d
+DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46bc3bee66be45e94a846b1a7ce859826273812d4ce11aa96d1766071bf5fb422771bf2176350145deae99e64e59c164e38 SHA512 90458dea29a4c9a3078e1f13ffd2163911bf5a5f42884553ad9b3c2a2fafea2f73e506640c78f55f27bc16551582ad22244437356b89786fef383ce4b24bb617
DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1 SHA512 30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80
+DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
diff --git a/dev-db/mongodb/mongodb-3.6.17.ebuild b/dev-db/mongodb/mongodb-3.6.17.ebuild
new file mode 100644
index 000000000000..8b60f64d9f55
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.17.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3:=
+ >=dev-libs/boost-1.60:=[threads(+)]
+ >=dev-libs/libpcre-8.41[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.8:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )
+ test? (
+ $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+ "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
+ ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.4-series. Then upgrade to 3.6 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.16.ebuild b/dev-db/mongodb/mongodb-4.0.16.ebuild
new file mode 100644
index 000000000000..7542115d20f4
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.16.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3:=
+ >=dev-libs/boost-1.60:=[threads(+)]
+ >=dev-libs/libpcre-8.41[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )
+ test? (
+ $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+ "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+ ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.6-series. Then upgrade to 4.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.3.ebuild b/dev-db/mongodb/mongodb-4.2.3.ebuild
new file mode 100644
index 000000000000..d566c1d609b2
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+)]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )
+ test? (
+ $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+ ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.0-series. Then upgrade to 4.2 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mysql++/mysql++-3.2.4.ebuild b/dev-db/mysql++/mysql++-3.2.4.ebuild
index 24978aa9f91f..ba9a947c7f13 100644
--- a/dev-db/mysql++/mysql++-3.2.4.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.4.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
src_configure() {
local myconf=(
--enable-thread-check
- --with-mysql="${EPREFIX%/}/usr"
+ --with-mysql="${EPREFIX}/usr"
--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
)
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index 8ecb148dc58a..048d9b67f192 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -238,8 +238,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -250,14 +249,14 @@ src_configure(){
-DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_ZLIB=system
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
# The build forces this to be defined when cross-compiling. We pass it
# all the time for simplicity and to make sure it is actually correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 8a33824b92a4..9456b1c4a778 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -239,8 +239,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -251,16 +250,16 @@ src_configure(){
-DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_EDITLINE=bundled
-DWITH_ZLIB=system
-DWITH_LIBWRAP=OFF
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
# The build forces this to be defined when cross-compiling. We pass it
# all the time for simplicity and to make sure it is actually correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index 8d0360acf3a8..a4c51a22cc00 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -239,8 +239,7 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -251,16 +250,16 @@ src_configure(){
-DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
-DWITH_EDITLINE=bundled
-DWITH_ZLIB=system
-DWITH_LIBWRAP=OFF
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
# The build forces this to be defined when cross-compiling. We pass it
# all the time for simplicity and to make sure it is actually correct.
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index 6a139eae88f6..121c4bdf49dc 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -49,10 +49,10 @@ src_install() {
# static lib has wrong name so we need to rename it
if use static-libs; then
- mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
- "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+ mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+ "${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
else
- rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+ rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
fi
# examples
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
index 8b7d7538783f..921ba7471c28 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit systemd s6 tmpfiles
DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI=""
LICENSE="GPL-2"
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index 65e334429702..0238c0f2d4b7 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -245,7 +245,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
@@ -536,10 +535,10 @@ src_test() {
}
mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=""
@@ -602,7 +601,7 @@ pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX%/}/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -763,13 +762,13 @@ pkg_config() {
if [[ -r "${help_tables}" ]] ; then
cat "${help_tables}" >> "${sqltmp}"
fi
- cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
einfo "Command: ${cmd[*]}"
su -s /bin/sh -c "${cmd[*]}" mysql \
>"${TMPDIR%/}"/mysql_install_db.log 2>&1
if [ $? -ne 0 ]; then
grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
fi
popd &>/dev/null || die
[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 1ea042478213..6f1c6b5e8485 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -254,7 +254,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
@@ -545,10 +544,10 @@ src_test() {
}
mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=""
@@ -611,7 +610,7 @@ pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX%/}/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -772,13 +771,13 @@ pkg_config() {
if [[ -r "${help_tables}" ]] ; then
cat "${help_tables}" >> "${sqltmp}"
fi
- cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
einfo "Command: ${cmd[*]}"
su -s /bin/sh -c "${cmd[*]}" mysql \
>"${TMPDIR%/}"/mysql_install_db.log 2>&1
if [ $? -ne 0 ]; then
grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
fi
popd &>/dev/null || die
[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
index 7cf6286849df..8825edb4d07a 100644
--- a/dev-db/mysql/mysql-5.7.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -125,10 +125,10 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=""
@@ -333,9 +333,8 @@ multilib_src_configure() {
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -346,9 +345,9 @@ multilib_src_configure() {
-DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
### TODO: make this system but issues with UTF-8 prevent it
@@ -356,7 +355,7 @@ multilib_src_configure() {
-DWITH_ZLIB=system
-DWITH_LIBWRAP=0
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
# The build forces this to be defined when cross-compiling. We pass it
@@ -774,7 +773,7 @@ pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX%/}/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -930,13 +929,13 @@ pkg_config() {
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't need as we set it ourselves
local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
- cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
einfo "Command: ${cmd[*]}"
su -s /bin/sh -c "${cmd[*]}" mysql \
>"${TMPDIR%/}"/mysql_install_db.log 2>&1
if [[ $? -ne 0 ]] ; then
grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
fi
popd &>/dev/null || die
[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index 5a103007c82a..0bfc4b1cbcf7 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -133,10 +133,10 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=""
@@ -344,9 +344,8 @@ multilib_src_configure() {
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -357,9 +356,9 @@ multilib_src_configure() {
-DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
### TODO: make this system but issues with UTF-8 prevent it
@@ -367,7 +366,7 @@ multilib_src_configure() {
-DWITH_ZLIB=system
-DWITH_LIBWRAP=0
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
# The build forces this to be defined when cross-compiling. We pass it
@@ -785,7 +784,7 @@ pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX%/}/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -941,13 +940,13 @@ pkg_config() {
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't need as we set it ourselves
local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
- cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
einfo "Command: ${cmd[*]}"
su -s /bin/sh -c "${cmd[*]}" mysql \
>"${TMPDIR%/}"/mysql_install_db.log 2>&1
if [[ $? -ne 0 ]] ; then
grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
fi
popd &>/dev/null || die
[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild
index d87e28c839bd..79346f5415bb 100644
--- a/dev-db/mysql/mysql-5.7.29.ebuild
+++ b/dev-db/mysql/mysql-5.7.29.ebuild
@@ -131,10 +131,10 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=""
@@ -342,9 +342,8 @@ multilib_src_configure() {
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -355,9 +354,9 @@ multilib_src_configure() {
-DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
### TODO: make this system but issues with UTF-8 prevent it
@@ -365,7 +364,7 @@ multilib_src_configure() {
-DWITH_ZLIB=system
-DWITH_LIBWRAP=0
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
# The build forces this to be defined when cross-compiling. We pass it
@@ -783,7 +782,7 @@ pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX%/}/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -939,13 +938,13 @@ pkg_config() {
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't need as we set it ourselves
local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
- cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
einfo "Command: ${cmd[*]}"
su -s /bin/sh -c "${cmd[*]}" mysql \
>"${TMPDIR%/}"/mysql_install_db.log 2>&1
if [[ $? -ne 0 ]] ; then
grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
fi
popd &>/dev/null || die
[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-8.0.19-r1.ebuild b/dev-db/mysql/mysql-8.0.19-r1.ebuild
index 5fced0177f01..a4a825347945 100644
--- a/dev-db/mysql/mysql-8.0.19-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.19-r1.ebuild
@@ -222,7 +222,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
index 5c4af55fc2eb..e936725d18de 100644
--- a/dev-db/percona-server/percona-server-5.7.27.30.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
@@ -161,10 +161,10 @@ python_check_deps() {
}
mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
- MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
- MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
- MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+ MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+ MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+ MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=""
@@ -395,9 +395,8 @@ multilib_src_configure() {
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
- -DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+ -DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -408,9 +407,9 @@ multilib_src_configure() {
-DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-DINSTALL_SCRIPTDIR=share/mysql/scripts
- -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+ -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-DINSTALL_SBINDIR=sbin
- -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-DWITH_UNIT_TESTS=$(usex test ON OFF)
### TODO: make this system but issues with UTF-8 prevent it
@@ -418,7 +417,7 @@ multilib_src_configure() {
-DWITH_ZLIB=system
-DWITH_LIBWRAP=0
-DENABLED_LOCAL_INFILE=1
- -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_DEFAULT_COMPILER_OPTIONS=0
-DWITH_DEFAULT_FEATURE_SET=0
# The build forces this to be defined when cross-compiling. We pass it
@@ -917,7 +916,7 @@ pkg_config() {
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
# my_print_defaults needs to read stuff in $HOME/.my.cnf
- export HOME=${EPREFIX%/}/root
+ export HOME=${EPREFIX}/root
# Make sure the vars are correctly initialized
mysql_init_vars
@@ -1073,13 +1072,13 @@ pkg_config() {
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't need as we set it ourselves
local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
- cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+ cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
einfo "Command: ${cmd[*]}"
su -s /bin/sh -c "${cmd[*]}" mysql \
>"${TMPDIR%/}"/mysql_install_db.log 2>&1
if [[ $? -ne 0 ]] ; then
grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
- die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+ die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
fi
popd &>/dev/null || die
[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/percona-server/percona-server-8.0.18.9.ebuild b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
index a3c7cca82238..93fbfaacf7f7 100644
--- a/dev-db/percona-server/percona-server-8.0.18.9.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
@@ -233,7 +233,6 @@ src_configure(){
mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
-DINSTALL_BINDIR=bin
diff --git a/dev-db/pgadmin4/pgadmin4-4.13.ebuild b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
similarity index 50%
rename from dev-db/pgadmin4/pgadmin4-4.13.ebuild
rename to dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
index 18587bb501f0..f044276c737a 100644
--- a/dev-db/pgadmin4/pgadmin4-4.13.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
@@ -29,35 +29,41 @@ COMMON_DEPEND="${PYTHON_DEPS}
"
DEPEND="${COMMON_DEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${COMMON_DEPEND}
- >=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
- >=dev-python/blinker-1.4[${PYTHON_USEDEP}]
- >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
- >=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
- >=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
- >=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
- >=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.12.0[${PYTHON_USEDEP}]
- >=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}]
- >=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+ ')
"
S="${WORKDIR}"/${P}/runtime
diff --git a/dev-db/pgadmin4/pgadmin4-4.17.ebuild b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
similarity index 54%
rename from dev-db/pgadmin4/pgadmin4-4.17.ebuild
rename to dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
index 5fbbd435ceb6..1a5bd03bedb6 100644
--- a/dev-db/pgadmin4/pgadmin4-4.17.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
@@ -29,35 +29,41 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-qt/qtwidgets:5
"
DEPEND="${COMMON_DEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
virtual/imagemagick-tools[png]
"
RDEPEND="${COMMON_DEPEND}
- >=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
- >=dev-python/blinker-1.4[${PYTHON_USEDEP}]
- >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
- >=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
- >=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
- >=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
- >=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
- >=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
- >=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
- >=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.12.0[${PYTHON_USEDEP}]
- >=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}]
- >=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+ ')
"
PATCHES=( "${FILESDIR}"/${P}-python-3.8.patch )
diff --git a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
index 0c8fc05f6763..7db68b875d7d 100644
--- a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
+++ b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
@@ -34,10 +34,10 @@ S="${WORKDIR}/${PN}-${MY_PV}"
src_configure() {
eqmake5 \
- PREFIX="${EPREFIX%/}/usr" \
- PLUGINSDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/plugins" \
- PRIVATEBINDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/bin" \
- PRIVATELIBDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
+ PREFIX="${EPREFIX}/usr" \
+ PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" \
+ PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" \
+ PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
NO_UPDATE_CHECK=1 \
-r ${PN}.pro
}
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index 679315dda916..c41008704bf5 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index e15a725fbf91..91d190c091db 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_6} )
inherit distutils-r1
DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild
index 4c21bf2c2fd8..85088dae2645 100644
--- a/dev-db/postgresql/postgresql-10.10.ebuild
+++ b/dev-db/postgresql/postgresql-10.10.ebuild
@@ -132,7 +132,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -292,11 +292,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-10.11.ebuild b/dev-db/postgresql/postgresql-10.11.ebuild
index 4db1706faa4c..1070f1654e7e 100644
--- a/dev-db/postgresql/postgresql-10.11.ebuild
+++ b/dev-db/postgresql/postgresql-10.11.ebuild
@@ -132,7 +132,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -292,11 +292,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild
index dfd737bb1a58..0171a97ac859 100644
--- a/dev-db/postgresql/postgresql-10.9.ebuild
+++ b/dev-db/postgresql/postgresql-10.9.ebuild
@@ -132,7 +132,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -292,11 +292,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild
index 2a0a71668e6f..b998144e091e 100644
--- a/dev-db/postgresql/postgresql-11.4.ebuild
+++ b/dev-db/postgresql/postgresql-11.4.ebuild
@@ -133,7 +133,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -294,11 +294,11 @@ pkg_postinst() {
elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild
index 665416e9dcbc..67c77e9b5084 100644
--- a/dev-db/postgresql/postgresql-11.5.ebuild
+++ b/dev-db/postgresql/postgresql-11.5.ebuild
@@ -133,7 +133,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -294,11 +294,11 @@ pkg_postinst() {
elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild
index bd2130f6d42f..d95233353b91 100644
--- a/dev-db/postgresql/postgresql-11.6.ebuild
+++ b/dev-db/postgresql/postgresql-11.6.ebuild
@@ -133,7 +133,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -294,11 +294,11 @@ pkg_postinst() {
elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-12.0.ebuild b/dev-db/postgresql/postgresql-12.0.ebuild
index 5bc6cd4acf10..f0a9f339f7f9 100644
--- a/dev-db/postgresql/postgresql-12.0.ebuild
+++ b/dev-db/postgresql/postgresql-12.0.ebuild
@@ -133,7 +133,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -294,11 +294,11 @@ pkg_postinst() {
elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild
index 1202ea084698..92a7fbe7985f 100644
--- a/dev-db/postgresql/postgresql-12.1.ebuild
+++ b/dev-db/postgresql/postgresql-12.1.ebuild
@@ -133,7 +133,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -294,11 +294,11 @@ pkg_postinst() {
elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
index 43043da26219..d7b84d15b9ce 100644
--- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -308,7 +308,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -319,11 +319,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index 3ca85697fc72..cf992d873e2a 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild
index 5d6471258c66..e7826a9966ab 100644
--- a/dev-db/postgresql/postgresql-9.4.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.23.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -308,7 +308,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -319,11 +319,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild
index 43043da26219..d7b84d15b9ce 100644
--- a/dev-db/postgresql/postgresql-9.4.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.24.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -308,7 +308,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -319,11 +319,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.4.25.ebuild b/dev-db/postgresql/postgresql-9.4.25.ebuild
index dccd9372c733..4afb351102c4 100644
--- a/dev-db/postgresql/postgresql-9.4.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.25.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -308,7 +308,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -319,11 +319,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
index 1b7912c6d02b..e92d7bb0834d 100644
--- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
fi
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index b8663e8bbf3e..9918b3fc1fe2 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild
index f6e7247b9104..f316af45dac1 100644
--- a/dev-db/postgresql/postgresql-9.5.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.18.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
fi
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild
index 1b7912c6d02b..e92d7bb0834d 100644
--- a/dev-db/postgresql/postgresql-9.5.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.19.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
fi
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.5.20.ebuild b/dev-db/postgresql/postgresql-9.5.20.ebuild
index 0631e478db3b..d86d352551bd 100644
--- a/dev-db/postgresql/postgresql-9.5.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.20.ebuild
@@ -127,7 +127,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
fi
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
einfo "Or move the configuration files back:"
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
index 1a2981407228..58e85bd619b0 100644
--- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
@@ -131,7 +131,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index bbb43aee8a94..74f8af4248ab 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -131,7 +131,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild
index 2334b0f00b3e..b86aebf664af 100644
--- a/dev-db/postgresql/postgresql-9.6.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.14.ebuild
@@ -131,7 +131,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild
index 1a2981407228..58e85bd619b0 100644
--- a/dev-db/postgresql/postgresql-9.6.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.15.ebuild
@@ -131,7 +131,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9.6.16.ebuild b/dev-db/postgresql/postgresql-9.6.16.ebuild
index f4a28fd7b81c..145faa5a444e 100644
--- a/dev-db/postgresql/postgresql-9.6.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.16.ebuild
@@ -131,7 +131,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
rm "${l}" || ewarn "Couldn't remove ${l}"
fi
@@ -314,7 +314,7 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
if use server ; then
elog
@@ -325,11 +325,11 @@ pkg_postinst() {
elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
pkg_config() {
use server || die "USE flag 'server' not enabled. Nothing to configure."
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 7d2460caf77f..803bd0b9076d 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -158,7 +158,7 @@ src_configure() {
export LDFLAGS_SL="${LDFLAGS}"
export LDFLAGS_EX="${LDFLAGS}"
- local PO="${EPREFIX%/}"
+ local PO="${EPREFIX}"
local i uuid_config=""
if use uuid; then
@@ -300,7 +300,7 @@ pkg_preinst() {
local l
# First remove any symlinks in /usr/bin that may have been created
# by the old eselect
- for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+ for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
[[ $(${canonicalise} "${l}") == *postgresql-9.7* ]] && rm "${l}"
done
@@ -316,21 +316,21 @@ pkg_postinst() {
postgresql-config update
elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+ elog " ${EROOT}/etc/postgresql-${SLOT}/"
elog
elog "Gentoo specific documentation:"
elog "https://wiki.gentoo.org/wiki/PostgreSQL"
elog
elog "Official documentation:"
- elog "${EROOT%/}/usr/share/doc/${PF}/html"
+ elog "${EROOT}/usr/share/doc/${PF}/html"
elog
elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
+ elog " ${EROOT}/run/postgresql/"
elog
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
elog "so that it contains your preferred locale, and other options, in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
elog
elog "Then, execute the following command to setup the initial database"
elog "environment:"
@@ -353,15 +353,15 @@ pkg_postrm() {
}
pkg_config() {
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
[[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+ && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
# environment.bz2 may not contain the same locale as the current system
# locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ if [ -f "${EROOT}/etc/env.d/02locale" ]; then
unset LANG
unset LC_CTYPE
unset LC_NUMERIC
@@ -370,7 +370,7 @@ pkg_config() {
unset LC_MONETARY
unset LC_MESSAGES
unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
+ source "${EROOT}/etc/env.d/02locale"
[ -n "${LANG}" ] && export LANG
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -382,7 +382,7 @@ pkg_config() {
fi
einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -422,9 +422,9 @@ pkg_config() {
einfo "Initializing the database ..."
if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
fi
if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -467,7 +467,7 @@ pkg_config() {
einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
einfo "instead of 'pg_ctl'."
else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
einfo "instead of 'pg_ctl'."
fi
}
diff --git a/dev-db/pspg/pspg-1.6.5.ebuild b/dev-db/pspg/pspg-1.6.5.ebuild
index 9f4383f0e53f..612f2529e008 100644
--- a/dev-db/pspg/pspg-1.6.5.ebuild
+++ b/dev-db/pspg/pspg-1.6.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-1.6.8.ebuild b/dev-db/pspg/pspg-1.6.8.ebuild
index a537b5d8c3a9..2413a413b870 100644
--- a/dev-db/pspg/pspg-1.6.8.ebuild
+++ b/dev-db/pspg/pspg-1.6.8.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-2.5.4.ebuild b/dev-db/pspg/pspg-2.5.4.ebuild
index 60a6aaa3b834..a3116171325a 100644
--- a/dev-db/pspg/pspg-2.5.4.ebuild
+++ b/dev-db/pspg/pspg-2.5.4.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-2.5.5.ebuild b/dev-db/pspg/pspg-2.5.5.ebuild
index 60a6aaa3b834..a3116171325a 100644
--- a/dev-db/pspg/pspg-2.5.5.ebuild
+++ b/dev-db/pspg/pspg-2.5.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 9717ba68fbb0..b166d0b5bfbb 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/platformio/platformio-4.1.0-r1.ebuild b/dev-embedded/platformio/platformio-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..0c28bb271d22
--- /dev/null
+++ b/dev-embedded/platformio/platformio-4.1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="An open source ecosystem for IoT development"
+HOMEPAGE="https://platformio.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ =dev-python/click-5[${PYTHON_MULTI_USEDEP}]
+ =dev-python/pyserial-3[${PYTHON_MULTI_USEDEP}]
+ =dev-python/requests-2.4[${PYTHON_MULTI_USEDEP}]
+ =dev-python/semantic_version-2.8.1[${PYTHON_MULTI_USEDEP}]
+ =dev-python/tabulate-0.8.3[${PYTHON_MULTI_USEDEP}]
+ =dev-python/pyelftools-0.25[${PYTHON_MULTI_USEDEP}]
+ =dev-python/marshmallow-2.20.5[${PYTHON_MULTI_USEDEP}]
+ =dev-python/click-5[${PYTHON_USEDEP}]
- =dev-python/pyserial-3[${PYTHON_USEDEP}]
- =dev-python/requests-2.4[${PYTHON_USEDEP}]
- =dev-python/semantic_version-2.8.1[${PYTHON_USEDEP}]
- =dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
- =dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
- =dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
- 99R <<-EOF
- LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
- R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+ LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+ R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
EOF
doenvd 99R
newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/R/R-3.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild
index df86d7063895..35f7ce8af6b0 100644
--- a/dev-lang/R/R-3.6.0.ebuild
+++ b/dev-lang/R/R-3.6.0.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
-i src/library/tools/R/Rd.R || die
# fix Rscript path when installed (gentoo bug #221061)
- sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+ sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
-i src/unix/Makefile.in || die "sed unix Makefile failed"
# fix HTML links to manual (gentoo bug #273957)
@@ -116,10 +116,10 @@ src_prepare() {
-e "/SHLIB_EXT/s/\.so/.dylib/" \
-i configure.ac || die
# sort of "undo" 2.14.1-rmath-shared.patch
- sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+ sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
-i src/nmath/standalone/Makefile.in || die
else
- append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+ append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
fi
fi
AT_M4DIR=m4
@@ -175,8 +175,8 @@ src_install() {
fi
cat > 99R <<-EOF
- LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
- R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+ LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+ R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
EOF
doenvd 99R
newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/R/R-3.6.2.ebuild b/dev-lang/R/R-3.6.2.ebuild
index b428a1112711..f3312585e0cc 100644
--- a/dev-lang/R/R-3.6.2.ebuild
+++ b/dev-lang/R/R-3.6.2.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
-i src/library/tools/R/Rd.R || die
# fix Rscript path when installed (gentoo bug #221061)
- sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+ sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
-i src/unix/Makefile.in || die "sed unix Makefile failed"
# fix HTML links to manual (gentoo bug #273957)
@@ -118,10 +118,10 @@ src_prepare() {
-e "/SHLIB_EXT/s/\.so/.dylib/" \
-i configure.ac || die
# sort of "undo" 2.14.1-rmath-shared.patch
- sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+ sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
-i src/nmath/standalone/Makefile.in || die
else
- append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+ append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
fi
fi
AT_M4DIR=m4
@@ -177,8 +177,8 @@ src_install() {
fi
cat > 99R <<-EOF
- LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
- R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+ LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+ R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
EOF
doenvd 99R
newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 31befa3899d9..ac675c63d332 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -6,6 +6,7 @@ DIST erlang-22.2.2.tar.gz 55743605 BLAKE2B f316b78f33d81f05d22eb4eab52756a46c39d
DIST erlang-22.2.3.tar.gz 55742102 BLAKE2B 85c1f9a2f6ae05e8e3c0f4c71c0dc4f1dd14f5a91e35070f20631b9349fd5d884a9c5390a0159bafcfda8464253bb3636a735f05f4d286ce2bf0518bdb3f3b50 SHA512 4ec29abfba875ddff700ed19095bf5709e75083530216ac8f3b24147e06d098675d1b4e5c0674aef44bc7391fe8e3fbcfc2e17d8083cd006e5ddb5c910010e44
DIST erlang-22.2.4.tar.gz 55746886 BLAKE2B 2132ab12789c98259f284cd0188109eb1bdbac63c3f6c5bb7a79572dd99586bdf9b741b3b2c87965f5794c3d41df1f0b713e9b89ebff0707ab9fa079dd20a9d2 SHA512 b73bb94c0172635cc4843958a62959c42085e63916423cebbb094cef9684ffd0491874a12338c7066cc94b660ac8b6f6aae73cc0eedcf5517ba1c85cf1b80258
DIST erlang-22.2.5.tar.gz 55745622 BLAKE2B 3bc0ef57dfedd46f3ab870622c5daa5424a0b1bc9669cb46e7d59a15d485cac9228896cb75883eb6c92b509e193ae484dee6ad2792a959c78cb74c6e18507083 SHA512 56252d7da1e42c27378ae3a1d587446554443207e9bbe2381f74626bf0fbb1c37d3117ed81a01b5c5e01eb76bfa4fb04159813f4df52ae5b8f5dfd261f555b02
+DIST erlang-22.2.6.tar.gz 55746963 BLAKE2B ebd1e11dc817285307add4147fc4f3c1bba4e9b8a19fa3dd61ec321aa4dfdb056406d76216185a39316787efc9bd766a1e7441b8c261bcb98c4b642c87a27357 SHA512 6da4b25340a37daa30d3a27081b782f24a53edfca0070f6c02ca0332bc8db9b3bad917c43d63470a15a86a44a439072f3ee1472b23ff8163730443e4a811c66b
DIST erlang-22.2.tar.gz 55736930 BLAKE2B bcd67ea4ef5c358d4f0bcbec977e2c60a3b0f1ccccb2d38c35ba1908ed9d96727c83ab6cb6dc69ce90ffc6772e34de68014cc66ec8c3bfcda852844a4f6b1548 SHA512 a192da8ee02588c44e5c04bf2933c95672f596ca10f485c2c41d0c97563c90b5ea24fa02da61e007595f25a80557e6513372db3059bb7e394647a4c11f4cd41e
DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202
diff --git a/dev-lang/erlang/erlang-22.2.6.ebuild b/dev-lang/erlang/erlang-22.2.6.ebuild
new file mode 100644
index 000000000000..c52ed00f231a
--- /dev/null
+++ b/dev-lang/erlang/erlang-22.2.6.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0"
+
+inherit elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+ http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.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"
+# 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"
+
+RDEPEND="
+ acct-group/epmd
+ acct-user/epmd
+ sys-libs/ncurses:0
+ sys-libs/zlib
+ emacs? ( >=app-editors/emacs-23.1:* )
+ java? ( >=virtual/jdk-1.8:* )
+ odbc? ( dev-db/unixODBC )
+ sctp? ( net-misc/lksctp-tools )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ systemd? ( sys-apps/systemd )
+ tk? ( dev-lang/tk:0 )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/18.2.1-wx3.0.patch"
+ "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
+ "${FILESDIR}/${PN}-22.2.2-gcc-10.patch"
+ "${FILESDIR}/${PN}-22.1.4-asn1-dep.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+ default
+
+ ./otp_build autoconf || die
+}
+
+src_configure() {
+ use wxwidgets && setup-wxwidgets
+
+ local myconf=(
+ --disable-builtin-zlib
+ $(use_enable hipe)
+ $(use_enable kpoll kernel-poll)
+ $(use_with java javac)
+ $(use_enable sctp)
+ $(use_with ssl ssl "${EPREFIX}"/usr)
+ $(use_enable ssl dynamic-ssl-lib)
+ $(use_enable systemd)
+ $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+ )
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake
+
+ if use emacs ; then
+ pushd lib/tools/emacs &>/dev/null || die
+ elisp-compile *.el
+ popd &>/dev/null || die
+ fi
+}
+
+extract_version() {
+ local path="$1"
+ local var_name="$2"
+ sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+ local erl_libdir_rel="$(get_libdir)/erlang"
+ local erl_libdir="/usr/${erl_libdir_rel}"
+ local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+ local erl_erts_ver="$(extract_version erts VSN)"
+ local my_manpath="/usr/share/${PN}/man"
+
+ [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+ [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+ emake INSTALL_PREFIX="${D}" install
+
+ if use doc ; then
+ local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
+ docompress -x /usr/share/doc/${PF}
+ else
+ local DOCS=("README.md")
+ fi
+
+ einstalldocs
+
+ dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+ dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+ dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+ dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+ dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+ ## Clean up the no longer needed files
+ rm "${ED}/${erl_libdir}/Install" || die
+
+ insinto "${my_manpath}"
+ doins -r "${WORKDIR}"/man/*
+ # extend MANPATH, so the normal man command can find it
+ # see bug 189639
+ newenvd - "90erlang" <<-_EOF_
+ MANPATH="${my_manpath}"
+ _EOF_
+
+ if use emacs ; then
+ elisp-install erlang lib/tools/emacs/*.{el,elc}
+ sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+ "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+ elisp-site-file-install "${T}/${SITEFILE}"
+ fi
+
+ newinitd "${FILESDIR}"/epmd.init-r2 epmd
+ newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+ use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-lang/julia/julia-1.2.0.ebuild b/dev-lang/julia/julia-1.2.0.ebuild
index f38f2aa63633..088ce53300e4 100644
--- a/dev-lang/julia/julia-1.2.0.ebuild
+++ b/dev-lang/julia/julia-1.2.0.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
sed -i \
-e 's|git submodule|${EPREFIX}/bin/true|g' \
-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
- -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|g" \
deps/Makefile || die
local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/julia/julia-1.3.0.ebuild b/dev-lang/julia/julia-1.3.0.ebuild
index 07d84380fe7c..c3e62fe9d541 100644
--- a/dev-lang/julia/julia-1.3.0.ebuild
+++ b/dev-lang/julia/julia-1.3.0.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
sed -i \
-e 's|git submodule|${EPREFIX}/bin/true|g' \
-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
- -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|g" \
deps/Makefile || die
local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 7105dfb500b4..ec42a1aa9c9d 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
sed -i \
-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
- -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|g" \
deps/Makefile || die
local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/lazarus/lazarus-2.0.2.ebuild b/dev-lang/lazarus/lazarus-2.0.2.ebuild
index 8724ffdb8bac..0a38db636893 100644
--- a/dev-lang/lazarus/lazarus-2.0.2.ebuild
+++ b/dev-lang/lazarus/lazarus-2.0.2.ebuild
@@ -84,7 +84,7 @@ src_install() {
--exclude="killme*" --exclude=".gdb_hist*" \
--exclude="debian" --exclude="COPYING*" \
--exclude="*.app" \
- "${S}" "${ED%/}"/usr/share \
+ "${S}" "${ED}"/usr/share \
|| die "Unable to copy files!"
dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
@@ -97,9 +97,9 @@ src_install() {
diropts -m0755
dodir /etc/lazarus
cp -rf ../lazarus-package-config/* \
- "${ED%/}"/etc/lazarus || die
+ "${ED}"/etc/lazarus || die
cp -rf ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus \
- "${ED%/}"/etc/lazarus || die
+ "${ED}"/etc/lazarus || die
fi
make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index b8df540a09ff..c4ff66ee2e6f 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -46,7 +46,7 @@ mlton_subdir() {
}
mlton_dir() {
- echo "${EPREFIX%/}"/usr/$(mlton_subdir)
+ echo "${EPREFIX}"/usr/$(mlton_subdir)
}
mlton_memory_requirement() {
@@ -137,7 +137,7 @@ mlton_create_bin_stubs() {
for i in ${BIN_STUBS[*]}; do
cat <<- EOF >> ${i}
#!/bin/bash
- exec ${EPREFIX%/}/usr/${SUBDIR}/bin/${i} \$*
+ exec ${EPREFIX}/usr/${SUBDIR}/bin/${i} \$*
EOF
chmod a+x ${i} || die
done
diff --git a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
index 70a0082df833..2357769a5f1b 100644
--- a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
@@ -39,8 +39,8 @@ RESTRICT=test
src_configure() {
MAKEOPTS+=" NOISY=1"
use doc && DOCS+=( docs/* )
- local prefix="${EPREFIX%/}/usr"
- local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX}/usr"
+ local libdir="${EPREFIX}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
index fd84dc9ac68c..6b94964a1fd4 100644
--- a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
@@ -44,8 +44,8 @@ PATCHES="${FILESDIR}/fix-quoting.patch"
src_configure() {
MAKEOPTS+=" NOISY=1"
use doc && DOCS+=( docs/* )
- local prefix="${EPREFIX%/}/usr"
- local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX}/usr"
+ local libdir="${EPREFIX}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.11.ebuild b/dev-lang/moarvm/moarvm-2019.11.ebuild
index 7ca933ccf7b4..732ff5144878 100644
--- a/dev-lang/moarvm/moarvm-2019.11.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.11.ebuild
@@ -41,8 +41,8 @@ RESTRICT=test
src_configure() {
MAKEOPTS+=" NOISY=1"
use doc && DOCS+=( docs/* )
- local prefix="${EPREFIX%/}/usr"
- local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+ local prefix="${EPREFIX}/usr"
+ local libdir="${EPREFIX}/usr/$(get_libdir)"
einfo "--prefix '${prefix}'"
einfo "--libdir '${libdir}'"
local myconfigargs=(
diff --git a/dev-lang/nqp/nqp-2019.03-r1.ebuild b/dev-lang/nqp/nqp-2019.03-r1.ebuild
index 663242f61de6..9e1f45775e4c 100644
--- a/dev-lang/nqp/nqp-2019.03-r1.ebuild
+++ b/dev-lang/nqp/nqp-2019.03-r1.ebuild
@@ -70,7 +70,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=${EPREFIX%/}/usr" )
+ "--prefix=${EPREFIX}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/nqp/nqp-2019.07.1.ebuild b/dev-lang/nqp/nqp-2019.07.1.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-2019.07.1.ebuild
+++ b/dev-lang/nqp/nqp-2019.07.1.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=${EPREFIX%/}/usr" )
+ "--prefix=${EPREFIX}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/nqp/nqp-2019.11.ebuild b/dev-lang/nqp/nqp-2019.11.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-2019.11.ebuild
+++ b/dev-lang/nqp/nqp-2019.11.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=${EPREFIX%/}/usr" )
+ "--prefix=${EPREFIX}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
- "--prefix=${EPREFIX%/}/usr" )
+ "--prefix=${EPREFIX}/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 5fb59fc6617a..89c9004502c4 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/python/python-3.7.5-r1.ebuild b/dev-lang/python/python-3.7.5-r1.ebuild
index aca8d41b662c..b28c4a75d3f9 100644
--- a/dev-lang/python/python-3.7.5-r1.ebuild
+++ b/dev-lang/python/python-3.7.5-r1.ebuild
@@ -201,7 +201,7 @@ src_test() {
}
src_install() {
- local libdir=${ED%/}/usr/lib/python${PYVER}
+ local libdir=${ED}/usr/lib/python${PYVER}
emake DESTDIR="${D}" altinstall
@@ -211,13 +211,13 @@ src_install() {
-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
# Fix collisions between different slots of Python.
- rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so"
+ rm -f "${ED}/usr/$(get_libdir)/libpython3.so"
# Cheap hack to get version with ABIFLAGS
- local abiver=$(cd "${ED%/}/usr/include"; echo python*)
+ local abiver=$(cd "${ED}/usr/include"; echo python*)
if [[ ${abiver} != python${PYVER} ]]; then
# Replace python3.X with a symlink to python3.Xm
- rm "${ED%/}/usr/bin/python${PYVER}" || die
+ rm "${ED}/usr/bin/python${PYVER}" || die
dosym "${abiver}" "/usr/bin/python${PYVER}"
# Create python3.X-config symlink
dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
@@ -228,13 +228,13 @@ src_install() {
# python seems to get rebuilt in src_install (bug 569908)
# Work around it for now.
if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E "${ED%/}/usr/bin/${abiver}"
+ pax-mark E "${ED}/usr/bin/${abiver}"
else
- pax-mark m "${ED%/}/usr/bin/${abiver}"
+ pax-mark m "${ED}/usr/bin/${abiver}"
fi
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+ use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
@@ -255,7 +255,7 @@ src_install() {
sed \
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-e "s:@PYDOC@:pydoc${PYVER}:" \
- -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+ -i "${ED}/etc/conf.d/pydoc-${PYVER}" "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
# for python-exec
local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
@@ -274,26 +274,26 @@ src_install() {
# python-exec wrapping support
local pymajor=${PYVER%.*}
- mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die
+ mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
# python and pythonX
- ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
- ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die
+ ln -s "../../../bin/${abiver}" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
# python-config and pythonX-config
# note: we need to create a wrapper rather than symlinking it due
# to some random dirname(argv[0]) magic performed by python-config
- cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+ cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
#!/bin/sh
exec "${abiver}-config" "\${@}"
EOF
- chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
- ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die
+ chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" "${D}${PYTHON_SCRIPTDIR}/python-config" || die
# 2to3, pydoc, pyvenv
- ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die
- ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die
- ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die
+ ln -s "../../../bin/2to3-${PYVER}" "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+ ln -s "../../../bin/pyvenv-${PYVER}" "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
# idle
if use tk; then
- ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die
+ ln -s "../../../bin/idle${PYVER}" "${D}${PYTHON_SCRIPTDIR}/idle" || die
fi
}
@@ -304,11 +304,11 @@ pkg_preinst() {
}
eselect_python_update() {
- if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then
+ if [[ -z "$(eselect python show)" || ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
eselect python update
fi
- if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+ if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
eselect python update --python${PV%%.*}
fi
}
diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild
index 1df1108e8973..1f7c23a57126 100644
--- a/dev-lang/smlnj/smlnj-110.82.ebuild
+++ b/dev-lang/smlnj/smlnj-110.82.ebuild
@@ -137,8 +137,8 @@ src_install() {
SUBDIR=$(smlnj_get_libdir)/${PN}
DIR=/usr/${SUBDIR}
for file in bin/{*,.*}; do
- [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX%/}/${DIR}" \
- -e "s:${WORKDIR}:${EPREFIX%/}/${DIR}:" -i ${file}
+ [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \
+ -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file}
done
dodir ${DIR}/bin
exeinto ${DIR}/bin
diff --git a/dev-lang/snobol/snobol-1.4.1.ebuild b/dev-lang/snobol/snobol-1.4.1.ebuild
index 3e9ecb949052..0a29b17c94d9 100644
--- a/dev-lang/snobol/snobol-1.4.1.ebuild
+++ b/dev-lang/snobol/snobol-1.4.1.ebuild
@@ -35,9 +35,9 @@ src_prepare() {
}
src_configure() {
- ./configure --prefix="${EPREFIX%/}/usr" \
- --snolibdir="${EPREFIX%/}/usr/lib/snobol4" \
- --mandir="${EPREFIX%/}/usr/share/man" \
+ ./configure --prefix="${EPREFIX}/usr" \
+ --snolibdir="${EPREFIX}/usr/lib/snobol4" \
+ --mandir="${EPREFIX}/usr/share/man" \
--add-cflags="${CFLAGS}"
}
diff --git a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
index a0c8d08062f1..30082712a0d8 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
@@ -57,7 +57,7 @@ src_prepare() {
}
src_configure() {
- export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}"
+ export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
cd "${BUILDDIR}" || die
diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
index 1c936015960e..ced690db1ef3 100644
--- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
}
src_configure() {
- export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}"
+ export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
cd "${BUILDDIR}" || die
econf \
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a9d9f2c9703b..641f6f613e71 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/angelscript/angelscript-2.34.0.ebuild b/dev-libs/angelscript/angelscript-2.34.0.ebuild
index d2bea73121f6..d1eedac8af5f 100644
--- a/dev-libs/angelscript/angelscript-2.34.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.34.0.ebuild
@@ -33,7 +33,7 @@ multilib_src_compile() {
multilib_src_install() {
emake -C ${PN}/projects/gnuc \
- DESTDIR="${D%/}" \
+ DESTDIR="${D}" \
PREFIX="${EPREFIX}"/usr \
LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \
install_header install_shared \
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index 69df78180409..98432bf891bd 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -126,8 +126,8 @@ src_install() {
default
find "${ED}" -name "*.la" -delete || die
- if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
- find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+ if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+ find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
fi
if ! use static-libs ; then
find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
@@ -140,5 +140,5 @@ src_install() {
# This file is only used on AIX systems, which Gentoo is not,
# and causes collisions between the SLOTs, so remove it.
- rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die
+ rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
}
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 26dcc8d80083..969ff91be7ea 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/boost-1.72.0-r1.ebuild b/dev-libs/boost/boost-1.72.0-r1.ebuild
index b435bdf41173..024bfbd5114f 100644
--- a/dev-libs/boost/boost-1.72.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.72.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
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"
+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 )
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 26afb2288b23..ce9f61ed5b1b 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,2 +1 @@
-DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
diff --git a/dev-libs/efl/efl-1.22.6.ebuild b/dev-libs/efl/efl-1.22.6.ebuild
deleted file mode 100644
index 946104590533..000000000000
--- a/dev-libs/efl/efl-1.22.6.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
-
-REQUIRED_USE="
- ?? ( elogind systemd )
- ?? ( gles2 opengl )
- fbcon? ( !tslib )
- gles2? (
- || ( wayland X )
- !sdl
- )
- ibus? ( glib )
- opengl? ( X )
- pulseaudio? ( sound )
- sdl? ( opengl )
- vnc? ( fbcon X )
- wayland? ( gles2 !opengl )
- xim? ( X )
- xpresent? ( X )
-"
-
-RDEPEND="
- net-misc/curl
- media-libs/libpng:0=
- sys-apps/dbus
- sys-apps/util-linux
- virtual/jpeg:0=
- connman? ( net-misc/connman )
- drm? (
- dev-libs/libinput
- media-libs/mesa[gbm]
- x11-libs/libdrm
- x11-libs/libxkbcommon
- )
- elogind? ( sys-auth/elogind )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gif? ( media-libs/giflib:= )
- gles2? ( media-libs/mesa[egl,gles2] )
- glib? ( dev-libs/glib:2 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- harfbuzz? ( media-libs/harfbuzz )
- hyphen? ( dev-libs/hyphen )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:= )
- libuv? ( dev-libs/libuv )
- luajit? ( dev-lang/luajit:= )
- !luajit? ( dev-lang/lua:* )
- pdf? ( app-text/poppler:=[cxx] )
- physics? ( sci-physics/bullet:= )
- postscript? ( app-text/libspectre )
- pulseaudio? ( media-sound/pulseaudio )
- raw? ( media-libs/libraw:= )
- scim? ( app-i18n/scim )
- sdl? (
- media-libs/libsdl2
- virtual/opengl
- )
- sound? ( media-libs/libsndfile )
- ssl? (
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- svg? (
- gnome-base/librsvg
- x11-libs/cairo
- )
- system-lz4? ( app-arch/lz4 )
- systemd? ( sys-apps/systemd:= )
- tiff? ( media-libs/tiff:0= )
- tslib? ( x11-libs/tslib:= )
- unwind? ( sys-libs/libunwind )
- valgrind? ( dev-util/valgrind )
- vlc? ( media-video/vlc )
- vnc? ( net-libs/libvncserver )
- wayland? (
- dev-libs/wayland
- media-libs/mesa[gles2,wayland]
- x11-libs/libxkbcommon
- )
- webp? ( media-libs/libwebp:= )
- X? (
- media-libs/freetype
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
- gles2? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- opengl? (
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
- )
- wayland? ( x11-libs/libxkbcommon[X] )
- )
- xine? ( media-libs/xine-lib )
- xpm? ( x11-libs/libXpm )
- xpresent? ( x11-libs/libXpresent )
- zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- default
-
- # Upstream still doesnt offer a configure flag. #611108
- if ! use unwind ; then
- sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
- configure || die "Sedding configure file with unwind fix failed."
- fi
-}
-
-src_configure() {
- local myconf=(
- --enable-cxx-bindings
- --enable-image-loader-generic
- --enable-image-loader-jpeg
- --enable-image-loader-png
- --enable-libeeze
- --enable-libmount
- --enable-quick-launch
- --enable-threads
- --enable-xinput22
-
- --disable-cancel-ok
- --disable-cocoa
- --disable-csharp-beta
- --disable-csharp-bindings
- --disable-doc
- --disable-ecore-buffer
- --disable-ecore-drm
- --disable-ecore-wayland
- --disable-eglfs
- --disable-g-main-loop
- --disable-gesture
- --disable-gstreamer
- --disable-pixman
- --disable-tizen
- --disable-wayland-ivi-shell
-
- $(use_enable bmp image-loader-bmp)
- $(use_enable bmp image-loader-wbmp)
- $(use_enable dds image-loader-dds)
- $(use_enable drm)
- $(use_enable drm elput)
- $(use_enable eet image-loader-eet)
- $(use_enable elogind)
- $(use_enable examples always-build-examples)
- $(use_enable fbcon fb)
- $(use_enable fontconfig)
- $(use_enable fribidi)
- $(use_enable gif image-loader-gif)
- $(use_enable gles2 egl)
- $(use_enable gstreamer gstreamer1)
- $(use_enable harfbuzz)
- $(use_enable hyphen)
- $(use_enable ico image-loader-ico)
- $(use_enable ibus)
- $(use_enable jpeg2k image-loader-jp2k)
- $(use_enable libuv)
- $(use_enable !luajit lua-old)
- $(use_enable neon)
- $(use_enable nls)
- $(use_enable pdf poppler)
- $(use_enable physics)
- $(use_enable postscript spectre)
- $(use_enable ppm image-loader-pmaps)
- $(use_enable psd image-loader-psd)
- $(use_enable pulseaudio)
- $(use_enable raw libraw)
- $(use_enable scim)
- $(use_enable sdl)
- $(use_enable sound audio)
- $(use_enable static-libs static)
- $(use_enable svg librsvg)
- $(use_enable system-lz4 liblz4)
- $(use_enable systemd)
- $(use_enable tga image-loader-tga)
- $(use_enable tiff image-loader-tiff)
- $(use_enable tslib)
- $(use_enable v4l v4l2)
- $(use_enable valgrind)
- $(use_enable vlc libvlc)
- $(use_enable vnc vnc-server)
- $(use_enable wayland)
- $(use_enable webp image-loader-webp)
- $(use_enable xcf)
- $(use_enable xim)
- $(use_enable xine)
- $(use_enable xpm image-loader-xpm)
- $(use_enable xpresent)
- $(use_enable zeroconf avahi)
-
- --with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
- --with-glib=$(usex glib)
- --with-js=none
- --with-net-control=$(usex connman connman none)
- --with-profile=$(usex debug debug release)
- --with-x11=$(usex X xlib none)
-
- $(use_with X x)
- )
-
- use drm && use wayland && myconf+=( --enable-gl-drm )
-
- if use opengl ; then
- myconf+=( --with-opengl=full )
- elif use gles2 ; then
- myconf+=( --with-opengl=es )
- elif use drm && use wayland ; then
- myconf+=( --with-opengl=es )
- else
- myconf+=( --with-opengl=none )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- if host-is-pax && use luajit ; then
- # We need to build the lua code first so we can pax-mark it. #547076
- local target='_e_built_sources_target_gogogo_'
- printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
- emake -C src "${target}"
- emake -C src bin/elua/elua
- pax-mark m src/bin/elua/.libs/elua
- fi
-
- V=1 emake
-}
-
-src_install() {
- V=1 emake install DESTDIR="${D}"
- einstalldocs
-
- if ! use static-libs ; then
- find "${D}" -name '*.la' -delete || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild
index 982a3b498ff0..3a1dc1e3db54 100644
--- a/dev-libs/efl/efl-1.23.3.ebuild
+++ b/dev-libs/efl/efl-1.23.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="+X bmp connman dds debug doc drm +eet elogind examples fbcon fontconfig
fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 02343d8644fd..4d01748725e9 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -18,12 +18,10 @@
Enable Intelligent Input Bus
Enable Ico image loader
Enable lottie animation support
- Enable dev-libs/libuv support
USE dev-lang/luajit instead of dev-lang/lua
Enable mono bindings
Enable Bullet physics effects and support
Enable PMAPS image loader
- Enable PMAPS image loader
Enable PSD image loader
Enable Smart Common Input Method
Use system liblz4 instead of bundled one
@@ -31,7 +29,6 @@
Enable Tgv image loader
Enable x11-libs/tslib for touchscreen events
Enable debug support via sys-libs/libunwind
- Enable usage of dev-util/valgrind in debug
Enable media-video/vlc support
Enable XCF image loader
Enable X Input Method
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index bc299e43e6ac..267ea61f7591 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -6,4 +6,5 @@ DIST ell-0.24.tar.xz 473332 BLAKE2B 97b5f5de1a4680f5b8da5db8d151df56d2eadb511c54
DIST ell-0.25.tar.xz 473392 BLAKE2B cefb71c0bd1c30a1c2e85baf19097f9028b3d2d1e8df14beb231f3c52f39e2ec98fbafdfbba4c05e94328c0c5747eb49111e1c76b3cb02fe22c09b51a5016f17 SHA512 7f12e2dfae16a38750166787ede7e3bf6def1e15a8bcb33bdba80ff84c2930d1857437f4ab871c408a52b18fec2212856ae9190ddf5eb542e90ebc76edd1f693
DIST ell-0.26.tar.xz 473512 BLAKE2B bad1545b65caad7263e03156740ef5dfc401536fc063f34bdac5346a9edca8b7b16fd175abb264a6163e9dca87d1469f388984a95962dcc695e3e98549ff2a0a SHA512 b7a841f6e3c50077b60c210549744344ee70b5116bc9ee0f44dfea896f68fe6ab89a6fa38fcfe04e259648de978162aa5592f2e07accf13825584b40d57ef6cb
DIST ell-0.27.tar.xz 474412 BLAKE2B 3b7d7ccfff8a92bbe930032b6a54bdc91b6541d1e6d8e514f1e49fcd08f3f5bc47beb3722dc864a63dcbbd72f793fbc2bc590b168f1623ff6e7088fbc960acb1 SHA512 ecda285155ef5ac1b8bdeabfba2e972149a5027c85236af74366c735aec7304b2dee8ff6aa931000b4299e8bb7654e7d4a63c1738de6e6e740f5ba16467f2823
+DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7
DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
diff --git a/dev-libs/ell/ell-0.28.ebuild b/dev-libs/ell/ell-0.28.ebuild
new file mode 100644
index 000000000000..615074c27a1b
--- /dev/null
+++ b/dev-libs/ell/ell-0.28.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+ glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ [[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ append-cflags "-fsigned-char" #662694
+ local myeconfargs=(
+ $(use_enable glib)
+ $(use_enable pie)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ local DOCS=( ChangeLog README )
+ einstalldocs
+
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index 81ce966a715c..2b38e3b527f0 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
LICENSE="LGPL-2.1+"
SLOT="3/5" # subslot = libgdl-3 soname version
IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
RDEPEND="
dev-libs/glib:2
diff --git a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
index b697e9c46d3b..b73da8e807fb 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
@@ -8,7 +8,7 @@ inherit eutils
GO_PN=github.com/hanwen/${PN}
EGIT_COMMIT="8c85ded140ac1889372a0e22d8d21e3d10a303bd"
-HOMEPAGE="https://${GO_PN}"
+HOMEPAGE="https://github.com/hanwen/go-fuse"
DESCRIPTION="FUSE bindings for Go"
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
index 894c8c631d8b..f2386f6a8c31 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
@@ -8,7 +8,7 @@ inherit eutils
GO_PN=github.com/hanwen/${PN}
EGIT_COMMIT="ffed29ec8b88f61c1b8954134cc48ef03bb26ce1"
-HOMEPAGE="https://${GO_PN}"
+HOMEPAGE="https://github.com/hanwen/go-fuse"
DESCRIPTION="FUSE bindings for Go"
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
similarity index 90%
rename from dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
rename to dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
index 4b780a3b6c9b..8a63af2a15f4 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
@@ -24,8 +24,12 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~a
RDEPEND="
>=dev-libs/gobject-introspection-common-${PV}
>=dev-libs/glib-2.58.0:2
- doctool? ( dev-python/mako[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}] )
+ doctool? (
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_MULTI_USEDEP}]
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
virtual/libffi:=
virtual/pkgconfig
!
-Date: Sun, 23 Jul 2017 20:46:19 +0200
-Subject: [PATCH] Control build of demos
-
-Building demos is not necessary for distributions. Allow disabling it
-but keep it enabled by default.
----
- Makefile.am | 2 ++
- configure.ac | 7 +++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0e4cf631..8c0c7143 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -635,6 +635,7 @@ endif
- CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
- CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
-
-+if ENABLE_BUILD_DEMOS
- # Demo programs
- noinst_PROGRAMS = \
- demos/youtube/youtube-cli \
-@@ -650,6 +651,7 @@ if HAVE_GTK
- noinst_PROGRAMS += \
- demos/scrapbook/scrapbook
- endif
-+endif
-
- demos_docs_list_docs_list_SOURCES = \
- demos/docs-list/docs-list.c \
-diff --git a/configure.ac b/configure.ac
-index 3b0530c3..1e09f277 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -152,6 +152,10 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE])
- AC_SUBST([GNOME_PACKAGES])
- AC_SUBST([GOA_ENABLED])
-
-+AC_ARG_ENABLE([build_demos],
-+ AS_HELP_STRING([--enable-build-demos],
-+ [Enable building demos (default: yes)]),,
-+ [enable_build_demos=yes])
- AC_ARG_ENABLE([always_build_tests],
- AS_HELP_STRING([--enable-always-build-tests],
- [Enable always building tests (default: yes)]),,
-@@ -161,6 +165,9 @@ AC_ARG_ENABLE([installed_tests],
- [Install test programs (default: no)]),,
- [enable_installed_tests=no])
-
-+AM_CONDITIONAL([ENABLE_BUILD_DEMOS],
-+ [test "$enable_build_demos" = "yes"])
-+
- AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS],
- [test "$enable_always_build_tests" = "yes"])
- AC_SUBST([ENABLE_ALWAYS_BUILD_TESTS],[$enable_always_build_tests])
---
-2.13.2
-
diff --git a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch b/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
deleted file mode 100644
index c73e3f9eaee2..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-autoconf-archive-2019.01.06 breaks AX_CODE_COVERAGE usage by requiring
-a different integration inside Makefile.am. This would be fine if the
-local m4/ax_code_coverage.m4 would get used, but eaclocal parses out
-the install from ACLOCAL_AMFLAGS, and calls aclocal with that, which
-overwrites ax_code_coverage.m4 with the newer version, obviously
-breaking the usage of all that in Makefile.am.
-Workaround it by patching out the --install argument, thus using the
-tarball copy of it (older version), which works with Makefile.am
-without further patching.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = . po docs gdata/tests
-
--ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
- DISTCHECK_CONFIGURE_FLAGS =
- MAINTAINERCLEANFILES =
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
deleted file mode 100644
index c00287ed11ab..000000000000
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- gnome-online-accounts? ( crypt )
- vala? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
- >=dev-libs/glib-2.44.0:2
- >=dev-libs/json-glib-0.15[introspection?]
- >=dev-libs/libxml2-2:2
- >=net-libs/liboauth-0.9.4
- >=net-libs/libsoup-2.55.90:2.4[introspection?]
- >=x11-libs/gdk-pixbuf-2.14:2
- crypt? ( app-crypt/gcr:= )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.25
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- test? ( >=net-libs/uhttpmock-0.5 )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.17.8-disable-demos.patch
- # don't overwrite m4/ax_* with newer breaking versions
- "${FILESDIR}"/${P}-ax2019-compat.patch
-)
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-build-demos \
- $(use_enable crypt gnome) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable introspection) \
- $(use_enable vala) \
- $(use_enable static-libs static) \
- $(use_enable test always-build-tests)
-}
-
-src_test() {
- unset ORBIT_SOCKETDIR
- dbus-run-session emake check
-}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 7c18d4d33bf4..c140345e9fbc 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1 +1,2 @@
DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
+DIST libgpg-error-1.37.tar.bz2 937282 BLAKE2B 70666749aa0156652405ee15e4307f29bdf748f06728da5c672c0208053e0d3a041aaef882b263dd828e2aa7dd8a2f77334447af2c499f81f7602150d84f593f SHA512 fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
new file mode 100644
index 000000000000..2919a9d73be0
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
@@ -0,0 +1,22 @@
+This breaks our multilib builds:
+
+ Confirm gpg-error-config works... no
+ *** Please report to with gpg-error-config-test.log
+
+--- libgpg-error-1.37/src/Makefile.am
++++ libgpg-error-1.37/src/Makefile.am
+@@ -338,14 +338,6 @@
+ cp gpg-error.h gpgrt.h
+
+ gpg-error-config: gpgrt-config gpg-error-config-old
+- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
+- @if ./gpg-error-config-test.sh --old-new; then \
+- echo "good"; \
+- else \
+- echo "no"; \
+- echo "*** Please report to with gpg-error-config-test.log"; \
+- exit 1; \
+- fi
+ cp gpg-error-config-old $@
+
+ install-data-local:
diff --git a/dev-libs/libgpg-error/libgpg-error-1.37.ebuild b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
new file mode 100644
index 000000000000..382f00f81ae9
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal toolchain-funcs prefix
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/gpg-error.h
+ /usr/include/gpgrt.h
+)
+
+PATCHES=( "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" )
+
+src_prepare() {
+ default
+ # only necessary for as long as we run eautoreconf, configure.ac
+ # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
+ # not a pure /bin/sh script, so it fails on some hosts
+ hprefixify -w 1 autogen.sh
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(multilib_is_native_abi || echo --disable-languages)
+ $(use_enable common-lisp languages)
+ $(use_enable nls)
+ $(use_enable static-libs static)
+ --enable-threads
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 97bad4e0e889..07969c0c2168 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,3 +1,4 @@
DIST libgusb-0.2.11.tar.xz 291992 BLAKE2B f43065fac0fcfbc3e392b90dc05537746ce1325d623161e93e1a306b87b07012ef4e11242514cd3da0b83a7df6adc052e20fd3336b53d2543ed9e23886a776f5 SHA512 f9c3c204b5f0feaf706b23dd9a174feb36a9f3c8db8ffb5dcdefa66b18ba0ac963c6041d2d91a6a2f6e23036fc6486d142210bd5348e10c026a6defeb0bee096
DIST libgusb-0.3.1.tar.xz 38568 BLAKE2B d09afae9d210fde1411de5a0b9b8852eef49f88558ff4c434ef5f2ed9c1c6c29600b96dad73f6873027c5ce0987a3fd99691ffd97d90cfba9f63fbb2cc73f8cd SHA512 5c864e35ec64d1e52ec15ab971c75e0ee3e4664223a6b365815a54819f23342889e5f9739b998799a3af3d37ee75f0ae38ee0d8bca4ed1e2d6ff712f65a53b9a
DIST libgusb-0.3.2.tar.xz 38852 BLAKE2B 72f98e54e9c4716380430103395ad6da830148c7ef4fb3e7e1445fa28c40b6cb1dfc954403896dedcd584d154383c38233abd422e20801a7e2f9165a6b69e4e5 SHA512 db4274b67d775ac0a46df11037dbd4cab84e1128be6d5b579ee5e1f493f3cc9d0950958610207ad5f207423570a86e664a9817885e25f86a858a95f96cfe19c2
+DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
new file mode 100644
index 000000000000..87219dfe567e
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection static-libs test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+ virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ sys-apps/hwids
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ gtk-doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.4
+ dev-util/gtk-doc
+ )
+ vala? ( $(vala_depend) )
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ default
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddefault_library=$(usex static-libs both shared)
+ $(meson_use test tests)
+ -Dvapi=$(multilib_native_usex vala true false)
+ -Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
+ -Ddocs=$(multilib_native_usex gtk-doc true false)
+ -Dintrospection=$(multilib_native_usex introspection true false)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index e5a2eaed32f1..f262ab963c3e 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1 +1,2 @@
DIST libgweather-3.32.2.tar.xz 2716144 BLAKE2B 56bf66edde8293758f49c1ca14b47fb725f72a0202e95e6e1d1832c179fd9414d527827be5cb7daa17627abfbd1ac16d8d09dbdbbdcb24d62cc62c25a220c156 SHA512 61543e5eaf8c04605a91a6f47811b3a0ed2b04c2f50eae9b8d08a4e24904db4731748fa27a0863d2cdab5fde776ec55abe9fd9fb2a72c7bd546665d59957cb4d
+DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba
diff --git a/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch b/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
new file mode 100644
index 000000000000..29956e3f498f
--- /dev/null
+++ b/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
@@ -0,0 +1,27 @@
+From ee246dc058098dee1709d76635e72db35efcef4e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera
+Date: Wed, 20 Nov 2019 10:55:02 +0100
+Subject: [PATCH] tests: Add another duplicate
+
+$ wget -O- -q https://www.aviationweather.gov/docs/metar/stations.txt | grep KX26
+FL SEBASTIAN KX26 X26 27 49N 080 30W 6 X W 8 US
+FL VALKARIA AFS KX26 X26 27 49N 080 30W 6 X 8 US
+---
+ libgweather/test_libgweather.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index 1bfa3d4..8a21911 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -336,6 +336,7 @@ parse_metar_stations (const char *contents)
+ "KHQG",
+ "KOEL",
+ "KTQK",
++ "KX26",
+ NULL
+ };
+ if (g_strv_contains (known_duplicates, station)) {
+--
+2.24.1
+
diff --git a/dev-libs/libgweather/libgweather-3.34.0.ebuild b/dev-libs/libgweather/libgweather-3.34.0.ebuild
new file mode 100644
index 000000000000..c92f920bd9ec
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.34.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
+
+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"
+
+RDEPEND="
+ >=dev-libs/glib-2.44.0:2
+ >=x11-libs/gtk+-3.13.5:3[introspection?]
+ >=net-libs/libsoup-2.44:2.4
+ >=dev-libs/libxml2-2.6.0:2
+ sci-geosciences/geocode-glib
+ >=sys-libs/timezone-data-2010k
+
+ glade? ( >=dev-util/glade-3.16:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.11
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+"
+
+PATCHES=(
+ "${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+ "${FILESDIR}"/${PV}-tests-Add-another-duplicate.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use glade glade_catalog)
+ $(meson_use vala enable_vala)
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index fdf5ee9550e4..05d375d16b1f 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -65,7 +65,7 @@ multilib_src_install_all() {
use doc && HTML_DOCS=(doc/*)
default_src_install
if use doc; then
- rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+ rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
fi
find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/libmspack/libmspack-9999.ebuild b/dev-libs/libmspack/libmspack-9999.ebuild
index 4c72d6fbe69a..31e174d47f43 100644
--- a/dev-libs/libmspack/libmspack-9999.ebuild
+++ b/dev-libs/libmspack/libmspack-9999.ebuild
@@ -63,7 +63,7 @@ multilib_src_install_all() {
use doc && HTML_DOCS=(doc/*)
default_src_install
if use doc; then
- rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+ rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
fi
find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 622656e3a5f3..8fcd920a4772 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -27,19 +27,19 @@ src_compile() {
emake \
CC=$(tc-getCC) \
CFLAGS="-I. ${CFLAGS}" \
- DIET="${EPREFIX%/}/usr/bin/diet -Os" \
- prefix="${EPREFIX%/}/usr" \
- INCLUDEDIR="${EPREFIX%/}/usr/include" \
+ DIET="${EPREFIX}/usr/bin/diet -Os" \
+ prefix="${EPREFIX}/usr" \
+ INCLUDEDIR="${EPREFIX}/usr/include" \
$( use diet || echo 'DIET=' )
}
src_install() {
emake \
- DESTDIR="${D%/}" \
- LIBDIR="${EPREFIX%/}/usr/$(get_libdir)" \
- MAN3DIR="${EPREFIX%/}/usr/share/man/man3" \
- INCLUDEDIR="${EPREFIX%/}/usr/include" \
+ DESTDIR="${D}" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ MAN3DIR="${EPREFIX}/usr/share/man/man3" \
+ INCLUDEDIR="${EPREFIX}/usr/include" \
install
- mv "${ED%/}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+ mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
}
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
similarity index 95%
rename from dev-libs/libpeas/libpeas-1.22.0.ebuild
rename to dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
index c4cdb1939630..d2eec7dc5313 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
!luajit? ( =dev-lang/lua-5.1*:0 ) )
python? (
${PYTHON_DEPS}
- >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
DEPEND="${RDEPEND}
dev-util/glib-utils
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
index 45ec518c2990..41b9508b37d1 100644
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
@@ -45,11 +45,11 @@ src_test() {
einfo "The tests need a running PostgreSQL server and an existing database."
einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
einfo "set PGPORT and PGHOST. Define them at the command line or in:"
- einfo " ${EROOT%/}/etc/libpqxx_test_env"
+ einfo " ${EROOT}/etc/libpqxx_test_env"
if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
- if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
- source "${EROOT%/}/etc/libpqxx_test_env"
+ if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
+ source "${EROOT}/etc/libpqxx_test_env"
[[ -n $PGDATABASE ]] && export PGDATABASE
[[ -n $PGHOST ]] && export PGHOST
[[ -n $PGPORT ]] && export PGPORT
diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
index d9ecc72540b0..1ee1e2a50841 100644
--- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
dev-libs/pugixml
- dev-python/sip[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
index d9ecc72540b0..1ee1e2a50841 100644
--- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
dev-libs/pugixml
- dev-python/sip[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
index 26c10c69fca2..55f2b677a7ef 100644
--- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
dev-libs/pugixml
- dev-python/sip[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
similarity index 94%
rename from dev-libs/libsavitar/libsavitar-4.3.0.ebuild
rename to dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
index 1b2ed0ae3c2b..599349de9add 100644
--- a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="${PYTHON_DEPS}
dev-libs/pugixml
- dev-python/sip[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
index 71d047416824..a4f3ba2ec144 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
MyPN=secp256k1
DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin/secp256k1"
COMMITHASH="6c527eceee7f5105c33c98dfae24ffeffd71f7cf"
SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz"
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
index 7716244ab405..5d593b8155f6 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
MyPN=secp256k1
DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin/secp256k1"
COMMITHASH="8225239f490f79842a5a3b82ad6cc8aa11d5208e"
SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
index bd971f602e6d..86225fa50e57 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
MyPN=secp256k1
DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
COMMITHASH="7a78f60598a6aeb635ef227ead50fb44a209c363"
SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index ae2f2abfab91..57808ea31a87 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug dbus +introspection"
RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 0538409e7f89..c20d503efe82 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
LICENSE="LGPL-2.1"
SLOT="3"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug +introspection"
RDEPEND="
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 3379c58070f1..4289f375ea65 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 526631f87c13..44dc960dbf09 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,5 +3,6 @@ DIST nss-3.48.tar.gz 76481237 BLAKE2B aded12d9f917d87e6fe32bc6c57b19e478507919c7
DIST nss-3.49.1.tar.gz 76489134 BLAKE2B 4b1ceb6e1a366f506d13ceaa88663fba400318bff872305993369c2caa1e1aef654fa02308957bc2a2774b7e0b4bafd097ad16831d38d7da53753991419839b7 SHA512 e463c9d71537ac30dbd2998cbdbc0cadc734768a6f3a316c57b6a6d01ad6d26ca732dff65e9c88555a834ae7d71fc857e4cbc1799438069f544a1e27f75985e8
DIST nss-3.49.2.tar.gz 76489641 BLAKE2B 844a88984fde45142093ee6df2934d89cb4911d3e716019c0d1620254064af51b56249bc4348816e546c5dcab66d7fc9d4def32021661f4f3d868e09c342abec SHA512 fe0fe032db15853384a50b145dd6f3187a855109f0b81f1846312d33f8c628aededcbca4d199f974ae52530aec3f2312f80afbca3e5b97ed1ff96fcffafd2881
DIST nss-3.49.tar.gz 76488781 BLAKE2B 12ce6477b95bc0b0623cfe297c771832818798e39d1ab5cbc7f30e21336644498f5201abeb2ea1cbfd7cf75d64e4423152b9fe4e5c6b1761c5c049ec3da0e9fc SHA512 7d8df73a2e585585a7cb3f887af3f933854984479531b3dd30316873bdd92c130e2fadb54e7b3b1f0b10675b1bce09112ef39860d74ef6f0df7b57bf430bd072
+DIST nss-3.50.tar.gz 78041630 BLAKE2B 4d21a1cac475936e153b22829f8b4b2f6f6a57c41e14d091b287aba633a8d4c80c045882ce6f1cb7a2f9ce760d616b13389f90e59f60250c41080ed1f5a4900a SHA512 d6bcaf8ad65b5a97c42cd6cbbc68add5c4b49db74b2debcedb2a007f72511ac0e9bd21fd2dec041bc1975cfc8af26a48450aa0d1b962f755931ab2ac45c795b1
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
diff --git a/dev-libs/nss/nss-3.50.ebuild b/dev-libs/nss/nss-3.50.ebuild
new file mode 100644
index 000000000000..c3b9fde93445
--- /dev/null
+++ b/dev-libs/nss/nss-3.50.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.25"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+ cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+ nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem utils"
+BDEPEND="
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+ >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+ >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/nss-config
+)
+
+PATCHES=(
+ # Custom changes for gentoo
+ "${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
+ "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+ "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+ unpack ${A}
+ if use nss-pem ; then
+ mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+ fi
+}
+
+src_prepare() {
+ if use nss-pem ; then
+ PATCHES+=(
+ "${FILESDIR}/${PN}-3.47-enable-pem.patch"
+ )
+ fi
+ if use cacert ; then #521462
+ PATCHES+=(
+ "${DISTDIR}/${PN}-cacert-class1-class3.patch"
+ )
+ fi
+
+ default
+
+ pushd coreconf >/dev/null || die
+ # hack nspr paths
+ echo 'INCLUDES += -I$(DIST)/include/dbm' \
+ >> headers.mk || die "failed to append include"
+
+ # modify install path
+ sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+ -i source.mk || die
+
+ # Respect LDFLAGS
+ sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+ popd >/dev/null || die
+
+ # Fix pkgconfig file for Prefix
+ sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+ config/Makefile || die
+
+ # use host shlibsign if need be #436216
+ if tc-is-cross-compiler ; then
+ sed -i \
+ -e 's:"${2}"/shlibsign:shlibsign:' \
+ cmd/shlibsign/sign.sh || die
+ fi
+
+ # dirty hack
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+ lib/ssl/config.mk || die
+ sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+ cmd/platlibs.mk || die
+
+ multilib_copy_sources
+
+ strip-flags
+}
+
+multilib_src_configure() {
+ # Ensure we stay multilib aware
+ sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+ # Most of the arches are the same as $ARCH
+ local t=${1:-${CHOST}}
+ case ${t} in
+ aarch64*)echo "aarch64";;
+ hppa*) echo "parisc";;
+ i?86*) echo "i686";;
+ x86_64*) echo "x86_64";;
+ *) tc-arch ${t};;
+ esac
+}
+
+nssbits() {
+ local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+ if [[ ${1} == BUILD_ ]]; then
+ cc=$(tc-getBUILD_CC)
+ else
+ cc=$(tc-getCC)
+ fi
+ echo > "${T}"/test.c || die
+ ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+ case $(file "${T}/${1}test.o") in
+ *32-bit*x86-64*) echo USE_X32=1;;
+ *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+ esac
+}
+
+multilib_src_compile() {
+ # use ABI to determine bit'ness, or fallback if unset
+ local buildbits mybits
+ case "${ABI}" in
+ n32) mybits="USE_N32=1";;
+ x32) mybits="USE_X32=1";;
+ s390x|*64) mybits="USE_64=1";;
+ ${DEFAULT_ABI})
+ einfo "Running compilation test to determine bit'ness"
+ mybits=$(nssbits)
+ ;;
+ esac
+ # bitness of host may differ from target
+ if tc-is-cross-compiler; then
+ buildbits=$(nssbits BUILD_)
+ fi
+
+ local makeargs=(
+ CC="$(tc-getCC)"
+ CCC="$(tc-getCXX)"
+ AR="$(tc-getAR) rc \$@"
+ RANLIB="$(tc-getRANLIB)"
+ OPTIMIZER=
+ ${mybits}
+ )
+
+ # Take care of nspr settings #436216
+ local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+ unset NSPR_INCLUDE_DIR
+
+ # Do not let `uname` be used.
+ if use kernel_linux ; then
+ makeargs+=(
+ OS_TARGET=Linux
+ OS_RELEASE=2.6
+ OS_TEST="$(nssarch)"
+ )
+ fi
+
+ export NSS_ALLOW_SSLKEYLOGFILE=1
+ export NSS_ENABLE_WERROR=0 #567158
+ export BUILD_OPT=1
+ export NSS_USE_SYSTEM_SQLITE=1
+ export NSDISTMODE=copy
+ export NSS_ENABLE_ECC=1
+ export FREEBL_NO_DEPEND=1
+ export FREEBL_LOWHASH=1
+ export NSS_SEED_ONLY_DEV_URANDOM=1
+ export ASFLAGS=""
+
+ local d
+
+ # Build the host tools first.
+ LDFLAGS="${BUILD_LDFLAGS}" \
+ XCFLAGS="${BUILD_CFLAGS}" \
+ NSPR_LIB_DIR="${T}/fakedir" \
+ emake -j1 -C coreconf \
+ CC="$(tc-getBUILD_CC)" \
+ ${buildbits:-${mybits}}
+ makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+ # Then build the target tools.
+ for d in . lib/dbm ; do
+ CPPFLAGS="${myCPPFLAGS}" \
+ XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ NSPR_LIB_DIR="${T}/fakedir" \
+ emake -j1 "${makeargs[@]}" -C ${d}
+ done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+# */${local_libdir}/libfreebl3.so*
+# */${local_libdir}/libnssdbm3.so*
+# */${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+ local shlibsign="$1"
+ local libdir="$2"
+ einfo "Resigning core NSS libraries for FIPS validation"
+ shift 2
+ local i
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libname=lib${i}.so
+ local chkname=lib${i}.chk
+ "${shlibsign}" \
+ -i "${libdir}"/${libname} \
+ -o "${libdir}"/${chkname}.tmp \
+ && mv -f \
+ "${libdir}"/${chkname}.tmp \
+ "${libdir}"/${chkname} \
+ || die "Failed to sign ${libname}"
+ done
+}
+
+cleanup_chk() {
+ local libdir="$1"
+ shift 1
+ local i
+ for i in ${NSS_CHK_SIGN_LIBS} ; do
+ local libfname="${libdir}/lib${i}.so"
+ # If the major version has changed, then we have old chk files.
+ [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+ && rm -f "${libfname}.chk"
+ done
+}
+
+multilib_src_install() {
+ pushd dist >/dev/null || die
+
+ dodir /usr/$(get_libdir)
+ cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+ local i
+ for i in crmf freebl nssb nssckfw ; do
+ cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+ done
+
+ # Install nss-config and pkgconfig file
+ dodir /usr/bin
+ cp -L */bin/nss-config "${ED}"/usr/bin || die
+ dodir /usr/$(get_libdir)/pkgconfig
+ cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+ # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+ # bug 517266
+ sed -e 's#Libs:#Libs: -lfreebl#' \
+ -e 's#Cflags:#Cflags: -I${includedir}/private#' \
+ */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+ || die "could not create nss-softokn.pc"
+
+ # all the include files
+ insinto /usr/include/nss
+ doins public/nss/*.{h,api}
+ insinto /usr/include/nss/private
+ doins private/nss/{blapi,alghmac}.h
+
+ popd >/dev/null || die
+
+ local f nssutils
+ # Always enabled because we need it for chk generation.
+ nssutils=( shlibsign )
+
+ if multilib_is_native_abi ; then
+ if use utils; then
+ # The tests we do not need to install.
+ #nssutils_test="bltest crmftest dbtest dertimetest
+ #fipstest remtest sdrtest"
+ # checkcert utils has been removed in nss-3.22:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+ # https://hg.mozilla.org/projects/nss/rev/df1729d37870
+ # certcgi has been removed in nss-3.36:
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+ nssutils+=(
+ addbuiltin
+ atob
+ baddbdir
+ btoa
+ certutil
+ cmsutil
+ conflict
+ crlutil
+ derdump
+ digest
+ makepqg
+ mangle
+ modutil
+ multinit
+ nonspr10
+ ocspclnt
+ oidcalc
+ p7content
+ p7env
+ p7sign
+ p7verify
+ pk11mode
+ pk12util
+ pp
+ rsaperf
+ selfserv
+ signtool
+ signver
+ ssltap
+ strsclnt
+ symkeyutil
+ tstclnt
+ vfychain
+ vfyserv
+ )
+ # install man-pages for utils (bug #516810)
+ doman doc/nroff/*.1
+ fi
+ pushd dist/*/bin >/dev/null || die
+ for f in ${nssutils[@]}; do
+ dobin ${f}
+ done
+ popd >/dev/null || die
+ fi
+
+ # Prelink breaks the CHK files. We don't have any reliable way to run
+ # shlibsign after prelink.
+ dodir /etc/prelink.conf.d
+ printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+ > "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+ multilib_pkg_postinst() {
+ # We must re-sign the libraries AFTER they are stripped.
+ local shlibsign="${EROOT}/usr/bin/shlibsign"
+ # See if we can execute it (cross-compiling & such). #436216
+ "${shlibsign}" -h >&/dev/null
+ if [[ $? -gt 1 ]] ; then
+ shlibsign="shlibsign"
+ fi
+ generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+ }
+
+ multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_pkg_postrm() {
+ cleanup_chk "${EROOT}"/usr/$(get_libdir)
+ }
+
+ multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/re2/re2-0.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
index 92704cdfd86f..e160a28429ed 100644
--- a/dev-libs/re2/re2-0.2019.12.01.ebuild
+++ b/dev-libs/re2/re2-0.2019.12.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
# https://abi-laboratory.pro/tracker/timeline/re2/
SONAME="gentoo-2019-01-01"
SLOT="0/${SONAME}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE="icu"
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index ef987e96e653..5afa6b050632 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2015-2019 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -22,7 +22,7 @@ fi
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d8ff1d035179..3aa240b5f414 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
index cba06ddf9e13..1a27643bcde4 100644
--- a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit opam
DESCRIPTION="Tool and library implementing patience diff"
-HOMEPAGE="https://github.com/janestreet/${PN}"
+HOMEPAGE="https://github.com/janestreet/patience_diff"
SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild b/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild
index f0c62c2ca0c2..6cc34ef803f1 100644
--- a/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild
+++ b/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Read the CDDB entry for an audio CD in your drive"
SRC_URI+=" http://armin.emx.at/cddb/${PN}-${MODULE_VERSION}.tar.gz"
-HOMEPAGE="http://armin.emx.at/cddb/ ${HOMEPAGE}"
+HOMEPAGE="http://armin.emx.at/cddb/ https://metacpan.org/release/CDDB_get"
LICENSE="|| ( Artistic GPL-2 )" # "as perl, either GPL-2 or Artistic"
SLOT="2"
diff --git a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
index be9328a33caf..b5d1b93affea 100644
--- a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
+++ b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=3.10
inherit perl-module
DESCRIPTION="Extremely fast, reliable form generation and processing module"
-HOMEPAGE="http://www.formbuilder.org/ ${HOMEPAGE}"
+HOMEPAGE="http://www.formbuilder.org/ https://metacpan.org/release/CGI-FormBuilder"
SLOT="0"
KEYWORDS="amd64 ~x86"
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
index 9291b32be8e9..8fc6ed047063 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=1.30
inherit perl-module
DESCRIPTION="Perl API for memcached"
-HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"
+HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Memcached"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild b/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
index c9f3e0f81b81..87a9471452e5 100644
--- a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
+++ b/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=("test.pl")
inherit perl-module
DESCRIPTION="Provide high level APIs for rapid user interface design on the console in Perl"
-HOMEPAGE="http://www.digitalmages.com/perl/CursesWidgets/index.html ${HOMEPAGE}"
+HOMEPAGE="http://www.digitalmages.com/perl/CursesWidgets/index.html https://metacpan.org/release/CursesWidgets"
SRC_URI+=" http://www.digitalmages.com/perl/CursesWidgets/downloads/${PN}-${DIST_VERSION}.tar.gz"
SLOT="0"
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
index 7990f37b2599..fdd2457611a2 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
@@ -43,7 +43,7 @@ src_configure() {
--testuser=test \
--testpassword=test"
fi
- myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config"
+ myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config"
perl-module_src_configure
}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
index 79609e1cbaa5..e2eb88d676fb 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
@@ -45,7 +45,7 @@ src_configure() {
--testuser=test \
--testpassword=test"
fi
- myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config"
+ myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config"
perl-module_src_configure
}
diff --git a/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild b/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
index c63421eab2da..f74082313566 100644
--- a/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
+++ b/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=0.14
inherit perl-module
DESCRIPTION="Structured Tags datastructures"
-HOMEPAGE="http://stag.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://stag.sourceforge.net/ https://metacpan.org/release/Data-Stag"
SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
index 228838985eca..adb6e567b290 100644
--- a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=0.74
inherit perl-module
DESCRIPTION="An rsync perl module"
-HOMEPAGE="http://perlrsync.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-RsyncP"
LICENSE="GPL-3"
SLOT="0"
diff --git a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
index 7a32dd581060..09907f1804e0 100644
--- a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
+++ b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Perl bindings for GTK2"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
index 86f0eb3f7ed9..586e51f57e17 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=1.56
inherit depend.apache perl-module
DESCRIPTION="A HTML development and delivery Perl Module"
-HOMEPAGE="http://www.masonhq.com/ ${HOMEPAGE}"
+HOMEPAGE="http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason"
SLOT="0"
KEYWORDS="amd64 ppc x86"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 4be1683f2dea..5ed0594ac957 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
index 8d2a778a8ff5..e16151bcaa80 100644
--- a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=${PV%0.0}
inherit user perl-module
DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
+HOMEPAGE="http://www.danga.com/mogilefs/ https://metacpan.org/release/MogileFS-Server"
IUSE="mysql +sqlite test postgres"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
index 8d2a778a8ff5..e16151bcaa80 100644
--- a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=${PV%0.0}
inherit user perl-module
DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
+HOMEPAGE="http://www.danga.com/mogilefs/ https://metacpan.org/release/MogileFS-Server"
IUSE="mysql +sqlite test postgres"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild b/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
index 1ea3d1f9419f..e99a4883524e 100644
--- a/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
+++ b/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=( "tools/*" )
inherit perl-module
DESCRIPTION="Parse nmap scan data with perl"
-HOMEPAGE="https://nmapparser.wordpress.com/ ${HOMEPAGE}"
+HOMEPAGE="https://nmapparser.wordpress.com/ https://metacpan.org/release/Nmap-Parser"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-perl/Pango/Pango-1.227.0.ebuild b/dev-perl/Pango/Pango-1.227.0.ebuild
index 70865338759a..ee8f6d906915 100644
--- a/dev-perl/Pango/Pango-1.227.0.ebuild
+++ b/dev-perl/Pango/Pango-1.227.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="Layout and render international text"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
index 8209ba071c5c..ac109653d41b 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=( "examples/*" )
inherit perl-module
DESCRIPTION="Perl script indenter and beautifier"
-HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
index 56aeb9a1df10..86ce647ae214 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=( "examples/*" )
inherit perl-module
DESCRIPTION="Perl script indenter and beautifier"
-HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/dev-perl/Wx/Wx-0.993.200-r1.ebuild b/dev-perl/Wx/Wx-0.993.200-r1.ebuild
index c2a53f89397e..c9b2d48decde 100644
--- a/dev-perl/Wx/Wx-0.993.200-r1.ebuild
+++ b/dev-perl/Wx/Wx-0.993.200-r1.ebuild
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("samples/*")
inherit wxwidgets virtualx perl-module
DESCRIPTION="Perl bindings for wxGTK"
-HOMEPAGE="http://wxperl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://wxperl.sourceforge.net/ https://metacpan.org/release/Wx"
SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild b/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild
index e97859a3ab1b..c5ca1ed03445 100644
--- a/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild
+++ b/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild
@@ -9,7 +9,7 @@ MY_P="${P/_/}"
S=${WORKDIR}/${MY_P}
DESCRIPTION="A Perl module providing a simple API to parsed XML instances"
-HOMEPAGE="http://cpan.org/modules/by-module/XML/${MY_P}.readme"
+HOMEPAGE="http://cpan.org/modules/by-module/XML/XML-Grove-0.46alpha.readme"
SRC_URI="mirror://cpan/authors/id/K/KM/KMACLEOD/${MY_P}.tar.gz"
LICENSE="Artistic"
diff --git a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
index 9868f61f2457..ec9048826388 100644
--- a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
@@ -9,7 +9,7 @@ DIST_VERSION=1.326
inherit perl-module
DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild b/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
index c3fc6d537e34..900fa8f694f2 100644
--- a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
@@ -9,7 +9,7 @@ DIST_VERSION=1.3291
inherit perl-module
DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild b/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
index 5e38cd37b7f3..27d7658a085c 100644
--- a/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
+++ b/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
@@ -9,7 +9,7 @@ DIST_VERSION=1.046
inherit perl-module
DESCRIPTION="Perl interface to the 2.x series of the Gnome libraries"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild
index 7b100ffbf40c..a5691e46bd67 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r1.ebuild
@@ -10,7 +10,7 @@ MODULE_VERSION=0.16
inherit perl-module
DESCRIPTION="Perl interface to the Window Navigator Construction Kit"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-Wnck"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
index 1bad8aea6f51..cf939c1464fa 100644
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
+++ b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
@@ -10,7 +10,7 @@ DIST_VERSION=0.16
inherit perl-module virtualx
DESCRIPTION="Perl interface to the Window Navigator Construction Kit"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-Wnck"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild b/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild
index 90e0d404d4ea..c05437de9917 100644
--- a/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild
+++ b/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_PN=Gtk2-Ex-FormFactory
inherit perl-module
DESCRIPTION="Gtk2 FormFactory"
-HOMEPAGE="https://www.exit1.org/Gtk2-Ex-FormFactory/ ${HOMEPAGE}"
+HOMEPAGE="https://www.exit1.org/Gtk2-Ex-FormFactory/ https://metacpan.org/release/Gtk2-Ex-FormFactory"
LICENSE="|| ( LGPL-2.1 LGPL-3 )" #LGPL-2.1+
SLOT="0"
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild
index 16b4717590dd..de46a8338460 100644
--- a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild
+++ b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r1.ebuild
@@ -9,7 +9,7 @@ MODULE_VERSION=1.007
inherit perl-module
DESCRIPTION="Create user interfaces directly from Glade XML files"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML"
SLOT="0"
LICENSE="LGPL-2"
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
index 38d0097fbf6d..66525ac72a4a 100644
--- a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
+++ b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("examples/*")
inherit perl-module virtualx
DESCRIPTION="Create user interfaces directly from Glade XML files"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML"
SLOT="0"
LICENSE="LGPL-2"
diff --git a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild
index 404dd8f31d7f..221029075545 100644
--- a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild
+++ b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,11 +9,11 @@ MODULE_VERSION=1.04
inherit perl-module
DESCRIPTION="Bindings for GtkSpell with Gtk2.x"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-Spell"
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
index 6c89f664b3b7..f22825e510af 100644
--- a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
+++ b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,11 +9,11 @@ DIST_VERSION=1.04
inherit perl-module virtualx
DESCRIPTION="Bindings for GtkSpell with Gtk2.x"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-Spell"
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
index 74b44e27157d..3090203ed644 100644
--- a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
+++ b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("examples/*")
inherit perl-module virtualx
DESCRIPTION="Perl wrappers for the egg cup Gtk2::TrayIcon utilities"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayIcon"
LICENSE="LGPL-2"
SLOT="0"
diff --git a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild
index 808eca3636be..a816563655a7 100644
--- a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild
+++ b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r1.ebuild
@@ -9,7 +9,7 @@ MODULE_VERSION=0.05
inherit perl-module
DESCRIPTION="Perl bindings for EggTrayManager"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayManager"
SLOT="0"
LICENSE="LGPL-2"
diff --git a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
index 7d8dc38456d6..564ceeaae09a 100644
--- a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
+++ b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("examples/*")
inherit perl-module virtualx
DESCRIPTION="Perl bindings for EggTrayManager"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayManager"
SLOT="0"
LICENSE="LGPL-2"
diff --git a/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
index f9c207a85240..641a509b85e7 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=1.28
inherit perl-module
DESCRIPTION="High-Level Interface to Uniforum Message Translation"
-HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
+HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/release/libintl-perl"
LICENSE="GPL-3"
SLOT="0"
diff --git a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
index 9406131c0a0c..e3fc31f49573 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=("sample/*")
inherit perl-module
DESCRIPTION="High-Level Interface to Uniforum Message Translation"
-HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
+HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/release/libintl-perl"
LICENSE="GPL-3"
SLOT="0"
diff --git a/dev-perl/perl-headers/perl-headers-0.0.1.ebuild b/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
index 0269d8e9421f..66c338729fbb 100644
--- a/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
+++ b/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
@@ -8,7 +8,7 @@ inherit perl-functions flag-o-matic readme.gentoo-r1
MY_GITV="${PV}"
DESCRIPTION="Generated .ph equivalents of system headers"
-HOMEPAGE="https://github.com/gentoo-perl/${PN}"
+HOMEPAGE="https://github.com/gentoo-perl/perl-headers"
SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${MY_GITV}.tar.gz -> ${PN}-${MY_GITV}.tar.gz"
LICENSE="|| ( Artistic GPL-1+ )"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index e28484f1e614..7662b5aba8ee 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
index 606b86b09a81..a0ecf007427a 100644
--- a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
+++ b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A full-featured command-line options and arguments parser"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Console_CommandLine"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
index 28d8f87ef159..3d8124cc3d8a 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Command-line option parser"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Console_Getopt"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
index 0e3691e00519..f4b17aa20914 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -8,7 +8,7 @@ MY_PV="${PV/_/}"
MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
index a3270a7d8bd5..be0e730b392b 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
@@ -8,7 +8,7 @@ MY_PV="${PV/_/}"
MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 17309af49608..5354988b5d97 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/-/_}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="The PEAR Exception base class"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR_Exception"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
index efd696159702..4a105a116a8e 100644
--- a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
+++ b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Easily manipulate archives in PHP"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/File_Archive"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
index 72c3e1fd1f34..72bb7d8266f0 100644
--- a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A class that facillitates the search of filesystems"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/File_Find"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild b/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
index 73706122eb1e..f2f9dd38c320 100644
--- a/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
+++ b/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
@@ -9,7 +9,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-HOMEPAGE="https://pear.php.net/package/${MY_PN}/"
+HOMEPAGE="https://pear.php.net/package/HTML_AJAX/"
SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
index 911e6d7b7879..e0c2693cc69a 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="The Log framework provides an abstracted logging system"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Log"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
index 5d2996f4a41a..dca5bd5d1768 100644
--- a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
@@ -7,7 +7,8 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Pure-PHP arbitrary precision integer arithmetic library"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}
+HOMEPAGE="
+ https://pear.php.net/package/Math_BigInteger
http://phpseclib.sourceforge.net/documentation/math.html"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="MIT"
diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
index 0e7b237afb3e..684da6b3d19f 100644
--- a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="PHP library to query DNS blacklists"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_DNSBL"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
index 99f3e01fd091..0d3253852184 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="${PN/PEAR-/}"
KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_LDAP2"
SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
index 969c79b32834..f6232ecee83b 100644
--- a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
+++ b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="OS independent wrapper class for executing ping calls"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_Ping"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
index 03ce6050db04..090e3163215d 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A PHP implementation of the SMTP protocol"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_SMTP"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
index 65b32a4c7a3c..6985ebb6e8ea 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A PHP implementation of the SMTP protocol"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_SMTP"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
index 55f2af80388d..b6c53ee23e68 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="${PN/PEAR-/}"
DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
-HOMEPAGE="https://github.com/roundcube/${MY_PN}"
+HOMEPAGE="https://github.com/roundcube/Net_Sieve"
SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
index f2967f670229..22a2d6512771 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="${PN/PEAR-/}"
DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
-HOMEPAGE="https://github.com/roundcube/${MY_PN}"
+HOMEPAGE="https://github.com/roundcube/Net_Sieve"
SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
index 92adafc19fd1..b8fc04992e4c 100644
--- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_SmartIRC"
# The PEAR tarball is missing some docs as of v1.10.0.
SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.tar.gz
-> ${MY_P}.tar.gz"
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
index 845170dccb02..67a23271e0d9 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Provides methods for spelling numerals in words"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Numbers_Words"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
index ac85f59deb70..79577a7da91b 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="MIT"
KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
index 8472eb060991..00e1ccd448bd 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="MIT"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
index 8472eb060991..00e1ccd448bd 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="MIT"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
index a4dcf2208c5f..6e8a99713eab 100644
--- a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
+++ b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Code Beautifier for PHP"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PHP_Beautifier"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild b/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
index d50b612502eb..2a7d8020837c 100644
--- a/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Provides an object oriented interface for the W3 CSS Validator"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Services_W3C_CSSValidator"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
index a9aac2347bc6..0f9b4ed8f276 100644
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Graph datastructure manipulation library"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Structures_Graph"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
index ef408662b86b..57359214cc4d 100644
--- a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
+++ b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="PHP command-line execution interface"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/System_Command"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
index 2e7a9c7fc7e1..3fe22d40db35 100644
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
+++ b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Render text using FIGlet fonts"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Text_Figlet"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01
examples? ( GPL-2+ OFL-1.1 )"
diff --git a/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
index 3e798dfb76fe..091c8b3ea319 100644
--- a/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
+++ b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A package for syntax highlighting"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Text_Highlighter"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
index 3da1e00f46ef..b9a1067c147c 100644
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Creating passwords with PHP"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Text_Password"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
index 3ad733e0de0a..50fd9ed67bd4 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
@@ -9,7 +9,7 @@ MY_PV="${MY_PV/alpha/a}"
MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="PHP parser for RDF and RSS documents"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/XML_RSS"
SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
LICENSE="PHP-3.01"
SLOT="0"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
index ab467bafa688..80e864530458 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="${PN/doctrine-//}"
DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
-HOMEPAGE="https://github.com/doctrine/${MY_PN}"
+HOMEPAGE="https://github.com/doctrine/instantiator"
SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
index 9ca2b9c37c06..6ace5f9593c2 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="${PN/doctrine-//}"
DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
-HOMEPAGE="https://github.com/doctrine/${MY_PN}"
+HOMEPAGE="https://github.com/doctrine/instantiator"
SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
index 5663a274a2d6..bb320327c3ea 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
@@ -15,7 +15,7 @@ USE_PHP="php5-6 php7-1 php7-2 php7-3"
inherit php-ext-source-r3
DESCRIPTION="PHP reader for the MaxMind database format"
-HOMEPAGE="https://github.com/maxmind/${MY_PN}"
+HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
index a1e214ab0692..7c49fd221d17 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="DeepCopy"
DESCRIPTION="Create deep copies (clones) of your objects"
-HOMEPAGE="https://github.com/myclabs/${MY_PN}"
+HOMEPAGE="https://github.com/myclabs/DeepCopy"
SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
index 6966ccfabd29..6e9c25144e28 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
MY_PN="DeepCopy"
DESCRIPTION="Create deep copies (clones) of your objects"
-HOMEPAGE="https://github.com/myclabs/${MY_PN}"
+HOMEPAGE="https://github.com/myclabs/DeepCopy"
SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
index 78a322edae68..70cafd890093 100644
--- a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
+++ b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="A simple, object-oriented, PHP Redmine API client"
-HOMEPAGE="https://github.com/kbsali/${PN}"
+HOMEPAGE="https://github.com/kbsali/php-redmine-api"
SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
index feca4c001439..e15edc95d6c6 100644
--- a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
+++ b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="A simple, object-oriented, PHP Redmine API client"
-HOMEPAGE="https://github.com/kbsali/${PN}"
+HOMEPAGE="https://github.com/kbsali/php-redmine-api"
SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
index 629ec768de12..19558aae6009 100644
--- a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
+++ b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
@@ -14,7 +14,7 @@ inherit php-ext-source-r3
MY_PV="${PV/_/}"
DESCRIPTION="PHP extension to re-enable realpath cache when using open_basedir restriction"
-HOMEPAGE="https://github.com/Whissi/${PN}/"
+HOMEPAGE="https://github.com/Whissi/realpath_turbo/"
SRC_URI="https://github.com/Whissi/${PN}/releases/download/v${MY_PV}/${P}.tar.bz2"
LICENSE="BSD-2"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0ef540dc9415..8dc90281a775 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
similarity index 79%
rename from dev-python/basemap/basemap-1.0.7-r1.ebuild
rename to dev-python/basemap/basemap-1.0.7-r2.ebuild
index 21c1f248697e..f6f476179223 100644
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild
@@ -3,6 +3,7 @@
EAPI=5
+DISTUTILS_SINGLE_IMPL=1
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
@@ -16,20 +17,21 @@ SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
LICENSE="MIT GPL-2"
-CDEPEND="sci-libs/shapelib
- || (
- >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
- >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
- )
- >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
+DEPEND="sci-libs/shapelib
+ $(python_gen_cond_dep '
+ || (
+ >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
+ >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
- >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/dap[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+ dev-python/dap[${PYTHON_MULTI_USEDEP}]
+ ')"
DOCS="FAQ API_CHANGES"
#REQUIRED_USE="test? ( examples )"
diff --git a/dev-python/basemap/basemap-1.0.7-r3.ebuild b/dev-python/basemap/basemap-1.0.7-r4.ebuild
similarity index 79%
rename from dev-python/basemap/basemap-1.0.7-r3.ebuild
rename to dev-python/basemap/basemap-1.0.7-r4.ebuild
index 97bcfc3f839b..38c0bfb4645e 100644
--- a/dev-python/basemap/basemap-1.0.7-r3.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r4.ebuild
@@ -3,6 +3,7 @@
EAPI=5
+DISTUTILS_SINGLE_IMPL=1
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
@@ -16,20 +17,21 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="MIT GPL-2"
-CDEPEND="sci-libs/shapelib
- || (
- >=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
- >=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
- )
- >=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
+DEPEND="sci-libs/shapelib
+ $(python_gen_cond_dep '
+ || (
+ >=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
+ >=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
- >=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/dap[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ >=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+ dev-python/dap[${PYTHON_MULTI_USEDEP}]
+ ')"
DOCS="FAQ API_CHANGES"
#REQUIRED_USE="test? ( examples )"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index fa4fcb572027..dc9a864b2783 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,5 +2,4 @@ DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b565
DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
-DIST cmd2-0.9.24.tar.gz 580456 BLAKE2B 0f4e32c52589d7493db13aafcff1dcc37b45d27120f546baed0e3541398f7ffde1a381b44fb4ba2f822ffaeff0ae52b7ad5cda509370685c480a76e1d677f7ed SHA512 0d9cf8d203914f9a62ff15fb538440a2a506b1751c381cef75054839f04fedaa3c6a43b7da8ed99dd0c3b17b55641e2a1cf90826cc7948d2798dbb45e53b6639
DIST cmd2-0.9.25.tar.gz 576329 BLAKE2B e3608df62ed47d04b039a71bf876556ac7c6f9dc0355d1593c63ca365fd7baf207a2b4169525911e85c98ffd38c1a603023a9851a2ffc556a99970d57fd393fb SHA512 7361c81ca0dc0276ade2e0de471d86865801b193db8c1fc4064cc8d7311083f95d6e20c67c5540b9e162d37976976d82bc609a0be6524be113fe4b7d3b6d627e
diff --git a/dev-python/cmd2/cmd2-0.9.23.ebuild b/dev-python/cmd2/cmd2-0.9.23.ebuild
index 502253d32c93..e0845861c191 100644
--- a/dev-python/cmd2/cmd2-0.9.23.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-0.9.24.ebuild b/dev-python/cmd2/cmd2-0.9.24.ebuild
deleted file mode 100644
index 78b85c913b6f..000000000000
--- a/dev-python/cmd2/cmd2-0.9.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-python/attrs[${PYTHON_USEDEP}]
- >=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
- >=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
- # tests rely on very specific text wrapping...
- local -x COLUMNS=80
- virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-0.9.25.ebuild b/dev-python/cmd2/cmd2-0.9.25.ebuild
index 0a6f24240007..dd0714d43c10 100644
--- a/dev-python/cmd2/cmd2-0.9.25.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 5f6a671d2f1e..27146fc4878f 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1 +1,2 @@
DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
+DIST dbusmock-0.18.3.tar.gz 72049 BLAKE2B b5ed8ebcae51fedec75fc810e07dc9a38223bcde541cbfddd5d3fbf1ad45d1458e6ad39c1fc69ee77165d751f978cb4483929e823eacbc99a7ae414aebf4d0f0 SHA512 6f7b42eae578ce03024b3b5cc85e82f04a467803f4c8b4cb5193454dcd849038f11e6ce5028ca9dd57ea5a9380c1b754d8fc644b4a24b51deee9e87b409115c3
diff --git a/dev-python/dbusmock/dbusmock-0.18.3.ebuild b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
new file mode 100644
index 000000000000..b5aafa09a899
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/0.18.2-disable-polkitd-tests.patch
+)
+
+python_test() {
+ nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( NEWS README.rst )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
index e2a018ec0ba1..256109284585 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index 92c5445521bb..48251ab53f64 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0.7"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
DEPEND="dev-python/paver[${PYTHON_USEDEP}]
diff --git a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
index 542c711646f2..6decf4fca5b1 100644
--- a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
+++ b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
gnome-base/gnome-common"
# eautoreconf needs gnome-base/gnome-common
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
index 1ca4939cde75..232c41696c51 100644
--- a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
+++ b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ DESCRIPTION="GtkSpell bindings for Python"
# an ebuild, currently. Punt till we actually have to face the issue.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
IUSE="doc examples"
RDEPEND="app-text/gtkspell:2"
diff --git a/dev-python/html2text/html2text-2019.8.11.ebuild b/dev-python/html2text/html2text-2019.8.11.ebuild
index 484d4f543a38..14acb3b2a1eb 100644
--- a/dev-python/html2text/html2text-2019.8.11.ebuild
+++ b/dev-python/html2text/html2text-2019.8.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index 08390e79f9ed..0f9269e5ab40 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
index 2bc0ef26fc64..cd1a2a581174 100644
--- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
index 7b3620197655..d40b39eb77b0 100644
--- a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jeepney/jeepney-0.4.1.ebuild b/dev-python/jeepney/jeepney-0.4.1.ebuild
index 73e95d570650..f17586db8045 100644
--- a/dev-python/jeepney/jeepney-0.4.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
BDEPEND="
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 3e7d57fbcc5e..43809df6ec19 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,2 +1,3 @@
DIST line_profiler-2.0.tar.gz 68478 BLAKE2B fb814b251e8f18a51e65297e57523b85c55b4060444c42d99801aa88c8ee0279abf14def6ecd5a9b09550e46e2d27b3ec809b1333725b00de64b58f117c76ed7 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb
DIST line_profiler-2.1.2.tar.gz 83131 BLAKE2B 0f61d7dbab24988a50c1c0a9dce528cf792ca53b5f4c60f00fd9dabfd3d3e109f2d245867bc1ebb8294fb84343907e3593c416341ea1b0d7ae626cda8a3218d3 SHA512 625a585915d338fe8ef2f37c5b5bc024f769a623380b85725bcf33686e4cc62a211c2e91552e093dee940367b0d2ad306c5cbe7f1e8f1574eb731d128b8e22bd
+DIST line_profiler-3.0.2.tar.gz 44005 BLAKE2B 2237eb5fc26d673eb0b7c1970b7f04ba7df1c5ebe5f1605a818dba218f9b134ddc3647ae91b10b42ad551cc8e4638d39723ac9d62f75ea705bc7ca1ddc41c99b SHA512 db6cd96c7dbab9b0d4844a3283c65dc56724d50ebe1ce439f6a2b3410e96209d812c2baf2795e2c8d78af23e3cd01c67a92aa0aca4533e8e4b661bf2e63f63c1
diff --git a/dev-python/line_profiler/line_profiler-3.0.2.ebuild b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
new file mode 100644
index 000000000000..e7db155b3e30
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/pyutils/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/scikit-build[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/ubelt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/line_profiler/line_profiler-9999.ebuild b/dev-python/line_profiler/line_profiler-9999.ebuild
deleted file mode 100644
index d39393b59017..000000000000
--- a/dev-python/line_profiler/line_profiler-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/rkern/line_profiler"
-EGIT_REPO_URI="https://github.com/rkern/${PN}.git"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
- "
-
-python_test() {
- "${PYTHON}" -m unittest discover -v "${S}"/tests/ \
- || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
index 9039f4a31310..35be66749f84 100644
--- a/dev-python/line_profiler/metadata.xml
+++ b/dev-python/line_profiler/metadata.xml
@@ -13,6 +13,6 @@
line_profiler
- rkern/line_profiler
+ pyutils/line_profiler
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.1.1-r1.ebuild
index 45b31da28123..b00061134ded 100644
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ b/dev-python/markdown/markdown-3.1.1-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
DEPEND="test? (
dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index 6edfca15b539..5a82861a62de 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
HOMEPAGE="https://github.com/PyCQA/mccabe"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-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 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/mechanize/mechanize-0.4.5.ebuild b/dev-python/mechanize/mechanize-0.4.5.ebuild
index f3b42df6b85d..61ce5f94303f 100644
--- a/dev-python/mechanize/mechanize-0.4.5.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( BSD ZPL )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
DEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 683531438669..faca695e6efe 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,3 +1,4 @@
DIST memory_profiler-0.47.tar.gz 33725 BLAKE2B 66fc0e5c579febeea9dcd5132caa6fdbccdb5cb0a2c9083f5abf8aa03baaaafe1f77f72cdbe4d5384c6ce27fd4760511f9a947fda46eee1d81e7125c1dcd2970 SHA512 110e16ecad33068d31cf53b2f0b775d65230d51345f24a4d7d3cafafb706b10a0c7e2d98a799256b0366f1bafa9b69c060222595bb4eb9e1689301428a36fc3d
DIST memory_profiler-0.54.0.tar.gz 31376 BLAKE2B 4c89a046bdce36a139448dde45c8cf952aaa8fe8e2089bf9574a8fb2ed1abb89991e54f59742b0ea1ae5315378c0799ef140752549f9a8d13a91bf0ceb021984 SHA512 ec5735b7e41e706ea35ce9fe0dd3963c51e50e5bdf7f1871c51bbbb2a0ae75abcdba23abd3a14979c26ce19e7ce7d2cf6782aefc77e0c17cfe4da573a6e249ae
DIST memory_profiler-0.55.0.tar.gz 40951 BLAKE2B ed6eefa0a522eaddfd0ebf3b118a57b7bcf6c7455057d1a9e891e826ba2b32a671fd86357d073f45c36ae5db418987a55e90a908cbb4aba3b3f972ba4580f9f6 SHA512 9f280af163b124809d0276b2a473f66d9f11071f38afbabf7247d4e49f120c137f69dde2cc3fb27fcc88cfc6dc71355ba01efeb102098c401c7e953462ed4a1b
+DIST memory_profiler-0.57.tar.gz 84096 BLAKE2B d2c5fe810b9ac2f1e52fb8630056ee825d3d56799c15a377bff914be3a04e11c872e557847ef2a107421d082515eb59906f931ad1873ae7fec58fef16caabb4c SHA512 c6e2f755656dc820dfc2cf7a659dc319b3d1aa0df144ac6a08db35f4b38a90a9b994cf9c8320b8370f51c97e0d0bf2f9c4a3ab070b4934879f8e579b732e426a
diff --git a/dev-python/memory_profiler/memory_profiler-0.57.ebuild b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
new file mode 100644
index 000000000000..9b0b4220a754
--- /dev/null
+++ b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A module for monitoring memory usage of a python program"
+HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler"
+SRC_URI="https://github.com/pythonprofilers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="examples"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# dev-lang/mercury: collision on 'mprof'
+# https://bugs.gentoo.org/571176
+RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
+ !dev-lang/mercury"
+
+distutils_enable_tests pytest
+
+python_test() {
+ ${EPYTHON} -m memory_profiler test/test_as.py || die
+ ${EPYTHON} -m memory_profiler test/test_func.py || die
+ ${EPYTHON} -m memory_profiler test/test_gen.py || die
+ ${EPYTHON} -m memory_profiler test/test_loop.py || die
+ ${EPYTHON} -m memory_profiler test/test_loop_decorated.py || die
+ ${EPYTHON} -m memory_profiler test/test_mprofile.py || die
+ ${EPYTHON} -m memory_profiler test/test_nested.py || die
+ ${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
+ ${EPYTHON} -m memory_profiler test/test_unicode.py || die
+
+ ${EPYTHON} test/test_exception.py || die
+ ${EPYTHON} test/test_exit_code.py || die
+ ${EPYTHON} test/test_global.py || die
+ ${EPYTHON} test/test_import.py || die
+ ${EPYTHON} test/test_memory_usage.py || die
+ ${EPYTHON} test/test_mprof.py || die
+ ${EPYTHON} test/test_precision_import.py || die
+ ${EPYTHON} test/test_stream_unicode.py || die
+ ${EPYTHON} test/test_tracemalloc.py || die
+}
+
+python_install_all() {
+ use examples && dodoc -r examples
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
index d3b0348b4c0b..17033a7a7b03 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test"
DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt )
python_test() {
- "${EPYTHON}" unittests.py --with-mysql="${EPREFIX%/}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
+ "${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
}
python_install_all(){
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
similarity index 87%
rename from dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
rename to dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
index 7d376a7f527e..1938ff3e5975 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,7 +21,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# because no (user) plugins could work without them; configure itself
# requires pygobject:3 or :2 and >=nautilus-2.32
RDEPEND="
- dev-python/pygobject:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
>=gnome-base/nautilus-3[introspection]
${PYTHON_DEPS}
"
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index ce1b0e299a3b..ed340b66e0a0 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -112,5 +112,5 @@ python_install() {
pkg_preinst() {
# remove old mathjax folder if present
- rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+ rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
}
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
new file mode 100644
index 000000000000..1efe57b1cd0f
--- /dev/null
+++ b/dev-python/ordered-set/Manifest
@@ -0,0 +1 @@
+DIST ordered-set-3.1.1.tar.gz 10520 BLAKE2B 885c24d5cb1db95d0056c9216bde16bc41b27e6489d8169ec2c60f93bf9fdf5e112b6183c4adc0d3a34209442db725d0afab3e53ac21420b223c9f4ddf2a9e49 SHA512 9a0d6c2fe1e678ebc5e4bb8229f2a97cfd0b579624f1f5e7153a9fe41937069a845271e431d626dff799136c3c90d8ecd7a7094de8b6f638c581ebe9c4e71ec6
diff --git a/dev-python/ordered-set/metadata.xml b/dev-python/ordered-set/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/ordered-set/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ sci@gentoo.org
+ Gentoo Science Project
+
+
diff --git a/dev-python/ordered-set/ordered-set-3.1.1.ebuild b/dev-python/ordered-set/ordered-set-3.1.1.ebuild
new file mode 100644
index 000000000000..a92064a27062
--- /dev/null
+++ b/dev-python/ordered-set/ordered-set-3.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A mutable set that remembers the order of its entries"
+HOMEPAGE="https://github.com/LuminosoInsight/ordered-set"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+ pytest -vv test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 7674635167d5..8909ae6a62d2 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1 @@
DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
-DIST oslo-config-6.4.1.tar.gz 144762 BLAKE2B 467e139767b6afd82e1c0d39841765c93e4c23b208e676bfd4c64512a71f6c432a1431d5bf902d268152fa3011e864173f6a766bca560efaadce7a713fa919b7 SHA512 97a47931fe98c6a19ecfe38fa8aae50e91e955db879b96988560db16c0ec775ce294cf0c9b45e62aa7dea67ec43cbfebf4a77e168f0c348bb03066c832dc40a3
-DIST oslo-config-6.8.1.tar.gz 149525 BLAKE2B 0676ac364410c5d2eb6c4d75b85c18d0cbb50cff33954a2afc96f4f779606912d46c0627b0d77fd63795f43e26baab113cfba409eb86e5a8c8353253542bdecb SHA512 d861120e35332411e7caba1ce1b37a2ad16d986ff2063d731edfa0cd6603000fd7f1abf6ebb611c7efbb6d3c4296c0ffb9ccea2c2cd6ba6bf7b18c53daa09f15
diff --git a/dev-python/oslo-config/oslo-config-6.11.2.ebuild b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
index fa19ee9fc042..87e62020fdd2 100644
--- a/dev-python/oslo-config/oslo-config-6.11.2.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-config/oslo-config-6.4.1.ebuild b/dev-python/oslo-config/oslo-config-6.4.1.ebuild
deleted file mode 100644
index 24a4aa5b23fb..000000000000
--- a/dev-python/oslo-config/oslo-config-6.4.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
- !~dev-python/coverage-4.4[${PYTHON_USEDEP}]
- >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
- )
- doc? (
- >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
- >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- >=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- use doc && esetup.py build_sphinx
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
- testr init || die "testr init failed under ${EPYTHON}"
- testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-config/oslo-config-6.8.1.ebuild b/dev-python/oslo-config/oslo-config-6.8.1.ebuild
deleted file mode 100644
index d4c9654fc283..000000000000
--- a/dev-python/oslo-config/oslo-config-6.8.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
- !~dev-python/coverage-4.4[${PYTHON_USEDEP}]
- >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- virtual/python-enum34[${PYTHON_USEDEP}]
- >=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
- testr init || die "testr init failed under ${EPYTHON}"
- testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 5b58f93ebe7b..87b5971c9d74 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,4 +1 @@
DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
-DIST oslo.messaging-8.1.2.tar.gz 296052 BLAKE2B c24d8bc22f1e7bb8fd4f58bf15c349a5fa5e41b98031611a0820b66ab7cabb2742d49995e5c730d1bba2c04a36ef4a055de0aced5f1100a7930052a4f4efd5fb SHA512 f7bebc525019f19f6d25178f4b2ef811c3073dc2b10600a9a01aa23dfadad4b428baeb929963df31ee7c775bb94c47493699e8031d5dd9cea5d865c28432d3ba
-DIST oslo.messaging-9.5.0.tar.gz 251799 BLAKE2B 72edeea222af199ace54ef6ea672177713c15c8556b7b1d1691c5d217bd57e377f871879c3429d46ef1339f4a4b5c610bae82c2aa6ddc74dc069d08b86c15537 SHA512 2479a51c2be7be5752d11fa2d09eb6ffd6cd82ce3531f0a9275eb5bf5fa4451ac16240873a41e2550db5fd7b51003bc9af293704e50d2f3033bd51b502728380
-DIST oslo.messaging-9.5.1.tar.gz 251389 BLAKE2B 2f6ceddcb476e4a65ad1c5359f0e771010d8a8683b8e2d4961c4aeef5c78e4b9fa5c440fa4716d0e0adce4acb4a79437e44968983715f72f0b8d983ac624ac80 SHA512 4b6c90a391597d96d887a54eed4ea29f8b803f3e48609644d865a5708eb6202c07c1bc7fecd1327bd0f55611224ede63166fd10452a97edc203cef2256f49f35
diff --git a/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild
deleted file mode 100644
index ec30a5571710..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- >=dev-python/py-amqp-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
- !~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
- >=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
- >=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
- virtual/python-futures[${PYTHON_USEDEP}]
- >=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
deleted file mode 100644
index 91134cc529af..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- >=dev-python/py-amqp-2.4.1[${PYTHON_USEDEP}]
- >=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
- !~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild
deleted file mode 100644
index c71f43ca6ca8..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- >=dev-python/py-amqp-2.4.1[${PYTHON_USEDEP}]
- >=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
- !~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 3e136c4691f9..b405d591a8c9 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,4 +1 @@
-DIST oslo.policy-1.38.1.tar.gz 82871 BLAKE2B e47e96230874d1c287a1d4e930c9a5dd4ab35ccfee62b1c93c9d046adaf877c7e0cb65f9c34ef378c2a212d6986b0c1abf86af0ca6671c17f7dc8e85e1f1e706 SHA512 6b80a45ef550f5562d0c5cd3a0a466163d741bba7f9fb430c4e9d5273e0811d468d9c0c19c1e6168b38b4436279b81a1aec379d6513cf12d59f1a50fd7a4eb91
-DIST oslo.policy-2.1.1.tar.gz 90438 BLAKE2B fa99f36c688705fbaacefbb01bbc74bb5efd6f6c6ab0e1c0a8e21a299f9a45e162988e26a8da98d0edc2318b8f0b16d2e3c75962043da8aeb365b1a35307dcb4 SHA512 e5925156a42978eada310ef1fd695ff7759e22a4124aaf0bbf5803071484ea83dfbce335c45bdfa73564050b853661d848a1b92e457de8fa3f4c1f27abcbc089
-DIST oslo.policy-2.3.2.tar.gz 90884 BLAKE2B 6eb100e5baf56083bb846adbcfcd0ed1636da3e21fc1cd7b164c89f774b34fd10604776c3751eb48233a8d0822b6a2aca5f57fc2c03babd543cb49d8b6d1a151 SHA512 44300e8aaf894f99fdf6bf4c7b3890013b7f9e9974667a423605f106baff2ca05fa0b8ebc82081511ac211b9c7bc57356a9aea8dbe78ee1ac01d364e337936fe
DIST oslo.policy-2.3.3.tar.gz 93581 BLAKE2B 50d1b45b596242b901a5b583b412c90d55b2ea9501dab29fa24be7b1c64eacf89f0f7df742f897503ab3c09399bfca25b93ed9cc3aa2377a72986f73bb96f1e4 SHA512 b4a2febe240582dbad8306e2208bfb7bd83c2783002544428b5888a8930d959919f10044eb2c30579e2fe61a6958ebefce4300f1778798b201714232a2edb88f
diff --git a/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
deleted file mode 100644
index 85007c3f1dfa..000000000000
--- a/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild b/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
deleted file mode 100644
index c3144b2fa23a..000000000000
--- a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
deleted file mode 100644
index c3144b2fa23a..000000000000
--- a/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
index 099d09f598fe..c3144b2fa23a 100644
--- a/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 11716a59ce52..ff67b00862bb 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,2 +1 @@
-DIST oslo-utils-3.41.3.tar.gz 91174 BLAKE2B 9783360e5328083b5cfb2813f388ea29ca8876ce01cbcba5a25e0706766aab87d28f7683c4a9ef43ad9a0a4756403d2f35dc61ad170ada33e0dab67e5d5a6af4 SHA512 b8efc1ee5e22a0f224a48406208424d75ae1b9eb2b740bd2ac57e172f23f2d7e3f2ae712a006f89b4a64e0b6a619858908540b729705285d0aa99a8d5081495f
DIST oslo-utils-3.41.4.tar.gz 91178 BLAKE2B fe3292b2f60021f6c7cff0a2f6444a8d906586278b4560422e7296e996ac2322973f98902b11b72e6d543a18693c5f10a02629c2fa741e36a8338ff3f53de8f5 SHA512 ea12199b583a83b408fdbe4874162689038936a08d2a362e4adc9074da623c38a1642861ad83833c63988298e2efd11c2242bf69090da03d6358856e6e287acd
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
deleted file mode 100644
index b3a3b972d712..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- test? (
- >=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
- !~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
- =dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
- =dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]' python2_7)
- >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- virtual/python-funcsigs[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
- distutils_install_for_testing
-
- cd "${TEST_DIR}"/lib || die
-
- rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
- testr init || die "testr init failed under ${EPYTHON}"
- testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
index 8fb0bddeb33c..b3a3b972d712 100644
--- a/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index bd534ea59c20..1527b6bb7c8b 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
python_test() {
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index a37ce462f810..535300f24a2c 100644
--- a/dev-python/portend/portend-2.6.ebuild
+++ b/dev-python/portend/portend-2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index a4f971093a10..e0396f710909 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index bd683033aa96..b908c255a15a 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,2 +1 @@
DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
-DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 BLAKE2B 6d23b9bad3fad1b508525bdc7b18dbf0801d7c7e36e15b843104e763b5946c79e22663bf705e071b35c8b4742e3f8e59bfaa0345dc95b18f91b9dd186e6d4df6 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
deleted file mode 100644
index d66b4262bd04..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-PYSDL="${PN}-2.1.0"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libpng:0=
- media-libs/libsdl2:=[video]
- media-libs/sdl2-image:=[png,jpeg]
- media-libs/sdl2-mixer:=
- media-libs/sdl2-ttf:=
- virtual/jpeg:0"
-DEPEND="${RDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
-
-# PyGame distribution for this version has some pregenerated files;
-# we need to remove them
-python_prepare_all()
-{
- rm -r gen{,3} || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
deleted file mode 100644
index bd63debab611..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/libpng:0=
- media-libs/libsdl2:=[video]
- media-libs/sdl2-image:=[png,jpeg]
- media-libs/sdl2-mixer:=
- media-libs/sdl2-ttf:=
- virtual/jpeg:0"
-DEPEND="${RDEPEND}
- dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index 88e91b3bc842..00e8020bdcda 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0-r1.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
similarity index 85%
rename from dev-python/pyilmbase/pyilmbase-2.3.0-r1.ebuild
rename to dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
index ea1f2d49fe50..c3f5e7b949a1 100644
--- a/dev-python/pyilmbase/pyilmbase-2.3.0-r1.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
@@ -18,14 +18,16 @@ IUSE="+numpy"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- >=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
~media-libs/ilmbase-${PV}:=
- numpy? (
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_MULTI_USEDEP}]
+ numpy? (
+ || (
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
+ )
)
- )"
+ ')"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
>=virtual/pkgconfig-0-r1"
diff --git a/dev-python/pypowervm/pypowervm-1.1.20.ebuild b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
index c2d855a03839..45c0824f5b89 100644
--- a/dev-python/pypowervm/pypowervm-1.1.20.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
@@ -15,17 +15,14 @@ SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE=""
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}"
RDEPEND="${DEPEND}
>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
- !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
index b61b72991892..84076638f559 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
LICENSE="MIT"
SLOT="${PV%_p*}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=sys-libs/zlib-1.1.3:0/1
virtual/libffi:0/7
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
index 3ab056f52c89..065d3026f4d0 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy/pypy-7.3.0.ebuild b/dev-python/pypy/pypy-7.3.0.ebuild
index f1d3f53402e6..fef3e9c742c7 100644
--- a/dev-python/pypy/pypy-7.3.0.ebuild
+++ b/dev-python/pypy/pypy-7.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
SLOT="0/73"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
RDEPEND="
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
index fe7c279a1cc4..a9dbed050aee 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
LICENSE="MIT"
SLOT="${PV%_p*}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=sys-libs/zlib-1.1.3:0/1
virtual/libffi:0/7
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
index 5a123c3a605c..3555bbb629dc 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3/pypy3-7.3.0.ebuild b/dev-python/pypy3/pypy3-7.3.0.ebuild
index 946314063a1c..9ec506dc1868 100644
--- a/dev-python/pypy3/pypy3-7.3.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-src"
LICENSE="MIT"
# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
index cb297114cf3f..d391b017378f 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
DESCRIPTION="py.test plugin for flake8"
-HOMEPAGE="https://github.com/tholo/${PN} https://pypi.org/project/${PN}"
+HOMEPAGE="https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
index 3b31825daf79..944b8265316e 100644
--- a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
DESCRIPTION="py.test plugin for isort"
-HOMEPAGE="https://github.com/moccu/${PN} https://pypi.org/project/${PN}"
+HOMEPAGE="https://github.com/moccu/pytest-isort https://pypi.org/project/pytest-isort"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
index 3925e5eb29b6..b84f9ceea363 100644
--- a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
DESCRIPTION="py.test plugin for isort"
-HOMEPAGE="https://github.com/moccu/${PN} https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://github.com/moccu/pytest-isort https://pypi.python.org/pypi/pytest-isort"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-runner/pytest-runner-5.2.ebuild b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
index 29793ca5581c..4a3ab2f29c89 100644
--- a/dev-python/pytest-runner/pytest-runner-5.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
SLOT="0"
IUSE="test"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
index 5b5b6f35f96f..14baebe6eab0 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
@@ -13,23 +13,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
-"
+ ${CDEPEND}"
RDEPEND="
${CDEPEND}
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
- !~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-"
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index afb69a0e788a..da618afe4729 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~sparc x86 ~amd64-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
index d48e3fc3cc6c..735bdaeb4a7b 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
@@ -77,7 +77,7 @@ python_test() {
python_install() {
distutils-r1_python_install
#stupid stupid
- local SITEDIR="${D%/}$(python_get_sitedir)" || die
+ local SITEDIR="${D}$(python_get_sitedir)" || die
cd "${SITEDIR}" || die
local egg=( python_neutronclient*.egg-info )
#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
index 1f0d0165b582..acff4ee83706 100644
--- a/dev-python/python-socketio/python-socketio-1.7.4.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
@@ -7,7 +7,10 @@ PYTHON_COMPAT=( python3_6 pypy3 )
inherit distutils-r1
DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.org/project/python-socketio/"
+HOMEPAGE="
+ https://python-socketio.readthedocs.org/
+ https://github.com/miguelgrinberg/python-socketio/
+ https://pypi.org/project/python-socketio/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-socketio/python-socketio-1.8.0.ebuild b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
index 34da195701db..23df095e3eaa 100644
--- a/dev-python/python-socketio/python-socketio-1.8.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
@@ -7,7 +7,10 @@ PYTHON_COMPAT=( python3_6 pypy3 )
inherit distutils-r1
DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.org/project/${PN}"
+HOMEPAGE="
+ https://python-socketio.readthedocs.org/
+ https://github.com/miguelgrinberg/python-socketio/
+ https://pypi.org/project/python-socketio"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-socketio/python-socketio-2.0.0.ebuild b/dev-python/python-socketio/python-socketio-2.0.0.ebuild
index 49f7279a7864..9f66dde45a09 100644
--- a/dev-python/python-socketio/python-socketio-2.0.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-2.0.0.ebuild
@@ -7,7 +7,10 @@ PYTHON_COMPAT=( python3_6 pypy3 )
inherit distutils-r1
DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.org/project/${PN}"
+HOMEPAGE="
+ https://python-socketio.readthedocs.org/
+ https://github.com/miguelgrinberg/python-socketio/
+ https://pypi.org/project/python-socketio"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-systemd/python-systemd-234.ebuild b/dev-python/python-systemd/python-systemd-234.ebuild
index 02b6eba8206b..d28e4d5108c1 100644
--- a/dev-python/python-systemd/python-systemd-234.ebuild
+++ b/dev-python/python-systemd/python-systemd-234.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1
@@ -12,30 +13,19 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
-COMMON_DEPEND="
- sys-apps/systemd:0=
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+DEPEND="sys-apps/systemd:0="
+RDEPEND="${DEPEND}
!sys-apps/systemd[python(-)]
"
-PATCHES=(
-)
-
python_compile() {
- if python_is_python3; then
- # https://bugs.gentoo.org/690316
- distutils-r1_python_compile -j1
- else
- distutils-r1_python_compile
- fi
+ # https://bugs.gentoo.org/690316
+ distutils-r1_python_compile -j1
}
python_test() {
diff --git a/dev-python/pythong/pythong-2.1.5-r2.ebuild b/dev-python/pythong/pythong-2.1.5-r3.ebuild
similarity index 84%
rename from dev-python/pythong/pythong-2.1.5-r2.ebuild
rename to dev-python/pythong/pythong-2.1.5-r3.ebuild
index 7c1059971d29..3e649b8f4557 100644
--- a/dev-python/pythong/pythong-2.1.5-r2.ebuild
+++ b/dev-python/pythong/pythong-2.1.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,7 +26,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
>=dev-lang/tk-8.3.4:0=
- dev-python/pmw:py2[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/pmw:py2[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_PN}-${MY_PV}"
@@ -43,13 +45,11 @@ src_install() {
python_doscript pythong.py
dodoc leeme.txt
- insinto /usr/share/doc/${PF}
- doins -r {LICENCIA,MANUAL,demos}
+ dodoc -r {LICENCIA,MANUAL,demos}
rm -fr "${ED}/usr/share/doc/${PF}/demos/modulepythong.py" || die
if use doc; then
- insinto /usr/share/doc/${PF}
- doins "${DISTDIR}"/python.pdf
+ dodoc "${DISTDIR}"/python.pdf
fi
python_optimize
}
diff --git a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
index 333b418acf79..241f619eea61 100644
--- a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
+++ b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
@@ -23,5 +23,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
src_install() {
distutils-r1_src_install
- rm -rf "${ED%/}"/usr/share/doc/${PN}
+ rm -rf "${ED}"/usr/share/doc/${PN}
}
diff --git a/dev-python/root_numpy/root_numpy-4.7.3.ebuild b/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
similarity index 76%
rename from dev-python/root_numpy/root_numpy-4.7.3.ebuild
rename to dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
index d76b31455628..c5305f468915 100644
--- a/dev-python/root_numpy/root_numpy-4.7.3.ebuild
+++ b/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
@@ -19,11 +19,16 @@ IUSE="examples test"
RESTRICT="!test? ( test )"
RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- sci-physics/root:=[python,${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
+ sci-physics/root:=[python,${PYTHON_SINGLE_USEDEP}]"
DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_MULTI_USEDEP}] )
+ ')"
python_test() {
cd "${BUILD_DIR}" || die
diff --git a/dev-python/rootpy/rootpy-1.0.1.ebuild b/dev-python/rootpy/rootpy-1.0.1-r1.ebuild
similarity index 60%
rename from dev-python/rootpy/rootpy-1.0.1.ebuild
rename to dev-python/rootpy/rootpy-1.0.1-r1.ebuild
index 6146c30b7abf..6b13cc9333d3 100644
--- a/dev-python/rootpy/rootpy-1.0.1.ebuild
+++ b/dev-python/rootpy/rootpy-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,15 +19,21 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RDEPEND="
- sci-physics/root:=[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/pytables[${PYTHON_USEDEP}]
- dev-python/root_numpy[${PYTHON_USEDEP}]
- dev-python/termcolor[${PYTHON_USEDEP}]"
+ sci-physics/root:=[${PYTHON_SINGLE_USEDEP}]
+ dev-python/root_numpy[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/pytables[${PYTHON_MULTI_USEDEP}]
+ dev-python/termcolor[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="
- sci-physics/root[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+ sci-physics/root[${PYTHON_SINGLE_USEDEP}]
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_MULTI_USEDEP}]
+ ')
+ )"
# TOFIX: tests go in an infinite loop error
RESTRICT=test
@@ -40,7 +46,6 @@ python_test() {
python_install_all() {
distutils-r1_python_install_all
if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
+ dodoc -r examples
fi
}
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index 4db5540b69d5..b1ccdb8c26cf 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
new file mode 100644
index 000000000000..dcc86e2bd4e6
--- /dev/null
+++ b/dev-python/scikit-build/Manifest
@@ -0,0 +1 @@
+DIST scikit-build-0.10.0.tar.gz 132443 BLAKE2B 7e817b1b6d8ea5e663cec59c5ed51b3f58318eedf6587380eb2a1458bac772a5a02a936015027f1200f740884ba33512babb1aadc4cdbb59ea38f46bc36cbb5f SHA512 cbdc59a41c60c162be84b38d207838d5e38898871f2ef02dcb672796f01f7a31645892770172e9891a4dd7aa02a85dd489b6dede4c5f717ab013dd8947d5d314
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
new file mode 100644
index 000000000000..f48ad9340754
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
@@ -0,0 +1,19 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index 094ed23..a58cb85 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -41,7 +41,6 @@ import skbuild
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = [
+- 'cmake',
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.viewcode',
+ 'sphinx_issues'
+@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+ if not on_rtd: # only import and set the theme if we're building docs locally
+ import sphinx_rtd_theme
+ html_theme = 'sphinx_rtd_theme'
+- html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+\ No newline at end of file
++ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
new file mode 100644
index 000000000000..9148db88660e
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
@@ -0,0 +1,132 @@
+This patch removes coverage tests (dep on pytest-cov which is deprecated)
+It also removes the tests that test the setup.py file
+These tests give 'permission denied' exceptions because it calls commands like 'setup.py install'
+diff --git a/tests/test_hello_cpp.py b/tests/test_hello_cpp.py
+index d39c8ef..0419b88 100644
+--- a/tests/test_hello_cpp.py
++++ b/tests/test_hello_cpp.py
+@@ -182,24 +182,3 @@ def test_hello_cleans(capfd):
+ assert "removing '{}'".format(SKBUILD_DIR()) == clean1_out.splitlines()[3]
+
+ assert "running clean" == clean2_out
+-
+-
+-@project_setup_py_test("hello-cpp", ["develop"])
+-def test_hello_develop():
+- for expected_file in [
+- # These files are the "regular" source files
+- 'setup.py',
+- 'CMakeLists.txt',
+- 'bonjour/__init__.py',
+- 'bonjourModule.py',
+- 'hello/__init__.py',
+- 'hello/__main__.py',
+- 'hello/_hello.cxx',
+- 'hello/CMakeLists.txt',
+- # These files are "generated" by CMake and
+- # are copied from CMAKE_INSTALL_DIR
+- 'hello/_hello%s' % (sysconfig.get_config_var('SO')),
+- 'hello/world.py',
+- 'helloModule.py'
+- ]:
+- assert os.path.exists(expected_file)
+diff --git a/tests/test_issue274_support_default_package_dir.py b/tests/test_issue274_support_default_package_dir.py
+deleted file mode 100644
+index 536f7b2..0000000
+--- a/tests/test_issue274_support_default_package_dir.py
++++ /dev/null
+@@ -1,27 +0,0 @@
+-
+-from . import (
+- _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
+- prepare_project, project_setup_py_test, push_dir
+-)
+-
+-
+-@project_setup_py_test("issue-274-support-default-package-dir", ["install"], disable_languages_test=True)
+-def test_install_command():
+- pass
+-
+-
+-def test_test_command():
+- with push_dir():
+-
+- tmp_dir = _tmpdir('test_test_command')
+- project = "issue-274-support-default-package-dir"
+- prepare_project(project, tmp_dir)
+- initialize_git_repo_and_commit(tmp_dir, verbose=True)
+-
+- try:
+- with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
+- pass
+- except SystemExit as exc:
+- assert exc.code == 0
+-
+- assert tmp_dir.join("test_hello.completed.txt").exists()
+diff --git a/tests/test_issue274_support_one_package_without_package_dir.py b/tests/test_issue274_support_one_package_without_package_dir.py
+deleted file mode 100644
+index 6612087..0000000
+--- a/tests/test_issue274_support_one_package_without_package_dir.py
++++ /dev/null
+@@ -1,27 +0,0 @@
+-
+-from . import (
+- _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
+- prepare_project, project_setup_py_test, push_dir
+-)
+-
+-
+-@project_setup_py_test("issue-274-support-one-package-without-package-dir", ["install"], disable_languages_test=True)
+-def test_install_command():
+- pass
+-
+-
+-def test_test_command():
+- with push_dir():
+-
+- tmp_dir = _tmpdir('test_test_command')
+- project = "issue-274-support-one-package-without-package-dir"
+- prepare_project(project, tmp_dir)
+- initialize_git_repo_and_commit(tmp_dir, verbose=True)
+-
+- try:
+- with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
+- pass
+- except SystemExit as exc:
+- assert exc.code == 0
+-
+- assert tmp_dir.join("test_hello.completed.txt").exists()
+diff --git a/tests/test_issue284_build_ext_inplace.py b/tests/test_issue284_build_ext_inplace.py
+deleted file mode 100644
+index 78dd3dd..0000000
+--- a/tests/test_issue284_build_ext_inplace.py
++++ /dev/null
+@@ -1,15 +0,0 @@
+-
+-import os
+-import sysconfig
+-
+-from distutils import sysconfig as du_sysconfig
+-
+-from . import project_setup_py_test
+-
+-
+-@project_setup_py_test("issue-284-build-ext-inplace", ["build_ext", "--inplace"], disable_languages_test=True)
+-def test_build_ext_inplace_command():
+- assert os.path.exists('hello/_hello_sk%s' % sysconfig.get_config_var('SO'))
+-
+- # See issue scikit-build #383
+- assert os.path.exists('hello/_hello_ext%s' % du_sysconfig.get_config_var('SO'))
+diff --git a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py b/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+deleted file mode 100644
+index 2285bfb..0000000
+--- a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
++++ /dev/null
+@@ -1,7 +0,0 @@
+-
+-from . import project_setup_py_test
+-
+-
+-@project_setup_py_test("issue-334-configure-cmakelist-non-cp1252-encoding", ["install"], disable_languages_test=True)
+-def test_install_command():
+- pass
diff --git a/dev-python/scikit-build/metadata.xml b/dev-python/scikit-build/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/scikit-build/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ sci@gentoo.org
+ Gentoo Science Project
+
+
diff --git a/dev-python/scikit-build/scikit-build-0.10.0.ebuild b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
new file mode 100644
index 000000000000..f4eb8f1ef3ec
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="https://github.com/scikit-build/scikit-build"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/flake8[${PYTHON_USEDEP}]
+ dev-python/path-py[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+ dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+ dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-docs.patch"
+ "${FILESDIR}/${P}-skip-sandbox-violation-tests.patch" )
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-issues
+distutils_enable_tests pytest
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
index 3ec7b3c3ebc1..b3cf15ddc19f 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86 ~amd64-linux ~x86-linux"
distutils_enable_tests pytest
diff --git a/dev-python/storm/storm-0.20-r1.ebuild b/dev-python/storm/storm-0.20-r2.ebuild
similarity index 83%
rename from dev-python/storm/storm-0.20-r1.ebuild
rename to dev-python/storm/storm-0.20-r2.ebuild
index a08b6d56c609..5bfc5d440906 100644
--- a/dev-python/storm/storm-0.20-r1.ebuild
+++ b/dev-python/storm/storm-0.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,10 +19,16 @@ KEYWORDS="~amd64 ~x86"
IUSE="mysql postgres sqlite test"
RESTRICT="!test? ( test )"
-RDEPEND="mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
- postgres? ( =dev-python/psycopg-2*[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
+RDEPEND="
+ $(python_gen_cond_dep '
+ mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
+ postgres? ( =dev-python/psycopg-2*[${PYTHON_MULTI_USEDEP}] )
+ ')"
+DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ test? ( dev-python/fixtures[${PYTHON_MULTI_USEDEP}] )
+ ')"
DOCS="tests/tutorial.txt"
diff --git a/dev-python/tempora/tempora-1.14.1-r1.ebuild b/dev-python/tempora/tempora-1.14.1-r1.ebuild
index 6700597ab1f5..c63ee752b81c 100644
--- a/dev-python/tempora/tempora-1.14.1-r1.ebuild
+++ b/dev-python/tempora/tempora-1.14.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
similarity index 88%
rename from dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
rename to dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
index 2d802fa3d307..0a243f4cf713 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
@@ -18,7 +18,9 @@ IUSE=""
RDEPEND="${PYTHON_DEPS}
>=x11-libs/gtk+-3.20:3
>=dev-libs/glib-2.30:2
- >=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.20:3[${PYTHON_MULTI_USEDEP}]
+ ')
>=xfce-base/thunar-1.7.0"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
index cd49b1a30231..91d876f3ed1c 100644
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ b/dev-python/twisted/twisted-18.4.0.ebuild
@@ -144,7 +144,7 @@ python_test() {
python_install() {
distutils-r1_python_install
- cd "${D%/}$(python_get_sitedir)" || die
+ cd "${D}$(python_get_sitedir)" || die
# own the dropin.cache so we don't leave orphans
touch twisted/plugins/dropin.cache || die
@@ -179,7 +179,7 @@ pkg_postinst() {
}
python_postrm() {
- rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+ rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
}
pkg_postrm(){
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index 0e4b0a4607d4..b8e44fd29607 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -146,7 +146,7 @@ python_test() {
python_install() {
distutils-r1_python_install
- cd "${D%/}$(python_get_sitedir)" || die
+ cd "${D}$(python_get_sitedir)" || die
# own the dropin.cache so we don't leave orphans
touch twisted/plugins/dropin.cache || die
@@ -181,7 +181,7 @@ pkg_postinst() {
}
python_postrm() {
- rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+ rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
}
pkg_postrm(){
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
new file mode 100644
index 000000000000..f7a01d309942
--- /dev/null
+++ b/dev-python/ubelt/Manifest
@@ -0,0 +1 @@
+DIST ubelt-0.8.8.tar.gz 172347 BLAKE2B 94435bf8b5a5f67011540c43dd767393cda6bccf95b963ca74cf3ee72444de43828b87bd2e6aa93001fc2c7cd49e245c459b0bc8f2617f12da906ae4e3f194aa SHA512 f63b3a9de51176d00a12999d540080e381266bb43b15942580f7f60b230b2e52021937b0cb4b31e084e0b77c141ae5cb3b8ae000d7af196e0c2f293a960e7438
diff --git a/dev-python/ubelt/metadata.xml b/dev-python/ubelt/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/ubelt/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ sci@gentoo.org
+ Gentoo Science Project
+
+
diff --git a/dev-python/ubelt/ubelt-0.8.8.ebuild b/dev-python/ubelt/ubelt-0.8.8.ebuild
new file mode 100644
index 000000000000..b38c32e6365a
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.8.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="doc"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+ dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-napoleon
+
+python_test() {
+ pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild
index fdbfe670aa9a..e2e7e3c9f1d2 100644
--- a/dev-python/uranium/uranium-3.6.0-r1.ebuild
+++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild
@@ -21,18 +21,24 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
- sci-libs/Shapely[${PYTHON_USEDEP}]
+ ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+ sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtquickcontrols:5
dev-qt/qtquickcontrols2:5"
DEPEND="${RDEPEND}
sys-devel/gettext
doc? ( app-doc/doxygen )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+ ')
+ )"
DOCS=( README.md )
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
index 8b3f307a109c..3154436aac0b 100644
--- a/dev-python/uranium/uranium-4.2.0.ebuild
+++ b/dev-python/uranium/uranium-4.2.0.ebuild
@@ -24,14 +24,20 @@ RESTRICT="!test? ( test )"
BDEPEND="${PYTHON_DEPS}
sys-devel/gettext
doc? ( app-doc/doxygen )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+ ')
+ )"
RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
- sci-libs/Shapely[${PYTHON_USEDEP}]
+ ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+ sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtquickcontrols:5
dev-qt/qtquickcontrols2:5"
diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0-r1.ebuild
similarity index 76%
rename from dev-python/uranium/uranium-4.3.0.ebuild
rename to dev-python/uranium/uranium-4.3.0-r1.ebuild
index 4ca593a01581..b5516dcefb70 100644
--- a/dev-python/uranium/uranium-4.3.0.ebuild
+++ b/dev-python/uranium/uranium-4.3.0-r1.ebuild
@@ -25,16 +25,20 @@ BDEPEND="${PYTHON_DEPS}
sys-devel/gettext
doc? ( app-doc/doxygen )
test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/mypy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+ dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+ ')
)"
RDEPEND="${PYTHON_DEPS}
- ~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
- sci-libs/Shapely[${PYTHON_USEDEP}]
+ ~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+ sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtquickcontrols:5
dev-qt/qtquickcontrols2:5"
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index 85f99bd181c5..bc451a8634cc 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="wxWinLL-3"
SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86"
IUSE="cairo examples libnotify opengl"
RDEPEND="
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
new file mode 100644
index 000000000000..b2f56e769efb
--- /dev/null
+++ b/dev-python/xdoctest/Manifest
@@ -0,0 +1 @@
+DIST xdoctest-0.11.0.tar.gz 123871 BLAKE2B ef766ae79b1566a243abbb31671a6e57184196079cda146081c73cf4aa2583b612b438ea8ff031a1c3d4da612034bccb1990a954ad4d2af55546edd7f7085238 SHA512 63629435e976d2ece770b13432f1857127e7d9c9c954e11e904c1f25b1a9e82d5cf99ff912656260f6c4ed8b08e27ab0fb2d39e621d94ccac9c797fc294bcc62
diff --git a/dev-python/xdoctest/metadata.xml b/dev-python/xdoctest/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/xdoctest/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ sci@gentoo.org
+ Gentoo Science Project
+
+
diff --git a/dev-python/xdoctest/xdoctest-0.11.0.ebuild b/dev-python/xdoctest/xdoctest-0.11.0.ebuild
new file mode 100644
index 000000000000..ddcfe852c5c4
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-0.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+ # fails because the ebuild environment location is not the expected location
+ sed -i -e 's:test_xdoc_console_script_location:_&:' \
+ testing/test_entry_point.py || die
+
+ # xdoctest has to be in PATH for this to work
+ sed -i -e 's:test_xdoc_console_script_exec:_&:' \
+ testing/test_entry_point.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ PYTHONPATH="${WORKDIR}/${P}"
+ pytest -vv || die "Test fail with ${EPYTHON}"
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 290028df01cb..572eb550aec8 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/assistant/assistant-5.12.3.ebuild b/dev-qt/assistant/assistant-5.12.3.ebuild
index 5a9d7abbba90..e993110952ea 100644
--- a/dev-qt/assistant/assistant-5.12.3.ebuild
+++ b/dev-qt/assistant/assistant-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.12.3.ebuild b/dev-qt/designer/designer-5.12.3.ebuild
index 6770d674cda8..f2cb763f33d1 100644
--- a/dev-qt/designer/designer-5.12.3.ebuild
+++ b/dev-qt/designer/designer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
index 25b6f2ea326d..ccb73694ccea 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Tools for working with Qt translation data files"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.12.3.ebuild b/dev-qt/linguist/linguist-5.12.3.ebuild
index a8112e4388cd..974e26c2fdd5 100644
--- a/dev-qt/linguist/linguist-5.12.3.ebuild
+++ b/dev-qt/linguist/linguist-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
DESCRIPTION="Graphical tool for translating Qt applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
index 8b61712d8edd..8cc3d4c8e1ff 100644
--- a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt screen magnifier"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.12.3.ebuild b/dev-qt/qdbus/qdbus-5.12.3.ebuild
index f7542996687e..cfe68350e12b 100644
--- a/dev-qt/qdbus/qdbus-5.12.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Interface to Qt applications communicating over D-Bus"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
index f7f439614408..0fe740208389 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qdoc/qdoc-5.12.3.ebuild b/dev-qt/qdoc/qdoc-5.12.3.ebuild
index 1a0cbf0d138a..82a5b3039ff7 100644
--- a/dev-qt/qdoc/qdoc-5.12.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt documentation generator"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE="qml"
diff --git a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
index d8ad29ba6427..cd57cd9a98ca 100644
--- a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
@@ -21,7 +21,7 @@ SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
LICENSE="FDL-1.3"
SLOT="5"
-KEYWORDS="~arm x86"
+KEYWORDS="x86"
IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
multimedia networkauth +qch script sensors virtualkeyboard webengine"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
index ac5b2bcc5a71..1483d1028503 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Bluetooth support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
index 00bc4a1b3056..fdac527647cf 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Bluetooth support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
index f59eebc63b16..98bacf95e126 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
index fcc7a560718b..48681faaae0d 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
new file mode 100644
index 000000000000..30b5abc39759
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
@@ -0,0 +1,50 @@
+From: Andreas Sturmlechner
+Date: Sun, 9 Feb 2020 11:45:00 +0100
+Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from =Qt-5.14, as a consequence of slot upgrade rebuilds, some
+reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
+cmake files regenerated, leading to cmake errors like:
+
+https://bugs.gentoo.org/703306
+https://bugs.gentoo.org/705198
+
+From mkspecs/features/create_cmake.prf:
+
+# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
+# functions whether a Configuration specific generator expression needs to be added to the values
+# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
+# configuration specific values. For singular builds (only release or only debug), we want the
+# values to be applied regardless of the configuration.
+# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
+# build a Debug configuration of an application, even if Qt was built in a Release configuration.
+
+qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
+optional and default to FALSE.
+
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100
+@@ -538,8 +538,14 @@
+
+ file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
+
+- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
+- IsDebugAndRelease)
++ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
++ set(IsDebugAndRelease FALSE)
++ set (list_var ${ARGN})
++ list(LENGTH list_var num_extra_arg)
++ if (${num_extra_arg} GREATER 0)
++ list(GET list_var 0 IsDebugAndRelease)
++ endif()
++
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild
deleted file mode 100644
index 8fa01e2779f6..000000000000
--- a/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/libpcre2[pcre16,unicode]
- sys-libs/zlib:=
- icu? ( dev-libs/icu:= )
- !icu? ( virtual/libiconv )
- systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
- !> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
- #if defined(QT_NO_${flag}) && defined(QT_${flag})
- # undef QT_NO_${flag}
- #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
- # define QT_NO_${flag}
- #endif
- _EOF_
- done
-}
diff --git a/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
index a4e53c829627..853f70c37ab3 100644
--- a/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm ~x86"
+ KEYWORDS="x86"
fi
IUSE="icu systemd"
diff --git a/dev-qt/qtcore/qtcore-5.14.1.ebuild b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
similarity index 95%
rename from dev-qt/qtcore/qtcore-5.14.1.ebuild
rename to dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
index 63378ff04bcb..d96ec59bb319 100644
--- a/dev-qt/qtcore/qtcore-5.14.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
@@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
+PATCHES=( "${FILESDIR}/${P}-cmake-macro-backward-compat.patch" ) # bug 703306
+
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
diff --git a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
index 238ccd58751a..05702645cd96 100644
--- a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
index ded471a2163f..18a154ce0efd 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="gles2 +jit localstorage +widgets"
diff --git a/dev-qt/qtdiag/qtdiag-5.12.3.ebuild b/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
index 7762da6fea55..4aa71707c731 100644
--- a/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm ~x86"
+ KEYWORDS="~x86"
fi
IUSE="+network +widgets"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
index 11fa5af3d6d7..1eee24e51e85 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
new file mode 100644
index 000000000000..30b5abc39759
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
@@ -0,0 +1,50 @@
+From: Andreas Sturmlechner
+Date: Sun, 9 Feb 2020 11:45:00 +0100
+Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from =Qt-5.14, as a consequence of slot upgrade rebuilds, some
+reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
+cmake files regenerated, leading to cmake errors like:
+
+https://bugs.gentoo.org/703306
+https://bugs.gentoo.org/705198
+
+From mkspecs/features/create_cmake.prf:
+
+# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
+# functions whether a Configuration specific generator expression needs to be added to the values
+# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
+# configuration specific values. For singular builds (only release or only debug), we want the
+# values to be applied regardless of the configuration.
+# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
+# build a Debug configuration of an application, even if Qt was built in a Release configuration.
+
+qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
+optional and default to FALSE.
+
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100
+@@ -538,8 +538,14 @@
+
+ file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
+
+- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
+- IsDebugAndRelease)
++ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
++ set(IsDebugAndRelease FALSE)
++ set (list_var ${ARGN})
++ list(LENGTH list_var num_extra_arg)
++ if (${num_extra_arg} GREATER 0)
++ list(GET list_var 0 IsDebugAndRelease)
++ endif()
++
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
index 9da6bd76cb93..276e36311bf9 100644
--- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
# TODO: linuxfb
diff --git a/dev-qt/qtgui/qtgui-5.14.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r2.ebuild
similarity index 96%
rename from dev-qt/qtgui/qtgui-5.14.1-r1.ebuild
rename to dev-qt/qtgui/qtgui-5.14.1-r2.ebuild
index f613f1709b54..e077dd59d735 100644
--- a/dev-qt/qtgui/qtgui-5.14.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.1-r2.ebuild
@@ -133,7 +133,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:gui
)
-PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946
+PATCHES=(
+ "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+ "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+)
src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
diff --git a/dev-qt/qthelp/qthelp-5.12.3.ebuild b/dev-qt/qthelp/qthelp-5.12.3.ebuild
index 0e5276c016f6..a803721b5888 100644
--- a/dev-qt/qthelp/qthelp-5.12.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating online documentation into applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
index 1778fd4aa6e3..8ec5c809c7a2 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Additional format plugins for the Qt image I/O system"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE="mng"
diff --git a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
index 56f8b9b18171..ec900f0cfb34 100644
--- a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
index 75ee52770e95..6258747f51ae 100644
--- a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
index a9f5bb6c8901..1b878987bc27 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
index bbfe6b126785..9c5866b6b7f8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
fi
IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
index cd32728f067b..17473a4c7e33 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Network abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
index 8e3a48223c0c..dcc247233f58 100644
--- a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="gles2"
diff --git a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
index 73ab9f9f78fe..3c2b038665df 100644
--- a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Command line client to QStandardPaths"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
index 6530441c0192..893c36177dd1 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
index 6f09126619bf..e8321b9e7c9f 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Printing support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
index 6585fd05b1b9..450ee2a11559 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
index 082c63e07951..decc77e8a05f 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE="widgets"
diff --git a/dev-qt/qtscript/qtscript-5.12.3.ebuild b/dev-qt/qtscript/qtscript-5.12.3.ebuild
index fb743bab2139..6f240b1a0f93 100644
--- a/dev-qt/qtscript/qtscript-5.12.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE="+jit scripttools"
diff --git a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
index 816b74b09c1e..4a9a57cfb96e 100644
--- a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Hardware sensor access library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
# TODO: simulator
diff --git a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
index efc12e8b1cee..96e2b5cccfb6 100644
--- a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Serial port abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
index d33ed8c67026..6bb70663def5 100644
--- a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Text-to-speech library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
# TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/qtsql-5.12.3.ebuild b/dev-qt/qtsql/qtsql-5.12.3.ebuild
index 5380e0e1dff6..2eef4d42dea3 100644
--- a/dev-qt/qtsql/qtsql-5.12.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
SLOT=5/$(ver_cut 1-3) # bug 639140
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
index 55dc3766278c..451498261337 100644
--- a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="SVG rendering library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qttest/qttest-5.12.3.ebuild b/dev-qt/qttest/qttest-5.12.3.ebuild
index 89f3ae8814c0..600060d9f9dd 100644
--- a/dev-qt/qttest/qttest-5.12.3.ebuild
+++ b/dev-qt/qttest/qttest-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Unit testing library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
index 26075dc5ce19..383733e771a7 100644
--- a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Translation files for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
index d81e51b8c8b9..280f3c3f74ae 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
# TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
index 8cc97662734d..b5a4ed7dc206 100644
--- a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~arm x86"
+ KEYWORDS="x86"
fi
IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
index b8ea150a4a5c..5dac54f247d3 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
index 72f4cd393064..d6669e5de5b2 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
deleted file mode 100644
index f7a5c064fc4e..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Bug: https://bugs.gentoo.org/634220
-
---- a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -803,6 +803,7 @@
-
- deps = [
- ":mksnapshot($v8_snapshot_toolchain)",
-+ ":run_paxmark",
- ]
-
- script = "tools/run.py"
-@@ -854,6 +855,28 @@
- }
- }
- }
-+action("run_paxmark") {
-+ visibility = [ ":*" ] # Only targets in this file can depend on this.
-+
-+ deps = [
-+ ":mksnapshot($v8_snapshot_toolchain)",
-+ ]
-+
-+ script = "/usr/sbin/pypaxctl"
-+
-+ sources = []
-+
-+ outputs = [
-+ "$target_out_dir/mksnapshot",
-+ ]
-+
-+ args = [
-+ "-sm",
-+ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+ "root_out_dir") + "/mksnapshot",
-+ root_build_dir),
-+ ]
-+}
-
- action("v8_dump_build_config") {
- script = "tools/testrunner/utils/dump_build_config.py"
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index acca7340ba1a..180beb2cfc87 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -11,7 +11,6 @@
Enable physical position determination
via dev-qt/qtpositioning
Combine source files to speed up build process.
- Enable building under a PaX enabled kernel
Use the system-wide media-video/ffmpeg
instead of bundled.
Use the system-wide dev-libs/icu
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index fbd7648f6f0a..ec2e98d5c56a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -2,17 +2,17 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
!!=sys-devel/binutils-2.31.1-r5
!!=sys-devel/binutils-2.32-r0
"
@@ -87,8 +86,6 @@ PATCHES+=(
)
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/core/config/common.pri || die
@@ -137,6 +134,4 @@ src_install() {
if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
-
- pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index 0f097f91df8a..f5c244acbfc5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -75,14 +75,11 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
"
PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" )
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/core/config/common.pri || die
@@ -126,6 +123,4 @@ src_install() {
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
-
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index db4d9855990d..ce5929f9ca8b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
- +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -75,12 +75,9 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
"
src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
@@ -124,6 +121,4 @@ src_install() {
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
-
- pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
index 116ef775f5a9..39f83b243e4a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
index 0470c9ca9563..d9c375383f56 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
fi
IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
index 0a383e2738e8..dbaebf311870 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
# keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
index 9cb19dfdec14..f8188c3dedaf 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.12.3.ebuild b/dev-qt/qtxml/qtxml-5.12.3.ebuild
index 5089d1feca99..101ee7259646 100644
--- a/dev-qt/qtxml/qtxml-5.12.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
index 470276438050..0e9ceb940d88 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="arm x86"
+ KEYWORDS="x86"
fi
IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ea7802660251..9130395cb325 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild
index 70f59a12905a..016e1251a0ff 100644
--- a/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
diff --git a/dev-ruby/barby/barby-0.6.8.ebuild b/dev-ruby/barby/barby-0.6.8.ebuild
index 8b5f75b2b3d6..78290277d133 100644
--- a/dev-ruby/barby/barby-0.6.8.ebuild
+++ b/dev-ruby/barby/barby-0.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,7 +25,7 @@ KEYWORDS="~amd64"
IUSE="test qrcode rmagick prawn png cairo"
ruby_add_rdepend "
- rmagick? ( dev-ruby/rmagick )
+ rmagick? ( dev-ruby/rmagick:* )
cairo? ( dev-ruby/rcairo )"
ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
index 54cd5f62f5a5..25f0fe94d727 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -25,7 +25,9 @@ all_ruby_prepare() {
sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
# Avoid unneeded rake-compiler dependency
- sed -i -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+ sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
+ -e '/bundler/ s:^:#:' \
+ -i Rakefile || die
}
each_ruby_configure() {
diff --git a/dev-ruby/ed25519/ed25519-1.2.4.ebuild b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
index eab124b782ae..282a543f34f2 100644
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
similarity index 89%
rename from dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
rename to dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
index 1e51b2fb94b3..23f293301191 100644
--- a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
+++ b/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,8 +30,10 @@ RUBY_S="${MY_P}"
RDEPEND+="
${PYTHON_DEPS}
- >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ >=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND+=" test? ( ${RDEPEND} )"
ruby_add_rdepend ">=dev-ruby/multi_json-1.0.0"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index dca8a059b547..47e822510f02 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,3 +1,4 @@
DIST rack-1.6.12.gem 230912 BLAKE2B 98a3ae6905535b284a5e723d39db7788f97c11b29506fbdb3c584c53d1dae35d1e8006724e5f63195d8407521806c53a5fcf47544b4241370a3576e6dbea0dc6 SHA512 9d0f6f44d228c1b6a7b0fbf29a1e5a2f45339b4749d563336c1729d88c3e37d6360fedde75b7cfcddcd7e051025fc50f04b594fb68d499899e96e2385478fe76
DIST rack-2.0.8.gem 256000 BLAKE2B 30fc53abd2a9389ef00b1803d2d329b10288356fadfeaf80e0b6f7d2327b5aea058626f50d228454716007b1be0b316c6083debee98c0d0ee5eed458600f8315 SHA512 88c406cfe38c3db1a3502fc563272a99d8f2e36bfea1122cdea6b6b49b0e6b5649e1f0864161793eed83cb3d934aa260650b703bb1b059c6e56c6073c2060fb2
+DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
DIST rack-2.1.1.tar.gz 250934 BLAKE2B d7d50c011d963dbfcd5dc456bca5711fa46c062df88f70280407cf617fde0c954f9a9453ae077dcdeeea54ac6291388420f37f25f629193112aaaa1bead6a55e SHA512 806842fdf1df332fc13d1aa8c4fa3f5bf091eaaf5db8684ad2c2de23d41955f850dad5da3ef7ca89ae5c51a0eea78e2d31b2c5465734ec949948a1fbc911427b
diff --git a/dev-ruby/rack/rack-2.0.9.ebuild b/dev-ruby/rack/rack-2.0.9.ebuild
new file mode 100644
index 000000000000..6ccbc9c8b581
--- /dev/null
+++ b/dev-ruby/rack/rack-2.0.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://rack.github.com/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+ dev-ruby/racc"
+ruby_add_bdepend "test? (
+ dev-ruby/test-unit:2
+ dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+ # Fix broken racc invocation
+ sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+ # Avoid bundler dependency
+ sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+ -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+ # Avoid dependency on developer-specific tools.
+ sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests failing due to a missing test file.
+ #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+
+ # Avoid SAFE mode test that fails on ruby 2.6
+ sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
+}
+
+each_ruby_test() {
+ # Upstream tries to daisy-chain rake calls but they fail badly
+ # with our setup, so run it manually.
+ ${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ dodoc -r samples
+}
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
index 341d6ab3eb43..8bb8278c24ca 100644
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
inherit ruby-ng-gnome2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
index 177fc7b8c9df..d8f7adf0af33 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
inherit ruby-ng-gnome2
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
index 2cb9544a2609..2d2bad37ef78 100644
--- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
inherit ruby-ng-gnome2
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
index ed0b2a50186b..681c77dd5d37 100644
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
inherit ruby-ng-gnome2
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index d41385081201..70ba58d23c94 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,3 +1,4 @@
DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57974e622969958dda39f4dc8656a4211378ba51c4b8e8eefafebf82e550ab73a775530eab06ff6419a3dee7f8f7b SHA512 90c8b68245168c7df4ec8d0e6c62d9723d759945823768645614fe085f375c6811a15c35334c485cb59f32f6adb1aa0a06e7df043b09a48ef4e6102d93562b1b
DIST ruby_parser-3.14.0.gem 467456 BLAKE2B 0eca83b919a87306e35e0a6481b6518d5b7ca04e437f6953de278bc757e8fd53e15dd26d7049a715314fd88c01cbd4fc5123fdc98e3cfa7d063e291f92a39a93 SHA512 077cc4610a768430982735e174ddff762ac677a6d437e0e82ee6615c467997434ec6f556d6144593e548c0e7bb8f7e208485e64085858757c4ba2dc9e606e9b2
DIST ruby_parser-3.14.1.gem 467968 BLAKE2B bcd72ebdf855111358f12c08518d200b1fdcd6bf860614dc190fc59f8a242d843271ec426797b7a2afb3082ec6775777d83d324d66391e21d1df8a27971e1b10 SHA512 0bbbe8a85e1602fd26d2ea8d19d4e57933251ba94341cda79631f7f0e35ea8f3c5b0c2e6e8bc182340838737d508cc8142167917dbd35e0bdb005889f152d72c
+DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
new file mode 100644
index 000000000000..76b25e685651
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.13.0:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+ # Remove reference to perforce method that is not in a released
+ # version of hoe-seattlerb.
+ #sed -i -e '/perforce/d' Rakefile || die
+ sed -i -e '/license/d' Rakefile || die
+ sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 3c0d62a3ebcc..08b697d4c041 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,3 +1,4 @@
DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb17605d5157c969d083a8fca404b1af3db1e2bfdcf76a6b7f392043996d246686dfa73117b9efacec529896d5a8e35 SHA512 d1e1ae7cf13b0b8c2e6786aad1bdeda25697d88abec86fc9415bb76d4e9e98097d2fecf16ceddbc80d1d447064bfa73beec5eaa5270ef38ce224c4bdbcdede3a
DIST sexp_processor-4.12.1.gem 54784 BLAKE2B 95b238abb3050448cd076cfbda61d60c1d2bd90cfc94c3eafb51187b48a26249eb84b26e2a9469414e61f1c26f7764703fdf33842cb77730219048f999d48b92 SHA512 00f27cfea808ce16eba209207f804a432057d434c181d62f44656798d051c783f0232fa9ff9068ba83c254dfc0bb50d59a83196bf2a5f247f438b6467d9ba701
DIST sexp_processor-4.13.0.gem 55808 BLAKE2B d807f632e93bbffaf92c31214a5d76fb5f069563af07f3f3c9d8095114d4ffc41a759144f93e1081d4192e6b7d572feab2be10a5fd639bafc0d3b166a4d5b5e1 SHA512 0b83613c10dd268837bddd552910c799e002eea6b409aa9788a5a65957454d2ef601cc023f84d98dbacc34e3c58923d6c43115510bae7ec9d2d72286f141828a
+DIST sexp_processor-4.14.0.gem 55808 BLAKE2B 60e19163bfca60b019b462f251eddc1f3644207f8eb4ac6240cb5eec9365621c56bd0a6741d1371a502c745b41e6a5efa29323a43ce919d823c0f11fd1a4d6f5 SHA512 90a6ed905d79079b51849521e25d8e6aa87c8d9aced75883b4080568a30aa3c349df35bb74556a1755f77ed73d3260ce88534d1967db93b39b34cf28132e0093
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.14.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.14.0.ebuild
new file mode 100644
index 000000000000..6b5718af0682
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/minitest-5.5
+ )"
+
+each_ruby_test() {
+ ${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 1d51faa97299..97ad8951d57e 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,3 +1 @@
-DIST sshkit-1.18.2.gem 150016 BLAKE2B b9427eab02b6967a71252bf4a519d86f06429241e28d661dd424ff7739fd69d68ca9b430096518872141e4e09fbac832e04aab8a89fc1d89ebe5077303b87238 SHA512 a98477dfc9c566ba3777a2557db95aa20c2b220b238d8acd59888c8ac271b71c1bbebb29f37ad87102a155beecdd0b60872b4c735f71f7a65be2c1fb5ae60c8f
-DIST sshkit-1.19.1.gem 155136 BLAKE2B 756d4f2e7575d0b2b2c0cdf885a22739e8b8f458d9ffebd614bc58135bd285853afe63bddc262dfb2d73ca64f6be5ebdb01436bbe25deaad73f5a62d9ac67b33 SHA512 9df31133c4d6b8da753aa2ab65574a813c99d086fff47b42db345057ff3eadce7e24bd6b648b28fcb476282a8b7f204acaec0cc766a3c25c52a3f64223169ebf
DIST sshkit-1.20.0.gem 155648 BLAKE2B fdb95aed6d407c598abde71591cbe2d7b1f98d91985695509a6545bcabc5c0f3337cfe8f73e82f4b212e3c04b6da09e7521637934baeea7a9b5e268ff72fcad1 SHA512 682234f99d6ae9533c99f0319ad0f3732f2ff166a8f1a07d5ce8ff59fd9606af9440798a39f657dd3899e9278639aa93d5fb29af8f64b2ebea7f3b8e75fb25fa
diff --git a/dev-ruby/sshkit/sshkit-1.18.2.ebuild b/dev-ruby/sshkit/sshkit-1.18.2.ebuild
deleted file mode 100644
index 5c4ef99622e0..000000000000
--- a/dev-ruby/sshkit/sshkit-1.18.2.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/net-ssh-2.8.0:*
- >=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
- sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
- -e '1irequire "set"; require "pathname"' test/helper.rb || die
-
- # Fix assumption about parent directory name
- sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
- # Run tests directly to avoid dependencies in the Rakefile
- ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.19.1.ebuild b/dev-ruby/sshkit/sshkit-1.19.1.ebuild
deleted file mode 100644
index 2e3a0b61bd06..000000000000
--- a/dev-ruby/sshkit/sshkit-1.19.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
- >=dev-ruby/net-ssh-2.8.0:*
- >=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
- sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
- -e '1irequire "set"; require "pathname"' test/helper.rb || die
-
- # Fix assumption about parent directory name
- sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
- # Run tests directly to avoid dependencies in the Rakefile
- ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 9a556b9c42cc..a302071ef51e 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -2,3 +2,4 @@ DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa03
DIST webmock-3.6.2.gem 117760 BLAKE2B 132b700323cbc4e753406ccfcc69375107c1d8546fd71bacf13db614d1818926321e2cd27dfc08670f908e0ac5946b06892138c2701fb1f27cfcf9fb6dd56c3d SHA512 1d6141be90840d01e3d7b8e925e0a981ac715fbca1219dd35edd7cf3bcea1c1da3442aaa131e3586f0827a7b06207314119c1f47e6ae64f11f154c70ba6fc5c2
DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
DIST webmock-3.8.0.gem 122368 BLAKE2B 17533e0ba297e2caed6de736f7e0b740d33ac8d08d743ef0ac543e443c990fe2a22b14519c599c2d5e36a0bab67d9d72e3aac99ec2ca2dc3f25643b90a75943a SHA512 3c0bb83abafaf1c25f8129fe1017acc323385de0ecf00229f4ebdc1ce60bf83c8d8a05372cfb6e80c2382324854dd985b06ecf3e2003ca4697a65c57c5788d1e
+DIST webmock-3.8.1.gem 122368 BLAKE2B ba956c72f20e2c21cea90b107ef445e42a6995fdb31f9af65c3b561e9e1fbb9fbd299db009a1d83ddfdb473ce030d40aadf6633e23afbd072ee3b4debf7e0be2 SHA512 b1137fabb000469ee88fdd5521756f368463ee49988d5d89b51fa8352362ff249a4849159504834933e5e1248ed9b6791d254528b3cdea461fc9e8e5d92a334c
diff --git a/dev-ruby/webmock/webmock-3.8.1.ebuild b/dev-ruby/webmock/webmock-3.8.1.ebuild
new file mode 100644
index 000000000000..04f3e54f7934
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.8.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
+
+ruby_add_bdepend "test? (
+ dev-ruby/minitest:5
+ dev-ruby/rspec:3
+ >=dev-ruby/test-unit-3.0.0
+ dev-ruby/rack
+ >=dev-ruby/httpclient-2.8.0
+ || ( dev-ruby/http:4 dev-ruby/http:3 ) )"
+
+all_ruby_prepare() {
+ # Remove bundler support
+ rm Gemfile || die
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+ sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+ sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+ # There is now optional support for curb and typhoeus which we don't
+ # have in Gentoo yet. em_http_request is available in Gentoo but its
+ # version is too old. patron's latest version is not compatible.
+ sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
+ rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
+
+ # Avoid httpclient specs that require network access, most likely
+ # because mocking does not fully work.
+ sed -i -e '/httpclient streams response/,/^ end/ s:^:#:' \
+ -e '/are detected when manually specifying Authorization header/,/^ end/ s:^:#:' \
+ spec/acceptance/httpclient/httpclient_spec.rb
+
+ # Avoid specs that require network access
+ sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+ ${RUBY} -S rake test NO_CONNECTION=true || die
+ ${RUBY} -S rspec-3 spec || die
+
+ einfo "Delay to allow the test server to stop"
+ sleep 10
+}
diff --git a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
index a9746bb09ab3..2f926b2efeef 100644
--- a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
+++ b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
DESCRIPTION="A pure ruby implementation of Remi Coulom's Whole-History Rating algorithm"
-HOMEPAGE="https://github.com/goshrine/${PN}"
+HOMEPAGE="https://github.com/goshrine/whole_history_rating"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 4f524700153d..ff06930dd75c 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch b/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
deleted file mode 100644
index 36a723fee98d..000000000000
--- a/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/glgd/glgdGraph.c
-+++ b/glgd/glgdGraph.c
-@@ -19,11 +19,7 @@
- #define GLGDGRAPH_CAMORBIT (0)
- #define GLGDGRAPH_NODENAME (1)
- #define GLGDGRAPH_LINKNAME (2)
--#ifdef __MINGW32__
- #define _MAXFLT (HUGE_VAL)
--#else /*!__MINGW32__*/
--#define _MAXFLT (HUGE)
--#endif /*!__MINGW32__*/
- #define _PANGO_DPI (72)
- #define _PANGO_SCALE (3)
- #define _TEXW (1024)
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
similarity index 64%
rename from dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
rename to dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
index 408f80d26af2..fc572995a607 100644
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
@@ -15,17 +15,13 @@ SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc x86"
-IUSE="examples glgd nls opengl"
+IUSE="examples"
RESTRICT="test"
+RDEPEND="x11-libs/gtk+:2
+ dev-scheme/gauche"
DEPEND="${RDEPEND}
virtual/pkgconfig"
-RDEPEND="x11-libs/gtk+:2
- dev-scheme/gauche
- opengl? (
- x11-libs/gtkglext
- dev-scheme/gauche-gl
- )"
S="${WORKDIR}/${MY_P}"
PATCHES=( "${FILESDIR}"/${PN}-glgd.patch )
@@ -35,23 +31,6 @@ src_prepare() {
eautoconf
}
-src_configure() {
- local myconf=()
- if use opengl; then
- if use glgd; then
- if use nls; then
- myconf+=( --enable-glgd-pango )
- else
- myconf+=( --enable-glgd )
- fi
- else
- myconf+=( --enable-gtkgl )
- fi
- fi
-
- econf "${myconf[@]}"
-}
-
src_compile() {
emake stubs
emake
@@ -67,13 +46,5 @@ src_install() {
# install gtk-tutorial
docinto examples/gtk-tutorial
dodoc examples/gtk-tutorial/*
- if use opengl; then
- # install gtkglext
- dodoc -r examples/gtkglext
- if use glgd; then
- # install glgd
- dodoc -r examples/glgd
- fi
- fi
fi
}
diff --git a/dev-scheme/gauche-gtk/metadata.xml b/dev-scheme/gauche-gtk/metadata.xml
index 4dd4d4ed3fd8..fe87f96ca80e 100644
--- a/dev-scheme/gauche-gtk/metadata.xml
+++ b/dev-scheme/gauche-gtk/metadata.xml
@@ -8,9 +8,6 @@
Gauche extension module to use GTK.
-
shirok/Gauche-gtk2
diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild
index 6496a36b4f9e..a977d7d588b4 100644
--- a/dev-scheme/scm/scm-5.5.6-r4.ebuild
+++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild
@@ -161,7 +161,7 @@ regen_catalog() {
}
pkg_postinst() {
- [[ -z ${ROOT%/} ]] && regen_catalog
+ [[ -z ${ROOT} ]] && regen_catalog
}
pkg_config() {
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index f3ce8387dfa7..a862c028af7f 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/crosstex/crosstex-0.6-r2.ebuild b/dev-tex/crosstex/crosstex-0.6-r3.ebuild
similarity index 88%
rename from dev-tex/crosstex/crosstex-0.6-r2.ebuild
rename to dev-tex/crosstex/crosstex-0.6-r3.ebuild
index 9e986f7cd802..ab2375f5c2c6 100644
--- a/dev-tex/crosstex/crosstex-0.6-r2.ebuild
+++ b/dev-tex/crosstex/crosstex-0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,9 @@ IUSE="examples"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/ply[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/ply[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}"
src_install() {
diff --git a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
new file mode 100644
index 000000000000..88c8d372e089
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
@@ -0,0 +1,25 @@
+--- PDFAnnotExtractor.java.org 2015-11-26 16:20:12.614852847 +0800
++++ work/source/latex/pax/src/PDFAnnotExtractor.java 2015-11-26 16:21:42.592303074 +0800
+@@ -24,14 +24,14 @@
+ import java.text.*;
+ import java.util.*;
+
+-import org.pdfbox.cos.*;
+-import org.pdfbox.pdfparser.*;
+-import org.pdfbox.pdmodel.*;
+-import org.pdfbox.pdmodel.common.*;
+-import org.pdfbox.pdmodel.interactive.action.*;
+-import org.pdfbox.pdmodel.interactive.action.type.*;
+-import org.pdfbox.pdmodel.interactive.annotation.*;
+-import org.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.pdfparser.*;
++import org.apache.pdfbox.pdmodel.*;
++import org.apache.pdfbox.pdmodel.common.*;
++import org.apache.pdfbox.pdmodel.interactive.action.*;
++import org.apache.pdfbox.pdmodel.interactive.action.type.*;
++import org.apache.pdfbox.pdmodel.interactive.annotation.*;
++import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
+
+ public class PDFAnnotExtractor implements Constants {
+
diff --git a/dev-tex/pdfannotextractor/files/StringVisitor.java.patch b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
new file mode 100644
index 000000000000..1b6a9d1d9161
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
@@ -0,0 +1,14 @@
+Index: work/source/latex/pax/src/StringVisitor.java
+--- StringVisitor.java.org 2015-11-26 16:20:35.434967156 +0800
++++ work/source/latex/pax/src/StringVisitor.java 2015-11-26 16:20:56.504072659 +0800
+@@ -22,8 +22,8 @@
+
+ import java.io.*;
+ import java.util.*;
+-import org.pdfbox.cos.*;
+-import org.pdfbox.exceptions.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.exceptions.*;
+
+ public class StringVisitor implements ICOSVisitor {
+
diff --git a/dev-tex/pdfannotextractor/files/javajars.patch b/dev-tex/pdfannotextractor/files/javajars.patch
new file mode 100644
index 000000000000..bc52050e7b06
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/javajars.patch
@@ -0,0 +1,13 @@
+Index: work/scripts/pax/pdfannotextractor.pl
+===================================================================
+--- work.orig/scripts/pax/pdfannotextractor.pl
++++ work/scripts/pax/pdfannotextractor.pl
+@@ -84,6 +84,8 @@ my @jar_pdfbox = qw[
+ PDFBox-0.7.2.jar
+ ];
+ my @dir_jar = qw[
++ /usr/share/pdfannotextractor/lib
++ /usr/share/pdfbox/lib
+ /usr/share/java
+ /usr/local/share/java
+ ];
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
index 1b6371bf6dbe..5ae9bb84c9eb 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
@@ -36,6 +36,12 @@ EANT_GENTOO_CLASSPATH="
pdfbox-1.8
fontbox-1.7
"
+src_prepare() {
+ eapply "${FILESDIR}"/javajars.patch
+ eapply "${FILESDIR}"/StringVisitor.java.patch
+ eapply "${FILESDIR}"/PDFAnnotExtractor.java.patch
+ default
+}
src_compile() {
cd "${S}/source/latex/pax" || die
diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index e4fb763f01d8..11cf3aec3f2e 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1 +1,2 @@
DIST rubber-1.4.tar.gz 109357 BLAKE2B e624674fdadae52890d5599450b741db39c3ddf2ca382a2e87941a87db346cfa33e96e2fb468f052d3f94b7b2086628e675971203a9a4181385c059196fc3df0 SHA512 8b4a9f689702505e19543e5295375c14ae93fb9d6b89d1234fda093d4161551bd58c2485b53678f141d52a140002df08856cfa059f6287721402b74b0ef666f7
+DIST rubber-1.5.1.tar.gz 111812 BLAKE2B 4d08527689d669e3ac8dd6e9050fc09766bfb46c53d9923ce10efc0aaf8a62a962cb2f1c27a0e7a19a9be96710edba923d93589d816aa22305eec33fd08aa08c SHA512 ba22eeddc24b4f9abf0bf087604a4261add648877ec558b766555de09538cd20c21c8cfd9731c1421540bb2479501dd6ed066346d250c6bc981529e31efacc40
diff --git a/dev-tex/rubber/rubber-1.5.1.ebuild b/dev-tex/rubber/rubber-1.5.1.ebuild
new file mode 100644
index 000000000000..dd7a18c0aa7b
--- /dev/null
+++ b/dev-tex/rubber/rubber-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A LaTeX wrapper for automatically building documents"
+HOMEPAGE="https://launchpad.net/rubber/"
+SRC_URI="https://launchpad.net/rubber/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/latex-base"
+BDEPEND="${RDEPEND}
+ virtual/texi2dvi"
+
+python_install() {
+ distutils-r1_python_install \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --infodir="${EPREFIX}"/usr/share/info \
+ --mandir="${EPREFIX}"/usr/share/man
+}
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index e7d8f61f4440..87f00d4df262 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
index 8e55519b92fa..92ad828684fd 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
@@ -24,8 +24,8 @@ RDEPEND="${DEPEND} "
# created and cause collisions.
pkg_setup() {
- if [ -f "${ROOT%/}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem" ]; then
- einfo "Removing ${ROOT%/}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
- rm -f "${ROOT%/}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
+ if [ -f "${ROOT}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem" ]; then
+ einfo "Removing ${ROOT}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
+ rm -f "${ROOT}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
fi
}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fd32aaf4db5d..bdd332f17b35 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
index 68d72ad521ee..3ad68189df84 100644
--- a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
@@ -123,7 +123,7 @@ src_install() {
fperms -R 755 "${dir}"/jre/{bin,jre/bin}
fperms 755 ${dir}/jre/jre/lib/jexec
fi
- chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die
+ chmod 755 "${ED}${dir}"/gradle/gradle-*/bin/gradle || die
newicon "bin/studio.png" "${PN}.png"
make_wrapper ${PN} ${dir}/bin/studio.sh
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 001d549c4d96..defda19b6e82 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1 +1,2 @@
DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
+DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
diff --git a/dev-util/apitrace/apitrace-9.0.ebuild b/dev-util/apitrace/apitrace-9.0.ebuild
new file mode 100644
index 000000000000..8c100383021a
--- /dev/null
+++ b/dev-util/apitrace/apitrace-9.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-single-r1
+
+DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ app-arch/brotli:=[${MULTILIB_USEDEP}]
+ >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=
+ media-libs/mesa[egl,gles1,gles2,X(+),${MULTILIB_USEDEP}]
+ >=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ sys-process/procps:=[${MULTILIB_USEDEP}]
+ x11-libs/libX11
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5[-gles2]
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5[-gles2]
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ # TODO: upstream
+ "${FILESDIR}"/${P}-disable-multiarch.patch
+ "${FILESDIR}"/${P}-brotli-unbundle.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # The apitrace code grubs around in the internal zlib structures.
+ # We have to extract this header and clean it up to keep that working.
+ # Do not be surprised if a zlib upgrade breaks things ...
+ rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
+}
+
+src_configure() {
+ my_configure() {
+ local mycmakeargs=(
+ -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+ -DENABLE_EGL=ON
+ -DENABLE_CLI=ON
+ -DENABLE_GUI=$(multilib_native_usex qt5)
+ -DENABLE_STATIC_SNAPPY=OFF
+ -DENABLE_WAFFLE=ON
+ )
+ cmake_src_configure
+ }
+
+ multilib_foreach_abi my_configure
+}
+
+src_install() {
+ MULTILIB_CHOST_TOOLS=(
+ /usr/bin/apitrace$(get_exeext)
+ /usr/bin/eglretrace$(get_exeext)
+ /usr/bin/glretrace$(get_exeext)
+ )
+
+ cmake-multilib_src_install
+
+ make_libgl_symlinks() {
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+ dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+ }
+ multilib_foreach_abi make_libgl_symlinks
+}
diff --git a/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch
new file mode 100644
index 000000000000..5715edaec3f0
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch
@@ -0,0 +1,158 @@
+From 3a07d551949ff488d1d669600a07d9c73ff4cc55 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 29 Apr 2019 21:08:02 +0200
+Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from
+ Igalia S.L.
+
+MIT License, which fits well.
+
+Signed-off-by: Andreas Sturmlechner
+---
+ cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++
+ cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 70 insertions(+)
+ create mode 100644 cmake/FindBrotliDec.cmake
+ create mode 100644 cmake/FindBrotliEnc.cmake
+
+diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
+new file mode 100644
+index 00000000..abb06f44
+--- /dev/null
++++ b/cmake/FindBrotliDec.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliDec. Once done, this will define
++#
++# BROTLIDEC_FOUND - system has BrotliDec.
++# BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
++# BROTLIDEC_LIBRARIES - link these to use BrotliDec.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIDEC libbrotlidec)
++
++find_path(BROTLIDEC_INCLUDE_DIRS
++ NAMES brotli/decode.h
++ HINTS ${PC_BROTLIDEC_INCLUDEDIR}
++)
++
++find_library(BROTLIDEC_LIBRARIES
++ NAMES brotlidec
++ HINTS ${PC_BROTLIDEC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliDec
++ REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
++ FOUND_VAR BROTLIDEC_FOUND
++ VERSION_VAR PC_BROTLIDEC_VERSION)
++
++mark_as_advanced(
++ BROTLIDEC_INCLUDE_DIRS
++ BROTLIDEC_LIBRARIES
++)
+diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
+new file mode 100644
+index 00000000..4be347db
+--- /dev/null
++++ b/cmake/FindBrotliEnc.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliEnc. Once done, this will define
++#
++# BROTLIENC_FOUND - system has BrotliEnc.
++# BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories
++# BROTLIENC_LIBRARIES - link these to use BrotliEnc.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIENC libbrotlienc)
++
++find_path(BROTLIENC_INCLUDE_DIRS
++ NAMES brotli/encode.h
++ HINTS ${PC_BROTLIENC_INCLUDEDIR}
++)
++
++find_library(BROTLIENC_LIBRARIES
++ NAMES brotlienc
++ HINTS ${PC_BROTLIENC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliEnc
++ REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES
++ FOUND_VAR BROTLIENC_FOUND
++ VERSION_VAR PC_BROTLIENC_VERSION)
++
++mark_as_advanced(
++ BROTLIENC_INCLUDE_DIRS
++ BROTLIENC_LIBRARIES
++)
+--
+2.24.1
+
+From 08a410f238aaf6488759e023b66d16cbbd7f6d66 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 29 Apr 2019 21:11:57 +0200
+Subject: [PATCH 2/2] Find system brotli instead of bundled
+
+Signed-off-by: Andreas Sturmlechner
+---
+ CMakeLists.txt | 5 +++--
+ cli/CMakeLists.txt | 2 +-
+ lib/trace/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c71d24e6..88e6b156 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -491,8 +491,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
+ endif ()
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
+-add_subdirectory (thirdparty/brotli)
++find_package(BrotliDec REQUIRED)
++find_package(BrotliEnc REQUIRED)
++include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS})
+
+ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
+ # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
+diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
+index 3a3c127e..0b33ddb5 100644
+--- a/cli/CMakeLists.txt
++++ b/cli/CMakeLists.txt
+@@ -39,7 +39,7 @@ add_executable (apitrace
+
+ target_link_libraries (apitrace
+ common
+- brotli_dec brotli_enc brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ ${ZLIB_LIBRARIES}
+ ${SNAPPY_LIBRARIES}
+ ${GETOPT_LIBRARIES}
+diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
+index c68bd00f..ce2e469e 100644
+--- a/lib/trace/CMakeLists.txt
++++ b/lib/trace/CMakeLists.txt
+@@ -31,7 +31,7 @@ target_link_libraries (common
+ guids
+ highlight
+ os
+- brotli_dec brotli_common
++ ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ )
+
+ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
+--
+2.24.1
+
diff --git a/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch
new file mode 100644
index 000000000000..37085b1ae299
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch
@@ -0,0 +1,53 @@
+From 556397e399994b005524b88171c9c103b8cc1b25 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Mon, 29 Apr 2019 20:32:04 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
+
+Respect the libdir cmake already set up for us instead of using
+debian-specific multiarch paths.
+
+Patch was rebased multiple times from 4.0 to 9.0 now.
+
+Signed-off-by: Andreas Sturmlechner
+---
+ CMakeLists.txt | 17 ++---------------
+ 1 file changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19316e60..6c3c4b85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -438,15 +438,6 @@ endif ()
+ ##############################################################################
+ # Installation directories
+
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+- # Debian multiarch support
+- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+- OUTPUT_VARIABLE ARCH_SUBDIR
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+-endif()
+-
+ if (WIN32 OR APPLE)
+ # On Windows/MacOSX, applications are usually installed on a directory of
+ # their own
+@@ -455,12 +446,8 @@ if (WIN32 OR APPLE)
+ set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+ set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+- if (ARCH_SUBDIR)
+- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+- else ()
+- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+- endif ()
++ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
++ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+ endif ()
+
+ # Allow customization of the doc installation dir (Slackware uses different
+--
+2.24.1
+
diff --git a/dev-util/autodia/autodia-2.140.0-r2.ebuild b/dev-util/autodia/autodia-2.140.0-r2.ebuild
index 4e8cb2652bf7..74fb18c1b9f1 100644
--- a/dev-util/autodia/autodia-2.140.0-r2.ebuild
+++ b/dev-util/autodia/autodia-2.140.0-r2.ebuild
@@ -9,7 +9,7 @@ DIST_AUTHOR=TEEJAY
inherit perl-module
DESCRIPTION="Parses source code, XML or data and produces an XML document in Dia format"
-HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ ${HOMEPAGE}"
+HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ https://metacpan.org/release/Autodia"
SRC_URI+=" mirror://gentoo/${DIST_NAME}-2.14-dbi.patch.gz"
LICENSE="GPL-2"
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild
index 5a820baf68dc..7a5ceed1897a 100644
--- a/dev-util/boost-build/boost-build-1.72.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.72.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
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"
+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"
RESTRICT="test"
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
index 856607a6df29..47a91aadc54e 100644
--- a/dev-util/cccc/cccc-3.1.5-r1.ebuild
+++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -52,19 +52,16 @@ src_install() {
dodoc README.md
- if use mfc ; then
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/cccc-MFC-dialect.opt
- fi
+ use mfc && dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
if use doc ; then
- insinto /usr/share/doc/${PF}/html
- doins cccc/*.html
+ docinto html
+ dodoc cccc/*.html
if use apidoc ; then
- insinto /usr/share/doc/${PF}/html/api
- doins -r doxygen/html/*
- insinto /usr/share/doc/${PF}/html/metrics
- doins ccccout/*
+ docinto html/api
+ dodoc -r doxygen/html/.
+ docinto html/metrics
+ dodoc -r ccccout/.
fi
fi
}
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index 326c78bb675a..f7b4111c9f64 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -16,7 +16,6 @@ SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
DEPEND="
- !
-
-
- Colored, side-by-side diff terminal viewer.
-
-
- cdiff
- ymattw/cdiff
-
+
+
+ cdiff
+ ymattw/cdiff
+
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
index cfd494b1cba1..39f37e6b3b9a 100644
--- a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
@@ -19,8 +19,7 @@ IUSE=""
RESTRICT="test"
RDEPEND="dev-lang/perl
- virtual/perl-Getopt-Long
- !> 8);
+}
---- colorgccrc.orig 1999-04-29 10:16:08.000000000 -0700
-+++ colorgccrc 2003-02-12 17:38:38.000000000 -0800
+--- a/colorgccrc
++++ b/colorgccrc
@@ -20,12 +20,14 @@
# For example, srcColor: bold cyan on_yellow
#
@@ -225,8 +225,8 @@
errorMessageColor: bold red
-
-
---- INSTALL.orig 1999-04-29 10:16:08.000000000 -0700
-+++ INSTALL 2003-04-07 17:12:25.000000000 -0700
+--- a/INSTALL
++++ b/INSTALL
@@ -27,9 +27,9 @@
When "g++" is invoked, colorgcc is run instead. colorgcc looks at the
program name to figure out which compiler to use.
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
index 911a31b21bf3..6cc033255a2a 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
@@ -1,5 +1,5 @@
---- colorgcc.r9 2003-09-21 12:14:48.000000000 -0700
-+++ colorgcc 2003-09-21 13:11:22.000000000 -0700
+--- a/colorgcc
++++ b/colorgcc
@@ -95,6 +95,7 @@
use Cwd 'abs_path';
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
index 9602146b0af9..b14a92b59a63 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
@@ -1,5 +1,5 @@
---- /usr/bin/colorgcc 2010-12-13 00:08:37.000000000 -0200
-+++ colorgcc 2011-10-05 15:26:53.000000000 -0300
+--- a/colorgcc
++++ b/colorgcc
@@ -221,17 +221,16 @@
# Figure out which compiler to invoke based on our program name.
$0 =~ m%.*/(.*)$%;
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
index 026503e8f2c9..52cdb165cdda 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
@@ -1,5 +1,5 @@
---- /usr/bin/colorgcc 2009-10-29 20:24:46.717190000 +0100
-+++ colorgcc 2009-10-29 20:27:42.614162888 +0100
+--- a/colorgcc
++++ b/colorgcc
@@ -102,7 +102,8 @@
$nocolor{"dumb"} = "true";
diff --git a/dev-util/conf2struct/conf2struct-1.0.ebuild b/dev-util/conf2struct/conf2struct-1.0.ebuild
index f05ace485dcf..28df9ba3cbb7 100644
--- a/dev-util/conf2struct/conf2struct-1.0.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.0.ebuild
@@ -28,5 +28,5 @@ src_compile(){
}
src_install(){
- emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
}
diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-9999.ebuild
index b853d93f1b86..e858e5baedb7 100644
--- a/dev-util/conf2struct/conf2struct-9999.ebuild
+++ b/dev-util/conf2struct/conf2struct-9999.ebuild
@@ -28,5 +28,5 @@ src_compile(){
}
src_install(){
- emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
}
diff --git a/dev-util/d-feet/d-feet-0.3.14.ebuild b/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
similarity index 92%
rename from dev-util/d-feet/d-feet-0.3.14.ebuild
rename to dev-util/d-feet/d-feet-0.3.14-r1.ebuild
index e4f0ba6d614d..9bffea50f288 100644
--- a/dev-util/d-feet/d-feet-0.3.14.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
@@ -25,7 +25,9 @@ COMMON_DEPEND="
RDEPEND="
${COMMON_DEPEND}
>=dev-libs/glib-2.34:2
- >=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.3.91:3[${PYTHON_MULTI_USEDEP}]
+ ')
>=sys-apps/dbus-1
X? ( x11-libs/libwnck:3[introspection] )
"
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
similarity index 86%
rename from dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
rename to dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
index 829f86ec19c3..c4f1875532ba 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
@@ -28,10 +28,16 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
"
DEPEND="${COMMON_DEPEND}
- test? ( dev-python/dbusmock[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${COMMON_DEPEND}
- dev-python/dbusmock[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+ ')
"
src_prepare() {
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 1286a1647bd9..fc28b4a96eb0 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,7 +22,6 @@ DEPEND="
${RDEPEND}
nls? ( sys-devel/gettext )
!minimal? ( sys-devel/libtool )
- !<=sys-freebsd/freebsd-contrib-8.9999
"
src_prepare() {
diff --git a/dev-util/dialog/dialog-1.3.20191110.ebuild b/dev-util/dialog/dialog-1.3.20191110.ebuild
index 81549340ae07..f119f530eae5 100644
--- a/dev-util/dialog/dialog-1.3.20191110.ebuild
+++ b/dev-util/dialog/dialog-1.3.20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,6 @@ DEPEND="
${RDEPEND}
nls? ( sys-devel/gettext )
!minimal? ( sys-devel/libtool )
- !<=sys-freebsd/freebsd-contrib-8.9999
"
S=${WORKDIR}/${DIA_P}
diff --git a/dev-util/dialog/dialog-1.3.20191210.ebuild b/dev-util/dialog/dialog-1.3.20191210.ebuild
index 81549340ae07..f119f530eae5 100644
--- a/dev-util/dialog/dialog-1.3.20191210.ebuild
+++ b/dev-util/dialog/dialog-1.3.20191210.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,7 +20,6 @@ DEPEND="
${RDEPEND}
nls? ( sys-devel/gettext )
!minimal? ( sys-devel/libtool )
- !<=sys-freebsd/freebsd-contrib-8.9999
"
S=${WORKDIR}/${DIA_P}
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 58c91e54731e..9700495ff272 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1 +1,2 @@
DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
+DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
diff --git a/dev-util/diffuse/diffuse-0.4.8.ebuild b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
similarity index 91%
rename from dev-util/diffuse/diffuse-0.4.8.ebuild
rename to dev-util/diffuse/diffuse-0.4.8-r1.ebuild
index 93a43809a4d2..5a0d5a3968a4 100644
--- a/dev-util/diffuse/diffuse-0.4.8.ebuild
+++ b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}
- dev-python/pygtk[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+ ')"
# file collision, bug #279018
DEPEND="${DEPEND}
!sci-chemistry/tinker"
diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
new file mode 100644
index 000000000000..1cb786be52c5
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
+inherit python-single-r1 l10n xdg-utils
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
+ ')
+ x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+ !sci-chemistry/tinker"
+
+src_prepare() {
+ default
+ l10n_find_plocales_changes translations '' '.po'
+
+ rm_locale() {
+ rm -f translations/${1}.po
+ rm -rf src/usr/share/man/${1}
+ rm -rf src/usr/share/gnome/help/${PN}/$1
+ rm -f src/usr/share/omf/${PN}/${PN}-$1.omf
+ }
+
+ l10n_for_each_disabled_locale_do rm_locale
+}
+
+src_install() {
+ "${PYTHON}" install.py \
+ --prefix="${EPREFIX}"/usr \
+ --sysconfdir="${EPREFIX}"/etc \
+ --files-only \
+ --destdir="${D}" \
+ || die "Installation failed"
+ dodoc AUTHORS ChangeLog README.md
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/dev-util/dput-ng/dput-ng-1.10.ebuild b/dev-util/dput-ng/dput-ng-1.10-r1.ebuild
similarity index 81%
rename from dev-util/dput-ng/dput-ng-1.10.ebuild
rename to dev-util/dput-ng/dput-ng-1.10-r1.ebuild
index 2192829fcc8c..eef660cec5b5 100644
--- a/dev-util/dput-ng/dput-ng-1.10.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,15 +17,19 @@ KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
- dev-python/python-debian[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-util/distro-info[python,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+ dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+ dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
+ ')
"
DEPEND="${RDEPEND}
app-text/asciidoc
test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/python-debian[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_MULTI_USEDEP}]
+ dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+ ')
)"
RESTRICT="test"
diff --git a/dev-util/dput-ng/dput-ng-1.28.ebuild b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
similarity index 83%
rename from dev-util/dput-ng/dput-ng-1.28.ebuild
rename to dev-util/dput-ng/dput-ng-1.28-r1.ebuild
index d0864124adac..573ed24b99a4 100644
--- a/dev-util/dput-ng/dput-ng-1.28.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
@@ -17,15 +17,19 @@ KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
- dev-python/python-debian[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-util/distro-info[python,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+ dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+ dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
+ ')
"
DEPEND="${RDEPEND}
app-text/asciidoc
test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/python-debian[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/nose[${PYTHON_MULTI_USEDEP}]
+ dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+ ')
dev-util/debhelper
)"
diff --git a/dev-util/drone-cli/drone-cli-0.8.6.ebuild b/dev-util/drone-cli/drone-cli-0.8.6.ebuild
index 8598f228df1d..2d96ab01c279 100644
--- a/dev-util/drone-cli/drone-cli-0.8.6.ebuild
+++ b/dev-util/drone-cli/drone-cli-0.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,19 +9,16 @@ EGIT_COMMIT="800d6949bd96847b4d5c400e261b18386ea2226f"
inherit golang-build golang-vcs-snapshot
ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
DESCRIPTION="Command-line interface for Drone"
HOMEPAGE="https://github.com/drone/drone-cli"
SRC_URI="${ARCHIVE_URI}"
+
LICENSE="Apache-2.0"
SLOT="0"
-IUSE=""
-
+KEYWORDS="~amd64"
RESTRICT="test"
-RDEPEND="!!
- Electron is a cross platform application development framework based on web technologies based on Chromium
diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
similarity index 95%
rename from media-gfx/krita/krita-4.2.7.1.ebuild
rename to media-gfx/krita/krita-4.2.7.1-r1.ebuild
index 4c9525d74aae..2d2e1b4c6547 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -50,8 +50,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
$(add_qt_dep qtxml)
dev-libs/boost:=
dev-libs/quazip
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
media-gfx/exiv2:=
media-libs/lcms
media-libs/libpng:0=
diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
similarity index 95%
rename from media-gfx/krita/krita-4.2.8.2.ebuild
rename to media-gfx/krita/krita-4.2.8.2-r1.ebuild
index 99703d1a2126..2348b287dfb9 100644
--- a/media-gfx/krita/krita-4.2.8.2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,8 +31,10 @@ BDEPEND="
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
dev-libs/quazip
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index de044c9bcfc7..ef2a9b8c654a 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -30,8 +30,8 @@ src_configure() {
tc-export AR CC
# Hand rolled configure script, so not all flags are supported.
./configure \
- --prefix="${EPREFIX%/}/usr" \
- --libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
$(use debug && echo --enable-debug) \
$(use_enable cpu_flags_x86_sse2 sse) \
$(use_with openmp) \
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 053745426699..c04b34f09632 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -30,8 +30,8 @@ src_configure() {
tc-export AR CC
# Hand rolled configure script, so not all flags are supported.
./configure \
- --prefix="${EPREFIX%/}/usr" \
- --libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
$(use debug && echo --enable-debug) \
$(use_enable cpu_flags_x86_sse2 sse) \
$(use_with openmp) \
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
similarity index 85%
rename from media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
rename to media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
index d30ef32ed435..a55e00599696 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
@@ -20,13 +20,15 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ )
+ >=dev-python/pycairo-1.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+ ')
>=dev-libs/json-c-0.11:=
media-libs/lcms:2
>=media-libs/libmypaint-1.3.0
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index b73d0599390e..fdd5434d27f1 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,3 +1,4 @@
DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
+DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
index ed5cd3d6884d..41ec70caafc7 100644
--- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
@@ -54,8 +54,8 @@ src_configure()
{
local mycmakeargs=(
-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
- -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
- -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+ -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+ -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-DCMAKE_SKIP_RPATH=ON
)
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
index bcb59bf1a284..8906b6e2ae54 100644
--- a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
@@ -53,8 +53,8 @@ src_configure()
{
local mycmakeargs=(
-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
- -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
- -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+ -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+ -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-DCMAKE_SKIP_RPATH=ON
)
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
index 9921de91c2f5..7f206e2ccf0f 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
@@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources
src_configure() {
local mycmakeargs=(
-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
- -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
- -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+ -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+ -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-DCMAKE_SKIP_RPATH=ON
)
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
index a73803cb0e07..760fe526d498 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
@@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources
src_configure() {
local mycmakeargs=(
-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
- -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
- -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+ -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+ -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-DCMAKE_SKIP_RPATH=ON
)
diff --git a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
new file mode 100644
index 000000000000..cccd2e4ca023
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+RDEPEND="
+ app-arch/lz4:=
+ >=dev-libs/boost-1.55.0:=
+ dev-libs/lzo:2
+ >=dev-qt/qtcore-5.9:5
+ >=dev-qt/qtgui-5.9:5
+ >=dev-qt/qtmultimedia-5.9:5[widgets]
+ >=dev-qt/qtnetwork-5.9:5
+ >=dev-qt/qtopengl-5.9:5
+ >=dev-qt/qtprintsupport-5.9:5
+ >=dev-qt/qtscript-5.9:5
+ >=dev-qt/qtsvg-5.9:5
+ >=dev-qt/qtwidgets-5.9:5
+ >=dev-qt/qtxml-5.9:5
+ media-libs/freeglut
+ media-libs/freetype:2
+ media-libs/glew:=
+ media-libs/libjpeg-turbo
+ >=media-libs/libmypaint-1.3.0:=
+ media-libs/libpng:=
+ >=sci-libs/superlu-4.1:=
+ sys-libs/zlib
+ virtual/cblas
+ virtual/libusb:1
+ virtual/opengl
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+CMAKE_MAKEFILE_GENERATOR=emake
+
+src_configure() {
+ local mycmakeargs=(
+ -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+ -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+ -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
+ -DCMAKE_SKIP_RPATH=ON
+ )
+
+ # The upstream uses their own modified libtiff
+ # See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+ cd thirdparty/tiff-4.0.3 || die
+ econf \
+ --with-pic \
+ --disable-jbig \
+ --enable-static \
+ --disable-shared
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cd "${S}"/thirdparty/tiff-4.0.3 || die
+ emake
+
+ cmake_src_compile
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
similarity index 92%
rename from media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
rename to media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
index e54468f1c2a1..c683e96e7099 100644
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
+ >=dev-libs/boost-1.62:=
>=dev-libs/c-blosc-1.5.0
dev-libs/jemalloc
dev-libs/log4cplus
@@ -33,7 +33,10 @@ RDEPEND="
x11-libs/libXrandr
python? (
${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
)"
DEPEND="${RDEPEND}
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
similarity index 91%
rename from media-gfx/openvdb/openvdb-5.2.0.ebuild
rename to media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
index 3bbdbdb4fb2a..acb7886d4438 100644
--- a/media-gfx/openvdb/openvdb-5.2.0.ebuild
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
+ >=dev-libs/boost-1.62:=
>=dev-libs/c-blosc-1.5.0
dev-libs/jemalloc
dev-libs/log4cplus
@@ -32,7 +32,10 @@ RDEPEND="
x11-libs/libXrandr
python? (
${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
)"
DEPEND="${RDEPEND}
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index f44a566e76f4..b2affae60d52 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
similarity index 96%
rename from media-gfx/zbar/zbar-0.20.1-r1.ebuild
rename to media-gfx/zbar/zbar-0.20.1-r2.ebuild
index 9a6382e3b61f..5aba21e790d8 100644
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,7 +33,11 @@ COMMON_DEPEND="
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
python? (
${PYTHON_DEPS}
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+ gtk? (
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
)
qt5? (
dev-qt/qtcore:5
diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
similarity index 98%
rename from media-gfx/zbar/zbar-0.23.ebuild
rename to media-gfx/zbar/zbar-0.23-r1.ebuild
index 495dc423d47e..87656810dce6 100644
--- a/media-gfx/zbar/zbar-0.23.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -66,7 +66,9 @@ DEPEND="${COMMON_DEPEND}
)
test? (
${PYTHON_DEPS}
- dev-python/pillow[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ ')
)"
BDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index dc2c8ce2581d..11a4689d0f84 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index 3f9aa7693e13..527a9794d7f5 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -41,5 +41,5 @@ multilib_src_install_all() {
find "${ED}" -name '*.a' -delete || die
fi
find "${ED}" -name '*.la' -delete || die
- sed -e 's:\${exec_prefix}/\\$LIB/::' -i "${ED%/}/usr/bin/aoss" || die
+ sed -e 's:\${exec_prefix}/\\$LIB/::' -i "${ED}/usr/bin/aoss" || die
}
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
new file mode 100644
index 000000000000..42615b32a54f
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X debug examples +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+COMMON_DEPEND="
+ >=dev-libs/glib-2.20:2
+ >=media-libs/clutter-1.20:1.0=[X=,introspection?]
+ >=media-libs/cogl-1.18:1.0=[introspection?]
+ >=media-libs/gstreamer-1.4:1.0[introspection?]
+ >=media-libs/gst-plugins-bad-1.4:1.0
+ >=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+ udev? ( dev-libs/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+ >=media-libs/gst-plugins-good-1.4:1.0
+ !udev? ( media-plugins/gst-plugins-v4l2 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.11
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # --enable-gl-texture-upload is experimental
+ gnome2_src_configure \
+ --disable-maintainer-flags \
+ --enable-debug=$(usex debug yes minimum) \
+ $(use_enable introspection) \
+ $(use_enable udev)
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins examples/{*.c,*.png,README}
+ fi
+}
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
index fb67d6643e15..d24e41188b45 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
MY_PV=$(replace_all_version_separators "-")
DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
index fb67d6643e15..d24e41188b45 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
MY_PV=$(replace_all_version_separators "-")
DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index 60e82af73945..677a23328f84 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -113,6 +113,6 @@ src_compile() {
}
src_install() {
- foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED%/}"/usr/$(get_libdir)
+ foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
einstalldocs
}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 5910d9d60c0b..3fed7f9dc4f8 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,2 +1 @@
-DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
deleted file mode 100644
index a30f232f48d9..000000000000
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
-
-LICENSE="BSD"
-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"
-IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
-
-REQUIRED_USE="shm? ( X )"
-
-RDEPEND="
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
- jpeg? ( ~virtual/jpeg-0:0=[${MULTILIB_USEDEP}] )
- mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- X? ( x11-base/xorg-proto )
-"
-
-multilib_src_configure() {
- local myconf_imlib2=(
- $(use_with bzip2)
- $(use_with gif)
- $(use_with jpeg)
- $(use_with mp3 id3)
- $(use_with png)
- $(use_with shm x-shm-fd)
- $(use_enable static-libs static)
- $(use_with tiff)
- $(use_with X x)
- $(use_with zlib)
- )
-
- # imlib2 has different configure options for x86/amd64 assembly
- if [[ $(tc-arch) == amd64 ]]; then
- myconf_imlib2+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
- else
- myconf_imlib2+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
- fi
-
- ECONF_SOURCE="${S}" \
- econf "${myconf_imlib2[@]}"
-}
-
-multilib_src_install() {
- V=1 emake install DESTDIR="${D}"
- find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
- if use doc; then
- local HTML_DOCS=( "${S}"/doc/. )
- rm "${S}"/doc/Makefile.{am,in} || die
- fi
- einstalldocs
-}
diff --git a/media-libs/libffado/libffado-2.4.1.ebuild b/media-libs/libffado/libffado-2.4.1-r1.ebuild
similarity index 95%
rename from media-libs/libffado/libffado-2.4.1.ebuild
rename to media-libs/libffado/libffado-2.4.1-r1.ebuild
index 571be2962fef..26c86b9fd086 100644
--- a/media-libs/libffado/libffado-2.4.1.ebuild
+++ b/media-libs/libffado/libffado-2.4.1-r1.ebuild
@@ -33,8 +33,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
sys-libs/libavc1394[${MULTILIB_USEDEP}]
sys-libs/libraw1394[${MULTILIB_USEDEP}]
qt5? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}]
+ ')
x11-misc/xdg-utils
)"
DEPEND="${COMMON_DEPEND}
diff --git a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild b/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
index bbaec2d1a295..dbff81c64076 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,8 +27,10 @@ RDEPEND="
ios? ( app-pda/libimobiledevice:= )
python? (
${PYTHON_DEPS}
- >=media-libs/mutagen-1.8[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=media-libs/mutagen-1.8[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygobject-2.8:2[${PYTHON_MULTI_USEDEP}]
+ ')
)
udev? ( virtual/udev )
mono? (
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r4.ebuild
similarity index 93%
rename from media-libs/libkate/libkate-0.4.1-r3.ebuild
rename to media-libs/libkate/libkate-0.4.1-r4.ebuild
index 6745423f91c8..3711f2d95de4 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r4.ebuild
@@ -30,7 +30,9 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
wxwidgets? (
${PYTHON_DEPS}
- dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+ ')
media-libs/liboggz )
"
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
index 52f9c783e3ea..dedef265f14f 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
[[ ${PV} == 9999 ]] && inherit autotools git-r3
DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index 35b64943085a..e06afc69f315 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
LICENSE="MPL-2.0"
SLOT="0"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 195d8afed66c..fdb976cb1d65 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,2 +1,3 @@
DIST libprojectm-3.1.1_rc8.tar.gz 54503673 BLAKE2B f7d781c6a0e54414d0a9ba5ab601556384e6af9b6a23a3123d3f3e0b1613549727b75901681beba1cd3fdd4193415d9e0bb927c4f7b69c41f4e4e85adb5f8597 SHA512 dcf2e7a0a826438bee538f052287b2057a303f5c29e77804874c9d5ea9f3cc0395a51f7734eec027a4f4e687c7b9f818bf908084c8b9da0953cd95d7fa12c864
+DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50226252ae7a6d651dff910104244e2f0747fc43791b0524f46f8fa305688749fc4f508b76d04506aa17292f2c8789d1c SHA512 c7c8e61b6262324a7d4094f92796732f7c7bf9fdd82df3dc327efe82fd1d3d8277763059ba72e3fea70875952dd763998cd3b69ed64f594fbff8ae489110dfa2
DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
diff --git a/media-libs/libprojectm/libprojectm-3.1.2.ebuild b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
new file mode 100644
index 000000000000..ec8f42efd454
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+ inherit git-r3
+else
+ MY_PV="${PV/_/-}"
+ SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+ S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+ media-libs/glm
+ media-libs/mesa[X(+)]
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtopengl:5
+ media-sound/pulseaudio
+ )
+ sdl? ( >=media-libs/libsdl2-2.0.5 )
+ sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable gles2 gles)
+ $(use_enable qt5 qt)
+ $(use_enable sdl)
+ --enable-emscripten=no
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index 1bbb41cef00e..18b33dc28a21 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -54,6 +54,6 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
- rm -rf "${ED%/}"/usr/share/doc/${PN} || die
+ rm -rf "${ED}"/usr/share/doc/${PN} || die
find "${D}" -name '*.la' -delete || die
}
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 3c130ff28f52..c4467c021691 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -69,11 +69,11 @@ src_configure() {
$(use_with expat)
$(use_with !expat libxml2)
$(use_with X x)
- --with-docdir="${EPREFIX%/}"/usr/share/doc/${PF}
- --with-fontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+ --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
--with-freetype
- --with-gsfontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
- --with-gsfontmap="${EPREFIX%/}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
+ --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
--with-jpeg
--with-layers
--with-png
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r2.ebuild
similarity index 88%
rename from media-libs/lv2/lv2-1.14.0-r1.ebuild
rename to media-libs/lv2/lv2-1.14.0-r2.ebuild
index 9c33a5afd098..fd9a5fe44eaf 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r2.ebuild
@@ -22,9 +22,11 @@ DEPEND="
${PYTHON_DEPS}
plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
RDEPEND="${DEPEND}
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/rdflib[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+ dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
+ ')
!
+Date: Fri, 7 Jun 2019 15:36:09 -0700
+Subject: [PATCH] meson: Generate cmake config and version files if meson is
+ new enough
+
+Meson 0.50.0 added a module similar to the pkg-config module for
+generating cmake config files. Since the CMake build system provides
+these the meson build system should as well.
+
+v2: - Bump version to 0.50 instead of incorrect 0.49
+v3: - remove TODO comment that this fixes
+ - Add a definition of set_and_check for meson-generated Config
+ files.
+
+Reviewed-by: Eric Engestrom
+---
+ cmake/Modules/WaffleConfig.cmake.in | 10 ++++++++++
+ meson.build | 2 --
+ src/waffle/meson.build | 20 ++++++++++++++++++++
+ 3 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/WaffleConfig.cmake.in b/cmake/Modules/WaffleConfig.cmake.in
+index b60b470..4e19755 100644
+--- a/cmake/Modules/WaffleConfig.cmake.in
++++ b/cmake/Modules/WaffleConfig.cmake.in
+@@ -7,6 +7,16 @@
+
+ @PACKAGE_INIT@
+
++# This should only be used for meson
++if (NOT DEFINED set_and_check)
++ macro(set_and_check _var _file)
++ set(${_var} "${_file}")
++ if(NOT EXISTS "${_file}")
++ message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
++ endif()
++ endmacro()
++endif()
++
+ set_and_check(Waffle_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@")
+ set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ set(Waffle_LIBRARIES "@waffle_libname@")
+diff --git a/meson.build b/meson.build
+index 29fda22..22b7f59 100644
+--- a/meson.build
++++ b/meson.build
+@@ -231,5 +231,3 @@ endif
+ if get_option('build-examples')
+ subdir('examples')
+ endif
+-
+-# TODO: CMake config file
+diff --git a/src/waffle/meson.build b/src/waffle/meson.build
+index 322df40..cd68ddf 100644
+--- a/src/waffle/meson.build
++++ b/src/waffle/meson.build
+@@ -211,6 +211,26 @@ pkg.generate(
+ description : 'A library for selecting an OpenGL API and windows system at runtime.',
+ )
+
++if meson.version().version_compare('>= 0.50')
++ cmake = import('cmake')
++ cmake.write_basic_package_version_file(
++ name : 'Waffle',
++ version : meson.project_version(),
++ compatibility : 'SameMajorVersion',
++ )
++
++ cmake_conf = configuration_data()
++ cmake_conf.set('waffle_libname', waffle_name)
++ cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')))
++ cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir')))
++
++ cmake.configure_package_config_file(
++ name : 'Waffle',
++ input : '../../cmake/Modules/WaffleConfig.cmake.in',
++ configuration : cmake_conf,
++ )
++endif
++
+ if get_option('build-tests')
+ if get_option('default_library') == 'shared'
+ # The unit tests need to poke at internals of the library, but with a
+--
+2.24.1
+
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild b/media-libs/waffle/waffle-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..2f9c6de8b559
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+ GIT_ECLASS="git-r3"
+else
+ SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+ >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+ doc? (
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.2
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-meson-Generate-cmake-config-and-version-files-if-mes.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
+src_unpack() {
+ default
+ [[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature X glx)
+ $(meson_feature wayland)
+ $(meson_feature X x11_egl)
+ $(meson_feature gbm)
+ $(meson_feature egl surfaceless_egl)
+ $(meson_use test build-tests)
+ $(meson_use doc build-manpages)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ rm -rf "${D}"/usr/share/doc/waffle1
+}
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 56a48b843787..f088ab0aa6d5 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
)
"
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/wflinfo$(get_exeext)
+)
+
src_unpack() {
default
[[ $PV = 9999* ]] && git-r3_src_unpack
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index dffdc38d56d8..41dc2c7ca9e7 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r2.ebuild
similarity index 86%
rename from media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild
rename to media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r2.ebuild
index 092dbe2cbe71..3d8ce22e9b37 100644
--- a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild
+++ b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
DEPEND="media-gfx/gimp
virtual/pkgconfig
${PYTHON_DEPS}"
-RDEPEND="media-gfx/gimp[python,${PYTHON_USEDEP}]
+RDEPEND="media-gfx/gimp[python,${PYTHON_SINGLE_USEDEP}]
${PYTHON_DEPS}"
S="${WORKDIR}/${MY_P}"
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index a83d849661f7..c8a5a98c0622 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,2 +1 @@
-DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
DIST imlib2_loaders-1.6.0.tar.gz 375642 BLAKE2B cf1e8ad887d7b56ab828018e85d5fc635509eadd283ebc051671d8b9129adfded12449a5e8d7d52f4a8bd8e877a0585d62562e169be6176d93ded3dec0569e5d SHA512 948e85260ad9379f71d35ed8f98355f25878acef3bffc9add0419b6c3d3f7eec0dd504701d0bd2ad75a1aacba02e08965a5f0327f7a2832369af34b5d23d9179
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
deleted file mode 100644
index a17b4de02399..000000000000
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Additional image loaders for Imlib2"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="eet xcf"
-
-RDEPEND="
- >=media-libs/imlib2-${PV}
- eet? ( dev-libs/efl[eet] )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-src_configure() {
- local myconf=(
- --disable-static
- $(use_enable eet)
- $(use_enable xcf)
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- V=1 emake install DESTDIR="${D}"
- einstalldocs
-
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
index 0b2ef19787d0..e8ee8565a1d4 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="eet xcf"
RDEPEND=">=media-libs/imlib2-${PV}
diff --git a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
index 8fadc5cead93..c02368823b0b 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN/_/.}-${PV}
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="tools"
RDEPEND="media-libs/libsamplerate
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
index 84fbbef3f1c6..03d78346ab04 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN/_/.}-${PV}
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="tools"
RDEPEND="media-libs/libsamplerate
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index f1ec52e192ec..7fe16ac3c06d 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,5 +1 @@
-DIST kodi-audioencoder-flac-2.0.1.tar.gz 20523 BLAKE2B 6ef8f51df7d0c0113389508e3d295b9adf7757684e42ab01ed19f4837881b2f9adfcfd6950f01fb0de54a772a7ea907afd3c4595b0df4b8fd2be647149a5a510 SHA512 4fcbfd4efe52b6983622367eefbbf09a9392c460160d6b4659df0e8b86a565a23f140a22728a2e40b033ad8cdbab68b786e90120dca034dd690217f8ba2b5c01
-DIST kodi-audioencoder-flac-2.0.2.tar.gz 21036 BLAKE2B 52296b0a85b3f6778cf5de67d5b5b95339195f23dcc1d35b4b3e738d7c2ca2932f1584a467a6654837f6baf898f118976c2d67087ada4561971f725978740587 SHA512 5e5ac3e66b193727e5d2d85c5416275adda642502526bf2525864135119f831b0332a50fca9dbb0042cb0a8165fa93de12d49f1e9cd467eb3280f31e3ee99486
-DIST kodi-audioencoder-flac-2.0.3.tar.gz 20974 BLAKE2B 3a328e7168bd3ae16faa0a7fc9917586dfc846903ec1cd4f8115986530da96fc9ffc7e614f5eba810f22bc833b9cf891d5e61d46c3f4db910b1c10f25fe6d661 SHA512 036c4368b09e540f67ad7654ec567d22fd52dcc8690bc22717de33180e6f8c03b0f6a1ecb8bd7a63dd99e65fa4318ef0f256b503fcb295ec0fb03ff38aee0322
-DIST kodi-audioencoder-flac-2.0.4.tar.gz 21010 BLAKE2B f7b59432b2054c6cde1c46728af77194a922d845b166efd90f20c033da234dcbf7e79f6b1e26e6c0ea59d92ede9b99849d59497bd09120bcca22b1c40139e41b SHA512 d58913acc84b892049919c15fd5d82e46f4451eaf6f7993e36e66e1e390f14c86bf0633dfdf60f6751ea23b43b7e0b7a8d2fc7a1c28a87212c614fc16cf33056
-DIST kodi-audioencoder-flac-2.0.5.tar.gz 21077 BLAKE2B 52df110e0c60abe3c309abafcd46c3407690132af95b251188fd701112ed17ca15b9dddaca882183b2f64357717ddc934cae4f072c70d10d049002ccad24f90f SHA512 4c6940be8c84f509a399ed22a38281259327371c7819cde4266ffd3712484664561a9bd3a5ecc8b51c0e45305f90114164f3aa2bc624c0d0d588b212bf28c750
+DIST kodi-audioencoder-flac-2.0.6.tar.gz 21666 BLAKE2B 13c63fd4987dd4e911e3af44642dea33a7d652b5f465654e7038247000aa324ff2b2422f22d7ed88a7f956c3d15dcf960cb9e5bde4b70b3dac3604ada49a099c SHA512 7de2b0f5b36b62bc1f066e5c99fba2aa61baac5f204a75556172aa95332999806a34babef08ac5e516e62a123b83d3befaee6654d3089ebd1a305335a40d88b5
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild
deleted file mode 100644
index 68b701ab3ff3..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
- inherit git-r3
- ;;
-*)
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/audioencoder.flac-${PV}"
- ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- =media-tv/kodi-18*
- media-libs/libogg
- media-libs/flac
- "
-RDEPEND="
- ${DEPEND}
- "
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
deleted file mode 100644
index 15673bd09c98..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
- inherit git-r3
- ;;
-*)
- KEYWORDS="~amd64 ~x86"
- CODENAME="Leia"
- SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
- ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- =media-tv/kodi-18*
- >=media-libs/libogg-1.3.4
- media-libs/flac
- "
-RDEPEND="
- ${DEPEND}
- "
-
-src_prepare(){
- [ -d depends ] && rm -rf depends || die
- cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
deleted file mode 100644
index 15673bd09c98..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
- inherit git-r3
- ;;
-*)
- KEYWORDS="~amd64 ~x86"
- CODENAME="Leia"
- SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
- ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- =media-tv/kodi-18*
- >=media-libs/libogg-1.3.4
- media-libs/flac
- "
-RDEPEND="
- ${DEPEND}
- "
-
-src_prepare(){
- [ -d depends ] && rm -rf depends || die
- cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
similarity index 95%
rename from media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
rename to media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
index 15673bd09c98..cda8b9b68051 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index c58bb0894d86..8f55163d6e72 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,2 +1,3 @@
DIST kodi-audioencoder-lame-2.0.1.tar.gz 23505 BLAKE2B 706cefee19bfdc19caa7c65101d61a3032f70033b4c8adf40c90009aed81c8b69c30e0a8982cf633267c26ea568b19adbefaf6c035617573fa09ae486a6d8e80 SHA512 eb780f31e96a0c745cb2598212aab39a065cc85b186b579ba2ace4732640588dabf9a6ef2e6ee57ddd793a2790cab0b8c2a1068714b80ecbfa4ae4a6eaf2f4b1
DIST kodi-audioencoder-lame-2.0.2.tar.gz 20286 BLAKE2B 56ebf807a40d2d77469c454db0011a4c70000bc90cb3cbd41839719e376a56b9d07733a583f551fc74eff6de42b25d6c84027e678f7d5f34bdee9fa576b0ac33 SHA512 e4a73dadba4fafc8e60c1730404f9390a191bec58823202c3193f7f0571e914151c74b6d18e7d48551ae2f493b9ef11a84ddb27976a5f766e1ba512f1a0e141b
+DIST kodi-audioencoder-lame-2.0.4.tar.gz 20819 BLAKE2B 38340fb3069cbb8539ead53e91dbcabd21e169fc5ab76d3b7142b126f192bf8a295e9d7ead2c4e68d822dc1596f0b7e83a962ef8709783979279e4a9aebb562c SHA512 8b57d20c2d02ec7148a83ab7af78eaf92b600a40faa666c4f26b5acb59838ade54f026dc3869b23fc79511fc5901acca5322d2f04336fc8d4f545f5d7c04cb2c
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
similarity index 54%
rename from media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
rename to media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
index 15673bd09c98..fec255d3dc38 100644
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake kodi-addon
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
+DESCRIPTION="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
SRC_URI=""
case ${PV} in
9999)
SRC_URI=""
- EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
+ EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
inherit git-r3
;;
*)
KEYWORDS="~amd64 ~x86"
CODENAME="Leia"
- SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+ SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
;;
esac
@@ -29,9 +29,9 @@ IUSE=""
DEPEND="
=media-tv/kodi-18*
- >=media-libs/libogg-1.3.4
- media-libs/flac
+ >=media-sound/lame-3.100
"
+
RDEPEND="
${DEPEND}
"
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index 2c44f1adc801..c4a8de3e8a4f 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,3 +1 @@
-DIST kodi-audioencoder-vorbis-2.0.1.tar.gz 15878 BLAKE2B 66bed287d8af393d914678a3e8da13e73d969fe8dabdaa3ed3c579851f40456d12f32f7edf416eb2a9b8734a2868ed8c0d4eb0a22b70fbb74167f3de1cdca2e5 SHA512 ed560a014d135dc9bc57f0185afd3fc4636158309eb4029b0fa1392ef2109c7795902eb37ce051d99199e5834d530c67b63362fdfb9db500a27e10c39d49e1d9
-DIST kodi-audioencoder-vorbis-2.0.2.tar.gz 15881 BLAKE2B 78181ec315abbbc7a3594f11c5730d8e9913f4529ba449c230e18d8d0bdffcb26e756dd6af6ea390a575a5c47e7f34483cd93dbfc0f13e50e1b0fab0eb7b843d SHA512 9f6262cbd39735b6492e9d5a4f2fb0e0277d32428fab2aca463d104e7f49e68ce922c4ee633a830eb855aa42a7cff6392a98637bcc09e5dc19ee57807af02dd2
-DIST kodi-audioencoder-vorbis-2.0.3.tar.gz 15181 BLAKE2B 1ac7fc05d91680cd7de460d6af31ce9c4cd57574636a97e45040286f06dd08e9b2c7a87a967b971e43034dcd6bd9098fc328eaa87e41d3c1fe6ad2b4de48f76a SHA512 9c68cb84ce2cc207b81b98306615425f85054f9e8ad731512a9844521145e1cdda936ede4a6302e0d0a76094aeacb4d60732b375ae1c85705d5528804d42eecc
+DIST kodi-audioencoder-vorbis-2.0.4.tar.gz 16343 BLAKE2B 788d1a64dff47594841e129e734b8bb1f2589b18557ea78477607a265efcc34c723f8e632698bd78b46cc392489a9ef278c21da805f0545b3ebc37811cbb691e SHA512 df618e078d1b0aa3f9b6cbca87288908058f4de13e52056d66239e9606c67a31a84734d8d650520920b8a9e0dfbd1c031aa81e2d1ece1316c11fbd59a6a8d8a2
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild
deleted file mode 100644
index 639f30b3562b..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
- inherit git-r3
- ;;
-*)
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/audioencoder.vorbis-${PV}"
- ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- =media-tv/kodi-18*
- media-libs/libogg
- media-libs/libvorbis
- "
-
-RDEPEND="
- ${DEPEND}
- "
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
deleted file mode 100644
index 23e049537e7e..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
- inherit git-r3
- ;;
-*)
- KEYWORDS="~amd64 ~x86"
- CODENAME="Leia"
- SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
- ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- =media-tv/kodi-18*
- media-libs/libogg
- media-libs/libvorbis
- "
-
-RDEPEND="
- ${DEPEND}
- "
-
-src_prepare(){
- [ -d depends ] && rm -rf depends || die
- cmake-utils_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
similarity index 95%
rename from media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
rename to media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
index 8f789873e0d6..2e01ace229d1 100644
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index 351ea91e5578..36df46eb843d 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,2 +1,3 @@
DIST kodi-audioencoder-wav-2.0.1.tar.gz 9850 BLAKE2B 08275b37e033eea178054c2f8e6eab1b1af3073d7c88f8406de54bcc8a57791f55126b8d595d543520e214fc41dec7e2c8d45e64263071a98b01e7ea72ef8d01 SHA512 27746034397fe87bcfb81a429350e234be5fe793ef37f1c4f58ab87c91ef11fec8c808874183e59b325228289d519f948dddd5c9587911f3ffca36ca53641f8d
DIST kodi-audioencoder-wav-2.0.2.tar.gz 9856 BLAKE2B 105e475e996e74a70712bdcef27cbc261beeb695fe3b0dddcc0d24d7e58a1fb0543cd7e954522e27e91a8bdd2c532190865847aab917d2775742f35c5c1527e4 SHA512 8e4de58bf6b7cc79c4bb24ed9f0906632f34a20c0a17010b4a5e32934d03414840b6a9d0db5b88975b5da2dd675cd743acb64288e2a3e338090f52df9fb228c9
+DIST kodi-audioencoder-wav-2.0.3.tar.gz 10447 BLAKE2B 8ddb4ce4777f35d75e428a4565dba5a949f85a262dec300a23f7b1425eeea416d7cd601fb5b3910df263edc420ea50111393d8d00d3d5834190040f9d5f4edd3 SHA512 f6b444483808b9e75426cd8b3252c4b3ed57811d9f1433d851d3cd6b3168f376bdfa2311aa3797642450b955ff8d231e40c7c49ad03a5f2b1b3e0679ec3a8617
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.3.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.3.ebuild
new file mode 100644
index 000000000000..f25d2c02aa48
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="WAV encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
+SRC_URI=""
+
+case ${PV} in
+9999)
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
+ inherit git-r3
+ ;;
+*)
+ KEYWORDS="~amd64 ~x86"
+ CODENAME="Leia"
+ SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
+ ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ =media-tv/kodi-18*
+ "
+RDEPEND="
+ ${DEPEND}
+ "
diff --git a/media-plugins/mythplugins/mythplugins-30.0.ebuild b/media-plugins/mythplugins/mythplugins-30.0-r1.ebuild
similarity index 92%
rename from media-plugins/mythplugins/mythplugins-30.0.ebuild
rename to media-plugins/mythplugins/mythplugins-30.0-r1.ebuild
index b574a2449e66..c8dc9edb4fb1 100644
--- a/media-plugins/mythplugins/mythplugins-30.0.ebuild
+++ b/media-plugins/mythplugins/mythplugins-30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -56,7 +56,9 @@ DEPEND="
=media-tv/mythtv-${PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid]
mytharchive? (
app-cdr/dvd+rw-tools
- dev-python/pillow[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ ')
media-video/dvdauthor
media-video/mjpegtools[png]
media-video/transcode
@@ -84,10 +86,12 @@ DEPEND="
)
)
mythnetvision? (
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/mysql-python[${PYTHON_USEDEP}]
- dev-python/oauth[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/oauth[${PYTHON_MULTI_USEDEP}]
+ ')
)
mythweather? (
dev-perl/Date-Manip
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f9e87d93bed5..b934edd88828 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
index 21b6d557a2c5..f63f96a8ec95 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,6 +26,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "$FILESDIR"/$PN-0.8.4-tinfo.patch
+ epatch "$FILESDIR"/$PN-0.0.8-fno-common.patch
eautoreconf
}
diff --git a/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch b/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
new file mode 100644
index 000000000000..1ea5c779ff38
--- /dev/null
+++ b/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
@@ -0,0 +1,87 @@
+diff --git a/ax25ipd/ax25ipd.c b/ax25ipd/ax25ipd.c
+index 461147d..e85b44d 100644
+--- a/ax25ipd/ax25ipd.c
++++ b/ax25ipd/ax25ipd.c
+@@ -35,6 +35,25 @@ int opt_help = 0;
+ char opt_configfile[PATH_MAX];
+ char opt_ttydevice[PATH_MAX];
+
++struct stats_s stats;
++
++int udp_mode;
++int ip_mode;
++unsigned short my_udp;
++char ttydevice[PATH_MAX];
++int ttyspeed;
++signed char mycallsign[7];
++unsigned char mycallsign2[7];
++unsigned char myalias[7];
++unsigned char myalias2[7];
++char bc_text[128];
++int bc_interval;
++int bc_every;
++
++int digi;
++int loglevel;
++int dual_port;
++
+ struct option options[] = {
+ {"version", 0, NULL, 'v'},
+ {"loglevel", 1, NULL, 'l'},
+diff --git a/ax25ipd/ax25ipd.h b/ax25ipd/ax25ipd.h
+index b088247..367024b 100644
+--- a/ax25ipd/ax25ipd.h
++++ b/ax25ipd/ax25ipd.h
+@@ -72,24 +72,25 @@
+ #include
+ #include
+
+-int udp_mode; /* true if we need a UDP socket */
+-int ip_mode; /* true if we need the raw IP socket */
+-unsigned short my_udp; /* the UDP port to use (network byte order) */
+-char ttydevice[PATH_MAX]; /* the tty device for serial comms */
+-int ttyspeed; /* The baud rate on the tty device */
+-unsigned char mycallsign[7]; /* My callsign, shifted ASCII with SSID */
+-unsigned char mycallsign2[7]; /* My seconds port callsign, shifted ASCII with SSID */
+-unsigned char myalias[7]; /* An alias to use */
+-unsigned char myalias2[7]; /* An alias for second port */
+-char bc_text[128]; /* The text for beacon messages */
+-int bc_interval; /* The interval, in seconds, between beacons */
+-int bc_every; /* true=every, false=after */
+-int digi; /* True if we are connected to a TNC */
+-int loglevel; /* Verbosity level */
++extern int udp_mode; /* true if we need a UDP socket */
++extern int ip_mode; /* true if we need the raw IP socket */
++extern unsigned short my_udp; /* the UDP port to use (network byte order) */
++extern char ttydevice[PATH_MAX]; /* the tty device for serial comms */
++extern int ttyspeed; /* The baud rate on the tty device */
++extern signed char mycallsign[7]; /* My callsign, shifted ASCII with SSID */
++extern unsigned char mycallsign2[7]; /* My seconds port callsign, shifted ASCII with SSID */
++extern unsigned char myalias[7]; /* An alias to use */
++extern unsigned char myalias2[7]; /* An alias for second port */
++extern char bc_text[128]; /* The text for beacon messages */
++extern int bc_interval; /* The interval, in seconds, between beacons */
++extern int bc_every; /* true=every, false=after */
++
++extern int digi; /* True if we are connected to a TNC */
++extern int loglevel; /* Verbosity level */
+ /* addition for dual port flag */
+-int dual_port;
++extern int dual_port;
+
+-struct {
++struct stats_s {
+ int kiss_in; /* # packets received */
+ int kiss_toobig; /* packet too large */
+ int kiss_badtype; /* control byte non-zero */
+@@ -107,7 +108,9 @@ struct {
+ int ip_tooshort; /* packet too short to be a valid frame */
+ int ip_not_for_me; /* packet not for me (in digi mode) */
+ int ip_i_am_dest; /* I am destination (in digi mode) */
+-} stats;
++};
++
++extern struct stats_s stats;
+
+ #define MAX_FRAME 2048
+
diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r1.ebuild
index b261a501e781..6af13746f582 100644
--- a/media-radio/ibp/ibp-0.21-r1.ebuild
+++ b/media-radio/ibp/ibp-0.21-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit toolchain-funcs
DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)"
-HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}.html"
+HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp.html"
SRC_URI="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${P}.tgz"
LICENSE="GPL-2"
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index cf836677f65f..91af311ca546 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -2,3 +2,4 @@ DIST js8call-1.0.0.tar.bz2 15923224 BLAKE2B 646fd869e6029d57dfd1d9762ede2407e18a
DIST js8call-1.1.0.tar.bz2 15993553 BLAKE2B 3538f746b175d0623169d2a13b5c26b334561f604fa25c8dddc15ee2a41319df8bb4c0a905be6340d4d18d87bffd8bd4e9a4eb9ceec3310f33aa22005c0e1c19 SHA512 992408408888a59174811c30fcc07065bcb5e459c355955a59e638ca27da27c2c25df8fa7579ce1c322a76f12780c58821df9fc781cde2cb2b2851312d188787
DIST js8call-2.0.0.tar.bz2 14434190 BLAKE2B 2d016c93175fe41cd4c24b57fc0a6c65ff5d5630aff68aac4e3e941570f315abe9f083f1686cb95e49d90ea41ac82752fcdd37041727e95820d34bcd0e82e2b1 SHA512 58566d4e6009339ef9a1459bdf2902748200b7a002c8be22067ec97eae16cc42465001e7084ebc00b1e406ae47fe45092226e1c6568253a1bbf95c65f040ab75
DIST js8call-2.1.0.tar.bz2 14432328 BLAKE2B 3f48be58905cf05af8230b715956ecfec71fd792fafb029cba84c799e51bb1189e158c16ef05bd8959572778aad556a11b0896647a47cc1e6b10ddd48bd033cd SHA512 0edfbc8cbbe3df551d7dc97c7362100d2714e2d37934a053233ca8107247f7fdc67a36b59b1fe701154c9348f27171ddab9c21ffc763072d390431f9dd5382a0
+DIST js8call-2.1.1.tar.bz2 14467115 BLAKE2B 8ebac342a1fc0bd22d6d53d9d6548ba4ec8f49088aa4901fb542f1d82ecdb9c2a23024aa8638191a3e862ab689c004cdde1562a834029bf53c535510300ed82a SHA512 deee4fe56f457b2bd533e9a44a812d8abcd5733079722504d4f06bee5c824a0a1b8c21ae805793fe419fde85f9e2e4aed10c33192f71378cf40afd68648a20a1
diff --git a/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch b/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
new file mode 100644
index 000000000000..6714949468ad
--- /dev/null
+++ b/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
@@ -0,0 +1,14 @@
+--- a/HamlibTransceiver.hpp 2020-02-08 19:14:50.584626858 -0500
++++ b/HamlibTransceiver.hpp 2020-02-08 19:15:09.857524125 -0500
+@@ -14,11 +14,7 @@
+ {
+ typedef struct rig RIG;
+ struct rig_caps;
+-#ifdef JS8_USE_LEGACY_HAMLIB
+ typedef int vfo_t;
+-#else
+- typedef unsigned int vfo_t;
+-#endif
+ }
+
+ // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
diff --git a/media-radio/js8call/js8call-2.1.1.ebuild b/media-radio/js8call/js8call-2.1.1.ebuild
new file mode 100644
index 000000000000..f461bf8f6b3e
--- /dev/null
+++ b/media-radio/js8call/js8call-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils vcs-snapshot
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://groups.io/g/js8call"
+SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}-ga.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtserialport:5
+ dev-qt/qtprintsupport:5
+ virtual/libusb:1
+ media-libs/portaudio
+ sci-libs/fftw:3.0[threads,fortran]
+ virtual/fortran
+ app-text/asciidoc
+ callsign, sizeof(racdata->callsign)," ");
-
- /* ==================================================================== */
- /* Search thru the index, get the RBA */
-@@ -257,19 +258,19 @@
- if (callsign[5] == '-')
- (void)chomp(callsign,5);
-
-- while (!feof(fdb) && strncmp((char *)&racdata, callsign, 6) < 0)
-+ while (!feof(fdb) && strncmp(buffer, callsign, 6) < 0)
-
- //WE7U
- // Problem here: We're sticking 8 bytes too many into racdata!
-- rc = fgets((char *)&racdata, sizeof(racdata), fdb);
-+ rc = fgets(buffer, sizeof(buffer), fdb);
-
- } else
- fprintf(stderr,"Search:Could not open RAC data base: %s\n", get_data_base_dir("fcc/AMACALL.LST") );
-
- /* || (callsign[5] == '-' && strncmp((char *)&racdata,callsign,5) < 0)) */
-- (void)chomp(racdata.callsign, 6);
-+ (void)chomp(racdata->callsign, 6);
-
-- if (!strncmp((char *)racdata.callsign, callsign, 6)) {
-+ if (!strncmp(racdata->callsign, callsign, 6)) {
- found = 1;
-
- // Some of these cause problems on 64-bit processors, so commented
-@@ -293,82 +294,82 @@
- xastir_snprintf(data->callsign,
- sizeof(data->callsign),
- "%s",
-- racdata.callsign);
-+ racdata->callsign);
-
- xastir_snprintf(data->first_name,
- sizeof(data->first_name),
- "%s",
-- racdata.first_name);
-+ racdata->first_name);
-
- xastir_snprintf(data->last_name,
- sizeof(data->last_name),
- "%s",
-- racdata.last_name);
-+ racdata->last_name);
-
- xastir_snprintf(data->address,
- sizeof(data->address),
- "%s",
-- racdata.address);
-+ racdata->address);
-
- xastir_snprintf(data->city,
- sizeof(data->city),
- "%s",
-- racdata.city);
-+ racdata->city);
-
- xastir_snprintf(data->province,
- sizeof(data->province),
- "%s",
-- racdata.province);
-+ racdata->province);
-
- xastir_snprintf(data->postal_code,
- sizeof(data->postal_code),
- "%s",
-- racdata.postal_code);
-+ racdata->postal_code);
-
- xastir_snprintf(data->qual_a,
- sizeof(data->qual_a),
- "%s",
-- racdata.qual_a);
-+ racdata->qual_a);
-
- xastir_snprintf(data->qual_b,
- sizeof(data->qual_b),
- "%s",
-- racdata.qual_b);
-+ racdata->qual_b);
-
- xastir_snprintf(data->qual_c,
- sizeof(data->qual_c),
- "%s",
-- racdata.qual_c);
-+ racdata->qual_c);
-
- xastir_snprintf(data->qual_d,
- sizeof(data->qual_d),
- "%s",
-- racdata.qual_d);
-+ racdata->qual_d);
-
- xastir_snprintf(data->club_name,
- sizeof(data->club_name),
- "%s",
-- racdata.club_name);
-+ racdata->club_name);
-
- xastir_snprintf(data->club_address,
- sizeof(data->club_address),
- "%s",
-- racdata.club_address);
-+ racdata->club_address);
-
- xastir_snprintf(data->club_city,
- sizeof(data->club_city),
- "%s",
-- racdata.club_city);
-+ racdata->club_city);
-
- xastir_snprintf(data->club_province,
- sizeof(data->club_province),
- "%s",
-- racdata.club_province);
-+ racdata->club_province);
-
- xastir_snprintf(data->club_postal_code,
- sizeof(data->club_postal_code),
- "%s",
-- racdata.club_postal_code);
-+ racdata->club_postal_code);
-
- }
- (void)fclose(fdb);
diff --git a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
deleted file mode 100644
index 8919239fbfde..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-# backported from xastir-2.1.4 (see bug #688444)
---- a/src/map_geo.c 2019-07-26 15:54:19.534488550 +0200
-+++ b/src/map_geo.c 2019-07-26 15:56:47.779713950 +0200
-@@ -125,20 +125,7 @@
- #undef PACKAGE_TARNAME
- #define XASTIR_PACKAGE_VERSION PACKAGE_VERSION
- #undef PACKAGE_VERSION
--#ifdef HAVE_GRAPHICSMAGICK
--/*#include */
--/* Define MAGICK_IMPLEMENTATION to access private interfaces
-- * such as DestroyImagePixels(). This may not be a good thing,
-- * but DestroyImagePixels() has been in this code for a long
-- * time. Defining MAGIC_IMPLEMENTATION eliminates the warning that is
-- * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
-- * OpenSuSE-11.3)
-- */
--#define MAGICK_IMPLEMENTATION
- #include
--#else // HAVE_GRAPHICSMAGICK
--#include
--#endif // HAVE_GRAPHICSMAGICK
- #undef PACKAGE_BUGREPORT
- #define PACKAGE_BUGREPORT XASTIR_PACKAGE_BUGREPORT
- #undef XASTIR_PACKAGE_BUGREPORT
-@@ -2030,7 +2017,6 @@
- if (!SyncImagePixels(image))
- fprintf(stderr, "SyncImagePixels Failed....\n");
- }
-- DestroyImagePixels(image);
- }
-
- // If were are drawing to a low bpp display (typically < 8bpp)
diff --git a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
deleted file mode 100644
index 8cbdbc2cdb62..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.ac.orig 2016-07-12 07:08:17.988160777 +0200
-+++ configure.ac 2016-07-12 07:11:42.591138389 +0200
-@@ -382,27 +382,17 @@
-
- # Check for Shapelib
- use_shapelib=yes
--force_internal_shapelib=no
- shapelib_desired=yes
- LIBSHP=""
- SUBSHP=""
- # This symbol will be blank if the proj library hasn't been found, and will
- # have the three programs that need proj if it has
- CONTSHP=""
--AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of internal shapelib library.],force_internal_shapelib=$withval)
- AC_ARG_WITH(shapelib,[ --without-shapelib Disable shapelib features.],shapelib_desired=$withval)
- if test "${shapelib_desired}" = "no"; then
- use_shapelib=no
-- force_internal_shapelib=no
- fi
--if test "${force_internal_shapelib}" = "yes"; then
-- AC_MSG_WARN([***************************************************************** ])
-- AC_MSG_WARN([Internal Shapelib library has been forced. ])
-- AC_MSG_WARN([***************************************************************** ])
-- # Temporary setting to get into if block below
-- use_shapelib=no
--fi
--if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then
-+if test "${shapelib_desired}" = "yes" ; then
- use_shapelib=no
- AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes
- LIBS="$LIBS -lshp"
-@@ -411,26 +401,6 @@
- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
- break)])
- fi
--if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then
-- AC_MSG_WARN([**************************************************************** ])
-- AC_MSG_WARN([Your system does not have shapelib installed. Using an internal ])
-- AC_MSG_WARN([version. This may lead to a larger filesize for the executable. ])
-- AC_MSG_WARN([Install shapelib on your system to eliminate this warning. ])
-- AC_MSG_WARN([**************************************************************** ])
-- LIBSHP="-Lshapelib -lshape"
-- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS"
-- SUBSHP="shapelib"
-- use_shapelib=yes
-- force_internal_shapelib=yes
-- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. )
-- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
-- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. )
--
-- if test $use_proj = "yes"
-- then
-- CONTSHP="shpcentrd$(EXEEXT) shpproj$(EXEEXT) shpdata$(EXEEXT) shpwkb$(EXEEXT)"
-- fi
--fi
- AC_SUBST(SUBSHP)
- AC_SUBST(CONTSHP)
- AC_SUBST(LIBSHP)
diff --git a/media-radio/xastir/files/xastir-2.0.8-scripts.diff b/media-radio/xastir/files/xastir-2.0.8-scripts.diff
deleted file mode 100644
index 35c73246c9ee..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-scripts.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
---- xastir-2.0.0-orig/scripts/Makefile.am.orig 2012-11-27 05:41:23.000000000 +0100
-+++ xastir-2.0.0/scripts/Makefile.am 2012-12-05 06:21:59.000000000 +0100
-@@ -43,10 +41,8 @@
- values \
- values.pl \
- waypoint-get.pl \
-- xastir-fixcfg.sh \
-- xastir-migrate.sh \
- Xastir_tigerpoly.py
-
- install-data-hook:
- cd $(DESTDIR)$(scriptsdir) && \
-- chmod a+x *.sh *.pl *.py get-* gpx2* *.bash
-+ chmod a+x *.pl *.py get-* gpx2* *.bash
-diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl
---- xastir-2.0.0.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000
-@@ -26,7 +26,7 @@
- #
-
-
--use lib "${prefix}/lib";
-+use lib /usr/share/xastir/scripts;
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl
---- xastir-2.0.0.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -34,7 +34,7 @@
- #
-
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
---- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -33,7 +33,7 @@
-
- #------------------------------------------------------------------------------------------------
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # Snag WE7U's Coordinate module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl
---- xastir-2.0.0.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/share/xastir/scripts/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl
---- xastir-2.0.0.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/share/xastir/scripts/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
diff --git a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
new file mode 100644
index 000000000000..f2580b5977e6
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
@@ -0,0 +1,63 @@
+# Fixes build with -fno-common (bug #706952)
+
+diff --git a/src/objects.h b/src/objects.h
+index b1bf8b5..ef5b9b1 100644
+--- a/src/objects.h
++++ b/src/objects.h
+@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, "Changing euid to %d and egid to %d\n", (
+ //
+ // number_of_predefined_objects holds the actual number of predefined
+ // objects available to display on the Create/Move popup menu.
+-int number_of_predefined_objects;
++extern int number_of_predefined_objects;
+ // File name of ~/.xastir/config file containing definitions for
+ // a predefined object menu.
+ extern char predefined_object_definition_filename[256];
+diff --git a/src/x_spider.c b/src/x_spider.c
+index a1fabc4..e5a0bc3 100644
+--- a/src/x_spider.c
++++ b/src/x_spider.c
+@@ -185,6 +185,7 @@ extern void split_string( char *data, char *cptr[], int max, char search_char );
+ // From database.h
+ extern char my_callsign[];
+
++extern char *pname;
+
+ typedef struct _pipe_object
+ {
+diff --git a/src/x_spider.h b/src/x_spider.h
+index d8af8e9..a168b1f 100644
+--- a/src/x_spider.h
++++ b/src/x_spider.h
+@@ -31,7 +31,7 @@
+ #define SERV_UDP_PORT 2023
+
+
+-char *pname;
++extern char *pname;
+ extern int pipe_xastir_to_tcp_server;
+ extern int pipe_tcp_server_to_xastir;
+ extern int pipe_xastir_to_udp_server;
+diff --git a/src/xa_config.c b/src/xa_config.c
+index 9a6f1f3..2ded26c 100644
+--- a/src/xa_config.c
++++ b/src/xa_config.c
+@@ -65,7 +65,7 @@
+
+ #define MAX_VALUE 300
+
+-//extern char xa_config_dir[];
++char xa_config_dir[1000]; /* cmdline option user config dir */
+
+
+
+diff --git a/src/xa_config.h b/src/xa_config.h
+index 9947145..530fc06 100644
+--- a/src/xa_config.h
++++ b/src/xa_config.h
+@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir);
+ void save_data(void);
+ void load_data_or_default(void);
+
+-char xa_config_dir[1000]; /* cmdline option user config dir */
++extern char xa_config_dir[1000]; /* cmdline option user config dir */
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index e44c45094ca1..f7dfda2f7084 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -6,7 +6,6 @@
Thomas Beierlein
- Support for some further map formats
Install geotiff support. Allows using USGS DRG topo
maps or other types of geotiff mapes/images
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
deleted file mode 100644
index 4d12a2c14255..000000000000
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gdal geotiff +graphicsmagick"
-
-DEPEND=">=x11-libs/motif-2.3:0
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXpm
- x11-apps/xfontsel
- dev-libs/libpcre
- net-misc/curl
- sys-libs/db:4.8
- sci-libs/shapelib
- !graphicsmagick? ( =media-libs/libsndfile-1.0.0
+ >=media-libs/portaudio-19.06.00-r2[alsa?]
+ =media-video/ffmpeg-1.2:= )
+ )
+ flac? ( >=media-libs/flac-1.3.1[cxx] )
+ id3tag? ( media-libs/libid3tag )
+ jack? ( virtual/jack )
+ lame? ( >=media-sound/lame-3.70 )
+ lv2? (
+ media-libs/lilv
+ media-libs/lv2
+ media-libs/suil
+ )
+ mad? ( >=media-libs/libmad-0.14.2b )
+ sbsms? ( media-libs/libsbsms )
+ soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+ twolame? ( media-sound/twolame )
+ vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+ vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+)
+
+src_prepare() {
+ default
+
+ use midi || sed -i \
+ -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+ src/Experimental.h || die
+}
+
+src_configure() {
+ setup-wxwidgets
+ append-cxxflags -std=gnu++14
+
+ # * always use system libraries if possible
+ # * options listed in the order that configure --help lists them
+ local myeconfargs=(
+ --disable-dynamic-loading
+ --enable-nyquist=local
+ --enable-unicode
+ --with-expat
+ --with-lib-preference=system
+ --with-libsndfile
+ --with-libsoxr
+ --with-mod-script-pipe
+ --with-mod-nyq-bench
+ --with-portaudio
+ --with-widgetextra=local
+ --with-wx-version=${WX_GTK_VER}
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable ladspa)
+ $(use_enable nls)
+ $(use_enable vst)
+ $(use_with ffmpeg)
+ $(use_with flac libflac)
+ $(use_with id3tag libid3tag)
+ $(use_with lame)
+ $(use_with lv2)
+ $(use_with mad libmad)
+ $(use_with midi portmidi local)
+ $(use_with midi "" local)
+ $(use_with portmixer)
+ $(use_with sbsms)
+ $(use_with soundtouch)
+ $(use_with twolame libtwolame)
+ $(use_with vamp libvamp)
+ $(use_with vorbis libvorbis)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Remove bad doc install
+ rm -r "${ED}"/usr/share/doc || die
+
+ # Install our docs
+ einstalldocs
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+ dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+ dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+ fi
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch b/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
new file mode 100644
index 000000000000..b44517fca80e
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
@@ -0,0 +1,56 @@
+From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite
+Date: Tue, 7 Nov 2017 13:06:33 +0100
+Subject: [PATCH] Fix building against the system portaudio library
+
+Building against the system portaudio results in this error:
+
+./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
+audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
+unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
+./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
+collect2: error: ld returned 1 exit status
+Makefile:2349: recipe for target 'audacity' failed
+make[3]: *** [audacity] Error 1
+
+This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
+but is resolved as a C++ symbol at link time.
+
+Audacity fixes this in the local tree with this change:
+https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
+
+However this is not general enough for the portaudio debian package.
+
+Since PaUtil_GetTime() is the only function causing problems, just copy
+over the code where it's used.
+---
+ src/AudioIO.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -480,8 +480,23 @@
+ #define ROUND(x) (int) ((x)+0.5)
+ //#include
+ // #include "../lib-src/portmidi/pm_common/portmidi.h"
+- #include "../lib-src/portaudio-v19/src/common/pa_util.h"
+ #include "NoteTrack.h"
++
++PaTime PaUtil_GetTime( void )
++{
++#ifdef HAVE_MACH_ABSOLUTE_TIME
++ return mach_absolute_time() * machSecondsConversionScaler_;
++#elif defined(HAVE_CLOCK_GETTIME)
++ struct timespec tp;
++ clock_gettime(CLOCK_REALTIME, &tp);
++ return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
++#else
++ struct timeval tv;
++ gettimeofday( &tv, NULL );
++ return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
++#endif
++}
++
+ #endif
+
+ #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
diff --git a/media-sound/cadence/cadence-0.9.0-r3.ebuild b/media-sound/cadence/cadence-0.9.0-r4.ebuild
similarity index 91%
rename from media-sound/cadence/cadence-0.9.0-r3.ebuild
rename to media-sound/cadence/cadence-0.9.0-r4.ebuild
index 6eb22cdfc3f6..08953c0b0c7f 100644
--- a/media-sound/cadence/cadence-0.9.0-r3.ebuild
+++ b/media-sound/cadence/cadence-0.9.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,8 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
CDEPEND="
${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+ ')
media-sound/jack2[dbus]
media-sound/jack_capture
a2jmidid? ( media-sound/a2jmidid[dbus] )
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 2350c0a718dc..1059f334e102 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,8 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
CDEPEND="
${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+ ')
media-sound/jack2[dbus]
media-sound/jack_capture
a2jmidid? ( media-sound/a2jmidid[dbus] )
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
index 83c05f7dc5eb..e4cfd45303e4 100644
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ b/media-sound/cmus/cmus-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
+vorbis wavpack"
@@ -34,7 +34,6 @@ DEPEND="
ao? ( media-libs/libao )
cddb? ( media-libs/libcddb )
cdio? ( dev-libs/libcdio-paranoia )
- cue? ( media-libs/libcue )
discid? ( media-libs/libdiscid )
elogind? ( sys-auth/elogind )
ffmpeg? ( media-video/ffmpeg:= )
@@ -74,16 +73,24 @@ PATCHES=(
S="${WORKDIR}/${P/_/-}"
-my_config() {
- local value
- use ${1} && value=a || value=n
- myconf="${myconf} ${2}=${value}"
-}
-
src_configure() {
- local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+ my_config() {
+ local value
+ use ${1} && value=a || value=n
+ myconf+=( ${2}=${value} )
+ }
+ local debuglevel=1
use debug && debuglevel=2
+ local myconf=(
+ CONFIG_CUE=y
+ CONFIG_ARTS=n
+ CONFIG_SUN=n
+ CONFIG_SNDIO=n
+ CONFIG_WAVEOUT=n
+ CONFIG_VTX=n
+ CONFIG_ROAR=n
+ )
my_config cddb CONFIG_CDDB
my_config cdio CONFIG_CDIO
@@ -100,7 +107,6 @@ src_configure() {
my_config mp4 CONFIG_MP4
my_config aac CONFIG_AAC
my_config ffmpeg CONFIG_FFMPEG
- my_config cue CONFIG_CUE
my_config pulseaudio CONFIG_PULSE
my_config alsa CONFIG_ALSA
my_config jack CONFIG_JACK
@@ -109,12 +115,12 @@ src_configure() {
my_config oss CONFIG_OSS
if use elogind || use systemd; then
- myconf="${myconf} CONFIG_MPRIS=a"
+ myconf+=( CONFIG_MPRIS=a )
else
- myconf="${myconf} CONFIG_MPRIS=n"
+ myconf+=( CONFIG_MPRIS=n )
fi
- ./configure prefix="${EPREFIX}"/usr ${myconf} \
+ ./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
}
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 6ae109af57a9..283dda195198 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
+vorbis wavpack"
@@ -34,7 +34,6 @@ DEPEND="
ao? ( media-libs/libao )
cddb? ( media-libs/libcddb )
cdio? ( dev-libs/libcdio-paranoia )
- cue? ( media-libs/libcue )
discid? ( media-libs/libdiscid )
elogind? ( sys-auth/elogind )
ffmpeg? ( media-video/ffmpeg:= )
@@ -68,16 +67,24 @@ DOCS=( AUTHORS README.md )
S="${WORKDIR}/${P/_/-}"
-my_config() {
- local value
- use ${1} && value=a || value=n
- myconf="${myconf} ${2}=${value}"
-}
-
src_configure() {
- local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+ my_config() {
+ local value
+ use ${1} && value=a || value=n
+ myconf+=( ${2}=${value} )
+ }
+ local debuglevel=1
use debug && debuglevel=2
+ local myconf=(
+ CONFIG_CUE=y
+ CONFIG_ARTS=n
+ CONFIG_SUN=n
+ CONFIG_SNDIO=n
+ CONFIG_WAVEOUT=n
+ CONFIG_VTX=n
+ CONFIG_ROAR=n
+ )
my_config cddb CONFIG_CDDB
my_config cdio CONFIG_CDIO
@@ -94,7 +101,6 @@ src_configure() {
my_config mp4 CONFIG_MP4
my_config aac CONFIG_AAC
my_config ffmpeg CONFIG_FFMPEG
- my_config cue CONFIG_CUE
my_config pulseaudio CONFIG_PULSE
my_config alsa CONFIG_ALSA
my_config jack CONFIG_JACK
@@ -103,12 +109,12 @@ src_configure() {
my_config oss CONFIG_OSS
if use elogind || use systemd; then
- myconf="${myconf} CONFIG_MPRIS=a"
+ myconf+=( CONFIG_MPRIS=a )
else
- myconf="${myconf} CONFIG_MPRIS=n"
+ myconf+=( CONFIG_MPRIS=n )
fi
- ./configure prefix="${EPREFIX}"/usr ${myconf} \
+ ./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
}
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index f19bd0670b18..671a05ce3c84 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -7,7 +7,6 @@
Use libcdio for CD support
- Enable CUE sheet parsing
Enable reading the ID of the inserted CD
Enable MPRIS support via sys-auth/elogind
Install support script for net-im/pidgin
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 9a7931538713..26f73b960486 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,3 +1,6 @@
DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab SHA512 87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82 SHA512 30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
+DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1 SHA512 638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
+DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35 SHA512 55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566 SHA512 b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40
+DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251 SHA512 21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8
diff --git a/media-sound/csound/csound-6.14.0.ebuild b/media-sound/csound/csound-6.14.0.ebuild
new file mode 100644
index 000000000000..f9db4411fa0f
--- /dev/null
+++ b/media-sound/csound/csound-6.14.0.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/csound/csound.git"
+ inherit git-r3
+else
+ DOC_P="Csound${PV}"
+ SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+ doc? (
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_pdf.zip
+ https://github.com/csound/csound/releases/download/${PV}/${DOC_P}_manual_html.zip
+ )"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Sound design and signal processing system for composition and performance"
+HOMEPAGE="https://csound.github.io/"
+
+LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
+SLOT="0"
+# java doesn't work atm as it needs to have some variables specified to work, see src_configure
+# mp3 doesnt work as media-sound/lame does not install cmake file
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+ linear? ( double-precision )
+ lua? ( cxx )
+ python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+# java? ( cxx )
+
+BDEPEND="
+ sys-devel/flex
+ virtual/yacc
+ chua? ( dev-libs/boost )
+ python? ( dev-lang/swig )
+ nls? ( sys-devel/gettext )
+ test? (
+ dev-util/cunit
+ ${PYTHON_DEPS}
+ )
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+# https://github.com/csound/csound/issues/920
+# currently not used deps due to some issues
+# java? ( virtual/jdk:* )
+# mp3? ( media-sound/lame )
+CDEPEND="
+ dev-cpp/eigen:3
+ >=media-libs/libsndfile-1.0.16
+ media-libs/libsamplerate
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ curl? ( net-misc/curl )
+ dssi? (
+ media-libs/dssi
+ media-libs/ladspa-sdk
+ )
+ fluidsynth? ( media-sound/fluidsynth:= )
+ fltk? ( x11-libs/fltk:1[threads?] )
+ hdf5? ( sci-libs/hdf5 )
+ image? ( media-libs/libpng:0= )
+ jack? ( virtual/jack )
+ keyboard? ( x11-libs/fltk:1[threads?] )
+ linear? ( =sci-mathematics/gmm-5.1* )
+ lua? (
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( dev-lang/lua:0 )
+ )
+ osc? ( media-libs/liblo )
+ portaudio? ( media-libs/portaudio )
+ portmidi? ( media-libs/portmidi )
+ pulseaudio? ( media-sound/pulseaudio )
+ python? ( ${PYTHON_DEPS} )
+ stk? ( media-libs/stk )
+ utils? ( !media-sound/snd )
+ websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+ ${CDEPEND}
+ dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+ DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+)
+
+pkg_setup() {
+ if use python || use test ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+ -e '/-O3/d' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_BELA=OFF
+ -DBUILD_BUCHLA_OPCODES=ON
+ -DBUILD_CHUA_OPCODES=$(usex chua)
+ -DBUILD_CSBEATS=$(usex beats)
+ -DBUILD_CUDA_OPCODES=OFF
+ -DBUILD_CXX_INTERFACE=$(usex cxx)
+ -DBUILD_DSSI_OPCODES=$(usex dssi)
+ -DBUILD_EMUGENS_OPCODES=ON
+ -DBUILD_EXCITER_OPCODES=ON
+ -DBUILD_FAUST_OPCODES=OFF
+ -DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+ -DBUILD_FRAMEBUFFER_OPCODES=ON
+ -DBUILD_HDF5_OPCODES=$(usex hdf5)
+ -DBUILD_IMAGE_OPCODES=$(usex image)
+ -DBUILD_INSTALLER=OFF
+ -DBUILD_JACK_OPCODES=$(usex jack)
+ -DBUILD_JAVA_INTERFACE=OFF
+ -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+ -DBUILD_LUA_INTERFACE=$(usex lua)
+ -DBUILD_MP3OUT_OPCODE=OFF
+ -DBUILD_MULTI_CORE=$(usex threads)
+ -DBUILD_OPENCL_OPCODES=OFF
+ -DBUILD_OSC_OPCODES=$(usex osc)
+ -DBUILD_P5GLOVE_OPCODES=OFF
+ -DBUILD_PADSYNTH_OPCODES=ON
+ -DBUILD_PLATEREV_OPCODES=ON
+ -DBUILD_PVSGENDY_OPCODE=OFF
+ -DBUILD_PYTHON_INTERFACE=$(usex python)
+ -DBUILD_PYTHON_OPCODES=$(usex python)
+ -DBUILD_RELEASE=ON
+ -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+ -DBUILD_SELECT_OPCODE=ON
+ -DBUILD_SERIAL_OPCODES=ON
+ -DBUILD_STACK_OPCODES=ON
+ -DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+ -DBUILD_STK_OPCODES=$(usex stk)
+ -DBUILD_TESTS=$(usex test)
+ -DBUILD_UTILITIES=$(usex utils)
+ -DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+ -DBUILD_VST4CS_OPCODES=OFF
+ -DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+ -DBUILD_WIIMOTE_OPCODES=OFF
+ -DBUILD_WINSOUND=OFF
+
+ -DFAIL_MISSING=ON
+ -DNEED_PORTTIME=OFF
+ -DNEW_PARSER_DEBUG=$(usex debug)
+
+ -DUSE_ALSA=$(usex alsa)
+ #-DUSE_ATOMIC_BUILTIN=ON
+ -DUSE_AUDIOUNIT=OFF # Apple specific
+ #-DUSE_COMPILER_OPTIMIZATIONS=ON
+ -DUSE_COREMIDI=OFF # Apple specific
+ -DUSE_CURL=$(usex curl)
+ -DUSE_DOUBLE=$(usex double-precision)
+ -DUSE_FLTK=$(usex fltk)
+ -DUSE_GETTEXT=$(usex nls)
+ -DUSE_GIT_COMMIT=ON
+ _DUSE_IPMIDI=ON
+ -DUSE_JACK=$(usex jack)
+ -DUSE_LRINT=ON
+ -DUSE_PORTAUDIO=$(usex portaudio)
+ -DUSE_PORTMIDI=$(usex portmidi)
+ -DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+ )
+
+ #use java && mycmakeargs+=(
+ #-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
+ #-DJAVA_AWT_LIBRARY="?"
+ #-DJAVA_JVM_LIBRARY="?"
+ #-DJAVA_INCLUDE_PATH2="?"
+ #-DJAVA_AWT_INCLUDE_PATH="?"
+ #)
+
+ # set the library that we want to use
+ if use lua ; then
+ local libdir
+ local libname
+
+ if use luajit ; then
+ libdir=$(pkg-config --variable=libdir luajit)
+ libname=$(pkg-config --variable=libname luajit)
+ else
+ libdir=$(pkg-config --variable=libdir lua)
+ libname=$(pkg-config --variable=libname lua)
+ [[ -z "${libname}" ]] && libname="lua"
+ fi
+
+ mycmakeargs+=(
+ -DLUA_LIBRARY="${libdir}/lib${libname}.so"
+ )
+ fi
+
+ use python && mycmakeargs+=(
+ -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+ )
+
+ # this is needed, otherwise it sets LIBRARY INSTALL DIR: lib
+ [[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
+ -DUSE_LIB64=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ dodoc -r Release_Notes/.
+
+ # generate env.d file
+ cat > "${T}"/62${PN} <<-_EOF_ || die
+ OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
+ CSSTRNGS="${EPREFIX}/usr/share/locale"
+ _EOF_
+ if use stk ; then
+ echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
+ fi
+ doenvd "${T}"/62${PN}
+
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ use samples && dodoc -r samples
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins installer/misc/vim/csound_{csd,orc,sco}.vim
+ insinto /usr/share/vim/vimfiles/plugin
+ doins installer/misc/vim/csound.vim
+ fi
+
+ # rename extract to csound_extract (bug #247394)
+ mv "${ED}"/usr/bin/{,csound_}extract || die
+
+ use python && python_optimize
+
+ # install docs
+ if [[ ${PV} != "9999" ]] && use doc ; then
+ dodoc "${WORKDIR}"/*.pdf
+ dodoc -r "${WORKDIR}"/html
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "The extract tool is now installed as csound_extract"
+ elog "due to collisions with many other packages (bug #247394)."
+ elog
+ fi
+}
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index f29357886e45..f9db4411fa0f 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -136,6 +136,7 @@ src_configure() {
-DBUILD_FRAMEBUFFER_OPCODES=ON
-DBUILD_HDF5_OPCODES=$(usex hdf5)
-DBUILD_IMAGE_OPCODES=$(usex image)
+ -DBUILD_INSTALLER=OFF
-DBUILD_JACK_OPCODES=$(usex jack)
-DBUILD_JAVA_INTERFACE=OFF
-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
@@ -155,8 +156,7 @@ src_configure() {
-DBUILD_SELECT_OPCODE=ON
-DBUILD_SERIAL_OPCODES=ON
-DBUILD_STACK_OPCODES=ON
- -DBUILD_STATIC_LIBRARY=$(usex static-libs)
- -DBUILD_STATIC_LIBRARY=$(usex test)
+ -DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-DBUILD_STK_OPCODES=$(usex stk)
-DBUILD_TESTS=$(usex test)
-DBUILD_UTILITIES=$(usex utils)
@@ -181,8 +181,8 @@ src_configure() {
-DUSE_GETTEXT=$(usex nls)
-DUSE_GIT_COMMIT=ON
_DUSE_IPMIDI=ON
- -DUSE_LRINT=ON
-DUSE_JACK=$(usex jack)
+ -DUSE_LRINT=ON
-DUSE_PORTAUDIO=$(usex portaudio)
-DUSE_PORTMIDI=$(usex portmidi)
-DUSE_PULSEAUDIO=$(usex pulseaudio)
diff --git a/media-sound/din/din-43.0.1.ebuild b/media-sound/din/din-43.0.1.ebuild
index b8471d76fd37..b6aa55e63846 100644
--- a/media-sound/din/din-43.0.1.ebuild
+++ b/media-sound/din/din-43.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+alsa jack"
RDEPEND="
diff --git a/media-sound/dir2ogg/dir2ogg-0.12.ebuild b/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild
similarity index 90%
rename from media-sound/dir2ogg/dir2ogg-0.12.ebuild
rename to media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild
index 1e90d2050a91..a25556207b96 100644
--- a/media-sound/dir2ogg/dir2ogg-0.12.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}
- >=media-libs/mutagen-1.11[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}]
+ ')
media-sound/vorbis-tools[ogg123]
aac? ( || (
media-libs/faad2
diff --git a/media-sound/dir2ogg/dir2ogg-0.13.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
similarity index 93%
rename from media-sound/dir2ogg/dir2ogg-0.13.ebuild
rename to media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
index d0664c226995..2ebce1e4d05d 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}
- >=media-libs/mutagen-1.11[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}]
+ ')
media-sound/vorbis-tools[ogg123]
aac? ( || (
media-libs/faad2
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r1.ebuild
index 3dd2d70b7e1c..ff38eae74dc9 100644
--- a/media-sound/easytag/easytag-2.4.3-r1.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
RESTRICT="!test? ( test )"
diff --git a/media-sound/exaile/exaile-4.0.0.ebuild b/media-sound/exaile/exaile-4.0.0-r1.ebuild
similarity index 77%
rename from media-sound/exaile/exaile-4.0.0.ebuild
rename to media-sound/exaile/exaile-4.0.0-r1.ebuild
index 57c248e3ab85..5fefb08686f1 100644
--- a/media-sound/exaile/exaile-4.0.0.ebuild
+++ b/media-sound/exaile/exaile-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,19 +25,21 @@ IUSE="cddb libnotify nls scrobbler"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-python/bsddb3[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/gst-python:1.0[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
>=media-libs/gst-plugins-base-1.6:1.0
>=media-libs/gst-plugins-good-1.4:1.0
- >=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
media-plugins/gst-plugins-meta:1.0
>=x11-libs/gtk+-3.10:3[introspection]
cddb? ( dev-python/cddb-py )
libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
- scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
+ >=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
+ scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+ ')
"
BDEPEND="
nls? (
diff --git a/media-sound/gnome-music/gnome-music-3.32.2.ebuild b/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild
similarity index 92%
rename from media-sound/gnome-music/gnome-music-3.32.2.ebuild
rename to media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild
index 827ced270df9..e461ee6710e5 100644
--- a/media-sound/gnome-music/gnome-music-3.32.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild
@@ -24,8 +24,10 @@ DEPEND="${PYTHON_DEPS}
>=media-libs/libmediaart-1.9.1:2.0[introspection]
net-libs/libsoup:2.4[introspection]
>=app-misc/tracker-1.99.1:=[introspection(+)]
- >=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_USEDEP}]
- >=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+ ')
>=media-libs/grilo-0.3.4:0.3[introspection]
>=media-plugins/grilo-plugins-0.3.8:0.3
"
diff --git a/media-sound/gpodder/gpodder-3.10.5.ebuild b/media-sound/gpodder/gpodder-3.10.5-r1.ebuild
similarity index 65%
rename from media-sound/gpodder/gpodder-3.10.5.ebuild
rename to media-sound/gpodder/gpodder-3.10.5-r1.ebuild
index bb7216eba8f5..aaa2fb67b7c9 100644
--- a/media-sound/gpodder/gpodder-3.10.5.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,17 +18,19 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+dbus bluetooth kernel_linux mtp test"
RESTRICT="!test? ( test )"
-# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
-# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_MULTI_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_MULTI_USEDEP}] ) once they
# support python3
COMMON_DEPEND="
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/isort[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
- >=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+ dev-python/isort[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/podcastparser-0.6.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/mygpoclient-1.8[${PYTHON_MULTI_USEDEP}]
+ dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
+ ')
bluetooth? ( net-wireless/bluez )
mtp? ( >=media-libs/libmtp-1.0.0:= )
"
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 934f72ac558d..42a4f298bea4 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,3 +1,2 @@
-DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
DIST grip-4.1.0.tar.gz 1208833 BLAKE2B 2ec7913abaef2fc91227e47aee3f729cc8d2d5db63392e271ea8fc8176117ce12bbe0c0644527c6d701906b865da3aba09f4b2ee8c804263789072eae638eef7 SHA512 c3a0010a96e5edfe7bf41f69938a4e0d5fbe08c477d01ac85eccd9a56c0a9b9f3c4b5fdcb661b0257721e941e061b6f2df3685f81926d1c54838deb86f015cb5
diff --git a/media-sound/grip/grip-3.9.0-r1.ebuild b/media-sound/grip/grip-3.9.0-r1.ebuild
deleted file mode 100644
index a4f672fef19d..000000000000
--- a/media-sound/grip/grip-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
- gnome-base/libgnome
- >=gnome-base/libgnomeui-2.2.0
- >=media-libs/id3lib-3.8.3
- media-sound/cdparanoia
- media-sound/lame
- net-misc/curl
- >=x11-libs/gtk+-2.2:2
- x11-libs/libX11
- x11-libs/pango
- x11-libs/vte:0
- vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
- ${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- # Bug #69536
- [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
- strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
- econf \
- --disable-werror
-}
diff --git a/media-sound/grip/grip-4.0.1-r1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
index 4ea63b98b5e4..c89721d90b02 100644
--- a/media-sound/grip/grip-4.0.1-r1.ebuild
+++ b/media-sound/grip/grip-4.0.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
IUSE="vorbis"
# lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/gtkguitune/gtkguitune-0.8.ebuild b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
index ff2d89b1b4bd..9be8c2d1ca93 100644
--- a/media-sound/gtkguitune/gtkguitune-0.8.ebuild
+++ b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit eutils flag-o-matic gnome2-utils
DESCRIPTION="A guitar tuning program that uses Schmitt-triggering for quick feedback"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/${PN}-gtk2-${PV}.tar.gz"
LICENSE="GPL-2"
diff --git a/media-sound/jack/jack-3.1.1-r2.ebuild b/media-sound/jack/jack-3.1.1-r3.ebuild
similarity index 78%
rename from media-sound/jack/jack-3.1.1-r2.ebuild
rename to media-sound/jack/jack-3.1.1-r3.ebuild
index 59c46f78ae98..f1953b5662e6 100644
--- a/media-sound/jack/jack-3.1.1-r2.ebuild
+++ b/media-sound/jack/jack-3.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,10 +19,12 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND="
- dev-python/cddb-py[${PYTHON_USEDEP}]
- dev-python/id3-py[${PYTHON_USEDEP}]
- dev-python/pyid3lib[${PYTHON_USEDEP}]
- dev-python/pyvorbis[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/cddb-py[${PYTHON_MULTI_USEDEP}]
+ dev-python/id3-py[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyid3lib[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyvorbis[${PYTHON_MULTI_USEDEP}]
+ ')
media-libs/flac
media-sound/lame
media-sound/cdparanoia"
diff --git a/media-sound/jack2/jack2-1.9.13-r1.ebuild b/media-sound/jack2/jack2-1.9.13-r2.ebuild
similarity index 96%
rename from media-sound/jack2/jack2-1.9.13-r1.ebuild
rename to media-sound/jack2/jack2-1.9.13-r2.ebuild
index 33700572b3fe..2e72302ca918 100644
--- a/media-sound/jack2/jack2-1.9.13-r1.ebuild
+++ b/media-sound/jack2/jack2-1.9.13-r2.ebuild
@@ -45,7 +45,11 @@ DEPEND="${CDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
RDEPEND="${CDEPEND}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ dbus? (
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
pam? ( sys-auth/realtime-base )
!media-sound/jack-audio-connection-kit:0"
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 4b1b8633232c..28cd775b1150 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -44,7 +44,11 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
RDEPEND="${COMMON_DEPEND}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ dbus? (
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
pam? ( sys-auth/realtime-base )
!media-sound/jack-audio-connection-kit:0"
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index eeefb7ac66bc..766a6fd7e1a6 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,3 +3,4 @@ DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83
DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178 SHA512 4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
+DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
index e0e03cdcb56f..e149c88acbee 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -16,8 +16,8 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+KEYWORDS="amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
REQUIRED_USE="portmidi? ( portaudio )"
BDEPEND="
@@ -47,7 +47,7 @@ DEPEND="
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
- vorbis? ( media-libs/libvorbis )
+ sf3? ( media-libs/libvorbis )
webengine? ( dev-qt/qtwebengine:5[widgets] )
"
RDEPEND="${DEPEND}"
@@ -79,7 +79,7 @@ src_configure() {
-DBUILD_PORTAUDIO="$(usex portaudio)"
-DBUILD_PORTMIDI="$(usex portmidi)"
-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
- -DSOUNDFONT3="$(usex vorbis)"
+ -DSOUNDFONT3="$(usex sf3)"
-DBUILD_WEBENGINE="$(usex webengine)"
)
cmake_src_configure
diff --git a/media-sound/musescore/musescore-3.4.2.ebuild b/media-sound/musescore/musescore-3.4.2.ebuild
new file mode 100644
index 000000000000..fb4ff90af180
--- /dev/null
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtquickcontrols2:5
+ >=dev-qt/qtsingleapplication-2.6.1_p20171024
+ dev-qt/qtsvg:5
+ dev-qt/qtxml:5
+ dev-qt/qtxmlpatterns:5
+ >=media-libs/freetype-2.5.2
+ media-libs/libsndfile
+ sys-libs/zlib:=
+ alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ jack? ( virtual/jack )
+ mp3? ( media-sound/lame )
+ omr? ( app-text/poppler )
+ portaudio? ( media-libs/portaudio )
+ portmidi? ( media-libs/portmidi )
+ pulseaudio? ( media-sound/pulseaudio )
+ sf3? ( media-libs/libvorbis )
+ webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Move soundfonts to the correct directory
+ mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DAEOLUS=OFF # does not compile
+ -DBUILD_ALSA="$(usex alsa)"
+ -DBUILD_CRASH_REPORTER=OFF
+ -DBUILD_JACK="$(usex jack)"
+ -DBUILD_LAME="$(usex mp3)"
+ -DBUILD_PCH=ON
+ -DBUILD_PORTAUDIO="$(usex portaudio)"
+ -DBUILD_PORTMIDI="$(usex portmidi)"
+ -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TELEMETRY_MODULE=ON
+ -DBUILD_WEBENGINE="$(usex webengine)"
+ -DCMAKE_SKIP_RPATH=ON
+ -DDOWNLOAD_SOUNDFONT=OFF
+ -DHAS_AUDIOFILE=ON
+ -DOCR=OFF
+ -DOMR="$(usex omr)"
+ -DSOUNDFONT3=ON
+ -DZERBERUS="$(usex sfz)"
+ -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+ -DUSE_SYSTEM_FREETYPE=ON
+ -DUSE_SYSTEM_POPPLER=ON
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake_build -j1 lrelease manpages
+ cmake_src_compile
+}
diff --git a/media-sound/picard/picard-2.1.3.ebuild b/media-sound/picard/picard-2.1.3-r1.ebuild
similarity index 93%
rename from media-sound/picard/picard-2.1.3.ebuild
rename to media-sound/picard/picard-2.1.3-r1.ebuild
index f995845bc002..8b04ce903747 100644
--- a/media-sound/picard/picard-2.1.3.ebuild
+++ b/media-sound/picard/picard-2.1.3-r1.ebuild
@@ -18,7 +18,9 @@ KEYWORDS="amd64 x86"
IUSE="nls"
RDEPEND="
- dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtgui:5
>=media-libs/mutagen-1.38"
DEPEND="
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index a937a75ec7a2..8ddfeb52fa15 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -26,7 +26,9 @@ BDEPEND="
nls? ( dev-qt/linguist-tools:5 )
"
RDEPEND="
- dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+ ')
dev-qt/qtgui:5[accessibility]
>=media-libs/mutagen-1.38"
diff --git a/media-sound/pympd/pympd-0.08.1-r1.ebuild b/media-sound/pympd/pympd-0.08.1-r2.ebuild
similarity index 90%
rename from media-sound/pympd/pympd-0.08.1-r1.ebuild
rename to media-sound/pympd/pympd-0.08.1-r2.ebuild
index 183544630d50..597dce6dfe2d 100644
--- a/media-sound/pympd/pympd-0.08.1-r1.ebuild
+++ b/media-sound/pympd/pympd-0.08.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,9 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- >=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygtk-2.6:2[${PYTHON_MULTI_USEDEP}]
+ ')
gnome-base/libglade:2.0
x11-libs/gdk-pixbuf:2[jpeg]
x11-themes/adwaita-icon-theme
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild
similarity index 95%
rename from media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
rename to media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild
index b018eac61025..5d67d46725de 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild
@@ -48,7 +48,9 @@ COMMON_DEPEND="
lirc? ( app-misc/lirc )
python? (
${PYTHON_DEPS}
- >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+ ')
)
udev? (
dev-libs/libgudev:=
@@ -65,7 +67,7 @@ RDEPEND="${COMMON_DEPEND}
media-plugins/gst-plugins-taglib:1.0
x11-themes/adwaita-icon-theme
python? (
- >=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
+ >=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
net-libs/libsoup:2.4[introspection]
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection]
diff --git a/media-sound/soundconverter/soundconverter-3.0.2.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
similarity index 95%
rename from media-sound/soundconverter/soundconverter-3.0.2.ebuild
rename to media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
index 845b2d2ce3bb..cc2b0688f896 100644
--- a/media-sound/soundconverter/soundconverter-3.0.2.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
@@ -30,7 +30,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
RDEPEND="${COMMON_DEPEND}
x11-libs/pango[introspection]
- dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+ ')
libnotify? ( x11-libs/libnotify[introspection] )
media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
diff --git a/media-sound/tunapie/tunapie-2.1.17-r1.ebuild b/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
index db38951688e3..c171a0b8d675 100644
--- a/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
+++ b/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="offensive"
-RDEPEND=">=dev-python/wxpython-2.6[${PYTHON_USEDEP}]
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/wxpython-2.6[${PYTHON_MULTI_USEDEP}]
+ ')
${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
diff --git a/media-sound/tunapie/tunapie-2.1.19.ebuild b/media-sound/tunapie/tunapie-2.1.19-r1.ebuild
similarity index 88%
rename from media-sound/tunapie/tunapie-2.1.19.ebuild
rename to media-sound/tunapie/tunapie-2.1.19-r1.ebuild
index db38951688e3..c171a0b8d675 100644
--- a/media-sound/tunapie/tunapie-2.1.19.ebuild
+++ b/media-sound/tunapie/tunapie-2.1.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="offensive"
-RDEPEND=">=dev-python/wxpython-2.6[${PYTHON_USEDEP}]
+RDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/wxpython-2.6[${PYTHON_MULTI_USEDEP}]
+ ')
${PYTHON_DEPS}"
DEPEND="${RDEPEND}"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 2ff8eeef4bef..083ee3b9a3b4 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
index a249ef137d27..ea0a6609f660 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild
@@ -73,8 +73,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/libxml2-2.9.4
>=dev-libs/lzo-2.04
dev-libs/tinyxml[stl]
- dev-python/pillow[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+ $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
>=dev-libs/libcdio-0.94
>=dev-libs/libfmt-3.0.1
dev-libs/libfstrcmp
@@ -305,11 +305,11 @@ src_test() {
src_install() {
cmake_src_install
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+ pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
newicon media/icon48x48.png kodi.png
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+ rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4-r1.ebuild
similarity index 97%
rename from media-tv/kodi/kodi-18.4.ebuild
rename to media-tv/kodi/kodi-18.4-r1.ebuild
index f5af05243ea0..3b37458b80ec 100644
--- a/media-tv/kodi/kodi-18.4.ebuild
+++ b/media-tv/kodi/kodi-18.4-r1.ebuild
@@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/libxml2-2.9.4
>=dev-libs/lzo-2.04
dev-libs/tinyxml[stl]
- dev-python/pillow[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+ $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
>=dev-libs/libcdio-0.94
>=dev-libs/libfmt-3.0.1
dev-libs/libfstrcmp
@@ -308,11 +308,11 @@ src_test() {
src_install() {
cmake_src_install
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+ pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
newicon media/icon48x48.png kodi.png
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+ rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
diff --git a/media-tv/kodi/kodi-18.5-r1.ebuild b/media-tv/kodi/kodi-18.5-r2.ebuild
similarity index 98%
rename from media-tv/kodi/kodi-18.5-r1.ebuild
rename to media-tv/kodi/kodi-18.5-r2.ebuild
index ffe5d7416b7d..9b455201ee36 100644
--- a/media-tv/kodi/kodi-18.5-r1.ebuild
+++ b/media-tv/kodi/kodi-18.5-r2.ebuild
@@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/libxml2-2.9.4
>=dev-libs/lzo-2.04
dev-libs/tinyxml[stl]
- dev-python/pillow[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+ $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+ $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
>=dev-libs/libcdio-0.94
>=dev-libs/libfmt-3.0.1
dev-libs/libfstrcmp
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 96f3f5e54a1d..c78d67f3d625 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -71,8 +71,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/libxml2-2.9.4
>=dev-libs/lzo-2.04
dev-libs/tinyxml[stl]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+ ')
>=dev-libs/libcdio-0.94
>=dev-libs/libfmt-3.0.1
dev-libs/libfstrcmp
diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
similarity index 97%
rename from media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
rename to media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
index 8b47a10cad28..3633cd824ba6 100644
--- a/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,7 +26,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
sys-apps/fix-gnustack
- dev-python/virtualenv[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+ ')"
RDEPEND="
net-dns/avahi
@@ -59,7 +61,6 @@ src_install() {
# Move the config to the correct place
local CONFIG_VANILLA="/etc/default/plexmediaserver"
local CONFIG_PATH="/etc/${_SHORTNAME}"
- dodir "${CONFIG_PATH}"
insinto "${CONFIG_PATH}"
doins "${CONFIG_VANILLA#/}"
sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
diff --git a/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
index f37b60268a7b..57039153cea1 100644
--- a/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,7 +26,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
sys-apps/fix-gnustack
- dev-python/virtualenv[${PYTHON_USEDEP}]"
+ $(python_gen_cond_dep '
+ dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+ ')"
RDEPEND="
net-dns/avahi
diff --git a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
index 1fa5d4363cc5..b939c7a780c1 100644
--- a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,10 @@ RESTRICT="bindist strip"
KEYWORDS="-* ~amd64"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+ ')"
RDEPEND="
net-dns/avahi
diff --git a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
index d4dc6a7ad1a1..8f2e0be664e2 100644
--- a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,7 +27,10 @@ RESTRICT="bindist strip"
KEYWORDS="-* ~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+ ')"
BDEPEND="dev-util/patchelf"
RDEPEND="
diff --git a/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
similarity index 98%
rename from media-tv/plex-media-server/plex-media-server-1.18.4.ebuild
rename to media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
index 994795f17759..ff7382861de2 100644
--- a/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
@@ -27,7 +27,10 @@ RESTRICT="bindist strip"
KEYWORDS="-* ~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+ ')"
BDEPEND="dev-util/patchelf"
RDEPEND="
@@ -63,7 +66,6 @@ src_install() {
# Move the config to the correct place
local config_vanilla="/etc/default/plexmediaserver"
local config_path="/etc/${_SHORTNAME}"
- dodir "${config_path}"
insinto "${config_path}"
doins "${config_vanilla#/}"
sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b9ab94118bb4..617c97adb9e9 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r3.ebuild
similarity index 83%
rename from media-video/griffith/griffith-0.13-r2.ebuild
rename to media-video/griffith/griffith-0.13-r3.ebuild
index aa9efbb2fc61..d606fd887aac 100644
--- a/media-video/griffith/griffith-0.13-r2.ebuild
+++ b/media-video/griffith/griffith-0.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,12 +22,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- dev-python/pillow[${PYTHON_USEDEP}]
- gnome-base/libglade[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-0.5.2[${PYTHON_USEDEP}]
- >=dev-python/reportlab-1.19[${PYTHON_USEDEP}]"
+ gnome-base/libglade[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygtk-2.6.1:2[${PYTHON_MULTI_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sqlalchemy-0.5.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/reportlab-1.19[${PYTHON_MULTI_USEDEP}]
+ ')"
DEPEND="${RDEPEND}
doc? ( app-text/docbook2X )"
diff --git a/media-video/openshot/openshot-2.4.0-r1.ebuild b/media-video/openshot/openshot-2.4.0-r1.ebuild
index cbde49448910..e426ccbfaa58 100644
--- a/media-video/openshot/openshot-2.4.0-r1.ebuild
+++ b/media-video/openshot/openshot-2.4.0-r1.ebuild
@@ -21,14 +21,13 @@ SLOT="1"
KEYWORDS="amd64 x86"
RDEPEND="
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
- dev-python/pyzmq[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- >=media-libs/libopenshot-0.1.8[python,${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},svg,webkit]
+ dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=media-libs/libopenshot-0.1.8[python,${PYTHON_SINGLE_USEDEP}]
"
S="${WORKDIR}"
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4-r1.ebuild
similarity index 70%
rename from media-video/openshot/openshot-2.4.4.ebuild
rename to media-video/openshot/openshot-2.4.4-r1.ebuild
index 954d0061c562..cf2c948c325c 100644
--- a/media-video/openshot/openshot-2.4.4.ebuild
+++ b/media-video/openshot/openshot-2.4.4-r1.ebuild
@@ -21,15 +21,18 @@ KEYWORDS="amd64 x86"
IUSE="doc"
RDEPEND="
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,webkit,widgets]
- dev-python/pyzmq[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- >=media-libs/libopenshot-0.2.3[python,${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
+ dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=media-libs/libopenshot-0.2.3[python,${PYTHON_SINGLE_USEDEP}]
"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+ ')
"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
similarity index 87%
rename from media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
rename to media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
index bd308e4f0daa..642f93edc0e6 100644
--- a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
@@ -18,12 +18,18 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
-RDEPEND="dev-python/gst-python[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
+ dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+ dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+ ')
media-plugins/gst-plugins-jpeg:1.0
x11-libs/wxGTK:*[X]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="
+ $(python_gen_cond_dep '
+ doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+ ')"
PATCHES=( "${FILESDIR}/${P}-disable-docs-by-default.patch" )
diff --git a/media-video/pitivi/pitivi-0.999.ebuild b/media-video/pitivi/pitivi-0.999-r1.ebuild
similarity index 82%
rename from media-video/pitivi/pitivi-0.999.ebuild
rename to media-video/pitivi/pitivi-0.999-r1.ebuild
index 0478303d98c0..aa8949946c6b 100644
--- a/media-video/pitivi/pitivi-0.999.ebuild
+++ b/media-video/pitivi/pitivi-0.999-r1.ebuild
@@ -26,7 +26,9 @@ GST_VER="1.14.2"
COMMON_DEPEND="
${PYTHON_DEPS}
- >=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/pycairo-1.10[${PYTHON_MULTI_USEDEP}]
+ ')
>=x11-libs/cairo-1.10
>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
@@ -36,11 +38,13 @@ RDEPEND="${COMMON_DEPEND}
>=dev-libs/glib-2.30.0:2
>=dev-libs/gobject-introspection-1.34:=
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/gst-python-1.4:1.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+ ')
gnome-base/librsvg:=
>=media-libs/gsound-1.0
@@ -66,7 +70,11 @@ BDEPEND="
dev-util/itstool
sys-devel/gettext
virtual/pkgconfig
- test? ( dev-python/nose2[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/nose2[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
PATCHES=(
diff --git a/media-video/pymp/pymp-1.1-r1.ebuild b/media-video/pymp/pymp-1.1-r2.ebuild
similarity index 89%
rename from media-video/pymp/pymp-1.1-r1.ebuild
rename to media-video/pymp/pymp-1.1-r2.ebuild
index b9fb82683b78..2ce35400dcf3 100644
--- a/media-video/pymp/pymp-1.1-r1.ebuild
+++ b/media-video/pymp/pymp-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,9 @@ KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="media-video/mplayer
- dev-python/pygtk[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+ ')
${PYTHON_DEPS}"
DEPEND="sys-apps/sed"
diff --git a/media-video/totem/totem-3.32.1-r1.ebuild b/media-video/totem/totem-3.32.1-r2.ebuild
similarity index 92%
rename from media-video/totem/totem-3.32.1-r1.ebuild
rename to media-video/totem/totem-3.32.1-r2.ebuild
index 0a1b3d38e9a1..dc7f5d912604 100644
--- a/media-video/totem/totem-3.32.1-r1.ebuild
+++ b/media-video/totem/totem-3.32.1-r2.ebuild
@@ -45,7 +45,10 @@ DEPEND="
lirc? ( app-misc/lirc )
python? (
${PYTHON_DEPS}
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
RDEPEND="${DEPEND}
media-plugins/grilo-plugins:0.3
@@ -53,8 +56,11 @@ RDEPEND="${DEPEND}
media-plugins/gst-plugins-taglib:1.0
x11-themes/adwaita-icon-theme
python? (
- >=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}] )
+ >=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
"
BDEPEND="
dev-lang/perl
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1d89d5ac5b07..9d10a3eb6955 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f3b7aa044076..bec483c8a746 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Feb 2020 12:08:58 +0000
+Sun, 09 Feb 2020 20:38:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f3b7aa044076..bec483c8a746 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Feb 2020 12:08:58 +0000
+Sun, 09 Feb 2020 20:38:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cbf8fc82d43f..4a60a312a6f8 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index e5f6a9ea41c8..d095f867f432 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/adm-0 b/metadata/md5-cache/acct-group/adm-0
index 6630582eaaa2..6c1759ed1458 100644
--- a/metadata/md5-cache/acct-group/adm-0
+++ b/metadata/md5-cache/acct-group/adm-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: adm
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=39d71964f4abdd9dbcb7e1d46f8465ff
diff --git a/metadata/md5-cache/acct-group/amule-0 b/metadata/md5-cache/acct-group/amule-0
index 4d097389b1cf..bc96c557acc9 100644
--- a/metadata/md5-cache/acct-group/amule-0
+++ b/metadata/md5-cache/acct-group/amule-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-p2p/amule
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c29b2069aed0cdb0ec1e5020f1b24f83
diff --git a/metadata/md5-cache/acct-group/asterisk-0 b/metadata/md5-cache/acct-group/asterisk-0
index 99b13c977a86..4857d2c89eab 100644
--- a/metadata/md5-cache/acct-group/asterisk-0
+++ b/metadata/md5-cache/acct-group/asterisk-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for asterisk
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=49c6c5e707bde0994b4a6ea1dbb5ae1f
diff --git a/metadata/md5-cache/acct-group/audio-0 b/metadata/md5-cache/acct-group/audio-0
index 4509db034c8b..800dc751dffa 100644
--- a/metadata/md5-cache/acct-group/audio-0
+++ b/metadata/md5-cache/acct-group/audio-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: audio
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b73f5838fb249b20a45bae74eb578ea6
diff --git a/metadata/md5-cache/acct-group/automx2-0 b/metadata/md5-cache/acct-group/automx2-0
index 2f2de99b0e78..d9be17dc8005 100644
--- a/metadata/md5-cache/acct-group/automx2-0
+++ b/metadata/md5-cache/acct-group/automx2-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for www-servers/automx2
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d7884f278a1790dae94edc7e31df370a
diff --git a/metadata/md5-cache/acct-group/avahi-0 b/metadata/md5-cache/acct-group/avahi-0
index acd5d81a4fe7..e94d6c2130a3 100644
--- a/metadata/md5-cache/acct-group/avahi-0
+++ b/metadata/md5-cache/acct-group/avahi-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for avahi
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3067c5893393c6a37d04222a9ef488a4
diff --git a/metadata/md5-cache/acct-group/avahi-autoipd-0 b/metadata/md5-cache/acct-group/avahi-autoipd-0
index f356278330fd..78b5436145cc 100644
--- a/metadata/md5-cache/acct-group/avahi-autoipd-0
+++ b/metadata/md5-cache/acct-group/avahi-autoipd-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for avahi-autoipd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6fc37fa157e5e768ef980c7606615062
diff --git a/metadata/md5-cache/acct-group/bacula-0 b/metadata/md5-cache/acct-group/bacula-0
index 3cd587ba721a..809e98fe81fb 100644
--- a/metadata/md5-cache/acct-group/bacula-0
+++ b/metadata/md5-cache/acct-group/bacula-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the bacula backup system
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=054692d2a0146d98fb8d14494de21fad
diff --git a/metadata/md5-cache/acct-group/bedrock-0 b/metadata/md5-cache/acct-group/bedrock-0
index 852853f6df71..7a885b4f5209 100644
--- a/metadata/md5-cache/acct-group/bedrock-0
+++ b/metadata/md5-cache/acct-group/bedrock-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Minecraft Bedrock server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d6a3955aedbf661a0fcc1831e2c7cecc
diff --git a/metadata/md5-cache/acct-group/bitcoin-0 b/metadata/md5-cache/acct-group/bitcoin-0
index c9bc4ca62d21..1006eb480444 100644
--- a/metadata/md5-cache/acct-group/bitcoin-0
+++ b/metadata/md5-cache/acct-group/bitcoin-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for users with access to system-wide Bitcoin services
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8efe6f15eb91a9af987038c9861c24fe
diff --git a/metadata/md5-cache/acct-group/burp-0 b/metadata/md5-cache/acct-group/burp-0
index e95e7fa9e335..9fde4726b671 100644
--- a/metadata/md5-cache/acct-group/burp-0
+++ b/metadata/md5-cache/acct-group/burp-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the app-backup/burp server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e3d5e39d1b95bf9351ca5517d737081b
diff --git a/metadata/md5-cache/acct-group/cdrom-0 b/metadata/md5-cache/acct-group/cdrom-0
index 998dceaa6066..e2f5c986477d 100644
--- a/metadata/md5-cache/acct-group/cdrom-0
+++ b/metadata/md5-cache/acct-group/cdrom-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: cdrom
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b9858db51d09305b00374dd08cbb7889
diff --git a/metadata/md5-cache/acct-group/ceph-0 b/metadata/md5-cache/acct-group/ceph-0
index 9f853b663852..0db02e818ef5 100644
--- a/metadata/md5-cache/acct-group/ceph-0
+++ b/metadata/md5-cache/acct-group/ceph-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: ceph
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c368b708f065fb4797ca8a85a0130970
diff --git a/metadata/md5-cache/acct-group/cinder-0 b/metadata/md5-cache/acct-group/cinder-0
index 87e381d35555..8e75828a7244 100644
--- a/metadata/md5-cache/acct-group/cinder-0
+++ b/metadata/md5-cache/acct-group/cinder-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: cinder
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2338b3f3fc4f4d39a2d711be9d060968
diff --git a/metadata/md5-cache/acct-group/clamav-0 b/metadata/md5-cache/acct-group/clamav-0
index 2a63ffd6529e..b47173492975 100644
--- a/metadata/md5-cache/acct-group/clamav-0
+++ b/metadata/md5-cache/acct-group/clamav-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: clamav
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=807db74c7e2a1423cbb6d42275fc080f
diff --git a/metadata/md5-cache/acct-group/cmd5checkpw-0 b/metadata/md5-cache/acct-group/cmd5checkpw-0
index 4bb14b1cb1d6..94c762f43cd1 100644
--- a/metadata/md5-cache/acct-group/cmd5checkpw-0
+++ b/metadata/md5-cache/acct-group/cmd5checkpw-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: cmd5checkpw
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9caaa23dddff76dcbb4ffc354805400f
diff --git a/metadata/md5-cache/acct-group/davfs2-0 b/metadata/md5-cache/acct-group/davfs2-0
index 3a2e9f97b59b..d6d6fb3a1703 100644
--- a/metadata/md5-cache/acct-group/davfs2-0
+++ b/metadata/md5-cache/acct-group/davfs2-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: davfs2
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=811977e983d56622e3535a9f8d6d305e
diff --git a/metadata/md5-cache/acct-group/ddclient-0 b/metadata/md5-cache/acct-group/ddclient-0
index dae0ec08360b..de852289bca6 100644
--- a/metadata/md5-cache/acct-group/ddclient-0
+++ b/metadata/md5-cache/acct-group/ddclient-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the dynamic DNS client
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fb40b31b6f503ed1a980ae287aca8ea7
diff --git a/metadata/md5-cache/acct-group/deluge-0 b/metadata/md5-cache/acct-group/deluge-0
index 741169079229..88759de72e8e 100644
--- a/metadata/md5-cache/acct-group/deluge-0
+++ b/metadata/md5-cache/acct-group/deluge-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: deluge
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=be89bf87c0f5b7aca5e475fb2703dcbd
diff --git a/metadata/md5-cache/acct-group/dhcp-0 b/metadata/md5-cache/acct-group/dhcp-0
index 5fd9fee21f77..1b6412c3e079 100644
--- a/metadata/md5-cache/acct-group/dhcp-0
+++ b/metadata/md5-cache/acct-group/dhcp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dhcp
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a5b3357b396326f7db8c294bb55251fe
diff --git a/metadata/md5-cache/acct-group/dialout-0 b/metadata/md5-cache/acct-group/dialout-0
index e590cd2e01b0..9cdd1167f8db 100644
--- a/metadata/md5-cache/acct-group/dialout-0
+++ b/metadata/md5-cache/acct-group/dialout-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dialout
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a1ad90b55d7bd6ef91bc53934e20abd3
diff --git a/metadata/md5-cache/acct-group/disk-0 b/metadata/md5-cache/acct-group/disk-0
index 9ff22b7dda44..921df333b2ef 100644
--- a/metadata/md5-cache/acct-group/disk-0
+++ b/metadata/md5-cache/acct-group/disk-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: disk
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a20b02cceaa021d9949929392bf56367
diff --git a/metadata/md5-cache/acct-group/dnscrypt-proxy-0 b/metadata/md5-cache/acct-group/dnscrypt-proxy-0
index 48a9b29c2682..235fe29f531a 100644
--- a/metadata/md5-cache/acct-group/dnscrypt-proxy-0
+++ b/metadata/md5-cache/acct-group/dnscrypt-proxy-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-dns/dnscrypt-proxy
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=06f43a467097deec8d1d5e97e07d40a2
diff --git a/metadata/md5-cache/acct-group/dnsmasq_exporter-0 b/metadata/md5-cache/acct-group/dnsmasq_exporter-0
index 5d0b4d93577b..0471e7b762ac 100644
--- a/metadata/md5-cache/acct-group/dnsmasq_exporter-0
+++ b/metadata/md5-cache/acct-group/dnsmasq_exporter-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dnsmasq_exporter
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8e4a90152ee0889d2eb93e35015b97fc
diff --git a/metadata/md5-cache/acct-group/docker-0 b/metadata/md5-cache/acct-group/docker-0
index 797eb3f811d4..651b889e02a1 100644
--- a/metadata/md5-cache/acct-group/docker-0
+++ b/metadata/md5-cache/acct-group/docker-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: docker
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b75dd269af84d92273d7d2d9283739ca
diff --git a/metadata/md5-cache/acct-group/dovecot-0 b/metadata/md5-cache/acct-group/dovecot-0
index c5f580e9afbe..bdbb13d4517e 100644
--- a/metadata/md5-cache/acct-group/dovecot-0
+++ b/metadata/md5-cache/acct-group/dovecot-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dovecot
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=307acf2708b69ed1a49b782fcbcbfd3a
diff --git a/metadata/md5-cache/acct-group/dovenull-0 b/metadata/md5-cache/acct-group/dovenull-0
index d53c8cd8deae..28d073dc366f 100644
--- a/metadata/md5-cache/acct-group/dovenull-0
+++ b/metadata/md5-cache/acct-group/dovenull-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dovenull
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=bae488a748de7501577bafd1d52abeb6
diff --git a/metadata/md5-cache/acct-group/elasticsearch-0 b/metadata/md5-cache/acct-group/elasticsearch-0
index 92cd03d8a851..0913576f8900 100644
--- a/metadata/md5-cache/acct-group/elasticsearch-0
+++ b/metadata/md5-cache/acct-group/elasticsearch-0
@@ -3,5 +3,5 @@ DESCRIPTION=Elasticsearch program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c781898f3a2a5c779c62444d0e11dc0e
diff --git a/metadata/md5-cache/acct-group/epmd-0 b/metadata/md5-cache/acct-group/epmd-0
index 873ed986ad20..914c7aca2eaa 100644
--- a/metadata/md5-cache/acct-group/epmd-0
+++ b/metadata/md5-cache/acct-group/epmd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for Erlang Portmapper Daemon
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=62b448ad61c88acf2787a843221cb3a8
diff --git a/metadata/md5-cache/acct-group/fetchmail-0 b/metadata/md5-cache/acct-group/fetchmail-0
index 2500afd692f8..80c1d852396e 100644
--- a/metadata/md5-cache/acct-group/fetchmail-0
+++ b/metadata/md5-cache/acct-group/fetchmail-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-mail/fetchmail
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d5b312fce59f915af4aa369fd0945164
diff --git a/metadata/md5-cache/acct-group/fhem-0 b/metadata/md5-cache/acct-group/fhem-0
index d48c7da6fb28..41190a4cd32a 100644
--- a/metadata/md5-cache/acct-group/fhem-0
+++ b/metadata/md5-cache/acct-group/fhem-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the FHEM perl server for house automation
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3aff19cab346f5a17f6815d97cc87ad3
diff --git a/metadata/md5-cache/acct-group/ftp-0 b/metadata/md5-cache/acct-group/ftp-0
index f4be487fd061..6c27b54c6a8b 100644
--- a/metadata/md5-cache/acct-group/ftp-0
+++ b/metadata/md5-cache/acct-group/ftp-0
@@ -3,5 +3,5 @@ DESCRIPTION=File Transfer Protocol server user
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e770669756dc3ee4457445a05f65adbf
diff --git a/metadata/md5-cache/acct-group/gamestat-0 b/metadata/md5-cache/acct-group/gamestat-0
index c43777815ccd..876ee90fe97d 100644
--- a/metadata/md5-cache/acct-group/gamestat-0
+++ b/metadata/md5-cache/acct-group/gamestat-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for shared high-score and game state files
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=388e0905310bf778877ef5218d2fa759
diff --git a/metadata/md5-cache/acct-group/geneweb-0 b/metadata/md5-cache/acct-group/geneweb-0
index 608a5dccd861..13b8f968742d 100644
--- a/metadata/md5-cache/acct-group/geneweb-0
+++ b/metadata/md5-cache/acct-group/geneweb-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for geneweb daemon
EAPI=7
KEYWORDS=~amd64 ~x86
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2dcfc74aea034c280415c540cf473889
diff --git a/metadata/md5-cache/acct-group/gerbera-0 b/metadata/md5-cache/acct-group/gerbera-0
index e0dff8619813..3755bdb1a540 100644
--- a/metadata/md5-cache/acct-group/gerbera-0
+++ b/metadata/md5-cache/acct-group/gerbera-0
@@ -3,5 +3,5 @@ DESCRIPTION=Gerbera UPnP Media Server group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=05f5232d19adab18b26d0e4ce4996bfe
diff --git a/metadata/md5-cache/acct-group/git-0 b/metadata/md5-cache/acct-group/git-0
index 45fcd5339a2a..9200d6595bc4 100644
--- a/metadata/md5-cache/acct-group/git-0
+++ b/metadata/md5-cache/acct-group/git-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: git
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=0f8adce0dd8913074e26d233a5527847
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0 b/metadata/md5-cache/acct-group/gkrellmd-0
index a7bc48375d3a..756db5431fa6 100644
--- a/metadata/md5-cache/acct-group/gkrellmd-0
+++ b/metadata/md5-cache/acct-group/gkrellmd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: gkrellmd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6e73e70bcd8ec52941c349a38f8257d2
diff --git a/metadata/md5-cache/acct-group/glance-0 b/metadata/md5-cache/acct-group/glance-0
index 54c4f9f478e7..8d3481a185da 100644
--- a/metadata/md5-cache/acct-group/glance-0
+++ b/metadata/md5-cache/acct-group/glance-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: glance
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4e0e15ccf19bfcfc90e85892a50b4cfc
diff --git a/metadata/md5-cache/acct-group/graylog-0 b/metadata/md5-cache/acct-group/graylog-0
index 7300a05b4c49..0ee59f461bbc 100644
--- a/metadata/md5-cache/acct-group/graylog-0
+++ b/metadata/md5-cache/acct-group/graylog-0
@@ -3,5 +3,5 @@ DESCRIPTION=Graylog program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9108fd7df54daa040cced4052c2c1481
diff --git a/metadata/md5-cache/acct-group/gvm-0 b/metadata/md5-cache/acct-group/gvm-0
index 4b0ca4f9097a..7a1b6cbc6083 100644
--- a/metadata/md5-cache/acct-group/gvm-0
+++ b/metadata/md5-cache/acct-group/gvm-0
@@ -3,5 +3,5 @@ DESCRIPTION=Greenbone vulnerability management program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=84783e4f6d9cdb64f1ce59bdac117c7b
diff --git a/metadata/md5-cache/acct-group/heat-0 b/metadata/md5-cache/acct-group/heat-0
index f29e6739cf29..0e1594092d25 100644
--- a/metadata/md5-cache/acct-group/heat-0
+++ b/metadata/md5-cache/acct-group/heat-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: heat
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=33f81fce01773239f6d9362751ac6bd5
diff --git a/metadata/md5-cache/acct-group/i2p-0 b/metadata/md5-cache/acct-group/i2p-0
index 5fbceaa8ae87..2319f05e3b40 100644
--- a/metadata/md5-cache/acct-group/i2p-0
+++ b/metadata/md5-cache/acct-group/i2p-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for system-wide net-vpn/i2p
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8e326f3d1153a991c0d1b33213c3924d
diff --git a/metadata/md5-cache/acct-group/i2pd-0 b/metadata/md5-cache/acct-group/i2pd-0
index f5997a12355d..71d4a938653b 100644
--- a/metadata/md5-cache/acct-group/i2pd-0
+++ b/metadata/md5-cache/acct-group/i2pd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-vpn/i2pd server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=453194474be9865bd9669c2dd708e289
diff --git a/metadata/md5-cache/acct-group/input-0 b/metadata/md5-cache/acct-group/input-0
index a72d5a60bc06..03155bcb18e6 100644
--- a/metadata/md5-cache/acct-group/input-0
+++ b/metadata/md5-cache/acct-group/input-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: input
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=facd231a70bee907d514147f6adddc94
diff --git a/metadata/md5-cache/acct-group/inspircd-0 b/metadata/md5-cache/acct-group/inspircd-0
index 9d3004ee4b4e..f18c4850df0c 100644
--- a/metadata/md5-cache/acct-group/inspircd-0
+++ b/metadata/md5-cache/acct-group/inspircd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: inspircd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a795520ec5641579d481dd2b0697614d
diff --git a/metadata/md5-cache/acct-group/ipfs-0 b/metadata/md5-cache/acct-group/ipfs-0
index 66083d88fdc5..50860cb1ee03 100644
--- a/metadata/md5-cache/acct-group/ipfs-0
+++ b/metadata/md5-cache/acct-group/ipfs-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-p2p/go-ipfs-bin server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=45098558a268a5a55b1f6d73ddfa3042
diff --git a/metadata/md5-cache/acct-group/keystone-0 b/metadata/md5-cache/acct-group/keystone-0
index 6265c93a06d9..2854b6d89d8f 100644
--- a/metadata/md5-cache/acct-group/keystone-0
+++ b/metadata/md5-cache/acct-group/keystone-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: keystone
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3d0739f8634948fbc860e400bfcba344
diff --git a/metadata/md5-cache/acct-group/kibana-0 b/metadata/md5-cache/acct-group/kibana-0
index f8116bfb9201..4f10ea3aa42b 100644
--- a/metadata/md5-cache/acct-group/kibana-0
+++ b/metadata/md5-cache/acct-group/kibana-0
@@ -3,5 +3,5 @@ DESCRIPTION=Kibana program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=0589731a7aa4db8784eaf2362f7ef020
diff --git a/metadata/md5-cache/acct-group/kmem-0 b/metadata/md5-cache/acct-group/kmem-0
index 732bf61849ad..11dd995672a1 100644
--- a/metadata/md5-cache/acct-group/kmem-0
+++ b/metadata/md5-cache/acct-group/kmem-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kmem
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=10127a30128142690669f5c03c937f4e
diff --git a/metadata/md5-cache/acct-group/knot-0 b/metadata/md5-cache/acct-group/knot-0
index 8586578a9fe0..8b9e0fecc5ef 100644
--- a/metadata/md5-cache/acct-group/knot-0
+++ b/metadata/md5-cache/acct-group/knot-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: knot
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2d26cd7f45a3e7ddb78f0fa0f149bd4f
diff --git a/metadata/md5-cache/acct-group/kube-apiserver-0 b/metadata/md5-cache/acct-group/kube-apiserver-0
index dba95bf6f95a..bd72d4d6677c 100644
--- a/metadata/md5-cache/acct-group/kube-apiserver-0
+++ b/metadata/md5-cache/acct-group/kube-apiserver-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kube-apiserver
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c054b5f4f98783b29587e9174c912761
diff --git a/metadata/md5-cache/acct-group/kube-controller-manager-0 b/metadata/md5-cache/acct-group/kube-controller-manager-0
index dd81bfbcb7d7..87428a5befb9 100644
--- a/metadata/md5-cache/acct-group/kube-controller-manager-0
+++ b/metadata/md5-cache/acct-group/kube-controller-manager-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kube-controller-manager
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=31dfddf84d88ed7750a80b3ae58b8ede
diff --git a/metadata/md5-cache/acct-group/kube-scheduler-0 b/metadata/md5-cache/acct-group/kube-scheduler-0
index 6740e4ea2c52..0f4e1af7849d 100644
--- a/metadata/md5-cache/acct-group/kube-scheduler-0
+++ b/metadata/md5-cache/acct-group/kube-scheduler-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kube-scheduler
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4b17bf59c8edde8c9952fa0650a2b085
diff --git a/metadata/md5-cache/acct-group/kvm-0 b/metadata/md5-cache/acct-group/kvm-0
index 0c848701bb64..7f08a3cc4b6e 100644
--- a/metadata/md5-cache/acct-group/kvm-0
+++ b/metadata/md5-cache/acct-group/kvm-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kvm
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=067b2dfd01914e403a4c31ea6f6bb8c4
diff --git a/metadata/md5-cache/acct-group/libvirt-0 b/metadata/md5-cache/acct-group/libvirt-0
index 0eef820c7ee0..6c51a3fbde8d 100644
--- a/metadata/md5-cache/acct-group/libvirt-0
+++ b/metadata/md5-cache/acct-group/libvirt-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: libvirt
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=002df7e4906cff6a8f6f26394482abaa
diff --git a/metadata/md5-cache/acct-group/lighttpd-0 b/metadata/md5-cache/acct-group/lighttpd-0
new file mode 100644
index 000000000000..b5ff77ed8d95
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lighttpd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: lighttpd
+EAPI=7
+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
+SLOT=0
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=2be863cecef258cae52996a81bd9a452
diff --git a/metadata/md5-cache/acct-group/logstash-0 b/metadata/md5-cache/acct-group/logstash-0
index 8d139e03e044..b8a8622ec854 100644
--- a/metadata/md5-cache/acct-group/logstash-0
+++ b/metadata/md5-cache/acct-group/logstash-0
@@ -3,5 +3,5 @@ DESCRIPTION=Logstash program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=861a900d93d5467bb8da8fd0adac01f9
diff --git a/metadata/md5-cache/acct-group/lp-0 b/metadata/md5-cache/acct-group/lp-0
index 0cfd19b6d9f1..18fafcf5ce87 100644
--- a/metadata/md5-cache/acct-group/lp-0
+++ b/metadata/md5-cache/acct-group/lp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: lp
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=699dd3f5942b4f58c8a27283ad495391
diff --git a/metadata/md5-cache/acct-group/mail-0 b/metadata/md5-cache/acct-group/mail-0
index 87b44f9ddde3..adf1a7bd28b6 100644
--- a/metadata/md5-cache/acct-group/mail-0
+++ b/metadata/md5-cache/acct-group/mail-0
@@ -3,5 +3,5 @@ DESCRIPTION=Mail program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e3067d3d912fccf59b2f4b2256a57add
diff --git a/metadata/md5-cache/acct-group/man-0 b/metadata/md5-cache/acct-group/man-0
index 5f392d1a41bd..554db6159308 100644
--- a/metadata/md5-cache/acct-group/man-0
+++ b/metadata/md5-cache/acct-group/man-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: man
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4c96f51f1389cf6ecdcdb10758ffad62
diff --git a/metadata/md5-cache/acct-group/memcached-0 b/metadata/md5-cache/acct-group/memcached-0
index c043bbd6b29f..8d700667d400 100644
--- a/metadata/md5-cache/acct-group/memcached-0
+++ b/metadata/md5-cache/acct-group/memcached-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: memcached
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1e325a3cdfb3722fda6e3aaa83d6a162
diff --git a/metadata/md5-cache/acct-group/messagebus-0 b/metadata/md5-cache/acct-group/messagebus-0
index 2c1cb944a952..bbdb6c3ee8e9 100644
--- a/metadata/md5-cache/acct-group/messagebus-0
+++ b/metadata/md5-cache/acct-group/messagebus-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: messagebus
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1534290a1fff9dabea91ec6f8b5facd7
diff --git a/metadata/md5-cache/acct-group/milter-regex-0 b/metadata/md5-cache/acct-group/milter-regex-0
index 4cf71a41eb93..59731955624d 100644
--- a/metadata/md5-cache/acct-group/milter-regex-0
+++ b/metadata/md5-cache/acct-group/milter-regex-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for mail-filter/milter-regex
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=53c54c448e630b9851d0a09ccf864f46
diff --git a/metadata/md5-cache/acct-group/minecraft-0 b/metadata/md5-cache/acct-group/minecraft-0
index 4c8ad24a65f1..068bfabb18a1 100644
--- a/metadata/md5-cache/acct-group/minecraft-0
+++ b/metadata/md5-cache/acct-group/minecraft-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Minecraft server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=0ac2f37208671fa68c6faeb53e64a554
diff --git a/metadata/md5-cache/acct-group/minetest-0 b/metadata/md5-cache/acct-group/minetest-0
index 3a9583f463b9..6f3a6c54cf30 100644
--- a/metadata/md5-cache/acct-group/minetest-0
+++ b/metadata/md5-cache/acct-group/minetest-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Minetest server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a0e1e54358c1d20b4ff7a9275538ab88
diff --git a/metadata/md5-cache/acct-group/mongodb-0 b/metadata/md5-cache/acct-group/mongodb-0
index de6bfefeab79..f24357ce9ed8 100644
--- a/metadata/md5-cache/acct-group/mongodb-0
+++ b/metadata/md5-cache/acct-group/mongodb-0
@@ -3,5 +3,5 @@ DESCRIPTION=MongoDB program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=7168bb491e7712305a4135f2ebd3cf05
diff --git a/metadata/md5-cache/acct-group/mosquitto-0 b/metadata/md5-cache/acct-group/mosquitto-0
index 1dbd1a30185e..9918759e5ac9 100644
--- a/metadata/md5-cache/acct-group/mosquitto-0
+++ b/metadata/md5-cache/acct-group/mosquitto-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the mosquitto MQTT broker
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9964002db136e9b2fba22f58708a14b0
diff --git a/metadata/md5-cache/acct-group/msmtpd-0 b/metadata/md5-cache/acct-group/msmtpd-0
index 050f554e615b..ee93d8f1f915 100644
--- a/metadata/md5-cache/acct-group/msmtpd-0
+++ b/metadata/md5-cache/acct-group/msmtpd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: msmtpd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ad9ddb1047b6e114f628220b4b8ab4d5
diff --git a/metadata/md5-cache/acct-group/munin-0 b/metadata/md5-cache/acct-group/munin-0
index d0b60a5f715e..85f37e720db0 100644
--- a/metadata/md5-cache/acct-group/munin-0
+++ b/metadata/md5-cache/acct-group/munin-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: munin
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ffaa3ceb6cc3adeaad181674e47fe5e5
diff --git a/metadata/md5-cache/acct-group/murmur-0 b/metadata/md5-cache/acct-group/murmur-0
index 3e10132d9021..f840682c2622 100644
--- a/metadata/md5-cache/acct-group/murmur-0
+++ b/metadata/md5-cache/acct-group/murmur-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: murmur
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=870bb9cb21b6dfa6dbbe73789d526c4c
diff --git a/metadata/md5-cache/acct-group/mysql-0 b/metadata/md5-cache/acct-group/mysql-0
index e249b1f347e2..46888e71079e 100644
--- a/metadata/md5-cache/acct-group/mysql-0
+++ b/metadata/md5-cache/acct-group/mysql-0
@@ -3,5 +3,5 @@ DESCRIPTION=MySQL program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d8c9ba10da6756eb6b8d6be422784cf0
diff --git a/metadata/md5-cache/acct-group/mythtv-0 b/metadata/md5-cache/acct-group/mythtv-0
index aea2cbcfff72..9f189ea061a8 100644
--- a/metadata/md5-cache/acct-group/mythtv-0
+++ b/metadata/md5-cache/acct-group/mythtv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Mythtv mythbackend server/deamon group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=94f7181abb848deb3e897ead1ec51843
diff --git a/metadata/md5-cache/acct-group/nagios-0 b/metadata/md5-cache/acct-group/nagios-0
index 47dbaf159fae..7bca05f41432 100644
--- a/metadata/md5-cache/acct-group/nagios-0
+++ b/metadata/md5-cache/acct-group/nagios-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nagios
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=326535b7e0fc7dd8049f7228af275525
diff --git a/metadata/md5-cache/acct-group/netbox-0 b/metadata/md5-cache/acct-group/netbox-0
index a844160c6a94..7fc69369e122 100644
--- a/metadata/md5-cache/acct-group/netbox-0
+++ b/metadata/md5-cache/acct-group/netbox-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: netbox
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=65ef9a0acf0ef3eb808cc22bb6b14ca3
diff --git a/metadata/md5-cache/acct-group/netdata-0 b/metadata/md5-cache/acct-group/netdata-0
index 4cf4bb74efa7..82862268a5f3 100644
--- a/metadata/md5-cache/acct-group/netdata-0
+++ b/metadata/md5-cache/acct-group/netdata-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: netdata
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=48e09487af82b5d21c249fd930d5fbd6
diff --git a/metadata/md5-cache/acct-group/netdev-0 b/metadata/md5-cache/acct-group/netdev-0
index 90acde8d5368..972db12ea9e4 100644
--- a/metadata/md5-cache/acct-group/netdev-0
+++ b/metadata/md5-cache/acct-group/netdev-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for netdev (avahi)
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=eaa51fc47a62ebc5d502ad5e3e76f991
diff --git a/metadata/md5-cache/acct-group/neutron-0 b/metadata/md5-cache/acct-group/neutron-0
index f24367eb847a..49607686f766 100644
--- a/metadata/md5-cache/acct-group/neutron-0
+++ b/metadata/md5-cache/acct-group/neutron-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: neutron
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c058f2e93fc39a15c0e0e4f13a8921a9
diff --git a/metadata/md5-cache/acct-group/nofiles-0 b/metadata/md5-cache/acct-group/nofiles-0
index 0079753b07b1..f15fab9cd12e 100644
--- a/metadata/md5-cache/acct-group/nofiles-0
+++ b/metadata/md5-cache/acct-group/nofiles-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nofiles
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6392b25de4070019a25c20bfcf717e5f
diff --git a/metadata/md5-cache/acct-group/nova-0 b/metadata/md5-cache/acct-group/nova-0
index 25cce70c5ea1..37f16ca7cd19 100644
--- a/metadata/md5-cache/acct-group/nova-0
+++ b/metadata/md5-cache/acct-group/nova-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nova
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=68731c2a87b669070f2036a658e5378c
diff --git a/metadata/md5-cache/acct-group/nsd-0 b/metadata/md5-cache/acct-group/nsd-0
index c9bb075da668..d0bada036fb4 100644
--- a/metadata/md5-cache/acct-group/nsd-0
+++ b/metadata/md5-cache/acct-group/nsd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nsd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=42c98ec2b9cb3d0ebf575318637d6302
diff --git a/metadata/md5-cache/acct-group/ntp-0 b/metadata/md5-cache/acct-group/ntp-0
index 6328aae1781f..bfe2d47a5131 100644
--- a/metadata/md5-cache/acct-group/ntp-0
+++ b/metadata/md5-cache/acct-group/ntp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: ntp
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=55a88933342b8dbd93a66a73f0a50945
diff --git a/metadata/md5-cache/acct-group/oidentd-0 b/metadata/md5-cache/acct-group/oidentd-0
index edf6dba9931d..4da87306ef9b 100644
--- a/metadata/md5-cache/acct-group/oidentd-0
+++ b/metadata/md5-cache/acct-group/oidentd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: oidentd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=450b8648c688ccecafe4e05c98d2d3aa
diff --git a/metadata/md5-cache/acct-group/openct-0 b/metadata/md5-cache/acct-group/openct-0
index d179611b484d..cd9c68b751e5 100644
--- a/metadata/md5-cache/acct-group/openct-0
+++ b/metadata/md5-cache/acct-group/openct-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: openct
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=7ae8badd59b78a22a19e96bd974bccc1
diff --git a/metadata/md5-cache/acct-group/opendkim-0 b/metadata/md5-cache/acct-group/opendkim-0
index c4219b8c3386..6c2ac89084a7 100644
--- a/metadata/md5-cache/acct-group/opendkim-0
+++ b/metadata/md5-cache/acct-group/opendkim-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for OpenDKIM
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4a24d2712880105f31f30aa9fce49542
diff --git a/metadata/md5-cache/acct-group/openntpd-0 b/metadata/md5-cache/acct-group/openntpd-0
index ace31d347e3b..57d9228c0d1a 100644
--- a/metadata/md5-cache/acct-group/openntpd-0
+++ b/metadata/md5-cache/acct-group/openntpd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: openntpd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9a470c142646ab8c66294adc5fcaadbf
diff --git a/metadata/md5-cache/acct-group/openrct2-0 b/metadata/md5-cache/acct-group/openrct2-0
index 1ae90cee8643..119fa43450cf 100644
--- a/metadata/md5-cache/acct-group/openrct2-0
+++ b/metadata/md5-cache/acct-group/openrct2-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the OpenRCT2 dedicated server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2b8669b79cbdad6338a3f095c1528a35
diff --git a/metadata/md5-cache/acct-group/pcscd-0 b/metadata/md5-cache/acct-group/pcscd-0
index 59cad5361cdd..54f371a07376 100644
--- a/metadata/md5-cache/acct-group/pcscd-0
+++ b/metadata/md5-cache/acct-group/pcscd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: pcscd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=aec8bc8ba57390489ba4fe0a4d3311bc
diff --git a/metadata/md5-cache/acct-group/pdnsd-0 b/metadata/md5-cache/acct-group/pdnsd-0
index a390943f5666..239ab07c4d84 100644
--- a/metadata/md5-cache/acct-group/pdnsd-0
+++ b/metadata/md5-cache/acct-group/pdnsd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: pdnsd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d553e3ed473ad56db2ff48168ecac299
diff --git a/metadata/md5-cache/acct-group/placement-0 b/metadata/md5-cache/acct-group/placement-0
index d7ee84586824..7edb72b4e57e 100644
--- a/metadata/md5-cache/acct-group/placement-0
+++ b/metadata/md5-cache/acct-group/placement-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: placement
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=7d315bb1371677e9fe580d9209b28041
diff --git a/metadata/md5-cache/acct-group/plex-0 b/metadata/md5-cache/acct-group/plex-0
index 898d4f39d993..285e7bf7efff 100644
--- a/metadata/md5-cache/acct-group/plex-0
+++ b/metadata/md5-cache/acct-group/plex-0
@@ -3,5 +3,5 @@ DESCRIPTION=Plex Media Server group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ed4fedb8b72771c007f0407b425d430f
diff --git a/metadata/md5-cache/acct-group/plugdev-0 b/metadata/md5-cache/acct-group/plugdev-0
index f438e80d439d..d6c16633e745 100644
--- a/metadata/md5-cache/acct-group/plugdev-0
+++ b/metadata/md5-cache/acct-group/plugdev-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group controlling access to removable media
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e16f6667e906ada718d427073f2812b2
diff --git a/metadata/md5-cache/acct-group/polkitd-0 b/metadata/md5-cache/acct-group/polkitd-0
index 2a3b0556fe6e..370f6066308a 100644
--- a/metadata/md5-cache/acct-group/polkitd-0
+++ b/metadata/md5-cache/acct-group/polkitd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: polkitd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d217390593e0ce31f04ccb30a5e83e2d
diff --git a/metadata/md5-cache/acct-group/postdrop-0 b/metadata/md5-cache/acct-group/postdrop-0
index a5dcb00db440..077b5d9c5897 100644
--- a/metadata/md5-cache/acct-group/postdrop-0
+++ b/metadata/md5-cache/acct-group/postdrop-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: postdrop
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1347bec1b03a8e003ee72bb1977b03ec
diff --git a/metadata/md5-cache/acct-group/postfix-0 b/metadata/md5-cache/acct-group/postfix-0
index 70dcbc8c0e97..d0393975f29f 100644
--- a/metadata/md5-cache/acct-group/postfix-0
+++ b/metadata/md5-cache/acct-group/postfix-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: postfix
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1a82ca8b8472e1ff9e647b24a4b78d52
diff --git a/metadata/md5-cache/acct-group/prometheus-0 b/metadata/md5-cache/acct-group/prometheus-0
index 3371fd982f85..94c80627b0de 100644
--- a/metadata/md5-cache/acct-group/prometheus-0
+++ b/metadata/md5-cache/acct-group/prometheus-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: prometheus
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8e64e090ccc75e7b0d343543baf1b432
diff --git a/metadata/md5-cache/acct-group/qemu-0 b/metadata/md5-cache/acct-group/qemu-0
index 77c27c4604c2..9d5fc4739a12 100644
--- a/metadata/md5-cache/acct-group/qemu-0
+++ b/metadata/md5-cache/acct-group/qemu-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: qemu
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a8bc544ee75754c59983fd84f9c7f6f4
diff --git a/metadata/md5-cache/acct-group/qmail-0 b/metadata/md5-cache/acct-group/qmail-0
index b7b7992f409c..c0ba1ab0fdbb 100644
--- a/metadata/md5-cache/acct-group/qmail-0
+++ b/metadata/md5-cache/acct-group/qmail-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: qmail
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=7f94a143fa30ba2bce6af841ab69cb31
diff --git a/metadata/md5-cache/acct-group/quassel-0 b/metadata/md5-cache/acct-group/quassel-0
index 8dd08d0f5658..56a021a2cb9e 100644
--- a/metadata/md5-cache/acct-group/quassel-0
+++ b/metadata/md5-cache/acct-group/quassel-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: quassel
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8068dce2d5b35117b7f126d122bdc234
diff --git a/metadata/md5-cache/acct-group/radius-0 b/metadata/md5-cache/acct-group/radius-0
index b7cd0ae02ee3..bc1c812b8b1e 100644
--- a/metadata/md5-cache/acct-group/radius-0
+++ b/metadata/md5-cache/acct-group/radius-0
@@ -3,5 +3,5 @@ DESCRIPTION=FreeRadius program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fb6e408aa036d4f41c08ea7b91f373da
diff --git a/metadata/md5-cache/acct-group/redis-0 b/metadata/md5-cache/acct-group/redis-0
index a45a98a6a965..d1094948276c 100644
--- a/metadata/md5-cache/acct-group/redis-0
+++ b/metadata/md5-cache/acct-group/redis-0
@@ -3,5 +3,5 @@ DESCRIPTION=Redis program group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e54df88df614dc2a0e51bab2867ab864
diff --git a/metadata/md5-cache/acct-group/redmine-0 b/metadata/md5-cache/acct-group/redmine-0
index d664117a4bc3..c58490993ac2 100644
--- a/metadata/md5-cache/acct-group/redmine-0
+++ b/metadata/md5-cache/acct-group/redmine-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: redmine
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e1e0c53a2a042ca7d5b3c084f0d31470
diff --git a/metadata/md5-cache/acct-group/render-0 b/metadata/md5-cache/acct-group/render-0
index 5a3198ab1391..9809bacdc994 100644
--- a/metadata/md5-cache/acct-group/render-0
+++ b/metadata/md5-cache/acct-group/render-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: render
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=141ce6e52ae209dc1e4812a47c68c24c
diff --git a/metadata/md5-cache/acct-group/rspamd-0 b/metadata/md5-cache/acct-group/rspamd-0
index 5a2e2ec1d071..c7aecbb98ba8 100644
--- a/metadata/md5-cache/acct-group/rspamd-0
+++ b/metadata/md5-cache/acct-group/rspamd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for rspamd - Rapid spam filtering system
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2d7be109ae40148389cd9a1956d7234d
diff --git a/metadata/md5-cache/acct-group/rstudio-server-0 b/metadata/md5-cache/acct-group/rstudio-server-0
index 28d439c559da..f4cb1adc3d98 100644
--- a/metadata/md5-cache/acct-group/rstudio-server-0
+++ b/metadata/md5-cache/acct-group/rstudio-server-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for sci-mathematics/rstudio
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e26c106ae4cd9bb7027b3222b64cf4f4
diff --git a/metadata/md5-cache/acct-group/rtkit-0 b/metadata/md5-cache/acct-group/rtkit-0
index a3899a76e230..5c2fda49482e 100644
--- a/metadata/md5-cache/acct-group/rtkit-0
+++ b/metadata/md5-cache/acct-group/rtkit-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Realtime Policy and Watchdog Daemon
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=544ef464e978937b47790cdd5f445b9f
diff --git a/metadata/md5-cache/acct-group/shellinaboxd-0 b/metadata/md5-cache/acct-group/shellinaboxd-0
index bce28f91f32e..d9531746cf01 100644
--- a/metadata/md5-cache/acct-group/shellinaboxd-0
+++ b/metadata/md5-cache/acct-group/shellinaboxd-0
@@ -3,5 +3,5 @@ DESCRIPTION=shellinabox group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=451f2183513582ce207d322a277d6330
diff --git a/metadata/md5-cache/acct-group/slurm-0 b/metadata/md5-cache/acct-group/slurm-0
index 8f032a56819e..84d7e8b843cb 100644
--- a/metadata/md5-cache/acct-group/slurm-0
+++ b/metadata/md5-cache/acct-group/slurm-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the slurm - Highly Scalable Resource Manager
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=87f9289a48adf386a0fbb41a68c65141
diff --git a/metadata/md5-cache/acct-group/smtpd-0 b/metadata/md5-cache/acct-group/smtpd-0
index 0a8df26cf3c9..72133c59e3b3 100644
--- a/metadata/md5-cache/acct-group/smtpd-0
+++ b/metadata/md5-cache/acct-group/smtpd-0
@@ -3,5 +3,5 @@ DESCRIPTION=daemon group for smtpd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c30685a7882b878d64668f0bfd9cc15c
diff --git a/metadata/md5-cache/acct-group/smtpq-0 b/metadata/md5-cache/acct-group/smtpq-0
index bc4b73c35c71..c157c6febd2d 100644
--- a/metadata/md5-cache/acct-group/smtpq-0
+++ b/metadata/md5-cache/acct-group/smtpq-0
@@ -3,5 +3,5 @@ DESCRIPTION=queue group for smtpd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f833d30e72519019b0761d9c895c03ac
diff --git a/metadata/md5-cache/acct-group/sogo-0 b/metadata/md5-cache/acct-group/sogo-0
index fca6e2a66411..cc838751d900 100644
--- a/metadata/md5-cache/acct-group/sogo-0
+++ b/metadata/md5-cache/acct-group/sogo-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for gnustep-apps/sogo
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4870abd9dbeb608f86178895139c90ec
diff --git a/metadata/md5-cache/acct-group/spectrum-0 b/metadata/md5-cache/acct-group/spectrum-0
index d02d774ff333..66d9ee216d6c 100644
--- a/metadata/md5-cache/acct-group/spectrum-0
+++ b/metadata/md5-cache/acct-group/spectrum-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Spectrum messaging transport
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=5e2dc3b7d066c85bb0235650b7fa011b
diff --git a/metadata/md5-cache/acct-group/spire-0 b/metadata/md5-cache/acct-group/spire-0
index 14370850bf7e..7e90d2ff7b20 100644
--- a/metadata/md5-cache/acct-group/spire-0
+++ b/metadata/md5-cache/acct-group/spire-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: spire
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=796313075561b9165534a586dc7ec080
diff --git a/metadata/md5-cache/acct-group/sqlgrey-0 b/metadata/md5-cache/acct-group/sqlgrey-0
index 0a94fdba1460..2d069c15cd5e 100644
--- a/metadata/md5-cache/acct-group/sqlgrey-0
+++ b/metadata/md5-cache/acct-group/sqlgrey-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for SQLGrey
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=7a4b933013e060b790b5c866ad69e748
diff --git a/metadata/md5-cache/acct-group/squid-0 b/metadata/md5-cache/acct-group/squid-0
index 63560e924eb2..b8d89d344d06 100644
--- a/metadata/md5-cache/acct-group/squid-0
+++ b/metadata/md5-cache/acct-group/squid-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: squid
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d62ae3398b0ef61de754e048c9483274
diff --git a/metadata/md5-cache/acct-group/sshd-0 b/metadata/md5-cache/acct-group/sshd-0
index 61d0872517e1..a75561b5d11f 100644
--- a/metadata/md5-cache/acct-group/sshd-0
+++ b/metadata/md5-cache/acct-group/sshd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: sshd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=806fe511e66eff6943cb9b40e5f0d87a
diff --git a/metadata/md5-cache/acct-group/stdiscosrv-0 b/metadata/md5-cache/acct-group/stdiscosrv-0
index a301362626d3..f0535f40a011 100644
--- a/metadata/md5-cache/acct-group/stdiscosrv-0
+++ b/metadata/md5-cache/acct-group/stdiscosrv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Syncthing discovery server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=5eac0e1089e8a2a06ba47f663a9ac5be
diff --git a/metadata/md5-cache/acct-group/steamcmd-0 b/metadata/md5-cache/acct-group/steamcmd-0
index 63138d7e64bf..5dc98adbf4bc 100644
--- a/metadata/md5-cache/acct-group/steamcmd-0
+++ b/metadata/md5-cache/acct-group/steamcmd-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the SteamCMD server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f88a4e6b8c7ed4e23c410b7c5d103cc1
diff --git a/metadata/md5-cache/acct-group/strelaysrv-0 b/metadata/md5-cache/acct-group/strelaysrv-0
index 53bbb7cbe494..3d721a9cbb22 100644
--- a/metadata/md5-cache/acct-group/strelaysrv-0
+++ b/metadata/md5-cache/acct-group/strelaysrv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Syncthing relay server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6962ba1fd37accc2190900fee6eea651
diff --git a/metadata/md5-cache/acct-group/stubby-0 b/metadata/md5-cache/acct-group/stubby-0
index dae58f3e7ea9..1882038c0e86 100644
--- a/metadata/md5-cache/acct-group/stubby-0
+++ b/metadata/md5-cache/acct-group/stubby-0
@@ -3,5 +3,5 @@ DESCRIPTION=Stubby program group (from net-dns/getdns)
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c2fb213ff5be584d746ef5a6def4ecb8
diff --git a/metadata/md5-cache/acct-group/stunnel-0 b/metadata/md5-cache/acct-group/stunnel-0
index 76eead435cb8..6e3464632112 100644
--- a/metadata/md5-cache/acct-group/stunnel-0
+++ b/metadata/md5-cache/acct-group/stunnel-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for stunnel
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3046d020a1e659da9ccef029ae395d56
diff --git a/metadata/md5-cache/acct-group/suricata-0 b/metadata/md5-cache/acct-group/suricata-0
index 4bee78ea5876..3e90de4f06e6 100644
--- a/metadata/md5-cache/acct-group/suricata-0
+++ b/metadata/md5-cache/acct-group/suricata-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for Suricata IDS
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=316bb514b720d956eba6153835e561e3
diff --git a/metadata/md5-cache/acct-group/swift-0 b/metadata/md5-cache/acct-group/swift-0
index dc312fff187b..837038158c4b 100644
--- a/metadata/md5-cache/acct-group/swift-0
+++ b/metadata/md5-cache/acct-group/swift-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: swift
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f85c78533012f1083d50060e1809ee47
diff --git a/metadata/md5-cache/acct-group/syncthing-0 b/metadata/md5-cache/acct-group/syncthing-0
index 4e0bfd643f79..4280bf3be666 100644
--- a/metadata/md5-cache/acct-group/syncthing-0
+++ b/metadata/md5-cache/acct-group/syncthing-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-p2p/syncthing server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9bab7067558a254e4301f6e26b97f00c
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0 b/metadata/md5-cache/acct-group/systemd-coredump-0
index bb43d04a006f..ea329d6e1dc4 100644
--- a/metadata/md5-cache/acct-group/systemd-coredump-0
+++ b/metadata/md5-cache/acct-group/systemd-coredump-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-coredump
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ba03881d70141240f8785a9ebe9b635a
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0 b/metadata/md5-cache/acct-group/systemd-journal-0
index 0622ba5697d4..b4463b340af5 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-0
+++ b/metadata/md5-cache/acct-group/systemd-journal-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-journal
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ee731e89b3add67d993214231cd448f4
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0 b/metadata/md5-cache/acct-group/systemd-journal-remote-0
index af6937f6e4ff..8ae7fed1668c 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-remote-0
+++ b/metadata/md5-cache/acct-group/systemd-journal-remote-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-journal-remote
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b35bee456dacb3def84bb3102b9b9e16
diff --git a/metadata/md5-cache/acct-group/systemd-network-0 b/metadata/md5-cache/acct-group/systemd-network-0
index 655edef11d7b..fa903640b93b 100644
--- a/metadata/md5-cache/acct-group/systemd-network-0
+++ b/metadata/md5-cache/acct-group/systemd-network-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-network
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6105dc422955de35899eb33e050ed61d
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0 b/metadata/md5-cache/acct-group/systemd-resolve-0
index 9fcc8d8c23a4..1978c0893335 100644
--- a/metadata/md5-cache/acct-group/systemd-resolve-0
+++ b/metadata/md5-cache/acct-group/systemd-resolve-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-resolve
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e4c7a1f08798faad650421105d7f17ec
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0 b/metadata/md5-cache/acct-group/systemd-timesync-0
index f9c5fdd64ca0..9ca4b1edcc0c 100644
--- a/metadata/md5-cache/acct-group/systemd-timesync-0
+++ b/metadata/md5-cache/acct-group/systemd-timesync-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-timesync
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=783e72d966ed013fde696067340924fd
diff --git a/metadata/md5-cache/acct-group/tape-0 b/metadata/md5-cache/acct-group/tape-0
index 53f0ed10a33f..70b83c2c2bb0 100644
--- a/metadata/md5-cache/acct-group/tape-0
+++ b/metadata/md5-cache/acct-group/tape-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: tape
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a34fcb3d861044abe1f10d14972f679b
diff --git a/metadata/md5-cache/acct-group/teamspeak-0 b/metadata/md5-cache/acct-group/teamspeak-0
index 88ab8ae672a9..8033763eb426 100644
--- a/metadata/md5-cache/acct-group/teamspeak-0
+++ b/metadata/md5-cache/acct-group/teamspeak-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the TeamSpeak server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3a4f071d6d3d7964df6e732cc98586e2
diff --git a/metadata/md5-cache/acct-group/telegraf-0 b/metadata/md5-cache/acct-group/telegraf-0
new file mode 100644
index 000000000000..56eaf987e360
--- /dev/null
+++ b/metadata/md5-cache/acct-group/telegraf-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: telegraf
+EAPI=7
+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
+SLOT=0
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d7fee1e42b2bd162089d2dd2b97b2861
diff --git a/metadata/md5-cache/acct-group/tor-0 b/metadata/md5-cache/acct-group/tor-0
index aae803aa1cdd..5a9309911446 100644
--- a/metadata/md5-cache/acct-group/tor-0
+++ b/metadata/md5-cache/acct-group/tor-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for tor daemon
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=bb2f9bd4b191e31cef73e1d664fd6edc
diff --git a/metadata/md5-cache/acct-group/tox-0 b/metadata/md5-cache/acct-group/tox-0
index aae0a5628470..851bcbe5affb 100644
--- a/metadata/md5-cache/acct-group/tox-0
+++ b/metadata/md5-cache/acct-group/tox-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group management for package net-libs/tox
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=638d52c97c3ee3959bebdc852b489031
diff --git a/metadata/md5-cache/acct-group/transmission-0 b/metadata/md5-cache/acct-group/transmission-0
index ea2f07f421fc..8d5c57683523 100644
--- a/metadata/md5-cache/acct-group/transmission-0
+++ b/metadata/md5-cache/acct-group/transmission-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: transmission
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=52e48d456339135bb9b1f5353a1e32bc
diff --git a/metadata/md5-cache/acct-group/tss-0 b/metadata/md5-cache/acct-group/tss-0
index 0e269364a470..3e4331f78d94 100644
--- a/metadata/md5-cache/acct-group/tss-0
+++ b/metadata/md5-cache/acct-group/tss-0
@@ -3,5 +3,5 @@ DESCRIPTION=Trusted Software Stack for TPMs group
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4ed6162a29f40de863ac3aaae7173cd0
diff --git a/metadata/md5-cache/acct-group/tty-0 b/metadata/md5-cache/acct-group/tty-0
index 86200bdab0e2..e036c4cd301b 100644
--- a/metadata/md5-cache/acct-group/tty-0
+++ b/metadata/md5-cache/acct-group/tty-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: tty
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=98be503d8e76c6be62c7f29d4f87d16d
diff --git a/metadata/md5-cache/acct-group/turnserver-0 b/metadata/md5-cache/acct-group/turnserver-0
index 6064c59bc00b..9699b7213da1 100644
--- a/metadata/md5-cache/acct-group/turnserver-0
+++ b/metadata/md5-cache/acct-group/turnserver-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for a turn server like coturn
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=420f0043feaf030bdfe8c952a308746e
diff --git a/metadata/md5-cache/acct-group/unifi-0 b/metadata/md5-cache/acct-group/unifi-0
index 25a4331082b5..a7a21c4ccea4 100644
--- a/metadata/md5-cache/acct-group/unifi-0
+++ b/metadata/md5-cache/acct-group/unifi-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the UniFi controller
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=bcbabd7f7349a20158d04360d8ce3435
diff --git a/metadata/md5-cache/acct-group/unrealircd-0 b/metadata/md5-cache/acct-group/unrealircd-0
index 497a01836713..6b08030ec499 100644
--- a/metadata/md5-cache/acct-group/unrealircd-0
+++ b/metadata/md5-cache/acct-group/unrealircd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: unrealircd
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=260b93e0bc769d63e90462b952aebf54
diff --git a/metadata/md5-cache/acct-group/uptimed-0 b/metadata/md5-cache/acct-group/uptimed-0
index b2e738b8493a..9c4eea46db16 100644
--- a/metadata/md5-cache/acct-group/uptimed-0
+++ b/metadata/md5-cache/acct-group/uptimed-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: uptimed
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8c781ce9bdbe5f5e6dabcf07ab1f663c
diff --git a/metadata/md5-cache/acct-group/usb-0 b/metadata/md5-cache/acct-group/usb-0
index 1ad2068f781c..2ae961ee0685 100644
--- a/metadata/md5-cache/acct-group/usb-0
+++ b/metadata/md5-cache/acct-group/usb-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: usb
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9b830fe958385f19197b60db5157c4af
diff --git a/metadata/md5-cache/acct-group/utmp-0 b/metadata/md5-cache/acct-group/utmp-0
index a07a0ad696e0..9c30657ccdec 100644
--- a/metadata/md5-cache/acct-group/utmp-0
+++ b/metadata/md5-cache/acct-group/utmp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: utmp
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8aa5529f38fbd076d459ebaab1b8d848
diff --git a/metadata/md5-cache/acct-group/varnish-0 b/metadata/md5-cache/acct-group/varnish-0
index 66648782fe87..486b5cd04843 100644
--- a/metadata/md5-cache/acct-group/varnish-0
+++ b/metadata/md5-cache/acct-group/varnish-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for varnish
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=5ada394e0e0f0f0690ec54d87b3958a9
diff --git a/metadata/md5-cache/acct-group/video-0 b/metadata/md5-cache/acct-group/video-0
index 3be095979142..01a349a4620f 100644
--- a/metadata/md5-cache/acct-group/video-0
+++ b/metadata/md5-cache/acct-group/video-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: video
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a5f2bb515d6492d449d0c5ebee5ec612
diff --git a/metadata/md5-cache/acct-group/vpopmail-0 b/metadata/md5-cache/acct-group/vpopmail-0
index 8753a624a8d5..4617598e59c9 100644
--- a/metadata/md5-cache/acct-group/vpopmail-0
+++ b/metadata/md5-cache/acct-group/vpopmail-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: vpopmail
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fcca992c8d81e5fa05c251d359ab8178
diff --git a/metadata/md5-cache/acct-group/wheel-0 b/metadata/md5-cache/acct-group/wheel-0
index 515a039148ec..468f33b0c706 100644
--- a/metadata/md5-cache/acct-group/wheel-0
+++ b/metadata/md5-cache/acct-group/wheel-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: wheel
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8bf40a3acada0f03317db54cd1ba0704
diff --git a/metadata/md5-cache/acct-group/x2goprint-0 b/metadata/md5-cache/acct-group/x2goprint-0
index 27ec46a66f0b..deaecee20434 100644
--- a/metadata/md5-cache/acct-group/x2goprint-0
+++ b/metadata/md5-cache/acct-group/x2goprint-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-misc/x2goserver
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8553a78b4086dbd2c28c62eec795b329
diff --git a/metadata/md5-cache/acct-group/x2gouser-0 b/metadata/md5-cache/acct-group/x2gouser-0
index 20b1d0bda5b9..9e9d3c73f54c 100644
--- a/metadata/md5-cache/acct-group/x2gouser-0
+++ b/metadata/md5-cache/acct-group/x2gouser-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-misc/x2goserver
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fa743ebbaa3f98cfe19f78eda378a3bf
diff --git a/metadata/md5-cache/acct-group/xrootd-0 b/metadata/md5-cache/acct-group/xrootd-0
index a9b79481eebd..329193dcb829 100644
--- a/metadata/md5-cache/acct-group/xrootd-0
+++ b/metadata/md5-cache/acct-group/xrootd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the XRootD server
EAPI=7
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
SLOT=0
-_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-group 7126fca4f6bf56620d1ce1fd317066fc user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d22ad4de39ccbe4aea539999ff793f0f
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index ca89097c1e25..3369986c7896 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/alias-0 b/metadata/md5-cache/acct-user/alias-0
index 201842e97a62..562a89987275 100644
--- a/metadata/md5-cache/acct-user/alias-0
+++ b/metadata/md5-cache/acct-user/alias-0
@@ -5,5 +5,5 @@ EAPI=7
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=acct-group/nofiles acct-group/qmail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a6dc9632cc4d39a30252d9a4e172da62
diff --git a/metadata/md5-cache/acct-user/amule-0 b/metadata/md5-cache/acct-user/amule-0
index 7c458f58d84e..92feaf198e28 100644
--- a/metadata/md5-cache/acct-user/amule-0
+++ b/metadata/md5-cache/acct-user/amule-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/amule
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d7602bcb3b8a44d7426c59f7d1ddd815
diff --git a/metadata/md5-cache/acct-user/asterisk-0 b/metadata/md5-cache/acct-user/asterisk-0
index 2a779892ed6c..f58da6282508 100644
--- a/metadata/md5-cache/acct-user/asterisk-0
+++ b/metadata/md5-cache/acct-user/asterisk-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/asterisk acct-group/dialout
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2cb4dfe68980ce27765c6f11fed1ddff
diff --git a/metadata/md5-cache/acct-user/automx2-0 b/metadata/md5-cache/acct-user/automx2-0
index c6392e530869..5aa20d4aa7e6 100644
--- a/metadata/md5-cache/acct-user/automx2-0
+++ b/metadata/md5-cache/acct-user/automx2-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/automx2
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=eb1c547ae1a542486893f3d70a4d1901
diff --git a/metadata/md5-cache/acct-user/avahi-0 b/metadata/md5-cache/acct-user/avahi-0
index 9deb2dd95f23..724db4e02d94 100644
--- a/metadata/md5-cache/acct-user/avahi-0
+++ b/metadata/md5-cache/acct-user/avahi-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/avahi
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fe1e61d7b398ef70199a38057417b8be
diff --git a/metadata/md5-cache/acct-user/avahi-autoipd-0 b/metadata/md5-cache/acct-user/avahi-autoipd-0
index 1a79e73cc7ef..eba3b5098524 100644
--- a/metadata/md5-cache/acct-user/avahi-autoipd-0
+++ b/metadata/md5-cache/acct-user/avahi-autoipd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/avahi-autoipd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=de2a2c95003266d0aa483347041cacd7
diff --git a/metadata/md5-cache/acct-user/bacula-0 b/metadata/md5-cache/acct-user/bacula-0
index 411329fbda67..df69be08346c 100644
--- a/metadata/md5-cache/acct-user/bacula-0
+++ b/metadata/md5-cache/acct-user/bacula-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/bacula acct-group/disk acct-group/tape acct-group/cdrom
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8ccc4d94d15137e771ae0ebd7e7bf805
diff --git a/metadata/md5-cache/acct-user/bedrock-0 b/metadata/md5-cache/acct-user/bedrock-0
index 4be271c75ecf..383e72996dd2 100644
--- a/metadata/md5-cache/acct-user/bedrock-0
+++ b/metadata/md5-cache/acct-user/bedrock-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/bedrock
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3f8ec9e85b86677c585a2f89cca60046
diff --git a/metadata/md5-cache/acct-user/bitcoin-0 b/metadata/md5-cache/acct-user/bitcoin-0
index de66c58facbc..891a056d1439 100644
--- a/metadata/md5-cache/acct-user/bitcoin-0
+++ b/metadata/md5-cache/acct-user/bitcoin-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/bitcoin
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=63daf8d0596a4fe92999f1b83c123aed
diff --git a/metadata/md5-cache/acct-user/burp-0 b/metadata/md5-cache/acct-user/burp-0
index 4dff771c09e2..58ef7a73afdd 100644
--- a/metadata/md5-cache/acct-user/burp-0
+++ b/metadata/md5-cache/acct-user/burp-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/burp
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6d5ad09bfdcb80ddfad920300080b71c
diff --git a/metadata/md5-cache/acct-user/ceph-0 b/metadata/md5-cache/acct-user/ceph-0
index fe9efaa47b8c..c453af67159c 100644
--- a/metadata/md5-cache/acct-user/ceph-0
+++ b/metadata/md5-cache/acct-user/ceph-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/ceph
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3ea4d95b910d1defb89b0590a04e70b5
diff --git a/metadata/md5-cache/acct-user/cinder-0 b/metadata/md5-cache/acct-user/cinder-0
index 6a4223d23a55..590104f2997d 100644
--- a/metadata/md5-cache/acct-user/cinder-0
+++ b/metadata/md5-cache/acct-user/cinder-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/cinder
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d6043b82f68f3c23301104449ea4661c
diff --git a/metadata/md5-cache/acct-user/clamav-0 b/metadata/md5-cache/acct-user/clamav-0
index 2a4b76e0b1c5..609974976986 100644
--- a/metadata/md5-cache/acct-user/clamav-0
+++ b/metadata/md5-cache/acct-user/clamav-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/clamav
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=7e3ed2c42096b55e9f6b00112ff16ea3
diff --git a/metadata/md5-cache/acct-user/cmd5checkpw-0 b/metadata/md5-cache/acct-user/cmd5checkpw-0
index 17431a7885e3..be992e54f9cc 100644
--- a/metadata/md5-cache/acct-user/cmd5checkpw-0
+++ b/metadata/md5-cache/acct-user/cmd5checkpw-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nofiles
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b3bd6d514a014afdc4b40ced00a31acd
diff --git a/metadata/md5-cache/acct-user/davfs2-0 b/metadata/md5-cache/acct-user/davfs2-0
index 2f08411a21c4..a86acf588028 100644
--- a/metadata/md5-cache/acct-user/davfs2-0
+++ b/metadata/md5-cache/acct-user/davfs2-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/davfs2
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=87845b0c86cbda824a799fc0210bf97a
diff --git a/metadata/md5-cache/acct-user/ddclient-0 b/metadata/md5-cache/acct-user/ddclient-0
index a0e4083e4bf4..de26a4695d06 100644
--- a/metadata/md5-cache/acct-user/ddclient-0
+++ b/metadata/md5-cache/acct-user/ddclient-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/ddclient
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d86bd0b3f264fb5ab1fb618e168e0dca
diff --git a/metadata/md5-cache/acct-user/deluge-0 b/metadata/md5-cache/acct-user/deluge-0
index 3e5c669b2513..bf1bc23d5ba4 100644
--- a/metadata/md5-cache/acct-user/deluge-0
+++ b/metadata/md5-cache/acct-user/deluge-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/deluge
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=95a25b0e84916ba6641636082d15e280
diff --git a/metadata/md5-cache/acct-user/dhcp-0 b/metadata/md5-cache/acct-user/dhcp-0
index 6c2747666e0e..9c8780383109 100644
--- a/metadata/md5-cache/acct-user/dhcp-0
+++ b/metadata/md5-cache/acct-user/dhcp-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/dhcp
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=99676fd2e887a56cb54e592ffc4581ba
diff --git a/metadata/md5-cache/acct-user/dnscrypt-proxy-0 b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
index 0eaf272c4800..6e6459665e80 100644
--- a/metadata/md5-cache/acct-user/dnscrypt-proxy-0
+++ b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/dnscrypt-proxy
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=664f3ddcc9b1899890ab516f81480642
diff --git a/metadata/md5-cache/acct-user/dnsmasq_exporter-0 b/metadata/md5-cache/acct-user/dnsmasq_exporter-0
index f35afaf3397f..d9e1c93d2929 100644
--- a/metadata/md5-cache/acct-user/dnsmasq_exporter-0
+++ b/metadata/md5-cache/acct-user/dnsmasq_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/dnsmasq_exporter
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=abe24aad9ee1c69bc1bcd6369a985591
diff --git a/metadata/md5-cache/acct-user/dovecot-0 b/metadata/md5-cache/acct-user/dovecot-0
index fa5983586ec6..765987ec6b7f 100644
--- a/metadata/md5-cache/acct-user/dovecot-0
+++ b/metadata/md5-cache/acct-user/dovecot-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/dovecot
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=410a5f6c83a833093b98d1dcc966b9d3
diff --git a/metadata/md5-cache/acct-user/dovenull-0 b/metadata/md5-cache/acct-user/dovenull-0
index c4d647d5d192..aee638d36f6d 100644
--- a/metadata/md5-cache/acct-user/dovenull-0
+++ b/metadata/md5-cache/acct-user/dovenull-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/dovenull
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1405c886d5e56f301892eb8186bf856a
diff --git a/metadata/md5-cache/acct-user/elasticsearch-0 b/metadata/md5-cache/acct-user/elasticsearch-0
index 5561093b7453..f00c6d69529e 100644
--- a/metadata/md5-cache/acct-user/elasticsearch-0
+++ b/metadata/md5-cache/acct-user/elasticsearch-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/elasticsearch
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=303abe68eab98e1ff3e83bf8d269d09f
diff --git a/metadata/md5-cache/acct-user/epmd-0 b/metadata/md5-cache/acct-user/epmd-0
index e3956c20c1fd..f110e4ac14ad 100644
--- a/metadata/md5-cache/acct-user/epmd-0
+++ b/metadata/md5-cache/acct-user/epmd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/epmd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=21e41d553c9516c34dc1cd72b7603dd8
diff --git a/metadata/md5-cache/acct-user/fetchmail-0 b/metadata/md5-cache/acct-user/fetchmail-0
index 898f778d20c6..be469eab788f 100644
--- a/metadata/md5-cache/acct-user/fetchmail-0
+++ b/metadata/md5-cache/acct-user/fetchmail-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/fetchmail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d3d21fa443b96154c83f83c4aa174fcf
diff --git a/metadata/md5-cache/acct-user/fhem-0 b/metadata/md5-cache/acct-user/fhem-0
index 51737a649294..eefb3f3f1a5f 100644
--- a/metadata/md5-cache/acct-user/fhem-0
+++ b/metadata/md5-cache/acct-user/fhem-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/fhem
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3b4533de1c110132852cbfc485473ecb
diff --git a/metadata/md5-cache/acct-user/ftp-0 b/metadata/md5-cache/acct-user/ftp-0
index d42de771db84..4c3c783b5db8 100644
--- a/metadata/md5-cache/acct-user/ftp-0
+++ b/metadata/md5-cache/acct-user/ftp-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/ftp
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c4f7d3e9113e45d0b587307d6bfd74d0
diff --git a/metadata/md5-cache/acct-user/geneweb-0 b/metadata/md5-cache/acct-user/geneweb-0
index 5e7645a7cdb5..761576c48a99 100644
--- a/metadata/md5-cache/acct-user/geneweb-0
+++ b/metadata/md5-cache/acct-user/geneweb-0
@@ -4,5 +4,5 @@ EAPI=7
KEYWORDS=~amd64 ~x86
RDEPEND=acct-group/geneweb
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=312ab0b641a11e8ce91489d1bd34e222
diff --git a/metadata/md5-cache/acct-user/gerbera-0 b/metadata/md5-cache/acct-user/gerbera-0
index 14420f784955..e89c9a41c80c 100644
--- a/metadata/md5-cache/acct-user/gerbera-0
+++ b/metadata/md5-cache/acct-user/gerbera-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/gerbera acct-group/video
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9f69a3f13d8a9d7013b2eac1e6e140c8
diff --git a/metadata/md5-cache/acct-user/git-0 b/metadata/md5-cache/acct-user/git-0
index 819bca9aec31..743f40398a2d 100644
--- a/metadata/md5-cache/acct-user/git-0
+++ b/metadata/md5-cache/acct-user/git-0
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
RDEPEND=acct-group/git
REQUIRED_USE=^^ ( gitea gitolite )
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b2689a0b55698bda7d9c38bcb1e12720
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0 b/metadata/md5-cache/acct-user/gkrellmd-0
index 9d7ea542c5fe..6982374f636a 100644
--- a/metadata/md5-cache/acct-user/gkrellmd-0
+++ b/metadata/md5-cache/acct-user/gkrellmd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/gkrellmd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=95088eb9093ebb5b9a0eea9f07b01fbd
diff --git a/metadata/md5-cache/acct-user/glance-0 b/metadata/md5-cache/acct-user/glance-0
index d3a32cbd508f..95a53912e022 100644
--- a/metadata/md5-cache/acct-user/glance-0
+++ b/metadata/md5-cache/acct-user/glance-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/glance
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9416bc7d36dc727632cb6aa9603ac385
diff --git a/metadata/md5-cache/acct-user/graylog-0 b/metadata/md5-cache/acct-user/graylog-0
index 330a170fe6f6..8795adc93d0a 100644
--- a/metadata/md5-cache/acct-user/graylog-0
+++ b/metadata/md5-cache/acct-user/graylog-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/graylog
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f4f6774da99a8d45052b4f35cea6b420
diff --git a/metadata/md5-cache/acct-user/gvm-0 b/metadata/md5-cache/acct-user/gvm-0
index 4fe98bc1a749..d73e28e546b9 100644
--- a/metadata/md5-cache/acct-user/gvm-0
+++ b/metadata/md5-cache/acct-user/gvm-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/gvm
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d58e41b5f6230ddc22ae336017d8044e
diff --git a/metadata/md5-cache/acct-user/heat-0 b/metadata/md5-cache/acct-user/heat-0
index e1f661db28ad..f45288874266 100644
--- a/metadata/md5-cache/acct-user/heat-0
+++ b/metadata/md5-cache/acct-user/heat-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/heat
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=11c65953154c88544415d29a37a27e01
diff --git a/metadata/md5-cache/acct-user/i2p-0 b/metadata/md5-cache/acct-user/i2p-0
index 4dd2738abb53..bedc77b9511b 100644
--- a/metadata/md5-cache/acct-user/i2p-0
+++ b/metadata/md5-cache/acct-user/i2p-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/i2p
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ffb6d95288de187e81445f9e9083ac34
diff --git a/metadata/md5-cache/acct-user/i2pd-0 b/metadata/md5-cache/acct-user/i2pd-0
index 23dd706b172e..4280fe1d9676 100644
--- a/metadata/md5-cache/acct-user/i2pd-0
+++ b/metadata/md5-cache/acct-user/i2pd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/i2pd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=876c9cfdec60e447bf4070dd2d4b07c5
diff --git a/metadata/md5-cache/acct-user/inspircd-0 b/metadata/md5-cache/acct-user/inspircd-0
index 72309acb210c..1498e4db25fb 100644
--- a/metadata/md5-cache/acct-user/inspircd-0
+++ b/metadata/md5-cache/acct-user/inspircd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/inspircd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e040a118122eb50acb419310a419f329
diff --git a/metadata/md5-cache/acct-user/ipfs-0 b/metadata/md5-cache/acct-user/ipfs-0
index bf52c1dd1ebc..40b4a96b76be 100644
--- a/metadata/md5-cache/acct-user/ipfs-0
+++ b/metadata/md5-cache/acct-user/ipfs-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/ipfs
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f906d1058b0bf264e48aba67119f235d
diff --git a/metadata/md5-cache/acct-user/ippl-0 b/metadata/md5-cache/acct-user/ippl-0
index e0669d4ca8b6..23bbb65a2239 100644
--- a/metadata/md5-cache/acct-user/ippl-0
+++ b/metadata/md5-cache/acct-user/ippl-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nofiles
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2b03815f1289c6d60dc12e9ea2d438cc
diff --git a/metadata/md5-cache/acct-user/keystone-0 b/metadata/md5-cache/acct-user/keystone-0
index c4fa9239f54e..f9f4c29d2bb0 100644
--- a/metadata/md5-cache/acct-user/keystone-0
+++ b/metadata/md5-cache/acct-user/keystone-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/keystone
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3a6966e2aab7f774aec7fe695f11b9ef
diff --git a/metadata/md5-cache/acct-user/kibana-0 b/metadata/md5-cache/acct-user/kibana-0
index 807ff6b3abf9..706fb648e3c1 100644
--- a/metadata/md5-cache/acct-user/kibana-0
+++ b/metadata/md5-cache/acct-user/kibana-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/kibana
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=17c0ae0e9d9cf04c935f3f27d1585e94
diff --git a/metadata/md5-cache/acct-user/knot-0 b/metadata/md5-cache/acct-user/knot-0
index 80888cdcc3a6..936cf50303c7 100644
--- a/metadata/md5-cache/acct-user/knot-0
+++ b/metadata/md5-cache/acct-user/knot-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/knot
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=19cc5d10a4269199806b14aaa3a2733b
diff --git a/metadata/md5-cache/acct-user/kube-apiserver-0 b/metadata/md5-cache/acct-user/kube-apiserver-0
index 174280260fc6..f5e37d0b5816 100644
--- a/metadata/md5-cache/acct-user/kube-apiserver-0
+++ b/metadata/md5-cache/acct-user/kube-apiserver-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/kube-apiserver
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b2c05b11f8d99eaec8009cf7d506e3f3
diff --git a/metadata/md5-cache/acct-user/kube-controller-manager-0 b/metadata/md5-cache/acct-user/kube-controller-manager-0
index de0985f8781a..89303da171a0 100644
--- a/metadata/md5-cache/acct-user/kube-controller-manager-0
+++ b/metadata/md5-cache/acct-user/kube-controller-manager-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/kube-controller-manager
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c2333c8e1e62b798bb4a2911e28a3f98
diff --git a/metadata/md5-cache/acct-user/kube-scheduler-0 b/metadata/md5-cache/acct-user/kube-scheduler-0
index f97ec55a129a..b313cba886db 100644
--- a/metadata/md5-cache/acct-user/kube-scheduler-0
+++ b/metadata/md5-cache/acct-user/kube-scheduler-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/kube-scheduler
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=0005497e87e852466a3be9c9eeb300fc
diff --git a/metadata/md5-cache/acct-user/lighttpd-0 b/metadata/md5-cache/acct-user/lighttpd-0
new file mode 100644
index 000000000000..089414012624
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lighttpd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for lighttpd
+EAPI=7
+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=acct-group/lighttpd
+SLOT=0
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=a59ead6de77457aacb7b168bd38c53ed
diff --git a/metadata/md5-cache/acct-user/logstash-0 b/metadata/md5-cache/acct-user/logstash-0
index 9d2d145f200e..53fb5f8af05b 100644
--- a/metadata/md5-cache/acct-user/logstash-0
+++ b/metadata/md5-cache/acct-user/logstash-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/logstash
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6d0dd20248b7b73eba0835bdf2613f2a
diff --git a/metadata/md5-cache/acct-user/mail-0 b/metadata/md5-cache/acct-user/mail-0
index 2188058734c5..47d5f70487a3 100644
--- a/metadata/md5-cache/acct-user/mail-0
+++ b/metadata/md5-cache/acct-user/mail-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/mail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1d648f45e2af351c6b06ac91ecc6f5e6
diff --git a/metadata/md5-cache/acct-user/man-1 b/metadata/md5-cache/acct-user/man-1
index e025d87d1e32..9dbe38ed3349 100644
--- a/metadata/md5-cache/acct-user/man-1
+++ b/metadata/md5-cache/acct-user/man-1
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/man
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f4f877dbc66a56f26588e4322cff4b53
diff --git a/metadata/md5-cache/acct-user/memcached-0 b/metadata/md5-cache/acct-user/memcached-0
index bf97586e479e..c563ac3fa857 100644
--- a/metadata/md5-cache/acct-user/memcached-0
+++ b/metadata/md5-cache/acct-user/memcached-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/memcached
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=09dd2fd3cceb6e638f77c53828575dba
diff --git a/metadata/md5-cache/acct-user/messagebus-0 b/metadata/md5-cache/acct-user/messagebus-0
index ca00998c0ed6..f8947438f5bd 100644
--- a/metadata/md5-cache/acct-user/messagebus-0
+++ b/metadata/md5-cache/acct-user/messagebus-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/messagebus
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c6ab10cec28a405c686c8707a0441c32
diff --git a/metadata/md5-cache/acct-user/milter-regex-0 b/metadata/md5-cache/acct-user/milter-regex-0
index 00ea4ff61ec6..2206e9c2b745 100644
--- a/metadata/md5-cache/acct-user/milter-regex-0
+++ b/metadata/md5-cache/acct-user/milter-regex-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/milter-regex
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a64af6abe097819ccb40d8574f847f37
diff --git a/metadata/md5-cache/acct-user/minecraft-0 b/metadata/md5-cache/acct-user/minecraft-0
index c1c2dbf8020c..58d708a61430 100644
--- a/metadata/md5-cache/acct-user/minecraft-0
+++ b/metadata/md5-cache/acct-user/minecraft-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/minecraft
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c18cfc57e0d08d970e7644237883921e
diff --git a/metadata/md5-cache/acct-user/minetest-0 b/metadata/md5-cache/acct-user/minetest-0
index efd8676de254..5a2456e9aabe 100644
--- a/metadata/md5-cache/acct-user/minetest-0
+++ b/metadata/md5-cache/acct-user/minetest-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/minetest
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4dd006a88748daeda668f4396841e395
diff --git a/metadata/md5-cache/acct-user/mongodb-0 b/metadata/md5-cache/acct-user/mongodb-0
index 916e888adbda..4ca6d4ef5a86 100644
--- a/metadata/md5-cache/acct-user/mongodb-0
+++ b/metadata/md5-cache/acct-user/mongodb-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/mongodb
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c5fc42b4f3b7a0dcbe425dda0edd2a34
diff --git a/metadata/md5-cache/acct-user/mosquitto-0 b/metadata/md5-cache/acct-user/mosquitto-0
index 1cd2d6447ef3..33f58bef2992 100644
--- a/metadata/md5-cache/acct-user/mosquitto-0
+++ b/metadata/md5-cache/acct-user/mosquitto-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/mosquitto
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=cffcacbe9db1fef3910dd5b12020fb47
diff --git a/metadata/md5-cache/acct-user/mpd-0 b/metadata/md5-cache/acct-user/mpd-0
index 90d05089423c..29443a247300 100644
--- a/metadata/md5-cache/acct-user/mpd-0
+++ b/metadata/md5-cache/acct-user/mpd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/audio
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6ddca8eb3f013ebcc84913721712b86b
diff --git a/metadata/md5-cache/acct-user/msmtpd-0 b/metadata/md5-cache/acct-user/msmtpd-0
index 36bdccc6840c..fd9c0ba92ec9 100644
--- a/metadata/md5-cache/acct-user/msmtpd-0
+++ b/metadata/md5-cache/acct-user/msmtpd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/msmtpd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1e86c8bfdb0678c2fee1fdd75c5c990b
diff --git a/metadata/md5-cache/acct-user/munin-0 b/metadata/md5-cache/acct-user/munin-0
index e20674f6fcc1..ade2f1d32b7e 100644
--- a/metadata/md5-cache/acct-user/munin-0
+++ b/metadata/md5-cache/acct-user/munin-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/munin
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b202c3be345a236c40672091da76dd7c
diff --git a/metadata/md5-cache/acct-user/munin-async-0 b/metadata/md5-cache/acct-user/munin-async-0
index 501e4383b079..edf96b9b2c6e 100644
--- a/metadata/md5-cache/acct-user/munin-async-0
+++ b/metadata/md5-cache/acct-user/munin-async-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/munin
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b59ba19aeddb7456315bca439cb06e87
diff --git a/metadata/md5-cache/acct-user/murmur-0 b/metadata/md5-cache/acct-user/murmur-0
index 14d84a0ae35b..4111fa316bec 100644
--- a/metadata/md5-cache/acct-user/murmur-0
+++ b/metadata/md5-cache/acct-user/murmur-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/murmur
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=12f204ef54bfecc67ed3baced394ea62
diff --git a/metadata/md5-cache/acct-user/mysql-0 b/metadata/md5-cache/acct-user/mysql-0
index ac006dd53f82..66578da9b795 100644
--- a/metadata/md5-cache/acct-user/mysql-0
+++ b/metadata/md5-cache/acct-user/mysql-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/mysql
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2239e70edb93016adb4f07506c64ee6f
diff --git a/metadata/md5-cache/acct-user/mythtv-0 b/metadata/md5-cache/acct-user/mythtv-0
index ac94a796d62d..0d7ffb46ad4c 100644
--- a/metadata/md5-cache/acct-user/mythtv-0
+++ b/metadata/md5-cache/acct-user/mythtv-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/mythtv acct-group/video acct-group/audio acct-group/cdrom acct-group/tty
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c91ae523ceb1d752843373fba89a3203
diff --git a/metadata/md5-cache/acct-user/nagios-0 b/metadata/md5-cache/acct-user/nagios-0
index 7f64396d8ec4..9869b4536228 100644
--- a/metadata/md5-cache/acct-user/nagios-0
+++ b/metadata/md5-cache/acct-user/nagios-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nagios
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8583f9acf3e2d3f01c1055593828839b
diff --git a/metadata/md5-cache/acct-user/netbox-0 b/metadata/md5-cache/acct-user/netbox-0
index 33e5a1c5057e..234c359f6a70 100644
--- a/metadata/md5-cache/acct-user/netbox-0
+++ b/metadata/md5-cache/acct-user/netbox-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/netbox
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=7576a9a5839d05ecefdb466a6d9d8972
diff --git a/metadata/md5-cache/acct-user/netdata-0 b/metadata/md5-cache/acct-user/netdata-0
index 2a010980bb25..e628a41932fe 100644
--- a/metadata/md5-cache/acct-user/netdata-0
+++ b/metadata/md5-cache/acct-user/netdata-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/netdata
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=90cafa4f9013c288db6bdbaeff811456
diff --git a/metadata/md5-cache/acct-user/neutron-0 b/metadata/md5-cache/acct-user/neutron-0
index 3ca978663160..32e032dd2d5d 100644
--- a/metadata/md5-cache/acct-user/neutron-0
+++ b/metadata/md5-cache/acct-user/neutron-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/neutron
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a97deaa3ef65b7cd8085c81caaa2ac4e
diff --git a/metadata/md5-cache/acct-user/nova-0 b/metadata/md5-cache/acct-user/nova-0
index 204be5a119bc..1015ebca1f93 100644
--- a/metadata/md5-cache/acct-user/nova-0
+++ b/metadata/md5-cache/acct-user/nova-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nova
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f97663b2cf9abbd1a770cda5d05a4ad0
diff --git a/metadata/md5-cache/acct-user/nsd-0 b/metadata/md5-cache/acct-user/nsd-0
index 3d8577f22939..7634707691a9 100644
--- a/metadata/md5-cache/acct-user/nsd-0
+++ b/metadata/md5-cache/acct-user/nsd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nsd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ba4d4367098caae927e815d356790903
diff --git a/metadata/md5-cache/acct-user/ntp-0 b/metadata/md5-cache/acct-user/ntp-0
index 9e2d72e07e76..12a56bc60b36 100644
--- a/metadata/md5-cache/acct-user/ntp-0
+++ b/metadata/md5-cache/acct-user/ntp-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/ntp
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3004c4f4ed33c8637fec813897554580
diff --git a/metadata/md5-cache/acct-user/oidentd-0 b/metadata/md5-cache/acct-user/oidentd-0
index e62193a857e9..b985172a6ff7 100644
--- a/metadata/md5-cache/acct-user/oidentd-0
+++ b/metadata/md5-cache/acct-user/oidentd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/oidentd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9328cdf4e7c095b9937d25ac2d448f61
diff --git a/metadata/md5-cache/acct-user/opendkim-0 b/metadata/md5-cache/acct-user/opendkim-0
index a78ca55544c2..e96442d57e42 100644
--- a/metadata/md5-cache/acct-user/opendkim-0
+++ b/metadata/md5-cache/acct-user/opendkim-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/opendkim
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6c02567e067b47e8f47a8ff80e0b1570
diff --git a/metadata/md5-cache/acct-user/openntpd-0 b/metadata/md5-cache/acct-user/openntpd-0
index be2b519af9c6..6b8193cbf58b 100644
--- a/metadata/md5-cache/acct-user/openntpd-0
+++ b/metadata/md5-cache/acct-user/openntpd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/openntpd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=af2b15ac04e4ed3cddeda127e12891c9
diff --git a/metadata/md5-cache/acct-user/openrct2-0 b/metadata/md5-cache/acct-user/openrct2-0
index 576ccef57e58..30d354c6d0d2 100644
--- a/metadata/md5-cache/acct-user/openrct2-0
+++ b/metadata/md5-cache/acct-user/openrct2-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/openrct2
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=741b03e814e139a6e26667284eae9ee2
diff --git a/metadata/md5-cache/acct-user/pcscd-0 b/metadata/md5-cache/acct-user/pcscd-0
index ffe728da2f03..56ed6916356a 100644
--- a/metadata/md5-cache/acct-user/pcscd-0
+++ b/metadata/md5-cache/acct-user/pcscd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/pcscd acct-group/openct acct-group/usb
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c5cad9823484267ce60585127ed6f723
diff --git a/metadata/md5-cache/acct-user/pdnsd-0 b/metadata/md5-cache/acct-user/pdnsd-0
index d5cb2ec8d700..c3ca58188fe5 100644
--- a/metadata/md5-cache/acct-user/pdnsd-0
+++ b/metadata/md5-cache/acct-user/pdnsd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/pdnsd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=964d062348fa7d70ba4f5b0f6c20b9f1
diff --git a/metadata/md5-cache/acct-user/placement-0 b/metadata/md5-cache/acct-user/placement-0
index f7e513f192fe..27f319fdc7de 100644
--- a/metadata/md5-cache/acct-user/placement-0
+++ b/metadata/md5-cache/acct-user/placement-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/placement
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=504e2951bc35a7a7cc780250b0ea85c5
diff --git a/metadata/md5-cache/acct-user/plex-0 b/metadata/md5-cache/acct-user/plex-0
index 956a58ef3837..f5610fb35ebb 100644
--- a/metadata/md5-cache/acct-user/plex-0
+++ b/metadata/md5-cache/acct-user/plex-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/plex acct-group/video
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=bb35790cd1068367d8155f8ad1f812ad
diff --git a/metadata/md5-cache/acct-user/polkitd-0 b/metadata/md5-cache/acct-user/polkitd-0
index 9c7122b6761d..50150e0275a6 100644
--- a/metadata/md5-cache/acct-user/polkitd-0
+++ b/metadata/md5-cache/acct-user/polkitd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/polkitd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3463586ac30a8004b934afdd01793c63
diff --git a/metadata/md5-cache/acct-user/postfix-0 b/metadata/md5-cache/acct-user/postfix-0
index 4a6eb55d4053..f78c5e3e9242 100644
--- a/metadata/md5-cache/acct-user/postfix-0
+++ b/metadata/md5-cache/acct-user/postfix-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/postfix acct-group/mail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ace42b1b52b11ce3fca4e74696128ae3
diff --git a/metadata/md5-cache/acct-user/postmaster-0 b/metadata/md5-cache/acct-user/postmaster-0
index 140521fcd1fd..b1ea662be1d4 100644
--- a/metadata/md5-cache/acct-user/postmaster-0
+++ b/metadata/md5-cache/acct-user/postmaster-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/mail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4215e7d391c4c711aba698a9da6a2d73
diff --git a/metadata/md5-cache/acct-user/prometheus-0 b/metadata/md5-cache/acct-user/prometheus-0
index bfa80bd3ba39..2892b7395427 100644
--- a/metadata/md5-cache/acct-user/prometheus-0
+++ b/metadata/md5-cache/acct-user/prometheus-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/prometheus
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9f6c97821a2a4bd2fdfb1f2489403ca4
diff --git a/metadata/md5-cache/acct-user/qemu-0 b/metadata/md5-cache/acct-user/qemu-0
index e3e806c4d497..d36a5c7ddfd3 100644
--- a/metadata/md5-cache/acct-user/qemu-0
+++ b/metadata/md5-cache/acct-user/qemu-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/qemu acct-group/kvm
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=304c14d1dbbc88dfb27654b70a662ec8
diff --git a/metadata/md5-cache/acct-user/qmaild-0 b/metadata/md5-cache/acct-user/qmaild-0
index de84c51e0043..56e5a57c17a7 100644
--- a/metadata/md5-cache/acct-user/qmaild-0
+++ b/metadata/md5-cache/acct-user/qmaild-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nofiles
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d07d4f89ab57965e77186d189d82d2d2
diff --git a/metadata/md5-cache/acct-user/qmaill-0 b/metadata/md5-cache/acct-user/qmaill-0
index 0d2301c6ddb5..8b6581a7dcf5 100644
--- a/metadata/md5-cache/acct-user/qmaill-0
+++ b/metadata/md5-cache/acct-user/qmaill-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nofiles
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3185f07915a9a2be7b6b7c750dd39d55
diff --git a/metadata/md5-cache/acct-user/qmailp-0 b/metadata/md5-cache/acct-user/qmailp-0
index cb6e02a64d39..f65d3f9f5ffa 100644
--- a/metadata/md5-cache/acct-user/qmailp-0
+++ b/metadata/md5-cache/acct-user/qmailp-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/nofiles
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3c364586371293b358d7c5db712d50db
diff --git a/metadata/md5-cache/acct-user/qmailq-0 b/metadata/md5-cache/acct-user/qmailq-0
index 6f5e4290f5e2..3ac3dfd12034 100644
--- a/metadata/md5-cache/acct-user/qmailq-0
+++ b/metadata/md5-cache/acct-user/qmailq-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/qmail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fb8f4cc88f20795bf95ddc0894e0126e
diff --git a/metadata/md5-cache/acct-user/qmailr-0 b/metadata/md5-cache/acct-user/qmailr-0
index f49a20ae94af..a7e25218b6c1 100644
--- a/metadata/md5-cache/acct-user/qmailr-0
+++ b/metadata/md5-cache/acct-user/qmailr-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/qmail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2d694a197491c1a775c3d6edafb438bc
diff --git a/metadata/md5-cache/acct-user/qmails-0 b/metadata/md5-cache/acct-user/qmails-0
index 713d796a4c1f..626db0c583d1 100644
--- a/metadata/md5-cache/acct-user/qmails-0
+++ b/metadata/md5-cache/acct-user/qmails-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/qmail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1e214bd119838a68a2dbef40ef41a3ed
diff --git a/metadata/md5-cache/acct-user/quassel-0 b/metadata/md5-cache/acct-user/quassel-0
index de5f0140700b..b608620c43a8 100644
--- a/metadata/md5-cache/acct-user/quassel-0
+++ b/metadata/md5-cache/acct-user/quassel-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/quassel
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=76051c211dc8b54b81563228b39a1789
diff --git a/metadata/md5-cache/acct-user/radius-0 b/metadata/md5-cache/acct-user/radius-0
index 26287036fe87..473809bb777f 100644
--- a/metadata/md5-cache/acct-user/radius-0
+++ b/metadata/md5-cache/acct-user/radius-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/radius
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a5ffb56316ad0511d0ac09a90286eb87
diff --git a/metadata/md5-cache/acct-user/redis-0 b/metadata/md5-cache/acct-user/redis-0
index b69727481901..94c007c083d4 100644
--- a/metadata/md5-cache/acct-user/redis-0
+++ b/metadata/md5-cache/acct-user/redis-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/redis
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9a325403a24df1ed7a18a938f3b99c56
diff --git a/metadata/md5-cache/acct-user/redmine-0 b/metadata/md5-cache/acct-user/redmine-0
index c82c60d11fb5..1d51dacf7c3e 100644
--- a/metadata/md5-cache/acct-user/redmine-0
+++ b/metadata/md5-cache/acct-user/redmine-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/redmine
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=26ffa625c4c40d55a45384ca87480f37
diff --git a/metadata/md5-cache/acct-user/rspamd-0 b/metadata/md5-cache/acct-user/rspamd-0
index cf5307a3fcb8..9b998213ff65 100644
--- a/metadata/md5-cache/acct-user/rspamd-0
+++ b/metadata/md5-cache/acct-user/rspamd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/rspamd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8ef85c33e47a45fb8341965ae2d48878
diff --git a/metadata/md5-cache/acct-user/rstudio-server-0 b/metadata/md5-cache/acct-user/rstudio-server-0
index 69d0b88df499..9eb9c9ab9bb9 100644
--- a/metadata/md5-cache/acct-user/rstudio-server-0
+++ b/metadata/md5-cache/acct-user/rstudio-server-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/rstudio-server
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=44b71968a9eb18296740f7ee6c07e727
diff --git a/metadata/md5-cache/acct-user/rtkit-0 b/metadata/md5-cache/acct-user/rtkit-0
index 5f788aa89b94..44e10eaa4365 100644
--- a/metadata/md5-cache/acct-user/rtkit-0
+++ b/metadata/md5-cache/acct-user/rtkit-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/rtkit
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ce8e63018323dcc6970bb34d49f6ea6c
diff --git a/metadata/md5-cache/acct-user/shellinaboxd-0 b/metadata/md5-cache/acct-user/shellinaboxd-0
index da73020a70c0..027040989377 100644
--- a/metadata/md5-cache/acct-user/shellinaboxd-0
+++ b/metadata/md5-cache/acct-user/shellinaboxd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/shellinaboxd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3e1deca43f9d5ff055633eb7355f95ca
diff --git a/metadata/md5-cache/acct-user/slurm-0 b/metadata/md5-cache/acct-user/slurm-0
index b71a703e4982..e40535aaf3c3 100644
--- a/metadata/md5-cache/acct-user/slurm-0
+++ b/metadata/md5-cache/acct-user/slurm-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/slurm
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=d98d09d56f76bb3d14f24c681267e864
diff --git a/metadata/md5-cache/acct-user/smtpd-0 b/metadata/md5-cache/acct-user/smtpd-0
index 880b936c358b..671873f32c7f 100644
--- a/metadata/md5-cache/acct-user/smtpd-0
+++ b/metadata/md5-cache/acct-user/smtpd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/smtpd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=120edf4c9f64015098547ab471d5b858
diff --git a/metadata/md5-cache/acct-user/smtpq-0 b/metadata/md5-cache/acct-user/smtpq-0
index 4abffcb03dae..af134701dc59 100644
--- a/metadata/md5-cache/acct-user/smtpq-0
+++ b/metadata/md5-cache/acct-user/smtpq-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/smtpq
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3057581131fe31493029dd09def448f6
diff --git a/metadata/md5-cache/acct-user/sogo-0 b/metadata/md5-cache/acct-user/sogo-0
index 05f654de6452..bdd03db4735d 100644
--- a/metadata/md5-cache/acct-user/sogo-0
+++ b/metadata/md5-cache/acct-user/sogo-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/sogo
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1984103c73075728ffbbf8ce1a3c60fd
diff --git a/metadata/md5-cache/acct-user/spectrum-0 b/metadata/md5-cache/acct-user/spectrum-0
index ac9d45d02513..61d8899f6ba8 100644
--- a/metadata/md5-cache/acct-user/spectrum-0
+++ b/metadata/md5-cache/acct-user/spectrum-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/spectrum
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=167827f76c5814d0cc53ed5e693f8012
diff --git a/metadata/md5-cache/acct-user/spire-0 b/metadata/md5-cache/acct-user/spire-0
index 2ea0dd74d87b..57acc42b526f 100644
--- a/metadata/md5-cache/acct-user/spire-0
+++ b/metadata/md5-cache/acct-user/spire-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/spire
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=9f81947a940b670dab44596013c4050f
diff --git a/metadata/md5-cache/acct-user/sqlgrey-0 b/metadata/md5-cache/acct-user/sqlgrey-0
index 554c62204c80..5a01539acca8 100644
--- a/metadata/md5-cache/acct-user/sqlgrey-0
+++ b/metadata/md5-cache/acct-user/sqlgrey-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/sqlgrey
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=66779f3c0aeae37521d3522d18abab1a
diff --git a/metadata/md5-cache/acct-user/squid-0 b/metadata/md5-cache/acct-user/squid-0
index 7bc13ac35f9f..7570b59cefa5 100644
--- a/metadata/md5-cache/acct-user/squid-0
+++ b/metadata/md5-cache/acct-user/squid-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/squid
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a4c915cdf7ca96c4c14527bffee0ca76
diff --git a/metadata/md5-cache/acct-user/sshd-0 b/metadata/md5-cache/acct-user/sshd-0
index de73c2b39609..d8ebb6ee2ce6 100644
--- a/metadata/md5-cache/acct-user/sshd-0
+++ b/metadata/md5-cache/acct-user/sshd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/sshd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c0e562c32c3c8bdc95c2071812b7eba3
diff --git a/metadata/md5-cache/acct-user/stdiscosrv-0 b/metadata/md5-cache/acct-user/stdiscosrv-0
index 5900b4554ea9..908c458d1d5a 100644
--- a/metadata/md5-cache/acct-user/stdiscosrv-0
+++ b/metadata/md5-cache/acct-user/stdiscosrv-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/stdiscosrv
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=af44b8606b4a40dab02f5496afe79489
diff --git a/metadata/md5-cache/acct-user/steamcmd-0 b/metadata/md5-cache/acct-user/steamcmd-0
index 4f2e6f6d1315..7aaf081006ef 100644
--- a/metadata/md5-cache/acct-user/steamcmd-0
+++ b/metadata/md5-cache/acct-user/steamcmd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/steamcmd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=591b1ef8bc9e8ccf51a31347d7992feb
diff --git a/metadata/md5-cache/acct-user/strelaysrv-0 b/metadata/md5-cache/acct-user/strelaysrv-0
index 3e345e3f2c2a..81c0f673bc28 100644
--- a/metadata/md5-cache/acct-user/strelaysrv-0
+++ b/metadata/md5-cache/acct-user/strelaysrv-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/strelaysrv
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6f884243bd1b2d10493d2442712e1830
diff --git a/metadata/md5-cache/acct-user/stubby-0 b/metadata/md5-cache/acct-user/stubby-0
index cfb44e8fcceb..7a214128e499 100644
--- a/metadata/md5-cache/acct-user/stubby-0
+++ b/metadata/md5-cache/acct-user/stubby-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/stubby
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2cc36dff823cef42ec536a7f273db8b2
diff --git a/metadata/md5-cache/acct-user/stunnel-0 b/metadata/md5-cache/acct-user/stunnel-0
index 9401cf2efa57..d08902efdb3f 100644
--- a/metadata/md5-cache/acct-user/stunnel-0
+++ b/metadata/md5-cache/acct-user/stunnel-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/stunnel
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=91214634055c416fb8d3f2ef0da0d833
diff --git a/metadata/md5-cache/acct-user/suricata-0 b/metadata/md5-cache/acct-user/suricata-0
index 6102a26b0e14..9da69f1efa8b 100644
--- a/metadata/md5-cache/acct-user/suricata-0
+++ b/metadata/md5-cache/acct-user/suricata-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/suricata
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1a4af599eb72284e98c4b177bdc8a464
diff --git a/metadata/md5-cache/acct-user/swift-0 b/metadata/md5-cache/acct-user/swift-0
index 3141156bd086..300414875999 100644
--- a/metadata/md5-cache/acct-user/swift-0
+++ b/metadata/md5-cache/acct-user/swift-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/swift
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=eefcf5a89122294a34b43f0e3588f15e
diff --git a/metadata/md5-cache/acct-user/syncthing-0 b/metadata/md5-cache/acct-user/syncthing-0
index fa4b82e73870..4214d1acfb6c 100644
--- a/metadata/md5-cache/acct-user/syncthing-0
+++ b/metadata/md5-cache/acct-user/syncthing-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/syncthing
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=28de358efd6c5e041eec5a14fe5c25b3
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0 b/metadata/md5-cache/acct-user/systemd-coredump-0
index 04f36a95eb54..b2dc4201bce2 100644
--- a/metadata/md5-cache/acct-user/systemd-coredump-0
+++ b/metadata/md5-cache/acct-user/systemd-coredump-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/systemd-coredump
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3c1db608ce4a5189047921934cb12aab
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0 b/metadata/md5-cache/acct-user/systemd-journal-remote-0
index 7e9ea5da54e3..e4be6f18804b 100644
--- a/metadata/md5-cache/acct-user/systemd-journal-remote-0
+++ b/metadata/md5-cache/acct-user/systemd-journal-remote-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/systemd-journal-remote
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2c76c24b248182149eb428205a72a917
diff --git a/metadata/md5-cache/acct-user/systemd-network-0 b/metadata/md5-cache/acct-user/systemd-network-0
index 5b53328fe119..fd291aee4ee0 100644
--- a/metadata/md5-cache/acct-user/systemd-network-0
+++ b/metadata/md5-cache/acct-user/systemd-network-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/systemd-network
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3eab8e08499459d01f181d06e7d2950c
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0 b/metadata/md5-cache/acct-user/systemd-resolve-0
index 6529bf867979..661922fc5325 100644
--- a/metadata/md5-cache/acct-user/systemd-resolve-0
+++ b/metadata/md5-cache/acct-user/systemd-resolve-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/systemd-resolve
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=3f1c651b891b7a8f654b421abfe5d4e9
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0 b/metadata/md5-cache/acct-user/systemd-timesync-0
index 8e211f3d9ae7..343f00b03588 100644
--- a/metadata/md5-cache/acct-user/systemd-timesync-0
+++ b/metadata/md5-cache/acct-user/systemd-timesync-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/systemd-timesync
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=bb13fbcbb1217c0817d90f47c25a46c6
diff --git a/metadata/md5-cache/acct-user/teamspeak-0 b/metadata/md5-cache/acct-user/teamspeak-0
index 58f1ea1d0796..bb8679be7fd0 100644
--- a/metadata/md5-cache/acct-user/teamspeak-0
+++ b/metadata/md5-cache/acct-user/teamspeak-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/teamspeak
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=670ff1b616f780dba69a63050697332e
diff --git a/metadata/md5-cache/acct-user/telegraf-0 b/metadata/md5-cache/acct-user/telegraf-0
new file mode 100644
index 000000000000..00832aa9a34c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/telegraf-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for telegraf
+EAPI=7
+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=acct-group/telegraf
+SLOT=0
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=ca11caddf344e5bf7ed334f2c28deea2
diff --git a/metadata/md5-cache/acct-user/tor-0 b/metadata/md5-cache/acct-user/tor-0
index 3ac304d73536..59a6bd8c44d1 100644
--- a/metadata/md5-cache/acct-user/tor-0
+++ b/metadata/md5-cache/acct-user/tor-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/tor
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=88b8f5dccdb3fb45557da818184c62ba
diff --git a/metadata/md5-cache/acct-user/tox-0 b/metadata/md5-cache/acct-user/tox-0
index d3387fafe9e1..ee1f37ddd3f9 100644
--- a/metadata/md5-cache/acct-user/tox-0
+++ b/metadata/md5-cache/acct-user/tox-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/tox
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e53ed4490b105e31f83d6061c6826d26
diff --git a/metadata/md5-cache/acct-user/transmission-1 b/metadata/md5-cache/acct-user/transmission-1
index 15d2882940a6..645c69a6911b 100644
--- a/metadata/md5-cache/acct-user/transmission-1
+++ b/metadata/md5-cache/acct-user/transmission-1
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/transmission
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=0b44ab1a37773fa981c764be3a1a84d7
diff --git a/metadata/md5-cache/acct-user/tss-0 b/metadata/md5-cache/acct-user/tss-0
index 57133f87139f..1503a741f805 100644
--- a/metadata/md5-cache/acct-user/tss-0
+++ b/metadata/md5-cache/acct-user/tss-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/tss
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=48f11bb648ce27ee71d39c1fbb79e27d
diff --git a/metadata/md5-cache/acct-user/turnserver-0 b/metadata/md5-cache/acct-user/turnserver-0
index 0ef2684b4175..6dbebe6fc422 100644
--- a/metadata/md5-cache/acct-user/turnserver-0
+++ b/metadata/md5-cache/acct-user/turnserver-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/turnserver
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=4013a7a3d0ccb561a03e9f7792891b50
diff --git a/metadata/md5-cache/acct-user/unifi-0 b/metadata/md5-cache/acct-user/unifi-0
index aaac1ff9fd0d..a09139052ec5 100644
--- a/metadata/md5-cache/acct-user/unifi-0
+++ b/metadata/md5-cache/acct-user/unifi-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/unifi
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=308d3988d0b53f474b2418af37538bea
diff --git a/metadata/md5-cache/acct-user/unrealircd-0 b/metadata/md5-cache/acct-user/unrealircd-0
index e4b0b0a9f669..6be3959c2069 100644
--- a/metadata/md5-cache/acct-user/unrealircd-0
+++ b/metadata/md5-cache/acct-user/unrealircd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/unrealircd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b186b3ee3ae34799a7b3a365e580b64c
diff --git a/metadata/md5-cache/acct-user/uptimed-0 b/metadata/md5-cache/acct-user/uptimed-0
index c3a83482cfae..e82af7e306fe 100644
--- a/metadata/md5-cache/acct-user/uptimed-0
+++ b/metadata/md5-cache/acct-user/uptimed-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/uptimed
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=51d9d153c86d94b7131084e6848be1f1
diff --git a/metadata/md5-cache/acct-user/varnish-0 b/metadata/md5-cache/acct-user/varnish-0
index e17da0d5eb6d..8a6a3de3c3de 100644
--- a/metadata/md5-cache/acct-user/varnish-0
+++ b/metadata/md5-cache/acct-user/varnish-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/varnish
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=795ff016e74f7b1c5620a2af8d0c7fda
diff --git a/metadata/md5-cache/acct-user/vpopmail-0 b/metadata/md5-cache/acct-user/vpopmail-0
index 7630d469337d..401f01285e98 100644
--- a/metadata/md5-cache/acct-user/vpopmail-0
+++ b/metadata/md5-cache/acct-user/vpopmail-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/vpopmail
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=95eaba3e880520e2ece0fa8eb6cb97c8
diff --git a/metadata/md5-cache/acct-user/x2goprint-0 b/metadata/md5-cache/acct-user/x2goprint-0
index 5dedd74e08fa..5fcd2d7b675e 100644
--- a/metadata/md5-cache/acct-user/x2goprint-0
+++ b/metadata/md5-cache/acct-user/x2goprint-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/x2goprint
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2ce6100ae1b09fd234d52a2f537b14f0
diff --git a/metadata/md5-cache/acct-user/x2gouser-0 b/metadata/md5-cache/acct-user/x2gouser-0
index 8f989ddf899a..5e2de29b0d06 100644
--- a/metadata/md5-cache/acct-user/x2gouser-0
+++ b/metadata/md5-cache/acct-user/x2gouser-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/x2gouser
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=2f734bc54cbcfeb1d639491e16706866
diff --git a/metadata/md5-cache/acct-user/xrootd-0 b/metadata/md5-cache/acct-user/xrootd-0
index 5a792abe51f6..04cf4aa5dc91 100644
--- a/metadata/md5-cache/acct-user/xrootd-0
+++ b/metadata/md5-cache/acct-user/xrootd-0
@@ -4,5 +4,5 @@ EAPI=7
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=acct-group/xrootd
SLOT=0
-_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=acct-user 0a104863ecbb0c7d2e255d005bcf9578 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=5d4f18bf413bb1083dca6eac53dcf136
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 6e4ea8e4fbc9..d990b43f1299 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
deleted file mode 100644
index 9a4719e063b1..000000000000
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.25.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.25.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-libs/libxml2-2.9.1 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gtk module for bridging AT-SPI to Atk
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2+
-RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.25.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-accessibility/at-spi2-core-2.25.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-atk/2.26/at-spi2-atk-2.26.2.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=e528c1348d5f3e76470914db30cf44e0
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2
deleted file mode 100644
index c2a477e09280..000000000000
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.8 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=D-Bus accessibility specifications and registration daemon
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=X +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-core/2.26/at-spi2-core-2.26.2.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=700d801a68a428d61a32bbcff2bc9743
diff --git a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3 b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
index 25446df31986..b2e073fb3959 100644
--- a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
+++ b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=>=app-accessibility/flite-1.4
SLOT=0
SRC_URI=mirror://sourceforge/eflite/eflite-0.4.1.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=e25d762ee8942b3c9d855e2e00a8ba80
diff --git a/metadata/md5-cache/app-accessibility/orca-3.32.0 b/metadata/md5-cache/app-accessibility/orca-3.32.0
deleted file mode 100644
index 5a90a67d66c7..000000000000
--- a/metadata/md5-cache/app-accessibility/orca-3.32.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/liblouis[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Extensible screen reader that provides access to the desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Orca
-IUSE=+braille +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/liblouis[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/atk[introspection] >=dev-python/pyatspi-2.32[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/orca/3.32/orca-3.32.0.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=61060ec0c82c20e87c18ee0c64a52b6b
diff --git a/metadata/md5-cache/app-accessibility/orca-3.32.0-r1 b/metadata/md5-cache/app-accessibility/orca-3.32.0-r1
new file mode 100644
index 000000000000..69e643184371
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/orca-3.32.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) ) >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Extensible screen reader that provides access to the desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Orca
+IUSE=+braille +python_targets_python3_6 +python_single_target_python3_6
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) ) dev-libs/atk[introspection] python_single_target_python3_6? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_6(-)] >=dev-python/pyatspi-2.32[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/orca/3.32/orca-3.32.0.tar.xz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab1e15a2abb3d51bb1769f232c7e2ab9
diff --git a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1 b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
index 9c85392e71bc..f59322793648 100644
--- a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
+++ b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/sphinxbase-0.7[static-libs?,python?,python_targets_p
REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
SLOT=0
SRC_URI=mirror://sourceforge/cmusphinx/sphinx3-0.8.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=2d82e172cbf8da7613c07e95d2fc8026
diff --git a/metadata/md5-cache/app-accessibility/sphinxbase-0.8 b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
index 1ffc63568df4..a0ea34170dad 100644
--- a/metadata/md5-cache/app-accessibility/sphinxbase-0.8
+++ b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
@@ -10,5 +10,5 @@ RDEPEND=media-sound/pulseaudio lapack? ( virtual/lapack ) python? ( python_targe
REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
SLOT=0
SRC_URI=mirror://sourceforge/cmusphinx/sphinxbase-0.8.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=5dec7b385c8010a79a35215f1d25295c
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index e6a3157a66fd..960c8017d6e0 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/abrt-2.12.0-r1 b/metadata/md5-cache/app-admin/abrt-2.12.0-r2
similarity index 58%
rename from metadata/md5-cache/app-admin/abrt-2.12.0-r1
rename to metadata/md5-cache/app-admin/abrt-2.12.0-r2
index 194f11f5526e..6844d9a156d6 100644
--- a/metadata/md5-cache/app-admin/abrt-2.12.0-r1
+++ b/metadata/md5-cache/app-admin/abrt-2.12.0-r2
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-text/asciidoc app-text/xmlto dev-libs/satyr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 python_single_target_python3_6? ( dev-libs/satyr[python_targets_python3_6(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
DESCRIPTION=Automatic bug detection and reporting tool
EAPI=6
HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
IUSE=debug selinux +python_targets_python3_6 +python_single_target_python3_6
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-arch/cpio app-arch/rpm dev-libs/elfutils dev-libs/json-c:0= dev-python/argcomplete[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/argh[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/humanize[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-apps/util-linux >=sys-devel/gdb-7
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-arch/cpio app-arch/rpm dev-libs/elfutils dev-libs/json-c:0= sys-apps/util-linux >=sys-devel/gdb-7 python_single_target_python3_6? ( dev-python/argcomplete[python_targets_python3_6(-)] dev-python/argh[python_targets_python3_6(-)] dev-python/humanize[python_targets_python3_6(-)] )
REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/abrt/abrt/archive/2.12.0.tar.gz -> abrt-2.12.0.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cad895e939f9eff741d1e76b4f5a50b
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=968a1a2d9f4ac8e9b57993f875904683
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
index 85ba35d58e6b..2c95a036ae63 100644
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
+++ b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
RDEPEND=dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
SLOT=0
SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.13/aerospike-amc-community-3.6.13.all.x86_64.deb
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=6f35cc2e0e647837344984b027342838
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1 b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
index eecc2b8a543e..3e96eecd5d4c 100644
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
+++ b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64
LICENSE=Apache-2.0
SLOT=0
SRC_URI=http://www.aerospike.com/download/amc/4.0.19/artifact/linux -> aerospike-amc-community-4.0.19.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=cf40d77563db21a4e3d76a4ae324d824
diff --git a/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1 b/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
index 164cbf23e8a2..d084cb6f4fc9 100644
--- a/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
+++ b/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
@@ -1,9 +1,9 @@
DEFINED_PHASES=install postinst
DESCRIPTION=Init script to setup Amazon EC2 instance parameters
EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
KEYWORDS=-* ~amd64 ~x86
LICENSE=GPL-2
RDEPEND=net-misc/wget
SLOT=0
-_md5_=be98a79980a67e933b1b83546195f411
+_md5_=96ac3b0653cbef31d5ce1d3ba4aa0e27
diff --git a/metadata/md5-cache/app-admin/ansible-2.9.2 b/metadata/md5-cache/app-admin/ansible-2.9.2
index ca50998e26c4..d2b224032b17 100644
--- a/metadata/md5-cache/app-admin/ansible-2.9.2
+++ b/metadata/md5-cache/app-admin/ansible-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://releases.ansible.com/ansible/ansible-2.9.2.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=b93691abf0988c4d842d6fc723a344b5
diff --git a/metadata/md5-cache/app-admin/ansible-2.9.3 b/metadata/md5-cache/app-admin/ansible-2.9.3
index 07a488e4bfff..be7c87459eca 100644
--- a/metadata/md5-cache/app-admin/ansible-2.9.3
+++ b/metadata/md5-cache/app-admin/ansible-2.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://releases.ansible.com/ansible/ansible-2.9.3.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=e6e7ea917269cd67ce387652b9bcbe69
diff --git a/metadata/md5-cache/app-admin/ansible-2.9.4 b/metadata/md5-cache/app-admin/ansible-2.9.4
index aaac61c62c73..2d9934ee4658 100644
--- a/metadata/md5-cache/app-admin/ansible-2.9.4
+++ b/metadata/md5-cache/app-admin/ansible-2.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://releases.ansible.com/ansible/ansible-2.9.4.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=e6e7ea917269cd67ce387652b9bcbe69
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index c0d5d28315d1..77a6b7d0291f 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=test
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=f0051f8363efb47269d45dd3b75368c3
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.28 b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
index 1f751f2b83ca..8ffa3cab6c7e 100644
--- a/metadata/md5-cache/app-admin/ansible-cmdb-1.28
+++ b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
@@ -10,5 +10,5 @@ RDEPEND=dev-python/mako[python_targets_python3_6(-)?,-python_single_target_pytho
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.28.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=a4ffc1259cf4f0a5fab981f28d7e3dd8
diff --git a/metadata/md5-cache/app-admin/ansible-lint-4.0.1 b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
index f5b97147b8af..300c7726b0f8 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-4.0.1
+++ b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/ansible/ansible-lint/archive/v4.0.1.tar.gz -> ansible-lint-4.0.1.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=d658f6c517054d2e78be2df736673d65
diff --git a/metadata/md5-cache/app-admin/ara-0.15.0-r1 b/metadata/md5-cache/app-admin/ara-0.15.0-r1
index 93f857009e89..3d038db75cb3 100644
--- a/metadata/md5-cache/app-admin/ara-0.15.0-r1
+++ b/metadata/md5-cache/app-admin/ara-0.15.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-admin/ansible[python_targets_python3_6(-)?,-python_single_target_pyt
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/openstack/ara/archive/0.15.0.tar.gz -> ara-0.15.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=ee6a68bcdd6127201b9d39aa2364d04d
diff --git a/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1 b/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
index ce113cf83894..45e69d849a33 100644
--- a/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
+++ b/metadata/md5-cache/app-admin/bcfg2-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=app-portage/gentoolkit[python_targets_python2_7(-)?,-python_single_targe
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.2.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=6e475cac35b358dc4d44c233bfc87782
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.12 b/metadata/md5-cache/app-admin/calamares-3.2.12
index fbf81a78c7c1..ddd6f8d93644 100644
--- a/metadata/md5-cache/app-admin/calamares-3.2.12
+++ b/metadata/md5-cache/app-admin/calamares-3.2.12
@@ -1,16 +1,16 @@
BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.60.0:5
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( >=dev-qt/qttest-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) test? ( >=dev-qt/qttest-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
DESCRIPTION=Distribution-independent installer framework
EAPI=7
HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug test python_targets_python3_6
+IUSE=+networkmanager pythonqt +upower debug test +python_targets_python3_6 +python_single_target_python3_6
KEYWORDS=~amd64
LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=5
SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.12/calamares-3.2.12.tar.gz
-_eclasses_=cmake 7b250250bd1c3cc90800ed668fb87825 ecm 879e666a2784e1ba491fdf89c982915d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b kde.org 12c2d7da2a75330ff5de0154686dbf4b kde5 43b81ba8315f22f13c8461215eb0e6dd kde5-functions 7f1ffe0e976f19abc8fc9ffe0fbccafa multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffaf5649ae4c3004c71c5181dabb36b2
+_eclasses_=cmake 7b250250bd1c3cc90800ed668fb87825 ecm 879e666a2784e1ba491fdf89c982915d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b kde.org 12c2d7da2a75330ff5de0154686dbf4b kde5 43b81ba8315f22f13c8461215eb0e6dd kde5-functions 7f1ffe0e976f19abc8fc9ffe0fbccafa multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=0712ab7e8356cfc4424108436b1fbf8c
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.17.1 b/metadata/md5-cache/app-admin/calamares-3.2.17.1
deleted file mode 100644
index 821e306d5e6c..000000000000
--- a/metadata/md5-cache/app-admin/calamares-3.2.17.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Distribution-independent installer framework
-EAPI=7
-HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug test python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.17.1/calamares-3.2.17.1.tar.gz
-_eclasses_=cmake 7b250250bd1c3cc90800ed668fb87825 ecm 879e666a2784e1ba491fdf89c982915d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=675008ad96716d9bb37ec8c831d94e37
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.17.1-r1 b/metadata/md5-cache/app-admin/calamares-3.2.17.1-r1
new file mode 100644
index 000000000000..dce4b0e014e8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/calamares-3.2.17.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Distribution-independent installer framework
+EAPI=7
+HOMEPAGE=https://calamares.io
+IUSE=+networkmanager pythonqt +upower debug test +python_targets_python3_6 +python_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( sys-boot/grub:2 sys-boot/systemd-boot ) sys-boot/os-prober sys-fs/squashfs-tools sys-libs/timezone-data virtual/udev networkmanager? ( net-misc/networkmanager ) upower? ( sys-power/upower ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.17.1/calamares-3.2.17.1.tar.gz
+_eclasses_=cmake 7b250250bd1c3cc90800ed668fb87825 ecm 879e666a2784e1ba491fdf89c982915d eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0f03c7470e0eb4583148a7d49db08b5
diff --git a/metadata/md5-cache/app-admin/cancd-0.1.0-r4 b/metadata/md5-cache/app-admin/cancd-0.1.0-r4
index ccd9bc482dea..bb9f7d81a8a1 100644
--- a/metadata/md5-cache/app-admin/cancd-0.1.0-r4
+++ b/metadata/md5-cache/app-admin/cancd-0.1.0-r4
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://oss.oracle.com/projects/cancd/dist/files/source/cancd-0.1.0.tar.gz
-_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=e8f1186123503650eb470a9bf7fb68ce
diff --git a/metadata/md5-cache/app-admin/cdist-5.1.3 b/metadata/md5-cache/app-admin/cdist-5.1.3
index 7305960ae084..20c58003b24e 100644
--- a/metadata/md5-cache/app-admin/cdist-5.1.3
+++ b/metadata/md5-cache/app-admin/cdist-5.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/c/cdist/cdist-5.1.3.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=8536c52939d15b722400b2bebc04f4e6
diff --git a/metadata/md5-cache/app-admin/cdist-6.0.0 b/metadata/md5-cache/app-admin/cdist-6.0.0
index 49037d256f1f..78cd1cf5f43f 100644
--- a/metadata/md5-cache/app-admin/cdist-6.0.0
+++ b/metadata/md5-cache/app-admin/cdist-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/c/cdist/cdist-6.0.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=9a081fef5986e6dc0bd8f8f6b1aeb98b
diff --git a/metadata/md5-cache/app-admin/clustershell-1.7.3 b/metadata/md5-cache/app-admin/clustershell-1.7.3
index 8e85bc3c5d3d..dcd7777d0268 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.7.3
+++ b/metadata/md5-cache/app-admin/clustershell-1.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.7.3.tar.gz -> clustershell-1.7.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=db63610921c5b00c57310475e89d511f
diff --git a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1 b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
index d55dc78b0fd7..5167760577f7 100644
--- a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
+++ b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
DESCRIPTION=Conky weather forecast script with support for language files
EAPI=5
HOMEPAGE=https://launchpad.net/~conky-companions
@@ -10,5 +10,5 @@ RDEPEND=app-admin/conky python_single_target_python2_7? ( >=dev-lang/python-2.7.
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://launchpad.net/~conky-companions/+archive/ppa/+files/conkyforecast_2.24.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=e06c266547272f04567fd9641f82960b
diff --git a/metadata/md5-cache/app-admin/consul-1.6.2 b/metadata/md5-cache/app-admin/consul-1.6.2
index 88d6c9a6789f..994496480e70 100644
--- a/metadata/md5-cache/app-admin/consul-1.6.2
+++ b/metadata/md5-cache/app-admin/consul-1.6.2
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/consul/archive/v1.6.2.tar.gz -> consul-1.6.2.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=dbfec7eeb9bd2ececbbadd0eb1805750
diff --git a/metadata/md5-cache/app-admin/consul-1.6.3 b/metadata/md5-cache/app-admin/consul-1.6.3
index e3ea3c217120..ba094b74fb4e 100644
--- a/metadata/md5-cache/app-admin/consul-1.6.3
+++ b/metadata/md5-cache/app-admin/consul-1.6.3
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/consul/archive/v1.6.3.tar.gz -> consul-1.6.3.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1b5ec1f77750207e190f6394850a375d
diff --git a/metadata/md5-cache/app-admin/consul-template-0.23.0 b/metadata/md5-cache/app-admin/consul-template-0.23.0
index c63c306730dd..bac7ee478837 100644
--- a/metadata/md5-cache/app-admin/consul-template-0.23.0
+++ b/metadata/md5-cache/app-admin/consul-template-0.23.0
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.23.0.tar.gz -> consul-template-0.23.0.tar.gz https://github.com/BurntSushi/toml/archive/v0.3.1.tar.gz -> github.com-BurntSushi-toml-v0.3.1.tar.gz https://github.com/armon/go-metrics/archive/ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz -> github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz https://github.com/frankban/quicktest/archive/v1.4.0.tar.gz -> github.com-frankban-quicktest-v1.4.0.tar.gz https://github.com/golang/snappy/archive/v0.0.1.tar.gz -> github.com-golang-snappy-v0.0.1.tar.gz https://github.com/google/btree/archive/v1.0.0.tar.gz -> github.com-google-btree-v1.0.0.tar.gz https://github.com/hashicorp/consul/archive/v1.2.0.tar.gz -> github.com-hashicorp-consul-v1.2.0.tar.gz https://github.com/hashicorp/errwrap/archive/v1.0.0.tar.gz -> github.com-hashicorp-errwrap-v1.0.0.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/v0.5.1.tar.gz -> github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz https://github.com/hashicorp/go-gatedio/archive/v0.5.0.tar.gz -> github.com-hashicorp-go-gatedio-v0.5.0.tar.gz https://github.com/hashicorp/go-hclog/archive/v0.9.2.tar.gz -> github.com-hashicorp-go-hclog-v0.9.2.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/v1.1.0.tar.gz -> github.com-hashicorp-go-immutable-radix-v1.1.0.tar.gz https://github.com/hashicorp/go-msgpack/archive/v0.5.5.tar.gz -> github.com-hashicorp-go-msgpack-v0.5.5.tar.gz https://github.com/hashicorp/go-multierror/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-multierror-v1.0.0.tar.gz https://github.com/hashicorp/go-retryablehttp/archive/v0.6.2.tar.gz -> github.com-hashicorp-go-retryablehttp-v0.6.2.tar.gz https://github.com/hashicorp/go-rootcerts/archive/v1.0.1.tar.gz -> github.com-hashicorp-go-rootcerts-v1.0.1.tar.gz https://github.com/hashicorp/go-sockaddr/archive/v1.0.2.tar.gz -> github.com-hashicorp-go-sockaddr-v1.0.2.tar.gz https://github.com/hashicorp/go-syslog/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-syslog-v1.0.0.tar.gz https://github.com/hashicorp/golang-lru/archive/v0.5.3.tar.gz -> github.com-hashicorp-golang-lru-v0.5.3.tar.gz https://github.com/hashicorp/hcl/archive/v1.0.0.tar.gz -> github.com-hashicorp-hcl-v1.0.0.tar.gz https://github.com/hashicorp/logutils/archive/v1.0.0.tar.gz -> github.com-hashicorp-logutils-v1.0.0.tar.gz https://github.com/hashicorp/memberlist/archive/v0.1.4.tar.gz -> github.com-hashicorp-memberlist-v0.1.4.tar.gz https://github.com/hashicorp/serf/archive/v0.8.3.tar.gz -> github.com-hashicorp-serf-v0.8.3.tar.gz https://github.com/hashicorp/vault/archive/746c0b111519166ff2126f55dba7071912c33006.tar.gz -> github.com-hashicorp-vault-746c0b111519166ff2126f55dba7071912c33006.tar.gz https://github.com/mattn/go-shellwords/archive/v1.0.5.tar.gz -> github.com-mattn-go-shellwords-v1.0.5.tar.gz https://github.com/miekg/dns/archive/v1.1.15.tar.gz -> github.com-miekg-dns-v1.1.15.tar.gz https://github.com/mitchellh/go-homedir/archive/v1.1.0.tar.gz -> github.com-mitchellh-go-homedir-v1.1.0.tar.gz https://github.com/mitchellh/hashstructure/archive/v1.0.0.tar.gz -> github.com-mitchellh-hashstructure-v1.0.0.tar.gz https://github.com/mitchellh/mapstructure/archive/v1.1.2.tar.gz -> github.com-mitchellh-mapstructure-v1.1.2.tar.gz https://github.com/pierrec/lz4/archive/v2.2.5.tar.gz -> github.com-pierrec-lz4-v2.2.5.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/ryanuber/go-glob/archive/v1.0.0.tar.gz -> github.com-ryanuber-go-glob-v1.0.0.tar.gz https://github.com/stretchr/testify/archive/v1.3.0.tar.gz -> github.com-stretchr-testify-v1.3.0.tar.gz https://github.com/golang/crypto/archive/4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz -> github.com-golang-crypto-4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz https://github.com/golang/net/archive/ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz -> github.com-golang-net-ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz https://github.com/golang/sys/archive/1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz -> github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz https://github.com/golang/text/archive/v0.3.2.tar.gz -> github.com-golang-text-v0.3.2.tar.gz https://github.com/golang/time/archive/c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz -> github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz https://github.com/go-check/check/archive/788fd78401277ebd861206a03c884797c6ec5541.tar.gz -> github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz https://github.com/square/go-jose/archive/v2.3.1.tar.gz -> github.com-square-go-jose-v2.3.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=dda1d01a7fa445c845b61fa19c7b3725
diff --git a/metadata/md5-cache/app-admin/consul-template-0.24.0 b/metadata/md5-cache/app-admin/consul-template-0.24.0
index 819fab88ca0b..01045500463b 100644
--- a/metadata/md5-cache/app-admin/consul-template-0.24.0
+++ b/metadata/md5-cache/app-admin/consul-template-0.24.0
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.24.0.tar.gz -> consul-template-0.24.0.tar.gz https://github.com/BurntSushi/toml/archive/v0.3.1.tar.gz -> github.com-BurntSushi-toml-v0.3.1.tar.gz https://github.com/armon/go-metrics/archive/ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz -> github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz https://github.com/frankban/quicktest/archive/v1.4.0.tar.gz -> github.com-frankban-quicktest-v1.4.0.tar.gz https://github.com/golang/snappy/archive/v0.0.1.tar.gz -> github.com-golang-snappy-v0.0.1.tar.gz https://github.com/google/btree/archive/v1.0.0.tar.gz -> github.com-google-btree-v1.0.0.tar.gz https://github.com/hashicorp/consul/archive/v1.2.0.tar.gz -> github.com-hashicorp-consul-v1.2.0.tar.gz https://github.com/hashicorp/errwrap/archive/v1.0.0.tar.gz -> github.com-hashicorp-errwrap-v1.0.0.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/v0.5.1.tar.gz -> github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz https://github.com/hashicorp/go-gatedio/archive/v0.5.0.tar.gz -> github.com-hashicorp-go-gatedio-v0.5.0.tar.gz https://github.com/hashicorp/go-hclog/archive/v0.9.2.tar.gz -> github.com-hashicorp-go-hclog-v0.9.2.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/v1.1.0.tar.gz -> github.com-hashicorp-go-immutable-radix-v1.1.0.tar.gz https://github.com/hashicorp/go-msgpack/archive/v0.5.5.tar.gz -> github.com-hashicorp-go-msgpack-v0.5.5.tar.gz https://github.com/hashicorp/go-multierror/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-multierror-v1.0.0.tar.gz https://github.com/hashicorp/go-retryablehttp/archive/v0.6.2.tar.gz -> github.com-hashicorp-go-retryablehttp-v0.6.2.tar.gz https://github.com/hashicorp/go-rootcerts/archive/v1.0.1.tar.gz -> github.com-hashicorp-go-rootcerts-v1.0.1.tar.gz https://github.com/hashicorp/go-sockaddr/archive/v1.0.2.tar.gz -> github.com-hashicorp-go-sockaddr-v1.0.2.tar.gz https://github.com/hashicorp/go-syslog/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-syslog-v1.0.0.tar.gz https://github.com/hashicorp/golang-lru/archive/v0.5.3.tar.gz -> github.com-hashicorp-golang-lru-v0.5.3.tar.gz https://github.com/hashicorp/hcl/archive/v1.0.0.tar.gz -> github.com-hashicorp-hcl-v1.0.0.tar.gz https://github.com/hashicorp/logutils/archive/v1.0.0.tar.gz -> github.com-hashicorp-logutils-v1.0.0.tar.gz https://github.com/hashicorp/memberlist/archive/v0.1.4.tar.gz -> github.com-hashicorp-memberlist-v0.1.4.tar.gz https://github.com/hashicorp/serf/archive/v0.8.3.tar.gz -> github.com-hashicorp-serf-v0.8.3.tar.gz https://github.com/hashicorp/vault/archive/746c0b111519166ff2126f55dba7071912c33006.tar.gz -> github.com-hashicorp-vault-746c0b111519166ff2126f55dba7071912c33006.tar.gz https://github.com/mattn/go-shellwords/archive/v1.0.5.tar.gz -> github.com-mattn-go-shellwords-v1.0.5.tar.gz https://github.com/miekg/dns/archive/v1.1.15.tar.gz -> github.com-miekg-dns-v1.1.15.tar.gz https://github.com/mitchellh/go-homedir/archive/v1.1.0.tar.gz -> github.com-mitchellh-go-homedir-v1.1.0.tar.gz https://github.com/mitchellh/hashstructure/archive/v1.0.0.tar.gz -> github.com-mitchellh-hashstructure-v1.0.0.tar.gz https://github.com/mitchellh/mapstructure/archive/v1.1.2.tar.gz -> github.com-mitchellh-mapstructure-v1.1.2.tar.gz https://github.com/pierrec/lz4/archive/v2.2.5.tar.gz -> github.com-pierrec-lz4-v2.2.5.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/ryanuber/go-glob/archive/v1.0.0.tar.gz -> github.com-ryanuber-go-glob-v1.0.0.tar.gz https://github.com/stretchr/testify/archive/v1.3.0.tar.gz -> github.com-stretchr-testify-v1.3.0.tar.gz https://github.com/golang/crypto/archive/4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz -> github.com-golang-crypto-4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz https://github.com/golang/net/archive/ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz -> github.com-golang-net-ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz https://github.com/golang/sys/archive/1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz -> github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz https://github.com/golang/text/archive/v0.3.2.tar.gz -> github.com-golang-text-v0.3.2.tar.gz https://github.com/golang/time/archive/c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz -> github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz https://github.com/go-check/check/archive/788fd78401277ebd861206a03c884797c6ec5541.tar.gz -> github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz https://github.com/square/go-jose/archive/v2.3.1.tar.gz -> github.com-square-go-jose-v2.3.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8edee055990a553e9c23e598b75db303
diff --git a/metadata/md5-cache/app-admin/denyhosts-2.9 b/metadata/md5-cache/app-admin/denyhosts-2.9
index a5de7190cbb3..6b8e070f922a 100644
--- a/metadata/md5-cache/app-admin/denyhosts-2.9
+++ b/metadata/md5-cache/app-admin/denyhosts-2.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/denyhosts/denyhosts/archive/v2.9.tar.gz -> denyhosts-2.9.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo 566393c426fca4615a83df9a982bb9d9 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo 566393c426fca4615a83df9a982bb9d9 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=5f5f303e6bb3cfe8feb86ba51a699992
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0 b/metadata/md5-cache/app-admin/denyhosts-3.0
index d8c9ba81831b..a3bbc707fdb9 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo 566393c426fca4615a83df9a982bb9d9 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo 566393c426fca4615a83df9a982bb9d9 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=39ca360141575427014c961f9042e3c4
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0-r1 b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
index 7d6a07815bdc..a877e2ac2f89 100644
--- a/metadata/md5-cache/app-admin/denyhosts-3.0-r1
+++ b/metadata/md5-cache/app-admin/denyhosts-3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/denyhosts/denyhosts/archive/v3.0.tar.gz -> denyhosts-3.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=9b5b2855bb9f0da2b2fa3c0b8e8b4aa7
diff --git a/metadata/md5-cache/app-admin/diamond-4.0-r1 b/metadata/md5-cache/app-admin/diamond-4.0-r1
index 36ff3da98c0f..bc74cc75c8f4 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0-r1
+++ b/metadata/md5-cache/app-admin/diamond-4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.tar.gz -> python-diamond-4.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=9b2dcc54f5e5cc3a26cb40742eb067c0
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515 b/metadata/md5-cache/app-admin/diamond-4.0.515
index 4d88ef26e0f9..94e657c26eed 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0.515
+++ b/metadata/md5-cache/app-admin/diamond-4.0.515
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.515.tar.gz -> python-diamond-4.0.515.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=9b9a7756d8aad6550f81765f060b36eb
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515.20170311 b/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
index 002715588083..afaf9a9ff328 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
+++ b/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
@@ -4,12 +4,12 @@ DESCRIPTION=Python daemon that collects and publishes system metrics
EAPI=6
HOMEPAGE=https://github.com/python-diamond/Diamond
IUSE=test mongo mysql snmp redis python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/python-diamond/Diamond/archive/73207d04e0739a4ce92bc201b36681c42d9fa7e7.tar.gz -> python-diamond-4.0.515.20170311.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=2daf586bdfb1a6827ea2d646d8f119ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=b3b7506d0a2f529bf5c8b01613b92c6d
diff --git a/metadata/md5-cache/app-admin/dxf-7.5.1 b/metadata/md5-cache/app-admin/dxf-7.5.1
index 6ad5d62d070b..9f639503a0ff 100644
--- a/metadata/md5-cache/app-admin/dxf-7.5.1
+++ b/metadata/md5-cache/app-admin/dxf-7.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.5.1.tar.gz -> dxf-7.5.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=6ad5125f21ee02aa3c48f98a672b3137
diff --git a/metadata/md5-cache/app-admin/dxf-7.5.2 b/metadata/md5-cache/app-admin/dxf-7.5.2
index d3c082032d0d..fb85cdf843d8 100644
--- a/metadata/md5-cache/app-admin/dxf-7.5.2
+++ b/metadata/md5-cache/app-admin/dxf-7.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.5.2.tar.gz -> dxf-7.5.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=6ad5125f21ee02aa3c48f98a672b3137
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3 b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
index b1af8f7bca50..3ba0c83949bd 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_6(-)?,pyth
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v0.4.3.tar.gz -> eclean-kernel-0.4.3.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=da96133b65ef1f46a52211b9deaa922e
diff --git a/metadata/md5-cache/app-admin/equo-302 b/metadata/md5-cache/app-admin/equo-302-r1
similarity index 69%
rename from metadata/md5-cache/app-admin/equo-302
rename to metadata/md5-cache/app-admin/equo-302-r1
index ad83596b38d4..22b995238f6d 100644
--- a/metadata/md5-cache/app-admin/equo-302
+++ b/metadata/md5-cache/app-admin/equo-302-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/asciidoc
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_single_target_python2_7(-)?] app-text/asciidoc
DESCRIPTION=Entropy Package Manager text-based client
EAPI=5
HOMEPAGE=http://www.sabayon.org
IUSE=+python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-apps/file[python]
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_single_target_python2_7(-)?] sys-apps/file[python]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ea810a85059cdfea498fd3a063d0a4f2
+_md5_=c673ccd54feefd7c8a13f3b597d3a34e
diff --git a/metadata/md5-cache/app-admin/exo-1.9.0 b/metadata/md5-cache/app-admin/exo-1.10.0
similarity index 76%
rename from metadata/md5-cache/app-admin/exo-1.9.0
rename to metadata/md5-cache/app-admin/exo-1.10.0
index 6a5b6b83e8bb..b6622ad7e42a 100644
--- a/metadata/md5-cache/app-admin/exo-1.9.0
+++ b/metadata/md5-cache/app-admin/exo-1.10.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip
SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.9.0.tar.gz -> exo-1.9.0.tar.gz
+SRC_URI=https://github.com/exoscale/cli/archive/v1.10.0.tar.gz -> exo-1.10.0.tar.gz
_md5_=4613cdf03d7e87ace11d7f888f9c6cf5
diff --git a/metadata/md5-cache/app-admin/fluentd-1.2.6-r1 b/metadata/md5-cache/app-admin/fluentd-1.2.6-r1
index b4803662b6eb..cc5e43ba60b2 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.2.6-r1
+++ b/metadata/md5-cache/app-admin/fluentd-1.2.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.2.6.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8745bf4fb72794bfbc1ef9aac1e4a75f
diff --git a/metadata/md5-cache/app-admin/fluentd-1.3.1 b/metadata/md5-cache/app-admin/fluentd-1.3.1
index aa75b35c71ba..08b435e26e2d 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.3.1
+++ b/metadata/md5-cache/app-admin/fluentd-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.3.1.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fa3b58e9b8660bdd9587c6dc8e78ba71
diff --git a/metadata/md5-cache/app-admin/fluentd-1.3.2 b/metadata/md5-cache/app-admin/fluentd-1.3.2
index e7ef9663d667..4feaacc923cd 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.3.2
+++ b/metadata/md5-cache/app-admin/fluentd-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.3.2.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fa3b58e9b8660bdd9587c6dc8e78ba71
diff --git a/metadata/md5-cache/app-admin/fluentd-1.3.3 b/metadata/md5-cache/app-admin/fluentd-1.3.3
index 8e67130f6887..36fa8afd2042 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.3.3
+++ b/metadata/md5-cache/app-admin/fluentd-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.3.3.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ae970460f208820ef188406646336c87
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.0 b/metadata/md5-cache/app-admin/fluentd-1.4.0
index 681e21436a8c..93b0167d302d 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.0
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.4.0.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ae970460f208820ef188406646336c87
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.1 b/metadata/md5-cache/app-admin/fluentd-1.4.1
index 1d3466da6086..d38b5318ff85 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.1
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.4.1.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=ae970460f208820ef188406646336c87
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.2 b/metadata/md5-cache/app-admin/fluentd-1.4.2
index e626bed06d68..de4267393ce2 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.2
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.4.2.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1e0e2ea87c4b6f798c734b2178d1067d
diff --git a/metadata/md5-cache/app-admin/fluentd-1.9.0 b/metadata/md5-cache/app-admin/fluentd-1.9.0
index 254816327a34..0c65168849a0 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.9.0
+++ b/metadata/md5-cache/app-admin/fluentd-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/fluentd-1.9.0.gem
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 multilib 1d91b03d42ab6308b5f4f6b598ed110e ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=58de2647fdcee221e1fbd2ca12994654
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.20 b/metadata/md5-cache/app-admin/gixy-0.1.20
index e4c2a58b5f06..5b7eddb8b122 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.20
+++ b/metadata/md5-cache/app-admin/gixy-0.1.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/yandex/gixy/archive/v0.1.20.tar.gz -> gixy-0.1.20.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=e7294e65528e6e277b3cf3d9eac03cfd
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
index 90550de4de4e..a9f10bfa35c3 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Single process stack of various system monitors
EAPI=7
HOMEPAGE=http://www.gkrellm.net/
IUSE=gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
SLOT=2
SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.10.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
-_md5_=0995f4bceeb50e352df83aed32ca9b2d
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=52643c0416d75703318d24ba92198f81
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.11 b/metadata/md5-cache/app-admin/gkrellm-2.3.11
index 837bbfc5fc35..59c053684bef 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.11
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.11
@@ -10,5 +10,5 @@ LICENSE=GPL-3
RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
SLOT=2
SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.11.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1aa99d0d88e0b712c37a886184d4b369
diff --git a/metadata/md5-cache/app-admin/glance-19.0.0 b/metadata/md5-cache/app-admin/glance-19.0.0
index 3bc5b375d1da..93fd30580b78 100644
--- a/metadata/md5-cache/app-admin/glance-19.0.0
+++ b/metadata/md5-cache/app-admin/glance-19.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://tarballs.openstack.org/glance/glance-19.0.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=08c8fe289f0530a122db63553eba62ac
diff --git a/metadata/md5-cache/app-admin/glance-19.0.1 b/metadata/md5-cache/app-admin/glance-19.0.1
index d25457644011..724af0ae3000 100644
--- a/metadata/md5-cache/app-admin/glance-19.0.1
+++ b/metadata/md5-cache/app-admin/glance-19.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://tarballs.openstack.org/glance/glance-19.0.1.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=49386e30f1f668b5316463135bb5ff80
diff --git a/metadata/md5-cache/app-admin/glance-2019.2.9999 b/metadata/md5-cache/app-admin/glance-2019.2.9999
index 115dc38d7b44..0f19e8ad7c7b 100644
--- a/metadata/md5-cache/app-admin/glance-2019.2.9999
+++ b/metadata/md5-cache/app-admin/glance-2019.2.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/eventlet-0.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/WSME-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-python/paste-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-messaging-9.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/glance_store-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] acct-user/glance acct-group/glance python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=49386e30f1f668b5316463135bb5ff80
diff --git a/metadata/md5-cache/app-admin/graylog-2.5.1 b/metadata/md5-cache/app-admin/graylog-2.5.1
index 6de32f9abe4f..095e6c1dc10f 100644
--- a/metadata/md5-cache/app-admin/graylog-2.5.1
+++ b/metadata/md5-cache/app-admin/graylog-2.5.1
@@ -8,5 +8,5 @@ RDEPEND=virtual/jdk:1.8
RESTRICT=strip
SLOT=0
SRC_URI=https://packages.graylog2.org/releases/graylog/graylog-2.5.1.tgz
-_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=bdae2ba7a1672abf9e486b5c24bd35e2
diff --git a/metadata/md5-cache/app-admin/installer-0.1.1_beta b/metadata/md5-cache/app-admin/installer-0.1.1_beta
index 58083966c0b7..44c53c5242d9 100644
--- a/metadata/md5-cache/app-admin/installer-0.1.1_beta
+++ b/metadata/md5-cache/app-admin/installer-0.1.1_beta
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses(+)] ) >=dev-lang
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/ChrisADR/installer/archive/v0.1.1-beta.tar.gz -> installer-0.1.1_beta.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=da79a789f6b3aa7c68c617ee4b1c70c4
diff --git a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1 b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
index 01489b2945e4..659e21246d83 100644
--- a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
+++ b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
RDEPEND=!app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
SLOT=0
SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.18.tar.xz
-_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=28c1e4f3e54d7917cbcdb4e231c2a254
diff --git a/metadata/md5-cache/app-admin/logstash-bin-5.6.15 b/metadata/md5-cache/app-admin/logstash-bin-5.6.15
index cfae7e7ff335..86650c89f16a 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-5.6.15
+++ b/metadata/md5-cache/app-admin/logstash-bin-5.6.15
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
RESTRICT=strip
SLOT=0
SRC_URI=https://artifacts.elastic.co/downloads/logstash/logstash-5.6.15.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 a055407af6fd37cf3f692ba73d2d2ba5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 a055407af6fd37cf3f692ba73d2d2ba5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=2ed1265b5f98e1420ac9544b1bebd6ce
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.2.0 b/metadata/md5-cache/app-admin/logstash-bin-7.2.0
index 148e1138da27..4f3346d66198 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.2.0
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.2.0
@@ -10,5 +10,5 @@ RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-confi
RESTRICT=strip
SLOT=0
SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.2.0.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.2.0.tar.gz )
-_eclasses_=java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 a055407af6fd37cf3f692ba73d2d2ba5 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 a055407af6fd37cf3f692ba73d2d2ba5 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=0fba9988629bb49f974845c35ecd1689
diff --git a/metadata/md5-cache/app-admin/logsurfer+-1.8-r3 b/metadata/md5-cache/app-admin/logsurfer+-1.8-r3
index 31ea97ef8e64..79826515d074 100644
--- a/metadata/md5-cache/app-admin/logsurfer+-1.8-r3
+++ b/metadata/md5-cache/app-admin/logsurfer+-1.8-r3
@@ -7,5 +7,5 @@ LICENSE=freedist GPL-2+
RESTRICT=bindist
SLOT=0
SRC_URI=mirror://sourceforge/logsurfer/logsurfer-1.8.tar.gz
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=38b43bdb88cbb21a00fdba34d9c3ca06
diff --git a/metadata/md5-cache/app-admin/matter-302 b/metadata/md5-cache/app-admin/matter-302-r1
similarity index 69%
rename from metadata/md5-cache/app-admin/matter-302
rename to metadata/md5-cache/app-admin/matter-302-r1
index dd5972907c57..06df058b8363 100644
--- a/metadata/md5-cache/app-admin/matter-302
+++ b/metadata/md5-cache/app-admin/matter-302-r1
@@ -5,9 +5,9 @@ HOMEPAGE=http://www.sabayon.org
IUSE=+entropy +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=entropy? ( ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sys-apps/file[python] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+RDEPEND=entropy? ( ~sys-apps/entropy-302[python_single_target_python2_7(-)?] ) sys-apps/file[python] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c2d6114f8060a7fd083d9f232a8e3f4
+_md5_=f9bd973d19b84a6a244c30b584c4e7b0
diff --git a/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1 b/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
index 1a50429fdcb1..064ae903f6ae 100644
--- a/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
+++ b/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
@@ -10,5 +10,5 @@ RDEPEND=! mongo-tools-3.6.17.tar.gz
+_md5_=fc0a5c3ebe356bd914a35b642e543d17
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.0.16 b/metadata/md5-cache/app-admin/mongo-tools-4.0.16
new file mode 100644
index 000000000000..0cd21aaa972b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.0.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=sasl ssl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.0.16.tar.gz -> mongo-tools-4.0.16.tar.gz
+_md5_=fc0a5c3ebe356bd914a35b642e543d17
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.2.3 b/metadata/md5-cache/app-admin/mongo-tools-4.2.3
new file mode 100644
index 000000000000..caa1d90055e7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=sasl ssl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.2.3.tar.gz -> mongo-tools-4.2.3.tar.gz
+_md5_=fc0a5c3ebe356bd914a35b642e543d17
diff --git a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
index 45bc9988bc64..dcb47257134e 100644
--- a/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_pyt
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=bf0c2539d67a349d3eb5f8dbc8895432
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.1.12 b/metadata/md5-cache/app-admin/packagekit-base-1.1.12-r1
similarity index 79%
rename from metadata/md5-cache/app-admin/packagekit-base-1.1.12
rename to metadata/md5-cache/app-admin/packagekit-base-1.1.12-r1
index c17b847e82d0..99490c9ac026 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-1.1.12
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.1.12-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
IUSE=command-not-found consolekit cron elogind entropy +introspection systemd test vala +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86
LICENSE=GPL-2
-RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.54.0:2 >=sys-auth/polkit-0.114 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-213 ) >=app-portage/layman-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sys-apps/portage-2.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] consolekit? ( sys-auth/consolekit ) entropy? ( >=sys-apps/entropy-234[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
+RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.54.0:2 >=sys-auth/polkit-0.114 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-213 ) python_single_target_python2_7? ( >=app-portage/layman-2[python_targets_python2_7(-)] >=sys-apps/portage-2.2[python_targets_python2_7(-)] ) consolekit? ( sys-auth/consolekit ) entropy? ( >=sys-apps/entropy-234[python_single_target_python2_7(-)?] )
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( consolekit elogind systemd ) vala? ( introspection ) entropy? ( python_single_target_python2_7 )
RESTRICT=!test? ( test )
SLOT=0/18
SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.12.tar.xz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vala cd46635fb3b81d6bc07830b4afe87066 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c3e791050f55ec87612b80466e28257
+_md5_=74e4eb680061d6dc93f4907061c508a3
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13 b/metadata/md5-cache/app-admin/ps_mem-3.13-r1
similarity index 63%
rename from metadata/md5-cache/app-admin/ps_mem-3.13
rename to metadata/md5-cache/app-admin/ps_mem-3.13-r1
index df12fd29bc64..94e6cc36a2b5 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.13
+++ b/metadata/md5-cache/app-admin/ps_mem-3.13-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] )
DESCRIPTION=A utility to report core memory usage per program
EAPI=6
HOMEPAGE=https://github.com/pixelb/ps_mem
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
SLOT=0
SRC_URI=https://github.com/pixelb/ps_mem/archive/9f54e1aa3a87ec176ce8b71f02673e0d8293b344.tar.gz -> ps_mem-3.13.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc26355173a72a580328673ee95ded3b
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c1e4f9248f7f99b74172dbdb42bcb3b
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.12 b/metadata/md5-cache/app-admin/puppet-4.10.12
index 84c3245ecec7..e5c0fbc353ec 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.12
+++ b/metadata/md5-cache/app-admin/puppet-4.10.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.12.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=e80c42a2649a0d92b2749ac6160e37db
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.17 b/metadata/md5-cache/app-admin/puppet-5.5.17
index 29a064f7c569..f05df048158f 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.17
+++ b/metadata/md5-cache/app-admin/puppet-5.5.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.17.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=1500cbfd2e1298a15b773a7977247b29
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.18 b/metadata/md5-cache/app-admin/puppet-5.5.18
index dcca475d049b..e5e35de19d57 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.18
+++ b/metadata/md5-cache/app-admin/puppet-5.5.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.18.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=39fa6356e87ad0d759656e091b39657d
diff --git a/metadata/md5-cache/app-admin/puppet-6.10.1 b/metadata/md5-cache/app-admin/puppet-6.10.1
index 2476ced03f9c..95641afcbcb1 100644
--- a/metadata/md5-cache/app-admin/puppet-6.10.1
+++ b/metadata/md5-cache/app-admin/puppet-6.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.10.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=a0ec35180fa765543bfa4772db6ba6aa
diff --git a/metadata/md5-cache/app-admin/puppet-6.11.1 b/metadata/md5-cache/app-admin/puppet-6.11.1
index 9757af9d8757..167feb24e5cb 100644
--- a/metadata/md5-cache/app-admin/puppet-6.11.1
+++ b/metadata/md5-cache/app-admin/puppet-6.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.11.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=a0ec35180fa765543bfa4772db6ba6aa
diff --git a/metadata/md5-cache/app-admin/puppet-6.12.0 b/metadata/md5-cache/app-admin/puppet-6.12.0
index ab3ad9190068..12915562783b 100644
--- a/metadata/md5-cache/app-admin/puppet-6.12.0
+++ b/metadata/md5-cache/app-admin/puppet-6.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.12.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cca036a1477f29b926bf994faddf4099 ruby-ng a1c89995f9f6dd045e93d13a92ca81a9 ruby-utils cdb4c1e4283adb7707b7dd48ccaa7ad2 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=9e7b739280e14591770fbf97250969b8
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.11.1 b/metadata/md5-cache/app-admin/puppet-agent-6.11.1
index 309f20ed8b28..8472e11243bb 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.11.1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.11.1
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !ap
RESTRICT=strip
SLOT=0
SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_i386.deb )
-_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=6fec500f7f22479f58edda1fa128dd18
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1
index 44a7a74bd591..2fc9cedf732a 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
RESTRICT=strip
SLOT=0
SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_i386.deb )
-_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=5060f0272deba1a9b95d663ad61eeb3e
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.12.0 b/metadata/md5-cache/app-admin/puppet-agent-6.12.0
index f6fb58a2c836..eaa1491d739c 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.12.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.12.0
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
RESTRICT=strip
SLOT=0
SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.12.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.12.0-1stretch_i386.deb )
-_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=5060f0272deba1a9b95d663ad61eeb3e
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.7.2 b/metadata/md5-cache/app-admin/puppetdb-6.7.2
index c4891e9e8af0..c3f2e635cc25 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.7.2
+++ b/metadata/md5-cache/app-admin/puppetdb-6.7.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.8.0
SLOT=0
SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.7.2.tar.gz
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f9c7186e96e99f02d8d5f1ba966f562e
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.8.0 b/metadata/md5-cache/app-admin/puppetdb-6.8.0
index ab8f89cc3699..2a3aac8186a1 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.8.0
+++ b/metadata/md5-cache/app-admin/puppetdb-6.8.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.8.0
SLOT=0
SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.8.0.tar.gz
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1e4bae2a3fcc56b1717a037c76f0a46e
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.7.2 b/metadata/md5-cache/app-admin/puppetserver-6.7.2
index 50991df08633..22cb3463de8b 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.7.2
+++ b/metadata/md5-cache/app-admin/puppetserver-6.7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
SLOT=0
SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.7.2.tar.gz
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c57accb56dd69ac44bcafb694f1023c6
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.8.0 b/metadata/md5-cache/app-admin/puppetserver-6.8.0
index 1795de731633..41c735ca55ae 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.8.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.8.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
SLOT=0
SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.8.0.tar.gz
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a939a94caacf85fd00b3a9341439b159
diff --git a/metadata/md5-cache/app-admin/pwman3-0.10.0 b/metadata/md5-cache/app-admin/pwman3-0.10.0
index 72d1e7175dd5..b8ae5e77ab3a 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.10.0
+++ b/metadata/md5-cache/app-admin/pwman3-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/pwman3/pwman3/archive/v0.10.0.tar.gz -> pwman3-0.10.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=dbff5ad48e0404a13f86519c2c7daecf
diff --git a/metadata/md5-cache/app-admin/pwman3-0.9.11 b/metadata/md5-cache/app-admin/pwman3-0.9.11
index 40f27d6db9d1..5ff7af0fbca8 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.9.11
+++ b/metadata/md5-cache/app-admin/pwman3-0.9.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/pwman3/pwman3/archive/v0.9.11.tar.gz -> pwman3-0.9.11.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f009800edf2fff42d5d8c62c04f61422
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.3 b/metadata/md5-cache/app-admin/sagan-0.2.3
index 051d0507366f..b372e9178d91 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.3
+++ b/metadata/md5-cache/app-admin/sagan-0.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
SLOT=0
SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=f8137960323090eea13b02136f2e7e7b
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.3-r1 b/metadata/md5-cache/app-admin/sagan-0.2.3-r1
index 0257045f4836..e81efb7c7308 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.3-r1
+++ b/metadata/md5-cache/app-admin/sagan-0.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
SLOT=0
SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=48ceada163bc38a8b533e74b06ef8b28
diff --git a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3 b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3
index 77dd0f64eacf..e4218b1ebd85 100644
--- a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3
+++ b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) lognorm? ( dev-libs/liblognorm dev-libs/json-c:= dev-libs/libee dev-libs/libestr ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) geoip? ( dev-libs/geoip )
SLOT=0
SRC_URI=http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=84ae7993f93af0d6a9b864773ffbe0e9
diff --git a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1 b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
index b5911b83378c..b9d2880e5917 100644
--- a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
+++ b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesm
REQUIRED_USE=mysql? ( libdnet )
SLOT=0
SRC_URI=http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=fccf98705a5695af1376634eecd3956b
diff --git a/metadata/md5-cache/app-admin/salt-2018.3.4 b/metadata/md5-cache/app-admin/salt-2018.3.4
index 71792aef7a5e..4ba74abfe025 100644
--- a/metadata/md5-cache/app-admin/salt-2018.3.4
+++ b/metadata/md5-cache/app-admin/salt-2018.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python3_6 )
RESTRICT=!test? ( test ) x86? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/salt/salt-2018.3.4.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=8e3e423fb332e9b0c0259e96e554bccf
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.0-r1 b/metadata/md5-cache/app-admin/salt-2019.2.0-r1
index 5fb99928c1ac..d88a8fb61d59 100644
--- a/metadata/md5-cache/app-admin/salt-2019.2.0-r1
+++ b/metadata/md5-cache/app-admin/salt-2019.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python3_6 )
RESTRICT=!test? ( test ) x86? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/salt/salt-2019.2.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=1d1a3bd7112253dc98a69b80aff5cdd9
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.2 b/metadata/md5-cache/app-admin/salt-2019.2.2
index 54acc110ec68..553168ce9112 100644
--- a/metadata/md5-cache/app-admin/salt-2019.2.2
+++ b/metadata/md5-cache/app-admin/salt-2019.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python3_6 )
RESTRICT=!test? ( test ) x86? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/salt/salt-2019.2.2.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=bff03fcf7f99263021f8ec2989e1370a
diff --git a/metadata/md5-cache/app-admin/serf-0.8.1-r1 b/metadata/md5-cache/app-admin/serf-0.8.1-r1
index fc6967b6f419..3c03f8764f84 100644
--- a/metadata/md5-cache/app-admin/serf-0.8.1-r1
+++ b/metadata/md5-cache/app-admin/serf-0.8.1-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD MIT
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/serf/archive/v0.8.1.tar.gz -> serf-0.8.1.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=c437d68a75b1add11d9a3bd0b68fcdf0
diff --git a/metadata/md5-cache/app-admin/setools-4.2.1 b/metadata/md5-cache/app-admin/setools-4.2.1
index 7cb671e9ce44..b3c9e9ba596b 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.1
+++ b/metadata/md5-cache/app-admin/setools-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/SELinuxProject/setools/archive/4.2.1.tar.gz -> setools-4.2.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=17d1ce443e2f8e2f6a9d0b1aad4f256c
diff --git a/metadata/md5-cache/app-admin/setools-4.2.2 b/metadata/md5-cache/app-admin/setools-4.2.2
index 94226529a449..f7a028cb46e0 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.2
+++ b/metadata/md5-cache/app-admin/setools-4.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.2.2/setools-4.2.2.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=7d8400dc3a83612885526c1bc7f3aa02
diff --git a/metadata/md5-cache/app-admin/setools-9999 b/metadata/md5-cache/app-admin/setools-9999
index e87c9becfe9f..c6ee6a54af61 100644
--- a/metadata/md5-cache/app-admin/setools-9999
+++ b/metadata/md5-cache/app-admin/setools-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=9d29ae4067e2d6cd076ba68415fde147
diff --git a/metadata/md5-cache/app-admin/supernova-2.2.0 b/metadata/md5-cache/app-admin/supernova-2.2.0
index f11d895aa2dd..669838d5bb61 100644
--- a/metadata/md5-cache/app-admin/supernova-2.2.0
+++ b/metadata/md5-cache/app-admin/supernova-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/supernova/supernova-2.2.0.tar.gz
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=64a07fd7ea230a9edecf49c9d06404f3
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.4 b/metadata/md5-cache/app-admin/supervisor-3.1.4
index 8be45ed3de21..e3a555ef9968 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.4
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=35dd94f879a06c12933f6f3ebff8d679
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.5 b/metadata/md5-cache/app-admin/supervisor-3.3.5
index d09f7ff3b7ff..6a62525af200 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.3.5
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.5.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b2ec38658e46eb0f3faa0aa72d538411
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.3 b/metadata/md5-cache/app-admin/supervisor-4.0.3
index 87e973500f46..eac97fde09af 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.0.3
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.3.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f1316db54079b2b269aeca42082e2fa8
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.4 b/metadata/md5-cache/app-admin/supervisor-4.0.4
index 212e670a7893..e68a27daeeb8 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.0.4
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.4.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=52b405a50c5b6a470148a14e8c46293a
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2 b/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
index b99206e5bd6f..a414a6138759 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/zdohnal/system-config-printer
IUSE=doc gnome-keyring policykit python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86
LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycups[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycups[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/urllib3[python_targets_python3_7(-)] ) gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/zdohnal/system-config-printer/releases/download/1.5.11/system-config-printer-1.5.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/system-config-printer-1.5.11-patchset-01.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dbe62986d21f387e3e09b2e90395f79
+_md5_=567b5efb0aac227f8b97ed12a917cf92
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.12 b/metadata/md5-cache/app-admin/system-config-printer-1.5.12-r1
similarity index 62%
rename from metadata/md5-cache/app-admin/system-config-printer-1.5.12
rename to metadata/md5-cache/app-admin/system-config-printer-1.5.12-r1
index 9a485470efc1..9a5f3b93f218 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-1.5.12
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.12-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/OpenPrinting/system-config-printer
IUSE=doc gnome-keyring policykit python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86
LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycups[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycups[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/urllib3[python_targets_python3_7(-)] ) gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/OpenPrinting/system-config-printer/releases/download/1.5.12/system-config-printer-1.5.12.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=2fa5bfcfb67b8dcba349eb373fd738b6
+_md5_=ae40068764455aded54248f750d48d9e
diff --git a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2 b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
index 0e7fa0c58e21..4761925fd4ae 100644
--- a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
+++ b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=!=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.2:2 >=dev-perl/Net-DBus-0.33.4 dev-lang/perl >=sys-auth/polkit-0.94 userland_GNU? ( virtual/shadow )
SLOT=0
SRC_URI=mirror://gnome/sources/system-tools-backends/2.10/system-tools-backends-2.10.2.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo 566393c426fca4615a83df9a982bb9d9 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo 566393c426fca4615a83df9a982bb9d9 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=a482c0497bce3c0ffb29b24996a2352c
diff --git a/metadata/md5-cache/app-admin/tenshi-0.17 b/metadata/md5-cache/app-admin/tenshi-0.17
index bad3b8256657..40a04ed212ce 100644
--- a/metadata/md5-cache/app-admin/tenshi-0.17
+++ b/metadata/md5-cache/app-admin/tenshi-0.17
@@ -7,5 +7,5 @@ LICENSE=ISC
RDEPEND=dev-lang/perl dev-perl/IO-BufferedSelect sys-apps/coreutils
SLOT=0
SRC_URI=https://github.com/inversepath/tenshi/archive/0.17.tar.gz -> tenshi-0.17.tar.gz
-_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=0a683653962683fe9310fcfec6553b6d
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7-r1 b/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
index ce992728afa2..f4e0b667b528 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=|| ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) nfacct? ( >=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_acct-1.0.1 ) nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 ) nflog? ( >=net-libs/libnetfilter_log-1.0.0 ) mysql? ( dev-db/mysql-connector-c:= ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) selinux? ( sec-policy/selinux-ulogd )
SLOT=0
SRC_URI=https://www.netfilter.org/projects/ulogd/files/ulogd-2.0.7.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=b6472085a8bbada313add8d27367943b
diff --git a/metadata/md5-cache/app-admin/usbview-2.0 b/metadata/md5-cache/app-admin/usbview-2.0
index c6ed90dfc071..2e14ea5742d3 100644
--- a/metadata/md5-cache/app-admin/usbview-2.0
+++ b/metadata/md5-cache/app-admin/usbview-2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Display the topology of devices on the USB bus
EAPI=5
HOMEPAGE=http://www.kroah.com/linux-usb/
IUSE=kernel_linux
-KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3
SLOT=0
SRC_URI=http://www.kroah.com/linux-usb/usbview-2.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6070432b4eff632126a7f0f2c521bc77
+_md5_=6101b91dfcd107c88c26c08b4d89ecf4
diff --git a/metadata/md5-cache/app-admin/vault-1.2.3 b/metadata/md5-cache/app-admin/vault-1.2.3
index d53b4d3bd9c0..523224cd6140 100644
--- a/metadata/md5-cache/app-admin/vault-1.2.3
+++ b/metadata/md5-cache/app-admin/vault-1.2.3
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/vault/archive/v1.2.3.tar.gz -> vault-1.2.3.tar.gz webui? ( mirror://gentoo/vault-1.2.3-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.2.3-webui.tar.xz )
-_eclasses_=fcaps 9445d60c1eb084a91c38ef4c070b2f16 golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=fcaps 9445d60c1eb084a91c38ef4c070b2f16 golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=52dcd89f249097892303e2d1f11530ef
diff --git a/metadata/md5-cache/app-admin/vault-1.2.4 b/metadata/md5-cache/app-admin/vault-1.2.4
index 8a19cb786457..817be97820c2 100644
--- a/metadata/md5-cache/app-admin/vault-1.2.4
+++ b/metadata/md5-cache/app-admin/vault-1.2.4
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/vault/archive/v1.2.4.tar.gz -> vault-1.2.4.tar.gz webui? ( mirror://gentoo/vault-1.2.4-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.2.4-webui.tar.xz )
-_eclasses_=fcaps 9445d60c1eb084a91c38ef4c070b2f16 golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=fcaps 9445d60c1eb084a91c38ef4c070b2f16 golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=52dcd89f249097892303e2d1f11530ef
diff --git a/metadata/md5-cache/app-admin/vault-1.3.0 b/metadata/md5-cache/app-admin/vault-1.3.0
index fba1025e86d9..0ab467b8d621 100644
--- a/metadata/md5-cache/app-admin/vault-1.3.0
+++ b/metadata/md5-cache/app-admin/vault-1.3.0
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/hashicorp/vault/archive/v1.3.0.tar.gz -> vault-1.3.0.tar.gz webui? ( mirror://gentoo/vault-1.3.0-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.3.0-webui.tar.xz )
-_eclasses_=fcaps 9445d60c1eb084a91c38ef4c070b2f16 golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=fcaps 9445d60c1eb084a91c38ef4c070b2f16 golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=52dcd89f249097892303e2d1f11530ef
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.52-r1 b/metadata/md5-cache/app-admin/webapp-config-1.52-r1
index b43f92233eb5..42f7d7311d41 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.52-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.52-r1
@@ -10,5 +10,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.52.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=dae9868050e15bebec5abd6b2d04e445
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.53-r2 b/metadata/md5-cache/app-admin/webapp-config-1.53-r2
index bc7baf00d90f..c7250b28cf66 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.53-r2
+++ b/metadata/md5-cache/app-admin/webapp-config-1.53-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.53.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=a4bc664b693ab184c746ad166cd44b36
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.54-r2 b/metadata/md5-cache/app-admin/webapp-config-1.54-r2
index a875b8db09aa..9082d07dc17e 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.54-r2
+++ b/metadata/md5-cache/app-admin/webapp-config-1.54-r2
@@ -10,5 +10,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.54.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=beda35ab9d1e033d7198abe5c465db80
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.55-r1 b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
index 89447d9fd34f..cd365c861e88 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.55-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
@@ -10,5 +10,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=8f3252549f643c9eacb935c09ffdf87d
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index 8593cc4db8ce..47699d0ffd8b 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
RDEPEND=portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=91290fc9feb3ea844d46282ca098be57
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index c89a87c20aef..360be31a9783 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.101.2-r1 b/metadata/md5-cache/app-antivirus/clamav-0.101.2-r1
index 8a34d41bbe2d..88bd2dd94425 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.101.2-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.101.2-r1
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virt
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.clamav.net/downloads/production/clamav-0.101.2.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=ebfd5092ace963ed5655a657770766db
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.101.4 b/metadata/md5-cache/app-antivirus/clamav-0.101.4
index d770edb19e29..51bff82a4584 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.101.4
+++ b/metadata/md5-cache/app-antivirus/clamav-0.101.4
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virt
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.clamav.net/downloads/production/clamav-0.101.4.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=ebfd5092ace963ed5655a657770766db
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.102.2 b/metadata/md5-cache/app-antivirus/clamav-0.102.2
index 64b856f8de98..db88f99bd4c4 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.102.2
+++ b/metadata/md5-cache/app-antivirus/clamav-0.102.2
@@ -4,7 +4,7 @@ DESCRIPTION=Clam Anti-Virus Scanner
EAPI=6
HOMEPAGE=https://www.clamav.net/
IUSE=bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=acct-group/clamav acct-user/clamav 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= ) dev-libs/libltdl || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) elibc_musl? ( sys-libs/fts-standalone ) !libclamav-only? ( net-misc/curl ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) selinux? ( sec-policy/selinux-clamav )
REQUIRED_USE=libclamav-only? ( !clamsubmit ) clamsubmit? ( !libclamav-only )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.clamav.net/downloads/production/clamav-0.102.2.tar.gz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=079a664f6b5c3a3301e26cd99ca0126c
+_md5_=a305afdf9e2d01a532228304655605f2
diff --git a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2 b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
index 88dda2d858ea..828b7be66dfc 100644
--- a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
+++ b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
@@ -7,5 +7,5 @@ LICENSE=BSD
RDEPEND=app-crypt/gnupg dev-lang/perl net-dns/bind-tools || ( net-misc/wget net-misc/curl )
SLOT=0
SRC_URI=https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.6.2.tar.gz -> clamav-unofficial-sigs-5.6.2.tar.gz
-_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
-_md5_=dac90635d7671743d0fbd45283cbb557
+_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f20aed0ada7e670657d5eb7170f13295
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index af0f84eb9d66..9ff5880e382e 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.16.0 b/metadata/md5-cache/app-arch/bloscpack-0.16.0
index c93ad7413336..c1fca3c472a3 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.16.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.16.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blosc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/blosc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/blosc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DESCRIPTION=Command line interface for Blosc compression
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.16.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=603814f20002484377ef0cc7a2487e03
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.6-r1 b/metadata/md5-cache/app-arch/brotli-1.0.6-r1
index 59d4fbb6dd5b..c49f06e8de03 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.6-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 py
RESTRICT=!test? ( test )
SLOT=0/1
SRC_URI=https://github.com/google/brotli/archive/v1.0.6.tar.gz -> brotli-1.0.6.tar.gz
-_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=76ed666d851d94849a5ec63b52b19202
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.7 b/metadata/md5-cache/app-arch/brotli-1.0.7
index 8ae7f7d4ed43..da6b436ad16a 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.7
+++ b/metadata/md5-cache/app-arch/brotli-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 py
RESTRICT=!test? ( test )
SLOT=0/1
SRC_URI=https://github.com/google/brotli/archive/v1.0.7.tar.gz -> brotli-1.0.7.tar.gz
-_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=464a2428ac81213732faf654dc648a87
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index aa3dbc9ff190..fc9203f39991 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -11,5 +11,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
RESTRICT=!test? ( test )
SLOT=0/9999
-_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b distutils-r1 c576838cd67e384002a18edd54be710e eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b distutils-r1 24ad93542cf9d80a03d58784093b1d44 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=4b7f208f2028bf5f1b82d894039a3110
diff --git a/metadata/md5-cache/app-arch/deb2targz-1-r2 b/metadata/md5-cache/app-arch/deb2targz-1-r2
deleted file mode 100644
index c9c14b10a082..000000000000
--- a/metadata/md5-cache/app-arch/deb2targz-1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Convert a .deb file to a .tar.gz archive
-EAPI=4
-HOMEPAGE=http://www.miketaylor.org.uk/tech/deb/
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.miketaylor.org.uk/tech/deb/deb2targz
-_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11e3ae92d4c35e72045029aa74ba7a63
diff --git a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3 b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3
index 8304926e3324..2ece8fd94bf1 100644
--- a/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3
+++ b/metadata/md5-cache/app-arch/ipkg-utils-1.7.050831-r3
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( app-crypt/gnupg net-misc/curl ) python_targets_python2_7? (
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://handhelds.org/download/packages/ipkg-utils/ipkg-utils-050831.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=82ee837107ff570b035db3abff03553f
diff --git a/metadata/md5-cache/app-arch/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index 70dee50b1b37..7d9ae12b026a 100644
--- a/metadata/md5-cache/app-arch/patool-1.12
+++ b/metadata/md5-cache/app-arch/patool-1.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
SLOT=0
SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=2dad42ecdfb68b449a06c546559e0699
diff --git a/metadata/md5-cache/app-arch/tar-1.32 b/metadata/md5-cache/app-arch/tar-1.32
index 6c9a459102a0..98f1e69a13b6 100644
--- a/metadata/md5-cache/app-arch/tar-1.32
+++ b/metadata/md5-cache/app-arch/tar-1.32
@@ -10,4 +10,4 @@ RDEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=mirror://gnu/tar/tar-1.32.tar.bz2 mirror://gnu-alpha/tar/tar-1.32.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a432a60e3f402d9cb3501db5acf20c6
+_md5_=9e3285101be44127e2f53ab25467803c
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index e0fd23c3c556..77b5ccd97a74 100644
--- a/metadata/md5-cache/app-arch/tardelta-1.0.1
+++ b/metadata/md5-cache/app-arch/tardelta-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/zmedico/tardelta/archive/1.0.1.tar.gz -> tardelta-1.0.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=39977c3464cc742f21350749ba4bd940
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p25 b/metadata/md5-cache/app-arch/unzip-6.0_p25
index 668192b7ea36..ffe91414818b 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0_p25
+++ b/metadata/md5-cache/app-arch/unzip-6.0_p25
@@ -4,10 +4,10 @@ DESCRIPTION=unzipper for pkzip-compressed files
EAPI=7
HOMEPAGE=http://www.info-zip.org/
IUSE=bzip2 natspec unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux
LICENSE=Info-ZIP
RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
SLOT=0
SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-25.debian.tar.xz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2fdf32800af8b752621321c8c1b9cbce
+_md5_=daddb3ec2fdfac3e13d6d1c165da9e6e
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index 1dbc0ac1151e..65a2b3a8b954 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=204417b7a10ff98942c3538e0b717277
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index c3476be58e41..a44b0526e06a 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=204417b7a10ff98942c3538e0b717277
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 188ed61df216..15699a8a5df3 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.9 b/metadata/md5-cache/app-backup/amanda-3.3.9
index 936a52e48110..b37d40b72d89 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.9
+++ b/metadata/md5-cache/app-backup/amanda-3.3.9
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.3.9.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=b65fac9693829ba8716af35775bf80de
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.1 b/metadata/md5-cache/app-backup/amanda-3.4.1
index c44e3de112ba..ee4bbe9b2597 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.1
+++ b/metadata/md5-cache/app-backup/amanda-3.4.1
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.4.1.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=b584997545ad4986d2cbef760d14a0ea
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.2 b/metadata/md5-cache/app-backup/amanda-3.4.2
index b17631e057ca..6c4334bb9d08 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.2
+++ b/metadata/md5-cache/app-backup/amanda-3.4.2
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.4.2.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.3 b/metadata/md5-cache/app-backup/amanda-3.4.3
index 80d4dbe65c63..0ec241b5edff 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.3
+++ b/metadata/md5-cache/app-backup/amanda-3.4.3
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.4.3.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.4 b/metadata/md5-cache/app-backup/amanda-3.4.4
index ca87cadbd658..ab37cc4017bb 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.4
+++ b/metadata/md5-cache/app-backup/amanda-3.4.4
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.4.4.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.5 b/metadata/md5-cache/app-backup/amanda-3.4.5
index 589e9479139a..9906cf2e865f 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.5
+++ b/metadata/md5-cache/app-backup/amanda-3.4.5
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.4.5.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.5-r1 b/metadata/md5-cache/app-backup/amanda-3.5-r1
index 80a8c036f81c..3c78fb680bba 100644
--- a/metadata/md5-cache/app-backup/amanda-3.5-r1
+++ b/metadata/md5-cache/app-backup/amanda-3.5-r1
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.5.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=a27d9fc5ef1307e28f4a4917c21df8f4
diff --git a/metadata/md5-cache/app-backup/amanda-3.5.1-r1 b/metadata/md5-cache/app-backup/amanda-3.5.1-r1
index a1bc7b03032f..2c1b1ddb7cbd 100644
--- a/metadata/md5-cache/app-backup/amanda-3.5.1-r1
+++ b/metadata/md5-cache/app-backup/amanda-3.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.5.1.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1d25e99498136e41876b5bebd3807c3e
diff --git a/metadata/md5-cache/app-backup/attic-0.16-r1 b/metadata/md5-cache/app-backup/attic-0.16-r1
index bb617a6ad005..c5a5b9afc86f 100644
--- a/metadata/md5-cache/app-backup/attic-0.16-r1
+++ b/metadata/md5-cache/app-backup/attic-0.16-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/msgpack[python_targets_python3_6(-)?,-python_single_target_py
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/jborg/attic/archive/0.16.tar.gz -> attic-0.16.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=8865603ff2c2a299a52ba363a0441bfb
diff --git a/metadata/md5-cache/app-backup/attic-9999 b/metadata/md5-cache/app-backup/attic-9999
index 33c929a33afc..bbab5ae40331 100644
--- a/metadata/md5-cache/app-backup/attic-9999
+++ b/metadata/md5-cache/app-backup/attic-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
RDEPEND=dev-python/msgpack[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=8865603ff2c2a299a52ba363a0441bfb
diff --git a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5 b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
index b8e36754ed64..b6cc62699304 100644
--- a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
+++ b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/CGI dev-perl/libwww-perl app-arch/tar app-arch/par2cmdline app-arch/gzip app-arch/bzip2 virtual/mta >=www-apache/mod_perl-2.0.9 www-apache/mpm_itk || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_fcgid] ) net-misc/rsync dev-perl/File-RsyncP rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba ) =www-servers/apache-2.4*
SLOT=0
SRC_URI=mirror://sourceforge/backuppc/BackupPC-3.3.1.tar.gz
-_eclasses_=depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=d8f94c6786f934899e2da3a3a53d97fa
diff --git a/metadata/md5-cache/app-backup/bacula-9.0.8-r1 b/metadata/md5-cache/app-backup/bacula-9.0.8-r1
index 5d22a5f638c7..eb0ead9e45d2 100644
--- a/metadata/md5-cache/app-backup/bacula-9.0.8-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[thr
REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
SLOT=0
SRC_URI=mirror://sourceforge/bacula/bacula-9.0.8.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=1e55956ace08d90661229fcc319a90cc
diff --git a/metadata/md5-cache/app-backup/bacula-9.2.2-r2 b/metadata/md5-cache/app-backup/bacula-9.2.2-r2
index d9cb42465df1..0b65bd91b1db 100644
--- a/metadata/md5-cache/app-backup/bacula-9.2.2-r2
+++ b/metadata/md5-cache/app-backup/bacula-9.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
SLOT=0
SRC_URI=mirror://sourceforge/bacula/bacula-9.2.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=efe454172c1cc9fe552811ad40d581a2
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.1-r2 b/metadata/md5-cache/app-backup/bacula-9.4.1-r2
index 801c26bfb513..983b17600345 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.1-r2
+++ b/metadata/md5-cache/app-backup/bacula-9.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
SLOT=0
SRC_URI=mirror://sourceforge/bacula/bacula-9.4.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=5341698c9e3295df70b6dddbd960d685
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.2-r1 b/metadata/md5-cache/app-backup/bacula-9.4.2-r1
index d9f96442fef7..3f3d3cbc060b 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.2-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
SLOT=0
SRC_URI=mirror://sourceforge/bacula/bacula-9.4.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=328398c092090cac1e669d87cbb0aa3e
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.3-r1 b/metadata/md5-cache/app-backup/bacula-9.4.3-r1
index 5d218dddbbb8..e85120120af3 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.3-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
SLOT=0
SRC_URI=mirror://sourceforge/bacula/bacula-9.4.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=328398c092090cac1e669d87cbb0aa3e
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.4-r1 b/metadata/md5-cache/app-backup/bacula-9.4.4-r1
index 4b575b6a40d0..099b7a6d873e 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.4-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
SLOT=0
SRC_URI=mirror://sourceforge/bacula/bacula-9.4.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=328398c092090cac1e669d87cbb0aa3e
diff --git a/metadata/md5-cache/app-backup/bareos-16.2.7-r1 b/metadata/md5-cache/app-backup/bareos-16.2.7-r1
index f5eff7f4c4df..dbe297afae62 100644
--- a/metadata/md5-cache/app-backup/bareos-16.2.7-r1
+++ b/metadata/md5-cache/app-backup/bareos-16.2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_
RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/bareos/bareos/archive/Release/16.2.7.tar.gz -> bareos-16.2.7.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=cde531c76e1337ab71e3b5a3a3537ebb
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.6 b/metadata/md5-cache/app-backup/bareos-17.2.6
index bfbec531d852..65ef14422b6a 100644
--- a/metadata/md5-cache/app-backup/bareos-17.2.6
+++ b/metadata/md5-cache/app-backup/bareos-17.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_
RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.6.tar.gz -> bareos-17.2.6.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=f917c58488b59d52888ebac57a1de8f8
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.7-r1 b/metadata/md5-cache/app-backup/bareos-17.2.7-r1
index db97750006aa..4efeed057fcb 100644
--- a/metadata/md5-cache/app-backup/bareos-17.2.7-r1
+++ b/metadata/md5-cache/app-backup/bareos-17.2.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_
RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.7.tar.gz -> bareos-17.2.7.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=0bc7b49f771edd0d2dc4b07376044cd2
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.6 b/metadata/md5-cache/app-backup/bareos-18.2.6
index fe45e95848ff..c734f3295412 100644
--- a/metadata/md5-cache/app-backup/bareos-18.2.6
+++ b/metadata/md5-cache/app-backup/bareos-18.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_
RESTRICT=mirror
SLOT=0
SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.6.tar.gz -> bareos-18.2.6.tar.gz
-_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=fefcd7ecec39df66f464ea6d4bb0fb13
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1 b/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
index 2acbc2d226d2..34278338cc01 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.10.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=fdec81cf103f66a0986666c5e68db4cf
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index 4cad7568c5f1..b728414a87f9 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=4a7fc5785a88a5e37dbc9caa1fd58ef4
diff --git a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2 b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
index aa1734fd0372..fa45e553399a 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
+++ b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_6(-)?,-python_single_target
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=173f737917ea2d4ca4d41f9c00280bd7
diff --git a/metadata/md5-cache/app-backup/borgweb-0.3.0 b/metadata/md5-cache/app-backup/borgweb-0.3.0
index 169eb1b83042..26f22544867b 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.3.0
+++ b/metadata/md5-cache/app-backup/borgweb-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-backup/borgbackup[python_targets_python3_6(-)?,-python_single_target
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/b/borgweb/borgweb-0.3.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=173f737917ea2d4ca4d41f9c00280bd7
diff --git a/metadata/md5-cache/app-backup/burp-2.2.18 b/metadata/md5-cache/app-backup/burp-2.2.18
index 63e133dcacb7..85d1904a6c16 100644
--- a/metadata/md5-cache/app-backup/burp-2.2.18
+++ b/metadata/md5-cache/app-backup/burp-2.2.18
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !lib
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/grke/burp/archive/2.2.18.tar.gz -> burp-2.2.18.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=22ae41112f789d8d9bf15c6d6ca9a6e5
diff --git a/metadata/md5-cache/app-backup/buttersink-0.6.8 b/metadata/md5-cache/app-backup/buttersink-0.6.8
index 0eb4faf75d5b..b76b387ebeea 100644
--- a/metadata/md5-cache/app-backup/buttersink-0.6.8
+++ b/metadata/md5-cache/app-backup/buttersink-0.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/AmesCornish/buttersink/archive/0.6.8.tar.gz -> buttersink-0.6.8.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/metadata/md5-cache/app-backup/buttersink-9999 b/metadata/md5-cache/app-backup/buttersink-9999
index 1d35cf76d404..eff3ca5cce85 100644
--- a/metadata/md5-cache/app-backup/buttersink-9999
+++ b/metadata/md5-cache/app-backup/buttersink-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=test
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/metadata/md5-cache/app-backup/cachedir-1.4 b/metadata/md5-cache/app-backup/cachedir-1.4
index 8f92b4b51aa6..c6e60a6feece 100644
--- a/metadata/md5-cache/app-backup/cachedir-1.4
+++ b/metadata/md5-cache/app-backup/cachedir-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
RESTRICT=test
SLOT=0
SRC_URI=http://git.liw.fi/cachedir/snapshot/cachedir-1.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=1bb018c7fde1c77c33194adcd32e43b5
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.10 b/metadata/md5-cache/app-backup/duplicity-0.7.10
index a596c644dc8e..094fbb9a7483 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.10
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.10/+download/duplicity-0.7.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=aed624d18e819366f14cf2fa8a6d72a4
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.12 b/metadata/md5-cache/app-backup/duplicity-0.7.12
index bae0351e50cd..3311892389ae 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.12
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.12/+download/duplicity-0.7.12.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=04671167139db67828ed20eeb3d3a8f5
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.19 b/metadata/md5-cache/app-backup/duplicity-0.7.19
index 8a9c418aa8a7..17152e7b4ea3 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.19
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.19/+download/duplicity-0.7.19.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=df72271c057b5e5a96c991ba35217f2c
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.09-r1 b/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
index 9b4363506525..3ee9d5268d9f 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
RESTRICT=test
SLOT=0
SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.09/+download/duplicity-0.8.09.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=7ef135ac6e5142a41f1f1d3d4d0d0c51
diff --git a/metadata/md5-cache/app-backup/genbackupdata-1.9 b/metadata/md5-cache/app-backup/genbackupdata-1.9
index b623c8858c12..860741700f74 100644
--- a/metadata/md5-cache/app-backup/genbackupdata-1.9
+++ b/metadata/md5-cache/app-backup/genbackupdata-1.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://debian/pool/main/g/genbackupdata/genbackupdata_1.9.orig.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=e0c5521315e7dd45912a07750ec55a43
diff --git a/metadata/md5-cache/app-backup/holland-1.0.10 b/metadata/md5-cache/app-backup/holland-1.0.10
index 416117fdd1bc..c8c9f3104a02 100644
--- a/metadata/md5-cache/app-backup/holland-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=postgres? ( ~app-backup/holland-backup-pgdump-1.0.10[python_targets_pyth
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=5aa2d950ef2698dc505f5760067ddaa1
diff --git a/metadata/md5-cache/app-backup/holland-backup-example-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-example-1.0.10
index 0c69d0aee265..5f235ebf381b 100644
--- a/metadata/md5-cache/app-backup/holland-backup-example-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-example-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=aac86b125f494bee7bf31c414293ec8c
diff --git a/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
index 6a80e7f0778e..67442943d356 100644
--- a/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-pgdump-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=~app-backup/holland-lib-common-1.0.10[python_targets_python2_7(-)?,-pyth
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f20c4732dfeb74ba12b441b9b9698624
diff --git a/metadata/md5-cache/app-backup/holland-backup-random-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-random-1.0.10
index d7537194502c..fb353d95efe4 100644
--- a/metadata/md5-cache/app-backup/holland-backup-random-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-random-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=d94e51417dcb2846926819b89073b2ed
diff --git a/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10 b/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
index 86276bbd6b7c..d80e9f662791 100644
--- a/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-backup-sqlite-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=~app-backup/holland-lib-common-1.0.10[python_targets_python2_7(-)?,-pyth
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=cda5ed2e673393144b38f2dfbc36baa2
diff --git a/metadata/md5-cache/app-backup/holland-lib-common-1.0.10 b/metadata/md5-cache/app-backup/holland-lib-common-1.0.10
index e6399b83cda5..c4723e4e8ab7 100644
--- a/metadata/md5-cache/app-backup/holland-lib-common-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-lib-common-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=3c58f13ac52095bff02ef2c9da75d150
diff --git a/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10 b/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10
index 90fc75a3b9b6..c7d45c03baf9 100644
--- a/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10
+++ b/metadata/md5-cache/app-backup/holland-lib-lvm-1.0.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://hollandbackup.org/releases/stable/1.0/holland-1.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=38ee29ab792df5a754296120689ecd76
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3 b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
index ff7b63aad81c..da4cce5dab41 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
@@ -11,5 +11,5 @@ RDEPEND=net-libs/librsync:0= dev-python/pylibacl[python_targets_python2_7(-)?,-p
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1.3.3.tar.gz -> rdiff-backup-1.3.3.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=29cc6cc2986729b5975591ada15e959e
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta b/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta
index e16691db83c4..1aab29d965a6 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/librsync-1.0:0= dev-python/pylibacl[python_targets_python3_6(
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v1.4.0.beta/rdiff-backup-1.4.0b0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=ab80577a6fa22ca2bdcd789fb292c787
diff --git a/metadata/md5-cache/app-backup/tsm-7.1.8.0 b/metadata/md5-cache/app-backup/tsm-7.1.8.0
index c0f14f96de7c..f1ef5113b7f8 100644
--- a/metadata/md5-cache/app-backup/tsm-7.1.8.0
+++ b/metadata/md5-cache/app-backup/tsm-7.1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java
RESTRICT=strip
SLOT=0
SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v7r1/Linux/LinuxX86/BA/v718/7.1.8.0-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils a41d1fd1c111289ffa04490de6ee79d7 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 rpm f52cfa3a435468d86d3b49c357b9cb35 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils a41d1fd1c111289ffa04490de6ee79d7 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 rpm f52cfa3a435468d86d3b49c357b9cb35 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=441467ba4e841e50c28cf689f3b674b7
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0 b/metadata/md5-cache/app-backup/tsm-8.1.6.0
index fd9a37831e30..85177a34bca8 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.6.0
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java
RESTRICT=strip
SLOT=0
SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils a41d1fd1c111289ffa04490de6ee79d7 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 rpm f52cfa3a435468d86d3b49c357b9cb35 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e pax-utils a41d1fd1c111289ffa04490de6ee79d7 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 rpm f52cfa3a435468d86d3b49c357b9cb35 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=b256c5e7d57b100e100fae7d356bee1b
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10 b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10
index f08646de8361..672f54ecc92a 100644
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/pyt
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.10.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=6e6c0c89c53f5dba4aa42a2736a90f35
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index ac57110abf68..a684cc2231cb 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/sync2cd-1.3-r1 b/metadata/md5-cache/app-cdr/sync2cd-1.3-r1
index f67a2f8fec62..207e888bd819 100644
--- a/metadata/md5-cache/app-cdr/sync2cd-1.3-r1
+++ b/metadata/md5-cache/app-cdr/sync2cd-1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/eject cdr? ( virtual/cdrtools ) dvdr? ( app-cdr/dvd+rw-tools ) p
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://www.calins.ch/download/sync2cd/sync2cd-1.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f83a321d1d1de9c6b6a900574d133c58
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e1da556c4bff..c025ef85f344 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-0.39.0 b/metadata/md5-cache/app-crypt/acme-0.39.0
index 3e9197dc8d91..baf79343b2d0 100644
--- a/metadata/md5-cache/app-crypt/acme-0.39.0
+++ b/metadata/md5-cache/app-crypt/acme-0.39.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-0.39.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=18bebddd3b3f68b50d8d7c9c29cd1fc3
diff --git a/metadata/md5-cache/app-crypt/acme-0.40.1 b/metadata/md5-cache/app-crypt/acme-0.40.1
index 41bd650aba66..601ad9f021df 100644
--- a/metadata/md5-cache/app-crypt/acme-0.40.1
+++ b/metadata/md5-cache/app-crypt/acme-0.40.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v0.40.1.tar.gz -> certbot-0.40.1.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=18bebddd3b3f68b50d8d7c9c29cd1fc3
diff --git a/metadata/md5-cache/app-crypt/acme-1.0.0 b/metadata/md5-cache/app-crypt/acme-1.0.0
index ccf0a8955e77..1cc580caf8ff 100644
--- a/metadata/md5-cache/app-crypt/acme-1.0.0
+++ b/metadata/md5-cache/app-crypt/acme-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=18bebddd3b3f68b50d8d7c9c29cd1fc3
diff --git a/metadata/md5-cache/app-crypt/acme-1.1.0 b/metadata/md5-cache/app-crypt/acme-1.1.0
index 7b18be7aee79..6b30d6134a47 100644
--- a/metadata/md5-cache/app-crypt/acme-1.1.0
+++ b/metadata/md5-cache/app-crypt/acme-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=4b9900ceea87f3800a1505334194e907
diff --git a/metadata/md5-cache/app-crypt/acme-1.2.0 b/metadata/md5-cache/app-crypt/acme-1.2.0
index b31b3aa800fc..5cc99f8d8287 100644
--- a/metadata/md5-cache/app-crypt/acme-1.2.0
+++ b/metadata/md5-cache/app-crypt/acme-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=4b9900ceea87f3800a1505334194e907
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 541a84f39b77..e8080fe57b2b 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targ
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
RESTRICT=!test? ( test )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=4b9900ceea87f3800a1505334194e907
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-4.0.3 b/metadata/md5-cache/app-crypt/acme-tiny-4.0.3
index e984252f8db3..56e4eb270c86 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-4.0.3
+++ b/metadata/md5-cache/app-crypt/acme-tiny-4.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/diafygi/acme-tiny/archive/4.0.3.tar.gz -> acme-tiny-4.0.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=59bb705f0377958b304bdd1c79ddb963
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-4.0.4 b/metadata/md5-cache/app-crypt/acme-tiny-4.0.4
index c462b4dbb47c..853f846c285e 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-4.0.4
+++ b/metadata/md5-cache/app-crypt/acme-tiny-4.0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/diafygi/acme-tiny/archive/4.0.4.tar.gz -> acme-tiny-4.0.4.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=e471ff95fbc0865cd0c39ab1bf3663f0
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-9999 b/metadata/md5-cache/app-crypt/acme-tiny-9999
index e88729ce15e4..045cb5c0a699 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-9999
+++ b/metadata/md5-cache/app-crypt/acme-tiny-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=7ab620d0e72af0b6043bd8bc9c3db7bd
diff --git a/metadata/md5-cache/app-crypt/certbot-0.39.0 b/metadata/md5-cache/app-crypt/certbot-0.39.0
index 045f0cc9461d..07f5b718d0e8 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.39.0
+++ b/metadata/md5-cache/app-crypt/certbot-0.39.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-0.39.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=df87ff79a87fa2557ff77e4332a95662
diff --git a/metadata/md5-cache/app-crypt/certbot-0.40.1 b/metadata/md5-cache/app-crypt/certbot-0.40.1
index 9fcc2a550cba..c3b6f6e131e7 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.40.1
+++ b/metadata/md5-cache/app-crypt/certbot-0.40.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v0.40.1.tar.gz -> certbot-0.40.1.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=745efd96ff4002b0f017a52d8cc75b1e
diff --git a/metadata/md5-cache/app-crypt/certbot-1.0.0-r1 b/metadata/md5-cache/app-crypt/certbot-1.0.0-r1
index 7e07145cbcbf..48da643fdf49 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.0.0-r1
+++ b/metadata/md5-cache/app-crypt/certbot-1.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=5bd3f1931cd44fbfbc89b62857dd8574
diff --git a/metadata/md5-cache/app-crypt/certbot-1.1.0 b/metadata/md5-cache/app-crypt/certbot-1.1.0
index f59cbcec0d18..f0a1d1b6b640 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.1.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=a107143d0a5b67e2a7c9eff2ea029810
diff --git a/metadata/md5-cache/app-crypt/certbot-1.2.0-r1 b/metadata/md5-cache/app-crypt/certbot-1.2.0-r1
index 7aea5cd63358..9533c09663c7 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.2.0-r1
+++ b/metadata/md5-cache/app-crypt/certbot-1.2.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=ad190bc164933bad7d3f47e044308ff1
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index cf13cbe61eca..ba8b0ee2369a 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=ad190bc164933bad7d3f47e044308ff1
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.0.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.0.0
index 32bb91b70e0e..817885eddefd 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.0.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=6f3f74f9a438622376ec1c9b50b0253d
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.1.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.1.0
index 8be5442fc043..e94e63e4c139 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.1.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=945bf5afdb0d62e10227ff9eeb4e2e92
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.2.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.2.0
index 06707363f033..910300009d12 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.2.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=961af3924a6252fa7815fefbd77c4724
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index bab47364f6b7..c92ae51b4a34 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_pyth
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=961af3924a6252fa7815fefbd77c4724
diff --git a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0 b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0
index bb93bd131981..948fb002274c 100644
--- a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0
+++ b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-1.0[python_targets_python3_6(-)?,-python_single_
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-dns-nsone-0.39.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=3dc6d94492cb113dcd3cbb8a24a3485c
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0
index 950f239ccd50..4fd618098dfa 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=b18445ea0069ce1a7c1b127209581eb0
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0
index 4c743293331d..51267438ed94 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=1649e29a0d825e12b4d662c36c45b01c
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0
index e58a4b1146ff..0207f562c88c 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=f206d2181e2c25fa152bb636fd024ba9
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index 86c702583870..536bd0f50118 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=f206d2181e2c25fa152bb636fd024ba9
diff --git a/metadata/md5-cache/app-crypt/dehydrated-0.6.5 b/metadata/md5-cache/app-crypt/dehydrated-0.6.5
index 92f847b89056..af0531ada3a8 100644
--- a/metadata/md5-cache/app-crypt/dehydrated-0.6.5
+++ b/metadata/md5-cache/app-crypt/dehydrated-0.6.5
@@ -9,5 +9,5 @@ LICENSE=MIT
RDEPEND=cron? ( virtual/cron ) app-shells/bash net-misc/curl
SLOT=0
SRC_URI=https://github.com/lukas2511/dehydrated/archive/v0.6.5.tar.gz -> dehydrated-0.6.5.tar.gz
-_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8c2000a9ecb11380a92fd3cfb213d9e8
diff --git a/metadata/md5-cache/app-crypt/gcr-3.20.0 b/metadata/md5-cache/app-crypt/gcr-3.20.0
deleted file mode 100644
index 71c244ab6d6d..000000000000
--- a/metadata/md5-cache/app-crypt/gcr-3.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/gobject-introspection-common dev-libs/libxslt dev-libs/vala-common dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gcr
-IUSE=debug gtk +introspection vala test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) !=dev-python/pyGPG-0.2[python_targets_python3_6(-)?,-pyt
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~dolsen/releases/gkeys/gkeys-0.2.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f0262d1442ac9a95f359e0780a1fb613
diff --git a/metadata/md5-cache/app-crypt/gkeys-9999 b/metadata/md5-cache/app-crypt/gkeys-9999
index c1915e7517bb..af1752394e9d 100644
--- a/metadata/md5-cache/app-crypt/gkeys-9999
+++ b/metadata/md5-cache/app-crypt/gkeys-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
RDEPEND=app-crypt/gnupg =dev-python/pyGPG-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-python/ssl-fetch-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=app-crypt/gentoo-keys-201501052117 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=b4cbaece5932b9f2a07dd72b6abb8873
diff --git a/metadata/md5-cache/app-crypt/glep63-check-9 b/metadata/md5-cache/app-crypt/glep63-check-9
index fa72c7798ad3..42d540a78d72 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-9
+++ b/metadata/md5-cache/app-crypt/glep63-check-9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( pytho
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/mgorny/glep63-check/archive/v9.tar.gz -> glep63-check-9.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=768c71b497c5acdcbec15e0711622ef3
diff --git a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2 b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
index e636ef79948c..5efb8888fb9d 100644
--- a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
+++ b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
@@ -10,5 +10,5 @@ LICENSE=BSD
RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=
SLOT=0
SRC_URI=https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-0.9.2/gnupg-pkcs11-scd-0.9.2.tar.bz2
-_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=fa3feabde1839e23059ab8b2aad72a7e
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.0 b/metadata/md5-cache/app-crypt/gpgme-1.13.0
index 20ef881a5812..f414812a77cb 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error
REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
SLOT=1/11
SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.0.tar.bz2
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=2b21a23aa1d3809ca7615a065ecb80eb
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1 b/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
index 2f9f32319211..51e2cba16324 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
SLOT=1/11
SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.0.tar.bz2
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=f09faea30f4e00d95b15ef8e7b1d0ac7
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.1 b/metadata/md5-cache/app-crypt/gpgme-1.13.1
index 8ea0fa8bb407..4755d897c6ce 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
SLOT=1/11
SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.1.tar.bz2
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=e853a2bc0706410503293628dbf3d3e2
diff --git a/metadata/md5-cache/app-crypt/manuale-1.1.0 b/metadata/md5-cache/app-crypt/manuale-1.1.0
index d44c9ac631e2..c5013b14bd1b 100644
--- a/metadata/md5-cache/app-crypt/manuale-1.1.0
+++ b/metadata/md5-cache/app-crypt/manuale-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target
REQUIRED_USE=|| ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/veeti/manuale/archive/1.1.0.tar.gz -> manuale-1.1.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=568f226cff5ad50bdc64fcdab3c69eed
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1 b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
index d13508e7813c..4f06c8d4d929 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg app-misc/lockfile-progs dev-perl/Crypt-OpenSSL-RSA dev-p
RESTRICT=test
SLOT=0
SRC_URI=http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=92d280bdf1d9e23a226db402cde1722b
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2 b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
index fc71a6d431db..6c026d596a6e 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Diges
RESTRICT=test
SLOT=0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=30bd9348cde168901cc5599226992248
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.37 b/metadata/md5-cache/app-crypt/monkeysphere-0.37
index 0f0ed0186a79..45b9016a27c6 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.37
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.37
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
RESTRICT=test
SLOT=0/0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=e86d1e4b88c1ef01657632f967844ace
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.38 b/metadata/md5-cache/app-crypt/monkeysphere-0.38
index e3aeec05c0e1..f9b5546f50f3 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.38
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.38
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
RESTRICT=test
SLOT=0/0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=d18de51849e6ea250bbc404dfdb2d477
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.39 b/metadata/md5-cache/app-crypt/monkeysphere-0.39
index 1ceb8c9ae35b..9dcea40db1d2 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.39
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.39
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
RESTRICT=test
SLOT=0/0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=df5cc7c52af46ded0cf6755b25595e8e
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.41 b/metadata/md5-cache/app-crypt/monkeysphere-0.41
index 0effbd5f3bca..ebb882db8d1d 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.41
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.41
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
RESTRICT=test
SLOT=0/0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=6f89b34157cd55d6e07eeea2ee2ab409
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.42 b/metadata/md5-cache/app-crypt/monkeysphere-0.42
index 3beaaa352b40..b59b1ce4fe82 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.42
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.42
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
RESTRICT=test
SLOT=0/0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.42.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.42.orig.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=d8d8bf2359661e53aa96e5c195a04da4
diff --git a/metadata/md5-cache/app-crypt/pius-2.2.4 b/metadata/md5-cache/app-crypt/pius-2.2.4
index a6f1214caa2e..0f26a5b207ab 100644
--- a/metadata/md5-cache/app-crypt/pius-2.2.4
+++ b/metadata/md5-cache/app-crypt/pius-2.2.4
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2.0.0 dev-lang/perl python_targets_python2_7? ( >=dev-
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/jaymzh/pius/releases/download/v2.2.4/pius-2.2.4.tar.bz2
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=2f1d9819ff1dfae6fd0197e86f8960ce
diff --git a/metadata/md5-cache/app-crypt/rotix-0.83 b/metadata/md5-cache/app-crypt/rotix-0.83
index c89305fd31c4..6ebe94276dca 100644
--- a/metadata/md5-cache/app-crypt/rotix-0.83
+++ b/metadata/md5-cache/app-crypt/rotix-0.83
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
DEPEND=sys-devel/gettext
DESCRIPTION=Rotix allows you to generate rotational obfuscations
EAPI=5
-HOMEPAGE=https://gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
KEYWORDS=amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-devel/gettext
SLOT=0
SRC_URI=http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/rotix-0.83/rotix-0.83.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35324281e60e7027bbc1a7e45154d819
+_md5_=621230f475e879f45987e8d6b7f7053b
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
index 38efc0e2f076..937739d2794b 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=dev-libs/gmp:= modules? ( kernel_linux? ( virtual/modutils ) )
SLOT=0
SRC_URI=https://github.com/PeterHuewe/tpm-emulator/archive/v0.7.5.tar.gz -> tpm-emulator-0.7.5.tar.gz
-_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c udev 452708c3f55cf6e918b045adb949a9e6 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils be72eac95bd029ad1d81d5d656c3c83b desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b linux-info 953c3b1c472dcadbf62098a9301327f2 linux-mod 6c7b3e7b9d39bd049bf23a991c16315e ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c udev 452708c3f55cf6e918b045adb949a9e6 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=47a2448d9672ceca2ff10af54a9e705d
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
index d104eef5d90e..96e644f2d03d 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 GPL-2
RDEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:0= ) selinux? ( sec-policy/selinux-tcsd )
SLOT=0
SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c udev 452708c3f55cf6e918b045adb949a9e6 user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c udev 452708c3f55cf6e918b045adb949a9e6 user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8bc5db14fb74c249c500265b86a6b1e1
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
index 35eaf55eaa4b..1cd465fa59c5 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-3.1.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=9bc6b14cb34f579c961265269f026624
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3
deleted file mode 100644
index 48eb81b25481..000000000000
--- a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] =dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] =dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)] =dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)] =dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=OpenDict is a free cross-platform dictionary program
EAPI=6
HOMEPAGE=http://opendict.sourceforge.net/
IUSE=+python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] )
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://sourceforge/opendict/files/opendict-0.6.7.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=d53b4b3e46f145382187b0159dfbbdbb
+_md5_=2febad02402359a01ca1ae7bfa55967a
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 77afa29363f5..4136cff071fb 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/cppman-0.4.8 b/metadata/md5-cache/app-doc/cppman-0.4.8-r1
similarity index 56%
rename from metadata/md5-cache/app-doc/cppman-0.4.8
rename to metadata/md5-cache/app-doc/cppman-0.4.8-r1
index fe68d8c3f691..8ae2c03c3e79 100644
--- a/metadata/md5-cache/app-doc/cppman-0.4.8
+++ b/metadata/md5-cache/app-doc/cppman-0.4.8-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
DESCRIPTION=C++ man pages for Linux, with source from cplusplus.com and cppreference.com
EAPI=6
HOMEPAGE=https://github.com/aitjcize/cppman
IUSE=+python_targets_python3_6 +python_single_target_python3_6
KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
LICENSE=GPL-3
-RDEPEND=sys-apps/groff dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/html5lib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+RDEPEND=sys-apps/groff python_single_target_python3_6? ( dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/aitjcize/cppman/archive/0.4.8.tar.gz -> cppman-0.4.8.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0df65ec063da249b58be588159ebf9d
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=18a8baf347259bc6e0e578c761da8583
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 2e3e9677b3b1..e2fd868db26f 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/editra-0.7.20-r2 b/metadata/md5-cache/app-editors/editra-0.7.20-r2
index d5e3d61b38ed..aff2cb74ceb0 100644
--- a/metadata/md5-cache/app-editors/editra-0.7.20-r2
+++ b/metadata/md5-cache/app-editors/editra-0.7.20-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_targ
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://editra.org/uploads/src/Editra-0.7.20.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=f49f78075f06733e8b530fa4dfb2ab7b
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r18 b/metadata/md5-cache/app-editors/emacs-23.4-r18
index ef2d626b3067..8b515eca4362 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r18
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r18
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=23
SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b474abdaeafe0638fa5be92358ffe4bc
+_md5_=aed82537626df1c0719f4cfc236be551
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r7 b/metadata/md5-cache/app-editors/emacs-24.5-r7
index f90b71c8749c..7e9569c46d34 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r7
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r7
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=24
SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d705634f683a43431340333566e3f1ee
+_md5_=abd682ad919c6696182349004a72f84b
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r6 b/metadata/md5-cache/app-editors/emacs-25.3-r6
index cde00af40993..bac813fe3cdc 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r6
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r6
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=25
SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=434fda753337e54ae813c8582da8fa49
+_md5_=0874e3b1445e2dfe52c674e8054ca62d
diff --git a/metadata/md5-cache/app-editors/emacs-26.2 b/metadata/md5-cache/app-editors/emacs-26.2
index eaaee36df88d..4a2b133e2b81 100644
--- a/metadata/md5-cache/app-editors/emacs-26.2
+++ b/metadata/md5-cache/app-editors/emacs-26.2
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=26
SRC_URI=mirror://gnu/emacs/emacs-26.2.tar.xz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be46fe1459a28605a184d7f65882e4e0
+_md5_=45956c7a01d16c96a4e124b58f7ad82d
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r1 b/metadata/md5-cache/app-editors/emacs-26.3-r1
index 0ff11936d3ba..85b380eb04d9 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r1
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=26
SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b45cbc9f90cb8e2ed64aae1bf33de1a1
+_md5_=3dd6aba7e55de651f3db27ff8d5440f4
diff --git a/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223 b/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
index b43e8003b3fc..86044076d5aa 100644
--- a/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
+++ b/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=27-vcs
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-27.0.50_pre20191223.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-27.0.50_pre20191223.tar.xz
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d84750a9a1a05a231677c7005923c5c0
+_md5_=222a57ed205b553f077e4398ce87bed4
diff --git a/metadata/md5-cache/app-editors/emacs-27.0.9999-r1 b/metadata/md5-cache/app-editors/emacs-27.0.9999-r1
index afae90e894e5..c5afc084e707 100644
--- a/metadata/md5-cache/app-editors/emacs-27.0.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.0.9999-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
RESTRICT=test
SLOT=27-vcs
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b git-r3 809e27702c573cbba31c08ed00bbad33 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2df216ac9d95e120135763dd6b3de2e6
+_md5_=980efcddaf3fb0a75404be8015648b94
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index 0b6bc564280f..84232bebfd29 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
RESTRICT=test
SLOT=28-vcs
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c elisp-common a1054cff648e1c6a806e17001d052176 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b git-r3 809e27702c573cbba31c08ed00bbad33 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=38f055c9eef7f128a9dcdd48b070234f
+_md5_=253a12a267c7990a1d1d2403078fc0bf
diff --git a/metadata/md5-cache/app-editors/leo-5.6 b/metadata/md5-cache/app-editors/leo-5.6
index aa661ebc9968..3993b568be1b 100644
--- a/metadata/md5-cache/app-editors/leo-5.6
+++ b/metadata/md5-cache/app-editors/leo-5.6
@@ -10,5 +10,5 @@ RDEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_p
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/leo-editor/leo-editor/archive/5.6.tar.gz -> leo-5.6.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=c3f1e7cccfe38390a8760968bcbedb0f
diff --git a/metadata/md5-cache/app-editors/nano-4.8 b/metadata/md5-cache/app-editors/nano-4.8
new file mode 100644
index 000000000000..620cac4248ea
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-4.8
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=7
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
+SLOT=0
+SRC_URI=https://www.nano-editor.org/dist/v4/nano-4.8.tar.gz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dcde4baa9d0a25e3eec9c960555bae84
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r7 b/metadata/md5-cache/app-editors/nvi-1.81.6-r7
index e44a08d93eca..54c68446c34f 100644
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r7
+++ b/metadata/md5-cache/app-editors/nvi-1.81.6-r7
@@ -11,4 +11,4 @@ REQUIRED_USE=tcl? ( !unicode )
SLOT=0
SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c db-use 501a5d0963e0d17f30260023f292ae8e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14148360017bec721fcf0e5a1e94591c
+_md5_=a2f6753c5629899a236302dab88d6884
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.4 b/metadata/md5-cache/app-editors/qhexedit2-0.8.4
index 05b89f276b4e..0d0fbf1805f7 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.4
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.4
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/P
REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
SLOT=0
SRC_URI=https://github.com/lancos/qhexedit2/archive/v0.8.4.tar.gz -> qhexedit2-0.8.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=cbd7c67328b426b33662d5a2ce8b214c
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719 b/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719
index 90873eb2704f..cf885abb4b64 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( dev-python/P
REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
SLOT=0
SRC_URI=https://github.com/lancos/qhexedit2/archive/5f3ca79dbe8c765b685636a1751d242a6bfabb7d.tar.gz -> qhexedit2-0.8.4_p20170719.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=852f8b80f23cb2aac2e72b666a53b6c6
diff --git a/metadata/md5-cache/app-editors/retext-7.0.4-r1 b/metadata/md5-cache/app-editors/retext-7.0.4-r1
index a9bca9e6a6c0..b840733b07aa 100644
--- a/metadata/md5-cache/app-editors/retext-7.0.4-r1
+++ b/metadata/md5-cache/app-editors/retext-7.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/R/ReText/ReText-7.0.4.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=d9d9f5e0f9b2f09b28b32030dc777392
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index 73e73739036f..ae01fca42a1a 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=8c35a6b7c94abc23d803e25467bcbb20
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index c5c6ce8a59df..d2403653b117 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26 b/metadata/md5-cache/app-emacs/pymacs-0.26
index f683cc088b11..9abf9e38aa92 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:* python_targets_python2_7? ( >=dev-lang/python
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e elisp 17bb0076b1e93d2dba84995228871c99 elisp-common a1054cff648e1c6a806e17001d052176 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 elisp 17bb0076b1e93d2dba84995228871c99 elisp-common a1054cff648e1c6a806e17001d052176 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=e08f4a0ade4325913b6679a67ff8479e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index c540ff5caf8d..22b285ba3e1b 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/buildah-1.14.0 b/metadata/md5-cache/app-emulation/buildah-1.14.0
new file mode 100644
index 000000000000..a36a2c667a7c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/buildah-1.14.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=7
+HOMEPAGE=https://github.com/containers/buildah
+IUSE=selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.14.0.tar.gz -> buildah-1.14.0.tar.gz
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb go-module c1d483897ed4807f97f20fb3b5a3cb7b multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f068cfbaaca7866ddd06b0257b447886
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.34.0 b/metadata/md5-cache/app-emulation/cadvisor-0.34.0
index a19c75d147d2..c06e7aa17271 100644
--- a/metadata/md5-cache/app-emulation/cadvisor-0.34.0
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.34.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/google/cadvisor/archive/v0.34.0.tar.gz -> cadvisor-0.34.0.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-build dc25bafa8fc1305a4de66a0a448472e7 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-build dc25bafa8fc1305a4de66a0a448472e7 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f0c014a0b772057b07a57b43eb77fcb3
diff --git a/metadata/md5-cache/app-emulation/cloud-init-17.2 b/metadata/md5-cache/app-emulation/cloud-init-17.2
index 3dfb53a8e7a6..c68a90214652 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-17.2
+++ b/metadata/md5-cache/app-emulation/cloud-init-17.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=test
SLOT=0
SRC_URI=https://launchpad.net/cloud-init/trunk/17.2/+download/cloud-init-17.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=25a72f1028ccb2c4f143e9a5b189b194
diff --git a/metadata/md5-cache/app-emulation/cloud-init-18.4-r1 b/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
index e68fd2be65d7..9bfa23474378 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
+++ b/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://launchpad.net/cloud-init/trunk/18.4/+download/cloud-init-18.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=2a91bdd25c8b0284e7e960f6b175d74e
diff --git a/metadata/md5-cache/app-emulation/cloud-init-18.5 b/metadata/md5-cache/app-emulation/cloud-init-18.5
index 9fd4a161b7cb..d1d94bbaee56 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-18.5
+++ b/metadata/md5-cache/app-emulation/cloud-init-18.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://launchpad.net/cloud-init/trunk/18.5/+download/cloud-init-18.5.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=fdfd0ea4df5e424a91a05c23a40b8035
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index 5c48cd7c5077..3b24254af1d0 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_pyth
REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 c576838cd67e384002a18edd54be710e epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 24ad93542cf9d80a03d58784093b1d44 epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 809e27702c573cbba31c08ed00bbad33 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=1b116171014734b9f3ab7d86d3bb48be
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
index 7436799710c0..7b798f0502e8 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-12.5.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45a703cd8346292622a79e1c02b9ca8b
+_md5_=fa280dcadbec8e7364cd1cda8092f690
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
index bdbaaf7af024..8fd845b2a5c4 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-12.5.1.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
index e513ee0a5b4e..55c497b78b5f 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-13.0.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
index 517135705c44..ac13dd217824 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-13.0.1.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
index 6207fef01ee0..d4c279b58946 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-13.1.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
index 4042bfdeff15..c38a4a30a751 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-13.1.2.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
index 0a80feabdd6d..2f6b51c83299 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-13.1.3.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
index 0d10e23291e0..d6eda987992a 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-13.2.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1 b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
index 4c10665c9174..608c04e63749 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-14.0.3.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d87097ff798f5a41138f31b2d6cf7328
+_md5_=5e539a4afd878af39125d4c01af82bb5
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1 b/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
index 8e59545d55f3..163dab5cf324 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist fetch test
SLOT=0
SRC_URI=install-crossover-14.1.4.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f8bfb1a9c074ebbb2c4e0b2033a5001
+_md5_=76e507a9394a11abf6328940e334e230
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
index dd6ea8fde943..aec97e37e368 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.0.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf4e1a6d1acf81b82840768cda91d7bb
+_md5_=54de466ec26fa168c71ccecd7a888f40
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.0.1 b/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
index 568c540bac18..5a4c72971b82 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.0.1.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8abf0ad6d1006b84dd26dac3d15de1d
+_md5_=157beb283d880b6392a5644664bab39b
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.1.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
index 78f71c5d5dd9..19c46fd2b1f9 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.1.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8abf0ad6d1006b84dd26dac3d15de1d
+_md5_=157beb283d880b6392a5644664bab39b
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
index eb059adc3466..2ef16913f983 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.2.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=142a7a2d5ab415ff79ac0c06943f4157
+_md5_=b8e019148521e1efb27d8ea3c0ce2839
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.3.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
index 5a9bcf074ff6..7686e23012b4 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.3.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.3.1 b/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
index 5092da580fa2..63ac60f49cf3 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.3.1.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-16.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
index 2a84c544c971..3df262008807 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-16.0.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-16.2.5 b/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
index 347a317f268c..ba40b9d92cfd 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-16.2.5.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
index 614e736d5ff7..14eaa6299459 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b77210c33dc0f01286d154641f4a8007
+_md5_=13f2850b8e7558079f78e58d4b500032
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
index 638a10773e4b..d5652508baef 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.0.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=42d5a0ff03e55e59c67acf089a522e0a
+_md5_=55e2a332a5ba25dc3a70c910bb116114
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
index b6f3f620c3e6..4b44bc7eb303 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.1.bin
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fdb0d0641114106a1540cd2eda24728
+_md5_=665274301e8171ea1ac59517e5241b2d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
index 69e8abe672ed..e190f36c0787 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.0.0.bin
_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=7b31f7cab5050e8a32af051abbe12849
+_md5_=dedccc389a81f68b7398c7c19aa08189
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.1.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
index cc774d10f227..f3cde5e79abb 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.codeweavers.com/products/
IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=-* ~amd64 ~x86
LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=bindist test
SLOT=0
SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.1.0.bin
_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=7b31f7cab5050e8a32af051abbe12849
+_md5_=dedccc389a81f68b7398c7c19aa08189
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0
deleted file mode 100644
index 7949b2e66e2a..000000000000
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/perl app-arch/unzip
-DEFINED_PHASES=install nofetch postinst prepare setup unpack
-DESCRIPTION=Commercial version of app-emulation/wine with paid support.
-EAPI=7
-HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.5.0.bin
-_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=7b31f7cab5050e8a32af051abbe12849
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1 b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1
new file mode 100644
index 000000000000..8b8111ce93ec
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/perl app-arch/unzip
+DEFINED_PHASES=install nofetch postinst prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support.
+EAPI=7
+HOMEPAGE=https://www.codeweavers.com/products/
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.5.0.bin
+_eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c unpacker 3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=dedccc389a81f68b7398c7c19aa08189
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0
index 554381668044..a5d64d0f6e08 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.32.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=65abf78f27f3e035bda0c9e6199fd045
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0
index 4b6a75533afe..961cecf1d8a6 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.33.0.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=24110faede78fc272e61ffd955df5ea8
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-9999 b/metadata/md5-cache/app-emulation/diskimage-builder-9999
index 8a12de99c80f..4df33d3df0ec 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-9999
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/networkx-1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
SLOT=0
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=24110faede78fc272e61ffd955df5ea8
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.24.0 b/metadata/md5-cache/app-emulation/docker-compose-1.24.0
index 48430e626a84..78fd1f939f6f 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.24.0
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.24.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/docker/compose/archive/1.24.0.tar.gz -> docker-compose-1.24.0.tar.gz
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=9cfc0b5b7124459e2991784d339c7ce3
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.25.4 b/metadata/md5-cache/app-emulation/docker-compose-1.25.4
index 67b38423665a..21772be9fe6f 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.25.4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.25.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/docker/compose/archive/1.25.4.tar.gz -> docker-compose-1.25.4.tar.gz
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb distutils-r1 c576838cd67e384002a18edd54be710e multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb distutils-r1 24ad93542cf9d80a03d58784093b1d44 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 4eed5e0c72d4544a2291ae46515f5d79 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c
_md5_=e07737f8e38148a06f3e72676a5885c9
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.7.1 b/metadata/md5-cache/app-emulation/docker-registry-2.7.1
index a9fe40efbae4..2b10dbbf8a85 100644
--- a/metadata/md5-cache/app-emulation/docker-registry-2.7.1
+++ b/metadata/md5-cache/app-emulation/docker-registry-2.7.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB
RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/docker/distribution/archive/v2.7.1.tar.gz -> docker-registry-2.7.1.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=8d847022785a7d62805f9d4f3c9b8395
diff --git a/metadata/md5-cache/app-emulation/faudio-19.06 b/metadata/md5-cache/app-emulation/faudio-19.06
index 20ff1387c3e9..8ab248d2ab2a 100644
--- a/metadata/md5-cache/app-emulation/faudio-19.06
+++ b/metadata/md5-cache/app-emulation/faudio-19.06
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/FNA-XNA/FAudio/archive/19.06.tar.gz -> FAudio-19.06.tar.gz
_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d0c7a0e6c88569e63f6165f72fa046
+_md5_=7f7dde91cf16945f055e6f3bf8933154
diff --git a/metadata/md5-cache/app-emulation/faudio-19.09 b/metadata/md5-cache/app-emulation/faudio-19.09
index 6c4581c7182a..022e8612ac41 100644
--- a/metadata/md5-cache/app-emulation/faudio-19.09
+++ b/metadata/md5-cache/app-emulation/faudio-19.09
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/FNA-XNA/FAudio/archive/19.09.tar.gz -> FAudio-19.09.tar.gz
_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d0c7a0e6c88569e63f6165f72fa046
+_md5_=7f7dde91cf16945f055e6f3bf8933154
diff --git a/metadata/md5-cache/app-emulation/faudio-9999 b/metadata/md5-cache/app-emulation/faudio-9999
index 5abc9d2a21cb..18e13e44f0f9 100644
--- a/metadata/md5-cache/app-emulation/faudio-9999
+++ b/metadata/md5-cache/app-emulation/faudio-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
RESTRICT=!test? ( test )
SLOT=0
_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils be72eac95bd029ad1d81d5d656c3c83b eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic dc34234e8c43343da45853da22dcf14b git-r3 809e27702c573cbba31c08ed00bbad33 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multilib-build 02d2553a7a1865bb34733f40f54b9491 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c virtualx e49dbce7ac14426e1155497476915307 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d0c7a0e6c88569e63f6165f72fa046
+_md5_=7f7dde91cf16945f055e6f3bf8933154
diff --git a/metadata/md5-cache/app-emulation/flannel-0.11.0 b/metadata/md5-cache/app-emulation/flannel-0.11.0
index ba54b54c09ff..66c497295b5a 100644
--- a/metadata/md5-cache/app-emulation/flannel-0.11.0
+++ b/metadata/md5-cache/app-emulation/flannel-0.11.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD ISC LGPL-3 MIT
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/coreos/flannel/archive/v0.11.0.tar.gz -> flannel-0.11.0.tar.gz
-_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
_md5_=f62ab93e1ddd36f1622752298581b56b
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2
deleted file mode 100644
index bb703679f8a4..000000000000
--- a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-devel/gettext
-DESCRIPTION=PyQt5-based launcher for FS-UAE
-EAPI=7
-HOMEPAGE=https://fs-uae.net/
-IUSE=lha python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-emulation/fs-uae dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] lha? ( dev-python/python-lhafile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://fs-uae.net/stable/3.0.2/fs-uae-launcher-3.0.2.tar.gz
-_eclasses_=distutils-r1 c576838cd67e384002a18edd54be710e multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4e7a793a7a341ee571798f22b941b5d
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2-r1 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2-r1
new file mode 100644
index 000000000000..a0f1c0c7702d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/gettext
+DESCRIPTION=PyQt5-based launcher for FS-UAE
+EAPI=7
+HOMEPAGE=https://fs-uae.net/
+IUSE=lha python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-emulation/fs-uae python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] lha? ( dev-python/python-lhafile[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] lha? ( dev-python/python-lhafile[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://fs-uae.net/stable/3.0.2/fs-uae-launcher-3.0.2.tar.gz
+_eclasses_=distutils-r1 24ad93542cf9d80a03d58784093b1d44 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=64ae5cdc4903e4b14bd7514f8935c163
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8 b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
deleted file mode 100644
index e8e405e858c4..000000000000
--- a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= =dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-1.0.1.0:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-1.0.1:0= =dev-haskell/snap-server-1.0.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= =dev-haskell/test-framework-hunit-0.2.7:0= =dev-haskell/test-framework-quickcheck2-0.2.12.1:0= =dev-haskell/hunit-1.2.4.2:0= =dev-haskell/quickcheck-2.4.2:2= =net-misc/socat-1.7 dev-util/shelltestrunner )
-DESCRIPTION=Ganeti is a virtual server management software tool
-EAPI=7
-HOMEPAGE=http://www.ganeti.org/
-IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= =dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-1.0.1.0:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-1.0.1:0= =dev-haskell/snap-server-1.0.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
-REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://downloads.ganeti.org/releases/2.15/ganeti-2.15.2.tar.gz mirror://debian/pool/main/g/ganeti-2.15/ganeti-2.15_2.15.2-11.debian.tar.xz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c bash-completion-r1 47a7402d95930413ce25ba8d857339bb libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337
-_md5_=18134a38992f0ede1c9906ca9a2974e4
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r9 b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r9
new file mode 100644
index 000000000000..6f9dc1895a86
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r9
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= =dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-1.0.1.0:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-1.0.1:0= =dev-haskell/snap-server-1.0.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= =dev-haskell/test-framework-hunit-0.2.7:0= =dev-haskell/test-framework-quickcheck2-0.2.12.1:0= =dev-haskell/hunit-1.2.4.2:0= =dev-haskell/quickcheck-2.4.2:2= =net-misc/socat-1.7 dev-util/shelltestrunner )
+DESCRIPTION=Ganeti is a virtual server management software tool
+EAPI=7
+HOMEPAGE=http://www.ganeti.org/
+IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_targets_python2_7 +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= =dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-1.0.1.0:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-1.0.1:0= =dev-haskell/snap-server-1.0.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
+REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://downloads.ganeti.org/releases/2.15/ganeti-2.15.2.tar.gz mirror://debian/pool/main/g/ganeti-2.15/ganeti-2.15_2.15.2-11.debian.tar.xz
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c bash-completion-r1 47a7402d95930413ce25ba8d857339bb libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=95ff721288cc7a4304eb90b159cc8158
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1 b/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
index 5d5c613504b8..d4b162c8c966 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
+++ b/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-0.3.1.3:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4.1:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-0.8.1:0= =dev-haskell/snap-server-0.8.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= =dev-haskell/test-framework-hunit-0.2.7:0= =dev-haskell/test-framework-quickcheck2-0.2.12.1:0= =dev-haskell/hunit-1.2.4.2:0= =dev-haskell/quickcheck-2.4.2:2= =net-misc/socat-1.7 dev-util/shelltestrunner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-0.3.1.3:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4.1:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-0.8.1:0= =dev-haskell/snap-server-0.8.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= =dev-haskell/test-framework-hunit-0.2.7:0= =dev-haskell/test-framework-quickcheck2-0.2.12.1:0= =dev-haskell/hunit-1.2.4.2:0= =dev-haskell/quickcheck-2.4.2:2= =net-misc/socat-1.7 dev-util/shelltestrunner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Ganeti is a virtual server management software tool
EAPI=6
HOMEPAGE=http://www.ganeti.org/
IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_targets_python2_7 +python_single_target_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-0.3.1.3:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4.1:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-0.8.1:0= =dev-haskell/snap-server-0.8.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
+RDEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-0.3.1.3:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4.1:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-0.8.1:0= =dev-haskell/snap-server-0.8.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://downloads.ganeti.org/releases/2.16/ganeti-2.16.0~rc1.tar.gz mirror://debian/pool/main/g/ganeti/ganeti_2.16.0~rc1-1.debian.tar.xz
-_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c bash-completion-r1 47a7402d95930413ce25ba8d857339bb estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info 6b8c733cdc71c5c5f0cc0d038d948337 versionator 2352c3fc97241f6a02042773c8287748
-_md5_=6261211afc9c552758b32adc0094d70c
+_eclasses_=autotools ea7865c8fba1ea8d3639f355fffe1a3c bash-completion-r1 47a7402d95930413ce25ba8d857339bb estack 686eaab303305a908fd57b2fd7617800 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c user 95500565ced27667aca7cf7da2d46068 user-info a2abd4e2f4c3b9b06d64bf1329359a02 versionator 2352c3fc97241f6a02042773c8287748
+_md5_=27bb01e69dcc714e5a80a4ed5adb9c1f
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1 b/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
index 8fce9b50281d..3ccfce015bd7 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
+++ b/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-0.3.1.3:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4.1:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-0.8.1:0= =dev-haskell/snap-server-0.8.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc <=dev-python/sphinx-1.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= =dev-haskell/test-framework-hunit-0.2.7:0= =dev-haskell/test-framework-quickcheck2-0.2.12.1:0= =dev-haskell/hunit-1.2.4.2:0= =dev-haskell/quickcheck-2.4.2:2= =net-misc/socat-1.7 dev-util/shelltestrunner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0=