Fixed syntax error causing qt to be set by plplot when qt4 is not (bug #374985)

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

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 0b1a31f6feafb480b7c74b6efbdaeafa772ccf9f..c2884bd23c8c8f8b8a1467379a64f7389b63bf52 100644 (file)
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
 # 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.35 2011/07/26 19:42:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.36 2011/07/28 23:28:40 bicatali Exp $
+
+  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
+  #374985)
 
   26 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> plplot-5.9.7-r1.ebuild:
   Marked ~ppc wrt #358035

diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 2d9ca5278488525a9aba51680fbab31cbd6e8eab..564f8e64ebad67101763b80f0d885e9805b296e5 100644 (file)
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -3,15 +3,13 @@ Hash: SHA1
 
 AUX plplot-5.9.6-python.patch 379 RMD160 0a86baca63a0078974928be8802bcf8eb5bdbf20 SHA1 480e20d98e14dd468737e52be0c53f1d25f0fc5d SHA256 a338e7b7d9893aabf0bc2e4bc5bd25a97b81674abfa40492b6cc8a33fe8763c8
 DIST plplot-5.9.7.tar.gz 7230997 RMD160 4dacdbe908830f79d7200933a6b16f1fefa53d26 SHA1 4bfdc2e8ead40ba280ea02ddb56dc90201f5fd47 SHA256 fbf9f48c4c4d96cb9eeb9d821c09b0ce4a36ae5dda9e378f5367f6b9671725e0
-EBUILD plplot-5.9.7-r1.ebuild 4933 RMD160 2f6243558a0d090b4754bd41cf5379be81d3e170 SHA1 bf16c694418e57a8bac084399facbb19a1782e43 SHA256 fcc81107c2517c7f9b31008cd482c5ecc7c68d7e98f584d736b2c71ac75ee06c
-MISC ChangeLog 6266 RMD160 9e932d7f8afefbc304a345d04cdcb8c813a817c8 SHA1 3d2d81c17db356ec1b0fa8f4e631e32065020a69 SHA256 2a721e2cd76977b38501b4bfcc4b26ff7edadc15e2fe7d6f22ca8e619fe2a8d5
+EBUILD plplot-5.9.7-r1.ebuild 4930 RMD160 15a37cd1f35596c09d57bcaeb3c553af05fb3400 SHA1 fbded8823e9d506f829cf9f65f0f3c8aa4d782dd SHA256 cdf0d139b7a06d93d0100a7ced0762975b52b26dfcd1e9915f84d764890d49cd
+MISC ChangeLog 6428 RMD160 12429569d5086e7416196afd2fdcfda7a7f89435 SHA1 0609b392aeeb16139a1c76b498e10b5aa39c13bf SHA256 275de8310d401ccdaa55589e9aaee4c14eeb4529384a77c8a5728a9cbf258e63
 MISC metadata.xml 1344 RMD160 4246d3a8be85dfce2158f5d9c3908980b1f10797 SHA1 213f525c1241740b248662e8c1d18a98f2d51d7a SHA256 f5c283da27a5fa22f966f403651da8d5732a5febf3d475b2dde33d6b309bbcbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4vGJwACgkQIiMqcbOVdxSlJAP+Pd6jiWtvDp0viQCykR6B4QbC
-hh+UEzPDQcWQk5n+x8Pg+Re7soVneFBiLGz2tEeau1t669K1SrgQ//3KfJKyAU7b
-xg9z2gTPIHprX9mD1Lo+mtXKC0+vAUaI47Hze3/7WuHtg80+Wjjy2P8D8iUoufU0
-qLlJBNQ6Rahf0SKIXBU=
-=9KKH
+iEYEARECAAYFAk4x8LEACgkQ1ycZbhPLE2DxiACfXustXoIytycjbe2vrZwEZqgj
+y/MAn3+2rL3hfIpTyBTdcW7oyMQx8w1X
+=2PAr
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/plplot/plplot-5.9.7-r1.ebuild b/sci-libs/plplot/plplot-5.9.7-r1.ebuild
index 087864a06511643ab8651cb914365b5f41784a32..0f0ef49ec08c8426f9e001b42b3789cea4ce320d 100644 (file)
--- a/sci-libs/plplot/plplot-5.9.7-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.9.7-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r1.ebuild,v 1.6 2011/07/26 19:42:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.9.7-r1.ebuild,v 1.7 2011/07/28 23:28:40 bicatali Exp $
 
 EAPI="3"
 
@@ -134,7 +134,7 @@ src_configure() {
                $(cmake-utils_pld qt4 pdfqt)
                $(cmake-utils_pld qt4 pngqt)
                $(cmake-utils_pld qt4 ppmqt)
-               $(cmake-utils_pld qt4 qtwidgets)
+               $(cmake-utils_pld qt4 qtwidget)
                $(cmake-utils_pld qt4 svgqt)
                $(cmake-utils_pld qt4 tiffqt)
                $(cmake-utils_pld wxwidgets wxwidgets)