Use global USE flags, better REQUIRED_USE syntax and more cleanup; proxied commit for Bertrand Jacquin, bug #472878.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 24 insertions, 17 deletions

diff --git a/www-misc/litmus/ChangeLog b/www-misc/litmus/ChangeLog
index c2790991213d..8ff9eba72f5a 100644
--- a/www-misc/litmus/ChangeLog
+++ b/www-misc/litmus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/litmus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/ChangeLog,v 1.1 2013/08/16 21:44:02 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/ChangeLog,v 1.2 2013/09/01 18:26:28 tomwij Exp $
+
+  01 Sep 2013; Tom Wijsman <TomWij@gentoo.org> litmus-0.13.ebuild, metadata.xml:
+  Use global USE flags, better REQUIRED_USE syntax and more cleanup; proxied
+  commit for Bertrand Jacquin, bug #472878.
 
 *litmus-0.13 (16 Aug 2013)
 
diff --git a/www-misc/litmus/litmus-0.13.ebuild b/www-misc/litmus/litmus-0.13.ebuild
index 255f8015e272..2aba090b4275 100644
--- a/www-misc/litmus/litmus-0.13.ebuild
+++ b/www-misc/litmus/litmus-0.13.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild,v 1.1 2013/08/16 21:44:02 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild,v 1.2 2013/09/01 18:26:28 tomwij Exp $
 
 EAPI="5"
 
 # TODO: FAIL (connection refused by '...' port 80: Connection refused)
+# We can't run tests that connect with the internet.
 RESTRICT="test"
 
 DESCRIPTION="WebDAV server protocol compliance test suite"
@@ -15,38 +16,41 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug gnutls gssapi libproxy openssl pkcs11"
+IUSE="debug gnutls kerberos libproxy ssl pkcs11 threads"
 
-REQUIRED_USE="openssl? ( !gnutls ) gnutls? ( !openssl )"
+REQUIRED_USE="^^ ( ssl gnutls )"
 
 neon_dep="<net-libs/neon-0.30:0/0"
 
-# First paragraph are required dependencies, second optional. 
+# First paragraph are required dependencies, second optional.
 DEPEND="
 	gnutls? ( ${neon_dep}[ssl,zlib] )
-	openssl? ( ${neon_dep}[ssl,zlib] )
-	!gnutls? ( !openssl? ( ${neon_dep}[zlib] ) )
+	ssl? ( ${neon_dep}[ssl,zlib] )
+	!gnutls? ( !ssl? ( ${neon_dep}[zlib] ) )
 	|| ( dev-libs/expat:0 dev-libs/libxml2:2 )
 
 	gnutls? ( net-libs/gnutls:0 )
-	gssapi? ( dev-perl/GSSAPI:0 )
+	kerberos? ( dev-perl/GSSAPI:0 )
 	libproxy? ( net-libs/libproxy:0 )
 	pkcs11? ( dev-libs/pakchois:0 )
-	openssl? ( dev-libs/openssl:0 )"
+	ssl? ( dev-libs/openssl:0 )"
 
 RDEPEND="${DEPEND}"
 
 DOCS=( ChangeLog FAQ NEWS README THANKS TODO )
 
 src_configure() {
-	# TODO: No EGD in the Portage tree for --with-egd.
+	# No EGD available in the Portage tree.
 	econf \
+		--enable-warnings \
+		--without-egd \
+		--with-neon \
+		--without-included-neon \
+		$(use_enable debug) \
+		$(use_enable threads threadsafe-ssl posix) \
 		$(use_with gnutls ssl gnutls) \
-		$(use_with gssapi) \
+		$(use_with kerberos gssapi) \
 		$(use_with libproxy) \
-		$(use_with openssl ssl openssl) \
-		$(use_with pkcs11 pakchois) \
-		$(use_enable debug) \
-		--with-neon \
-		--without-included-neon
+		$(use_with ssl ssl openssl) \
+		$(use_with pkcs11 pakchois)
 }
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
index 7313724a5e72..50f9570068e8 100644
--- a/www-misc/litmus/metadata.xml
+++ b/www-misc/litmus/metadata.xml
@@ -8,7 +8,6 @@
 	</maintainer>
 	<longdescription>WebDAV server protocol compliance test suite</longdescription>
 	<use>
-		<flag name="gssapi">Support for GSSAPI through <pkg>dev-perl/GSSAPI</pkg>.</flag>
 		<flag name="libproxy">Support for automatic proxy configuratino management through <pkg>net-libs/libproxy</pkg>.</flag>
 		<flag name="openssl">Support for SSL through OpenSSL (<pkg>dev-libs/openssl</pkg>).</flag>
 		<flag name="pkcs11">Support for PKCS #11 through PaKChoiS (<pkg>dev-libs/pakchois</pkg>).</flag>