Migrate to EAPI 2.

(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)

3 files changed, 29 insertions, 69 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 9574869aff5e..013a3765bd0a 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.61 2009/01/09 06:39:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.62 2009/03/08 14:16:36 betelgeuse Exp $
+
+  08 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> freevo-1.7.6.1.ebuild,
+  freevo-1.8.2.ebuild:
+  Migrate to EAPI 2.
 
   09 Jan 2009; Patrick Lauer <patrick@gentoo.org> -freevo-1.7.2.ebuild:
   Remove old
diff --git a/media-tv/freevo/freevo-1.7.6.1.ebuild b/media-tv/freevo/freevo-1.7.6.1.ebuild
index f836ea80e8bc..d9499198d528 100644
--- a/media-tv/freevo/freevo-1.7.6.1.ebuild
+++ b/media-tv/freevo/freevo-1.7.6.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.6.1.ebuild,v 1.4 2008/05/01 09:27:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.6.1.ebuild,v 1.5 2009/03/08 14:16:36 betelgeuse Exp $
+
+EAPI="2"
 
 inherit distutils
 
@@ -19,16 +21,21 @@ RDEPEND=">=dev-python/pygame-1.5.6
 	>=dev-python/imaging-1.1.3
 	>=dev-python/twisted-2.4
 	>=dev-python/twisted-web-0.6
-	>=media-video/mplayer-0.92
+	>=media-video/mplayer-0.92[directfb?,fbcon?]
 	>=media-libs/freetype-2.1.4
-	>=media-libs/libsdl-1.2.5
+	>=media-libs/libsdl-1.2.5[directfb?,fbcon?]
+	media-libs/sdl-image[jpeg,png]
 	>=sys-apps/sed-4
 	>=dev-python/elementtree-1.2.6
 	>=dev-python/beautifulsoup-3.0
 	>=dev-python/kaa-base-0.2.0
 	>=dev-python/kaa-metadata-0.7.1
 	>=dev-python/kaa-imlib2-0.2.2
-	dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
+	dvd? (
+		>=media-video/xine-ui-0.9.22
+		>=media-video/lsdvd-0.10
+		media-libs/xine-lib[directfb?,fbcon?]
+	)
 	gphoto2? ( media-gfx/gphoto2 )
 	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )
 	matrox? ( >=media-video/matroxset-0.3 )
@@ -38,30 +45,6 @@ RDEPEND=">=dev-python/pygame-1.5.6
 		!minimal? ( media-tv/xmltv ) )"
 
 pkg_setup() {
-	if use directfb ; then
-		use dvd && ! built_with_use media-libs/xine-lib directfb \
-			&& ewarn "media-libs/xine-lib was not built with directfb support"
-		! built_with_use media-video/mplayer directfb \
-			&& ewarn "media-video/mplayer was not built with directfb support"
-		if ! built_with_use media-libs/libsdl directfb ; then
-			eerror "media-libs/libsdl was not built with directdb support"
-			eerror "Please re-emerge libsdl with the directfb use flag"
-			die "directfb use flag specified but no support in libsdl and others"
-		fi
-	fi
-
-	if use fbcon ; then
-		use dvd && ! built_with_use media-libs/xine-lib fbcon \
-			&& ewarn "media-libs/xine-lib was not built with fbcon support"
-		! built_with_use media-video/mplayer fbcon \
-			&& ewarn "media-video/mplayer was not built with fbcon support"
-		if ! built_with_use media-libs/libsdl fbcon ; then
-			eerror "media-libs/libsdl was not built with fbcon support"
-			eerror "Please re-emerge libsdl with the fbcon use flag"
-			die "fbcon use flag specified but no support in media-libs/libsdl and others"
-		fi
-	fi
-
 	if ! { use X || use directfb || use fbcon || use matrox ; } ; then
 		echo
 		ewarn "WARNING - no video support specified in USE flags."
@@ -69,11 +52,6 @@ pkg_setup() {
 		ewarn "support (X11, fbcon, directfb, etc) you plan on using."
 		echo
 	fi
-
-	if ! built_with_use -a media-libs/sdl-image jpeg png ; then
-		eerror "media-libs/sdl-image needs more image format support (USE=\"png jpeg\")"
-		die "re-emerge media-libs/sdl-image with the given USE flags"
-	fi
 }
 
 src_install() {
diff --git a/media-tv/freevo/freevo-1.8.2.ebuild b/media-tv/freevo/freevo-1.8.2.ebuild
index 7b456432d5d8..161b4cf0789a 100644
--- a/media-tv/freevo/freevo-1.8.2.ebuild
+++ b/media-tv/freevo/freevo-1.8.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.8.2.ebuild,v 1.3 2009/01/09 06:39:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.8.2.ebuild,v 1.4 2009/03/08 14:16:36 betelgeuse Exp $
+
+EAPI="2"
 
 inherit distutils eutils
 
@@ -28,12 +30,17 @@ RDEPEND="dev-python/pygame
 	>=dev-python/kaa-metadata-0.7.3
 	>=dev-python/kaa-imlib2-0.2.3
 
-	media-video/mplayer
-	>=media-libs/libsdl-1.2.5
+	media-video/mplayer[directfb?,fbcon?]
+	>=media-libs/libsdl-1.2.5[directfb?,fbcon?]
+	media-libs/sdl-image[jpeg,png]
 
 	cdparanoia? ( media-sound/cdparanoia )
-	dvd? ( >=media-video/lsdvd-0.10
-		encode? ( media-video/dvdbackup ) )
+	dvd? (
+		>=media-video/lsdvd-0.10
+		directfb? ( media-libs/xine-lib[directfb] )
+		fbcon? ( media-libs/xine-lib[fbcon] )
+		encode? ( media-video/dvdbackup )
+	)
 	flac? ( media-libs/flac )
 	gphoto2? ( media-libs/libgphoto2 )
 	jpeg? ( media-libs/jpeg )
@@ -50,30 +57,6 @@ RDEPEND="dev-python/pygame
 	xmame? ( games-emulation/xmame )"
 
 pkg_setup() {
-	if use directfb ; then
-		use dvd && ! built_with_use media-libs/xine-lib directfb \
-			&& ewarn "media-libs/xine-lib was not built with directfb support"
-		! built_with_use media-video/mplayer directfb \
-			&& ewarn "media-video/mplayer was not built with directfb support"
-		if ! built_with_use media-libs/libsdl directfb ; then
-			eerror "media-libs/libsdl was not built with directdb support"
-			eerror "Please re-emerge libsdl with the directfb use flag"
-			die "directfb use flag specified but no support in libsdl and others"
-		fi
-	fi
-
-	if use fbcon ; then
-		use dvd && ! built_with_use media-libs/xine-lib fbcon \
-			&& ewarn "media-libs/xine-lib was not built with fbcon support"
-		! built_with_use media-video/mplayer fbcon \
-			&& ewarn "media-video/mplayer was not built with fbcon support"
-		if ! built_with_use media-libs/libsdl fbcon ; then
-			eerror "media-libs/libsdl was not built with fbcon support"
-			eerror "Please re-emerge libsdl with the fbcon use flag"
-			die "fbcon use flag specified but no support in media-libs/libsdl and others"
-		fi
-	fi
-
 	if ! { use X || use directfb || use fbcon || use matrox ; } ; then
 		echo
 		ewarn "WARNING - no video support specified in USE flags."
@@ -81,11 +64,6 @@ pkg_setup() {
 		ewarn "support (X11, fbcon, directfb, etc) you plan on using."
 		echo
 	fi
-
-	if ! built_with_use -a media-libs/sdl-image jpeg png ; then
-		eerror "media-libs/sdl-image needs more image format support (USE=\"png jpeg\")"
-		die "re-emerge media-libs/sdl-image with the given USE flags"
-	fi
 }
 
 src_unpack() {