net-libs/gnutls: fix hppa and valgrind

Bug: 604752

Package-Manager: portage-2.3.0

3 files changed, 11 insertions, 8 deletions

diff --git a/net-libs/gnutls/gnutls-3.4.17.ebuild b/net-libs/gnutls/gnutls-3.4.17.ebuild
index 67358055a24c..f640fbb19c60 100644
--- a/net-libs/gnutls/gnutls-3.4.17.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.17.ebuild
@@ -14,11 +14,11 @@ LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile idn nls +openssl pkcs11 static-libs test test-full +tls-heartbeat tools zlib ${IUSE_LINGUAS// / linguas_}"
+IUSE="+cxx +crywrap dane doc examples guile idn nls +openssl pkcs11 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
 
 REQUIRED_USE="
 	test? ( tools )
-	test-full? ( pkcs11 openssl tools zlib )"
+	test-full? ( pkcs11 openssl tools valgrind zlib )"
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -33,11 +33,11 @@ RDEPEND=">=dev-libs/libtasn1-4.3:=[${MULTILIB_USEDEP}]
 	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	idn? ( net-dns/libidn[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		app-misc/datefudge
 		dev-libs/softhsm:2
-		dev-util/valgrind
 		net-dialup/ppp
 		net-misc/socat
 	)
@@ -114,7 +114,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable guile) \
 		$(multilib_native_use_enable crywrap) \
 		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full valgrind-tests) \
+		$(multilib_native_use_enable valgrind valgrind-tests) \
 		$(use_enable nls) \
 		$(use_enable openssl openssl-compatibility) \
 		$(use_enable tls-heartbeat heartbeat-support) \
diff --git a/net-libs/gnutls/gnutls-3.5.7.ebuild b/net-libs/gnutls/gnutls-3.5.7.ebuild
index fe804db0e1f4..5005875909d8 100644
--- a/net-libs/gnutls/gnutls-3.5.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.7.ebuild
@@ -14,11 +14,11 @@ LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 sslv2 +sslv3 static-libs test test-full +tls-heartbeat tools zlib ${IUSE_LINGUAS// / linguas_}"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 sslv2 +sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
 
 REQUIRED_USE="
 	test? ( tools )
-	test-full? ( pkcs11 openssl tools zlib )"
+	test-full? ( pkcs11 openssl tools valgrind zlib )"
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -33,11 +33,11 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	idn? ( net-dns/libidn[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-util/valgrind )
 	test-full? (
 		app-crypt/dieharder
 		app-misc/datefudge
 		dev-libs/softhsm:2
-		dev-util/valgrind
 		net-dialup/ppp
 		net-misc/socat
 	)
@@ -115,7 +115,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable doc gtk-doc) \
 		$(multilib_native_use_enable guile) \
 		$(multilib_native_use_enable test tests) \
-		$(multilib_native_use_enable test-full valgrind-tests) \
+		$(multilib_native_use_enable valgrind valgrind-tests) \
 		$(use_enable nls) \
 		$(use_enable openssl openssl-compatibility) \
 		$(use_enable tls-heartbeat heartbeat-support) \
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index de46a2ea13bd..050220181932 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -34,6 +34,9 @@
     <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>