gentoo resync : 20.03.2022

4 files changed, 3 insertions, 56 deletions

diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index f086ed3cdc5a..7fb603f34af5 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -1,6 +1,4 @@
-AUX bin86-0.16.17-amd64-build.patch 327 BLAKE2B 076e7fb11802f082f94f3e688553ae9f561609ae6675c67105ee9a30292185edd12b90a5149bc34ba6d6a453ce7648943c732a865bb238a4ebe5e8185ce6ed51 SHA512 8e4102c5b0848249c69fd9b3f16a93b12bbe8dce9771b78514bf423bec7b0144677f4eae07cb0ea479bf03dbd21092fdb2ce0a028df95f28c37d48b660466c13
 AUX bin86-0.16.21-amd64-build.patch 398 BLAKE2B c9457b574beceac90ba1ae5207b4164426f731252c0e728901ab6ee628a570c4ca95a4395e53b6a3f73fa41107678dd766185daa158e99e6ec609ae026ea48fa SHA512 d7be4857acf46ee6dd803048726083b471dc302c7189c64acf71e00923d736ebe9174a87ed0f90f5eb71221c35c18f2259f0f62a47f8e64c682a6d7afcf2504d
 DIST bin86-0.16.21.tar.gz 154283 BLAKE2B 6c88a5cf86623130f6ed45cefb9ee9293d8888f4d0e5712d96a24a6fe84bbe5002869761e9c39bb20c8af74e3fe76cf65632ef43e55d81d0e5cb9212f3cae56a SHA512 e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56
-EBUILD bin86-0.16.21-r1.ebuild 839 BLAKE2B 6eecb19c6033d79e056d7d0958cd9fb6f563ec6212192489271bd0b49ccada960c1a2283b1ca2e52d02e8173bf5d4a40b84ea0d716f5a0ce744d1ac515685fcb SHA512 7bbc87ab86117b04d209220ef80de9b5cc38f6a1af4619c33f8a1d8ed49ceaff38cf49824a2e746c1e0b084d5c981df86a1c87aaf917e5086c55932fcb64d3bc
-EBUILD bin86-0.16.21.ebuild 855 BLAKE2B 7a13609b50ddc239fc1ca03e21bada1a45b7eecc73127cf16dd8323572fc43dc14f7a033b5d5ac364903d5e495136b159231266fbd16219d5e28e006708c2387 SHA512 96d3a8d61e02c3039f9197313ea88aadbf991aea9626226621992cf924e1b34cd1ab49fa664b102bf92e2a43859761572f5ea56d05c0c8e19a73cc9979e0bce4
+EBUILD bin86-0.16.21-r1.ebuild 837 BLAKE2B 5fe9c0e2142f56d07baa04a31144fab49d0e260e8b7239d3b32faddd52afe130d647ac242e053efd7719c3268dcdbce467721a660d3c8df8c3859e41fded8c27 SHA512 218ed09c7a38a6dbab4ce0473f433b392fcd272234e6ebbf40c4cc084d995965f3e9f83a26548d5304ab5af231f9afcb0798665cbf60636d92b043f7cae1c9f5
 MISC metadata.xml 243 BLAKE2B 88a8c5cbe0638cb7bdd3ddd42933def8a1cd34061ea459a0fc0bf392b72a0555955bd0812488b7024933258fb38f82c4fffaf8cb981a609c2d26f999520d44c5 SHA512 3232362e301749801c78b456fa395a8dd155629d5d06a22a4929ab29405e2ffdf1f1a77414d7c069b30456b87b3909c7c73684b9b44f9cf1e47eff0306c88928
diff --git a/sys-devel/bin86/bin86-0.16.21-r1.ebuild b/sys-devel/bin86/bin86-0.16.21-r1.ebuild
index c8aa201710f6..cdbd313b3371 100644
--- a/sys-devel/bin86/bin86-0.16.21-r1.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 PATCHES="${FILESDIR}"/${PN}-0.16.21-amd64-build.patch
 
diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild b/sys-devel/bin86/bin86-0.16.21.ebuild
deleted file mode 100644
index b21fcec3bf49..000000000000
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs epatch
-
-DESCRIPTION="Assembler and loader used to create kernel bootsector"
-HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
-SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-src_prepare() {
-	use elibc_musl && CPPFLAGS="${CPPFLAGS} -U__linux__"
-	sed -i \
-		-e '/^PREFIX/s|=.*|=$(DESTDIR)/usr|' \
-		-e '/^MANDIR/s|)/man/man1|)/share/man/man1|' \
-		-e '/^INSTALL_OPTS/s|-s||' \
-		-e "/^CFLAGS/s|=.*|=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}|" \
-		-e "/^LDFLAGS/s|=.*|=${LDFLAGS}|" \
-		Makefile || die
-	epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	default
-}
diff --git a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch b/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch
deleted file mode 100644
index b494a8b724de..000000000000
--- a/sys-devel/bin86/files/bin86-0.16.17-amd64-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This should make it built on other archictectures as well
-
-https://bugs.gentoo.org/428228
-
---- ld/x86_aout.h
-+++ ld/x86_aout.h
-@@ -13,7 +13,9 @@
- typedef long Long;
- #define __OUT_OK 1
- #else
--typedef char Long[4];
-+#define __OUT_OK 1
-+#include <inttypes.h>
-+typedef int32_t Long;
- #endif
- 
- struct	exec {			/* a.out header */