Bump minimum swig version for octave bindings, thanks disperato bug #503418. Adjust library depedencies

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

3 files changed, 30 insertions, 24 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 52a4afbb33cf..e6be54223a7d 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.56 2014/02/21 22:00:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.57 2014/03/27 04:32:36 bicatali Exp $
+
+  27 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org> plplot-5.10.0.ebuild:
+  Bump minimum swig version for octave bindings, thanks disperato bug #503418.
+  Adjust library depedencies
 
 *plplot-5.10.0 (21 Feb 2014)
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 30fff8db7560..4a500159a511 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -16,16 +16,16 @@ DIST plplot-5.10.0.tar.gz 14766687 SHA256 d4e930b8b9d43cd1663408986218d61f166de7
 DIST plplot-5.9.10.tar.gz 15215720 SHA256 6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723 SHA512 356eff0d27f8b5a672992a8cb642a7bcd15cd49d18512b9e9a3c999d28e19c7da0bf095ac0bbdf4dc1df512190265179aa9311fbead80260a9968cc3d1a11fbe WHIRLPOOL d77917db0c3e9a7236525df01e36f0611bd2145083d827077ac2019ef9c38d0187dada0e20893aaaa37b425f67c700ab50474d63ff457efccb23ca33b9e47c43
 DIST plplot-5.9.11.tar.gz 14586326 SHA256 77383e44ffda2361199b40b8cf25f88ac012eff5c6a7468e80b112c8fd4793b3 SHA512 da95b76bf255c600d662b43555f003237ff2e310276e61c57854b4077f3f71a5847f931a9fba188a94c7b76656782cb22493a060b0aa1f2338107fd3f2cd01a0 WHIRLPOOL 2666822923b9f578df84f00dbe44d8b0549528f42d4f533e931190efda68b1b14a56428df7fac0c8979060e10e3d8ce12e232117ad7b93e080da2650a5531f4e
 DIST plplot-5.9.9.tar.gz 13778554 SHA256 747e5a043681f3e20df30d159f6e8517cb1e25e502322adcd80e8ca53ec2c90d SHA512 ad46d40fbfecdf9b8d9e6f1e9da986716b07f88a91ad78f14498bd83acb0186c984b6b5079564046cfedfd1010692d0e7d3c3ce8831b3d1c825c8db335d4c7f1 WHIRLPOOL 3da257b0d0db87f46fd950e32d7bf22ef25b27d7334113fc2b0e5219fdb1d3462a425ff02550ee907fd105041d35f30b22b2b1b39649a13568d3f04f51525664
-EBUILD plplot-5.10.0.ebuild 6526 SHA256 7eb349b9a18b9b509826dd1a6fd222f29940fa7b90811621da25451c6ac58c88 SHA512 3c737c53786a3e446ac7a98aa9ba909df983436620746b58a7adab3853464b50d925c9e9ceeca28603605ce14e612a383836730da2edf74263f63c509f095027 WHIRLPOOL 8bfe881c6636c37065a896d0f1a54563a147fdd7ee6fc06a1d3205a4c1ab3a7112f3fe00de2fedb5cc24fbc1fde0f30048acb7a58d5b45daf299e26c78e39175
+EBUILD plplot-5.10.0.ebuild 6630 SHA256 53a89b9de10a424f22665f2d5c8ba18ddcf4d9c97315cdf6847e0b8019869f35 SHA512 75e561f42ee26d46546d8ddd27ca8bcd5701ca59e093dea593bfe5c8ede78153652a2072c894292030ab249763ada3bb19df883ca08ef8aedc6589a7894b99c0 WHIRLPOOL a53cced311ec6a6c1afa7c54b8745f251782ea76fe513e00db66753b073390836797070337df483b495b7b01f0cdbe5a6f56adf4b4a12ee4a807b9f0237b0b29
 EBUILD plplot-5.9.10-r1.ebuild 6400 SHA256 520e3bf00ac36d9e0de31c68fcdce6baa76f8cfa212f5ebd530848b49cce81f4 SHA512 fa0233ba3b7ee32e2f5c5cfea4ab02b2d022f1a30d37c57c4920c95b83854dfccff1b083b9dcc907f48579ea676ff7d10e6a255519a86a1133080e3f919fc014 WHIRLPOOL cfdb3631e2e87aae1dee01d55844fbe91a47c013445e3590b21aa0af792c087a36f0ce34d77f8c927269840827bcd35bb4bc71fae523e13fa95697c866db377e
 EBUILD plplot-5.9.11-r1.ebuild 6607 SHA256 bec389be210e8be7266db3ea142dd79c33e52eadbf7e9368845d6be4a98bbfb5 SHA512 918d56d9ac05d0b3f4f9811b6eb19da1fff5ce7d58650abd75675a0c2f803afea18a495606cbf507f66f0d3b95294bc1b2c53bdb174adfcddb55549b68d982d5 WHIRLPOOL a879916044e779ed1e7b7c62b248d2cd1ee4d5a090d6238c4742cac563885405116716b439229e40a731bd4595e6da5fa2a52c72b04bb3ea10c9e3429de550d3
 EBUILD plplot-5.9.9-r2.ebuild 5923 SHA256 d6e2f4e478bbdb0e993dcae4516c5988a73eeb5ada74e20257d429d1c92c1d75 SHA512 a9b4826e8f0c8219c4159873bf395067bf692c547d062796ea3db87fb178b1c1203e83ff82df5719ba2cf1fd38bc760cbc912eef6efc68d8283c9c98acf5a902 WHIRLPOOL d1d2d5ab9501e63cd6ce3c248ddea46adb4a45053d602f68475f7be0c902b216ac5bddd61149e9f41740be63ac6567193582a60931a512d54d8f3fd60dff70c1
-MISC ChangeLog 10365 SHA256 443f20244bfb949febd8032bb2e55e5794f8e42b7dc0380149b588fdbffeaf15 SHA512 47fe753b7ca663ba7180f63d5840129ef03967de93a2f5beb96ea179b08a026b60df59f8d1b698a810ac45dc3364e40e1991cff8b1cf10b7d67ac9f97c528ea4 WHIRLPOOL ca66fb6b07747c11392121813ac3f863ecaaceb83dc91e1647b372c9bba3cbdd03137722c780d92c194bff716c3b1a25b67447131156cac3fb2a7747acf73f90
+MISC ChangeLog 10551 SHA256 3f3391cc3efd3dc78eda19b08ad1957163d1abb91718e1a865eb1dcec1ea02d1 SHA512 7d30b02e80f35beef0a9d10b36808e508c540a3987704a46accd5a08084e6e926cae7099455f83887758f7873902a9903ab543155ec90a3e2be560fbba8ebfc6 WHIRLPOOL ef03c828b06a77cb8b36beed1740127bf666bb7ad0c075904076c61cf2a7ce93bb8075b98a07ad01b4a78b5490f63371662ba2b80b8c5eb7170ed1946521d657
 MISC metadata.xml 1409 SHA256 9fe1c36eb5beb07262c2814c2ff0aa16c18c69fbb091641608f5ac9b90630d99 SHA512 338034d611f0b7fff5fdcfadb76488b25326f00df739c3ce58ca59b67c6fb8738bde9ceb88bf990de77364b938c2c33c5a1e56ca7ae69d910f6eac673ce4d651 WHIRLPOOL 7c81f05237517c0048cc4d4cb91a289d59b84c0923f17f8ca8bf9faf40cdb69c304fa37f63efbe63bfcfad26f5f2da9e884e1e94426eae4df99fcbba45a76c92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMHzGUACgkQ1ycZbhPLE2BYIACglB70jP8G00W5rZ0Tfv2iw9J7
-BGAAoJCZz62N1Z/neDYX8lqq4lo+/U2c
-=se7q
+iEYEAREIAAYFAlMzqewACgkQ1ycZbhPLE2ApiwCgsfjfuLwl4NQOXKcazn9ytOAl
+DVEAoKcZ764eq48t7Ji72JhQdE1xOKhX
+=uN/U
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/plplot-5.10.0.ebuild b/sci-libs/plplot/plplot-5.10.0.ebuild
index a5580f962a9c..f10b58a6728b 100644
--- a/sci-libs/plplot/plplot-5.10.0.ebuild
+++ b/sci-libs/plplot/plplot-5.10.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0.ebuild,v 1.1 2014/02/21 22:00:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.10.0.ebuild,v 1.2 2014/03/27 04:32:36 bicatali Exp $
 
 EAPI=5
 
 WX_GTK_VER="2.8"
 FORTRAN_NEEDED=fortran
 PYTHON_COMPAT=( python{2_6,2_7} )
+VIRTUALX_REQUIRED=test
 
 inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \
 	virtualx wxwidgets java-pkg-opt-2 multilib
@@ -24,21 +25,21 @@ IUSE="ada cairo cxx doc +dynamic examples fortran gd java jpeg latex lua
 
 RDEPEND="
 	ada? ( virtual/gnat )
-	cairo? ( x11-libs/cairo[svg?,X?] )
+	cairo? ( x11-libs/cairo:0=[svg?,X?] )
 	java? ( >=virtual/jre-1.5 )
-	gd? ( media-libs/gd[jpeg?,png?] )
+	gd? ( media-libs/gd:2=[jpeg?,png?] )
 	latex? (
 		app-text/ghostscript-gpl
 		virtual/latex-base
 	)
-	lua? ( dev-lang/lua )
+	lua? ( dev-lang/lua:0= )
 	ocaml? (
 		dev-lang/ocaml
 		dev-ml/camlidl
 		cairo? ( dev-ml/cairo-ocaml[gtk] )
 	)
-	octave? ( sci-mathematics/octave )
-	pdf? ( media-libs/libharu )
+	octave? ( sci-mathematics/octave:0= )
+	pdf? ( media-libs/libharu:0= )
 	pdl? (
 		dev-perl/PDL
 		dev-perl/XML-DOM
@@ -49,13 +50,13 @@ RDEPEND="
 	)
 	qhull? ( media-libs/qhull )
 	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
+		dev-qt/qtgui:4=
+		dev-qt/qtsvg:4=
 	)
-	shapefile? ( sci-libs/shapelib )
+	shapefile? ( sci-libs/shapelib:0= )
 	tcl? (
-		dev-lang/tcl
-		dev-tcltk/itcl
+		dev-lang/tcl:0=
+		dev-tcltk/itcl:0=
 		tk? (
 			dev-lang/tk
 			dev-tcltk/itk
@@ -63,17 +64,17 @@ RDEPEND="
 	)
 	truetype? (
 		media-fonts/freefont
-		media-libs/lasi
-		gd? ( media-libs/gd[truetype] )
+		media-libs/lasi:0=
+		gd? ( media-libs/gd:2=[truetype] )
 	)
 	wxwidgets? (
-		x11-libs/wxGTK:2.8[X]
-		x11-libs/agg[truetype?]
+		x11-libs/wxGTK:2.8=[X]
+		x11-libs/agg:0=[truetype?]
 	)
 	X? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
+		x11-libs/libX11:0=
+		x11-libs/libXau:0=
+		x11-libs/libXdmcp:0=
 	)"
 
 DEPEND="${RDEPEND}
@@ -83,6 +84,7 @@ DEPEND="${RDEPEND}
 		dev-lang/swig
 	)
 	ocaml? ( dev-ml/findlib )
+	octave? ( >=dev-lang/swig-2.0.12 )
 	python? ( dev-lang/swig )
 	test? (
 		media-fonts/font-misc-misc