Allow only qt >=4.4 and simplify qt deps; by Davide Pesavento <davidepesa@gmail.com>, bug #264974

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

6 files changed, 38 insertions, 33 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 2b8e5f93c27e..3dda7c6c726d 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.430 2009/04/04 13:37:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.431 2009/04/08 07:54:24 aballier Exp $
+
+  08 Apr 2009; Alexis Ballier <aballier@gentoo.org> vlc-0.9.9.ebuild,
+  vlc-0.9.9999.ebuild, vlc-1.0.0_pre1.ebuild, vlc-9999.ebuild:
+  Allow only qt >=4.4 and simplify qt deps; by Davide Pesavento
+  <davidepesa@gmail.com>, bug #264974
 
   04 Apr 2009; Alexis Ballier <aballier@gentoo.org> -vlc-0.9.9_rc2.ebuild:
   remove rc
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a21b6236049c..3eaa3df103b1 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,16 +7,16 @@ DIST vlc-1.0.0-pre1.tar.bz2 17157544 RMD160 d84c77f75b8d97b1b702e0d6953f72b64cc7
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-59.tar.bz2 4685 RMD160 a01cba6d4af12ebd26faed4a7f8894529dc42e57 SHA1 387934801502ff82045ab446fb1421b14233cf03 SHA256 cf38f9398e62fad8c51dc1b0c8467236cbffb1d465ddbf5ab62d2bf4bbd1ec35
 EBUILD vlc-0.9.8a.ebuild 11371 RMD160 3f4becbdc020286c3956d7f4f90139590f8f853c SHA1 e04d129256bc54b9f5e5646ff8ffd9d22fb8e8ce SHA256 807507089a9a423e01ec9e0c660ce00b5265a6d11bf58bb8ab6cc68b4073e0c0
-EBUILD vlc-0.9.9.ebuild 11218 RMD160 52a61e2bb3e25dbb8bb0edf42377a85175580b3e SHA1 85644ebb3e3a0e83a9cda492cdf2b10b236e5d3e SHA256 ba2e94ab84d5c0d553febf01a979db6db2062255217a942e5db4daf34e67e8c5
-EBUILD vlc-0.9.9999.ebuild 11169 RMD160 34801708c67e2e5803ac29180f079f6017e74e2d SHA1 a4219b7eb3a201c7d710da3e5f0e530535e012f6 SHA256 66f487721718505b2a9a30f19ce93bede0a476da1df9a85940ee85a8dca41d3b
-EBUILD vlc-1.0.0_pre1.ebuild 11345 RMD160 baa65a3685e3cc35c9865aa30116937046cf6c5d SHA1 7b39b889ce9a1a9da2c91d2deb6c981e6537713c SHA256 bbf1056974a7981712da34767fc89dfc9edf0d03d3ed3768d818effd1652c8a4
-EBUILD vlc-9999.ebuild 11290 RMD160 687e04f86bb4ffada87276f9cd168aad98634146 SHA1 83de228ed051e3b475410db28fa06172ca25c584 SHA256 54ad5213d38f645f96977700f853a3075da290c9d4922874c54951025b3932a7
-MISC ChangeLog 69175 RMD160 ce52b39909c61b20dc12c76b04ca11e4ef16e33c SHA1 c2b141dbcfcb6c19a63362d7ddb88235cd03044c SHA256 ead0c4c634f55ae2221bb21b78355cbd09c231c40a98771bb3807763a6bd2c15
+EBUILD vlc-0.9.9.ebuild 11132 RMD160 370e3de04e6e714e739ecadb5e9f2ab795ae0d4f SHA1 9de6500da541362b90df6ac919f3cf6c9c4c58b2 SHA256 689bd26c2fd9eaa41f12c362e24039f96b2f9e45ec21fa982d34ab55db43ef86
+EBUILD vlc-0.9.9999.ebuild 11083 RMD160 5867d88b69e80fee0f13a49124ef3a99b441791b SHA1 b0676cca7c5e7e94211387d0f81b7f31269094f1 SHA256 171f84d4c6f48b0f0718b6127d5c237c8c526889e59b5fc5a2efa55a020b734b
+EBUILD vlc-1.0.0_pre1.ebuild 11262 RMD160 e2e225c96b4a17e15766f234be9166a14d98cb7d SHA1 af28904705e0b4f1c1a075035da72605979589c5 SHA256 bbd681ba23ca413ce34e3ad92a61bc262998fdc3e5c6358d5af443a5fd555c05
+EBUILD vlc-9999.ebuild 11204 RMD160 b8471933398bc6f03a53803edf762bfb28115ea8 SHA1 635925a788c2e356f1894f76fa6bb0f5e1b91076 SHA256 1e5f00d8d2fe904be5e919b6dae08f83ef2d74228c376d25b4904a2c1dd84277
+MISC ChangeLog 69411 RMD160 b99795b41dff4822e0b97f4a8dc90fd7e73ba399 SHA1 182cc2bab325131c31f8ee3aa1d4b31609f01cef SHA256 c2672ec4b3bf20a96cac60f59bd5282f783d0a021c450b1c2e3ccb27c4e5728b
 MISC metadata.xml 3851 RMD160 a699793eb039c03d81a9ba4b8959a5b9ba6fb56a SHA1 0928ebfe4a753b6007ea35560ae64888650e6563 SHA256 1d7db3bb96293bbcd252c63b2686191a0e25a07d9998c984d04c83d260e95673
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknXYoYACgkQvFcC4BYPU0poOQCfapb1FHPKdHHH0fjHBzYNpiGm
-ZE0An2J7QTZUk+sYDXiYMqqwH0twmNEV
-=AYuj
+iEYEARECAAYFAkncWDgACgkQvFcC4BYPU0qoDgCgkwQ3KP21hEHVAyxg59Klg50w
+fVYAn3mtShekjMAZy18f5VQKwDWTr3mI
+=s3jS
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.9.9.ebuild b/media-video/vlc/vlc-0.9.9.ebuild
index 10c3f7f6a947..3c863ae9631e 100644
--- a/media-video/vlc/vlc-0.9.9.ebuild
+++ b/media-video/vlc/vlc-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild,v 1.1 2009/04/04 13:35:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild,v 1.2 2009/04/08 07:54:24 aballier Exp $
 
 EAPI="1"
 
@@ -115,14 +115,14 @@ RDEPEND="
 		pda? ( x11-libs/gtk+:2 )
 		png? ( media-libs/libpng )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
 		samba? ( net-fs/samba )
 		schroedinger? ( >=media-libs/schroedinger-1.0 )
 		sdl? ( >=media-libs/libsdl-1.2.8
 			sdl-image? ( media-libs/sdl-image ) )
 		shout? ( media-libs/libshout )
-		skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		speex? ( media-libs/speex )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
 		svga? ( media-libs/svgalib )
@@ -162,7 +162,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# Dispalys a warning if the first use flag is set but not the second
+# Displays a warning if the first use flag is set but the second is not
 vlc_use_needs() {
 	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
 }
@@ -194,8 +194,8 @@ pkg_setup() {
 	vlc_use_needs fontconfig truetype
 	vlc_use_needs libv4l2 v4l2
 	use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
-	if ( use qt4 || use skins ) ; then
-		QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup
+	if use qt4 || use skins ; then
+		qt4_pkg_setup
 	else
 		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
 		ewarn "graphical interface. Maybe that is not what you want..."
diff --git a/media-video/vlc/vlc-0.9.9999.ebuild b/media-video/vlc/vlc-0.9.9999.ebuild
index b3e817fff35d..e2b059deefc0 100644
--- a/media-video/vlc/vlc-0.9.9999.ebuild
+++ b/media-video/vlc/vlc-0.9.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild,v 1.2 2009/03/17 07:57:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild,v 1.3 2009/04/08 07:54:24 aballier Exp $
 
 EAPI="1"
 
@@ -115,14 +115,14 @@ RDEPEND="
 		pda? ( x11-libs/gtk+:2 )
 		png? ( media-libs/libpng )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
 		samba? ( net-fs/samba )
 		schroedinger? ( >=media-libs/schroedinger-1.0 )
 		sdl? ( >=media-libs/libsdl-1.2.8
 			sdl-image? ( media-libs/sdl-image ) )
 		shout? ( media-libs/libshout )
-		skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		speex? ( media-libs/speex )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
 		svga? ( media-libs/svgalib )
@@ -162,7 +162,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# Dispalys a warning if the first use flag is set but not the second
+# Displays a warning if the first use flag is set but the second is not
 vlc_use_needs() {
 	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
 }
@@ -194,8 +194,8 @@ pkg_setup() {
 	vlc_use_needs fontconfig truetype
 	vlc_use_needs libv4l2 v4l2
 	use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
-	if ( use qt4 || use skins ) ; then
-		QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup
+	if use qt4 || use skins ; then
+		qt4_pkg_setup
 	else
 		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
 		ewarn "graphical interface. Maybe that is not what you want..."
diff --git a/media-video/vlc/vlc-1.0.0_pre1.ebuild b/media-video/vlc/vlc-1.0.0_pre1.ebuild
index aeaf2c2f51b8..d6947ead3617 100644
--- a/media-video/vlc/vlc-1.0.0_pre1.ebuild
+++ b/media-video/vlc/vlc-1.0.0_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild,v 1.2 2009/03/29 15:39:32 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild,v 1.3 2009/04/08 07:54:24 aballier Exp $
 
 EAPI="1"
 
@@ -114,14 +114,14 @@ RDEPEND="
 		pda? ( x11-libs/gtk+:2 )
 		png? ( media-libs/libpng )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
 		samba? ( net-fs/samba )
 		schroedinger? ( >=media-libs/schroedinger-1.0 )
 		sdl? ( >=media-libs/libsdl-1.2.8
 			sdl-image? ( media-libs/sdl-image ) )
 		shout? ( media-libs/libshout )
-		skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		speex? ( media-libs/speex )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
 		svga? ( media-libs/svgalib )
@@ -163,7 +163,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# Dispalys a warning if the first use flag is set but not the second
+# Displays a warning if the first use flag is set but the second is not
 vlc_use_needs() {
 	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
 }
@@ -195,8 +195,8 @@ pkg_setup() {
 	vlc_use_needs fontconfig truetype
 	vlc_use_needs libv4l2 v4l2
 	use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
-	if ( use qt4 || use skins ) ; then
-		QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup
+	if use qt4 || use skins ; then
+		qt4_pkg_setup
 	else
 		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
 		ewarn "graphical interface. Maybe that is not what you want..."
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 8976872f5cdc..9204b6a32000 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.4 2009/03/17 07:57:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.5 2009/04/08 07:54:24 aballier Exp $
 
 EAPI="1"
 
@@ -114,14 +114,14 @@ RDEPEND="
 		pda? ( x11-libs/gtk+:2 )
 		png? ( media-libs/libpng )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
 		samba? ( net-fs/samba )
 		schroedinger? ( >=media-libs/schroedinger-1.0 )
 		sdl? ( >=media-libs/libsdl-1.2.8
 			sdl-image? ( media-libs/sdl-image ) )
 		shout? ( media-libs/libshout )
-		skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
+		skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		speex? ( media-libs/speex )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
 		svga? ( media-libs/svgalib )
@@ -163,7 +163,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# Dispalys a warning if the first use flag is set but not the second
+# Displays a warning if the first use flag is set but the second is not
 vlc_use_needs() {
 	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
 }
@@ -195,8 +195,8 @@ pkg_setup() {
 	vlc_use_needs fontconfig truetype
 	vlc_use_needs libv4l2 v4l2
 	use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
-	if ( use qt4 || use skins ) ; then
-		QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup
+	if use qt4 || use skins ; then
+		qt4_pkg_setup
 	else
 		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
 		ewarn "graphical interface. Maybe that is not what you want..."