gentoo resync : 12.05.2022

4 files changed, 40 insertions, 35 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 9c8167a9f89d..bcd669fd3553 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
index faa7249ca934..24b58a8bb8d8 100644
--- a/www-misc/litmus/Manifest
+++ b/www-misc/litmus/Manifest
@@ -1,4 +1,4 @@
-AUX 0.13-autotools-neon-version.patch 344 BLAKE2B ece27a25656cb54a5eac255994fdd757c98840a39c4c215c44bb1b548eb3b5583b04d0bbe2feecec5a05fc0283f8f5ce6903894ed3bb94e57e20e6df825e36ab SHA512 ffc549b2c676a124bbb5a4d9df5ffe3178ac7186dafbad0cbae85b6092b6e204c9ac15e054084efd5eb5bf74620cedeaa88924c02c1f0861e9c258bae7ff9012
+AUX litmus-0.13-autotools-neon-version.patch 278 BLAKE2B 1377d61c8e6053847df342e303eab9f631e424bd098f96b97ab47184b67c7df28d8a8cfbad6fe0f0d968092753715ab8aa67962ee44dd10d75af789c107b1fe0 SHA512 bc17882f3fffbd7f06d27ca8717fa6117fce8665514cad50f6c9ec2242e0a44ed3e81bc47f78b28e5e151a592b496c723a18805822a1f4e3133048c71df97971
 DIST litmus-0.13.tar.gz 467532 BLAKE2B 509951d2751e32917f920fd37720dab215b1b81e6450ee96c5adaad22efd06ce781b80cb6acb363dda9e62ed9e08c2bab1869d24a4fd70f5f7bc337f3e112af4 SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e
-EBUILD litmus-0.13.ebuild 1578 BLAKE2B c293e826677a9a1f0cd68ed969cff5c5af69aee5f99b2e51687f9f24ecf2b7b4daf4b9504d07bfbcaaff6e3ddb6cb396c682cfbe74ccb4cb900a7bc65960a186 SHA512 a05e0149648b14d00f0ba2c5ec7a80a3236b7195cd2b067d6c592bd67e67737b6836ff9ffcbbacf7f42c1edaed7a4752e3eb8117c3fe6a62a1ae8ab4261e070f
+EBUILD litmus-0.13-r1.ebuild 1473 BLAKE2B d2a847752f3b36d35e4b0f914962f5cfab5f345a923703b3746d65c067f6c9e3e7c87a038e25e9c193e2683f396d5ef8178c38fb996288ab8c6896bbcb207521 SHA512 e1ddfd81d03684d4144e2b84385c5af95a13e16a563fac5171bdd09bbfa48a65a4be9eb0928c9b06ae875fcd36c3728750fd02603c6ed4348f285959b254b164
 MISC metadata.xml 700 BLAKE2B b2c4edf0ad95b882f3f56cae429e64242274e708dd3e4a72532b3bc1322b431572a0e81e5379bab35aa86926dcc5d46f7d3b7469483041151d9a461bd884c3c9 SHA512 5a07e8eb5d164d366c6fc3c451b08b23902364a84a92b1c7432b5112cdda552c7f5c8d26067722d6dfc0852bd667a15a90c25b8060defda9053fec12b91daca5
diff --git a/www-misc/litmus/files/0.13-autotools-neon-version.patch b/www-misc/litmus/files/litmus-0.13-autotools-neon-version.patch
index c2e0211b6508..b1fdfd61e3ec 100644
--- a/www-misc/litmus/files/0.13-autotools-neon-version.patch
+++ b/www-misc/litmus/files/litmus-0.13-autotools-neon-version.patch
@@ -1,11 +1,11 @@
---- configure.ac.ori	2014-01-31 01:00:58.796123088 +0100
-+++ configure.ac	2014-01-31 01:00:43.767787763 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -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])
++NE_REQUIRE_VERSIONS([0], [25 26 27 28 29 30 31 32])
  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-r1.ebuild
index a7cdc6362201..2f6f95a3ad14 100644
--- a/www-misc/litmus/litmus-0.13.ebuild
+++ b/www-misc/litmus/litmus-0.13-r1.ebuild
@@ -1,13 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
-inherit autotools epatch
-
-# TODO: FAIL (connection refused by '...' port 80: Connection refused)
-# We can't run tests that connect with the internet.
-RESTRICT="test"
+inherit autotools
 
 DESCRIPTION="WebDAV server protocol compliance test suite"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -17,45 +13,54 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads"
-REQUIRED_USE="?? ( gnutls ssl )
+REQUIRED_USE="
+	?? ( gnutls ssl )
 	^^ ( expat libxml2 )
-	threads? ( ^^ ( gnutls ssl ) )"
+	threads? (
+		^^ ( gnutls ssl )
+	)
+"
 
-NEON_DEP="net-libs/neon:0="
-DEPEND="${NEON_DEP}[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib]
+# TODO: FAIL (connection refused by '...' port 80: Connection refused)
+# We can't run tests that connect with the internet.
+RESTRICT="test"
 
+DEPEND="
+	net-libs/neon: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 )"
+	ssl? ( dev-libs/openssl:0 )
+"
+
 RDEPEND="${DEPEND}"
 
-DOCS=( ChangeLog FAQ NEWS README THANKS TODO )
+PATCHES=( "${FILESDIR}/${P}-autotools-neon-version.patch" )
 
 src_prepare() {
-	# Accept Neon 0.30.
-	epatch "${FILESDIR}/${PV}-autotools-neon-version.patch"
-
+	default
 	eautoreconf
 }
 
 src_configure() {
-	# 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 ssl    ssl openssl) \
-		$(use_with expat) \
-		$(use_with libxml2) \
-		$(use_with kerberos gssapi) \
-		$(use_with pkcs11 pakchois) \
+	local myeconfargs=(
+		--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 ssl ssl openssl)
+		$(use_with expat)
+		$(use_with libxml2)
+		$(use_with kerberos gssapi)
+		$(use_with pkcs11 pakchois)
 		$(use_with libproxy)
+	)
+
+	econf "${myeconfargs[@]}"
 }