commit: b3035ad721eb51a82d09d86bb4a8c6d29298a12c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 6 09:32:30 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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') )
