gentoo resync : 22.05.2021

3 files changed, 2 insertions, 67 deletions

diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 5fb89f169b7e..f389890a1307 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,7 +1,5 @@
 AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1756 BLAKE2B f53d7a968df0d995988f84364f669595beb06d9919d628f37b25b54ddf6757a76b9630e78a6ae89293a7de70e0bda70b6a677c0cec4849f884228c73f4af6ba8 SHA512 151c0c7c0bfca5c4e7d1dd3c39659e29c0ed1ae49d84e8782793201cb92626111637315393e0b6217bd2ccb2126cfdf9c0ac9e238e70c43f2068510aaa885f30
-DIST gnuconfig-20200621.tar.bz2 58729 BLAKE2B 8be2ff224620d0d93f676951ec8dcc7a4f1bfdfcb83e2e07371aa6fdf2f08a8d0e8503aecdd55954a0246f0d4119f31b24d60d461500db07757b061c89914df4 SHA512 25778100cb6b47a4ffa8a1875d3109a8b304bf3984549b53e2cbc1e31222aa9614ce01d34451cf6545af62b843378ab217d3396535ed4389ff3e8a7ddaa948ff
 DIST gnuconfig-20210107.tar.xz 65944 BLAKE2B 209952ca349c9859b695df5a4f8b49df689cba47b439e715108cb66ccef7ec3742162113a2ee4948a85a96b44c45d4d553f9e41c15823403f451fea6ea61bd36 SHA512 e1485b7b719994441f49b18a88f922405f74aff2ba1df16050802a311fb5438e598d989fdb7fa008734e5ec0e567e7e90486f8bc6655787bc053ad8a89650213
-EBUILD gnuconfig-20200621.ebuild 1518 BLAKE2B 74b0fa7c1a9a9c3fae2824a4df09f43cb91d07760826dcb2be69f83ff4a35b739cea123e521ce3566c06614e84129f4a3cbbd0cbb54d20a0e1c4ae4e89403f4e SHA512 81bd34ffe4b616cadf8c5762dc4f0a71666050cd9445cd47ec4b23a05e1091e1c6874f4681c4b985ad4ac09ef046c153a8f40bccfd6272598c66d84308ac4953
-EBUILD gnuconfig-20210107.ebuild 1553 BLAKE2B bc2f456a181c77614397facda57c6446f37f58d7409ce3d1257edaebba3c9349a29b7032baf982cbad20b65352374ab54c5829ee2e547b0d111c6e0ceed5d38d SHA512 08daacfbb59a08f982c5c23eeaa2dec936bb2156ac35ceb296d53b22c8f8bf551a1e35e950fa35a2d645dc2c9d87c9fb9d02a2ecb4d8760ffab2bee7688ba2c8
+EBUILD gnuconfig-20210107.ebuild 1545 BLAKE2B ecd7861d21c911a1be24b66cd9d0792d36255f584fd257fe48b1288aecdec19be8d28dc02c15251e9fd6a59390edc2a5718fed764b7bf1d5e85c84917a357ee5 SHA512 408a0e7f953c4314ca8151d7a4ee5beba8cf901fe2b6209db2904a6e1c1b1dc264bea69262f1f2d8ced6bb31e3ded3f83902376338e00ae77fffe5025295835b
 EBUILD gnuconfig-99999999.ebuild 1547 BLAKE2B 44509931d0293e5fab7a2701f383078f722298225efd8134a84a5c7a8a39a4e32af9608f8c3ecef0c5c0f65064f04f270faafa945f584814e10fd0969bcdedb0 SHA512 b2e00604fa9dfd5259422a2c79de46ea498281648372d5ea1a048461140325c49bfcf14742f3da3b723f56eb7aef6379b5be9275b9f032e281b2404f1ba296a3
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
deleted file mode 100644
index 5dbe1179e09e..000000000000
--- a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	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 ~x86-winnt"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Updated config.sub and config.guess file from GNU"
-HOMEPAGE="https://savannah.gnu.org/projects/config"
-
-LICENSE="GPL-3+-with-autoconf-exception"
-SLOT="0"
-IUSE=""
-
-maint_pkg_create() {
-	cd "${S}"
-
-	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
-	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
-
-	cp "${FILESDIR}"/${PV}/*.patch . || die
-
-	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf "${tar}" ./* || die "creating tar failed"
-	einfo "Packaged tar now available:"
-	einfo "$(du -b "${tar}")"
-}
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		maint_pkg_create
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	default
-	eapply "${S}"/*.patch
-	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
-}
-
-src_compile() { :;}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins config.{sub,guess}
-	fperms +x /usr/share/${PN}/config.{sub,guess}
-	dodoc ChangeLog
-}
diff --git a/sys-devel/gnuconfig/gnuconfig-20210107.ebuild b/sys-devel/gnuconfig/gnuconfig-20210107.ebuild
index e95a3aeabb3e..f10936047305 100644
--- a/sys-devel/gnuconfig/gnuconfig-20210107.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20210107.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${PN}/${P}.tar.xz"
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 	S="${WORKDIR}"
 fi