summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2011-02-22 12:05:48 +0000
committerUlrich Müller <ulm@gentoo.org>2011-02-22 12:05:48 +0000
commitcc3dbadbbec9abb8652f99452c861eaa4b645190 (patch)
tree44602371bb7aaefe6236ec6b270926e42e0bf583 /sci-visualization
parentQA: make sure autotools are rebuilt properly (closes bug #339755; also fix bu... (diff)
downloadgentoo-2-cc3dbadbbec9abb8652f99452c861eaa4b645190.tar.gz
gentoo-2-cc3dbadbbec9abb8652f99452c861eaa4b645190.tar.bz2
gentoo-2-cc3dbadbbec9abb8652f99452c861eaa4b645190.zip
Fix automagic dependency on pdflib, bug 356005.
(Portage version: 2.1.9.40/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/gnuplot/ChangeLog4
-rw-r--r--sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild7
-rw-r--r--sci-visualization/gnuplot/gnuplot-4.4.2.ebuild4
3 files changed, 8 insertions, 7 deletions
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 56b245c81cef..3f8f3c09ca8e 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,11 +1,11 @@
# ChangeLog for sci-visualization/gnuplot
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.147 2011/02/22 07:36:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.148 2011/02/22 12:05:48 ulm Exp $
22 Feb 2011; Ulrich Mueller <ulm@gentoo.org> gnuplot-4.2.6-r1.ebuild,
gnuplot-4.4.2.ebuild:
Don't link against media-libs/pdflib, because it would violate clause 2.1 of
- the PDFLite license.
+ the PDFLite license. Configure --without-pdf, bug 356005.
21 Feb 2011; Ulrich Mueller <ulm@gentoo.org> -gnuplot-4.2.6.ebuild,
gnuplot-4.2.6-r1.ebuild, -gnuplot-4.4.0.ebuild, gnuplot-4.4.2.ebuild:
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
index 98b0cf07d9ca..21872d2237ee 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild,v 1.5 2011/02/22 07:36:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild,v 1.6 2011/02/22 12:05:48 ulm Exp $
EAPI=2
@@ -72,13 +72,14 @@ src_configure() {
fi
local myconf
- myconf="--with-gihdir=/usr/share/${PN}/gih --without-lisp-files"
+ myconf="${myconf} --without-lisp-files"
+ myconf="${myconf} --without-pdf"
+ myconf="${myconf} --with-gihdir=/usr/share/${PN}/gih"
myconf="${myconf} $(use_with X x)"
myconf="${myconf} $(use_with svga linux-vga)"
myconf="${myconf} $(use_with gd)"
myconf="${myconf} $(use_enable wxwidgets)"
myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
- #myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
myconf="${myconf} $(use_with lua)"
myconf="${myconf} $(use_with doc tutorial)"
myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild
index 38de07afe12b..cc704ca6048f 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild,v 1.10 2011/02/22 07:36:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild,v 1.11 2011/02/22 12:05:48 ulm Exp $
EAPI=3
@@ -68,6 +68,7 @@ src_configure() {
local myconf
myconf="${myconf} --without-lisp-files"
+ myconf="${myconf} --without-pdf"
myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
myconf="${myconf} $(use_with cairo)"
myconf="${myconf} $(use_with doc tutorial)"
@@ -75,7 +76,6 @@ src_configure() {
myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))"
myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))"
myconf="${myconf} $(use_with lua)"
- #myconf="${myconf} $(use_with pdf pdf "${EPREFIX}"/usr/$(get_libdir))"
myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))"
myconf="${myconf} $(use_with svga linux-vga)"
myconf="${myconf} $(use_enable thin-splines)"