gentoo resync : 28.04.2021

4 files changed, 6 insertions, 50 deletions

diff --git a/sys-devel/bin86/Manifest b/sys-devel/bin86/Manifest
index da6a53d2dd39..9b8625ea306d 100644
--- a/sys-devel/bin86/Manifest
+++ b/sys-devel/bin86/Manifest
@@ -1,7 +1,4 @@
 AUX bin86-0.16.17-amd64-build.patch 327 BLAKE2B 076e7fb11802f082f94f3e688553ae9f561609ae6675c67105ee9a30292185edd12b90a5149bc34ba6d6a453ce7648943c732a865bb238a4ebe5e8185ce6ed51 SHA512 8e4102c5b0848249c69fd9b3f16a93b12bbe8dce9771b78514bf423bec7b0144677f4eae07cb0ea479bf03dbd21092fdb2ce0a028df95f28c37d48b660466c13
-DIST bin86-0.16.20-fix_lilo_build.patch 3488 BLAKE2B 1a0f4240156ab36579e2e49fbfb5b4c9f9fc165dcf3b1bc1f6ca770ebf7a6dfde2d1672968522b56f59787c3a2528d7c35b402753470ff3ab92da42b26e80cfa SHA512 f307438ced09e34ce5c552f808a9d1ae09bb9bbaceee4e1e07021f810470dfb07d21a30d1447295b2d023ccf56f158f4b7f3d80d478b1d7e3e4b79b13b8e760c
-DIST bin86-0.16.20.tar.gz 154107 BLAKE2B f51a189fed52713d5cdccc880596aea9f6a5dd4a8eb6eabf2ad2600a5da520b3ec765b512261bc6ffe33ce0c9d23c5491c8c34481795d24dcec2c91e04fc5d22 SHA512 c567ad5f9241d9ed768410f988266d4ff952fd4767d033552b100a2643db69ee9d4b5929a1b40c3018db7037b0efc7b47db84fa1f561bc39f01e640b1a3bacfc
 DIST bin86-0.16.21.tar.gz 154283 BLAKE2B 6c88a5cf86623130f6ed45cefb9ee9293d8888f4d0e5712d96a24a6fe84bbe5002869761e9c39bb20c8af74e3fe76cf65632ef43e55d81d0e5cb9212f3cae56a SHA512 e80e06965fbdcf13100aae4690071d01a6efe74aed7ff8f14e5892c6803393a1b5acda1296e0f0e1837dfb73e0edd02e9cccfeabbeabe1b68fa6b6b85ced1f56
-EBUILD bin86-0.16.20-r2.ebuild 946 BLAKE2B d454f86bf11e40951c4294e8992bae338e4844b9ee4778196262c4750179e81a42211768dd4125111d83e9e149b506f374c9e184f4e5abcbba06e806963e8fd5 SHA512 82c2130b7d7e393f27b3f4f46197655a69bf81d5decb00341dc9681e067911656c593266f634f66c5e097feb42633c66d87d8bbbadc01ddb5b07dee189408245
-EBUILD bin86-0.16.21.ebuild 850 BLAKE2B 7233deeb19f84b7473191e0e84cbdca53e638f1633238ce654033a4cdc12848359c3de9f3d86a313c213ea34e4f7133f7c411b9ad29a827b818b6ca3617460e3 SHA512 d87da5b2f1775e2d58ed7099eb2ef916d532992c64e0d077cb15bc9cb18d0d2d2d522178760591a27588cdda159d1e46de29463e2974de6b54485e32715b55a1
-MISC metadata.xml 479 BLAKE2B b05ad19dac9e88d9714a0a5b176187b8c3b3c7514f73b8a1a5d8f1498c02900546e9ad3aa04edc4c6a1b9d07035e8ab0a8bd66c853aa27babf302bd8ae92ea18 SHA512 89e8c96a44e57ccae73c66141904a99e0128587fd62acc8b2d3e860636ab05396e9842c80152ab27860850a7582dd4097fefb465e0d0a86761b96614d8c0992d
+EBUILD bin86-0.16.21.ebuild 855 BLAKE2B 7a13609b50ddc239fc1ca03e21bada1a45b7eecc73127cf16dd8323572fc43dc14f7a033b5d5ac364903d5e495136b159231266fbd16219d5e28e006708c2387 SHA512 96d3a8d61e02c3039f9197313ea88aadbf991aea9626226621992cf924e1b34cd1ab49fa664b102bf92e2a43859761572f5ea56d05c0c8e19a73cc9979e0bce4
+MISC metadata.xml 242 BLAKE2B 67c64df897c468c6437934974e3d9f41f645fd4e9147a2565a70710d325f16955751b73d82dddf36db56b7380a9eb2c1bab84558de8895d4215e253f346021d8 SHA512 9af318711447b78f238aaa75bcb59c6b7e099b0a2702e390d2e3928112223f21eaef2f4d362f77a74f33fa6d7aef3991d51c006e41642895a3495ac2d5d4b5be
diff --git a/sys-devel/bin86/bin86-0.16.20-r2.ebuild b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
deleted file mode 100644
index ae8685567e43..000000000000
--- a/sys-devel/bin86/bin86-0.16.20-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-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
-	https://github.com/lkundrak/dev86/commit/2c95336f19eeff761ecb858c5a2a58484bb3ceeb.patch -> ${PN}-0.16.20-fix_lilo_build.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-src_prepare() {
-	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 \
-		"${DISTDIR}"/${P}-fix_lilo_build.patch
-	tc-export CC
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	default
-}
diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild b/sys-devel/bin86/bin86-0.16.21.ebuild
index ad7a6449a569..b21fcec3bf49 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs epatch
 
 DESCRIPTION="Assembler and loader used to create kernel bootsector"
 HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
index b6943a7745a3..e3d90415dc52 100644
--- a/sys-devel/bin86/metadata.xml
+++ b/sys-devel/bin86/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<!--
-	If anyone from base-system wants to be secondary, by all means just add
-	yourself, and send me (boo) a mail telling me that you've done so.
--->
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="github">lkundrak/dev86</remote-id>
 </upstream>