Version bump. Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 14 insertions, 83 deletions

diff --git a/sys-devel/bin86/ChangeLog b/sys-devel/bin86/ChangeLog
index 0336ef01f925..87122dff419f 100644
--- a/sys-devel/bin86/ChangeLog
+++ b/sys-devel/bin86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/bin86
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.33 2014/05/18 17:26:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/ChangeLog,v 1.34 2014/05/28 09:52:44 polynomial-c Exp $
+
+*bin86-0.16.21 (28 May 2014)
+
+  28 May 2014; Lars Wendler <polynomial-c@gentoo.org> -bin86-0.16.17.ebuild,
+  -bin86-0.16.18.ebuild, -bin86-0.16.19.ebuild, +bin86-0.16.21.ebuild:
+  Version bump. Removed old.
 
   18 May 2014; Mike Frysinger <vapier@gentoo.org> bin86-0.16.20-r2.ebuild:
   Add ppc/ppc64 keywords as this project can build on any arch (it will still
diff --git a/sys-devel/bin86/bin86-0.16.17.ebuild b/sys-devel/bin86/bin86-0.16.17.ebuild
deleted file mode 100644
index 1378b49d3d44..000000000000
--- a/sys-devel/bin86/bin86-0.16.17.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.17.ebuild,v 1.7 2009/10/05 23:26:10 vapier Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Assembler and loader used to create kernel bootsector"
-HOMEPAGE="http://www.debath.co.uk/"
-SRC_URI="http://www.debath.co.uk/dev86/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's:/man/man1:/share/man/man1:' \
-		-e '/^INSTALL_OPTS/s:-s::' \
-		Makefile || die "sed"
-
-	# This should make it built on other archictectures as well
-	use amd64 && epatch "${FILESDIR}"/${P}-amd64-build.patch
-}
-
-src_compile() {
-	emake \
-		PREFIX="/usr" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	emake install PREFIX="${D}/usr" || die "install"
-	dodoc README* ChangeLog
-}
diff --git a/sys-devel/bin86/bin86-0.16.19.ebuild b/sys-devel/bin86/bin86-0.16.19.ebuild
deleted file mode 100644
index c74c6be2b27c..000000000000
--- a/sys-devel/bin86/bin86-0.16.19.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.19.ebuild,v 1.4 2013/06/25 12:53:51 ago Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Assembler and loader used to create kernel bootsector"
-HOMEPAGE="http://www.debath.co.uk/"
-SRC_URI="http://www.debath.co.uk/dev86/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-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.18-headers.patch #347817
-	epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
-	tc-export CC
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	default
-}
diff --git a/sys-devel/bin86/bin86-0.16.18.ebuild b/sys-devel/bin86/bin86-0.16.21.ebuild
index 65b86d2a3bb5..487fdf78f6a2 100644
--- a/sys-devel/bin86/bin86-0.16.18.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.18.ebuild,v 1.3 2012/08/01 02:00:35 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.16.21.ebuild,v 1.1 2014/05/28 09:52:44 polynomial-c Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit toolchain-funcs eutils
 
 DESCRIPTION="Assembler and loader used to create kernel bootsector"
-HOMEPAGE="http://www.debath.co.uk/"
-SRC_URI="http://www.debath.co.uk/dev86/${P}.tar.gz"
+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 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
@@ -23,7 +24,6 @@ src_prepare() {
 		-e "/^CFLAGS/s:=.*:=${CFLAGS} -D_POSIX_SOURCE ${CPPFLAGS}:" \
 		-e "/^LDFLAGS/s:=.*:=${LDFLAGS}:" \
 		Makefile || die
-	epatch "${FILESDIR}"/${P}-headers.patch #347817
 	epatch "${FILESDIR}"/${PN}-0.16.17-amd64-build.patch
 	tc-export CC
 }