diff options
177 files changed, 1053 insertions, 1068 deletions
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 <maya@NetBSD.org> -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 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/abrt/abrt-2.12.0-r1.ebuild b/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/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 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/equo/equo-302.ebuild b/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/matter/matter-302.ebuild b/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/packagekit-base/packagekit-base-1.1.12.ebuild b/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/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 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-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} - !<gnome-base/gnome-keyring-3.3 -" -# gcr was part of gnome-keyring until 3.3 -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - 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? ( $(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/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild b/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-4.0.0[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/pyotherside[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=app-crypt/yubikey-manager-1.0.0[${PYTHON_MULTI_USEDEP}] + <app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}] + dev-python/cryptography[${PYTHON_MULTI_USEDEP}] + ') + dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}] dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 diff --git a/app-dicts/opendict/opendict-0.6.7.ebuild b/app-dicts/opendict/opendict-0.6.7-r1.ebuild index 99c27f354f2b..2adc18c71cf4 100644 --- a/app-dicts/opendict/opendict-0.6.7.ebuild +++ b/app-dicts/opendict/opendict-0.6.7-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 @@ -18,7 +18,9 @@ IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - dev-python/wxpython:3.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${RDEPEND}" 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 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/ganeti/ganeti-2.15.2-r8.ebuild b/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/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 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/xen-tools/xen-tools-4.11.3.ebuild b/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 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-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild b/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 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 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 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 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 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 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 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 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/ibus-typing-booster-2.7.0.ebuild b/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.7.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.8.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild index 0845963503ce..0091f717eeca 100644 --- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.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/pology/pology-0.12-r1.ebuild b/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/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/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 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-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/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}] ) - <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${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}] - ) + >=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 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/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}] ) - <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${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}] + >=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 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 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} - <www-apps/trac-1.1[${PYTHON_USEDEP}]" + <www-apps/trac-1.1[${PYTHON_SINGLE_USEDEP}]" pkg_setup() { einfo "You can set the following variables in make.conf:" diff --git a/app-misc/email2trac/email2trac-2.8.4.ebuild b/app-misc/email2trac/email2trac-2.8.4.ebuild index 7c7443a662c4..8ebdae6ac932 100644 --- a/app-misc/email2trac/email2trac-2.8.4.ebuild +++ b/app-misc/email2trac/email2trac-2.8.4.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} - <www-apps/trac-1.2[${PYTHON_USEDEP}]" + <www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]" pkg_setup() { einfo "You can set the following variables in make.conf:" diff --git a/app-misc/email2trac/email2trac-2.8.8.ebuild b/app-misc/email2trac/email2trac-2.8.8-r1.ebuild index 7c7443a662c4..8ebdae6ac932 100644 --- a/app-misc/email2trac/email2trac-2.8.8.ebuild +++ b/app-misc/email2trac/email2trac-2.8.8-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} - <www-apps/trac-1.2[${PYTHON_USEDEP}]" + <www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]" pkg_setup() { einfo "You can set the following variables in make.conf:" diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r3.ebuild index af0e1339c581..368f73717811 100644 --- a/app-misc/lirc/lirc-0.10.1-r1.ebuild +++ b/app-misc/lirc/lirc-0.10.1-r3.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-r2.ebuild b/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-python/pyyaml-5[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + <dev-python/pyyaml-5[${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/metromap/metromap-0.1.4-r1.ebuild b/app-misc/metromap/metromap-0.1.4-r2.ebuild index 6d0dba3d4e4d..25eca6fecc16 100644 --- a/app-misc/metromap/metromap-0.1.4-r1.ebuild +++ b/app-misc/metromap/metromap-0.1.4-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" @@ -19,8 +19,10 @@ IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - dev-python/pygobject:2[${PYTHON_USEDEP}] - >=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygtk-2.8:2[${PYTHON_MULTI_USEDEP}] + ') " DEPEND="${RDEPEND} sys-devel/gettext diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild index 585a85257cd1..2bd5a6a4fbff 100644 --- a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild +++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild @@ -20,8 +20,10 @@ IUSE="caps debug python seccomp" RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) python? ( ${PYTHON_DEPS} - dev-python/pyelftools[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + dev-python/pyelftools[${PYTHON_MULTI_USEDEP}] + ') + ) seccomp? ( sys-libs/libseccomp )" DEPEND="${RDEPEND} caps? ( virtual/pkgconfig ) diff --git a/app-misc/pax-utils/pax-utils-1.2.4.ebuild b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild index 0ead02e5fc9c..66b213c14c49 100644 --- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild +++ b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild @@ -20,8 +20,10 @@ IUSE="caps debug python seccomp" RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) python? ( ${PYTHON_DEPS} - dev-python/pyelftools[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep ' + dev-python/pyelftools[${PYTHON_MULTI_USEDEP}] + ') + ) seccomp? ( sys-libs/libseccomp )" DEPEND="${RDEPEND} caps? ( virtual/pkgconfig ) diff --git a/app-office/gnumeric/gnumeric-1.12.39.ebuild b/app-office/gnumeric/gnumeric-1.12.39-r1.ebuild index 2ff8d6609df0..f12e005b4cec 100644 --- a/app-office/gnumeric/gnumeric-1.12.39.ebuild +++ b/app-office/gnumeric/gnumeric-1.12.39-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" @@ -39,7 +39,10 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} - >=dev-python/pygobject-3:3[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + >=dev-python/pygobject-3:3[${PYTHON_MULTI_USEDEP}] + ') + ) libgda? ( gnome-extra/libgda:5[gtk] ) " DEPEND="${RDEPEND} diff --git a/app-office/gnumeric/gnumeric-1.12.44.ebuild b/app-office/gnumeric/gnumeric-1.12.44-r1.ebuild index dc288a384e42..dc288a384e42 100644 --- a/app-office/gnumeric/gnumeric-1.12.44.ebuild +++ b/app-office/gnumeric/gnumeric-1.12.44-r1.ebuild diff --git a/app-office/kmymoney/kmymoney-5.0.7.ebuild b/app-office/kmymoney/kmymoney-5.0.7-r1.ebuild index 75cc141e722b..611c550390a8 100644 --- a/app-office/kmymoney/kmymoney-5.0.7.ebuild +++ b/app-office/kmymoney/kmymoney-5.0.7-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 @@ -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/kmymoney/kmymoney-5.0.8.ebuild b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild index d0eb2a74db57..b1446f406c74 100644 --- a/app-office/kmymoney/kmymoney-5.0.8.ebuild +++ b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild @@ -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 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 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 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? ( - <dev-python/pytest-4[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + <dev-python/pytest-4[${PYTHON_MULTI_USEDEP}] + ') dev-util/cunit )" diff --git a/app-office/moneyguru/moneyguru-3.0.1-r1.ebuild b/app-office/moneyguru/moneyguru-3.0.1-r2.ebuild index db78b348715e..ba927b91e60b 100644 --- a/app-office/moneyguru/moneyguru-3.0.1-r1.ebuild +++ b/app-office/moneyguru/moneyguru-3.0.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? ( - dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_MULTI_USEDEP}] + ') dev-util/cunit )" diff --git a/app-office/planner/planner-0.14.6_p20130520.ebuild b/app-office/planner/planner-0.14.6_p20130520-r1.ebuild index e2a022f1b4f0..e9b4ff1e4fbd 100644 --- a/app-office/planner/planner-0.14.6_p20130520.ebuild +++ b/app-office/planner/planner-0.14.6_p20130520-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 @@ -29,7 +29,9 @@ RDEPEND=" >=dev-libs/libxslt-1.1.23 python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + >=dev-python/pygtk-2.6:2[${PYTHON_MULTI_USEDEP}] ) + ') eds? ( >=gnome-extra/evolution-data-server-3.6:= >=mail-client/evolution-3.6 ) diff --git a/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r3.ebuild index 4cf3e67ada7b..2d0fce300191 100644 --- a/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild +++ b/app-office/pybliographer/pybliographer-1.4.0-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=6 @@ -21,10 +21,12 @@ RDEPEND="${PYTHON_DEPS} >=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-portage/elogviewer/elogviewer-2.9.ebuild b/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 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/unsymlink-lib/unsymlink-lib-17.ebuild b/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-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/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/pastebinit/pastebinit-1.5.ebuild b/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/sigil/sigil-0.9.16.ebuild b/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/xiphos/xiphos-4.0.6a-r1.ebuild b/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 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/automatictexplugin/automatictexplugin-12.5-r1.ebuild b/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 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/gundo/gundo-2.6.2.ebuild b/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 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 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 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 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 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 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 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 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 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 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 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/gps/gps-2018-r2.ebuild b/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 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/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-db/pgadmin4/pgadmin4-4.13.ebuild b/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 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-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7-r1.ebuild index 179c88599c41..d89518d63680 100644 --- a/dev-games/cegui/cegui-0.8.7.ebuild +++ b/dev-games/cegui/cegui-0.8.7-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 @@ -43,7 +43,9 @@ RDEPEND=" pcre? ( dev-libs/libpcre ) python? ( ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}] + ') ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) diff --git a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild index 393fd89c7222..996f3aa184b5 100644 --- a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild +++ b/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild @@ -18,9 +18,11 @@ IUSE="tcmalloc" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - dev-python/pysol_cards[${PYTHON_USEDEP}] - dev-python/random2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}] + dev-python/random2[${PYTHON_MULTI_USEDEP}] + dev-python/six[${PYTHON_MULTI_USEDEP}] + ') tcmalloc? ( dev-util/google-perftools ) " DEPEND="${RDEPEND} 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/gobject-introspection/gobject-introspection-1.60.2.ebuild b/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 !<dev-lang/vala-0.20.0 @@ -38,7 +42,10 @@ DEPEND="${RDEPEND} sys-devel/flex test? ( x11-libs/cairo[glib] - dev-python/markdown[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep ' + dev-python/markdown[${PYTHON_MULTI_USEDEP}] + ') + ) " # autoreconf needs autoconf-archive # PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well PDEPEND="cairo? ( x11-libs/cairo[glib] )" diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r202.ebuild index 40fe8964c862..2803f1e0e278 100644 --- a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild +++ b/dev-libs/libappindicator/libappindicator-12.10.0-r202.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 @@ -28,7 +28,9 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-1:= ) python? ( ${PYTHON_DEPS} - dev-python/pygtk[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygtk[${PYTHON_MULTI_USEDEP}] + ') ) " DEPEND="${RDEPEND} diff --git a/dev-libs/libarcus/libarcus-3.4.1.ebuild b/dev-libs/libarcus/libarcus-3.4.1.ebuild index ced7f6897f9f..120cd3820013 100644 --- a/dev-libs/libarcus/libarcus-3.4.1.ebuild +++ b/dev-libs/libarcus/libarcus-3.4.1.ebuild @@ -20,9 +20,11 @@ IUSE="examples python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} - dev-python/sip[${PYTHON_USEDEP}] dev-libs/protobuf - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-libs/libarcus/libarcus-3.6.0.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild index ced7f6897f9f..120cd3820013 100644 --- a/dev-libs/libarcus/libarcus-3.6.0.ebuild +++ b/dev-libs/libarcus/libarcus-3.6.0.ebuild @@ -20,9 +20,11 @@ IUSE="examples python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} - dev-python/sip[${PYTHON_USEDEP}] dev-libs/protobuf - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild index deb2605d5649..0dbed3da3dd0 100644 --- a/dev-libs/libarcus/libarcus-4.2.0.ebuild +++ b/dev-libs/libarcus/libarcus-4.2.0.ebuild @@ -20,9 +20,11 @@ IUSE="examples python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} - dev-python/sip[${PYTHON_USEDEP}] dev-libs/protobuf - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-libs/libarcus/libarcus-4.3.0.ebuild b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild index 0869769e8f5b..f949a913e19b 100644 --- a/dev-libs/libarcus/libarcus-4.3.0.ebuild +++ b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild @@ -20,9 +20,11 @@ IUSE="examples python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} - dev-python/sip[${PYTHON_USEDEP}] dev-libs/protobuf - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] ) + ')" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest index 9d32ef866e92..09a94d47adf9 100644 --- a/dev-libs/libgdata/Manifest +++ b/dev-libs/libgdata/Manifest @@ -1,2 +1 @@ DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982 -DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce diff --git a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch b/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch deleted file mode 100644 index fe06cee34281..000000000000 --- a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 12fb11f46a7eb4054b74679a6f5ad12dcc41132d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -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/libpeas/libpeas-1.22.0.ebuild b/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/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 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-python/basemap/basemap-1.0.7-r1.ebuild b/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 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/nautilus-python/nautilus-python-1.2.2.ebuild b/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/pyilmbase/pyilmbase-2.3.0-r1.ebuild b/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/pythong/pythong-2.1.5-r2.ebuild b/dev-python/pythong/pythong-2.1.5-r3.ebuild index 7c1059971d29..a466b85801da 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}" 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 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/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 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-ruby/pygments_rb/pygments_rb-1.2.1.ebuild b/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-tex/crosstex/crosstex-0.6-r2.ebuild b/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/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index a840769cdecf..e546aadfa4a7 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -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 # @ECLASS: distutils-r1.eclass @@ -117,15 +117,23 @@ _distutils_set_globals() { local rdep=${PYTHON_DEPS} local bdep=${rdep} + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + local sdep="dev-python/setuptools[${PYTHON_USEDEP}]" + else + local sdep="$(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_MULTI_USEDEP}] + ')" + fi + case ${DISTUTILS_USE_SETUPTOOLS} in no|manual) ;; bdepend) - bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]" + bdep+=" ${sdep}" ;; rdepend) - bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]" - rdep+=" dev-python/setuptools[${PYTHON_USEDEP}]" + bdep+=" ${sdep}" + rdep+=" ${sdep}" ;; *) die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}" @@ -387,16 +395,16 @@ distutils_enable_tests() { debug-print-function ${FUNCNAME} "${@}" [[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: test-runner" - local test_deps + local test_pkg case ${1} in nose) - test_deps="dev-python/nose[${PYTHON_USEDEP}]" + test_pkg="dev-python/nose" python_test() { nosetests -v || die "Tests fail with ${EPYTHON}" } ;; pytest) - test_deps="dev-python/pytest[${PYTHON_USEDEP}]" + test_pkg="dev-python/pytest" python_test() { pytest -vv || die "Tests fail with ${EPYTHON}" } @@ -416,13 +424,23 @@ distutils_enable_tests() { die "${FUNCNAME}: unsupported argument: ${1}" esac - if [[ -n ${test_deps} || -n ${RDEPEND} ]]; then + local test_deps=${RDEPEND} + if [[ -n ${test_pkg} ]]; then + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + test_deps+=" ${test_pkg}[${PYTHON_USEDEP}]" + else + test_deps+=" $(python_gen_cond_dep " + ${test_pkg}[\${PYTHON_MULTI_USEDEP}] + ")" + fi + fi + if [[ -n ${test_deps} ]]; then IUSE+=" test" RESTRICT+=" !test? ( test )" if [[ ${EAPI} == [56] ]]; then - DEPEND+=" test? ( ${test_deps} ${RDEPEND} )" + DEPEND+=" test? ( ${test_deps} )" else - BDEPEND+=" test? ( ${test_deps} ${RDEPEND} )" + BDEPEND+=" test? ( ${test_deps} )" fi fi diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index 35cf4e322188..33838e3ec8bb 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -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 # @ECLASS: scons-utils.eclass @@ -126,8 +126,9 @@ if [[ ${_PYTHON_ANY_R1} ]]; then } python_check_deps() { scons-utils_python_check_deps; } elif [[ ${_PYTHON_SINGLE_R1} ]]; then - # when using python-single-r1, use plain PYTHON_USEDEP API - BDEPEND="${SCONS_DEPEND}[${PYTHON_USEDEP}] + # when using python-single-r1, use PYTHON_MULTI_USEDEP API + BDEPEND=" + $(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_MULTI_USEDEP}]") ${PYTHON_DEPS}" elif [[ ${EAPI:-0} == [0123456] ]]; then # in older EAPIs, just force Python 2.7 diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index 94a45c720e6a..c5a30c9a42fb 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -1,2 +1 @@ -DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0 diff --git a/gnome-base/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild deleted file mode 100644 index f38544da3eaf..000000000000 --- a/gnome-base/dconf/dconf-0.26.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 bash-completion-r1 virtualx - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="https://wiki.gnome.org/Projects/dconf" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - sys-apps/dbus -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.15 - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure \ - --disable-gcov \ - --enable-man \ - VALAC=$(type -P true) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf -} - -pkg_postinst() { - gnome2_pkg_postinst - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild index a2ff821691bc..a5e14629412a 100644 --- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild +++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit python-r1 +inherit python-single-r1 DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY" HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/" @@ -21,12 +21,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="" RDEPEND=" ${PYTHON_DEPS} - dev-python/dnspython[$PYTHON_USEDEP] - dev-python/ipaddr[$PYTHON_USEDEP] - dev-python/m2crypto[$PYTHON_USEDEP] - net-dns/unbound[python,$PYTHON_USEDEP] + net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] + openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] ) + ') ipsec? ( net-vpn/libreswan[dnssec] ) - openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] ) ssh? ( net-misc/openssh ) " @@ -38,7 +40,7 @@ src_install() { use ipsec && tools+=" ipseckey" for tool in $tools ; do doman ${tool}.1 - python_foreach_impl python_doscript ${tool} + python_doscript ${tool} done dodoc BUGS CHANGES README } diff --git a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild index 161c87a31f2d..e36c1758e267 100644 --- a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild +++ b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit python-r1 +inherit python-single-r1 DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY" HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/" @@ -21,12 +21,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="" RDEPEND=" ${PYTHON_DEPS} - dev-python/dnspython[$PYTHON_USEDEP] - dev-python/ipaddr[$PYTHON_USEDEP] - dev-python/m2crypto[$PYTHON_USEDEP] - net-dns/unbound[python,$PYTHON_USEDEP] + net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] + openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] ) + ') ipsec? ( net-vpn/libreswan[dnssec] ) - openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] ) ssh? ( net-misc/openssh ) " @@ -38,7 +40,7 @@ src_install() { use ipsec && tools+=" ipseckey" for tool in $tools ; do doman ${tool}.1 - python_foreach_impl python_doscript ${tool} + python_doscript ${tool} done dodoc BUGS CHANGES README } diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild index 41a07f7c1a83..52c57d2312c0 100644 --- a/net-firewall/fwknop/fwknop-2.6.10.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.10-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 @@ -6,6 +6,7 @@ EAPI=7 # Python extension supports only Python 2. # See https://github.com/mrash/fwknop/issues/167 PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 DISTUTILS_OPTIONAL=1 inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd @@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser DEPEND=" client? ( net-misc/wget[ssl] ) - firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) + firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme @@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf instead of the default one chosen at compile time. " +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + src_prepare() { default_src_prepare diff --git a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild index 5c86df5bfb0c..03699570bd46 100644 --- a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.9-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 @@ -7,6 +7,7 @@ EAPI=6 # See https://github.com/mrash/fwknop/issues/167 PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd @@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser DEPEND=" client? ( net-misc/wget[ssl] ) - firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] ) + firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme @@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf instead of the default one chosen at compile time. " +pkg_setup() { + linux-info_pkg_setup + python-single-r1_pkg_setup +} + src_prepare() { default_src_prepare diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild index 91da837445dc..541ab5c65511 100644 --- a/net-libs/rest/rest-0.8.1.ebuild +++ b/net-libs/rest/rest-0.8.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="6" @@ -13,7 +13,7 @@ LICENSE="LGPL-2.1" SLOT="0.7" IUSE="+introspection test" RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86" # Coverage testing should not be enabled RDEPEND=" diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask index 8fdac6f26126..2a7abacc6860 100644 --- a/profiles/arch/hppa/package.use.stable.mask +++ b/profiles/arch/hppa/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Mart Raudsepp <leio@gentoo.org> (2020-02-09) +# No stable gnome-base/dconf on hppa. +dev-libs/glib dbus + # Mart Raudsepp <leio@gentoo.org> (2020-02-08) # No stable x11-libs/gtk+ on hppa. gnome-base/librsvg tools diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 4dbdb7a19e5e..b28fb1ff286b 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -6,6 +6,12 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Michał Górny <mgorny@gentoo.org> (2020-02-08) +# The dependency is python-single-r1 while the package (and its revdeps) +# are python-r1. +dev-python/rdflib redland +www-apps/venus redland + # Michał Górny <mgorny@gentoo.org> (2020-02-05) # Requires google-api-python-client with Python 2 which is no longer # supported by its dependencies. @@ -22,7 +28,7 @@ dev-python/zeep tornado # Michał Górny <mgorny@gentoo.org> (2020-01-29) # Require dev-python/epydoc which is being removed. -<=app-admin/system-config-printer-1.5.12 doc +<=app-admin/system-config-printer-1.5.12-r1 doc <=dev-python/cosmolopy-0.1.104-r2 doc <=dev-python/dbus-python-1.2.4 doc <=dev-python/pycrypto-2.6.1-r2 doc diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index 957ea16b4f30..c265c0639db4 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -59,7 +59,7 @@ gnome-extra/gnome-user-share app-admin/equo app-admin/matter app-admin/packagekit -=app-admin/packagekit-base-1.1.12 +~app-admin/packagekit-base-1.1.12 app-admin/packagekit-gtk app-admin/packagekit-qt <app-admin/salt-2018 diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask index ed28e6e8aad5..63635efd4421 100644 --- a/profiles/features/selinux/package.use.mask +++ b/profiles/features/selinux/package.use.mask @@ -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 # Jeroen Roovers <jer@gentoo.org> (2019-02-23) @@ -37,13 +37,13 @@ net-wireless/bluez user-session # SELinux userspace 3.0 dropped python2.7 support app-admin/equo python_targets_python2_7 app-admin/matter python_targets_python2_7 -app-admin/packagekit-base python_targets_python2_7 +app-admin/packagekit-base python_targets_python2_7 python_single_target_python2_7 app-admin/salt python_targets_python2_7 app-admin/webapp-config python_targets_python2_7 app-portage/diffmask python_targets_python2_7 app-portage/distpatch python_targets_python2_7 app-portage/elicense python_targets_python2_7 -app-portage/elogviewer python_targets_python2_7 +app-portage/elogviewer python_targets_python2_7 python_single_target_python2_7 app-portage/euscan python_targets_python2_7 app-portage/flaggie python_targets_python2_7 app-portage/g-sorcery python_targets_python2_7 @@ -58,7 +58,7 @@ app-portage/porthole python_targets_python2_7 app-portage/portpeek python_targets_python2_7 app-portage/repoman python_targets_python2_7 app-portage/smart-live-rebuild python_targets_python2_7 -app-portage/unsymlink-lib python_targets_python2_7 +app-portage/unsymlink-lib python_targets_python2_7 python_single_target_python2_7 dev-java/java-config python_targets_python2_7 kde-frameworks/frameworkintegration appstream net-proxy/http-replicator python_targets_python2_7 diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild index ad95f8f410fa..179e6448d605 100644 --- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild +++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit scons-utils fortran-2 flag-o-matic python-r1 toolchain-funcs +inherit scons-utils fortran-2 flag-o-matic python-single-r1 toolchain-funcs DESCRIPTION="Automated pipeline for performing Poisson-Boltzmann electrostatics calculations" HOMEPAGE="https://www.poissonboltzmann.org/" @@ -19,13 +19,15 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - || ( - dev-python/numpy-python2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) - sci-chemistry/openbabel-python[${PYTHON_USEDEP}] - opal? ( dev-python/zsi[${PYTHON_USEDEP}] ) - pdb2pka? ( sci-chemistry/apbs[${PYTHON_USEDEP},-mpi] )" + $(python_gen_cond_dep ' + || ( + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ) + sci-chemistry/openbabel-python[${PYTHON_MULTI_USEDEP}] + opal? ( dev-python/zsi[${PYTHON_MULTI_USEDEP}] ) + ') + pdb2pka? ( sci-chemistry/apbs[${PYTHON_SINGLE_USEDEP},-mpi] )" DEPEND="${RDEPEND} dev-lang/swig:0" @@ -43,6 +45,7 @@ pkg_setup() { einfo "Allow usage of ${MAXATOMS} during calculations" fi fortran-2_pkg_setup + python-single-r1_pkg_setup } src_prepare() { @@ -54,15 +57,10 @@ src_prepare() { epatch "${PATCHES[@]}" tc-export CXX rm -rf scons || die - - python_copy_sources } src_configure() { - python_configure() { - cd "${BUILD_DIR}" || die - - cat > build_config.py <<- EOF + cat > build_config.py <<- EOF PREFIX="${D}/$(python_get_sitedir)/${PN}" #URL="http://<COMPUTER NAME>/pdb2pqr/" APBS="${EPREFIX}/usr/bin/apbs" @@ -71,51 +69,35 @@ src_configure() { MAX_ATOMS=${MAXATOMS} BUILD_PDB2PKA=$(usex pdb2pka True False) REBUILD_SWIG=True - EOF - } - - python_foreach_impl python_configure + EOF } src_compile() { - python_compile() { - cd "${BUILD_DIR}" || die - escons - } - python_foreach_impl python_compile + escons } src_test() { - python_test() { - local myesconsargs=( -j1 ) - cd "${BUILD_DIR}" || die - escons test - escons advtest - escons complete-test - } - python_foreach_impl python_test + local myesconsargs=( -j1 ) + escons test + escons advtest + escons complete-test } src_install() { dodir /usr/share/doc/${PF}/html - python_install() { - local lib - - cd "${BUILD_DIR}" || die + local lib - escons install + escons install - find "${D}$(python_get_sitedir)"/${PN}/{jmol,examples,doc,contrib} -delete || die + find "${D}$(python_get_sitedir)"/${PN}/{jmol,examples,doc,contrib} -delete || die - python_doscript "${FILESDIR}"/{${PN},pdb2pka} + python_doscript "${FILESDIR}"/{${PN},pdb2pka} - for lib in apbslib.py{,c,o}; do - dosym ../../apbs/${lib} $(python_get_sitedir)/${PN}/pdb2pka/${lib} - done - dosym ../../_apbslib.so $(python_get_sitedir)/${PN}/pdb2pka/_apbslib.so - python_optimize - } - python_foreach_impl python_install + for lib in apbslib.py{,c,o}; do + dosym ../../apbs/${lib} $(python_get_sitedir)/${PN}/pdb2pka/${lib} + done + dosym ../../_apbslib.so $(python_get_sitedir)/${PN}/pdb2pka/_apbslib.so + python_optimize if use doc; then pushd doc > /dev/null diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild index e661cc957b68..705c196994e6 100644 --- a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild +++ b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 +DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 @@ -19,8 +20,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=">=www-apps/trac-0.12[${PYTHON_USEDEP}] - >=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]" +RDEPEND=">=www-apps/trac-0.12[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + >=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}] + ')" S="${WORKDIR}/${MY_P}" diff --git a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild index 9b4f678dd53a..6aa50c5b940c 100644 --- a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild +++ b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 +DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 mercurial @@ -20,8 +21,9 @@ SLOT="0" # KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=">=www-apps/trac-1.0[${PYTHON_USEDEP}] - >=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]" +RDEPEND=">=www-apps/trac-1.0[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + >=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}] + ')" S="${WORKDIR}/${MY_P}" diff --git a/www-apps/trac-tags/trac-tags-0.6-r1.ebuild b/www-apps/trac-tags/trac-tags-0.6-r2.ebuild index 43896d792b6f..025d60b0a73f 100644 --- a/www-apps/trac-tags/trac-tags-0.6-r1.ebuild +++ b/www-apps/trac-tags/trac-tags-0.6-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 +DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 @@ -20,11 +21,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -CDEPEND=">=dev-python/genshi-0.6[${PYTHON_USEDEP}]" +CDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/genshi-0.6[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${CDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] app-arch/unzip" RDEPEND="${CDEPEND} - >=www-apps/trac-0.11[${PYTHON_USEDEP}]" + >=www-apps/trac-0.11[${PYTHON_SINGLE_USEDEP}]" S="${WORKDIR}/${MY_DIR}" diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest index 922b4f714bf2..e45500887673 100644 --- a/x11-misc/py3status/Manifest +++ b/x11-misc/py3status/Manifest @@ -1 +1 @@ -DIST py3status-3.24.tar.gz 403557 BLAKE2B 1b1b0ceafaaf757fa06a4c9637b4efcec7315662b55e61812af8100048832d5f104f11f36dbe9cbe8e9fd7bc8b8f6f5a0e0a5398aed38b35b249ba47b5418f31 SHA512 4e3aebc314498ba0ebe740455c2cf179715e65cfa72ed690d0d44fa9c2a8c3cf17b5785cd1163481afb8232fbb5e22d47ba60d95479472feb56fcf6e6b1b1eab +DIST py3status-3.25.tar.gz 405276 BLAKE2B 9ff163f8ff037eedda29e7479bc637c9e3ddee1edb0848bdb61b32702ad8855745340beca7f5895612209d05bae838ce71a17521ded50cb61f2516669b740009 SHA512 114c510fc3126256af49f9fd7a141ebc86fe8306cf10094c1c9e9980757bf8f23e0ddb131d54aaa8acdcb5b98f0a230e9c2f0584ea09a68b779be5b66bc865b2 diff --git a/x11-misc/py3status/py3status-3.24.ebuild b/x11-misc/py3status/py3status-3.25.ebuild index 9b33b20bb0f9..9b33b20bb0f9 100644 --- a/x11-misc/py3status/py3status-3.24.ebuild +++ b/x11-misc/py3status/py3status-3.25.ebuild |