sys-apps/hexdump-esr: Version Bump, moved to EAPI=4

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

3 files changed, 49 insertions, 12 deletions

diff --git a/sys-apps/hexdump-esr/ChangeLog b/sys-apps/hexdump-esr/ChangeLog
index 709fa7cac291..554ed6a4d78a 100644
--- a/sys-apps/hexdump-esr/ChangeLog
+++ b/sys-apps/hexdump-esr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hexdump-esr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump-esr/ChangeLog,v 1.14 2012/05/11 19:16:16 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump-esr/ChangeLog,v 1.15 2012/07/11 12:43:02 jlec Exp $
+
+*hexdump-esr-1.7 (11 Jul 2012)
+
+  11 Jul 2012; Justin Lecher <jlec@gentoo.org> hexdump-esr-1.6-r1.ebuild,
+  +hexdump-esr-1.7.ebuild:
+  Version Bump, moved to EAPI=4
 
   11 May 2012; Michael Palimaka <kensington@gentoo.org> -hexdump-esr-1.6.ebuild:
   Remove old.
diff --git a/sys-apps/hexdump-esr/hexdump-esr-1.6-r1.ebuild b/sys-apps/hexdump-esr/hexdump-esr-1.6-r1.ebuild
index 9532939858f8..a89cecda1321 100644
--- a/sys-apps/hexdump-esr/hexdump-esr-1.6-r1.ebuild
+++ b/sys-apps/hexdump-esr/hexdump-esr-1.6-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump-esr/hexdump-esr-1.6-r1.ebuild,v 1.6 2012/03/02 21:08:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump-esr/hexdump-esr-1.6-r1.ebuild,v 1.7 2012/07/11 12:43:02 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit toolchain-funcs
 
 MY_P=${P/-esr/}
+
 DESCRIPTION="Eric Raymond's hex dumper"
 HOMEPAGE="http://www.catb.org/~esr/hexdump/"
 SRC_URI="http://www.catb.org/~esr/hexdump/${MY_P}.tar.gz"
@@ -15,23 +16,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	sed -i Makefile \
-		-e 's|-O ||g' \
+		-e "s|-O |${CFLAGS} ${LDFLAGS} |g" \
 		|| die "sed Makefile"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die
-	mv hexdump hexdump-esr
-	mv hexdump.1 hexdump-esr.1
+	tc-export CC
 }
 
 src_install() {
-	dobin hexdump-esr || die
-	doman hexdump-esr.1
+	newbin hexdump hexdump-esr
+	newman hexdump.1 hexdump-esr.1
 	dodoc README
 	dosym hexdump-esr /usr/bin/hex
 }
diff --git a/sys-apps/hexdump-esr/hexdump-esr-1.7.ebuild b/sys-apps/hexdump-esr/hexdump-esr-1.7.ebuild
new file mode 100644
index 000000000000..ed5801fa18f8
--- /dev/null
+++ b/sys-apps/hexdump-esr/hexdump-esr-1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hexdump-esr/hexdump-esr-1.7.ebuild,v 1.1 2012/07/11 12:43:02 jlec Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+MY_P=${P/-esr/}
+
+DESCRIPTION="Eric Raymond's hex dumper"
+HOMEPAGE="http://www.catb.org/~esr/hexdump/"
+SRC_URI="http://www.catb.org/~esr/hexdump/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i Makefile \
+		-e "s|-O |${CFLAGS} ${LDFLAGS} |g" \
+		|| die "sed Makefile"
+	tc-export CC
+}
+
+src_install() {
+	newbin hexdump hexdump-esr
+	newman hexdump.1 hexdump-esr.1
+	dodoc README
+	dosym hexdump-esr /usr/bin/hex
+}