From bea8f5d57a6cb4e4028ecf36ee1217c25da66577 Mon Sep 17 00:00:00 2001
From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sat, 19 Sep 2009 18:29:38 +0000
Subject: Convert to EAPI 2 in order to nuke built_with_use usage. (Portage
 version: 2.2_rc40/cvs/Linux i686)

---
 media-plugins/vdr-softdevice/ChangeLog             |  6 ++++-
 .../vdr-softdevice-0.5.0.20090630.ebuild           | 31 +++++++++-------------
 2 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'media-plugins')

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/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() {
-- 
cgit v1.2.3-65-gdbad