Removed bundled libltdl (fixes bug #221879).

(Portage version: 2.1.5_rc7)

3 files changed, 53 insertions, 9 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 13cee8d5bf94..93316ca586fe 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.73 2008/03/13 21:42:01 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.74 2008/05/29 14:50:15 dev-zero Exp $
+
+  29 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/360-unixODBC-2.2.12-libltdlfixes.patch, unixODBC-2.2.12.ebuild:
+  Removed bundled libltdl (fixes bug #221879).
 
   13 Mar 2008; <ricmm@gentoo.org> unixODBC-2.2.11-r1.ebuild,
   unixODBC-2.2.12.ebuild:
diff --git a/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch b/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch
new file mode 100644
index 000000000000..c26f1a8a3e26
--- /dev/null
+++ b/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch
@@ -0,0 +1,35 @@
+diff -Naur unixODBC-2.2.12.orig/configure.in unixODBC-2.2.12/configure.in
+--- unixODBC-2.2.12.orig/configure.in	2008-05-29 15:54:09.000000000 +0200
++++ unixODBC-2.2.12/configure.in	2008-05-29 15:58:32.000000000 +0200
+@@ -163,9 +163,6 @@
+ dnl Configure libtool
+ AM_PROG_LIBTOOL
+ 
+-dnl Configure libltdl
+-AC_CONFIG_SUBDIRS(libltdl)
+-
+ use_builtin_libtool="no"
+ 
+ dnl override the libtool lines if we use the system libs
+diff -Naur unixODBC-2.2.12.orig/exe/Makefile.am unixODBC-2.2.12/exe/Makefile.am
+--- unixODBC-2.2.12.orig/exe/Makefile.am	2008-05-29 15:54:09.000000000 +0200
++++ unixODBC-2.2.12/exe/Makefile.am	2008-05-29 15:57:14.000000000 +0200
+@@ -103,6 +103,6 @@
+ 
+ if WITHLT
+ dltest_DEPENDENCIES = $(LIBLTDL)
+-dltest_LDADD = $(LIBLTDL) $(LIBADD_DL)
+ else
+ endif
++dltest_LDADD = $(LIBLTDL) $(LIBADD_DL)
+diff -Naur unixODBC-2.2.12.orig/Makefile.am unixODBC-2.2.12/Makefile.am
+--- unixODBC-2.2.12.orig/Makefile.am	2008-05-29 15:54:09.000000000 +0200
++++ unixODBC-2.2.12/Makefile.am	2008-05-29 15:57:56.000000000 +0200
+@@ -3,7 +3,6 @@
+     log \
+ 	lst \
+ 	ini \
+-    	libltdl \
+ 	odbcinst \
+ 	DriverManager \
+ 	odbcinstQ \
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
index ee6ec78e7273..6d5ac98094a4 100644
--- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.13 2008/03/13 21:42:01 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.14 2008/05/29 14:50:15 dev-zero Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 PATCH_VERSION="2.2.12-r0"
 PATCH_P="${PN}-${PATCH_VERSION}-patches"
 
-inherit eutils multilib autotools gnuconfig
+inherit eutils multilib autotools gnuconfig libtool
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
@@ -22,8 +22,8 @@ IUSE="qt3 gnome"
 RDEPEND=">=sys-libs/readline-4.1
 		>=sys-libs/ncurses-5.2
 		qt3? ( =x11-libs/qt-3* )
-		gnome? ( gnome-base/libgnomeui )"
-
+		gnome? ( gnome-base/libgnomeui )
+		sys-devel/libtool"
 DEPEND="${RDEPEND}
 	gnome? ( dev-util/cvs )" # see Bug 173256
 
@@ -32,7 +32,14 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${WORKDIR}"/${PATCH_P}/*
-	epatch "${FILESDIR}"/350-${P}-gODBCConfig-as-needed.patch
+	epatch \
+		"${FILESDIR}/350-${P}-gODBCConfig-as-needed.patch" \
+		"${FILESDIR}/360-${P}-libltdlfixes.patch"
+
+	# Remove bundled libltdl copy
+	rm -rf libltdl
+
+	eautoreconf
 }
 
 src_compile() {
@@ -44,15 +51,13 @@ src_compile() {
 		myconf="--enable-gui=no"
 	fi
 
-	# Detect mips systems properly
-	eautoreconf
-
 	econf --host=${CHOST} \
 		--prefix=/usr \
 		--sysconfdir=/etc/${PN} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-static \
 		--enable-fdb \
+		--enable-ltdllib \
 		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"