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

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

4 files changed, 36 insertions, 35 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/Manifest b/sci-visualization/gnuplot/Manifest
index 94c7d8c58270..a3bea262915f 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gnuplot-4.4.4-tikz.patch 578 RMD160 563699f2e7df71b28a6d5bfab9ad37e46d5c48fb SHA1 4297d02936427b5efe78767fe00df789e6895f83 SHA256 aaf803a66e57c7e069dc5aba8ec91dc3038c224c10d8624368c1b505ef34e4f6
 DIST gnuplot-4.4.3-texinfo-update.patch.gz 7519 RMD160 73188caf8edbc84d11b43ea16a93fb5c9bece959 SHA1 dbd8d69214ae99411a2ffcc63f309cd342622865 SHA256 6153e081a0165682b052188a0166408e353a03be5fa1465d889c75f56d32700a
@@ -8,23 +8,14 @@ DIST gnuplot-4.4.4.tar.gz 3328278 RMD160 7e1d039c05c46fa38b53a3c4afbd328509da901
 DIST gnuplot-4.6.0.tar.gz 5017694 RMD160 2c06500f45fb81850b45713a2cd0e38f0021b065 SHA1 9a43ae13546d97d4b174533ddac31a14e0edc9b2 SHA256 6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be
 EBUILD gnuplot-4.4.3-r1.ebuild 6829 RMD160 f480bd3adedafbb3542f9e93894cad9cba297be7 SHA1 2dafd489fd6a9955e8701795471cfc44e45b0e83 SHA256 5efe3c596f36612a5f32e1e1bd5afede66e9a8671d06ee6fd15399701060813f
 EBUILD gnuplot-4.4.4-r1.ebuild 6635 RMD160 5a2f6666a2ac0e0a3544c27b0f3ea17059b2a7a6 SHA1 f8bc0bf9508ddfd16b0372f851ecbd3c23a5e755 SHA256 919cc230c0f26a0e12442d0185cbcf794cd0699307153f84d8f89186129b0217
-EBUILD gnuplot-4.6.0.ebuild 7274 RMD160 1d64f1187eda55c6fb08e85a0f5c2e18a150561a SHA1 5cb829b69d92b5b14f9b08b5e0706c815fbb7ac0 SHA256 bca304dd3907550061e01958a3a71227efb2e2282fcd4e2106cebd96a365a75c
-MISC ChangeLog 33950 RMD160 41c6f16214d45f005136141bd61b424065ecd887 SHA1 05d47d6373f6bb9f38fa9ca4e6885f688535879b SHA256 1c5d70d30f34cf9104359399936f524b3ea0055b139e5c31ac7940a6177ea5c0
-MISC metadata.xml 900 RMD160 59b4fe1d76ba85af0bae40abc30234bfb5da38c4 SHA1 2d8c395924fccaf27f153dcd307eb33183b946ff SHA256 9eb5b90c72cc99f8e7734febd3784ff96652917e643c8f2526fe2d96ed6cf64e
+EBUILD gnuplot-4.6.0.ebuild 7451 RMD160 d33fac83bf29ac7b6dbae79c4187e4ceed4c7cd1 SHA1 5edb7beb365fd0ea834dbf207808d7ec03c0b019 SHA256 5aa83999e054addb6916222e1740150b2d943ae86000bc97519b5efd75d46ee4
+MISC ChangeLog 34099 RMD160 330a986340dccb905d9c600e815d979d19b680a1 SHA1 b74af779035375f2b2f21c185a38e8eee9268366 SHA256 237598eb042a36f3041c4a58b552563d9d509d89c594928e9880d197ce7640a9
+MISC metadata.xml 908 RMD160 23e0628ea794c96201c8f8501ae8359fc8700300 SHA1 86ad01c899f615b61a515ba5fd3df1432fa29fdd SHA256 534fde1e36790209e6e2fa9f958d587cc9ca82e8f8a69213d4ee79f538543ae7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBCAAGBQJPupbrAAoJEF0huFKJUZL55Z8P/REe4FsbM5/vuFJqH3CR0Y9W
-7g5Dnp6r/rEstMcVLX/xQGViIh76oJkZRMbc23d6W8edZ5Ryo7VQ9vWXLOoqUrSs
-wP26zkpeGGKfnl8T0MyVeymf0JlGhXs4Z0dtl5QKk9SsAv6oVbBxzjkFOu6bcJ0X
-x4UarsvBVa2DTn/x+mpU/uPCc5Kdio53vZU9IoCGAne+HzcxgAXHtgqDjXUeTiDu
-795CcEdwKApf6CXDQKRkjfy5psfMS+8H7eMBW5fa5xJc/mkAIB3PAMKoZmtNJBU0
-cyI7onOdGCa6LizvsikcBYDZ1bMYbtqxjhFqRCa1n252u2JL6WkGysNvwtsRkoKw
-JyXb0nRAuwPJWzlQU5mhyUnqIiyZf/4soSKdeCTH8c0uqETLMrt6LPBBruQ3PPoN
-PyAv9aSz3g+UUtVVZwID9JHX4NqssTFw0X4GTkHOZibm1Jxu4anx3IWnMVs/9Tui
-mXFvr780bPOxPC9L1LME2qGyWPLlkeF4VSvYN5+pGH8nxk/F5/nb0TNAWvLmTI9U
-WfLAmYroPkpJHojlRZeYTaCuWp1ltdsrZCbrXwRAOG1mXeoEmH85RvgbFt6S0UZw
-MKzY8scSWGknf5oxdBmf54tpaE+vMs7wqDynZbHhKtkh+VLkJQpdV2gt8WOHc8Kz
-QKtKV9MSA5glRj5A0JiQ
-=eLnw
+iEYEAREKAAYFAk/LbroACgkQgAnW8HDreRbtlwCgo7BTdejn3YtHpDlt1Ohg0a1U
+OJUAoITcD7gX2CWm4sp3OQWfBQFoIhs4
+=fS0m
 -----END PGP SIGNATURE-----
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>