Version bump

Package-Manager: portage-2.2.7-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 227 insertions, 11 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index bab1eee87ae5..a8f38ae0be87 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.49 2013/04/18 06:09:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.50 2013/10/28 19:36:30 bicatali Exp $
+
+*plplot-5.9.10 (28 Oct 2013)
+
+  28 Oct 2013; Sébastien Fabbro <bicatali@gentoo.org> +plplot-5.9.10.ebuild,
+  metadata.xml:
+  Version bump
 
 *plplot-5.9.9-r2 (18 Apr 2013)
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index dbcb95d767a5..363a1f1ad2d7 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX plplot-5.9.6-python.patch 379 SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 WHIRLPOOL a6ae20047cd0e99251746cadf703e19d35897a6788e5b5d665758f970cc47aad31331640a679f974455aeab4ab6ec4927649d4b1c1a9d9efbe474f2e966aed83
 AUX plplot-5.9.9-CMakeLists.txt.patch 524 SHA256 f2a28ccca6934f85e496bf5c54d192bf436f544b379640498e2077fd882ce647 SHA512 daa8788ca5d55539c146c17318b2f402e360a8f34ce930999b7078e474099535dc8a335f88c520ec756d8e9f2249e2c93a4d65e5822f7224ec400c854f1168cc WHIRLPOOL 02e09ed162aab24f3358f8a3248fae66bac8c60db29180adacc7869ce5a1ae11db44430da9101327bd487a49480ea84647ce2883bfbc954f460e801be89c3aba
 AUX plplot-5.9.9-no-pdftest.patch 458 SHA256 ee9d6b0cfdf4e954e24c5c026723334105ee208d9bb92e623bc42fdbd272caad SHA512 4c41b4321cdf4040cf64fba44b5c93032011737c1dbd98a9fa8c8d5b2b0c182cc94b30a3c52d2c1c184ce678e22b2c35a2d4f0e5ddbd93a86396e2c615cb50fe WHIRLPOOL aa6aaaffd9098abde89927a9c1079f351a7810e9c7b41fb61bc72f75225c5f5c3ff636b575444cdab4a22bd6bc24ea110d6bb29dbc684e9984c20cab37c709fd
 AUX plplot-5.9.9-tk86.patch 21286 SHA256 9d6c908e7bb36df4e805bf2b95c773b88fb4dfa2542db63157bd994e83a22b35 SHA512 0b60a42a014b35a5b85af830f0dfc200a1156e53fa79ddb230f93080ab9cb19589008456affb6e670e388679a5ee68b981c04ce2a232cfcb7f27fd2ce457b51f WHIRLPOOL a8086c4ffd07ac98b51edc8f8fcdf7bf4de3755d25101464493129aaf4979d2c6247eb3f0afcd9bb57f774760f2e0ea1cb48f91d02d36dc630bf8ebfb0f2e104
+DIST plplot-5.9.10.tar.gz 15215720 SHA256 6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723 SHA512 356eff0d27f8b5a672992a8cb642a7bcd15cd49d18512b9e9a3c999d28e19c7da0bf095ac0bbdf4dc1df512190265179aa9311fbead80260a9968cc3d1a11fbe WHIRLPOOL d77917db0c3e9a7236525df01e36f0611bd2145083d827077ac2019ef9c38d0187dada0e20893aaaa37b425f67c700ab50474d63ff457efccb23ca33b9e47c43
 DIST plplot-5.9.9.tar.gz 13778554 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d SHA512 ad46d40fbfecdf9b8d9e6f1e9da986716b07f88a91ad78f14498bd83acb0186c984b6b5079564046cfedfd1010692d0e7d3c3ce8831b3d1c825c8db335d4c7f1 WHIRLPOOL 3da257b0d0db87f46fd950e32d7bf22ef25b27d7334113fc2b0e5219fdb1d3462a425ff02550ee907fd105041d35f30b22b2b1b39649a13568d3f04f51525664
+EBUILD plplot-5.9.10.ebuild 6320 SHA256 ead1c15438f1c28f72d42170f1ce0bba978a8b94f4831c24db654fa236848292 SHA512 73b9f444ac510d6ef26407a92cd35f2f76c23a5d0f320b84434019577e03a2b7f830539304dde9268304deeafb8f0f20f69d610b2fee096817f3f61c232f0372 WHIRLPOOL aa668aa9f0c0a05c3bce21a37debf09a171b74dab175941a4466ac9b8a0ebf42dfc8d5555e8de13735a3623e8ab48f746b2dceecc28f43293c3d00511baaeb03
 EBUILD plplot-5.9.9-r1.ebuild 5944 SHA256 7f47557aa53823b2cc2bbab2d9d7c205f3d3cf3c9f820afb5d5c59786e807e14 SHA512 e7b2a877941837b95ea96cea3053577aa252071426cf00fcae098fa5f0cfbbc5c5a7ba2662fc58a39f78d8e73c0b129a2521a6ec34edbb2dc683e9d806acda66 WHIRLPOOL 85ee7e189bff2d637e29c1b28127af703e4dfbf72db6e6ce5577e2555f68235941805f80dee3348935ffbb6fb6c095ad2a4dc567770ed1548d2cce17c51ce973
 EBUILD plplot-5.9.9-r2.ebuild 5959 SHA256 f62f54b16283b5bb5c06e514b9f2725a23f6a1f28f95be319859f3449c8c19a7 SHA512 090fe2769d0a8171eb599bfb59166d486ee3c2b153c005ce1bfb9d5eae21fea494684f9d61f0d2fd52701be9ffd42c3fb00d2e0ebf9c60832fdb666923ff3ea7 WHIRLPOOL 94e11c2c1388f42167d10359150b1c41de6f4e0153b8a5bc828e7106e8c1ecd2fb64a8b0ae76443bf470a0f07581cd75293ae17d19ab1d50c05a5478d2b4b2ab
-MISC ChangeLog 8762 SHA256 f7aff18dd3ffa47e690e9a49b1ccbf702f6ab31142f2658d3dfe01ce4665bc2d SHA512 d138f7cb578e8bdc9e608bd0ebcb79071a3648a4c07f5a2bed202628c8e24e70c03c8d54e796ac2b9a6a7abc54530f4a06246e96bf3518a2e3148a52be285a47 WHIRLPOOL a4265744372bf39a8c401a5e13759ad74f6d7b84f3e719fd8328fa454b33ce9be1c09470e56fe31045e8a07a74a4f01a218079eedbbff5128f65e2398d4e8d05
-MISC metadata.xml 1279 SHA256 c65b0cb27de9ac13092c5eb8be177aeb02f4ef21ae88ae6dab98b055d2b53845 SHA512 0bed3295c866c9ec9e0927be13cd9204df06d8c59a21a3ad300c5067be25c14733d6d1fa313470edd4d759cfa25ae402668fa4c78236be237f72d4195c151c3d WHIRLPOOL 37a0ba2bba2d92a52d6efe4b41615e05e1f2b034c1a910f31313c5645412c38369898e48f525aa66743569c523a357016d450ed92fffaa06d6c34f4f87072f53
+MISC ChangeLog 8903 SHA256 dd547bd7558b926338aed6d6cf18ce88f3357e8d1a3e5cb49b52699ff4618e21 SHA512 062f567b9a121d7781ea4d8484759a2ae1a8329a4cc94a51493ff4fb1dab5750b343f465fe56407cd846aeb28b0e19ff1fa721b120e12dce586c2f886e63014b WHIRLPOOL 6e23b844a3ac6b92a3c4e31156d2959e69cd449b3d80e930b3d4a8abf2952189ed0dbe9dadd070d11d035dcd4ae165b57cb2beb284e722e02169fbe555a051d7
+MISC metadata.xml 1340 SHA256 ba735c538783ca6b35ccccedd2626936718d8061c24e8335d2af42a00ecc3b9d SHA512 0b715adc49a9ea90ec3f7a3a94c91b006a815674f8190a3398e30064ae5eb42fbc261ad972ea37a3943e93f552032da5eaa8d4d0af0e7066282511c27a95ad09 WHIRLPOOL c44d78922e8bdd22e2399fbbc973541a5fc8ff085aa73a87a1368ca98612ef9ff49b02f7a3aba7405496e554e71b795dbd1e67fb0949bc8692d5b74c2d18a0b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJuvNsACgkQ1ycZbhPLE2CgrACghCykKATWC1dXiXRkLCD7aFmT
+sl4An2P6kKyKMWmm06K32gbjsNyp0C3k
+=js76
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/metadata.xml b/sci-libs/plplot/metadata.xml
index e8c81d6b8fb7..c6cb1ea7cb53 100644
--- a/sci-libs/plplot/metadata.xml
+++ b/sci-libs/plplot/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription>
+<herd>sci</herd>
+<longdescription lang='en'>
   PLplot is a library of functions that are useful for making scientific
   plots. It can be used from within compiled languages such as C, C++,
   FORTRAN and Java, as well as interactively from interpreted languages such
@@ -15,10 +15,11 @@
   support for extended characters inculding the Greek alphabet and a host of
   mathematical symbols.
 </longdescription>
-  <use>
-    <flag name="ada">Add bindings for the ADA programming language</flag>
-    <flag name="dynamic">Build with dynamic drivers</flag>
-    <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
-    <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
-  </use>
+<use>
+  <flag name="ada">Add bindings for the ADA programming language</flag>
+  <flag name="dynamic">Build with dynamic drivers</flag>
+  <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag>
+  <flag name="qhull">Add bindings for <pkg>media-libs/qhull</pkg></flag>
+  <flag name="shapefile">Enable support for ESRI shapefiles</flag>
+</use>
 </pkgmetadata>
diff --git a/sci-libs/plplot/plplot-5.9.10.ebuild b/sci-libs/plplot/plplot-5.9.10.ebuild
new file mode 100644
index 000000000000..563f8406d0fe
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.9.10.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.10.ebuild,v 1.1 2013/10/28 19:36:30 bicatali Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+FORTRAN_NEEDED=fortran
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs virtualx \
+	wxwidgets java-pkg-opt-2 multilib
+
+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 ~amd64-linux ~x86-linux"
+IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
+	  ocaml octave pdf perl png python qhull qt4 shapefile svg tcl test threads
+	  tk truetype wxwidgets X"
+
+RDEPEND="
+	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
+		cairo? ( dev-ml/cairo-ocaml[gtk] ) )
+	octave? ( sci-mathematics/octave )
+	pdf? ( media-libs/libharu )
+	perl? ( dev-perl/PDL dev-perl/XML-DOM )
+	python? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) )
+	qhull? ( media-libs/qhull )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4 )
+	shapefile? ( sci-libs/shapelib )
+	tcl? ( dev-lang/tcl dev-tcltk/itcl
+		tk? ( dev-lang/tk dev-tcltk/itk ) )
+	truetype? (
+		media-fonts/freefont
+		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}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	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 )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex )"
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+	use python && python-single-r1_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
+	# avoid installing license
+	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
+	# prexify hard-coded /usr/include in cmake modules
+	sed -i \
+		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
+		cmake/modules/*.cmake || 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
+	java-utils-2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEFAULT_ALL_DEVICES=ON
+		-DTEST_DYNDRIVERS=OFF
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_d=OFF
+		$(cmake-utils_use_build doc DOX_DOC)
+		$(cmake-utils_use_build test)
+		$(cmake-utils_use_has python NUMPY)
+		$(cmake-utils_use_has shapefile SHAPELIB)
+		$(cmake-utils_use_with truetype FREETYPE)
+		$(cmake-utils_use_enable ada)
+		$(cmake-utils_use_enable cxx)
+		$(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_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 truetype && mycmakeargs+=(
+		-DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont"
+	)
+	use shapefile && mycmakeargs+=(
+		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp"
+	)
+	use python && mycmakeargs+=( $(cmake-utils_use_enable qt4 pyqt4) )
+	use doc && mycmakeargs+=( -DPREBUILT_DOC=ON )
+	cmake-utils_src_configure
+
+	# clean up bloated pkg-config files (help linking properly on prefix)
+	sed -i \
+		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
+		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
+		-e "s:${LDFLAGS}::g" \
+		"${CMAKE_BUILD_DIR}"/pkgcfg/*pc || die
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null
+	Xemake test || die "tests failed"
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples
+	#use doc && dohtml -r doc/docbook/src/*
+	if use java; then
+		rm -r "${ED}"/usr/share/java "${ED}"/usr/$(get_libdir)/jni  || die
+		java-pkg_dojar "${CMAKE_BUILD_DIR}"/examples/java/${PN}.jar
+		java-pkg_doso "${CMAKE_BUILD_DIR}"/bindings/java/plplotjavac_wrap.so
+	fi
+}