gentoo resync : 03.03.2021

8 files changed, 22 insertions, 215 deletions

diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index 6d846a9e20cd..585a4cf889d6 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,13 +1,3 @@
-DIST wandio-1.0.5.tar.gz 385535 BLAKE2B a7911ab14ff9911ef19bf35b6e50d3f2e6dd0fa06f5689b6c353cc5ff2ee93175d7e758657f79fd35e7aff29fb1a4b4c343c30ab1e00a118ec3056ba9129cd60 SHA512 3bf2b4362355bb3db047ea12055b96cc6fdd759b4efbd9cf1caf05133ae9e7e1fab5f4a7e5eadda45d7c1b4dcf9aba1cf3a4c04bc23694934aa8aa67ec31e480
-DIST wandio-4.0.0.tar.gz 385706 BLAKE2B 7f6e7855a06ae2c23138598c5cf16c9a38f57932d488cf2c9d0fda2fe54e971b8e93b5768a487328afc2079add7f269cd8f0203314b06eb3d256f8739828c6fb SHA512 8ee4149439411e8ca784a434766c5c35144fb49c7166c2f135cf47625011815e2b27af5b61d75d6a4f9e64ab1091ce1cfd4ef114e34b57e0c53029be45f9369c
-DIST wandio-4.1.2.tar.gz 409755 BLAKE2B 90bf4cf9bdd6cdd87668614c91bbd5fd8dc7c526a8e985737d1dced760209be205052221ebfe9ebf92b7c05492298da275498aee1e3817d73235488da9ee2cc1 SHA512 0d74aec9fe2faf678d369fec420f56ae78eedc5f38b70b403034fb030a9c0d1d5a54225b111993ce59b79d8e02ad49a2b0ca4697c7910149f2ae54379d9e19c4
-DIST wandio-4.2.0.tar.gz 410273 BLAKE2B f133e783f6f47a6d55058684b4965d02816a0fe835bcce274292287492e53007ebfce3b447d6ac9f58d8d4626ba20b7b6a7e5e6ac3cc054ef49d70c843c0216f SHA512 befbca1479b32cca909c6125e54be0a061d1fecfc01d9bca7cbd54f86564d39a02714805c7583d9b50896bb553a197e0f86fd10d4424782f5e9798a0cb440923
-DIST wandio-4.2.1.tar.gz 15417543 BLAKE2B 704ed3846cda3755ad305bdb84febed75ba1f044d0380465041cab9f44dc16c1a7fc8bb5a8d4292d5f6c12d6783af45d93bdce70228afc5438bbe7d6f5714491 SHA512 eab9180e477f63e37b11d090b772037fc319554495e6f3656da66e34dcde25f47566e87b71255645d9bb5aaaff721f0dceace4d880cdca491c05a9de6852553b
 DIST wandio-4.2.3_p1.tar.gz 15418423 BLAKE2B 1274f10b87964e2dc87ed25a465991b1e4e9211b75fb5ac5a13a0aa535ff30ddfa69059b3d41de7dc758220bda8dd9d02ca7ed31b7c0ca2997641968cc729e48 SHA512 b4bfff9d33010c04826318c560592ee7f7aba9fccd0eba0f29c6294a636971bf4ac5105ffb9addfc22946e7b7234396dafa6c7e0a0d8de3ee1b7e586c069b438
-EBUILD wandio-1.0.5.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
-EBUILD wandio-4.0.0.ebuild 763 BLAKE2B b8a182d6d0e43b564b513673627642f620f6f70353ed996cb3efb280c0c4df9ab512f91e00f0485362ebb9c7b470e1149c4e1c328b09129ef94476c677a05d50 SHA512 8bfe12bf9d275c8da7513382cc8eb996722642e3d041f101c33575245ae6ee212ba3ba12ceff60c3a5bfd63ad7a4ee8d703e3553d8c49febffa0b5ceb0e4bccd
-EBUILD wandio-4.1.2.ebuild 760 BLAKE2B 0882091040df94b87a0fd6fcd299ba996706dd57e69c6ba1f1661a77bd9f919e0d5cac8aded697073d79a3516f5937973467ae389b6c06c9939627728c81e8f8 SHA512 32a42584bf5d8a5366d51b24e8bc0a204ff94b9918dc13daaeb4fd33c729eae676b283eccca967cfe05bf16d5a34aed8b9af8728ca024c0d3525f992d8abbe22
-EBUILD wandio-4.2.0.ebuild 760 BLAKE2B ce10f3f5b9892f8d4559340d7bd658f6c81eb8386ac44cec033c92690b23e5aa7ba148cc3a17057ab0e80e1218639e2887886046a8aba22791e02cabccfac902 SHA512 2d65bb7cbf03be4bf7555d2f4af1f01d6c51e69b3fced3574604f90d695fe91b1d8f5ae05a990b8189d8b4d1b60bd4d6ade4e61c29de07a4aeb794c4f2e07d95
-EBUILD wandio-4.2.1.ebuild 939 BLAKE2B 5b655173042829fb5466eef3fb5517758e84674243b6f0c0bc3a4df8d183b251df5a8ec10f61f8f3050d6bd81dabab36f8733fda4ad3e8452c7e5fbfe48c8cb5 SHA512 428e577429bb6a3fdbcd569d003ad27828b384163097e2d1cd0a7f0e3e3dd5826529915b78c322be4d7e14b6b5aa2e8ed5b8bae709100c3478e2d46cb9b78870
-EBUILD wandio-4.2.3_p1-r1.ebuild 1037 BLAKE2B 635c179b9a94ab256124bb8a74322bd5eddb71d9147630248167c075ed104175ab24d46ac5be1ae0e1a34fd0020f7fef4aa6be4eee0ed90613167dd06bdeca8f SHA512 4ed8ff8a8e3259d85c4fecfbb8f9bd85881d845c35ef2f11249aa69f7d41e231836f18e66e78615a3166a38345637b0c063cece2468dac42a75954cf56f19e05
-MISC metadata.xml 325 BLAKE2B 83c3a11757f54887d9fa3ed48c2a9c5a5ababc6070875778a26157b04624c6411d406f810a1c9c02bdc6355675e41a130cb21cfd987aea39e1d2aac8d23c2895 SHA512 f6baf388df040729e65cf7b578f13650917d22989b89ba4adeaeba332fdc78fc8f3661fc37c238a495c75f4cc601c2642f13e2660e73b6e36da8db39dacb052a
+EBUILD wandio-4.2.3_p1-r1.ebuild 1075 BLAKE2B c2b0086b33f6e43826cfba1520bbae67b5b67dc34fb46c2e2d9c08d883d5365d74eea3e113a528bed9285885a97c366f13a624699a45c1c3fdf45fa5e2fa8cd5 SHA512 b3d777a31fab7bf88b76e8823fdaa3771cfd2387119421752ce0d12d0d6f9e6fb0fe99e45628372efde653f2bde962479e2b4f89d33657d547ee264b63a8d651
+MISC metadata.xml 412 BLAKE2B 4173e01b1d35f1c4a53e624d99366572037eda88e016900378ff680dec75600085efd3222423be0318bf320b683d4467df9e127f6c1d7e208110c903732da2c3 SHA512 af4359b086d6192c51a8d4acd3036b0b2d0b0a719a183a80d48aabc5b3965769e82084fe5c5fc82e3c87435c8d3df92976a44c2392655dcaff38ae1c86607e69
diff --git a/net-libs/wandio/metadata.xml b/net-libs/wandio/metadata.xml
index 5cf4e8226272..05148eb557aa 100644
--- a/net-libs/wandio/metadata.xml
+++ b/net-libs/wandio/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-</maintainer>
-<use>
-<flag name='http'>Build support for reading files over HTTP using <pkg>net-misc/curl</pkg></flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="http">Build support for reading files over HTTP using <pkg>net-misc/curl</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wanduow/wandio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/wandio/wandio-1.0.5.ebuild b/net-libs/wandio/wandio-1.0.5.ebuild
deleted file mode 100644
index 069c3be4975f..000000000000
--- a/net-libs/wandio/wandio-1.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.0.0.ebuild b/net-libs/wandio/wandio-4.0.0.ebuild
deleted file mode 100644
index 069c3be4975f..000000000000
--- a/net-libs/wandio/wandio-4.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.1.2.ebuild b/net-libs/wandio/wandio-4.1.2.ebuild
deleted file mode 100644
index 3e738af7ca8a..000000000000
--- a/net-libs/wandio/wandio-4.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.2.0.ebuild b/net-libs/wandio/wandio-4.2.0.ebuild
deleted file mode 100644
index 7a923dc15cc2..000000000000
--- a/net-libs/wandio/wandio-4.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs zlib"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
diff --git a/net-libs/wandio/wandio-4.2.1.ebuild b/net-libs/wandio/wandio-4.2.1.ebuild
deleted file mode 100644
index 97dc53cce125..000000000000
--- a/net-libs/wandio/wandio-4.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="C library for simple and efficient file IO"
-HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
-SRC_URI="https://github.com/wanduow/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<net-libs/libtrace-4
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	http? ( net-misc/curl )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( app-arch/lzop )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with bzip2) \
-		$(use_with http) \
-		$(use_with lzma) \
-		$(use_with lzo) \
-		$(use_with zlib)
-}
-
-src_test() {
-	pushd test || die
-	sh do-basic-tests.sh
-}
diff --git a/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild b/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
index e0d614fcb241..4eef4248a4d6 100644
--- a/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
+++ b/net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="C library for simple and efficient file IO"
 HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
 SRC_URI="https://github.com/wanduow/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="LGPL-3"
 SLOT="0/6"
 KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 http lzma lzo static-libs test zlib"
+IUSE="bzip2 http lzma lzo test zlib"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lzma lzo )"
 
 RDEPEND="
 	!<net-libs/libtrace-4
@@ -26,7 +29,6 @@ DEPEND="
 	${RDEPEND}
 	test? ( app-arch/lzop )
 "
-S=${WORKDIR}/${P/_p/-}
 
 src_prepare() {
 	default
@@ -35,7 +37,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with bzip2) \
 		$(use_with http) \
 		$(use_with lzma) \
@@ -43,12 +45,12 @@ src_configure() {
 		$(use_with zlib)
 }
 
+src_test() {
+	pushd test || die
+	${CONFIG_SHELL}/bin/bash do-basic-tests.sh || die
+}
+
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 }
-
-src_test() {
-	pushd test || die
-	sh do-basic-tests.sh
-}