[gentoo-commits] gentoo-x86 commit in sci-visualization/gnuplot: metadata.xml ChangeLog gnuplot-4.6.0.ebuild

[Justin Lecher (jlec)]

jlec        12/06/03 14:03:32

  Modified:             metadata.xml ChangeLog gnuplot-4.6.0.ebuild
  Log:
  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)

Revision  Changes    Path
1.14                 sci-visualization/gnuplot/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/metadata.xml?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/metadata.xml?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/metadata.xml?r1=1.13&r2=1.14

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/metadata.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- metadata.xml	30 Jan 2012 04:34:33 -0000	1.13
+++ metadata.xml	3 Jun 2012 14:03:32 -0000	1.14
@@ -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@g.o</email>
-  <name>Ulrich Müller</name>
-</maintainer>
-<maintainer>
-  <email>ottxor@g.o</email>
-  <name>Christoph Junghans</name>
-</maintainer>
-<longdescription>
+	<herd>sci</herd>
+	<maintainer>
+		<email>ulm@g.o</email>
+		<name>Ulrich Müller</name>
+	</maintainer>
+	<maintainer>
+		<email>ottxor@g.o</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>



1.190                sci-visualization/gnuplot/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.190&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.190&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/ChangeLog?r1=1.189&r2=1.190

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- ChangeLog	21 May 2012 19:26:29 -0000	1.189
+++ ChangeLog	3 Jun 2012 14:03:32 -0000	1.190
@@ -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@g.o> 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@g.o> gnuplot-4.4.4-r1.ebuild:
   Add missing inheritance of eutils.eclass



1.4                  sci-visualization/gnuplot/gnuplot-4.6.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild?r1=1.3&r2=1.4

Index: gnuplot-4.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnuplot-4.6.0.ebuild	3 May 2012 11:49:42 -0000	1.3
+++ gnuplot-4.6.0.ebuild	3 Jun 2012 14:03:32 -0000	1.4
@@ -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 @@
 	# 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() {