4 files changed, 5 insertions, 82 deletions
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 8a0f53f59633..5dcf0bc64c38 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -4,7 +4,6 @@ AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aac
 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 1820 BLAKE2B a19ad399d7d406958ebf8540b5d925e59db71bd03c2c90169034992764dc75769311a76a3afc202d5436772d4d1c2737ec7dc02c9e17bae7c18be84dff6ca902 SHA512 cd093d1ebea014f8f842ee5a70dbec7aa25c636211c56caf11e89b37a6625110488ba72a8cbdf10796c2b64b4d1a1d5831f3a99bfd7788bfcf6245a4d25f2c80
-EBUILD dev86-0.16.21-r2.ebuild 1843 BLAKE2B f3f9aa92e7bb0ed01bb28f8c6915866e3a3a1471ec908e5f4d706741710fc2959439490b27c20d859dab590794250c2073bb3f338cef848cc734ea7dbc2dd141 SHA512 1b7d8213232bded080c8f78df9b16931b0d22493c4510963ee9e98ea6b142d008a046496e580d25e77f96dde1453838dbd6d6c847020e41dbc993a921b17dfde
-EBUILD dev86-0.16.21.ebuild 1780 BLAKE2B fddd798d7bf71c6a77bafee7ee8b5914c3fd70ca2948fabf0d9bf44f11dfbf3a13e20ead5787c2ff76000711f6436f39af26edb756503d72de52c780e8da5950 SHA512 0ac3ea2a1768b57f5999006d88f0b7620993b8dd4c8c55cf04f7d24231899fe8492264ff1f040b443d5ff4a46d242212490ba110839d5ec7bb914af6ee37babd
+EBUILD dev86-0.16.19.ebuild 1854 BLAKE2B 49f3ee0daa8a7b1410aadd978a733862cd6a40556bc49f89b3921da2a64d1bd5217c1455ef97e87bd62a0a17a6b35436923fc2e62b05c35eec39925a65b24548 SHA512 17d24085519121a56639ce740c315faaa2815731e63420c5ad164b148acfa507a14a2caa6651dc13c597de2d008adbf07c6a7995cac7fdf300c13d98881459e5
+EBUILD dev86-0.16.21-r2.ebuild 1872 BLAKE2B 691192c6fb7c6db1552a7b22849c4c9e3a851631e634f29427779fd312b436ad839b68a6f04a25f7b0809295a28de9dd7aa7a3c8704ac24fa5f67c4231b8c234 SHA512 5ebefb8e0b0b8ae26dbd345f237c12429922425d330354770988da597f058edf7bae9990b172f0fdd9819a9d5938995f6605a9cab93a41a25a911444a3e455a2
 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
index 194de6a5b686..835423c7e4d1 100644
--- a/sys-devel/dev86/dev86-0.16.19.ebuild
+++ b/sys-devel/dev86/dev86-0.16.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -6,7 +6,7 @@ EAPI="4"
 inherit eutils multilib
 
 DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/"
+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"
diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
index 39d5b5977db4..701d48499a53 100644
--- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
+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"
diff --git a/sys-devel/dev86/dev86-0.16.21.ebuild b/sys-devel/dev86/dev86-0.16.21.ebuild
deleted file mode 100644
index ea917c7d3292..000000000000
--- a/sys-devel/dev86/dev86-0.16.21.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
-SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~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
-	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/
-}