Now use system libltdl instead of bundled one. Closing bug #273766

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

4 files changed, 56 insertions, 8 deletions

diff --git a/sci-visualization/ggobi/ChangeLog b/sci-visualization/ggobi/ChangeLog
index 906404bc5968..d79b22705260 100644
--- a/sci-visualization/ggobi/ChangeLog
+++ b/sci-visualization/ggobi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/ggobi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ChangeLog,v 1.2 2009/12/14 17:43:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ChangeLog,v 1.3 2009/12/14 22:07:17 bicatali Exp $
+
+  14 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> ggobi-2.1.8.ebuild,
+  +files/ggobi-2.1.8-plugindir.patch, +files/ggobi-2.1.8-syslibltdl.patch:
+  Now use system libltdl instead of bundled one. Closing bug #273766
 
   14 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> ggobi-2.1.8.ebuild:
   Changed plugin directory to libdir instead of datadir
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch b/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch
new file mode 100644
index 000000000000..0476f47a816d
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.8-plugindir.patch
@@ -0,0 +1,11 @@
+--- plugins/Makefile.plugin.orig	2009-12-14 22:15:01.000000000 +0000
++++ plugins/Makefile.plugin	2009-12-14 22:15:16.000000000 +0000
+@@ -2,7 +2,7 @@
+ 
+ # Every plugin provides a single library to GGobi, define it here.
+ # Its name should start with 'lib' and end with '.la'.
+-plugindir = $(datadir)/ggobi/plugins/$(PACKAGE_NAME)
++plugindir = $(libdir)/ggobi/plugins/$(PACKAGE_NAME)
+ plugin_LTLIBRARIES        = plugin.la
+ 
+ # Most plugins will only require GGobi and its dependencies (gtk, libxml2)
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.8-syslibltdl.patch b/sci-visualization/ggobi/files/ggobi-2.1.8-syslibltdl.patch
new file mode 100644
index 000000000000..c381a98445ce
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.8-syslibltdl.patch
@@ -0,0 +1,26 @@
+--- ./Makefile.am.orig	2009-12-14 20:56:57.000000000 +0000
++++ ./Makefile.am	2009-12-14 20:57:24.000000000 +0000
+@@ -1,4 +1,4 @@
+-SUBDIRS = libltdl src plugins po
++SUBDIRS = src plugins po
+ 
+ EXTRA_DIST = bootstrap CPLicense.txt
+ 
+--- ./configure.ac.orig	2009-12-14 20:56:49.000000000 +0000
++++ ./configure.ac	2009-12-14 21:00:11.000000000 +0000
+@@ -144,14 +144,12 @@
+ # and to support DLLs on Windows. Also build libltdl for loading plugins.
+ AC_DISABLE_STATIC
+ AC_LIBTOOL_WIN32_DLL
+-AC_LIBLTDL_CONVENIENCE
+-AC_LIBTOOL_DLOPEN
+ AC_PROG_LIBTOOL
+ 
+ # Configure libltdl build
++AC_WITH_LTDL
+ AC_SUBST(INCLTDL)
+ AC_SUBST(LIBLTDL)
+-AC_CONFIG_SUBDIRS(libltdl)
+ 
+ # Configure for building against local libintl
+ AC_SUBST(INCINTL)
diff --git a/sci-visualization/ggobi/ggobi-2.1.8.ebuild b/sci-visualization/ggobi/ggobi-2.1.8.ebuild
index 3827c9c4f434..9c8f8f3a16bb 100644
--- a/sci-visualization/ggobi/ggobi-2.1.8.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ggobi-2.1.8.ebuild,v 1.2 2009/12/14 17:43:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ggobi-2.1.8.ebuild,v 1.3 2009/12/14 22:07:17 bicatali Exp $
 
 EAPI=2
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Visualization program for exploring high-dimensional data"
 HOMEPAGE="http://www.ggobi.org"
@@ -12,7 +12,7 @@ SRC_URI="http://www.ggobi.org/downloads/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
+IUSE="minimal nls"
 
 RDEPEND=">=media-gfx/graphviz-2.6
 	>=x11-libs/gtk+-2.6
@@ -21,15 +21,22 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
+	# build with external system libltdl
+	rm -rf libltdl
+
 	has_version ">=media-gfx/graphviz-2.22" && \
 		epatch "${FILESDIR}"/${P}-graphviz.patch
-	# sedding directly in the Makefile.in instead of the Makefile.plugins
-	# to avoid rebuilding 10 autoreconf for such a simple fix
-	sed -i -e '/plugindir/s/datadir/libdir/g' plugins/*/Makefile.in || die
+	epatch "${FILESDIR}"/${P}-syslibltdl.patch
+	epatch "${FILESDIR}"/${P}-plugindir.patch
+	eautoreconf
 }
 
 src_configure() {
-	econf $(use_with !minimal all-plugins)
+	econf \
+		--disable-maintainer-mode \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_with !minimal all-plugins)
 }
 
 src_compile() {