gentoo resync : 12.05.2022

3 files changed, 2 insertions, 78 deletions

diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 2ed6ed694cb2..248825e0e1d4 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,4 @@
-DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-EBUILD pkgconf-1.7.4-r1.ebuild 1519 BLAKE2B bb7ef98d18c414eaf498484e9d2281ab2171db86b4aebb0be79126b5090ca4fe24faaf8f081f7fb48671f0c0c20fc4a6af7c0941ae077ee515956d68ad1aa16c SHA512 f8e615a911386599c0365fc5719e5021d45a6ecfbc1ad8b5bdb4c7a573de95c381da195d24e7157b1625cbc83b2d597c95e573ee4fddf8a87c1d4a5305804b03
-EBUILD pkgconf-1.8.0-r1.ebuild 1590 BLAKE2B b89f4321a742fdd04d3bb3349703cd50e2376862be9f98e92404393c1d6dc11f082b028a382484c11ebcd0e7211aba759ea3ce2368b91f88def0743d7eba77a2 SHA512 ddeb3d4495aef2aff20ebcd8dd69cbecf52d0209aec37bb3ab20bee786cac17723fb1e3f9677fc66ecfeaa9231d895905e1720547657ed4cc566efb4ba68cae1
+EBUILD pkgconf-1.8.0-r1.ebuild 1597 BLAKE2B 004c5b51b45b6fd5eba5bb3c9ee3e68c29c4036c0aa1f1b1929d2510746de19bfdd61fd3006f7e501063f95c0e1be1c087a5e55b3dcfece6ed51c5c441493189 SHA512 1312f4c0e9820b3cadb3cbc1b613488d4150a924529254475bba436c1cdfd591f24c4fc922f2d948120f80eb3bfe00ffdc75194db11f9e93aa4fe2592bf3ce22
 EBUILD pkgconf-9999.ebuild 1531 BLAKE2B 02e5c632a81cc0673903e44c7d708d75a002ba9e6d058626c7686a46b42496194c9e01fd7c8b2ecf228839e6be52f0fbb4bbc9bb09d35c48ec35535fa3719346 SHA512 b2499096796c0645d346e7e0d722c1b38f797b3bf6ce361f8cd76ac1ce59e4f38489c5dc8aa428a862dd4babc176723eeb6fb17f65779a638ce77d96af765844
 MISC metadata.xml 594 BLAKE2B 41e097bde16856411e4423d63898129e9d11059f77a89f8ffa5dc196fbe9c97cd8a27cac567c511eeca7eef57436826148713557ad0c5359e875b53700e88b27 SHA512 59efd28cc254a9213af4b1fd9e3b55e19353027f585edd0014e38c304cec4639132d7bd98769e329fb4a7fbe243e91ba088d2ea36aa53320d25d87e1952d255d
diff --git a/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild b/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
deleted file mode 100644
index b174cb7572a4..000000000000
--- a/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
-else
-	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
-
-LICENSE="ISC"
-SLOT="0/3"
-IUSE="test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	!dev-util/pkgconfig
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf$(get_exeext)
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/pkg-config$(get_exeext)
-	)
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE="${S}"
-	local args=(
-		--disable-static
-		--with-system-includedir="${EPREFIX}/usr/include"
-		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
-	)
-	econf "${args[@]}"
-}
-
-multilib_src_test() {
-	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-	default
-}
-
-multilib_src_install() {
-	default
-
-	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
-	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
index cf76028b9ad0..b4378ac99c5f 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"