Apply a patch to sanitise build system that actually allows for it to pass properly. Also fix bug #347059, and make the package cross-compilable.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

5 files changed, 78 insertions, 77 deletions

diff --git a/dev-libs/libelf/ChangeLog b/dev-libs/libelf/ChangeLog
index f58571c65ae7..9c6bec709bbd 100644
--- a/dev-libs/libelf/ChangeLog
+++ b/dev-libs/libelf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libelf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.29 2010/04/24 15:07:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/ChangeLog,v 1.30 2010/11/18 17:50:14 flameeyes Exp $
+
+*libelf-0.8.13-r1 (18 Nov 2010)
+
+  18 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org> -libelf-0.8.12.ebuild,
+  -libelf-0.8.13.ebuild, +libelf-0.8.13-r1.ebuild,
+  +files/libelf-0.8.13-build.patch:
+  Apply a patch to sanitise build system that actually allows for it to pass
+  properly. Also fix bug #347059, and make the package cross-compilable.
 
 *libelf-0.8.13 (24 Apr 2010)
 
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index 06131ee572d5..c6e90d0579c3 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -1,8 +1,17 @@
-DIST libelf-0.8.12.tar.gz 148090 RMD160 29ca31074134a2bc99b207adaddd10924e46d899 SHA1 b6ff5c0262418fbca8ce281f9f927e25181f4237 SHA256 ec65a3922d718c32fd4e4836db980c76cc7a6e5a8a4b05303418366158a29495
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libelf-0.8.13-build.patch 1347 RMD160 ba632d52293da655677a0316743fbf89e1a70700 SHA1 561061af3c5e944ffc11e96f7dbc78c8ae3c92e6 SHA256 96b57e778a9a82fb92dc6fee502405ebf2646d656c0dee1871b1b8c39e2e811e
 DIST libelf-0.8.13.tar.gz 148529 RMD160 06962fbbcd91da25f02b964ad9513b9536f67baa SHA1 c1d6ac5f182d19dd685c4dfd74eedbfe3992425d SHA256 591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d
 DIST libelf-0.8.4.tar.gz 128313 RMD160 765c17439acdd50f95fa92324630d215602649bb SHA1 2d9d9a22aabf9c446cbd4cb627eedfc5ae1f74b8 SHA256 8022ccbd568c02e0b36331e533f78eeb3d0d1fa5637adac9b8b816d1ea358ebf
-EBUILD libelf-0.8.12.ebuild 1217 RMD160 aa753d95254b6ef03ed3570b5bc3331dc5a9500d SHA1 300f28cc72e7964785678b652269172daafe2471 SHA256 34c620df1e43790a1fd08b1f0c470e365d46c8c3bbaf1e64e90b2a399c58fd3e
-EBUILD libelf-0.8.13.ebuild 1221 RMD160 5127628c224d6284333c3e556eaba98ca91fd4e0 SHA1 34539befb861689803db166f738e3894e7fdf1ee SHA256 ffbeb5eac687ffeb0e5e287a3a29be64866dbcd84effdc9004715487d3141eb9
+EBUILD libelf-0.8.13-r1.ebuild 1236 RMD160 e5cfbe07b7b3d34ef288c31c69f9a3c4718a4762 SHA1 924a96637f2fa2248c6598bf3653606a3e998023 SHA256 4efe784d2f8bd84aef71234ec3fa673c50faeeee37c86a906819996b07da338c
 EBUILD libelf-0.8.4.ebuild 781 RMD160 b648a6bb3e1b3f1132a0a18654a229f5e1ff922b SHA1 0c9e91aa263fb0216adbda0cf9097a309f7a2798 SHA256 43ed37de4b9be14ea3f6dd6399d3a6ce0178fa0b4d1165e96875069476d35372
-MISC ChangeLog 3620 RMD160 e8366901b3f1c264b6bae07499db928cd5883aba SHA1 0a2aaf4ecedf65d122525d80051788aca5d275c2 SHA256 0828f2167eea178a638e3be679d9b0e0fea1624f717a899c4009771bb0d82c23
+MISC ChangeLog 3970 RMD160 313cbaa9f9852478f93c5ed6a1e41918402412c5 SHA1 78abffd5127aae2e534198e7c5c40770356b163e SHA256 7805dccb2bf3a3cb3d9666b95881d203790e377b7b12616f7338bec5a1b590cd
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzlZx0ACgkQAiZjviIA2Xhu4wCcD0+/9zdc+KnOGJ3oya44atcT
+ZfoAoI8deZnAvxEKtbCXbioKkWigs35p
+=Z15D
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libelf/files/libelf-0.8.13-build.patch b/dev-libs/libelf/files/libelf-0.8.13-build.patch
new file mode 100644
index 000000000000..57173d6138a2
--- /dev/null
+++ b/dev-libs/libelf/files/libelf-0.8.13-build.patch
@@ -0,0 +1,38 @@
+Index: libelf-0.8.13/aclocal.m4
+===================================================================
+--- libelf-0.8.13.orig/aclocal.m4
++++ libelf-0.8.13/aclocal.m4
+@@ -235,7 +235,7 @@ AC_DEFUN(mr_ENABLE_SHARED, [
+     AC_REQUIRE([AC_PROG_CC])
+     AC_PATH_PROG(LD, ld, ld)
+     case "$host" in
+-      *-linux*|*-gnu*)
++      *-linux*|*-gnu*|*-freebsd*)
+ 	if test "$GCC" = yes; then
+ 	  mr_TARGET_ELF
+ 	  if test "$mr_cv_target_elf" = yes; then
+Index: libelf-0.8.13/lib/Makefile.in
+===================================================================
+--- libelf-0.8.13.orig/lib/Makefile.in
++++ libelf-0.8.13/lib/Makefile.in
+@@ -158,7 +158,7 @@ libelf.a: $(OBJS) $(LIBOBJS)
+ 
+ $(SHLIB): libelf.a
+ 	@$(RM) $(SHLIB)
+-	$(LINK_SHLIB) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS)
++	$(LINK_SHLIB) $(LDFLAGS) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS)
+ 	if test "$(SONAME)" = "$(SHLIB)"; then true; else \
+ 	  $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \
+ 	fi
+@@ -169,9 +169,9 @@ $(SHLIB): libelf.a
+ install: install-data \
+ 	install-shared-$(DO_SHLIB) install-compat-$(DO_COMPAT)
+ 
+-installdirs: $(top_srcdir)/mkinstalldirs
++installdirs:
+ 	dirs="$(installdirs)"; for dir in $$dirs; do \
+-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(instroot)$$dir; \
++	    mkdir -p $(instroot)$$dir; \
+ 	done
+ 
+ install-data: all installdirs
diff --git a/dev-libs/libelf/libelf-0.8.12.ebuild b/dev-libs/libelf/libelf-0.8.12.ebuild
deleted file mode 100644
index 0e66d0893be7..000000000000
--- a/dev-libs/libelf/libelf-0.8.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.12.ebuild,v 1.1 2009/11/21 09:24:32 patrick Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="A ELF object file access library"
-HOMEPAGE="http://www.mr511.de/software/"
-SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug nls elibc_FreeBSD"
-
-DEPEND="!dev-libs/elfutils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use elibc_FreeBSD; then
-		# Stop libelf from stamping on the system nlist.h
-		sed -i -e 's:nlist.h::g' lib/Makefile.in || die
-
-		# Enable shared libs
-		sed -i \
-			-e 's:\*-linux\*\|\*-gnu\*:\*-linux\*\|\*-gnu\*\|\*-freebsd\*:' \
-			configure || die
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		--enable-shared \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake -j1 \
-		prefix="${D}"/usr \
-		libdir="${D}"usr/$(get_libdir) \
-		install \
-		install-compat || die "emake install failed"
-	dodoc ChangeLog VERSION README
-}
diff --git a/dev-libs/libelf/libelf-0.8.13.ebuild b/dev-libs/libelf/libelf-0.8.13-r1.ebuild
index 8baf38e182de..b7e694938d18 100644
--- a/dev-libs/libelf/libelf-0.8.13.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13.ebuild,v 1.1 2010/04/24 15:07:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13-r1.ebuild,v 1.1 2010/11/18 17:50:14 flameeyes Exp $
 
 EAPI=2
-inherit eutils multilib
+inherit eutils multilib autotools
 
 DESCRIPTION="A ELF object file access library"
 HOMEPAGE="http://www.mr511.de/software/"
@@ -15,28 +15,20 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	if use elibc_FreeBSD; then
-		# Stop libelf from stamping on the system nlist.h
-		sed -i \
-			-e 's:nlist.h::g' \
-			lib/Makefile.in || die
-
-		# Enable shared libs
-		sed -i \
-			-e 's:\*-linux\*\|\*-gnu\*:\*-linux\*\|\*-gnu\*\|\*-freebsd\*:' \
-			configure || die
-	fi
-
-	sed -i \
-		-e 's:$(LINK_SHLIB) -o:$(LINK_SHLIB) $(LDFLAGS) -o:' \
-		lib/Makefile.in || die
+	epatch "${FILESDIR}/${P}-build.patch"
+	eautoreconf
+
 }
 
 src_configure() {
+	# prefix might want to play with this; unfortunately the stupid
+	# macro used to detect whether we're building ELF is so screwed up
+	# that trying to fix it is just a waste of time.
+	export mr_cv_target_elf=yes
+
 	econf \
 		$(use_enable nls) \
 		--enable-shared \
@@ -44,10 +36,15 @@ src_configure() {
 }
 
 src_install() {
-	emake -j1 \
+	emake \
 		prefix="${D}usr" \
 		libdir="${D}usr/$(get_libdir)" \
 		install \
 		install-compat || die
-	dodoc ChangeLog README
+
+	dodoc ChangeLog README || die
+
+	# Stop libelf from stamping on the system nlist.h
+	use elibc_FreeBSD && rm "${D}"/usr/include/nlist.h
 }
+