Version bump. Removed the wxwidgets hack since it broke parallel building

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

3 files changed, 170 insertions, 2 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 1c057379e7ba..b549339be1e8 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.19 2009/01/02 20:04:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.20 2009/01/29 18:25:50 bicatali Exp $
+
+*plplot-5.9.2 (29 Jan 2009)
+
+  29 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> +plplot-5.9.2.ebuild:
+  Version bump. Removed the wxwidgets hack since it broke parallel building
 
   02 Jan 2009; Marcus D. Hanwell <cryos@gentoo.org> metadata.xml:
   Removed myself as maintainer.
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 0d97607a75e8..f34293364a05 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plplot-5.5.1-gcc-3.4-fix.patch 1396 RMD160 8854c2f315a5443cc5c29082a949e2ee359e6746 SHA1 ee321d24c5534bb4a86f9dda17579ae21965ef43 SHA256 1142ad469f6cc6dbf6331de9ceac0967e0128bef26e1ece2bb6b4f200f7e638f
 AUX plplot-5.5.2-macro-fix.patch 534 RMD160 71ffcec74770cab421a4756355f22818032e6e5c SHA1 0c1be25c54c94667371bbe386278960ed6cb4bdb SHA256 4a0d75b9e6d7ffeddfb38dcd58d9e440cde02ec93ce5ee22e48a3379c236874b
 AUX plplot-5.9.0-cmake.patch 14449 RMD160 d3f767d1229bafd6efd2da136260f77b02192cef SHA1 14a8b5d100694f1fc851ef38022d5064bce30b59 SHA256 eab7939ad0f630ff0b704996caa788708099be903ba8304723c981968f6ab685
@@ -5,7 +8,16 @@ AUX plplot-5.9.0-pdftex.patch 3603 RMD160 8ed16124102a4c0ae404de0b0e6475d7f85bc7
 AUX plplot-5.9.0-python.patch 283 RMD160 6252e5a37fd79aafc2e6333cc67fe7fddc76e54e SHA1 a7ebf85d462a3abd555d3acee6cfacecc266377e SHA256 25138e47df484955b67cc723ad2ccd3666ab3e9335f0838f82e569ff1e6d2f9a
 DIST plplot-5.5.2.tar.gz 5891255 RMD160 55ea8e7dde5c0542ce8f360228a676049ad7d701 SHA1 72e0830b12d7d50ff9ac5b54e49aa1813a580786 SHA256 267d9c4070b8b6de75590efc24388da670dd5d0039a5dc21ecb803366d14730c
 DIST plplot-5.9.0.tar.gz 5698323 RMD160 46fac543b471ccadd22d6cda6da63108023bb08b SHA1 6473e2ed44c91b10e50a3529e02f4b54541899ca SHA256 742719c2af4a642b9d087d7821a75c6fb4617479cb82cfeeab67a730c23d1231
+DIST plplot-5.9.2.tar.gz 6666641 RMD160 b134b99a40b320d2e03601191aefa8967701acf8 SHA1 271b7792e547f71ae7123b4bef10d92720fb7e5c SHA256 6aa22f1c7b210f819d54e761a6df573038d961c99183bcdc59c7a92d4cf72587
 EBUILD plplot-5.5.2.ebuild 5150 RMD160 f4566a19c4a0dc8c76fd760396046dec47fde91d SHA1 f874b95ad608a7830f72bb4d5fd775e2dc2cb38a SHA256 56eaae02509aaec912d3baaeb719461dfc9395419d626d0158327dcea06481e6
 EBUILD plplot-5.9.0.ebuild 4964 RMD160 b15086e96be6119a5080c6b40dec2901ca66837f SHA1 df5936d227ed178ce87b6ecb20caa073988a49da SHA256 93e4c6936b01a2829a8c344105f4542ab6ebec88471098c3234799f48d919612
-MISC ChangeLog 3388 RMD160 aad5d8021ddec5e4f9316fe79e24dd04b1746909 SHA1 791d6b853bc2e6de918079ef21b7315f1eed23df SHA256 ffcccbfdfae7ff7ef47568b0ef95ab0d9764b00bf75744545c044b54f9e8d50a
+EBUILD plplot-5.9.2.ebuild 4478 RMD160 84b729f4babcccc6b24d4f9ecaaf359c65fb236e SHA1 a2c9de6fea18514e8ea263939ea50d58bf8165d0 SHA256 154300c2641d209c7511e2f3b0af768691970e19cea2b1d5f77a6d2308f399e9
+MISC ChangeLog 3574 RMD160 b08570f9be3f2832a67bfffe07fab03b6924a353 SHA1 d5e2ccc5d01077de7776b071b820eff09f38fd23 SHA256 c657b04fecb6287613d75318e80b62acc4abf083bb583f9d9f2cf82c1c59bc32
 MISC metadata.xml 1429 RMD160 7df6d6b4334c97bffcc04e6162609d614484ca2a SHA1 2bcc9006b03b5ef5b6331766ebcad535b74a6394 SHA256 eb6173703686df98812dcba922d9d4ccc61023cce655fd996d71c06573f614b7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmB9MMACgkQ1ycZbhPLE2DpGgCbBl1tsPGf3uyQ3b2LuU068R4b
+9M8AoKUISRH5EVcmR3s1M7Z0Y30Bp5zE
+=oL76
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/plplot-5.9.2.ebuild b/sci-libs/plplot/plplot-5.9.2.ebuild
new file mode 100644
index 000000000000..e8df3ff21dc4
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.9.2.ebuild
@@ -0,0 +1,151 @@
+# 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 $
+
+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 doc examples fortran gd gnome java jpeg latex	octave pdf perl
+	png python qhull svga tcl threads tk truetype wxwindows X"
+
+RDEPEND="ada? ( virtual/gnat )
+	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-libs/freetype
+				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="
+		-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 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
+	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
+}