gentoo resync : 16.02.1018

3 files changed, 3 insertions, 81 deletions

diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 66c62a740eb0..a7d88bb419b7 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -3,6 +3,5 @@ AUX dev86-0.16.21-make.patch 2299 BLAKE2B 7bc53ca455c545fe72b71a0daae8de8fd54da6
 AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aaccc6d47f8935797bc92ac4024ca6bef2c40585ace38bd720e9cf4b3be391d81ff0e4e8708bbf5758979d544417e135430cbd1a06af8 SHA512 57781aab833999b86d57a4c62d686b61f11a64225debf82ca57252bfe5043d0bdef04749bbbf3e1af73a6d40242ebd5efa41b147e4677b7c8ed4b071c5100318
 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.21-r2.ebuild 1870 BLAKE2B e6da95b4a65b98d1215e109519c3400ed7b5189cacb1cda4cb0186bdb348134fd22b58b6e25ed2426c784e8a5e3ff0f11dc378ef642a361d200ff3323e9096d5 SHA512 5edc82cfd68a9e08bc5ef95b0fabfeca13bdf63a209ea3dfcb0730203bb7ca804c5c91aa60776668d6195c771f2ee38f55845f16b061b63a4ccc9a2bb561d9c3
-EBUILD dev86-0.16.21-r3.ebuild 1913 BLAKE2B e32fce5c10708bc9ed828fa68a73046387a3d1db19623b3347c9064d51c389e3d49a79f15fcb7e554386cc68aab5dca5d0ee584b574bcfd96d10f9dee4f7ea54 SHA512 20278dfad29f93bec24782379def485058ab8ec34ed5aaf0926af12dfc099a00bbe47828cf9bcd22e54320495bafb1e69b015df97ac75a5e92fcf4b8373cf5bf
+EBUILD dev86-0.16.21-r3.ebuild 1908 BLAKE2B c8439d7cd438747879c2ebd80f85eb89a19844d677c2e9bebfe37de4ab8facc6d56cdc9cb669da70dc7db4b17cf3edf27ecec367759ce88b1052721ae8135b2f SHA512 e085a146c930939cd42ad75079196994a91980f38dcd0d1b3a13575ae9a4e5519f0606e906fa4979a86eabdb6082436bf80676aa7744ec5b75371499cd7cc3c8
 MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2
diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
deleted file mode 100644
index 0e731cc95637..000000000000
--- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86"
-SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="sys-devel/bin86"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-
-STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
-PATCHES=(
-	"${FILESDIR}/${PN}-pic.patch"
-	"${FILESDIR}/${PN}-0.16.19-fortify.patch"
-	"${FILESDIR}/${P}-non-void-return-clang.patch"
-)
-
-src_prepare() {
-	default
-
-	# elksemu doesn't compile under amd64
-	if use amd64; then
-		einfo "Not compiling elksemu on amd64"
-		sed -i \
-			-e 's,alt-libs elksemu,alt-libs,' \
-			-e 's,install-lib install-emu,install-lib,' \
-			makefile.in || die
-	fi
-
-	sed -i -e "s:-O2 -g:${CFLAGS}:" -e '/INEXE=/s:-s::' makefile.in || die
-	sed -i -e "s:/lib/:/$(get_libdir)/:" bcc/bcc.c || die
-	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
-	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
-}
-
-src_compile() {
-	# Don't mess with CPPFLAGS as they tend to break compilation
-	# (bug #343655).
-	unset CPPFLAGS
-
-	# First `make` is also a config, so set all the path vars here
-	emake -j1 \
-		DIST="${D}" \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/bcc" \
-		INCLDIR="/usr/$(get_libdir)/bcc"
-
-	export PATH=${S}/bin:${PATH}
-
-	cd bin || die
-	ln -s ncc bcc || die
-	cd .. || die
-
-	cd bootblocks || die
-	emake DIST="${D}"
-}
-
-src_install() {
-	emake -j1 install-all DIST="${D}"
-	dobin bootblocks/makeboot
-	# remove all the stuff supplied by bin86
-	rm "${D}"/usr/bin/{as,ld,nm,objdump,size}86 || die
-	rm "${D}"/usr/man/man1/{as,ld}86.1 || die
-
-	dodir /usr/share
-	mv "${D}"/usr/{man,share/man} || die
-}
diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
index 1ba9e30203d8..35355a20312c 100644
--- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-devel/bin86"