From 9950c248e87396b5501dce96af3107885ef8a26d Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <beber@meleeweb.net>
Date: Mon, 2 Sep 2013 22:03:41 +0200
Subject: www-misc/litmus: Enhance DEPENDS

Package-Manager: portage-2.2.1
---
 metadata/md5-cache/www-misc/litmus-0.13 | 10 +++++-----
 www-misc/litmus/ChangeLog               |  3 +++
 www-misc/litmus/Manifest                |  4 ++--
 www-misc/litmus/litmus-0.13.ebuild      | 24 ++++++++++++++++--------
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/metadata/md5-cache/www-misc/litmus-0.13 b/metadata/md5-cache/www-misc/litmus-0.13
index a50e6413..d1c85ed1 100644
--- a/metadata/md5-cache/www-misc/litmus-0.13
+++ b/metadata/md5-cache/www-misc/litmus-0.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure
-DEPEND=<net-libs/neon-0.30:0/0[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] libxml2? ( dev-libs/libxml2:2 )
+DEPEND=<net-libs/neon-0.30:0/0[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] expat? ( dev-libs/expat:0 ) gnutls? ( net-libs/gnutls:0 ) kerberos? ( app-crypt/mit-krb5:0 ) libproxy? ( net-libs/libproxy:0 ) libxml2? ( dev-libs/libxml2:2 ) pkcs11? ( dev-libs/pakchois:0 ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=WebDAV server protocol compliance test suite
 EAPI=5
 HOMEPAGE=http://www.webdav.org/neon/litmus
-IUSE=debug expat gnutls kerberos libproxy +libxml2 +ssl pkcs11 threads
+IUSE=debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=<net-libs/neon-0.30:0/0[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] libxml2? ( dev-libs/libxml2:2 )
-REQUIRED_USE=?? ( gnutls ssl ) ?? ( expat libxml2 ) threads? ( ^^ ( gnutls ssl ) )
+RDEPEND=<net-libs/neon-0.30:0/0[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] expat? ( dev-libs/expat:0 ) gnutls? ( net-libs/gnutls:0 ) kerberos? ( app-crypt/mit-krb5:0 ) libproxy? ( net-libs/libproxy:0 ) libxml2? ( dev-libs/libxml2:2 ) pkcs11? ( dev-libs/pakchois:0 ) ssl? ( dev-libs/openssl:0 )
+REQUIRED_USE=?? ( gnutls ssl ) ^^ ( expat libxml2 ) threads? ( ^^ ( gnutls ssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz
-_md5_=6ae0cce218d332dcd9f4d3e0c6702de1
+_md5_=c218603aa94d875ece3bec2baedc6242
diff --git a/www-misc/litmus/ChangeLog b/www-misc/litmus/ChangeLog
index bca15fa4..a0d42c17 100644
--- a/www-misc/litmus/ChangeLog
+++ b/www-misc/litmus/ChangeLog
@@ -1,3 +1,6 @@
+  02 Sep 2013; Bertrand Jacquin <beber@meleeweb.net> litmus-0.13.ebuild:
+  www-misc/litmus: Enhance DEPENDS
+
   21 Aug 2013; Bertrand Jacquin <beber@meleeweb.net> litmus-0.13.ebuild,
   metadata.xml:
   www-misc/litmus: Support more USE flags (expat, gnutls, kerberos, libxml2,
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
index b7e56a4b..71f49a65 100644
--- a/www-misc/litmus/Manifest
+++ b/www-misc/litmus/Manifest
@@ -1,4 +1,4 @@
 DIST litmus-0.13.tar.gz 467532 SHA256 09d615958121706444db67e09c40df5f753ccf1fa14846fdeb439298aa9ac3ff WHIRLPOOL a9809b9e3a3faf0f51dc234a117812442bac84dddfe339f1746094237096164bbfcab8eb4739d7c4a325480124828217194374401a1396e1c7f1f1807883e9eb
-EBUILD litmus-0.13.ebuild 1278 SHA256 2844ab4fccd1e07ee05ec471a673ed9eee32a27bf6abee4e56232e00cd8f09d6 WHIRLPOOL e75f53239b665ebcf9927d2ac03de015be65c5fe44f566ca595e3c01dc4032cccfc221533badb7b06689f500d4fb9a90135ff6aa87830d76286dfb315b17a9c8
-MISC ChangeLog 728 SHA256 2717ce654ecc40ee81be86b20888408e6da74da1130344b50b46e4153b56c8f3 WHIRLPOOL bba23b45b6abd5a7def4b6edd002bb97d4eb5c90d079746fe16128299d59d09ce6de46a4e13c0e5403007f3c67835de1cc97f112d2261b89582e168226f4c89e
+EBUILD litmus-0.13.ebuild 1565 SHA256 7484d3888f295b1521fa28b0570101b04e2500b3027b756d3a8a63d8bd3c13d5 WHIRLPOOL 604f575d02cf792dc599cec530acb1929d48cee373d6fb776b0c2035820743e04bf37fbfcda01a27cb66b8c7fbba5d6d642807a1e06ae91f1ac8eabff5c5d523
+MISC ChangeLog 837 SHA256 abb4fde0af6597f5357ae3e224d75b77472b48df864e62443c7afb67112e43e5 WHIRLPOOL 09e75f13b6d6a79549723fa084e7d3f1dac797433f6cfb9b3c7b7d45744e0bdf41fc1563266f50fe7bc23282f036d8946b0166fbb6fee8288211e053c68772f4
 MISC metadata.xml 506 SHA256 5fb55df2bf178412e8bf7c84ac0f007438175a1b6911b569495a7c4a227ac827 WHIRLPOOL cf0ccd65f40ed272f80807dab50e1df1e4a7f6081e00e3b6894c83200cbe122b40d4ccfb4d965c9abfb846388d37655478ef47f9504a09976721d52cc2f167d2
diff --git a/www-misc/litmus/litmus-0.13.ebuild b/www-misc/litmus/litmus-0.13.ebuild
index d5376483..7432a1c9 100644
--- a/www-misc/litmus/litmus-0.13.ebuild
+++ b/www-misc/litmus/litmus-0.13.ebuild
@@ -1,9 +1,13 @@
 # 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"
 HOMEPAGE="http://www.webdav.org/neon/litmus"
 SRC_URI="http://www.webdav.org/neon/${PN}/${P}.tar.gz"
@@ -11,23 +15,27 @@ SRC_URI="http://www.webdav.org/neon/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug expat gnutls kerberos libproxy +libxml2 +ssl pkcs11 threads"
+IUSE="debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads"
 REQUIRED_USE="?? ( gnutls ssl )
-	?? ( expat libxml2 )
+	^^ ( expat libxml2 )
 	threads? ( ^^ ( gnutls ssl ) )"
 
-# TODO: FAIL (connection refused by '...' port 80: Connection refused)
-RESTRICT="test"
-
 NEON_DEP="<net-libs/neon-0.30:0/0"
-
 DEPEND="${NEON_DEP}[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib]
-	libxml2? ( dev-libs/libxml2:2 )"
+
+	expat? ( dev-libs/expat:0 )
+	gnutls? ( net-libs/gnutls:0 )
+	kerberos? ( app-crypt/mit-krb5:0 )
+	libproxy? ( net-libs/libproxy:0 )
+	libxml2? ( dev-libs/libxml2:2 )
+	pkcs11? ( dev-libs/pakchois:0 )
+	ssl? ( dev-libs/openssl:0 )"
 RDEPEND="${DEPEND}"
 
 DOCS=( ChangeLog FAQ NEWS README THANKS TODO )
 
 src_configure() {
+	# No EGD available in the Portage tree.
 	econf \
 		--enable-warnings \
 		--without-egd \
-- 
cgit v1.2.3