sci-visualization/gnuplot: Add workaround for prefix where we have no control over ld.so.conf

(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)

3 files changed, 28 insertions, 18 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index bbcf831bcb77..874755eb3b15 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.189 2012/05/21 19:26:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.190 2012/06/03 14:03:32 jlec Exp $
+
+  03 Jun 2012; Justin Lecher <jlec@gentoo.org> gnuplot-4.6.0.ebuild,
+  metadata.xml:
+  Add workaround for prefix where we have no control over ld.so.conf
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org> gnuplot-4.4.4-r1.ebuild:
   Add missing inheritance of eutils.eclass
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild
index 253c05acb644..80c6a6634788 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild,v 1.3 2012/05/03 11:49:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild,v 1.4 2012/06/03 14:03:32 jlec Exp $
 
 EAPI=4
 
-inherit elisp-common multilib wxwidgets
+inherit elisp-common flag-o-matic multilib wxwidgets
 
 DESCRIPTION="Command-line driven interactive plotting program"
 HOMEPAGE="http://www.gnuplot.info/"
@@ -88,6 +88,12 @@ src_prepare() {
 	# Add special version identification as required by provision 2
 	# of the gnuplot license
 	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
+
+	# hacky workaround
+	# Please hack the buildsystem if you like
+	if use prefix && use qt4; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+	fi
 }
 
 src_configure() {
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 603442515bc9..72afd323a038 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>ulm@gentoo.org</email>
-  <name>Ulrich Müller</name>
-</maintainer>
-<maintainer>
-  <email>ottxor@gentoo.org</email>
-  <name>Christoph Junghans</name>
-</maintainer>
-<longdescription>
+	<herd>sci</herd>
+	<maintainer>
+		<email>ulm@gentoo.org</email>
+		<name>Ulrich Müller</name>
+	</maintainer>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<longdescription>
   Gnuplot is a command-driven interactive function plotting program.
   It can be used to plot functions and data points in both two- and
   three-dimensional plots in many different formats. It is designed
   primarily for the visual display of scientific data.
 </longdescription>
-<use>
-  <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
+	<use>
+		<flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
     Needed for GIF, JPEG, and PNG image output.</flag>
-  <flag name="thin-splines">Enable thin plate splines</flag>
-  <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
-</use>
+		<flag name="thin-splines">Enable thin plate splines</flag>
+		<flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
+	</use>
 </pkgmetadata>