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

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

3 files changed, 39 insertions, 65 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/Manifest b/media-video/oxine/Manifest
index 39918835f3de..5338a1ea6a01 100644
--- a/media-video/oxine/Manifest
+++ b/media-video/oxine/Manifest
@@ -1,4 +1,24 @@
-DIST oxine-0.7.1.tar.gz 3653511 RMD160 503e9134e4a87cb7c066319bb323c958293b85be SHA1 fa81f1380f94bfbd1cc0bb648b8ff8c4e77aa6ee SHA256 bfe9e4f49996234eabf788397969c90901197b2b1823cdb9a61e529f5c0f6a7d
-EBUILD oxine-0.7.1-r1.ebuild 3135 RMD160 eba145cab184cec690c00aa5b49de967727b06ec SHA1 f02065de30f15aea6e49a2c6bb56742f23d4a994 SHA256 3cfce61fcb287177efe3ca828a3dee34a7652e2946cb9e619e272811d8616821
-MISC ChangeLog 4622 RMD160 b654f3ddafab0cfc4b4801217008784313049ffe SHA1 675630c8cb975bdf619b5d653b83a41a73c1f716 SHA256 366ab569de23559598212fa7bbef9ca94a86e1cdd00505dc297727f5e37a2a86
-MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST oxine-0.7.1.tar.gz 3653511 SHA256 bfe9e4f49996234eabf788397969c90901197b2b1823cdb9a61e529f5c0f6a7d SHA512 96f6851f6277d97530b1f4d95d0f0843c9c3262d1a97ccc431e8a674441e06ca8fc24a65f83be5735f54e089d636e60fb297fa7958279b24004eecbc1711a257 WHIRLPOOL 6e8c91ceb889dfa97daaa6f291987d0becb622c6755f82d01d9489016aa2699c0de1b499e274c0129fd440b821b840e05f7c3a2c7a9ed9539a2c13b230f00880
+EBUILD oxine-0.7.1-r1.ebuild 1877 SHA256 8f4caf7b0432b32d475cd95a6b7d3bbef54b3d4de0c404a302f2d1dd4315fc7f SHA512 46713c6e11b8de2d15bd3d655fa3d1ae986aa8b74aa82b1371e7e4e2da96421512e60fccb057a5f82fa26038a34a1c85634148405eabf0439cb0e2ec35094127 WHIRLPOOL 2223eddff872dda3e86d7b5ee02b40bbb8d7a36d3f07eea3fbbe094c10e1c5bde3551c0167c0bbae5cf58a352ca9d940be21d14d460ac45b804b03ba4a954bb4
+MISC ChangeLog 4789 SHA256 4df7ec98784ef3ae60f18b4bd1fe5eba11ba666b68acd6a9f43051404f84a164 SHA512 12af8a1a4d4c86d4042939cc76422daee7024c99ce2beeb7a7ae1f6ebac43a53b2fee16e17b185c227fb27ee3ca2a899a90dae03b7490a5d7ee88f6a7c9f9982 WHIRLPOOL d49446664845ca974c826fe6257cb7394915086292d57060579f41cc2f879f69b9aec35756a3d4477bbfcaecf2ad58f2dcd9359f730b16eaa6c196efe6d9952d
+MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTGdS1AAoJEE8aJVXqcZkdXRUP/it4ZZY8IKtxrgrM3fc81vSh
+Uir1Np8IrnYdWR20E+Ie2DtupyCebUJCYokST9F83PEhfw3rNmZi0RugmBS5oc3D
+X6OcxEYFddfolIAzrDG80glx5wwr+oZvrno5lRcxEx4EHfaxctSnPx8wDeK9D3ta
+JitM/9kAeQo7ivD9qYzp7PHppH3rC0sLQk2g+IXkETWGEEUo6KcAKo1asqZkfcnK
+7zPydChC4Q2koGF6RxAKIoBcL0waq1lvPIIqjM/YNEJNo9fcshy2+7Gx/ohmLTnu
+Xut/FdXXomVVLkxFy1NMqFux85sz0sy+VFZNQYITg1rAAfVEI8XXFmCfN8H8lDwc
+B1RAmth2xkV0gatLJ4vfw9cqNZO8nGVTtHfjj6wy6CiTEBOEad2knWhaac5UKGpH
+rsGbu6bU84r5UzwH3+BuMZibVAnVfC91w2KXtOdruV8SQVHJLTS+V/LIS0r41mH2
+41ECoiF8KFXenS1a0rUy4kLFats0RK9Rfrzi4/tJN6dlpWtTEDEHD9pHqSWZ64Fs
+fIoDUluMyKGSvRfTgcuAKCmv/eeYrqlXjzl75fUrzKdjr3EzLEdUxYCqrN6ddFma
+uUJFVDnTMKjqy204Uv1JzStIvDdSJQvOXEG8mUkURQesCal8uI23wyggqZT8O/i2
+g8rofjU/HkBkJxw1WFrn
+=SzdR
+-----END PGP SIGNATURE-----
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
-
 }