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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3065815808C for ; Sun, 6 Mar 2022 09:39:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E37CAE083D; Sun, 6 Mar 2022 09:39:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC026E0844 for ; Sun, 6 Mar 2022 09:39:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA22A343233 for ; Sun, 6 Mar 2022 09:39:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E6B7B209 for ; Sun, 6 Mar 2022 09:39:16 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1646559386.b3035ad721eb51a82d09d86bb4a8c6d29298a12c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gnutls/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/gnutls/gnutls-3.7.3-r1.ebuild net-libs/gnutls/gnutls-3.7.3.ebuild X-VCS-Directories: net-libs/gnutls/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b3035ad721eb51a82d09d86bb4a8c6d29298a12c X-VCS-Branch: master Date: Sun, 6 Mar 2022 09:39:16 +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: ff7b7847-3d13-414e-a918-a91ca92bc076 X-Archives-Hash: a9942e11b90005b0908e86a883f071cc commit: b3035ad721eb51a82d09d86bb4a8c6d29298a12c Author: Sam James gentoo org> AuthorDate: Sun Mar 6 09:32:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 6 09:36:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3035ad7 net-libs/gnutls: fix automagic dependency on app-crypt/tpm2-tss Closes: https://bugs.gentoo.org/832569 Signed-off-by: Sam James gentoo.org> .../{gnutls-3.7.3.ebuild => gnutls-3.7.3-r1.ebuild} | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net-libs/gnutls/gnutls-3.7.3.ebuild b/net-libs/gnutls/gnutls-3.7.3-r1.ebuild similarity index 89% rename from net-libs/gnutls/gnutls-3.7.3.ebuild rename to net-libs/gnutls/gnutls-3.7.3-r1.ebuild index 5c5b49f696cd..e0bf42e9601a 100644 --- a/net-libs/gnutls/gnutls-3.7.3.ebuild +++ b/net-libs/gnutls/gnutls-3.7.3-r1.ebuild @@ -14,8 +14,7 @@ SLOT="0/30" # libgnutls.so number KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" -REQUIRED_USE=" - test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" RESTRICT="!test? ( test )" RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] @@ -43,10 +42,7 @@ BDEPEND=">=virtual/pkgconfig-0-r1 net-misc/socat )" -DOCS=( - README.md - doc/certtool.cfg -) +DOCS=( README.md doc/certtool.cfg ) HTML_DOCS=() @@ -77,9 +73,12 @@ multilib_src_configure() { local libconf=() # TPM needs to be tested before being enabled - libconf+=( --without-tpm ) + libconf+=( + --without-tpm + --without-tpm2 + ) - # hardware-accell is disabled on OSX because the asm files force + # hardware-accel is disabled on OSX because the asm files force # GNU-stack (as doesn't support that) and when that's removed ld # complains about duplicate symbols [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) @@ -108,8 +107,8 @@ multilib_src_configure() { $(use_with idn) $(use_with pkcs11 p11-kit) --disable-rpath - --with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" - --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt --without-included-libtasn1 $("${S}/configure" --help | grep -o -- '--without-.*-prefix') )