Fixed for wxwidgets build (thanks dirtyepic for his patches, bug #242212, and removed dirty fortran eclass

Package-Manager: portage-2.2_rc54/cvs/Linux x86_64

4 files changed, 35 insertions, 191 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index f6846af4cdf6..a9041798082e 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2009/11/04 14:21:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.26 2009/12/03 21:50:53 bicatali Exp $
+
+  03 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> -plplot-5.9.2.ebuild,
+  plplot-5.9.5.ebuild, +files/plplot-5.9.5-wxwidgets-cmake.patch:
+  Fixed for wxwidgets build (thanks dirtyepic for his patches, bug #242212,
+  and removed dirty fortran eclass
 
 *plplot-5.9.5 (04 Nov 2009)
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 0fc872b4fda7..9a3649397d3a 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,7 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plplot-5.9.0-python.patch 283 RMD160 6252e5a37fd79aafc2e6333cc67fe7fddc76e54e SHA1 a7ebf85d462a3abd555d3acee6cfacecc266377e SHA256 25138e47df484955b67cc723ad2ccd3666ab3e9335f0838f82e569ff1e6d2f9a
-DIST plplot-5.9.2.tar.gz 6666641 RMD160 b134b99a40b320d2e03601191aefa8967701acf8 SHA1 271b7792e547f71ae7123b4bef10d92720fb7e5c SHA256 6aa22f1c7b210f819d54e761a6df573038d961c99183bcdc59c7a92d4cf72587
+DIST plplot-5.9.5-wxwidgets-cmake.patch.bz2 9827 RMD160 cfcedd58cfcdba8bbcdc9b650b57e15693e8ce89 SHA1 6d4d16140f6764507f9db5c9bd979d7cee280f94 SHA256 44c91584721864b6fb0f217b1ff6e511484b6e44b9ca11d08367a3427befbb0e
 DIST plplot-5.9.5.tar.gz 7071486 RMD160 75f21ad12fbe952c964e0a9b3d298a4f059157c2 SHA1 f24d096238398b5519427145f0134ce1c180f0e8 SHA256 094cdfa1fced0cf86a52fdc3dae062a120f025ac271ddc3676a3fba7134538c3
-EBUILD plplot-5.9.2.ebuild 5027 RMD160 53bb02f1d2069f5473bb339908749bdd8034f20b SHA1 8ec7fc7d81380cf334a4ef461d3e05b189ec78f1 SHA256 ef495930a873f8d61d00211d2d46cae48996da508723672e8f71dac761927d91
-EBUILD plplot-5.9.5.ebuild 5043 RMD160 9dba851d177ede8963f5db38ce9d48a5ef83e8ac SHA1 e4cb42c04f1afb6fbbafa3151bb941dc00378676 SHA256 b69beb0da7706db6ada297aa3026aaa273182c830493f279463f3d0d9cb50f83
-MISC ChangeLog 4350 RMD160 b3efb9c6eb736a4f3a0392d879d67737c06e5903 SHA1 3ed9f3c1765e1447e1b79c9b5587e26924abb4a2 SHA256 42d36a3cf38d464acb53791741639aae92872842e3184ecaae26ca84abe5cb3e
+EBUILD plplot-5.9.5.ebuild 5190 RMD160 e38cdaa8adc4bea2475c48dfc18ec0209f896ea3 SHA1 f3cea4ac614ab342fba458ec1a88b179d87b7d21 SHA256 886c5fafde6514f4b34d83f72b3b68d523791d2490c9a7de0527202f3d059109
+MISC ChangeLog 4605 RMD160 d8445e8af2beed0eb910c6b32662a3cdc236cc70 SHA1 17370545c669dac80f1ca9009cdd5cc616a17c4e SHA256 e63ede060b51023c313e38ab3d36b1451521e334d5d1728103491159f53d5cf2
 MISC metadata.xml 1219 RMD160 f221eb3d8c1967c473532291a0605628d95a9c68 SHA1 bd13e4b7ccfd9cdf2d5b129476f3f4d9f6875a15 SHA256 2d3438d25fa17ccdf08c18aa421a442f86a0dce5cef5753811e8aa7109adc74a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksYPCkACgkQ1ycZbhPLE2AxdgCgo6caW9RH7dTOpCn/WOLXdz8e
+hNgAoKwZ5Lu8MUF4vu0ro3fXEVLts79A
+=JAVB
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/plplot-5.9.2.ebuild b/sci-libs/plplot/plplot-5.9.2.ebuild
deleted file mode 100644
index c1e6b514702a..000000000000
--- a/sci-libs/plplot/plplot-5.9.2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.2 2009/03/14 13:57:15 bicatali Exp $
-
-EAPI="2"
-WX_GTK_VER="2.8"
-inherit eutils fortran cmake-utils wxwidgets java-pkg-opt-2
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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
-			 gnome-base/libgnomeprintui
-			 python? ( dev-python/gnome-python ) )
-	latex? ( virtual/latex-base virtual/ghostscript )
-	octave? ( >=sci-mathematics/octave-3 )
-	pdf? ( media-libs/libharu )
-	perl? ( dev-perl/PDL dev-perl/XML-DOM )
-	python? ( dev-python/numpy )
-	svga? ( media-libs/svgalib )
-	tcl? ( dev-lang/tcl dev-tcltk/itcl )
-	tk? ( dev-lang/tk dev-tcltk/itk )
-	truetype? ( media-fonts/freefont-ttf
-				media-libs/lasi
-				gd? ( media-libs/gd[truetype] ) )
-	wxwindows? ( x11-libs/wxGTK:2.8[X] x11-libs/agg )
-	X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.6
-	dev-util/pkgconfig
-	doc? ( app-text/opensp
-		   app-text/jadetex
-		   app-text/docbook2X
-		   app-text/docbook-dsssl-stylesheets
-		   dev-perl/XML-DOM
-		   virtual/latex-base
-		   virtual/ghostscript
-		   sys-apps/texinfo )
-	java? ( >=virtual/jdk-1.5 dev-lang/swig )
-	python? ( dev-lang/swig )
-	qhull? ( media-libs/qhull )"
-
-pkg_setup() {
-	if use fortran; then
-		FORTRAN="gfortran ifc g77"
-		fortran_pkg_setup
-	fi
-	export FC=${FORTRANC} F77=${FORTRANC}
-
-	wxwidgets_pkg_setup
-}
-
-src_prepare() {
-	# path for python independent of python version
-	epatch "${FILESDIR}"/${PN}-5.9.0-python.patch
-
-	# remove license
-	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
-
-	# change default install directories for doc and examples
-	sed -i \
-		-e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \
-		examples/CMakeLists.txt examples/*/CMakeLists.txt || die
-	sed -i \
-		-e 's:${VERSION}::g' \
-		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
-		cmake/modules/instdirs.cmake || die
-
-	# haru pdf devide does not build with HPDF_SHARED
-	sed -i \
-		-e 's:-DHPDF_SHARED::' \
-		cmake/modules/pdf.cmake || die
-
-	# default location for docbook crap
-	sed -i \
-		-e 's:xml/declaration:sgml:' \
-		cmake/modules/docbook.cmake || die
-}
-
-src_configure() {
-	# see http://www.miscdebris.net/plplot_wiki/index.php?title=CMake_options_for_PLplot
-
-	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)
-		$(cmake-utils_has qhull QHULL)
-		$(cmake-utils_has threads PTHREAD)
-		$(cmake-utils_has truetype FREETYPE)
-		$(cmake-utils_use_enable ada ada)
-		$(cmake-utils_use_enable fortran f77)
-		$(cmake-utils_use_enable java java)
-		$(cmake-utils_use_enable gnome gnome2)
-		$(cmake-utils_use_enable octave octave)
-		$(cmake-utils_use_enable perl pdl)
-		$(cmake-utils_use_enable python python)
-		$(cmake-utils_use_enable tcl tcl)
-		$(cmake-utils_use_enable tcl itcl)
-		$(cmake-utils_use_enable tk tk)
-		$(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)"
-
-	use fortran && [[ ${FORTRANC} != g77 ]] && \
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable fortran f95)"
-
-	use truetype && mycmakeargs="${mycmakeargs}
-		-DPL_FREETYPE_FONT_PATH:PATH=/usr/share/fonts/freefont-ttf"
-
-	if use python && use gnome; then
-		mycmakeargs="${mycmakeargs}	-DENABLE_pygcw=ON"
-	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
-}
-
-src_compile() {
-	# separate doc and normal because doc building crashes with parallel
-	cmake-utils_src_make
-	if use doc; then
-		mycmakeargs="${mycmakeargs}	-DBUILD_DOC=ON"
-		mycmakeargs="${mycmakeargs}	-DHAVE_DB_DTD=ON"
-		mycmakeargs="${mycmakeargs}	-DHAVE_DSSSL_DTD=ON"
-		mycmakeargs="${mycmakeargs}	-DHAVE_HTML_SS=ON"
-		mycmakeargs="${mycmakeargs}	-DHAVE_PRINT_SS=ON"
-		cmake-utils_src_configure
-		cmake-utils_src_make -j1
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use examples || rm -rf "${D}"usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/plplot/plplot-5.9.5.ebuild b/sci-libs/plplot/plplot-5.9.5.ebuild
index ccc19e6e25df..32c7b045b891 100644
--- a/sci-libs/plplot/plplot-5.9.5.ebuild
+++ b/sci-libs/plplot/plplot-5.9.5.ebuild
@@ -1,20 +1,21 @@
 # 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.5.ebuild,v 1.1 2009/11/04 14:21:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.5.ebuild,v 1.2 2009/12/03 21:50:53 bicatali Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
-inherit eutils fortran cmake-utils wxwidgets java-pkg-opt-2
+inherit eutils cmake-utils toolchain-funcs wxwidgets java-pkg-opt-2
 
 DESCRIPTION="Multi-language scientific plotting library"
 HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-wxwidgets-cmake.patch.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 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"
+	 pdf perl png python qhull svg svga tcl threads tk truetype wxwidgets X"
 
 RDEPEND="ada? ( virtual/gnat )
 	cairo? ( x11-libs/cairo[svg?,X?] )
@@ -34,7 +35,7 @@ RDEPEND="ada? ( virtual/gnat )
 	truetype? ( media-fonts/freefont-ttf
 				media-libs/lasi
 				gd? ( media-libs/gd[truetype] ) )
-	wxwindows? ( x11-libs/wxGTK:2.8[X] x11-libs/agg )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] )
 	X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
 
 DEPEND="${RDEPEND}
@@ -54,18 +55,19 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use fortran; then
-		FORTRAN="gfortran ifc g77"
-		fortran_pkg_setup
+		export FC=$(tc-getFC) F77=$(tc-getF77)
+	else
+		export FC="" F77=""
 	fi
-	export FC=${FORTRANC} F77=${FORTRANC}
-
-	wxwidgets_pkg_setup
 }
 
 src_prepare() {
 	# path for python independent of python version
 	epatch "${FILESDIR}"/${PN}-5.9.0-python.patch
 
+	# bug #242212
+	epatch "${WORKDIR}"/${P}-wxwidgets-cmake.patch
+
 	# remove license
 	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
 
@@ -112,13 +114,14 @@ src_configure() {
 		$(cmake-utils_use_enable tcl itcl)
 		$(cmake-utils_use_enable tk tk)
 		$(cmake-utils_use_enable tk itk)
-		$(cmake-utils_use_enable wxwindows wxwidgets)
+		$(cmake-utils_pld wxwidgets _wxwidgets)
+		$(cmake-utils_pld wxwidgets _wxpng)
 		$(cmake-utils_pld pdf pdf)
 		$(cmake-utils_pld truetype psttf)
 		$(cmake-utils_pld latex pstex)
 		$(cmake-utils_pld svga linuxvga)"
 
-	use fortran && [[ ${FORTRANC} != g77 ]] && \
+	use fortran && [[ $(tc-getFC) != g77 ]] && \
 		mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable fortran f95)"
 
 	use truetype && mycmakeargs="${mycmakeargs}
@@ -162,7 +165,7 @@ src_compile() {
 		mycmakeargs="${mycmakeargs}	-DHAVE_HTML_SS=ON"
 		mycmakeargs="${mycmakeargs}	-DHAVE_PRINT_SS=ON"
 		cmake-utils_src_configure
-		cmake-utils_src_make -j1
+		VARTEXFONTS="${T}/fonts" cmake-utils_src_make -j1
 	fi
 }