6 files changed, 15 insertions, 200 deletions
diff --git a/dev-util/elfkickers/ChangeLog b/dev-util/elfkickers/ChangeLog
index 493639a15228..45289a350cd3 100644
--- a/dev-util/elfkickers/ChangeLog
+++ b/dev-util/elfkickers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/elfkickers
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/ChangeLog,v 1.30 2009/03/04 17:08:31 drizzt Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/ChangeLog,v 1.31 2010/03/05 22:06:33 solar Exp $
+
+  05 Mar 2010; <solar@gentoo.org> -elfkickers-2.0a.ebuild,
+  -elfkickers-2.0a-r1.ebuild, -elfkickers-2.0a-r2.ebuild,
+  -elfkickers-2.0a-r3.ebuild, elfkickers-2.0a-r4.ebuild:
+  - flush old ebuilds. make sure docs are handled right. (bug 305549)
 
   04 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
   elfkickers-2.0a-r4.ebuild:
diff --git a/dev-util/elfkickers/elfkickers-2.0a-r1.ebuild b/dev-util/elfkickers/elfkickers-2.0a-r1.ebuild
deleted file mode 100644
index 01c3d9f74bb2..000000000000
--- a/dev-util/elfkickers/elfkickers-2.0a-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-2.0a-r1.ebuild,v 1.4 2006/08/12 18:50:34 weeve Exp $
-
-inherit eutils
-
-MY_PN=${PN/elf/ELF}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc, ebfc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~mips ppc sparc x86"
-IUSE="doc"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}.diff
-	epatch "${FILESDIR}"/${P}-elfls-core.patch
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-bsd.patch
-
-	cp "${FILESDIR}"/sstrip-mjn3.c sstrip/sstrip.c || die "failed to update sstrip"
-
-	sed -i -e '/^SUBDIRS/s:tiny::' Makefile
-	use x86 || sed -i -e '/^SUBDIRS/s:ebfc::' Makefile
-}
-
-src_install() {
-	for d in elfls elftoc rebind sstrip ; do
-		newdoc ${d}/README README.${d}
-		dobin ${d}/${d} || die "dobin ${d} failed"
-	done
-	if use x86 ; then
-		newdoc ebfc/README README.ebfc
-		dobin ebfc/ebfc || die "dobin ebfc failed"
-	fi
-
-	doman */*.1
-	dodoc Changelog README ebfc/elfparts.txt
-	if use doc ; then
-		docinto tiny
-		dodoc tiny/*.asm
-	fi
-}
diff --git a/dev-util/elfkickers/elfkickers-2.0a-r2.ebuild b/dev-util/elfkickers/elfkickers-2.0a-r2.ebuild
deleted file mode 100644
index e4b6027f9bc4..000000000000
--- a/dev-util/elfkickers/elfkickers-2.0a-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-2.0a-r2.ebuild,v 1.1 2007/05/16 19:37:09 solar Exp $
-
-inherit eutils
-
-MY_PN=${PN/elf/ELF}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc, ebfc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}-${PV}.tar.gz
-	mirror://gentoo/elfkickers-2.0a-r2.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/elfkickers-2.0a-r2.patch
-
-	sed -i -e '/^SUBDIRS/s:tiny::' Makefile
-	use x86 || sed -i -e '/^SUBDIRS/s:ebfc::' Makefile
-}
-
-src_install() {
-	for d in elfls elftoc rebind sstrip ; do
-		newdoc ${d}/README README.${d}
-		dobin ${d}/${d} || die "dobin ${d} failed"
-	done
-	if use x86 ; then
-		newdoc ebfc/README README.ebfc
-		dobin ebfc/ebfc || die "dobin ebfc failed"
-	fi
-
-	doman */*.1
-	dodoc Changelog README ebfc/elfparts.txt
-	if use doc ; then
-		docinto tiny
-		dodoc tiny/*.asm
-	fi
-}
diff --git a/dev-util/elfkickers/elfkickers-2.0a-r3.ebuild b/dev-util/elfkickers/elfkickers-2.0a-r3.ebuild
deleted file mode 100644
index b82dc3085570..000000000000
--- a/dev-util/elfkickers/elfkickers-2.0a-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-2.0a-r3.ebuild,v 1.9 2008/11/04 23:15:10 vapier Exp $
-
-inherit eutils
-
-MY_PN=${PN/elf/ELF}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc, ebfc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}-${PV}.tar.gz
-	mirror://gentoo/elfkickers-2.0a-r2.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="doc"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/elfkickers-2.0a-r2.patch
-
-	sed -i -e '/^SUBDIRS/s:tiny::' Makefile
-	use x86 || sed -i -e '/^SUBDIRS/s:ebfc::' Makefile
-	use x86 && sed -i -e 's:linux/elf.h:elf.h:' ebfc/*.c
-}
-
-src_install() {
-	for d in elfls elftoc rebind sstrip ; do
-		newdoc ${d}/README README.${d}
-		dobin ${d}/${d} || die "dobin ${d} failed"
-	done
-	if use x86 ; then
-		newdoc ebfc/README README.ebfc
-		dobin ebfc/ebfc || die "dobin ebfc failed"
-	fi
-
-	doman */*.1
-	dodoc Changelog README ebfc/elfparts.txt
-	if use doc ; then
-		docinto tiny
-		dodoc tiny/*.asm
-	fi
-}
diff --git a/dev-util/elfkickers/elfkickers-2.0a-r4.ebuild b/dev-util/elfkickers/elfkickers-2.0a-r4.ebuild
index 1ecc14152ff5..7a14a1ee97e9 100644
--- a/dev-util/elfkickers/elfkickers-2.0a-r4.ebuild
+++ b/dev-util/elfkickers/elfkickers-2.0a-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-2.0a-r4.ebuild,v 1.9 2009/03/04 17:08:31 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-2.0a-r4.ebuild,v 1.10 2010/03/05 22:06:33 solar Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -42,13 +42,15 @@ src_compile() {
 
 src_install() {
 	for d in elfls elftoc rebind sstrip ; do
-		newdoc ${d}/README README.${d}
-		dobin ${d}/${d}{32,64} || die "dobin ${d}{32,64} failed"
-		doman $d/*.1
+		newdoc ${d}/README README.${d} || die
+		dobin ${d}/${d}{32,64} || die
+		for i in ${d}/*.1; do
+		  [ -e ${i} ] && doman ${i}
+		done
 		case $(get_libdir) in
 			lib64) dosym /usr/bin/${d}64 /usr/bin/${d};;
 			lib|lib32) dosym /usr/bin/${d}32 /usr/bin/${d};;
 		esac
 	done
-	dodoc Changelog README
+	dodoc Changelog README || die
 }
diff --git a/dev-util/elfkickers/elfkickers-2.0a.ebuild b/dev-util/elfkickers/elfkickers-2.0a.ebuild
deleted file mode 100644
index e5aff02e9e62..000000000000
--- a/dev-util/elfkickers/elfkickers-2.0a.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-2.0a.ebuild,v 1.14 2006/05/09 11:38:16 solar Exp $
-
-inherit eutils
-
-MY_PN=${PN/elf/ELF}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc, ebfc"
-HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips sparc x86 ~ppc"
-IUSE="doc"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}.diff
-
-	sed -i -e '/^SUBDIRS/s:tiny::' Makefile
-	use x86 || sed -i -e '/^SUBDIRS/s:ebfc::' Makefile
-}
-
-src_install() {
-	for d in elfls elftoc rebind sstrip ; do
-		newdoc ${d}/README README.${d}
-		dobin ${d}/${d} || die "dobin ${d} failed"
-	done
-	if use x86 ; then
-		newdoc ebfc/README README.ebfc
-		dobin ebfc/ebfc || die "dobin ebfc failed"
-	fi
-
-	doman */*.1
-	dodoc Changelog README ebfc/elfparts.txt
-	if use doc ; then
-		docinto tiny
-		dodoc tiny/*.asm
-	fi
-}