Fix building with --as-needed and clean up ebuild.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

4 files changed, 45 insertions, 14 deletions

diff --git a/dev-libs/eb/ChangeLog b/dev-libs/eb/ChangeLog
index 7f158995e73d..ff55f1119608 100644
--- a/dev-libs/eb/ChangeLog
+++ b/dev-libs/eb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/eb
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eb/ChangeLog,v 1.36 2007/12/25 17:06:38 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eb/ChangeLog,v 1.37 2008/06/21 13:57:30 dirtyepic Exp $
+
+  21 Jun 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/eb-4.2.2-as-needed.patch, eb-4.2.2.ebuild:
+  Fix building with --as-needed and clean up ebuild.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931. Assigning to maintainer-needed.
diff --git a/dev-libs/eb/Manifest b/dev-libs/eb/Manifest
index 381a8bc62878..44f3dd8bb1db 100644
--- a/dev-libs/eb/Manifest
+++ b/dev-libs/eb/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX eb-4.2.2-as-needed.patch 585 RMD160 4222619e015ad4564931bc5dcef74d4c01485807 SHA1 fa269ea275f6c259a98b40011e4e30c3c0edb4f9 SHA256 2ab69e6ef70ac140804f1b0a6f9be62c6b8d8004d5dd7c751411886454b9d8ab
 DIST eb-3.3.4.tar.gz 1059932 RMD160 e326abcaacbedd70cb01c917c7b51ca1b33864a3 SHA1 8dda7d5e244be71669bb4d336ba108784739ba69 SHA256 c8c1efea7c7fea7161fc7fff14c1dcb97b2385b0519e59a9f8fef78793359afb
 DIST eb-4.2.1.tar.bz2 479688 RMD160 c949a13fc6cf2dea042167d343f0b5b7588f477e SHA1 1a17eb9c8d22819690616ca80a7456f27a64e440 SHA256 b88060637f0f5e41aa20ca5e52e8dbcf12af162fa9568b5508661124f58089fd
 DIST eb-4.2.2.tar.bz2 480001 RMD160 0a2a3bef3d50171ea3feb2f247f6fb035a05bfa7 SHA1 4762303c567de816fef9ea5b841bda591accaed7 SHA256 83f75cc58191dc3d518d2931295dc80638a9c32d6aab0e6cc3a2bce02dd090ec
 DIST eb-4.2.tar.bz2 479270 RMD160 7013ac6bef124842b5928d215648a424626af7d0 SHA1 6dc82a9ac006a811a5bc7df09e75eeee76580e22 SHA256 9c4ec8af099378052a3698486e7f8d4f850576740eb768e9a7db8de29affd6ec
 EBUILD eb-3.3.4.ebuild 657 RMD160 565d8087a2eb47ef7d51efcdc44cfe975229f48d SHA1 ea896cbfa71d2ab873663d228cf6d23ff3131f08 SHA256 413fb2c332dc764c112f9b25954dd4e83dd257dec6adbd186e3b8228bef47e6a
 EBUILD eb-4.2.1.ebuild 966 RMD160 2734d341228256dc4c3e4c42f2aa70c02eed0a82 SHA1 e12d830de4a58a98a98a5d8b4dac8e972b9d6b7d SHA256 f15ce1e86ffedc3a1e187ed033c2a4e792200e0fdebf3946a4ce9b19395767bb
-EBUILD eb-4.2.2.ebuild 984 RMD160 12f5a4fd2e5e76e5e4a107f2e9aa70f98bf077c8 SHA1 92b4f5b6da3b73bd609a7d7b7c94e0ef55fa636d SHA256 9203ec3ff8eeecf0d9c9706505b0d98797300702fe63abc6fc42f7c2a865de5c
+EBUILD eb-4.2.2.ebuild 1101 RMD160 daa5638747cdac0c880c1cb4da65bcc616061532 SHA1 dcede0a3e161a7241c86042be14442a125dac63a SHA256 253d77d0a8ee13cb8f0ea26c32c25993a60aedec639e18043824527a35ce052d
 EBUILD eb-4.2.ebuild 960 RMD160 720ed8acfc0c4a5c7557e774ba794d3536a5b1a0 SHA1 fe1f0e038e7e352dfb50327555ae285bdf2b21cd SHA256 b4e8723b5d9ceb0c8da4f78688dc1c026bfec4538ae82afa99acf3a9ea8d7977
-MISC ChangeLog 4154 RMD160 d2615c835a96756005083252923873a2b40faf45 SHA1 32394904e40a4b1ad0624b2584a2b3a39ef93506 SHA256 46fb1427d31f1478ec7d772a3cec53fedf3a7dc6a4d7404be47b9f8af1581ebb
+MISC ChangeLog 4311 RMD160 74e045ba48da11d771bd016d68b2c6dc998de22a SHA1 4dc54ca3a85ea50a370f749d99d8afd8c2a73d35 SHA256 8e44084aed79ebc821f399846494bb3be42c5ecf2c4d06819bb09808117c1e6e
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhdCM8ACgkQiqiDRvmkBmIpdgCg66RWKU3b2Pi33/iPIjPp+UHM
+JQkAnjIAoq6lZDaq+6jPR3SIyPtQtvpy
+=/49S
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/eb/eb-4.2.2.ebuild b/dev-libs/eb/eb-4.2.2.ebuild
index 671af09a29cd..0ac62d1bd40b 100644
--- a/dev-libs/eb/eb-4.2.2.ebuild
+++ b/dev-libs/eb/eb-4.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/eb/eb-4.2.2.ebuild,v 1.13 2007/08/25 17:13:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/eb/eb-4.2.2.ebuild,v 1.14 2008/06/21 13:57:30 dirtyepic Exp $
 
 inherit eutils
 
@@ -14,21 +14,25 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
-DEPEND="virtual/libc
-	sys-libs/zlib
-	nls? ( sys-devel/gettext )"
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
 
 src_compile () {
 	econf \
 		--with-pkgdocdir=/usr/share/doc/${PF}/html \
-		`use_enable nls` \
-		`use_enable threads pthread` \
-		`use_enable ipv6` || die
-	emake || die
+		$(use_enable nls) \
+		$(use_enable threads pthread) \
+		$(use_enable ipv6) || die "Failed configure."
+	emake || die "Failed make."
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die "Failed install."
 
 	dodoc AUTHORS INSTALL* NEWS README*
 }
diff --git a/dev-libs/eb/files/eb-4.2.2-as-needed.patch b/dev-libs/eb/files/eb-4.2.2-as-needed.patch
new file mode 100644
index 000000000000..19ec6c1ab582
--- /dev/null
+++ b/dev-libs/eb/files/eb-4.2.2-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Naurp eb-4.2.2-orig/eb/Makefile.in eb-4.2.2/eb/Makefile.in
+--- eb-4.2.2-orig/eb/Makefile.in	2005-11-25 21:02:13.000000000 -0600
++++ eb-4.2.2/eb/Makefile.in	2008-06-21 07:37:51.000000000 -0600
+@@ -318,7 +318,7 @@ clean-libLTLIBRARIES:
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+ libeb.la: $(libeb_la_OBJECTS) $(libeb_la_DEPENDENCIES) 
+-	$(LINK) -rpath $(libdir) $(libeb_la_LDFLAGS) $(libeb_la_OBJECTS) $(libeb_la_LIBADD) $(LIBS)
++	$(LINK) -rpath $(libdir) $(libeb_la_LDFLAGS) $(libeb_la_OBJECTS) $(libeb_la_LIBADD) $(LIBS) $(ZLIBLIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)