Convert to EAPI 2 in order to nuke built_with_use usage.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 24 insertions, 25 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 48b44be4ac90..81f88cdc2cd0 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-softdevice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.64 2009/06/30 20:46:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.65 2009/09/19 18:29:38 betelgeuse Exp $
+
+  19 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+  vdr-softdevice-0.5.0.20090630.ebuild:
+  Convert to EAPI 2 in order to nuke built_with_use usage.
 
 *vdr-softdevice-0.5.0.20090630 (30 Jun 2009)
 
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 2d9a9a56fc86..76510bba2739 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -12,13 +12,13 @@ DIST vdr-softdevice-cvs-20090218.tar.bz2 161620 RMD160 273b55bd4dd551b82714724aa
 DIST vdr-softdevice-cvs-20090630.tar.bz2 162845 RMD160 2855c6e7177a770982efabd0c81fea03ce0e72de SHA1 c3930fbdefa8e15a7949745e82fa92865817f9b1 SHA256 02b6c4277bcc77df2e488bb0ba3efd59c4fcaa61ec6f3ba88ccf77c4e1d5a609
 EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3566 RMD160 f4fb258bf79f7969e5f4a894bc57ea0227fb02cb SHA1 8307b7065d0bc1f44ec9a9d20c99c70baec390e8 SHA256 b9443de9249cb7c12510eaba76de19c14793f5fc9451c43afb3b817d1717ef72
 EBUILD vdr-softdevice-0.5.0.20090218.ebuild 3313 RMD160 734363deaaa61357aa7e6dafcf8ae40949571e9b SHA1 6ba937eed366bdc6cfdcc09b5a547ae84d1dbb7d SHA256 d58aff20d0192177e2a70e1ed8aeabbf23cc8ae4166ffa0fa9bbba848adbac7a
-EBUILD vdr-softdevice-0.5.0.20090630.ebuild 3314 RMD160 f1f5b03cf0d932ea92c5bd0e87a32607a7dce6ff SHA1 b8cbe0588707d4ffc224f53e487841b712db4082 SHA256 4a8df2c19322b78810a6be80b33270706695994e79b2c74a530f3b5a9b645e7f
-MISC ChangeLog 14787 RMD160 2c31357d5132a842896683b583135f1d749f91d4 SHA1 c2a4f4a6e855abc5c54f2a5ba4707ffdce29d72f SHA256 53997fe669a79f512380bb13ae88e0b951c526c03cce89dd491fa455d4229140
+EBUILD vdr-softdevice-0.5.0.20090630.ebuild 3042 RMD160 d47f27a443e1779fc810487c55c9d757a32c68d3 SHA1 5a23084545983f76e738db56d124e6075f1cadcb SHA256 961e3c554f0484eb77db7bc7acf330cfc4f64aa66e3e3de4b9d6bded4eae5bd6
+MISC ChangeLog 14946 RMD160 7b32239b0b90b2f47e1506e5c782e01c0d561a08 SHA1 40b49f698c31b4a00dcb4979494468bbfa3c0446 SHA256 60e465574b2f5d1358698b14f6b6328cfc6e58b2b2787335871028633292023f
 MISC metadata.xml 315 RMD160 9ff61fc577af435ee1e4c8cc622a7495ee2b6932 SHA1 514ba8e35690751b2d1d8cfba2c4162152f07d0f SHA256 0e99bf3f1538b2fef87bd304d896b78a5ddfb8a75277550c261801dcd3c4e279
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpKebAACgkQt2vP6XvVdOco1gCfQySoaxqE8UVyqG8+4UZgLSJM
-MBYAn1TQYeBAw+J7Efm4u6kBC0ib0ZyZ
-=py5Z
+iEYEARECAAYFAkq1IxgACgkQcxLzpIGCsLRoPwCff04HNJfwPlHVw4UrK5XPErYj
+kIUAn28dpDPElNXQAOZNl3jRbWlZBKv+
+=unS+
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
index 30c0e63f2dc9..e67a20dcbe3a 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.1 2009/06/30 20:46:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.2 2009/09/19 18:29:38 betelgeuse Exp $
 
-EAPI=1
+EAPI="2"
 
 inherit eutils vdr-plugin versionator
 
@@ -24,8 +24,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+xv fbcon directfb mmx mmxext xinerama"
 
+# converted from built_with_use that had this comment:
+# Check for ffmpeg relying on libtheora without pkg-config-file
+# Bug #142250
 RDEPEND=">=media-video/vdr-1.3.36
-	>=media-video/ffmpeg-0.4.9_pre1
+	|| (
+		>=media-video/ffmpeg-0.4.9_pre1[-theora]
+		(
+			>=media-video/ffmpeg-0.4.9_pre1[theora]
+			>=media-libs/libtheora-1.0_alpha4
+		)
+	)
 	directfb? (
 		dev-libs/DirectFB
 		dev-libs/DFB++
@@ -74,21 +83,9 @@ pkg_setup() {
 		0)	elog "SHM support will not be compiled." ;;
 		1)	elog "SHM support will be compiled." ;;
 	esac
-
-	# Check for ffmpeg relying on libtheora without pkg-config-file
-	# Bug #142250
-	if built_with_use media-video/ffmpeg theora	&& \
-		has_version "<media-libs/libtheora-1.0_alpha4"; then
-
-			eerror "This package will not work when using ffmpeg with"
-			eerror "USE=\"theora\" combined with media-libs/libtheora"
-			eerror "older than version 1.0_alpha4."
-			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
-			die "Please update to at least media-libs/libtheora-1.0_alpha4."
-	fi
 }
 
-src_compile() {
+src_configure() {
 	local MYOPTS=""
 	MYOPTS="${MYOPTS} --disable-vidix"
 	use xv || MYOPTS="${MYOPTS} --disable-xv"
@@ -105,8 +102,6 @@ src_compile() {
 	cd "${S}"
 	elog configure ${MYOPTS}
 	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
 }
 
 src_install() {