243950

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 33 insertions, 29 deletions

diff --git a/dev-libs/tdb/ChangeLog b/dev-libs/tdb/ChangeLog
index 892018daa3e2..aaa5da109522 100644
--- a/dev-libs/tdb/ChangeLog
+++ b/dev-libs/tdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/tdb
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tdb/ChangeLog,v 1.19 2007/05/14 20:18:59 bangert Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tdb/ChangeLog,v 1.20 2009/07/06 18:09:48 ssuominen Exp $
+
+  06 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> tdb-1.0.6.ebuild:
+  Run full eautoreconf instead of elibtoolize to respect CC and LDFLAGS wrt
+  #243950, thanks to Diego E. Pettenò for reporting.
 
   14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/dev-libs/tdb/Manifest b/dev-libs/tdb/Manifest
index 03a6dfdd7689..481ddb411102 100644
--- a/dev-libs/tdb/Manifest
+++ b/dev-libs/tdb/Manifest
@@ -1,6 +1,6 @@
 AUX tdb-1.0.6-gcc3.patch 1656 RMD160 00da055532c6d900fca5e64d9fb650c37fef121c SHA1 b79f10e212ebbc14d4a9b4c4617f1f2498d4f562 SHA256 225745dd3926b1f7fead2242f3e60c1a19c926ecc588809e2f44559361a7953e
-AUX tdb-1.0.6-no-gdbm.patch 461 RMD160 d30b990aee9c16d853e75ea8f099f9fbfeae924d SHA1 6d7b28881693a28d4307cec4f81bbfde6d6cd0e0 SHA256 49653a16b36374ffaecdd93348917b0b59b0161930152aaf9e62c4414fed19c3
+AUX tdb-1.0.6-no-gdbm.patch 500 RMD160 344a065e46203ba6cbbb07801eee057884cb8673 SHA1 48551a9a566e76884817bc6d86bb5064743c7f98 SHA256 9bcdb0e2c9247fd9db513ea6112beb1e0f7074c7a0e9f6270b7f5b744dc80282
 DIST tdb-1.0.6.tar.gz 139948 RMD160 5163caf1cc76c9f3a69e88f7438ecd98ec5e52cf SHA1 d1876522f1b8ffa8cf844a1f6605e0c32d387a7a SHA256 235bd4f82321675779b0ed099753d0835b0f3e53bc45846f372fd51350252bb2
-EBUILD tdb-1.0.6.ebuild 708 RMD160 194721b576d2875a3a09df3fb93698a10840644a SHA1 35b300573f60d7ec8d8c76e44a6e9cea698522c8 SHA256 0f2ed27def4cf0c9e01de6b4b82d12afafd8a7a55afd73b637bad7dc93d01868
-MISC ChangeLog 2014 RMD160 9b961262d3a1aaaf54f5de4097915d47c755eba3 SHA1 cdcd6751cf207be6ae116b9c21f5c3c8be413e75 SHA256 a6153cc634e92775ea51777d8c7fdd597da0637d622ec66a3e0695319aee9dff
+EBUILD tdb-1.0.6.ebuild 723 RMD160 b6795db8036da400d46aaad0e72f6c8ff0c93e18 SHA1 d9a9b057424f1f9f0e7e548ec3026e16af8ed258 SHA256 3ff4952a649de05e94c9394ae32fc72b492878a73140ba6f2534ad100bda7ea2
+MISC ChangeLog 2219 RMD160 21776f07521ff7f94204d7c9fc6e5efa0b9beeca SHA1 66d8456c5b35227316e4a053108a525e37d54f5b SHA256 c13067056f66e2cae69162b963f29ec73b2b3efafef0e42cff4c135ceb963d57
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-libs/tdb/files/tdb-1.0.6-no-gdbm.patch b/dev-libs/tdb/files/tdb-1.0.6-no-gdbm.patch
index 0f4703076735..4199ea02b34b 100644
--- a/dev-libs/tdb/files/tdb-1.0.6-no-gdbm.patch
+++ b/dev-libs/tdb/files/tdb-1.0.6-no-gdbm.patch
@@ -1,16 +1,16 @@
-gdbm is only used in tdbspeed and tdbtest which never get
-installed, so lets go ahead and force disable gdbm "support"
+Disable gdbm support since its never actually used anyways #113824 by
+Natanael Copa.
 
-http://bugs.gentoo.org/113824
-
---- Makefile.in
-+++ Makefile.in
-@@ -80,7 +80,7 @@
- @BUILD_TDBTORTURE_TRUE@TDBTORTURE = tdbtorture
- @BUILD_TDBTORTURE_FALSE@TDBTORTURE = 
+diff -ur tdb-1.0.6.orig/Makefile.am tdb-1.0.6/Makefile.am
+--- tdb-1.0.6.orig/Makefile.am	2001-12-11 06:05:13.000000000 +0200
++++ tdb-1.0.6/Makefile.am	2009-07-06 21:10:56.000000000 +0300
+@@ -13,7 +13,8 @@
+ TDBTORTURE =
+ endif
  
--noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
-+noinst_PROGRAMS = tdbiterate $(TDBTORTURE)
- bin_PROGRAMS = tdbtool tdbdump
+-noinst_PROGRAMS=tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
++# tdbspeed $(TDBTEST)
++noinst_PROGRAMS=tdbiterate $(TDBTORTURE)
+ bin_PROGRAMS=tdbtool tdbdump
  
- lib_LTLIBRARIES = libtdb.la
+ lib_LTLIBRARIES=libtdb.la
diff --git a/dev-libs/tdb/tdb-1.0.6.ebuild b/dev-libs/tdb/tdb-1.0.6.ebuild
index 90302145d7fd..48599fe29862 100644
--- a/dev-libs/tdb/tdb-1.0.6.ebuild
+++ b/dev-libs/tdb/tdb-1.0.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tdb/tdb-1.0.6.ebuild,v 1.23 2006/12/13 23:37:44 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tdb/tdb-1.0.6.ebuild,v 1.24 2009/07/06 18:09:48 ssuominen Exp $
 
-inherit libtool eutils
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="A Trivial Database"
 HOMEPAGE="http://sourceforge.net/projects/tdb"
@@ -13,17 +14,16 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
-DEPEND="!net-fs/samba"
+RDEPEND="!net-fs/samba"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc3.patch
-	epatch "${FILESDIR}"/${P}-no-gdbm.patch	#113824
-	elibtoolize #117051
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc3.patch \
+		"${FILESDIR}"/${P}-no-gdbm.patch
+	eautoreconf #243950
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS NEWS README TODO
 }