Use EAPI=5 and USE dependencies instead of pkg_setup, bug #424091 by flameeyes.

(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)

2 files changed, 15 insertions, 61 deletions

diff --git a/media-video/oxine/ChangeLog b/media-video/oxine/ChangeLog
index e8ea5eb3329e..402ed3dc0e5b 100644
--- a/media-video/oxine/ChangeLog
+++ b/media-video/oxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/oxine
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.38 2012/05/05 08:58:50 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/ChangeLog,v 1.39 2014/03/09 22:01:57 phajdan.jr Exp $
+
+  07 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> oxine-0.7.1-r1.ebuild:
+  Use EAPI=5 and USE dependencies instead of pkg_setup, bug #424091 by
+  flameeyes.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> oxine-0.7.1-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-video/oxine/oxine-0.7.1-r1.ebuild b/media-video/oxine/oxine-0.7.1-r1.ebuild
index 668592862a80..ad52733348e9 100644
--- a/media-video/oxine/oxine-0.7.1-r1.ebuild
+++ b/media-video/oxine/oxine-0.7.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.7.1-r1.ebuild,v 1.3 2012/05/05 08:58:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/oxine/oxine-0.7.1-r1.ebuild,v 1.4 2014/03/09 22:01:57 phajdan.jr Exp $
 
+EAPI="5"
 WANT_AUTOMAKE="1.9"
-inherit eutils autotools
+inherit eutils
 
 DESCRIPTION="OSD frontend for Xine"
 HOMEPAGE="http://oxine.sourceforge.net/"
@@ -13,18 +14,19 @@ KEYWORDS="amd64 ppc ~ppc64 x86"
 SLOT="0"
 IUSE="X curl debug dvb exif joystick jpeg lirc nls png v4l"
 
-COMMON_DEPEND="media-libs/xine-lib
+COMMON_DEPEND="media-libs/xine-lib[v4l?,X,imagemagick]
+	dvb? ( media-libs/xine-lib[v4l] )
 	dev-libs/libcdio
 	curl? ( net-misc/curl )
 	joystick? ( media-libs/libjsw )
 	jpeg? ( media-gfx/imagemagick
-		media-libs/netpbm
+		media-libs/netpbm[jpeg,zlib]
 		media-video/mjpegtools )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl
 		sys-devel/gettext )
 	png? ( media-gfx/imagemagick
-		media-libs/netpbm
+		media-libs/netpbm[png,zlib]
 		media-video/mjpegtools )
 	X? ( x11-libs/libXext
 		x11-libs/libX11 )"
@@ -33,55 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
-
-	# Video4Linux support
-	if ( use dvb || use v4l ) && ! built_with_use media-libs/xine-lib v4l ; then
-		eerror "Re-emerge xine-lib with the 'v4l' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	# X
-	if ! built_with_use media-libs/xine-lib X ; then
-		eerror "Re-emerge xine-lib with the 'X' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	# Image support
-	if (use png || use jpeg ) && ! built_with_use media-libs/netpbm zlib ; then
-		eerror "In order to enable image support, media-libs/netpbm must be"
-		eerror "emerged with the 'zlib' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	if (use png || use jpeg ) && ! built_with_use media-libs/netpbm png ; then
-		eerror "To view PNG images, media-libs/netpbm must be emerged with"
-		eerror "the 'png' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	if (use png || use jpeg ) && ! built_with_use media-libs/netpbm jpeg ; then
-		eerror "To view JPEG images, media-libs/netpbm must be emerged with"
-		eerror "with the 'jpeg' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	if ! built_with_use media-libs/xine-lib imagemagick ; then
-		eerror "To display its menus, oxine needs xine-lib to be compiled"
-		eerror "with with the 'imagemagick' USE flag"
-		REBUILD_DEPS=1
-	fi
-
-	if [[ ${REBUILD_DEPS} = 1 ]]; then
-		eerror "Check your USE flags, re-emerge the dependencies and then"
-		eerror "emerge this package."
-		die
-	fi
-
-}
-
-src_compile() {
-
+src_configure() {
 	# Note on images: Image support will be automatically disabled if
 	# netpbm, imagemagick or mjpegtools is not installed, irregardless
 	# of what the USE flags are set to.
@@ -104,14 +58,10 @@ src_compile() {
 		$( use_enable v4l ) \
 		--disable-extractor \
 		--disable-rpath || die "econf died"
-	emake || die "emake failed"
 }
 
 src_install() {
-
 	emake DESTDIR="${D}" install || die "emake install died"
-
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	dohtml doc/README.html doc/keymapping.pdf
-
 }