net-libs/gnutls: cleanup further (invalid) USE=valgrind remnants

Fixes: 05ae3326995131af0c877597d8bdfe6fd5e3badc
Signed-off-by: Sam James <sam@gentoo.org>

5 files changed, 8 insertions, 15 deletions

diff --git a/net-libs/gnutls/gnutls-3.7.6.ebuild b/net-libs/gnutls/gnutls-3.7.6.ebuild
index 6e50e19d7fe4..e63cbcf83268 100644
--- a/net-libs/gnutls/gnutls-3.7.6.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
+IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
@@ -40,7 +40,6 @@ BDEPEND="
 	>=virtual/pkgconfig-0-r1
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		>=app-misc/datefudge-1.22
@@ -101,6 +100,7 @@ multilib_src_configure() {
 	export gl_cv_warn_c__fanalyzer=no
 
 	local myeconfargs=(
+		--disable-valgrind-tests
 		$(multilib_native_enable manpages)
 		$(multilib_native_use_enable doc gtk-doc)
 		$(multilib_native_use_enable doc)
@@ -109,7 +109,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable test tests)
 		$(multilib_native_use_enable test-full full-test-suite)
 		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
 		$(use_enable cxx)
 		$(use_enable dane libdane)
 		$(use_enable nls)
diff --git a/net-libs/gnutls/gnutls-3.7.7.ebuild b/net-libs/gnutls/gnutls-3.7.7.ebuild
index 2882922ce9c1..a1bc18f35d9b 100644
--- a/net-libs/gnutls/gnutls-3.7.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
+IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
@@ -40,7 +40,6 @@ BDEPEND="
 	>=virtual/pkgconfig-0-r1
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		>=app-misc/datefudge-1.22
@@ -101,6 +100,7 @@ multilib_src_configure() {
 	export gl_cv_warn_c__fanalyzer=no
 
 	local myeconfargs=(
+		--disable-valgrind-tests
 		$(multilib_native_enable manpages)
 		$(multilib_native_use_enable doc gtk-doc)
 		$(multilib_native_use_enable doc)
@@ -109,7 +109,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable test tests)
 		$(multilib_native_use_enable test-full full-test-suite)
 		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
 		$(use_enable cxx)
 		$(use_enable dane libdane)
 		$(use_enable nls)
diff --git a/net-libs/gnutls/gnutls-3.7.8.ebuild b/net-libs/gnutls/gnutls-3.7.8.ebuild
index e61c65b13e1b..dc7d2f811ac0 100644
--- a/net-libs/gnutls/gnutls-3.7.8.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
+IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
@@ -40,7 +40,6 @@ BDEPEND="
 	>=virtual/pkgconfig-0-r1
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		>=app-misc/datefudge-1.22
@@ -101,6 +100,7 @@ multilib_src_configure() {
 	export gl_cv_warn_c__fanalyzer=no
 
 	local myeconfargs=(
+		--disable-valgrind-tests
 		$(multilib_native_enable manpages)
 		$(multilib_native_use_enable doc gtk-doc)
 		$(multilib_native_use_enable doc)
@@ -109,7 +109,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable test tests)
 		$(multilib_native_use_enable test-full full-test-suite)
 		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
 		$(use_enable cxx)
 		$(use_enable dane libdane)
 		$(use_enable nls)
diff --git a/net-libs/gnutls/gnutls-3.7.9.ebuild b/net-libs/gnutls/gnutls-3.7.9.ebuild
index 6c27a339a55c..09c958dd5c69 100644
--- a/net-libs/gnutls/gnutls-3.7.9.ebuild
+++ b/net-libs/gnutls/gnutls-3.7.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
+IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
 RESTRICT="!test? ( test )"
@@ -40,7 +40,6 @@ BDEPEND="
 	>=virtual/pkgconfig-0-r1
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
-	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		>=app-misc/datefudge-1.22
@@ -101,6 +100,7 @@ multilib_src_configure() {
 	export gl_cv_warn_c__fanalyzer=no
 
 	local myeconfargs=(
+		--disable-valgrind-tests
 		$(multilib_native_enable manpages)
 		$(multilib_native_use_enable doc gtk-doc)
 		$(multilib_native_use_enable doc)
@@ -109,7 +109,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable test tests)
 		$(multilib_native_use_enable test-full full-test-suite)
 		$(multilib_native_use_enable tools)
-		$(multilib_native_use_enable valgrind valgrind-tests)
 		$(use_enable cxx)
 		$(use_enable dane libdane)
 		$(use_enable nls)
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 8a72ba7694c9..439912b2c426 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -33,9 +33,6 @@
 		<flag name="test-full">
 			Enable full test mode
 		</flag>
-		<flag name="valgrind">
-			Enable usage of <pkg>dev-util/valgrind</pkg> in debug
-		</flag>
 	</use>
 	<slots>
 		<subslots>Reflect ABI compatibility of libgnutls.so</subslots>