From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD08E138334 for ; Thu, 6 Jun 2019 16:34:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5069E0884; Thu, 6 Jun 2019 16:34:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3BF9E0884 for ; Thu, 6 Jun 2019 16:34:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECABE345851 for ; Thu, 6 Jun 2019 16:34:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71E33608 for ; Thu, 6 Jun 2019 16:34:36 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1559838868.57bda9c4f94cd43a2dd2e33faccadce256a0572d.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild app-portage/portage-utils/portage-utils-9999.ebuild X-VCS-Directories: app-portage/portage-utils/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 57bda9c4f94cd43a2dd2e33faccadce256a0572d X-VCS-Branch: master Date: Thu, 6 Jun 2019 16:34:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee7d2460-ae9c-4823-9221-d4857da187b8 X-Archives-Hash: de1a23d473c2d5c35256af319da3a91d commit: 57bda9c4f94cd43a2dd2e33faccadce256a0572d Author: Fabian Groffen gentoo org> AuthorDate: Thu Jun 6 16:34:16 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jun 6 16:34:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57bda9c4 app-portage/portage-utils: fix USE=static, fix RDEPEND Closes: https://bugs.gentoo.org/687512 Signed-off-by: Fabian Groffen gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 .../portage-utils-0.80_pre20190605.ebuild | 36 ++++++++++++---------- .../portage-utils/portage-utils-9999.ebuild | 36 ++++++++++++---------- 2 files changed, 40 insertions(+), 32 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..754e9aafaac 100644 --- a/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild +++ b/app-portage/portage-utils/portage-utils-0.80_pre20190605.ebuild @@ -3,8 +3,6 @@ EAPI="6" -inherit toolchain-funcs - DESCRIPTION="Small and fast Portage helper tools written in C" HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" @@ -21,10 +19,9 @@ 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 +RDEPEND=" static? ( dev-libs/iniparser:0[static-libs] ) + !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( @@ -32,24 +29,31 @@ DEPEND="${RDEPEND} sys-devel/clang-runtime:*[openmp] ) ) - app-crypt/libb2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - app-crypt/gpgme + static? ( + app-crypt/libb2:=[static-libs] + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + sys-libs/zlib[static-libs] + app-crypt/gpgme[static-libs] + ) + !static? ( + app-crypt/libb2 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-libs/zlib + app-crypt/gpgme + ) ) - " - -src_prepare() { - default -} +" +DEPEND="${RDEPEND}" src_configure() { econf \ --disable-maintainer-mode \ --with-eprefix="${EPREFIX}" \ $(use_enable qmanifest) \ - $(use_enable openmp) + $(use_enable openmp) \ + $(use_enable static) } pkg_postinst() { diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild index 42e27f0ce8a..d116c33af56 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-9999.ebuild @@ -3,8 +3,6 @@ EAPI="6" -inherit toolchain-funcs - DESCRIPTION="Small and fast Portage helper tools written in C" HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" @@ -21,10 +19,9 @@ 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 +RDEPEND=" static? ( dev-libs/iniparser:0[static-libs] ) + !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( @@ -32,22 +29,29 @@ DEPEND="${RDEPEND} sys-devel/clang-runtime:*[openmp] ) ) - app-crypt/libb2 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib - app-crypt/gpgme + static? ( + app-crypt/libb2:=[static-libs] + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + sys-libs/zlib[static-libs] + app-crypt/gpgme[static-libs] + ) + !static? ( + app-crypt/libb2 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-libs/zlib + app-crypt/gpgme + ) ) - " - -src_prepare() { - default -} +" +DEPEND="${RDEPEND}" src_configure() { econf \ --disable-maintainer-mode \ --with-eprefix="${EPREFIX}" \ $(use_enable qmanifest) \ - $(use_enable openmp) + $(use_enable openmp) \ + $(use_enable static) }