Version bump. Fixed examples installation, some automagic dependencies, adapted chang...

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

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index c2884bd23c8c8f8b8a1467379a64f7389b63bf52..4edc8b09e952d1211d1a387492aee4cb154f056d 100644 (file)
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.36 2011/07/28 23:28:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.37 2011/11/20 16:41:04 bicatali Exp $
+
+*plplot-5.9.9 (20 Nov 2011)
+
+  20 Nov 2011; Sébastien Fabbro <bicatali@gentoo.org> +plplot-5.9.9.ebuild,
+  +files/plplot-5.9.9-no-pdftest.patch:
+  Version bump. Fixed examples installation, some automagic dependencies,
+  adapted changeds in CMake options. Added cxx flag, tests for pdf is disabled
+  (Assumes a bundled libharu)
 
   28 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> plplot-5.9.7-r1.ebuild:
   Fixed syntax error causing qt to be set by plplot when qt4 is not (bug

diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 564f8e64ebad67101763b80f0d885e9805b296e5..a974cdb63a9e7a940e85a550b55361f2bdc968f8 100644 (file)
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX plplot-5.9.6-python.patch 379 RMD160 0a86baca63a0078974928be8802bcf8eb5bdbf20 SHA1 480e20d98e14dd468737e52be0c53f1d25f0fc5d SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8
+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 4930 RMD160 15a37cd1f35596c09d57bcaeb3c553af05fb3400 SHA1 fbded8823e9d506f829cf9f65f0f3c8aa4d782dd SHA256 cdf0d139b7a06d93d0100a7ced0762975b52b26dfcd1e9915f84d764890d49cd
-MISC ChangeLog 6428 RMD160 12429569d5086e7416196afd2fdcfda7a7f89435 SHA1 0609b392aeeb16139a1c76b498e10b5aa39c13bf SHA256 275de8310d401ccdaa55589e9aaee4c14eeb4529384a77c8a5728a9cbf258e63
+EBUILD plplot-5.9.9.ebuild 5385 RMD160 1c7b913136931115b7bfba03b41de3b2442cd9a0 SHA1 028bef177940ad452051048cd81e83af74825050 SHA256 6a91f2ef6f5aabcb4f7b00ec79d89d91b7d10b9c79e47061d810d80b84230922
+MISC ChangeLog 6758 RMD160 bbcce490bbd2f003d9ca0631212a377cdf0af845 SHA1 039a1005b94a4a144f51f8bddf00063e2f240a22 SHA256 a1542e2feedf2fb8dc38e0b04f0b59713dd8d77d1b3042a2f7b72364e2a227ee
 MISC metadata.xml 1344 RMD160 4246d3a8be85dfce2158f5d9c3908980b1f10797 SHA1 213f525c1241740b248662e8c1d18a98f2d51d7a SHA256 f5c283da27a5fa22f966f403651da8d5732a5febf3d475b2dde33d6b309bbcbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4x8LEACgkQ1ycZbhPLE2DxiACfXustXoIytycjbe2vrZwEZqgj
-y/MAn3+2rL3hfIpTyBTdcW7oyMQx8w1X
-=2PAr
+iEYEARECAAYFAk7JLbEACgkQ1ycZbhPLE2DfOQCfWx6NCdmrlnH5vouBRKCUtr2+
++0wAn1KpXQwAv48wzzhv1vaKrVLuF1Xq
+=pN2y
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch b/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch
new file mode 100644 (file)
index 0000000..7e7e826
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.9.9-no-pdftest.patch
@@ -0,0 +1,15 @@
+--- plplot_test/CMakeLists.txt.orig    2011-11-20 16:10:04.000000000 +0000
++++ plplot_test/CMakeLists.txt 2011-11-20 16:10:24.000000000 +0000
+@@ -387,12 +387,6 @@
+       )
+   endif(PLD_pdfqt)
+ 
+-  if(PLD_pdf)
+-    add_test(examples_pdf
+-      ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf"
+-      )
+-  endif(PLD_pdf)
+-
+   if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
+     configure_file(
+       test_diff.sh.in

diff --git a/sci-libs/plplot/plplot-5.9.9.ebuild b/sci-libs/plplot/plplot-5.9.9.ebuild
new file mode 100644 (file)
index 0000000..00d5382
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.9.9.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.9.ebuild,v 1.1 2011/11/20 16:41:04 bicatali Exp $
+
+EAPI="3"
+
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 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/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ada cairo cxx 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 )
+       ada? ( virtual/gnat )
+       cairo? ( x11-libs/cairo[svg?,X?] )
+       java? ( >=virtual/jre-1.5 )
+       gd? ( media-libs/gd[jpeg?,png?] )
+       latex? ( virtual/latex-base app-text/ghostscript-gpl )
+       lua? ( dev-lang/lua )
+       ocaml? (
+               dev-lang/ocaml
+               dev-ml/camlidl
+               dev-ml/lablgtk )
+       octave? ( sci-mathematics/octave )
+       pdf? ( media-libs/libharu )
+       perl? ( dev-perl/PDL dev-perl/XML-DOM )
+       python? (
+               dev-python/numpy
+               qt4? ( dev-python/PyQt4 ) )
+       qhull? ( media-libs/qhull )
+       qt4? (
+               x11-libs/qt-gui:4
+               x11-libs/qt-svg:4 )
+       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] ) )
+       wxwidgets? ( x11-libs/wxGTK:2.8[X] x11-libs/agg[truetype?] )
+       X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )"
+
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       java? ( >=virtual/jdk-1.5 dev-lang/swig )
+       ocaml? ( dev-ml/findlib )
+       python? ( dev-lang/swig )
+       test? ( media-fonts/font-misc-misc
+                       media-fonts/font-cursor-misc )"
+
+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
+}
+
+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
+
+       # 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' \
+               $(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
+}
+
+src_configure() {
+       mycmakeargs=(
+               -DUSE_RPATH=OFF
+               -DUSE_RELATIVE_PATH=OFF
+               -DDEFAULT_ALL_DEVICES=ON
+               -DTEST_DYNDRIVERS=OFF
+               -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+               $(cmake-utils_use_build test)
+               $(cmake-utils_use_has python numpy)
+               $(cmake-utils_use_with truetype FREETYPE)
+               $(cmake-utils_use_enable ada)
+               $(cmake-utils_use_enable cxx)
+               $(cmake-utils_use_enable d)
+               $(cmake-utils_use_enable dynamic DYNDRIVERS)
+               $(cmake-utils_use_enable fortran f77)
+               $(cmake-utils_use_enable java)
+               $(cmake-utils_use_enable lua)
+               $(cmake-utils_use_enable ocaml)
+               $(cmake-utils_use_enable octave)
+               $(cmake-utils_use_enable perl pdl)
+               $(cmake-utils_use_enable python)
+               $(cmake-utils_use_enable qt4 qt)
+               $(cmake-utils_use_enable tcl)
+               $(cmake-utils_use_enable tcl itcl)
+               $(cmake-utils_use_enable tk)
+               $(cmake-utils_use_enable tk itk)
+               $(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 truetype && mycmakeargs+=(
+               -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont-ttf" )
+
+       use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) )
+       use doc && mycmakeargs+=( -DPREBUILT_DOC=ON )
+       cmake-utils_src_configure
+}
+
+src_test() {
+       pushd "${S}_build" > /dev/null
+       Xemake test || die "tests failed"
+       popd > /dev/null
+}
+
+src_install() {
+       cmake-utils_src_install
+       use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+}