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 9555D138334 for ; Sun, 14 Jul 2019 16:31:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BECBFE0845; Sun, 14 Jul 2019 16:30:59 +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 8D11CE0845 for ; Sun, 14 Jul 2019 16:30:59 +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 D124A347AFA for ; Sun, 14 Jul 2019 16:30:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4316A4D3 for ; Sun, 14 Jul 2019 16:30:56 +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: <1563121846.631b38ecd0e5d3724590ddd53c0ff453d5ddcf45.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/Manifest app-portage/portage-utils/metadata.xml app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild app-portage/portage-utils/portage-utils-0.80_pre20190714.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: 631b38ecd0e5d3724590ddd53c0ff453d5ddcf45 X-VCS-Branch: master Date: Sun, 14 Jul 2019 16:30:56 +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: 7c40d863-c721-41d8-99d6-0afa78b94b6e X-Archives-Hash: e2fa8d8a38a74b49567f2203b36f60cc commit: 631b38ecd0e5d3724590ddd53c0ff453d5ddcf45 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jul 14 16:30:33 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jul 14 16:30:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631b38ec app-portage/portage-utils: bump 0.80 pre Closes: https://bugs.gentoo.org/688442 Closes: https://bugs.gentoo.org/689290 Signed-off-by: Fabian Groffen gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 app-portage/portage-utils/Manifest | 2 +- app-portage/portage-utils/metadata.xml | 1 + ...0.ebuild => portage-utils-0.80_pre20190714.ebuild} | 19 ++++++++++++++++++- app-portage/portage-utils/portage-utils-9999.ebuild | 19 ++++++++++++++++++- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 13cff118abe..6b456873126 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1,3 +1,3 @@ DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e -DIST portage-utils-0.80_pre20190620.tar.xz 1761544 BLAKE2B fe39bebe6ed7afb525b7a3dbcfb2668b29195d7da7128fffb42be313e79b3d68792203bdc7711fa1961b9a1520b72e01b154e3d948aed2861feb44f130995d75 SHA512 2fc877e04213af57ba4050e9830004a0552fea5ac052d625a5635c4383b492e2ae5dcf45b01c63711b6ca6c2574b65ec44b41acd33cd03886bfa5fcc27c7d043 +DIST portage-utils-0.80_pre20190714.tar.xz 1762284 BLAKE2B 5000db2ea6ba04f1206c4ed63c9b16bf1317c1cbdfb0e677ce0c1f1f252bbde36f2bf7dd19ff22635653b58f64bef794cc21da2e945a06fddd2e7f8aaab6c853 SHA512 1c1979b627edbf5d5ca40043dc897f955c18e57c91485426ea48cd8574e4dbba1687df796ba600aaa2cd03699c1bf6217acd513f4e4d9cd1991083e0d5cf49da diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml index dac8feca7f1..3aac9818b8b 100644 --- a/app-portage/portage-utils/metadata.xml +++ b/app-portage/portage-utils/metadata.xml @@ -7,5 +7,6 @@ Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing + Build qtegrity applet, this adds additional dependencies for OpenSSL diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild similarity index 83% rename from app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild rename to app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild index daaaf9474d2..1c8161df1e8 100644 --- a/app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild +++ b/app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" LICENSE="GPL-2" SLOT="0" -IUSE="nls static openmp +qmanifest libressl" +IUSE="nls static openmp +qmanifest +qtegrity libressl" if [[ ${PV} == *9999 ]]; then inherit git-r3 autotools @@ -43,6 +43,22 @@ RDEPEND=" app-crypt/gpgme:= ) ) + qtegrity? ( + openmp? ( + || ( + >=sys-devel/gcc-4.2:*[openmp] + sys-devel/clang-runtime:*[openmp] + ) + ) + static? ( + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + ) + !static? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) " DEPEND="${RDEPEND}" @@ -51,6 +67,7 @@ src_configure() { --disable-maintainer-mode \ --with-eprefix="${EPREFIX}" \ $(use_enable qmanifest) \ + $(use_enable qtegrity) \ $(use_enable openmp) \ $(use_enable static) } diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild index ba0d7c72658..423703f19f3 100644 --- a/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/app-portage/portage-utils/portage-utils-9999.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" LICENSE="GPL-2" SLOT="0" -IUSE="nls static openmp +qmanifest libressl" +IUSE="nls static openmp +qmanifest +qtegrity libressl" if [[ ${PV} == *9999 ]]; then inherit git-r3 autotools @@ -43,6 +43,22 @@ RDEPEND=" app-crypt/gpgme:= ) ) + qtegrity? ( + openmp? ( + || ( + >=sys-devel/gcc-4.2:*[openmp] + sys-devel/clang-runtime:*[openmp] + ) + ) + static? ( + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[static-libs] ) + ) + !static? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) " DEPEND="${RDEPEND}" @@ -51,6 +67,7 @@ src_configure() { --disable-maintainer-mode \ --with-eprefix="${EPREFIX}" \ $(use_enable qmanifest) \ + $(use_enable qtegrity) \ $(use_enable openmp) \ $(use_enable static) }