gentoo resync : 28.04.2021

7 files changed, 2 insertions, 637 deletions

diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 4dd82a8b3d16..75b8b0646f55 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,11 +1,4 @@
-AUX pkgconfig-0.28-lfs.patch 8351 BLAKE2B c54878b2f53f17e66444ec300e6e066505287d0a730983222b5c457e13510a78e2afc73c8e83476257bbfd703f8b1c724edeb8cb9a8eb8e41304aabdfcdd10a7 SHA512 1fbf5d326467f92cc9a82627f2b855ed5bd1a1843dbb922d7a48391ed900d45b6b228d2ee5e5860a4755812645095a8501765d85ffbb6eb28e0c088d7e9559c5
-AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae79bdfe4b68d155e7945a49d6980454234c45a0ca1683c15decc3b4063e3a6f0b00185da59fa7849b1aea0003593576f7044f453990fa1777b37989724 SHA512 9511c0f966b4acc90d0421906ef0937edeae6901fa267a282d878e1d4a1ef84ee12f89b8feafe7172cecbde98e6d106fc446ac98780efd41b036c1f7a2f97d87
-DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
 DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2815 BLAKE2B 9a80ea89ad2f9dda87d22d830f4a6e1f94c40a15b763a8f3f758a2fbaa5ad2cb39b5a91aeb99b78092a1d374be3b2ad7dad63eec1282510976743212fe581120 SHA512 6e415f2372763b6762c249edcc14068d2d10c3beeec6755d0c774046bda59221991a5103dda6216f0bee62d86175a73cf5377c145822c375025de2a909febe96
-EBUILD pkgconfig-0.28-r3.ebuild 3333 BLAKE2B 7b6edbc90056a77bd995e0280d5c00e6994b46e4d0523b6a184e58af41a88d8b85af58e64fd5002442b88c818714416ecd97ffcda2c79cdf4cb5320916ae1f63 SHA512 3b1ab604f69525894c0e1deb99afc3fb9158c1a5cf8f3b678acd17444a525f9b88a6ceb1bb53728e36ab736a4b2d14bf4a5699344fee64543a56c51732a737bd
-EBUILD pkgconfig-0.29.1.ebuild 3697 BLAKE2B 22e3607d803206ca94d05973ee9e1cd6b0899080918a5a2e1f3c72f987ff8aca10ed117fc6d924ecbc7dc9da27ceedbe41299c8e7363f5876ce6af4e7cd82fa8 SHA512 7b1aaa6608f13b7587d63e1db9dc1654bfffadacc46334e7cea67f8cedec453d83663f6ed1dbebed497e1383497bde1c1d306dac953e6c0060a49b405bb166c0
-EBUILD pkgconfig-0.29.2.ebuild 3814 BLAKE2B c1544c3ae3be916bc68808acf9e99ec6d0deb93354b51aa4ff2b4ebd5c433660d989c262ed1e97da6eba8395f48ffe40e3c6aa3ed817e7218bfaf711d19540a3 SHA512 d21b19b3f9b97987c2b74bea9fee6b743a4c174d81a72e80f64ca5721dfbe6ee9eb2a1b46b90e3ff8cf480df85e0fbaeb66572e0657f1eed2ce4095c47b7f7d0
+EBUILD pkgconfig-0.29.2.ebuild 3815 BLAKE2B bc1f6b7642cb410871d38989fb0870c848dab00c284d1cf7cba8fd4dee1bec801f70a4f8d744e270141bcea854c7920c379ef24ef852626089492a5c29b9a84e SHA512 8ae7a64d6776dc7d22d9fe2f8753b7ed66ee69fea4e523d97050513efea15fe5143888247f90efff6ab1079f58178e5da28021d6878708ff225cc4daf4dfa015
 EBUILD pkgconfig-9999.ebuild 3697 BLAKE2B 22e3607d803206ca94d05973ee9e1cd6b0899080918a5a2e1f3c72f987ff8aca10ed117fc6d924ecbc7dc9da27ceedbe41299c8e7363f5876ce6af4e7cd82fa8 SHA512 7b1aaa6608f13b7587d63e1db9dc1654bfffadacc46334e7cea67f8cedec453d83663f6ed1dbebed497e1383497bde1c1d306dac953e6c0060a49b405bb166c0
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
deleted file mode 100644
index 9515f4f650a0..000000000000
--- a/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From 217ffa021257fc2313c9eeb3e94e2ee38d255634 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 15 Apr 2015 12:25:29 -0400
-Subject: [PATCH] Enable large file support
-
-https://bugs.freedesktop.org/show_bug.cgi?id=90078
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: expand out configure,
- config.h.in modifications.]
----
- configure.ac |   3 +
- config.h.in  |  11 ++++
- configure    | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 217 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 2b33371..1a321e1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,6 +17,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1
- dnl to make
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
-+dnl Enable large file support
-+AC_SYS_LARGEFILE
-+
- dnl Check for programs
- AC_PROG_CC
- AC_CHECK_PROG([LN], [ln], [ln], [cp -Rp])
-diff --git a/config.h.in b/config.h.in
-index 0aac8f3..fdae454 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -72,3 +72,14 @@
- 
- /* Version number of package */
- #undef VERSION
-+
-+/* Enable large inode numbers on Mac OS X 10.5.  */
-+#ifndef _DARWIN_USE_64_BIT_INODE
-+# define _DARWIN_USE_64_BIT_INODE 1
-+#endif
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+#undef _FILE_OFFSET_BITS
-+
-+/* Define for large files, on AIX-style hosts. */
-+#undef _LARGE_FILES
-diff --git a/configure b/configure
-index 160ecab..f897e22 100755
---- a/configure
-+++ b/configure
-@@ -783,6 +783,7 @@ with_gnu_ld
- with_sysroot
- enable_libtool_lock
- enable_silent_rules
-+enable_largefile
- with_pc_path
- with_system_include_path
- with_system_library_path
-@@ -1435,6 +1436,7 @@ Optional Features:
-   --disable-libtool-lock  avoid locking (might break parallel builds)
-   --enable-silent-rules   less verbose build output (undo: "make V=1")
-   --disable-silent-rules  verbose build output (undo: "make V=0")
-+  --disable-largefile     omit support for large files
-   --enable-indirect-deps  list both direct and indirect dependencies.
-        --disable-indirect-deps only list direct dependencies.
-     default=auto
-@@ -11389,6 +11391,207 @@ fi
- AM_BACKSLASH='\'
- 
- 
-+# Check whether --enable-largefile was given.
-+if test "${enable_largefile+set}" = set; then :
-+  enableval=$enable_largefile;
-+fi
-+
-+if test "$enable_largefile" != no; then
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-+if ${ac_cv_sys_largefile_CC+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_sys_largefile_CC=no
-+     if test "$GCC" != yes; then
-+       ac_save_CC=$CC
-+       while :; do
-+	 # IRIX 6.2 and later do not support large files by default,
-+	 # so use the C compiler's -n32 option if that helps.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 CC="$CC -n32"
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_largefile_CC=' -n32'; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 break
-+       done
-+       CC=$ac_save_CC
-+       rm -f conftest.$ac_ext
-+    fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-+  if test "$ac_cv_sys_largefile_CC" != no; then
-+    CC=$CC$ac_cv_sys_largefile_CC
-+  fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-+if ${ac_cv_sys_file_offset_bits+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#define _FILE_OFFSET_BITS 64
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=64; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_file_offset_bits=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-+case $ac_cv_sys_file_offset_bits in #(
-+  no | unknown) ;;
-+  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  if test $ac_cv_sys_file_offset_bits = unknown; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-+if ${ac_cv_sys_large_files+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#define _LARGE_FILES 1
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=1; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_large_files=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-+$as_echo "$ac_cv_sys_large_files" >&6; }
-+case $ac_cv_sys_large_files in #(
-+  no | unknown) ;;
-+  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  fi
-+
-+
-+fi
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--- 
-2.4.2
-
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch b/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
deleted file mode 100644
index e1a2bb534a37..000000000000
--- a/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/512336
-http://bugs.freedesktop.org/show_bug.cgi?id=78077
-
-From 8691b580ab3f7ac36182060e2253307fbd0aba75 Mon Sep 17 00:00:00 2001
-From: Andrew Oakley <aoakley@espial.com>
-Date: Tue, 29 Apr 2014 13:14:35 +0100
-Subject: [PATCH 1/1] Strip system library directories reliably
-
-This loop was changed from a while loop to a for loop in commit
-9bf6277b, but the iterator is now advanced twice each time round the
-loop.
----
- pkg.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pkg.c b/pkg.c
-index 3697fec..c847c95 100644
---- a/pkg.c
-+++ b/pkg.c
-@@ -917,7 +917,6 @@ verify_package (Package *pkg)
-             }
-           system_dir_iter = system_dir_iter->next;
-         }
--      iter = iter->next;
-     }
-   g_list_free (system_directories);
- 
--- 
-1.8.3.2
-
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
deleted file mode 100644
index 73edc7072dd3..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	inherit autotools git-2
-else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch
-
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	epatch_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
deleted file mode 100644
index 6267da5f5304..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch
-
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	# Large file support, fixed in upstream git; bug #550508
-	epatch "${FILESDIR}"/${P}-lfs.patch
-	# lfs patch touches config.h.in; need this hack to prevent autoreconf and automake
-	touch aclocal.m4 config.h.in Makefile.in
-
-	epatch_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
deleted file mode 100644
index d2554a4effda..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
-	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
-	WANT_AUTOMAKE=1.12
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]
-	virtual/libintl"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
-
-	eapply_user
-
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fix standards conflicts
-		sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
-			glib/configure || die
-		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
-			glib/glib/giounix.c || die
-	fi
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-		# non-glibc platforms use GNU libiconv, but configure needs to
-		# know about that not to get confused when it finds something
-		# outside the prefix too
-		if use prefix && use !elibc_glibc ; then
-			myconf+=" --with-libiconv=gnu"
-			# add the libdir for libtool, otherwise it'll make love with system
-			# installed libiconv
-			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
-			# the glib objects reference symbols from these frameworks,
-			# not good, esp. since Carbon should be deprecated
-			[[ ${CHOST} == *-darwin* ]] && \
-				append-ldflags -framework CoreFoundation -framework Carbon
-			if [[ ${CHOST} == *-solaris* ]] ; then
-				# required due to __EXTENSIONS__
-				append-cppflags -DENABLE_NLS
-				# similar to Darwin
-				append-ldflags -lintl
-			fi
-		fi
-	else
-		if ! has_version --host-root dev-util/pkgconfig; then
-			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-			export GLIB_LIBS="-lglib-2.0"
-		fi
-	fi
-
-	use ppc64 && use hardened && replace-flags -O[2-3] -O1
-
-	# Force using all the requirements when linking, so that needed -pthread
-	# lines are inherited between libraries
-	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
-
-	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use prefix; then
-		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
-		# simplify cross-prefix builds
-		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
-		doenvd "${T}"/99${PN}
-	fi
-}
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 4b4e246111c5..d854a38b0820 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	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"
+	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"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi