gentoo resync : 23.09.2020

4 files changed, 2 insertions, 98 deletions

diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 9cf55f52bb10..99ff2f7ea6a9 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,6 +1,3 @@
-DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
-EBUILD libassuan-2.5.1-r1.ebuild 1258 BLAKE2B efa52147c6b3c42086196503ff9d516bb9a9fbede7d648ed36fa98a4a056dc6382428838abcb50e7fad34db24a0ad68a002d33e9b447cf34c61032b987be8f90 SHA512 d24e6d34d0c198bc52d6370c54f764ffa1c4ea20cc49badeebfa879639ac8d4c4d0ad354b2eb1a229e501986390983d02d80d9a6babfd03ecace44d24600c116
-EBUILD libassuan-2.5.1.ebuild 1060 BLAKE2B 00418cde3ff85a1d9d35a248dbada254770b7537198ca794d77186d748114c70efb25ff07bb0e501328800543406d8881f3e1b188f3f086a14ca384b62cfb784 SHA512 13faafbcaffa9da2e873816478b2d5f0411596c34503667a27ba9c8aa5c5b024453d0d070f57054fef72023a7d818cbfbaa51daece2f436187b8e8fe5bdf88ee
-EBUILD libassuan-2.5.3.ebuild 1258 BLAKE2B 76494ac9a7bf2561a31f4c15352a8e240d3f0044918fedcf3479d451bb1b1d1d7ffd8689d8f40efa234f8dcf9b4840830698b1e2dd024e1b2b94e42563c40928 SHA512 a76496460ffd556e810693a904be16a56bde374775f7e25eee9e264151087c4827301d505c9319dd7f5fde49c62a15e469618e68f728097de1045e2084598011
+EBUILD libassuan-2.5.3.ebuild 1223 BLAKE2B cf011f69d8ed47b936561330c6401a660314364b813abfd67b59c08004512406b6526fab81004410b666cf4a8e0afba337cf9fe64e32136199b2e195d08bcda6 SHA512 6f1b1d362c384699a31074f266d25bcb011cd5400bceb7462294bfe343b6f6a6ad64fd4c66384d6c5604569e5bd07df0e57bc421ae8532059c16057033bb2d6b
 MISC metadata.xml 869 BLAKE2B 0553da6ce347ea1413910cd3dc422a28201982403a08bdc4725c35c764b97e488fdb361980a6759d7545e474291fd26ede24883875f2feff39ff555ed63dfe9e SHA512 b9561c267faae23ed753f61024c97b2da74c48682183ad4c2291910073530a389f6b416c5ecfae9b28b593d1b48b92802d64f4c5fcc917cd6d70818e0c5e080a
diff --git a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
deleted file mode 100644
index 640a53fdf86d..000000000000
--- a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
deleted file mode 100644
index a3f9a416bbcf..000000000000
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	prune_libtool_files
-}
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 68a274079307..c712d1fa6158 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -12,7 +12,6 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
@@ -34,7 +33,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable static-libs static)
+		--disable-static
 		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)