gentoo new year resync : 01.01.2021

5 files changed, 39 insertions, 159 deletions

diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 7b546ee5bf4e..6572f0eb600d 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,10 +1,6 @@
-DIST libisds-0.10.6.tar.xz 724120 BLAKE2B b6d3f42d4ff84c377c9425dfd84a14ae97ccc39ea4bb96169e3a8de21b99dd6e5ceda39a6d4a574ccb418561dbec2507f72afc8b6f185c34ff92202abcc49441 SHA512 602c4e7f047dedff131cda941d02ea41fca7b8ea80eb668ab8f7ab2626a013ddc1a86f1e2c7b5759adf266c7c22c515284e6d4fdd9fd594ad310bed1be6016f4
-DIST libisds-0.10.7.tar.xz 724840 BLAKE2B 73d93b518271cbd08787a38da454ceb8fa6c2d421b0291c61cded8f1438d44c5607d1e90d75714c3d76e0886ac723e38dc2a41d60284a58d567abdcba76becd4 SHA512 ba2ef11c2983cb3bc8f779e7af3fb8319d38a786911e68c6b53c25aff339b4630bdf78886825ea3da671e87f689cab376cd9e41398f3f74608af932abe7a0023
 DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
-DIST libisds-0.11.tar.xz 741952 BLAKE2B 553613b7f1d8f5b3af1ecff2734584234f5d461c289c08acaf4353b724102ac87da5e60c2b5ffc2895a6441af2a51e0a381ab9df4494d7543edf356b989df891 SHA512 d30708cc6df92f0da9c4fac9acea3c1f3d97ae5ed1f17967e41c4887fe90f5b7375508df987b4b98cc5653a099a78c7a678f8fcb6897de863ff2f4538413f7dd
-EBUILD libisds-0.10.6.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
-EBUILD libisds-0.10.7.ebuild 1184 BLAKE2B 719e6c404063287a16186c52442ecbd0c2b12dfa915403e4dfd75fe8bab001796b5342dbe133de04836f3ec24b7e6d6070e3c67a2a8587130ae2ea050fb9ba92 SHA512 e8a4283e30245a6a6849a097c82ec32152b9894c11f5ce3287ec194b644f7d292c1e97b846a9461d364a3770ac21ea667970a15c86273cbd1c199de40a6b5a17
+DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a
 EBUILD libisds-0.10.8.ebuild 1183 BLAKE2B 609e17accfe1f3b0c149890cc81a38f5d03f9d63e826e64b8e0dd48842d17c1292acc27ba58f9f7a1158db292b2a27ee9f0e6165d2a5e0d254d9f9470d4903bb SHA512 4111123c6388132aa065df5c9c1dd4d73f44223086577ef0a3c9afaedf22052ef54f78b762b45e0b950aa41b96e9ee80cb2fc073698661b14e881fad035ee9fd
-EBUILD libisds-0.11.ebuild 1274 BLAKE2B eccde55c98bf443f36ba823fb8d3a723960bcd39dd6968af1b964a16e94cfe128f48a6926d15182cb1b22f19c32d1a32c5dd533ff5f438b66a54e95ee15a0b90 SHA512 5c2b1e00de587bee9dfdd3159c421ffc5be6b077f197520f757576a35d1e2b6b1ef5f2f97d87d0e48edc399f0686bb9536131569526c3f2e117e611dc932c7ca
-EBUILD libisds-9999.ebuild 1232 BLAKE2B b36387416664cf5273f17d6afcaa86157af7a381b9aad4ddff889fe79fc372d63f6db66e4b34d15070b274ac5b091529c57a15e21c60654b373c28cc32918285 SHA512 017031a837d18d026e48a2a87908a39992e3d134ab65eca2570afbc269f1287064ad672e5d0f77f651a190c56a6daad3dc94f2fb323978d963b7a751b709cb4b
+EBUILD libisds-0.11.1.ebuild 1127 BLAKE2B 7cee56d6661f5af830a1b1ab866fd0e422e01f5a51745a914727d0296fa8ee45fb6d666c2feb649a84e7e21e48891eb5e34e9fbae42ac040deb7c4ba411dcf34 SHA512 1a90290df87abcaf721e95fc4b8ba47b2db57e25f28c48f887ce2f74b6853e785d6d40bad093dedd9f003b26c246d83c171c49753048715f478577cf27199ddc
+EBUILD libisds-9999.ebuild 1154 BLAKE2B 0b944facaec152943b9cac24ffb6f9e6f46b2be459e16d38b327d3a76f566420ff759fb318406546a46af5a3f0e53e25f14314945d37bd33fbcffff188b70918 SHA512 33d0fd8dd98c0dca1e33a748ba9a8780913360cb49decc9b872ae143d6078f9fb6d4166221f9bc3478821ffd703070c40d71e3ffe3e8cba60b374215e10fc9ee
 MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
diff --git a/net-libs/libisds/libisds-0.10.6.ebuild b/net-libs/libisds/libisds-0.10.6.ebuild
deleted file mode 100644
index 9b1974819ffb..000000000000
--- a/net-libs/libisds/libisds-0.10.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Client library for accessing ISDS Soap services"
-HOMEPAGE="http://xpisar.wz.cz/libisds/"
-SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="~amd64 ~mips ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+curl debug nls openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gpgme
-		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/libisds/libisds-0.10.7.ebuild b/net-libs/libisds/libisds-0.10.7.ebuild
deleted file mode 100644
index 9b1974819ffb..000000000000
--- a/net-libs/libisds/libisds-0.10.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Client library for accessing ISDS Soap services"
-HOMEPAGE="http://xpisar.wz.cz/libisds/"
-SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="~amd64 ~mips ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+curl debug nls openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gpgme
-		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/libisds/libisds-0.11.ebuild b/net-libs/libisds/libisds-0.11.1.ebuild
index 959693ab47c5..d9a4859a617a 100644
--- a/net-libs/libisds/libisds-0.11.ebuild
+++ b/net-libs/libisds/libisds-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,10 +10,10 @@ KEYWORDS="~amd64 ~mips ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="+curl debug doc nls openssl static-libs test"
+IUSE="+curl debug doc nls openssl test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/expat
 	dev-libs/libxml2
 	curl? ( net-misc/curl[ssl] )
@@ -23,31 +23,26 @@ COMMON_DEPEND="
 	)
 	openssl? ( dev-libs/openssl:= )
 	!openssl? (
+		app-crypt/gnupg
 		app-crypt/gpgme
 		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
+	)"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls )"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
+	nls? ( sys-devel/gettext )"
 
 src_configure() {
 	local myeconfargs=(
 		--disable-fatalwarnings
+		--disable-static
 		$(use_with curl libcurl)
 		$(use_enable curl curlreauthorizationbug)
 		$(use_enable doc)
 		$(use_enable debug)
 		$(use_enable nls)
 		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
 		$(use_enable test)
 	)
 	econf "${myeconfargs[@]}"
@@ -56,5 +51,5 @@ src_configure() {
 src_install() {
 	default
 
-	find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libisds/libisds-9999.ebuild b/net-libs/libisds/libisds-9999.ebuild
index 29b8477bdd67..eb24a312d360 100644
--- a/net-libs/libisds/libisds-9999.ebuild
+++ b/net-libs/libisds/libisds-9999.ebuild
@@ -1,54 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-[[ ${PV} = 9999* ]] && inherit git-r3 autotools
+EAPI=7
 
+inherit autotools git-r3
 DESCRIPTION="Client library for accessing ISDS Soap services"
 HOMEPAGE="http://xpisar.wz.cz/libisds/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
-else
-	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-	KEYWORDS="~amd64 ~mips ~x86"
-fi
+EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="+curl debug nls static-libs test"
+IUSE="+curl debug doc nls openssl test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
-	app-crypt/gpgme
+RDEPEND="
 	dev-libs/expat
-	dev-libs/libgcrypt:0=
 	dev-libs/libxml2
 	curl? ( net-misc/curl[ssl] )
-"
-DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+	openssl? ( dev-libs/openssl:= )
+	!openssl? (
+		app-crypt/gnupg
+		app-crypt/gpgme
+		dev-libs/libgcrypt:=
+	)"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls )"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-crypt/gnupg-2
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
+	nls? ( sys-devel/gettext )"
 
 src_prepare() {
 	default
-	[[ ${PV} = 9999* ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
 		--disable-fatalwarnings
+		--disable-static
 		$(use_with curl libcurl)
 		$(use_enable curl curlreauthorizationbug)
+		$(use_enable doc)
 		$(use_enable debug)
 		$(use_enable nls)
-		$(use_enable static-libs static)
+		$(use_enable openssl openssl-backend)
 		$(use_enable test)
 	)
 	econf "${myeconfargs[@]}"
@@ -57,5 +56,5 @@ src_configure() {
 src_install() {
 	default
 
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }