243950

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 30 insertions, 26 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/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
 }