commit:     b14ea48df1017341dc2c1ffa15b183a417b054bc
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 02:28:22 2017 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 19:26:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14ea48d

net-libs/gnutls: add test-full USE

temporary force tools for tests

Bug: 604144

Package-Manager: portage-2.3.0
RepoMan-Options: --force

 net-libs/gnutls/gnutls-3.4.17.ebuild | 15 +++++++++++++--
 net-libs/gnutls/gnutls-3.5.7.ebuild  | 15 +++++++++++++--
 net-libs/gnutls/metadata.xml         |  3 +++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/net-libs/gnutls/gnutls-3.4.17.ebuild 
b/net-libs/gnutls/gnutls-3.4.17.ebuild
index 77c6ae3..9c247c7 100644
--- a/net-libs/gnutls/gnutls-3.4.17.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +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 +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 zlib ${IUSE_LINGUAS// / 
linguas_}"
+
+REQUIRED_USE="
+       test? ( tools )
+       test-full? ( pkcs11 openssl tools zlib )"
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -29,6 +33,13 @@ 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}] )
+       test-full? (
+               app-crypt/dieharder
+               app-misc/datefudge
+               dev-libs/softhsm:2
+               net-dialup/ppp
+               net-misc/socat
+       )
        abi_x86_32? (
                !<=app-emulation/emul-linux-x86-baselibs-20140508
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]

diff --git a/net-libs/gnutls/gnutls-3.5.7.ebuild 
b/net-libs/gnutls/gnutls-3.5.7.ebuild
index 3491513..e3f940b 100644
--- a/net-libs/gnutls/gnutls-3.5.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +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 +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 zlib ${IUSE_LINGUAS// / 
linguas_}"
+
+REQUIRED_USE="
+       test? ( tools )
+       test-full? ( pkcs11 openssl tools zlib )"
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -29,6 +33,13 @@ 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}] )
+       test-full? (
+               app-crypt/dieharder
+               app-misc/datefudge
+               dev-libs/softhsm:2
+               net-dialup/ppp
+               net-misc/socat
+       )
        abi_x86_32? (
                !<=app-emulation/emul-linux-x86-baselibs-20140508
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]

diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 7abdcd0..de46a2e 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -31,6 +31,9 @@
     <flag name="sslv3">
       Support for the old/insecure SSLv3 protocol
     </flag>
+    <flag name="test-full">
+      Enable full test mode
+    </flag>
   </use>
   <slots>
    <subslots>Reflect ABI compatibility of libgnutls.so</subslots>

Reply via email to