Adjust java installation directories. Remove D support, since we have no in the tree. Add dependency on cairo-ocaml for OCaml bindings if cairo is on. Fixed cmake error, bug #419743, thanks Juergen Rose for the patch.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 106 insertions, 52 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index c81761705bf1..e4def16488d1 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.38 2012/05/04 08:22:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.39 2012/06/18 20:05:31 bicatali Exp $
+
+*plplot-5.9.9-r1 (18 Jun 2012)
+
+  18 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/plplot-5.9.9-CMakeLists.txt.patch, +plplot-5.9.9-r1.ebuild,
+  -plplot-5.9.7-r1.ebuild:
+  Adjust java installation directories. Remove D support, since we have no in
+  the tree. Add dependency on cairo-ocaml for OCaml bindings if cairo is on.
+  Fixed cmake error, bug #419743, thanks Juergen Rose for the patch.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> plplot-5.9.7-r1.ebuild,
   plplot-5.9.9.ebuild:
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 8d7e368e4187..479537fb63af 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plplot-5.9.6-python.patch 379 RMD160 0a86baca63a0078974928be8802bcf8eb5bdbf20 SHA1 480e20d98e14dd468737e52be0c53f1d25f0fc5d SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8
+AUX plplot-5.9.9-CMakeLists.txt.patch 524 RMD160 b4ed6f46be61ef2c30d70c95b8c1b47618853fa0 SHA1 652a138e0021d94d586df3a3c6a7b4e899200fb7 SHA256 f2a28ccca6934f85e496bf5c54d192bf436f544b379640498e2077fd882ce647
 AUX plplot-5.9.9-no-pdftest.patch 458 RMD160 ecd3e0d26194b8457780b42f8e971a5e18f9f986 SHA1 1c5fe594828a66ad2532848610cdda859d100ea7 SHA256 ee9d6b0cfdf4e954e24c5c026723334105ee208d9bb92e623bc42fdbd272caad
-DIST plplot-5.9.7.tar.gz 7230997 RMD160 4dacdbe908830f79d7200933a6b16f1fefa53d26 SHA1 4bfdc2e8ead40ba280ea02ddb56dc90201f5fd47 SHA256 fbf9f48c4c4d96cb9eeb9d821c09b0ce4a36ae5dda9e378f5367f6b9671725e0
 DIST plplot-5.9.9.tar.gz 13778554 RMD160 403d56896714336e6f8d65ef51563e7c28c7e588 SHA1 3df8fc21723e14af62fea4098e4ef019e1b52a54 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d
-EBUILD plplot-5.9.7-r1.ebuild 4927 RMD160 f952ae3cb0179420964aabfd960f57a12d79c671 SHA1 f1b28fe8d0801965ef8f449fa22c84f593619dba SHA256 90bbda5256d6683e5497d28ec51b2ace2d294f9c6cd734499462eb65c98d2fbc
+EBUILD plplot-5.9.9-r1.ebuild 5661 RMD160 45e28fd4e5f6f1e77ce5acf2fe2d8e49094dc5ec SHA1 a2ca2f565213196ed72dc77b8c6f0570b22cbda5 SHA256 b3f9a53c3096fa2127f21b92646fce48f385d65625090e76feb8ee903a172c5d
 EBUILD plplot-5.9.9.ebuild 5382 RMD160 d9aea9633619aae884cb376d2450e56a79d57b80 SHA1 1c530da57ae14d393def6f0b6f850b75e7910a88 SHA256 af69e4e652212d2d34693530c5925148ff4f756f254706d93246e4eb215581fd
-MISC ChangeLog 6895 RMD160 efc66c36e007a6743d2d77fb839f9d74273a59b2 SHA1 65268a2195f5f4700eb200550c9dad9f0226a186 SHA256 e15f6e3d86e3eca84a325f3160c2b2900842413a1fe62b014b04cca2a8b3734a
+MISC ChangeLog 7305 RMD160 a8889d5398b76981099e9297c058b19cb03d8120 SHA1 8db9ade9c7788625f7ab473b48b37d167141246c SHA256 d1a79b2efd3d18e5adb0b75324882f01dd6bf307357f3b2fabb9dba87487b132
 MISC metadata.xml 1344 RMD160 4246d3a8be85dfce2158f5d9c3908980b1f10797 SHA1 213f525c1241740b248662e8c1d18a98f2d51d7a SHA256 f5c283da27a5fa22f966f403651da8d5732a5febf3d475b2dde33d6b309bbcbe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk/fijkACgkQ1ycZbhPLE2Cz3gCgkFnBHSXo1qz2JwCtIr1GQOkA
+BVwAmQE8R8ZGyuPHc9lv6T51DHd13mWi
+=DSao
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch b/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch
new file mode 100644
index 000000000000..6bec2e54cc77
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.9-CMakeLists.txt.patch
@@ -0,0 +1,14 @@
+--- trunk/scripts/CMakeLists.txt	2011/10/31 15:33:42	12018
++++ trunk/scripts/CMakeLists.txt	2012/01/04 15:45:07	12116
+@@ -30,9 +30,9 @@
+   if(PLD_pstex)
+     set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps)
+   endif(PLD_pstex)
+-  if (NOT ${scripts_SCRIPTS} STREQUAL "")
++  if (NOT "${scripts_SCRIPTS}" STREQUAL "")
+     install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR})
+-  endif (NOT ${scripts_SCRIPTS} STREQUAL "")
++  endif (NOT "${scripts_SCRIPTS}" STREQUAL "")
+ endif(HAVE_BASH)
+ 
+ if(ENABLE_tcl OR ENABLE_tk)
diff --git a/sci-libs/plplot/plplot-5.9.7-r1.ebuild b/sci-libs/plplot/plplot-5.9.9-r1.ebuild
index 01fbcbec4de1..3d2900f7c44b 100644
--- a/sci-libs/plplot/plplot-5.9.7-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.9.9-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.7-r1.ebuild,v 1.8 2012/05/04 08:22:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9-r1.ebuild,v 1.1 2012/06/18 20:05:31 bicatali Exp $
 
-EAPI="3"
+EAPI=4
 
 WX_GTK_VER="2.8"
 PYTHON_DEPEND="python? 2"
 
-inherit eutils fortran-2 cmake-utils python toolchain-funcs virtualx wxwidgets java-pkg-opt-2
+inherit eutils fortran-2 cmake-utils python toolchain-funcs virtualx \
+	wxwidgets java-pkg-opt-2
 
 DESCRIPTION="Multi-language scientific plotting library"
 HOMEPAGE="http://plplot.sourceforge.net/"
@@ -16,12 +17,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="ada cairo d doc dynamic examples fortran gd java jpeg latex lua ocaml octave
-	 pdf perl png python qhull qt4 svg tcl test threads tk truetype wxwidgets X"
-
-RDEPEND="
-	fortran? ( virtual/fortran )
+IUSE="ada cairo cxx doc dynamic examples fortran gd java jpeg latex lua
+	  ocaml octave pdf perl png python qhull qt4 svg tcl test threads tk
+	  truetype wxwidgets X"
 
+RDEPEND="fortran? ( virtual/fortran )
 	ada? ( virtual/gnat )
 	cairo? ( x11-libs/cairo[svg?,X?] )
 	java? ( >=virtual/jre-1.5 )
@@ -31,7 +31,7 @@ RDEPEND="
 	ocaml? (
 		dev-lang/ocaml
 		dev-ml/camlidl
-		dev-ml/lablgtk )
+		cairo? ( dev-ml/cairo-ocaml[gtk] ) )
 	octave? ( sci-mathematics/octave )
 	pdf? ( media-libs/libharu )
 	perl? ( dev-perl/PDL dev-perl/XML-DOM )
@@ -50,6 +50,7 @@ RDEPEND="
 				gd? ( media-libs/gd[truetype] ) )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] )
 	X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
+
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	java? ( >=virtual/jdk-1.5 dev-lang/swig )
@@ -61,38 +62,37 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	if use fortran; then
 		fortran-2_pkg_setup
-		export FC=$(tc-getFC) F77=$(tc-getF77)
 	else
 		export FC="" F77=""
 	fi
 	use wxwidgets && wxwidgets_pkg_setup
 	use python && python_set_active_version 2
-	use java && java-pkg-opt-2_pkg_setup
+	java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
 	# path for python independent of python version
 	epatch "${FILESDIR}"/${PN}-5.9.6-python.patch
+	# test with pdf assumes a modified bundled libharu
+	epatch "${FILESDIR}"/${PN}-5.9.9-no-pdftest.patch
+	# gentoo bug #419743 fixed upstream
+	epatch "${FILESDIR}"/${PN}-5.9.9-CMakeLists.txt.patch
 
-	# remove license
+	# avoid installing 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
+		$(find "${S}" -name CMakeLists.txt) || die
 	sed -i \
 		-e 's:${VERSION}::g' \
 		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
 		cmake/modules/instdirs.cmake || die
-
-	use java && java-utils-2_src_prepare
+	java-utils-2_src_prepare
 }
 
 src_configure() {
-	# see http://www.miscdebris.net/plplot_wiki/index.php?title=CMake_options_for_PLplot
-	cmake-utils_pld() { _use_me_now PLD "$1 _$2" ; }
-
 	mycmakeargs=(
 		-DUSE_RPATH=OFF
 		-DUSE_RELATIVE_PATH=OFF
@@ -101,11 +101,9 @@ src_configure() {
 		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 		$(cmake-utils_use_build test)
 		$(cmake-utils_use_has python numpy)
-		$(cmake-utils_use_has qhull QHULL)
-		$(cmake-utils_use_has threads PTHREAD)
 		$(cmake-utils_use_with truetype FREETYPE)
 		$(cmake-utils_use_enable ada)
-		$(cmake-utils_use_enable d)
+		$(cmake-utils_use_enable cxx)
 		$(cmake-utils_use_enable dynamic DYNDRIVERS)
 		$(cmake-utils_use_enable fortran f77)
 		$(cmake-utils_use_enable java)
@@ -119,37 +117,55 @@ src_configure() {
 		$(cmake-utils_use_enable tcl itcl)
 		$(cmake-utils_use_enable tk)
 		$(cmake-utils_use_enable tk itk)
-		$(cmake-utils_pld cairo memcairo)
-		$(cmake-utils_pld cairo extcairo)
-		$(cmake-utils_pld cairo pdfcairo)
-		$(cmake-utils_pld cairo pngcairo)
-		$(cmake-utils_pld cairo pscairo)
-		$(cmake-utils_pld cairo svgcairo)
-		$(cmake-utils_pld cairo xcairo)
-		$(cmake-utils_pld qt4 bmpqt)
-		$(cmake-utils_pld qt4 epsqt)
-		$(cmake-utils_pld qt4 extqt)
-		$(cmake-utils_pld qt4 jpgqt)
-		$(cmake-utils_pld qt4 memqt)
-		$(cmake-utils_pld qt4 pdfqt)
-		$(cmake-utils_pld qt4 pngqt)
-		$(cmake-utils_pld qt4 ppmqt)
-		$(cmake-utils_pld qt4 qtwidget)
-		$(cmake-utils_pld qt4 svgqt)
-		$(cmake-utils_pld qt4 tiffqt)
-		$(cmake-utils_pld wxwidgets wxwidgets)
-		$(cmake-utils_pld wxwidgets wxpng)
-		$(cmake-utils_pld pdf)
-		$(cmake-utils_pld truetype psttf)
-		$(cmake-utils_pld latex pstex)
+		$(cmake-utils_use_enable wxwidgets)
+		$(cmake-utils_use threads PL_HAVE_PTHREAD)
+		$(cmake-utils_use qhull PL_HAVE_QHULL)
+		$(cmake-utils_use qt4 PLD_aqt)
+		$(cmake-utils_use qt4 PLD_bmpqt)
+		$(cmake-utils_use qt4 PLD_epsqt)
+		$(cmake-utils_use qt4 PLD_extqt)
+		$(cmake-utils_use qt4 PLD_jpgqt)
+		$(cmake-utils_use qt4 PLD_memqt)
+		$(cmake-utils_use qt4 PLD_pdfqt)
+		$(cmake-utils_use qt4 PLD_pngqt)
+		$(cmake-utils_use qt4 PLD_ppmqt)
+		$(cmake-utils_use qt4 PLD_svgqt)
+		$(cmake-utils_use qt4 PLD_qtwidget)
+		$(cmake-utils_use qt4 PLD_tiffqt)
+		$(cmake-utils_use cairo PLD_extcairo)
+		$(cmake-utils_use cairo PLD_memcairo)
+		$(cmake-utils_use cairo PLD_pdfcairo)
+		$(cmake-utils_use cairo PLD_pngcairo)
+		$(cmake-utils_use cairo PLD_pscairo)
+		$(cmake-utils_use cairo PLD_svgcairo)
+		$(cmake-utils_use cairo PLD_wincairo)
+		$(cmake-utils_use cairo PLD_xcairo)
+		$(cmake-utils_use tk PLD_ntk)
+		$(cmake-utils_use tk PLD_tk)
+		$(cmake-utils_use tk PLD_tkwin)
+		$(cmake-utils_use gd PLD_gif)
+		$(cmake-utils_use gd PLD_jpeg)
+		$(cmake-utils_use gd PLD_png)
+		$(cmake-utils_use pdf PLD_pdf)
+		$(cmake-utils_use latex PLD_ps)
+		$(cmake-utils_use latex PLD_pstex)
+		$(cmake-utils_use truetype PLD_psttf)
+		$(cmake-utils_use svg PLD_svg)
+		$(cmake-utils_use wxwidgets PLD_wxpng)
+		$(cmake-utils_use wxwidgets PLD_wxwidgets)
+		$(cmake-utils_use X PLD_xwin)
+	)
+
+	[[ $(tc-getFC) != *g77 ]] && \
+		mycmakeargs+=(
+		$(cmake-utils_use_enable fortran f95)
 	)
-	use fortran && [[ $(tc-getFC) != *g77 ]] && \
-		mycmakeargs+=( $(cmake-utils_use_enable fortran f95) )
 
 	use truetype && mycmakeargs+=(
-		-DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont-ttf" )
+		-DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont-ttf"
+	)
 
-	use python && use qt4 && mycmakeargs+=( $(cmake-utils_pld pyqt) )
+	use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) )
 	use doc && mycmakeargs+=( -DPREBUILT_DOC=ON )
 	cmake-utils_src_configure
 }
@@ -163,4 +179,9 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	if use java; then
+		rm -rf "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni
+		java-pkg_dojar "${CMAKE_BUILD_DIR}"/examples/java/${PN}.jar
+		java-pkg_doso "${CMAKE_BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
+	fi
 }