Allow >=net-libs/neon-30, bug 499732 by Arfrever. Also several other small changes from maintainer Bertrand Jacquin.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 58 insertions, 24 deletions

diff --git a/www-misc/litmus/ChangeLog b/www-misc/litmus/ChangeLog
index b53f1852a8ba..d5a4a0329e32 100644
--- a/www-misc/litmus/ChangeLog
+++ b/www-misc/litmus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2013/09/02 00:43:49 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/ChangeLog,v 1.4 2014/02/10 03:00:12 floppym Exp $
+
+  10 Feb 2014; Mike Gilbert <floppym@gentoo.org>
+  +files/0.13-autotools-neon-version.patch, litmus-0.13.ebuild, metadata.xml:
+  Allow >=net-libs/neon-30, bug 499732 by Arfrever. Also several other small
+  changes from maintainer Bertrand Jacquin.
 
   02 Sep 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag description from metadata.xml
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
index ea79f13b72ca..5c90ab730355 100644
--- a/www-misc/litmus/Manifest
+++ b/www-misc/litmus/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 0.13-autotools-neon-version.patch 344 SHA256 15394127af20b5d29a8c4666c2a9156046aa2069795d9e811a68a307e288ef0b SHA512 ffc549b2c676a124bbb5a4d9df5ffe3178ac7186dafbad0cbae85b6092b6e204c9ac15e054084efd5eb5bf74620cedeaa88924c02c1f0861e9c258bae7ff9012 WHIRLPOOL 27ff6d16c0d2eb65fb7d62efd9a279c6a5cda3579e9cda7732fe4e558d6320228d69b72fee054af4be2917f40141c2b738592d62367c64d5b33f67584aa61cb9
 DIST litmus-0.13.tar.gz 467532 SHA256 09d615958121706444db67e09c40df5f753ccf1fa14846fdeb439298aa9ac3ff SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e WHIRLPOOL a9809b9e3a3faf0f51dc234a117812442bac84dddfe339f1746094237096164bbfcab8eb4739d7c4a325480124828217194374401a1396e1c7f1f1807883e9eb
-EBUILD litmus-0.13.ebuild 1540 SHA256 36d44671e92f40b3394d79962f951705485ccc1db3dbfa1a4f85c571bdc100a1 SHA512 b843d32094ccd26894ed66e5a7724c378ffa2df30a1d4fe61cae216604323ffe534634246955648a909deef9f5e4b334d40d25896834317c3f0d645b9fd98f86 WHIRLPOOL 9fda9e2c2de2ae4cf31a91e1c57d71b5ff1ff61e9dbfc4fddfb629cde44fe292e12f135aed6ce66c426e041a2a8eb513836beaee944e5f374f7b9cc77fd418de
-MISC ChangeLog 825 SHA256 ac8fa8f814af16bc8dea03de053cbbd08a24716b44023035dc23430feff3281f SHA512 bfafc25101af58a6ea27c20f52681febbfa210c305e60e33edeca9a72463e1ac898427a569deadd9f818070ff4656705334d95a2dff9732664b284197bf23593 WHIRLPOOL a01942fd3c4d17d3d627508777e7253ea8ed97770415d82eb23bae8fa860c435fccf18c98286ddd9a9aa016a910ef727d49d15f7d3851718cf828f88e5bcf296
-MISC metadata.xml 585 SHA256 9eac0183296f3b206e63117e4f3630d52d23a81a56cf6d20bef55197a2708934 SHA512 5b9803cdba5c27e5cf83598bb5052c09f2a0c55bbe271f1562db64ab4f0e04ba567967cea9737c6c1e8b434446809d8e708d94d895ca17e22cd64352bfe0ab07 WHIRLPOOL 48b1e6c350a9e15a6ffb904ff6de6978c05cddef60350783224b93d12540b6e379a6f0823ae9065fe9bc259564ac21eb63cdc0666fb3807bd0d681bdf9376b12
+EBUILD litmus-0.13.ebuild 1701 SHA256 3964c1637f2772f785084d8664c474c5eb5998d0802e0fee471164348b379278 SHA512 7fde4cddea82a3288b291a509ca8f482163bba20b776e1b3705bb52d3bdf65b1e406fa5c754aa578eec6d330048fea26855f9b42adf7b7a7a0e222f43f0faa6b WHIRLPOOL 60e822eff5703578384f0db19363f565869cab0175cd104141d6804d8707c6b1c183fea78a59506f99fa2ca7f6e711f94b027f7f605cad7b9ced50cde9c49137
+MISC ChangeLog 1074 SHA256 76603bbf7b7e0585fdf130578b7da48efae153cb694eb25861bc51b66ef59fb0 SHA512 abacc93746d010535d9527f269f298cefb0a9d7679150b3e0c1a90d7bf9843ad673890fcb86695d4f8b06d7f76346afa5e194a6b357b1b71e115560b0aac7fab WHIRLPOOL 4b1d1b0392a0ce8d1eef770349be77e2a6e18631976a14467458c4487647427eb6db7b92a4802b63d410d2d0561d82f10ce754c5e7b4cadff95c45de5f22e477
+MISC metadata.xml 649 SHA256 b7614bf286f2a611875362dd3b96de5f75b7ae0c678e57c7cc471e6b98423b00 SHA512 223ffdc16dbe3538befc86ca3fc949d3dd1cc05a8a576d08d6d900ce780250251142b95a37c92991f7667c2169acf737fd18c69168b671e906976e6634cae524 WHIRLPOOL 4714f88698bed1cddd1cc60e0b40d5ff2f03ea78df0b5c89808cb9e3ac6ee2662a1b31a004d31a598936606f4aef16248b7f94acb99defd60d159d2ec3d96be2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlL4QL0ACgkQC77qH+pIQ6TUqgD7BFUcgRbnfZIIU4M1pvJ9p0Ca
+cX4vWUVdQb2/kND0RTwBAK65lr04dS1wU6Q9T9MIWDxamjsKs/4OUsx3MWXcK43T
+=+bZt
+-----END PGP SIGNATURE-----
diff --git a/www-misc/litmus/files/0.13-autotools-neon-version.patch b/www-misc/litmus/files/0.13-autotools-neon-version.patch
new file mode 100644
index 000000000000..c2e0211b6508
--- /dev/null
+++ b/www-misc/litmus/files/0.13-autotools-neon-version.patch
@@ -0,0 +1,11 @@
+--- configure.ac.ori	2014-01-31 01:00:58.796123088 +0100
++++ configure.ac	2014-01-31 01:00:43.767787763 +0100
+@@ -20,7 +20,7 @@
+ dnl List of tests
+ AC_SUBST([TESTS], ["basic copymove props locks http"])
+ 
+-NE_REQUIRE_VERSIONS([0], [25 26 27 28 29])
++NE_REQUIRE_VERSIONS([0], [25 26 27 28 29 30])
+ NEON_WITHOUT_ZLIB
+ NEON_WITHOUT_ACL
+ NEON_TEST
diff --git a/www-misc/litmus/litmus-0.13.ebuild b/www-misc/litmus/litmus-0.13.ebuild
index 2aba090b4275..bf903626d5b3 100644
--- a/www-misc/litmus/litmus-0.13.ebuild
+++ b/www-misc/litmus/litmus-0.13.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.2 2013/09/01 18:26:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild,v 1.3 2014/02/10 03:00:12 floppym Exp $
 
 EAPI="5"
 
+inherit autotools eutils
+
 # TODO: FAIL (connection refused by '...' port 80: Connection refused)
 # We can't run tests that connect with the internet.
 RESTRICT="test"
@@ -15,30 +17,32 @@ SRC_URI="http://www.webdav.org/neon/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads"
+REQUIRED_USE="?? ( gnutls ssl )
+	^^ ( expat libxml2 )
+	threads? ( ^^ ( gnutls ssl ) )"
 
-IUSE="debug gnutls kerberos libproxy ssl pkcs11 threads"
-
-REQUIRED_USE="^^ ( ssl gnutls )"
-
-neon_dep="<net-libs/neon-0.30:0/0"
-
-# First paragraph are required dependencies, second optional.
-DEPEND="
-	gnutls? ( ${neon_dep}[ssl,zlib] )
-	ssl? ( ${neon_dep}[ssl,zlib] )
-	!gnutls? ( !ssl? ( ${neon_dep}[zlib] ) )
-	|| ( dev-libs/expat:0 dev-libs/libxml2:2 )
+NEON_DEP="net-libs/neon:0="
+DEPEND="${NEON_DEP}[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib]
 
+	expat? ( dev-libs/expat:0 )
 	gnutls? ( net-libs/gnutls:0 )
-	kerberos? ( dev-perl/GSSAPI: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_prepare() {
+	# Accept Neon 0.30.
+	epatch "${FILESDIR}/${PV}-autotools-neon-version.patch"
+
+	eautoreconf
+}
+
 src_configure() {
 	# No EGD available in the Portage tree.
 	econf \
@@ -49,8 +53,10 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable threads threadsafe-ssl posix) \
 		$(use_with gnutls ssl gnutls) \
+		$(use_with ssl    ssl openssl) \
+		$(use_with expat) \
+		$(use_with libxml2) \
 		$(use_with kerberos gssapi) \
-		$(use_with libproxy) \
-		$(use_with ssl ssl openssl) \
-		$(use_with pkcs11 pakchois)
+		$(use_with pkcs11 pakchois) \
+		$(use_with libproxy)
 }
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
index 3c773e49f319..f0b5e4cd5d70 100644
--- a/www-misc/litmus/metadata.xml
+++ b/www-misc/litmus/metadata.xml
@@ -9,6 +9,7 @@
 	<longdescription>WebDAV server protocol compliance test suite</longdescription>
 	<use>
 		<flag name="libproxy">Support for automatic proxy configuratino management through <pkg>net-libs/libproxy</pkg>.</flag>
+		<flag name="libxml2">Use dev-libs/libxml2 to parse XML</flag>
 		<flag name="pkcs11">Support for PKCS #11 through PaKChoiS (<pkg>dev-libs/pakchois</pkg>).</flag>
 	</use>
 </pkgmetadata>