[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgpg-error/files/, dev-libs/libgpg-error/

[Lars Wendler]

commit:     283868e52a50f0e39478a5a16b94758fee0f8c33
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 17:22:54 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 17:23:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=283868e5

dev-libs/libgpg-error: Removed old

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/libgpg-error/Manifest                     |  3 -
 .../files/libgpg-error-1.38-cross_compile.patch    | 40 -------------
 dev-libs/libgpg-error/libgpg-error-1.38.ebuild     | 68 ----------------------
 dev-libs/libgpg-error/libgpg-error-1.41.ebuild     | 65 ---------------------
 4 files changed, 176 deletions(-)

diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index fd3a84d69f8..5ddde2c0447 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,5 +1,2 @@
-DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c
-DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
-DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
 DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
 DIST libgpg-error-1.43.tar.bz2 999006 BLAKE2B 22c5491ebd43b8010cdd4e82a58443fb8d19d51de9a033d0bb44634a82f033916d5d9fcfe47eb47e64a513521b01ff088838a8979f488cde74e5944c28dec0aa SHA512 36769a62d0b4b219a6d58195bed692e34d3b0313f628b1036055ca34b69332edbe6bcdace9855a60d06e7be5998dc13bf1305d0b2bb211a4d8f701e85040961c

diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch b/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch
deleted file mode 100644
index 7ddd51f9a57..00000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: David Michael <fedora.dm0@×××××.com>
-Date: Mon, 1 Jun 2020 14:24:53 +0000 (-0400)
-Subject: build: Fix cross-compiling into a separate build dir.
-X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=013720333c6ec1d38791689bc49ba039d98e16b3
-
-build: Fix cross-compiling into a separate build dir.
-
-* configure.ac: Create the src directory before writing into it.
-* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh.
-
---
-
-Signed-off-by: David Michael <fedora.dm0@×××××.com>
----
-
-diff --git a/configure.ac b/configure.ac
-index 6bd634b..1dd6489 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then
-   case $host in
-     *-*-linux*)
-     lock_obj_h_generated=yes
-+    mkdir src
-     LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
-         CC=$CC OBJDUMP=$host_alias-objdump \
-         ac_ext=$ac_ext ac_objext=$ac_objext \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7e36d69..b2bffd2 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
- 	gpg-error.vers gpg-error.def.in \
-         versioninfo.rc.in gpg-error.w32-manifest.in \
- 	gpg-error-config-test.sh gpg-error.pc.in \
--	$(lock_obj_pub)
-+	gen-lock-obj.sh $(lock_obj_pub)
- 
- BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
- 	code-to-errno.h code-from-errno.h \

diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
deleted file mode 100644
index e5d788d1421..00000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs prefix
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
-	https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38 -> gen-lock-obj-1.38.sh"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
-	"${FILESDIR}/${P}-cross_compile.patch" #726520
-)
-
-src_unpack() {
-	[[ ${PV} == 1.38 ]] || die "Please remove gen-lock-obj.sh from SRC_URI and drop src_unpack"
-	unpack ${P}.tar.bz2
-	cp "${DISTDIR}"/gen-lock-obj-1.38.sh "${S}"/src/gen-lock-obj.sh || die
-	chmod +x "${S}"/src/gen-lock-obj.sh || die
-}
-
-src_prepare() {
-	default
-	# only necessary for as long as we run eautoreconf, configure.ac
-	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
-	# not a pure /bin/sh script, so it fails on some hosts
-	hprefixify -w 1 autogen.sh
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_is_native_abi || echo --disable-languages)
-		$(use_enable common-lisp languages)
-		$(use_enable nls)
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-		--enable-threads
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}

diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
deleted file mode 100644
index b83de2c2f4a..00000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs prefix
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
-)
-
-src_prepare() {
-	default
-
-	if use prefix ; then
-		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
-		sed -i -e 's/solaris\*/disabled/' configure.ac || die
-	fi
-
-	# only necessary for as long as we run eautoreconf, configure.ac
-	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
-	# not a pure /bin/sh script, so it fails on some hosts
-	hprefixify -w 1 autogen.sh
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_is_native_abi || echo --disable-languages)
-		$(use_enable common-lisp languages)
-		$(use_enable nls)
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-		--enable-threads
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}