Removed bundled libltdl (fixes bug #221879).

Package-Manager: portage-2.1.5_rc7

4 files changed, 56 insertions, 11 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/Manifest b/dev-db/unixODBC/Manifest
index dd04cc74a2ca..a03e614719ad 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,4 +1,5 @@
 AUX 350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382 RMD160 080c2947d564ed320071ebd7750cda50886084d6 SHA1 11f482aeeea33fc196b45ba35120755ac88c2978 SHA256 460bbf2dd174d0286b89330d991c3f7030ca7256bce8b16ebf4593572cf7be85
+AUX 360-unixODBC-2.2.12-libltdlfixes.patch 1124 RMD160 ee215893cbdb2aa9672ec63501cd0bddaf08c397 SHA1 0d8fc8b5db51c7bf3ce72abfe7ba8119808702ad SHA256 974942040de5e471274b109ae478f05dea75ac0e5042aaf9eb1acd3f2461d4bf
 AUX unixODBC-2.2.11-Makefile.am.patch 1295 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 SHA1 2b0953ffb879b8dfc98beab0a01eceeaaa01112b SHA256 669c3f0897fad09cb7dd750319605a34221eaeac633501550ca791a83e7e64c5
 AUX unixODBC-2.2.11-configure.in.patch 239 RMD160 c3821bbe8c815997698d66bf6b1c7151cdb853c5 SHA1 ab6493ab5387d27a3c1130cf46b46f603829d965 SHA256 e41f79814d320104273aa9f9b4eaaece593ed07d14fd36c8a6cfe313c93b80fe
 AUX unixODBC-2.2.11-flex.patch 486 RMD160 5962bd7cceb3547446ec384bbb1474151f0eaaf7 SHA1 4b24b239d3c2240f9df11397150946a84be903ab SHA256 9bd580e29ec4211b8bceccd044cd1bb4c6f32af4ae60b847548d08bbdb011ec7
@@ -6,6 +7,6 @@ DIST unixODBC-2.2.11.tar.gz 2406740 RMD160 533a2733aa9f49bf9e3fd062b6d0ebfdff4df
 DIST unixODBC-2.2.12-r0-patches.tar.bz2 6968 RMD160 5d53a41f4645cd366e18405d23acbf3f87dc9eda SHA1 1aa13bf8a6d031583fae844a7d0d503405607f28 SHA256 da58a4c4a08ccef6416af4cac17bd0d6e89f1c513aecab21d9092bcbae0faefd
 DIST unixODBC-2.2.12.tar.gz 2798077 RMD160 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 SHA1 d1cb286fb538c664549153165e2b9183b58a627b SHA256 d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
 EBUILD unixODBC-2.2.11-r1.ebuild 1486 RMD160 e75c6c5fcdafd752a9cccab8d1cc10dd6dd0dfbd SHA1 0323fe19593b82238410aa70db74427ff95b8eae SHA256 3d4b4eb7117218dcaaf2fe888e22b4f4478befa9e0235c4df8d2f4d78ddb933a
-EBUILD unixODBC-2.2.12.ebuild 2197 RMD160 92dae7920249ce77b4838ccf435fea9831bbc0d5 SHA1 c8e9bb30e3c6045b1bf9c09fd69792d8a25831ae SHA256 48f7c6acfe4032338a59c429e447bf9704c98069c0cfe875b6c2db10629ca5d0
-MISC ChangeLog 10262 RMD160 78df0c7d51f35f6a4bfba9e9739c938d1a410594 SHA1 a1de912a1d7b5e18b599bc678a182eb8df6efb10 SHA256 be8ed6628ad534b30136648f9f060b93f87e69b7083ab880983a953400a70998
+EBUILD unixODBC-2.2.12.ebuild 2314 RMD160 5893e3e7315a6e9ed52284830179047248fff79b SHA1 2e89af4b5b9f862d30a520392836af9c6a02f3c8 SHA256 45050b4e5829245c9363a67a48445700345084bcbfaeafcfef73531d90cf7e08
+MISC ChangeLog 10439 RMD160 552f7a11e932db75407b21ee22950c61457b68c0 SHA1 e88810f7248278cda3db9d4f654b994126df2728 SHA256 f13b90af07394b61dcec62d5ab718630e573531aac2bb2ad3fc6f2f080e528b8
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
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"