dev-util/hxd: Fix parallel build, #240257; fix LLONG_MAX redefinition, bump EAPI

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

6 files changed, 121 insertions, 43 deletions

diff --git a/dev-util/hxd/ChangeLog b/dev-util/hxd/ChangeLog
index 25b045fc778a..d091a2e5f566 100644
--- a/dev-util/hxd/ChangeLog
+++ b/dev-util/hxd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/hxd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/hxd/ChangeLog,v 1.12 2012/05/10 16:05:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/hxd/ChangeLog,v 1.13 2012/06/20 12:53:28 jlec Exp $
+
+*hxd-0.70.02-r1 (20 Jun 2012)
+
+  20 Jun 2012; Justin Lecher <jlec@gentoo.org> -hxd-0.70.02.ebuild,
+  +hxd-0.70.02-r1.ebuild, +files/hxd-0.70.02-llong-redef.patch,
+  +files/hxd-0.70.02-prll-flags.patch, metadata.xml:
+  Fix parallel build, #240257; fix LLONG_MAX redefinition, bump EAPI
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -hxd-0.70.ebuild:
   Remove old
diff --git a/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch b/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch
new file mode 100644
index 000000000000..e9e230c867ac
--- /dev/null
+++ b/dev-util/hxd/files/hxd-0.70.02-llong-redef.patch
@@ -0,0 +1,25 @@
+ general.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/general.h b/general.h
+index 0a2ebe7..b749945 100644
+--- a/general.h
++++ b/general.h
+@@ -56,7 +56,7 @@
+ 
+ #ifdef	HAVE_LONGLONG
+ loff_t	lseek64( int fd, loff_t offset, int whence );
+-#define	LLONG_MAX	0x7fffffffffffffffll
++#define	L_LONG_MAX	0x7fffffffffffffffll
+ #undef	LSEEK
+ #define	LSEEK(A,B,C)	lseek64((A),(B),(C))
+ #undef  STRTOL
+@@ -64,7 +64,7 @@ loff_t	lseek64( int fd, loff_t offset, int whence );
+ #undef	SIZE_MIN
+ #define	SIZE_MIN	( (loff_t) 0 )
+ #undef	SIZE_MAX
+-#define	SIZE_MAX	( LLONG_MAX - 1 )
++#define	SIZE_MAX	( L_LONG_MAX - 1 )
+ #undef	OFF_T
+ #define	OFF_T		loff_t
+ #endif
diff --git a/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch b/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch
new file mode 100644
index 000000000000..f08f2eb18063
--- /dev/null
+++ b/dev-util/hxd/files/hxd-0.70.02-prll-flags.patch
@@ -0,0 +1,56 @@
+ Makefile.Linux |   23 +++++++++++++++--------
+ 1 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.Linux b/Makefile.Linux
+index e3711cd..d5b00cb 100644
+--- a/Makefile.Linux
++++ b/Makefile.Linux
+@@ -1,6 +1,6 @@
+-CC=gcc
+-CFLAGS=-Wall -Wstrict-prototypes -fomit-frame-pointer -pipe -I$(HDDIR) -DOS_TYPE_Linux -DOS_TYPE_STR=\"Linux\"
+-LDFLAGS=-Wl,-warn-common -s -L$(LIBDIR)
++CC ?=gcc
++CFLAGS+=-Wall -Wstrict-prototypes -I$(HDDIR) -DOS_TYPE_Linux -DOS_TYPE_STR=\"Linux\"
++LDFLAGS+=-Wl,-warn-common  -L$(LIBDIR)
+ 
+ LDLIBS = 
+ HDDIR = ./
+@@ -32,26 +32,33 @@ $(PRG_UNDUMP):	$(PRG_UNDUMP).c $(PRG_UNDUMP).h general.h
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) $(LDFLAGS) $(PRG_UNDUMP).c -o $@
+ 
+ 
+-$(MAN_DUMP):	$(PRG_DUMP).man
++mkmkman: $(PRG_DUMP)
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_DUMP)\" -DMANUAL_NUMBER=$(MAN_NO_DUMP) -Dundump_name=\"$(PRG_UNDUMP)\" $(LDFLAGS) mkmkman.c -o mkmkman
++
++mkman.c:	mkmkman $(PRG_DUMP).man
+ 		cat $(PRG_DUMP).man | ./mkmkman > mkman.c
+ 		ln -sf $(PRG_DUMP).h header.h
++
++$(MAN_DUMP): mkman.c
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_DUMP)\" -DMANUAL_NUMBER=$(MAN_NO_DUMP) -Dundump_name=\"$(PRG_UNDUMP)\" $(LDFLAGS) mkman.c -o mkman
+ 		./mkman > $@
+ 
+-
+-$(MAN_UNDUMP):	$(PRG_UNDUMP).man
++mkmkman_u: $(MAN_DUMP) $(PRG_UNDUMP)
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) -Ddump_name=\"$(PRG_DUMP)\" $(LDFLAGS) mkmkman.c -o mkmkman
++
++mkman_u.c:	$(PRG_UNDUMP).man mkmkman_u
+ 		cat $(PRG_UNDUMP).man | ./mkmkman > mkman.c
+ 		ln -sf $(PRG_UNDUMP).h header.h
++
++$(MAN_UNDUMP): $(MAN_UNDUMP) mkman_u.c
+ 		$(CC) $(CFLAGS) -Dprg_name=\"$(PRG_UNDUMP)\" -DMANUAL_NUMBER=$(MAN_NO_UNDUMP) -Ddump_name=\"$(PRG_DUMP)\" $(LDFLAGS) mkman.c -o mkman
+ 		./mkman > $@
+ 
+ 
+ install:	all
+-		install -s -m 0755 -o root -g root $(PRG_DUMP) $(INSTALLDIR_BIN_DUMP)
++		install -m 0755 -o root -g root $(PRG_DUMP) $(INSTALLDIR_BIN_DUMP)
+ 		install    -m 0644 -o root -g root $(MAN_DUMP) $(INSTALLDIR_MAN_DUMP)
+-		install -s -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP)
++		install -m 0755 -o root -g root $(PRG_UNDUMP) $(INSTALLDIR_BIN_UNDUMP)
+ 		install    -m 0644 -o root -g root $(MAN_UNDUMP) $(INSTALLDIR_MAN_UNDUMP)
+ 
+ clean:
diff --git a/dev-util/hxd/hxd-0.70.02-r1.ebuild b/dev-util/hxd/hxd-0.70.02-r1.ebuild
new file mode 100644
index 000000000000..38c5e6dc4b0b
--- /dev/null
+++ b/dev-util/hxd/hxd-0.70.02-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/hxd/hxd-0.70.02-r1.ebuild,v 1.1 2012/06/20 12:53:28 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Binary to hexadecimal converter"
+HOMEPAGE="http://www-tet.ee.tu-berlin.de/solyga/linux/"
+SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~sparc ~mips ~ppc"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-prll-flags.patch \
+		"${FILESDIR}"/${P}-llong-redef.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin hxd unhxd
+	doman hxd.1 unhxd.1
+	dodoc README TODO
+}
diff --git a/dev-util/hxd/hxd-0.70.02.ebuild b/dev-util/hxd/hxd-0.70.02.ebuild
deleted file mode 100644
index 240e82ca4cc0..000000000000
--- a/dev-util/hxd/hxd-0.70.02.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/hxd/hxd-0.70.02.ebuild,v 1.2 2009/09/23 17:45:18 patrick Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Binary to hexadecimal converter"
-HOMEPAGE="http://www-tet.ee.tu-berlin.de/solyga/linux/"
-SRC_URI="http://linux.xulin.de/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~sparc ~mips ~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#Respect FLAGS and avoid stripping
-	sed -i -e "/^CFLAGS/s|=|+=|" \
-		-e "/^LDFLAGS/s|=|+=|" \
-		-e "/^LDFLAGS/s|-s||" \
-		-e "s/install -s/install/" \
-		Makefile.Linux || die "sed failed"
-}
-
-src_compile() {
-	econf || die
-	emake CC="$(tc-getCC)" -j1 || die "make failed"
-}
-
-src_install() {
-	dobin hxd unhxd
-	doman hxd.1 unhxd.1
-	dodoc README TODO
-}
diff --git a/dev-util/hxd/metadata.xml b/dev-util/hxd/metadata.xml
index d9cd2cad66c2..91f4e72fb544 100644
--- a/dev-util/hxd/metadata.xml
+++ b/dev-util/hxd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>