Convert to EAPI-4, make use of REQUIRED_USE, simplify and remove useless eclass inherits.

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

3 files changed, 35 insertions, 60 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index a3358ebf4229..f6074855e4df 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.662 2011/02/16 13:21:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.663 2011/02/16 14:39:41 aballier Exp $
+
+  16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
+  Convert to EAPI-4, make use of REQUIRED_USE, simplify and remove useless
+  eclass inherits.
 
   16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   remoteosd is now controlled by the gcrypt useflag
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 8137fd0fd737..4a7b930789a0 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,13 +7,13 @@ DIST vlc-patches-89.tar.bz2 3370 RMD160 da3c173817f6666abfaaef5762af58f3810e5180
 DIST vlc-patches-91.tar.bz2 3955 RMD160 37024ac3d68f0c36f711bb680c573976e4e729e8 SHA1 987ac5f47926d76073e84643023df346f9a0027a SHA256 9863e9fd62bf07641e3e99cbd11194cd462ad99ca1719034badfff74419ec451
 EBUILD vlc-1.1.7.ebuild 12269 RMD160 36dc682bb0549b58f7803aa17a055ef0b971ca53 SHA1 1e561a2088c4c4ed3935d24b2a63f02e495a84fb SHA256 261f17b1624e51706b95cf97e5c342b1012147d9027bb1e485aecef29bdcd7e8
 EBUILD vlc-1.1.9999.ebuild 12280 RMD160 e7e42fd81239d7151280219c89c88350505e5d5f SHA1 b13979bc3cff3478efe29e8181de1e1b13a84107 SHA256 8a31788ba75dcb01a467c315b11110a2e0d2ed3f823233d87e6572d296da6843
-EBUILD vlc-9999.ebuild 10923 RMD160 3a0ecc3ec9de5e46f973b183ceb707debee8cd70 SHA1 73ad546a6cb04fa538bbcfc41ec7b6fc2fe3a53c SHA256 d6781a5357d5f5792540340c624201a4f3ba1df50012ecaf1b05492c1a845f4e
-MISC ChangeLog 100456 RMD160 0423c5c127ec20bbb341f10601244ffe6751418f SHA1 5686e1ab8b9395e40bd7368b91c51d100a883d4a SHA256 abda4128cc9b6aa44b1ed1ed678e0609552284890883203a62112a58bee70238
+EBUILD vlc-9999.ebuild 9814 RMD160 c97e991951400b9c54150262810bbca3ff845881 SHA1 564012c58396195ef96541da846bce4daaf32bfb SHA256 dcb6ba02f1959dcc4a8a972fcfbd330bf3a9dff1b8da4e6c1771d7a0e869a767
+MISC ChangeLog 100620 RMD160 0cc87e4a6134ace508c1f7ab63e8725a91c40d5d SHA1 a7b10755c554e9e958010c7063c430681f7a968c SHA256 14bcc13bd7e30ba5b6c49378cc968244d8da2a0012306d974844d825c63b6c19
 MISC metadata.xml 4211 RMD160 2a8b9684d21db73920b1967ea27af9828250c228 SHA1 5c4e0725c9e48f64c7b26237327c34ffe00cc976 SHA256 baa70c6763379c4f483ff330bb5f141882b6ea448c07be55c445bed332c5342e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1bz14ACgkQvFcC4BYPU0o3+gCgxwJmNhsNO/pTtM+n9A4x8OF4
-kCgAn1J995qkjxorL8hej+6ZyBczz4H0
-=/w/P
+iEYEARECAAYFAk1b4bIACgkQvFcC4BYPU0pOiwCfQ020k8s9ppFvAnl0J0hEIvA4
+O58An3jdnoZmPtABZ1/Q373vFr59Z5wN
+=aQdL
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 05a8e3ba765d..70fb89f3f6bc 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.103 2011/02/16 13:21:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.104 2011/02/16 14:39:41 aballier Exp $
 
-EAPI="3"
+EAPI="4"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
@@ -17,7 +17,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then
 	fi
 fi
 
-inherit eutils multilib autotools toolchain-funcs gnome2 qt4-r2 flag-o-matic ${SCM}
+inherit eutils multilib autotools toolchain-funcs flag-o-matic ${SCM}
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -64,7 +64,7 @@ RDEPEND="
 		alsa? ( >=media-libs/alsa-lib-1.0.23 )
 		avahi? ( >=net-dns/avahi-0.6[dbus] )
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		cdda? (	cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		cddb? ( >=media-libs/libcddb-1.2.0 )
 		dbus? ( >=sys-apps/dbus-1.0.2 )
 		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
 		dirac? ( >=media-video/dirac-0.10.0 )
@@ -79,7 +79,7 @@ RDEPEND="
 		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
 		gme? ( media-libs/game-music-emu )
 		gnome? ( gnome-base/gnome-vfs )
-		gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
+		gnutls? ( >=net-libs/gnutls-1.7.4 )
 		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
 		kate? ( >=media-libs/libkate-0.1.1 )
@@ -99,22 +99,17 @@ RDEPEND="
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
 		ogg? ( media-libs/libogg )
-		opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
+		opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
 		png? ( media-libs/libpng sys-libs/zlib )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
-		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
 		samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
 		sdl? ( >=media-libs/libsdl-1.2.8
 			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
 		shout? ( media-libs/libshout )
 		sid? ( media-libs/libsidplay:2 )
-		skins? (
-				x11-libs/qt-gui:4 x11-libs/qt-core:4
-				x11-libs/libXext x11-libs/libX11
-				media-libs/freetype media-fonts/dejavu
-			   )
 		speex? ( media-libs/speex )
 		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
 		svg? ( >=gnome-base/librsvg-2.9.0 )
@@ -124,8 +119,8 @@ RDEPEND="
 		twolame? ( media-sound/twolame )
 		udev? ( >=sys-fs/udev-142 )
 		upnp? ( net-libs/libupnp )
-		v4l2? ( libv4l2? ( media-libs/libv4l ) )
-		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.6 )
+		libv4l2? ( media-libs/libv4l )
+		vaapi? ( x11-libs/libva )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
@@ -146,41 +141,24 @@ DEPEND="${RDEPEND}
 	xcb? ( x11-proto/xproto )
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-# 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."
-}
-
-# Notify the user that some useflag have been forced on
-vlc_use_force() {
-	use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
-}
+REQUIRED_USE="
+	bidi? ( truetype )
+	cddb? ( cdda )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	libtiger? ( kate )
+	libv4l2? ( v4l2 )
+	qt4? ( X )
+	skins? ( truetype qt4 )
+	vaapi? ( ffmpeg )
+	vlm? ( stream )
+	xv? ( xcb )
+"
 
-# Use when $1 depends strictly on $2
-# if use $1 then enable $2
-vlc_use_enable_force() {
-	use $1 && echo "--enable-$2"
-}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	# Useflags we need to forcefuly enable
-	vlc_use_force gnutls gcrypt
-	vlc_use_force skins truetype
-	vlc_use_force skins qt4
-	vlc_use_force vlm stream
-	vlc_use_force vaapi ffmpeg
-
-	# Useflags that will be automagically discarded if deps are not met
-	vlc_use_needs bidi truetype
-	vlc_use_needs cddb cdda
-	vlc_use_needs fontconfig truetype
-	vlc_use_needs libv4l2 v4l2
-	vlc_use_needs libtiger kate
-	vlc_use_needs xv xcb
-
-	if use !qt4 && use !skins ; then
+	if use !qt4; then
 		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
 		ewarn "graphical interface. Maybe that is not what you want..."
 	fi
@@ -313,12 +291,7 @@ src_configure() {
 		--disable-snapshot \
 		--disable-growl \
 		--disable-optimizations \
-		--enable-fast-install \
-		$(vlc_use_enable_force vlm sout) \
-		$(vlc_use_enable_force skins qt4) \
-		$(vlc_use_enable_force skins freetype) \
-		$(vlc_use_enable_force gnutls libgcrypt) \
-		$(vlc_use_enable_force vaapi avcodec)
+		--enable-fast-install
 }
 
 src_install() {
@@ -332,8 +305,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_pkg_postinst
-
 	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
 		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
 		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"