Made use of python-any-r1 instead of python-single-r1 since python is only relevant at Python and the implementation does not matter. Use the global gstreamer USE flag instead of the local gst USE flag. Better support prefixes using EPREFIX. Thanks to Nikoli for these suggestions. More testing of dependency versions and the use of virtuals will follow the coming week...

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 43 insertions, 35 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index 699263df4a45..c4d3fb4d2999 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.1 2013/05/05 17:33:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.2 2013/05/05 20:59:23 tomwij Exp $
+
+  05 May 2013; Tom Wijsman <TomWij@gentoo.org> handbrake-0.9.9_pre5441.ebuild,
+  handbrake-9999.ebuild, metadata.xml:
+  Made use of python-any-r1 instead of python-single-r1 since python is only
+  relevant at Python and the implementation does not matter. Use the global
+  gstreamer USE flag instead of the local gst USE flag. Better support prefixes
+  using EPREFIX. Thanks to Nikoli for these suggestions. More testing of
+  dependency versions and the use of virtuals will follow the coming week...
 
 *handbrake-0.9.9_pre5441 (05 May 2013)
 *handbrake-9999 (05 May 2013)
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index d2acfe35f4f5..304faa3d249e 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -8,18 +8,18 @@ AUX handbrake-9999-remove-faac-dependency.patch 7478 SHA256 dd8b096ee47dfdc2bb3d
 AUX handbrake-9999-use-older-libmkv.patch 583 SHA256 17e15eccc630bf5dfcd66609d19bdcf57c731fba6c314af3a5a6d083de80ba7c SHA512 6ebcf55ffaab20301da1ceb2d993580a6b875676b65ee2d61d3fcaedf9e5a3b7e52128dae30363923218ba2e6f4510232c0e7738343e35c4c95048d35ff3933b WHIRLPOOL 075f604ec3c48345f435b3b2cd39b7d175c7df69600e5ca9438cd6d6a380673ff8848a2bf111cfe8fb3dff21ad33e822fbf7b45a3e547da8a0d9170a933e78d3
 AUX handbrake-9999-use-unpatched-a52.patch 944 SHA256 b8ccdecb0a70650af162fa649a323dd1c31268efe7c9ace58a89d70eab984c80 SHA512 aff9da64a434946600d1683f101bea1024319a418c57b0dbe9a8c287c72edf91d18102d51b817d9cea6e825d3a945741893956c55df16bf8f61b415a50dbeab4 WHIRLPOOL 97cf18bb453b435f88a60ed6417811eb8ce5c7af68f4e3d12316a72ac1594637f288511b54aee2b50fc04c356a0dba23dcf71b5712e9520371ab112f99b4f90f
 DIST handbrake-0.9.9_pre5441.tar.gz 5580422 SHA256 6a6b8348229c4ae820be329413418d2a50a023922f28119c5b6e5aa155e3ec22 SHA512 aa3faca48dc7fafa5e56c0388300c86b81084549228f20908351a878e737ed54609b98c557ded921e215e4f5ced84aa96a0d64c11a7e67a40ac7eba24f2701a4 WHIRLPOOL 6ad2c23b09414e6d5b15c8c8e0dfa9eac05040c0b1673549b94293c5c20f7f55b8a98d39920be9e6c980664fb861dbf23ee9704fe3bffb7b8facf9722a4e1cb3
-EBUILD handbrake-0.9.9_pre5441.ebuild 3629 SHA256 b033e8e35e665aa5a1c7cf4a09c156b8db1faeaad9939e42686e327881fb440a SHA512 e724341a29ab00ee70277256b34027e5417e9e6da39c2bb0b3c99f02f0ef432c66c18907a0c623d23f8546427c79f8c63a5453efd6a8095787517090a6a11c1f WHIRLPOOL e590ba5083e4e35836f44c3c9f910a8347cc1888f5f86e95298a7caa54300305f4841cbbd79855dd8548c40c7ca6f3b5174f3c054135ba4d1bfbb4e74abdef55
-EBUILD handbrake-9999.ebuild 3620 SHA256 3293089077e864496852918698984fceee8db8eaafe5c9a5089dbd7ea41ed443 SHA512 7a389e244be34a2899dc6f3bde1367272fbc05431e4cae365f8a318ce2ecb6d8b5c36959b9fdb71441e11b54c2c02f34e2a43d038f596b12c382448594bf411f WHIRLPOOL 44ef6c9773531d6d6fe47c497df754e2a5a862ad58179d4b4829238d1a6db8c248450987bf60e7bc6a1d48f7c2cc2056bbd3914c39b278b4bad92f321f47edd7
-MISC ChangeLog 1117 SHA256 4e48461429444b37e2e3e96675b7af45eef428cc07954e0dcb2e6224b8179755 SHA512 433da9a79b2639f72621dd51e739bd8bf30ae8d3378ff85d8eb1641c2adad39f4e408d43db71dd3c923b8f195d053f1abca7674443470f7b0e8ac62203763d7a WHIRLPOOL ca1c5f438a534c8213a27c11b8329dc627cb294b52194910547b90ae849442679ffbbe03973240d78dcb7c364d4c37bfb17fabd1fc52e10edf48a7ec4c3324e9
-MISC metadata.xml 757 SHA256 d88151e937f3672bf0d01a372e46c2b69b18f105f400088019ffece963502e57 SHA512 22f30472114af87574c9f5be1b36b16568239914460622f8f37d24a10118e05cfa484b2992c5c48b87f13a1d7f6c05b48e7575908b4aaf7a75c4727224dc2c03 WHIRLPOOL 462509f7e1b793022a9af05e6649df7a753d4f670c35f94a88ad4201411faa28751f580e298e1a866bc0a8b05bc7a063ddf7b4a4976f62f8a786911037e125ae
+EBUILD handbrake-0.9.9_pre5441.ebuild 3635 SHA256 c96fb45c09ea808bb08206ed071c79783b995608d3653a2e42742aeefe4f51e4 SHA512 3f9782dac74447348d6900e8cbe36c5f38390384f4474e6b2dc6c6c7f220f8d98e17c3442c0fffd02c3b7661b09dd9819ebe6ebe2ff82476b0a79abf711fc418 WHIRLPOOL b5f8cfd675ad02ecadff11b96b42f406031c1a01598c360a298ce709abdd6c3d9d8df217fae506023905b75dbb2769d5ca565f31036a5ce909009a3b7daf3661
+EBUILD handbrake-9999.ebuild 3626 SHA256 cdd9e3d70279213d6b53f46474bd0e6067856e0f3b1e81403f1fa1dc1b51809b SHA512 e27a3f5816b19dc51f69fbda49379717183da68fac326d09ed8e0f03415c590468fe6fc623d010112e521fdc830cd28c3433329370e43fdb7b2b731ac02e233d WHIRLPOOL c30c1081ba0408e67655bb025aceaa9197cb4ae1d486146385f4ef1b56d2186a5248b9580408896d959e7ccde1ce6732c299e692c61034d4eb85304cf17ba5d5
+MISC ChangeLog 1619 SHA256 a4239d04a5916a01a24a587a72abcf4b0c8a086d7ce9754866d7c1602be45d6d SHA512 112d343e95d1d03f7dfa0d057df20e23db4063f3dbb63119e58f8b8811c2a38d6de39ee5d59337f71f91a795c6b5698070cfb6092cc6000c2378f1ad31a7913a WHIRLPOOL 803f3cb9e59f8bcda40d28aca24b1b89770ccb5790e38d5ee9b9b7dd984e293a7f500a5adbb352d125e0d70e937b9637205b5831841fefa9c718a13c35426f84
+MISC metadata.xml 763 SHA256 6155cfc48064a39612d7e574b23e749461014333ce3764a7b9a449b1de2e38ba SHA512 11706eb71ccd43088aa9f4004405c82952bdd1e8fc0092d44f1323aec172be4cfd00b7b066ddebb2a16c51ebd664ea38bef1fe2b667e474c3dee94569c540459 WHIRLPOOL 3f4a4056e3052acff8ea9ed469ea2350ebf19199ea3222544912b9f53920f2b70b33cbef099e33b229faf72b389a1109096d61eb887cf03f9c06e905be051d59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRhpesAAoJEJWyH81tNOV9dV4H/RzNnHAKgNzTUi/okwoKEFXq
-z/IDWXQ09ig4AChE0M9jgBRGaHJEvuc139mbGLZKdUFERyv2RNcPCvSi7PfkBMtL
-HFqaXiJeFrficybEb6nM+fnvr2uBv6Q1VX1MuE1wxVonh9X+mjqqWwDlgNKqlMk8
-tKcQgxDQQ1J3VrUtpjhoYN7fOJrG9Lr0JpRApZOBils2z2+tyTrJmtvQZXhj4yJM
-2jj+mW1kNt3JJinmaWUHbMhmxn9Yp7513D1sNZRonyVvG90cQVnc17yMSLwmSGr5
-laYjze0Ngn7THONiu+7yyjPWSHEVE6KJ6xyRbKcUcOXwE1DDJ953ezQHdNkgebk=
-=iBXo
+iQEcBAEBCAAGBQJRhsfVAAoJEJWyH81tNOV9wPUIALaP/m8n+PMvT3Wu07zUVy50
+rK2uWg5LTPrqtxKU4wmXKFbq2oslfe36lPnajuXomWueirxldEzHWPS9A/1EAQAu
+nqNFAQtEylrxJ9MDKBAJ4GeIpEHWWVbpsfYwFYogT+u4Jebr4xpH1QLhPMOvA8PZ
+qk+F3UKRLAFxvv1AvXGKum37FNmTh0hXbG3rYY3JwJ1jIb4q6cS9BvxQmrvenOyW
+4ISvGRbv7VrIidjauLC2CBfz+dS7MNQCOwbP641tZSZpXJtEW2JSILDkVkNea3q5
+PA+fEs0vqa77InraFA5hIPd2DcHF4mtNkMOWiCum+gplA2GolL3Om543g4d73Yc=
+=NZ0B
 -----END PGP SIGNATURE-----
diff --git a/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild b/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild
index a17c7cfd8713..70ddd9817630 100644
--- a/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild,v 1.1 2013/05/05 17:33:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild,v 1.2 2013/05/05 20:59:23 tomwij Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit eutils gnome2-utils python-single-r1
+inherit eutils gnome2-utils python-any-r1
 
 if [[ ${PV} = *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
@@ -23,10 +23,10 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="gtk gst ffmpeg"
+IUSE="gtk gstreamer ffmpeg"
 
 # Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
-REQUIRED_USE="!ffmpeg? ( gst )"
+REQUIRED_USE="!ffmpeg? ( gstreamer )"
 
 RDEPEND="
 	media-libs/a52dec
@@ -45,7 +45,7 @@ RDEPEND="
 	ffmpeg? ( >=media-video/ffmpeg-1.2 )
 	sys-libs/glibc:2.2
 	sys-libs/zlib
-	gst? (
+	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
@@ -67,7 +67,7 @@ DEPEND="${RDEPEND}
 	sys-devel/automake"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -101,20 +101,20 @@ src_configure() {
 	local myconf=""
 
 	if ! use gtk ; then
-		myconf="${myconf} --disable-gtk"
+		myconf+=" --disable-gtk"
 	fi
 
-	if ! use gst ; then
-		myconf="${myconf} --disable-gst"
+	if ! use gstreamer ; then
+		myconf+=" --disable-gst"
 	fi
 
 	if use ffmpeg ; then
-		myconf="${myconf} --enable-ff-mpeg2"
+		myconf+=" --enable-ff-mpeg2"
 	fi
 
 	./configure \
 		--force \
-		--prefix=/usr \
+		--prefix="${EPREFIX}/usr" \
 		--disable-gtk-update-checks \
 		${myconf} || die "Configure failed."
 }
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index d611834d2c47..4fcea9e15b44 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.1 2013/05/05 17:33:51 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.2 2013/05/05 20:59:23 tomwij Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit eutils gnome2-utils python-single-r1
+inherit eutils gnome2-utils python-any-r1
 
 if [[ ${PV} = *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
@@ -23,10 +23,10 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="gtk gst ffmpeg"
+IUSE="gtk gstreamer ffmpeg"
 
 # Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
-REQUIRED_USE="!ffmpeg? ( gst )"
+REQUIRED_USE="!ffmpeg? ( gstreamer )"
 
 RDEPEND="
 	media-libs/a52dec
@@ -45,7 +45,7 @@ RDEPEND="
 	ffmpeg? ( >=media-video/ffmpeg-1.2 )
 	sys-libs/glibc:2.2
 	sys-libs/zlib
-	gst? (
+	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
@@ -67,7 +67,7 @@ DEPEND="${RDEPEND}
 	sys-devel/automake"
 
 pkg_setup() {
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -101,20 +101,20 @@ src_configure() {
 	local myconf=""
 
 	if ! use gtk ; then
-		myconf="${myconf} --disable-gtk"
+		myconf+=" --disable-gtk"
 	fi
 
-	if ! use gst ; then
-		myconf="${myconf} --disable-gst"
+	if ! use gstreamer ; then
+		myconf+=" --disable-gst"
 	fi
 
 	if use ffmpeg ; then
-		myconf="${myconf} --enable-ff-mpeg2"
+		myconf+=" --enable-ff-mpeg2"
 	fi
 
 	./configure \
 		--force \
-		--prefix=/usr \
+		--prefix="${EPREFIX}/usr" \
 		--disable-gtk-update-checks \
 		${myconf} || die "Configure failed."
 }
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 4a8643aa966f..520fba092725 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -10,7 +10,7 @@
   </longdescription>
   <use>
     <flag name="ffmpeg">Use FFmpeg from <pkg>media-video/ffmpeg</pkg> to decode MPEG-2 instead of <pkg>media-plugins/gst-plugins-mpeg2dec</pkg>.</flag>
+    <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
     <flag name="gtk">Support for Gimp ToolKit + from <pkg>x11-libs/gtk+</pkg>, requirement for a GUI-based HandBrake.</flag>
-    <flag name="gst">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
   </use>
 </pkgmetadata>