From fa74f6e29ae6cd36cc1f55226a72d3926d105333 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Thu, 6 Jun 2019 16:15:44 +0000 Subject: [PATCH] app-portage/portage-utils: Fix dependencies. Drop "static" USE flag. Drop toolchain-funcs.eclass. Closes: https://bugs.gentoo.org/687512 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- .../portage-utils-0.80_pre20190605.ebuild | 23 ++++++++----------- .../portage-utils/portage-utils-9999.ebuild | 23 ++++++++----------- 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild index 86a1c0df20a..db1f6f4e162 100644 --- a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild +++ b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild @@ -3,14 +3,12 @@ EAPI="6" -inherit toolchain-funcs - DESCRIPTION="Small and fast Portage helper tools written in C" HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" LICENSE="GPL-2" SLOT="0" -IUSE="nls static openmp +qmanifest libressl" +IUSE="nls openmp +qmanifest libressl" if [[ ${PV} == *9999 ]]; then inherit git-r3 autotools @@ -21,24 +19,21 @@ else KEYWORDS="~amd64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -RDEPEND="dev-libs/iniparser:0" -DEPEND="${RDEPEND} - app-arch/xz-utils - static? ( dev-libs/iniparser:0[static-libs] ) +DEPEND="dev-libs/iniparser:0 qmanifest? ( + app-crypt/gpgme + app-crypt/libb2 + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) - app-crypt/libb2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - app-crypt/gpgme - ) - " + )" +RDEPEND="${DEPEND}" src_prepare() { default diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild index 42e27f0ce8a..05cbb5808bd 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-9999.ebuild @@ -3,14 +3,12 @@ EAPI="6" -inherit toolchain-funcs - DESCRIPTION="Small and fast Portage helper tools written in C" HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" LICENSE="GPL-2" SLOT="0" -IUSE="nls static openmp +qmanifest libressl" +IUSE="nls openmp +qmanifest libressl" if [[ ${PV} == *9999 ]]; then inherit git-r3 autotools @@ -21,24 +19,21 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -RDEPEND="dev-libs/iniparser:0" -DEPEND="${RDEPEND} - app-arch/xz-utils - static? ( dev-libs/iniparser:0[static-libs] ) +DEPEND="dev-libs/iniparser:0 qmanifest? ( + app-crypt/gpgme + app-crypt/libb2 + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) - app-crypt/libb2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - app-crypt/gpgme - ) - " + )" +RDEPEND="${DEPEND}" src_prepare() { default -- 2.21.0