From 963216a731c39f143c82792350b96363b1dd970b Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Sun, 17 Apr 2022 16:31:09 +0200 Subject: www-misc/litmus: EAPI 5 -> 8 Closes: https://bugs.gentoo.org/715472 Closes: https://bugs.gentoo.org/835351 Signed-off-by: Conrad Kostecki --- .../litmus/files/0.13-autotools-neon-version.patch | 11 ---- .../files/litmus-0.13-autotools-neon-version.patch | 11 ++++ www-misc/litmus/litmus-0.13-r1.ebuild | 66 ++++++++++++++++++++++ www-misc/litmus/litmus-0.13.ebuild | 61 -------------------- 4 files changed, 77 insertions(+), 72 deletions(-) delete mode 100644 www-misc/litmus/files/0.13-autotools-neon-version.patch create mode 100644 www-misc/litmus/files/litmus-0.13-autotools-neon-version.patch create mode 100644 www-misc/litmus/litmus-0.13-r1.ebuild delete mode 100644 www-misc/litmus/litmus-0.13.ebuild (limited to 'www-misc') diff --git a/www-misc/litmus/files/0.13-autotools-neon-version.patch b/www-misc/litmus/files/0.13-autotools-neon-version.patch deleted file mode 100644 index c2e0211b6508..000000000000 --- a/www-misc/litmus/files/0.13-autotools-neon-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/files/litmus-0.13-autotools-neon-version.patch b/www-misc/litmus/files/litmus-0.13-autotools-neon-version.patch new file mode 100644 index 000000000000..b1fdfd61e3ec --- /dev/null +++ b/www-misc/litmus/files/litmus-0.13-autotools-neon-version.patch @@ -0,0 +1,11 @@ +--- 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 31 32]) + NEON_WITHOUT_ZLIB + NEON_WITHOUT_ACL + NEON_TEST diff --git a/www-misc/litmus/litmus-0.13-r1.ebuild b/www-misc/litmus/litmus-0.13-r1.ebuild new file mode 100644 index 000000000000..2f6f95a3ad14 --- /dev/null +++ b/www-misc/litmus/litmus-0.13-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="WebDAV server protocol compliance test suite" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${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 ) + ) +" + +# 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 ) +" + +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-autotools-neon-version.patch" ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + 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[@]}" +} diff --git a/www-misc/litmus/litmus-0.13.ebuild b/www-misc/litmus/litmus-0.13.ebuild deleted file mode 100644 index a7cdc6362201..000000000000 --- a/www-misc/litmus/litmus-0.13.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools epatch - -# 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="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${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 ) )" - -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? ( 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 \ - --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) -} -- cgit v1.2.3-65-gdbad