gentoo auto-resync : 10:10:2022 - 01:33:06

4 files changed, 6 insertions, 77 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b6471583c9e3..4e48f6e5527e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 17df8b9659e6..25c93edb4e6c 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -5,6 +5,5 @@ DIST libgpg-error-1.46.tar.bz2 1014291 BLAKE2B 6748c463256b7d0a05fe89a63c5f3abda
 DIST libgpg-error-1.46.tar.bz2.sig 119 BLAKE2B 5c4ce6111d2872a19d7fa818c67cabc584eef93e47c0e0e42b7e5a54cced137910861bba730f2c8f41fcaf8d9311e21f725d284b4c1948e653741e84fc06ef3d SHA512 2c2957fbf6220d60846cade760985486c9a287b04f4361b22352352ef68963f0ae6add00a8925b76bdb924223383a1029565063e4a925865be1802fa821a7bca
 EBUILD libgpg-error-1.45-r1.ebuild 1984 BLAKE2B fb622e43f183e520c376009b177e1d55c7c6c50d6eb147ab8d58dfaa11f0b208c76216b61574e1413b648d05860d389af940349b98d76885f3f42344170ae0da SHA512 3911ee0d4b74853adc1dbf19c7e7d717639bbf6b5033cf9f54314923167ecd30f258f57082b430e05fab6cc4785b8b359fc46211fa7b3a71240b740379727cc3
 EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce
-EBUILD libgpg-error-1.46-r1.ebuild 2465 BLAKE2B 5f69a1101d7dfd50121fbdd4ab4d77dca2108ab6ea0f485d5d7be7de8b9511ce1d233ebe99020a4c6bc09f46fe2888ef0b0d6366f586d13dc3c3c4fdd7edd9a3 SHA512 d71c3e63ecd8123d2eef077805b713d1e754258253e8e4998fbc2aff9afa4ccd8849cc44bcead73a3ed23e268176a1d6ec8e9e4597d1cf67ee9b50e838dbf9ad
-EBUILD libgpg-error-1.46.ebuild 2353 BLAKE2B c2dc6ff38ef7409ecb175bd5d34aeed4360b1edb2fc2f18c28a67f800cc268d961060cf1ae4292c65f48484be9c503e64e45abb70903d99d8f0580fb0c778fd1 SHA512 4abc616854ca2e408eeeea9261a36f983d1d9d71bd964075ade931c9ad5e7fb41772a67218dc3eb72fdbc1c40d3725bac0d555fcf13f7ba07c73a11cb0e47698
+EBUILD libgpg-error-1.46-r1.ebuild 2622 BLAKE2B 74dc5b9629cf9fb784734ba1c0c4e4a1cdc84073782db5d56bc36e02a9232d7895f1da1df7f0f9ded37849c83fa70209697270ed3a801c939527087d81dfca88 SHA512 196512a776c1263803bae61c8cdfc20049eb337175499250c35e011ee1f0a5a1b59b36d3f511933027c041cc50554a3be7ab6ad5acb82aa28ca8fd30a08bc4c5
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild
index 0e230fcc57db..b8677bb2428b 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild
@@ -67,7 +67,12 @@ multilib_src_configure() {
 		# required for sys-power/suspend[crypt], bug 751568
 		$(use_enable static-libs static)
 		$(use_enable test tests)
+
+		# See bug #699206 and its duplicates wrt gpgme-config
+		# Upstream no longer install this by default and we should
+		# seek to disable it at some point.
 		--enable-install-gpg-error-config
+
 		--enable-threads
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
diff --git a/dev-libs/libgpg-error/libgpg-error-1.46.ebuild b/dev-libs/libgpg-error/libgpg-error-1.46.ebuild
deleted file mode 100644
index c2db218d0ecd..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.46.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit autotools multilib-minimal toolchain-funcs prefix verify-sig
-
-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"
-SRC_URI+=" mirror://gnupg/${PN}/${P}.tar.bz2.sig"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.44-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)
-		$(use_enable test tests)
-		--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
-}