[gentoo-commits] gentoo-x86 commit in sci-libs/plplot: ChangeLog plplot-5.9.2.ebuild plplot-5.9.0.ebuild

[gentoo-commits] gentoo-x86 commit in sci-libs/plplot: ChangeLog plplot-5.9.2.ebuild plplot-5.9.0.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    09/03/14 13:57:15

  Modified:             ChangeLog plplot-5.9.2.ebuild
  Removed:              plplot-5.9.0.ebuild
  Log:
  Fixed support for cairo (bug #262001) and some automagic dependencies
  (Portage version: 2.2_rc25/cvs/Linux x86_64)

Revision  Changes    Path
1.21                 sci-libs/plplot/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/plplot/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/plplot/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/plplot/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	29 Jan 2009 18:25:50 -0000	1.20
+++ ChangeLog	14 Mar 2009 13:57:15 -0000	1.21
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.20 2009/01/29 18:25:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.21 2009/03/14 13:57:15 bicatali Exp $
+
+  14 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> -plplot-5.9.0.ebuild,
+  plplot-5.9.2.ebuild:
+  Fixed support for cairo (bug #262001) and some automagic dependencies
 
 *plplot-5.9.2 (29 Jan 2009)
 



1.2                  sci-libs/plplot/plplot-5.9.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/plplot/plplot-5.9.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/plplot/plplot-5.9.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/plplot/plplot-5.9.2.ebuild?r1=1.1&r2=1.2

Index: plplot-5.9.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.9.2.ebuild	29 Jan 2009 18:25:50 -0000	1.1
+++ plplot-5.9.2.ebuild	14 Mar 2009 13:57:15 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.2.ebuild,v 1.1 2009/01/29 18:25:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.2.ebuild,v 1.2 2009/03/14 13:57:15 bicatali Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -13,10 +13,11 @@
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ada doc examples fortran gd gnome java jpeg latex	octave pdf perl
-	png python qhull svga tcl threads tk truetype wxwindows X"
+IUSE="ada cairo doc examples fortran gd gnome java jpeg latex octave
+	 pdf perl png python qhull svg svga tcl threads tk truetype wxwindows X"
 
 RDEPEND="ada? ( virtual/gnat )
+	cairo? ( x11-libs/cairo[svg?,X?] )
 	java? ( >=virtual/jre-1.5 )
 	gd? ( media-libs/gd[jpeg?,png?] )
 	gnome? ( gnome-base/libgnomeui
@@ -30,8 +31,7 @@
 	svga? ( media-libs/svgalib )
 	tcl? ( dev-lang/tcl dev-tcltk/itcl )
 	tk? ( dev-lang/tk dev-tcltk/itk )
-	truetype? ( media-libs/freetype
-				media-fonts/freefont-ttf
+	truetype? ( media-fonts/freefont-ttf
 				media-libs/lasi
 				gd? ( media-libs/gd[truetype] ) )
 	wxwindows? ( x11-libs/wxGTK:2.8[X] x11-libs/agg )
@@ -95,6 +95,7 @@
 	cmake-utils_pld() { _use_me_now PLD "$@" ; }
 
 	mycmakeargs="
+		-DUSE_RPATH=OFF
 		-DDEFAULT_ALL_DEVICES=ON
 		-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
 		$(cmake-utils_has python numpy)
@@ -114,6 +115,7 @@
 		$(cmake-utils_use_enable tk itk)
 		$(cmake-utils_use_enable wxwindows wxwidgets)
 		$(cmake-utils_pld pdf pdf)
+		$(cmake-utils_pld truetype psttf)
 		$(cmake-utils_pld latex pstex)
 		$(cmake-utils_pld svga linuxvga)"
 
@@ -128,6 +130,26 @@
 	else
 		mycmakeargs="${mycmakeargs}	-DENABLE_pygcw=OFF"
 	fi
+	if use cairo; then
+		# memcairo buggy, see cmake/modules/drivers-init.cmake
+		mycmakeargs="${mycmakeargs}
+			-DPLD_memcairo=OFF
+			-DPLD_extcairo=OFF
+			-DPLD_pdfcairo=ON
+			-DPLD_pngcairo=ON
+			-DPLD_pscairo=ON
+			$(cmake-utils_pld svg svgcairo)
+			$(cmake-utils_pld X xcairo)"
+	else
+		mycmakeargs="${mycmakeargs}
+			-DPLD_memcairo=OFF
+			-DPLD_extcairo=OFF
+			-DPLD_pdfcairo=OFF
+			-DPLD_pngcairo=OFF
+			-DPLD_pscairo=OFF
+			-DPLD_svgcairo=OFF
+			-DPLD_xcairo=OFF"
+	fi
 	cmake-utils_src_configure
 }