Fixed for as-needed. Install plugins in libdir (bug #423363)

(Portage version: 2.1.11.1/cvs/Linux x86_64)

3 files changed, 54 insertions, 3 deletions

diff --git a/sci-visualization/ggobi/ChangeLog b/sci-visualization/ggobi/ChangeLog
index ea485f8c7486..f6ebff4cd727 100644
--- a/sci-visualization/ggobi/ChangeLog
+++ b/sci-visualization/ggobi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/ggobi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ChangeLog,v 1.10 2012/05/04 08:06:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ChangeLog,v 1.11 2012/06/26 05:19:19 bicatali Exp $
+
+*ggobi-2.1.9-r1 (26 Jun 2012)
+
+  26 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/ggobi-2.1.9-as-needed.patch, +ggobi-2.1.9-r1.ebuild,
+  -ggobi-2.1.9.ebuild:
+  Fixed for as-needed. Install plugins in libdir (bug #423363)
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> ggobi-2.1.8.ebuild,
   ggobi-2.1.9.ebuild:
@@ -45,4 +52,3 @@
   29 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
   +sci-visualization/ggobi/metadata.xml:
   Initial import
-
diff --git a/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch b/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch
new file mode 100644
index 000000000000..3bec9b55c21d
--- /dev/null
+++ b/sci-visualization/ggobi/files/ggobi-2.1.9-as-needed.patch
@@ -0,0 +1,40 @@
+--- configure.ac.orig	2012-06-26 05:46:07.000000000 +0100
++++ configure.ac	2012-06-26 05:46:44.000000000 +0100
+@@ -178,6 +178,8 @@
+  echo "Looking for gtk2"
+ 
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.6.0])
++AC_CHECK_LIB(m,sqrt)
++PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0])
+ 
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+
+--- src/Makefile.am.orig	2012-06-26 04:53:20.000000000 +0100
++++ src/Makefile.am	2012-06-26 04:54:04.000000000 +0100
+@@ -4,7 +4,6 @@
+ libggobi_la_GOBHEADERS = $(libggobi_la_GOBS:%.gob=ggobi-%.h)
+ libggobi_la_GOBOBJECTS = $(libggobi_la_GOBS:%.gob=ggobi-%.lo)
+ libggobi_la_GOBSTAMPS = $(libggobi_la_GOBS:%.gob=.%.gob.stamp)
+-libggobi_la_LDFLAGS  = @GTK_LIBS@ @LIBXML_LIBS@
+ libggobi_la_BUILT = array.c ash1d.c barchart.c barchartClass.c \
+   barchart_ui.c brush.c brush_api.c brush_bins.c brush_init.c brush_link.c \
+   brush_ui.c color.c color_ui.c cpanel.c display.c display_tree.c display_ui.c \
+@@ -27,7 +26,7 @@
+   write_csv.c write_xml.c wvis.c wvis_ui.c xlines.c xyplot.c \
+   xyplot_ui.c $(libggobi_la_GOBSOURCES)
+ libggobi_la_SOURCES = $(libggobi_la_BUILT) $(libggobi_la_GOBSTAMPS)
+-libggobi_la_LIBADD = $(libggobi_la_GOBOBJECTS)
++libggobi_la_LIBADD = $(libggobi_la_GOBOBJECTS) @GTK_LIBS@ @LIBXML_LIBS@ @GMODULE_LIBS@
+ libggobi_la_DEPENDENCIES = $(libggobi_la_GOBOBJECTS)
+ pkginclude_HEADERS = GGobiAPI.h ggobiClass.h tour1d_pp.h GGobiApp.h \
+   noop-toggle.h tour2d_pp.h GGobiEvents.h parcoordsClass.h tour_pp.h \
+@@ -59,7 +58,7 @@
+ # Windows specific
+ if OS_WIN32
+ libggobi_la_DEPENDENCIES+=libggobi.def
+-libggobi_la_LDFLAGS+=-Wc,-s -no-undefined -export-symbols libggobi.def
++libggobi_la_LDFLAGS=-Wc,-s -no-undefined -export-symbols libggobi.def
+ ggobi_LDFLAGS = -mwindows -s
+ endif
+ 
diff --git a/sci-visualization/ggobi/ggobi-2.1.9.ebuild b/sci-visualization/ggobi/ggobi-2.1.9-r1.ebuild
index 5868670da6a6..699efbe4d913 100644
--- a/sci-visualization/ggobi/ggobi-2.1.9.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ggobi-2.1.9.ebuild,v 1.3 2012/05/04 08:06:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/ggobi/ggobi-2.1.9-r1.ebuild,v 1.1 2012/06/26 05:19:19 bicatali Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -24,6 +24,11 @@ src_prepare() {
 	sed -i \
 		-e 's|ND_coord_i|ND_coord|' \
 		plugins/GraphLayout/graphviz.c || die
+	rm -f m4/libool.m4 m4/lt*m4
+	epatch \
+		"${FILESDIR}"/${PN}-2.1.8-plugindir.patch \
+		"${FILESDIR}"/${PN}-2.1.9-as-needed.patch
+	eautoreconf
 }
 
 src_configure() {