gentoo resync : 15.02.2018

4 files changed, 2 insertions, 99 deletions

diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index b045e5cc6399..50f26741bb24 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -1,9 +1,6 @@
 AUX dev86-0.16.19-fortify.patch 325 BLAKE2B 3747ed3c7cc2df559bfdec185e1db8d45138f2819cefcfeabe4687f4b270e18ddefd334403fcaacbff0a9f0882a5e9b473b7d42da649dc189b3f84fd47a082d5 SHA512 04195831db5802ae25a5a1957979b5439168c708d9d3702a62c1d267090fca59e565ac78bb3a6bfb312282ce002b52760903e9d4ab30f3c906568a70dc349696
-AUX dev86-0.16.19-memmove.patch 401 BLAKE2B 7d0a4fbc2a31ba764e52af652b698770a46657028addcd340e364b4e80d7c6e00965b13cd981dc2437179746a0a22652096eec7a271cc3811a38cec851a1c4c5 SHA512 4fa5ee815636048db2a0f5faeeb48b06e559639fb21be1db3319495bfe5f5e1ee1afcfc920d496845cf4bb3eae7ff4bf9aa77124638788f918ae27599d153a6a
 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.19.tar.gz 713688 BLAKE2B c62a552be801ff109ee30c403d43586e2601342bd6fe0902d287849a88778338764216663c5302e7401e2b09962e116f2e3569c144846e5fcec87523d69ff206 SHA512 4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.19.ebuild 1854 BLAKE2B 49f3ee0daa8a7b1410aadd978a733862cd6a40556bc49f89b3921da2a64d1bd5217c1455ef97e87bd62a0a17a6b35436923fc2e62b05c35eec39925a65b24548 SHA512 17d24085519121a56639ce740c315faaa2815731e63420c5ad164b148acfa507a14a2caa6651dc13c597de2d008adbf07c6a7995cac7fdf300c13d98881459e5
-EBUILD dev86-0.16.21-r2.ebuild 1871 BLAKE2B 3046eb3fe8f3896bb4ed3ba3fb12a2e3beab636d6ffd2bfc968933b7f4a09b5dfd85456fb00a48b4a07fd9c3d296b8761f81eaff9887ac8c75aa8152630dbdcd SHA512 2df3325a2aed9ea2a9051c8a8e3e28c71c268a726188a25a0bff078d89f8981f27051625b16e887f0e4eee2128921fe8772e1e1f78ae3c8eba65f1ba3cd5dce2
+EBUILD dev86-0.16.21-r2.ebuild 1870 BLAKE2B e6da95b4a65b98d1215e109519c3400ed7b5189cacb1cda4cb0186bdb348134fd22b58b6e25ed2426c784e8a5e3ff0f11dc378ef642a361d200ff3323e9096d5 SHA512 5edc82cfd68a9e08bc5ef95b0fabfeca13bdf63a209ea3dfcb0730203bb7ca804c5c91aa60776668d6195c771f2ee38f55845f16b061b63a4ccc9a2bb561d9c3
 MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2
diff --git a/sys-devel/dev86/dev86-0.16.19.ebuild b/sys-devel/dev86/dev86-0.16.19.ebuild
deleted file mode 100644
index 835423c7e4d1..000000000000
--- a/sys-devel/dev86/dev86-0.16.19.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-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://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-devel/bin86"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-
-STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
-
-src_prepare() {
-	# 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
-
-	epatch "${FILESDIR}"/dev86-pic.patch
-	epatch "${FILESDIR}"/${PN}-0.16.19-fortify.patch
-	epatch "${FILESDIR}"/${PN}-0.16.19-memmove.patch #354351
-	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).
-	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
-	ln -s ncc bcc
-	cd ..
-	cd bootblocks
-	ln -s ../bcc/version.h .
-	emake DIST="${D}"
-}
-
-src_install() {
-	emake -j1 install-all DIST="${D}"
-	dobin bootblocks/makeboot
-	# remove all the stuff supplied by bin86
-	cd "${D}"
-	rm usr/bin/{as,ld,nm,objdump,size}86 || die
-	rm usr/man/man1/{as,ld}86.1 || die
-	dodir /usr/share/man
-	mv usr/man usr/share/
-}
diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
index 832575fed108..0e731cc95637 100644
--- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
@@ -11,7 +11,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"
diff --git a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch b/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
deleted file mode 100644
index 12df3f672624..000000000000
--- a/sys-devel/dev86/files/dev86-0.16.19-memmove.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/354351
-
-fix sniped from Debian:
-* Fix "FTBFS: ncc: illegal label": apply patch by dai that replaces strcpy
-  by memmove (closes: #591133).
-
---- copt/copt.c
-+++ copt/copt.c
-@@ -174,7 +174,7 @@
-   /* Delete leading white spaces */
-   for (cp = buf; *cp && isspace(*cp); cp++) ;
-   if (cp != buf && *cp)
--	strcpy(buf, cp);
-+	memmove(buf, cp, strlen(cp) + 1);
- 
-   return(buf);
- }