Migrate to EAPI 2.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

4 files changed, 42 insertions, 72 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/Manifest b/media-tv/freevo/Manifest
index 67680a82769b..6b17b4cdeba0 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freevo-1.8.2-mplayerargs.patch 3173 RMD160 9012cde6ba6f4939255c36959e55d4f74f3ca315 SHA1 977e7efcbccaa9583a436b6e919f090abdc440a0 SHA256 90911180f74e6d0b61563e0f439720119461c80f25581f153083276ea1b3d647
 AUX freevo-1.8.2.boot 1632 RMD160 1ac38228250957180886a14f842f7154734e6b6b SHA1 fc4dbd9ed2d7fa219e12396215d74ee8130fa999 SHA256 36d047e29c8707d73c7e63538ee0ea2b77f64045954f73e0838f5ef7532982bc
 AUX freevo.boot 1553 RMD160 2c2174de08b850a0da21ee07752abd3b9c2fb463 SHA1 a02253e749f699fc9c5aed3a8bdc2d049cdb57f6 SHA256 754c16099054887a178372759aac0bab7104cb6dd0a829f6f534c6523e31002d
@@ -6,7 +9,14 @@ AUX freevo.desktop 126 RMD160 bab4ae937c10d2a1d895bfadefa80d999a979692 SHA1 e95f
 AUX xbox-lircrc 1690 RMD160 8472024be1e467c69346ce0ea87033d76f389a2e SHA1 4856c57582e83514f4dccd3489a7076a6b2a4aa9 SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187098ae1dd1070
 DIST freevo-1.7.6.1.tar.gz 20856412 RMD160 a2151d64ee0a75c405a85d89ba1193c4ddaf3fe5 SHA1 b1867392796b7f8ce1caf980e9f2052290bb44e5 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e
 DIST freevo-1.8.2.tar.gz 26573021 RMD160 4a40c660bd4b58f4aa9ddcaa8deb99739c1d1421 SHA1 c08c87a9a80b3f139c1e67cd9a7ae08c92b605e8 SHA256 f8cc77fe66e8150b773ba2fab198cef053ba3e8af94820d12b8c7b3d556780ff
-EBUILD freevo-1.7.6.1.ebuild 6506 RMD160 3754c0b76b2c9614915e3534f65fa580dedd6fd8 SHA1 94d8ffc2492f6a4109117cf8cb73a2f8a5311050 SHA256 ef5d4908a74c599a92a2320bd9ad828f211f154c42547f6f13c8ce5a66b5118e
-EBUILD freevo-1.8.2.ebuild 7048 RMD160 549b54df99013c7e01f938f808254358ec61922f SHA1 289819684b14a3d23b8a679e9219cc12751b67bc SHA256 0901251c2d315417fc4b67e7df095561ea6e68bc9d5565c74f7a527c6a65b803
-MISC ChangeLog 10432 RMD160 f67b8160c046e1c68e1e52ef9ba0d94064839f4f SHA1 ae6908376fad220bd1ada4822ca80568dcebaa7a SHA256 3abcc558dc2aadd0af35b12d45ffe9494dd3ca783bad76b663f07b51829600ad
+EBUILD freevo-1.7.6.1.ebuild 5346 RMD160 083f37599f8dcd8b49f9c1558baea80406e1f8d6 SHA1 5b667e211f8ef759d80e8748eab469f945c3b41c SHA256 5ce7fa3c56c3c1cf6b9b5a53cdfbf589cbd7ca96af8eb7301b5421c4b734ba93
+EBUILD freevo-1.8.2.ebuild 5935 RMD160 08791a5b4658c69bad6858a8ed75e850cf9e613d SHA1 8fca0f53de726efbd5fe490bd7dbdaac7c6f3b9b SHA256 21305858163b0830c63af19e2934ee8166a24a12e01079ba2180d4895ca02cea
+MISC ChangeLog 10556 RMD160 85346af32d02b7b1a010fd3d7a6cd5b0f648e536 SHA1 8492750512606f465dbd02ea896a4a9b4789328a SHA256 46b5603eef11a335adad1a405c2dcdab3cb6cb362ea1c5bbf2378cbb297ee6e4
 MISC metadata.xml 1337 RMD160 0ef28da2292c0a670b447068723d6f7b0ba94040 SHA1 c55ebaca121cb0d6ca4ac21433934d5e603aaefb SHA256 a0689efacf368e999860198cbdbda67578885dc2cac4cc1747fdf074265f92ae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmz06cACgkQcxLzpIGCsLSL1wCfea235FP1MIU+rJqmxy9/tgBP
+tZMAn2OOqvwWIHmwRhjVshnRGBb8Uj1G
+=LYhs
+-----END PGP SIGNATURE-----
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() {