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

(Portage version: 2.2_rc28/cvs/Linux x86_64)

5 files changed, 30 insertions, 25 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/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..."