Fix bad deps in 0.10.11. liboil was dropped in favour of orc, so we depend on that on architectures where orc is available.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 24 insertions, 10 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index 1311a8a48a3c..dc46ca582f6a 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.120 2011/01/30 08:01:08 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.121 2011/01/30 08:40:58 ford_prefect Exp $
+
+*gst-plugins-ffmpeg-0.10.11-r1 (30 Jan 2011)
+
+  30 Jan 2011; Arun Raghavan <ford_prefect@gentoo.org>
+  -gst-plugins-ffmpeg-0.10.11.ebuild, +gst-plugins-ffmpeg-0.10.11-r1.ebuild,
+  metadata.xml:
+  Fix bad deps in 0.10.11. liboil was dropped in favour of orc, so we depend on
+  that on architectures where orc is available.
 
 *gst-plugins-ffmpeg-0.10.11 (30 Jan 2011)
 
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 4f4d48f16a9d..6de7e710d753 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -7,10 +7,10 @@ DIST gst-ffmpeg-0.10.5.tar.bz2 3031714 RMD160 ae314047c7a5feacc78dff4392f5e9989f
 DIST gst-ffmpeg-0.10.6.tar.bz2 3126310 RMD160 537ed2f6ce6463a6cc6d913c246afe130435309a SHA1 0979f167bbe440f1948060737c8d50a1400276b6 SHA256 c9a5f4c9b1eddd7cb042d83390072f832f19f3712d023e4d6568391e5eb4878a
 DIST gst-ffmpeg-0.10.7.tar.bz2 8208382 RMD160 7afb20556e91d50717821b3e61224cd01e835c5b SHA1 962484ce93cb632ee31d463034085aab2e93f178 SHA256 94bd5110a03837145afe5c81760f22bd7bef9ef455f4417340eeeb2b12e54fb0
 DIST gst-ffmpeg-0.10.9.tar.bz2 3310276 RMD160 07d0ac35a7896058b827992a07bd4f8501c0abc0 SHA1 88b68958680d345ebb7b261dbabd12b5908869ef SHA256 63ed1b3c7d548bed4ad50e05b14374cdb0d91e3bfac19248d68c7144bf2c8f15
-EBUILD gst-plugins-ffmpeg-0.10.11.ebuild 1116 RMD160 97e1bc84704a0c245c2f58ea12653e33b15688bf SHA1 e3315b39d83fe09023b5f07bb0455ac83f0d3e5c SHA256 9b8c1a435c78bf1fc3d5f66ceef8a176736c257e1c3beb29cc34696ee8e5ec70
+EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1155 RMD160 b3bfa11abe3d7b8c42f152a012e3d9204bb982aa SHA1 8d8dc94197b3e373332752f2ad80ea2177188a3e SHA256 2e3a909b60fd10423a5f8f346fc1282b9cebe4bbf82f6912653cf57aeca6b6e2
 EBUILD gst-plugins-ffmpeg-0.10.5.ebuild 1639 RMD160 4c7b9682017e2e11dd146f64d4d3dc11a8ddfd88 SHA1 09562974b2de22593a5400630f8587084897558b SHA256 27df9fa4c4130a94e4c0d400715ab78f0fc10cbdd45ca093f7810d777df9b1ef
 EBUILD gst-plugins-ffmpeg-0.10.6.ebuild 1543 RMD160 e9c07be85448a44d7718ac3c60fe23995f7259ae SHA1 f3a227c5b480d13f39aa169a5245cf2c72ac6182 SHA256 bdcb7eb0ca599c38834dcd81b37fe3411a6d5e069e4cb6dcc0dba696b1a8eacd
 EBUILD gst-plugins-ffmpeg-0.10.7.ebuild 1451 RMD160 b52726b0e402a31f00695dc84feb5b1071e00795 SHA1 c3af64b2ebcf88c66024e4b8c9e6dac164756d51 SHA256 821a3346b1ade67d9738196e1805de19ac749c777a2837af78f5c40dc927eb75
 EBUILD gst-plugins-ffmpeg-0.10.9.ebuild 1103 RMD160 b69788268add004f574f883d599acae19afcdd50 SHA1 f5ad3de7f65a5f44c1d52c8f1ce67099eec34e42 SHA256 ae4b13df8080264b9b7a92882ef15c593ae9290a27df59e448e15c3da596c72c
-MISC ChangeLog 17584 RMD160 d76f498842db5ca49e1a1d3d776d52c62bae9dcb SHA1 3eb4988df5305f631a7b3557f2455dbbce629a96 SHA256 209b1692180989041a88cc324b3ca0af181011f29959eab1eac31daed36cd84d
-MISC metadata.xml 181 RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d SHA1 faf40c45bd66b0072b95556cf7ab097d3be19511 SHA256 22c215902ccdc7fd8cdb765750fb23ea9d9b6c9d3edb1b45325c3469f8f6ffc5
+MISC ChangeLog 17907 RMD160 9c09b6f288ae3940a4bdf52570ca57852bb4fa48 SHA1 6c74a68f9be79cfd60139865da33847109225ee8 SHA256 75ee14fa71d8b8d668c71d6d2ff153ec2626382f683ce26eabbfc9fc5139ec60
+MISC metadata.xml 284 RMD160 7cc22001038b1ed2a95eb604de942b333449a98f SHA1 3b51c6e37d36e78ab53b51d83fe43980b2691f3d SHA256 f64fcc91266aa9c29d21e88be4f29f303151bb5b27aab1466f52404aaeb29d24
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild
index 345790b5e479..7ad6f3744201 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11.ebuild,v 1.1 2011/01/30 08:01:08 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.11-r1.ebuild,v 1.1 2011/01/30 08:40:58 ford_prefect Exp $
+
+EAPI=1
 
 inherit flag-o-matic eutils base
 
@@ -19,20 +21,20 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="+orc"
 
 S=${WORKDIR}/${MY_P}
 
 RDEPEND=">=media-libs/gstreamer-0.10.25
 	>=media-libs/gst-plugins-base-0.10.25
-	>=dev-libs/liboil-0.3.6"
+	orc? ( >=dev-lang/orc-0.4.5 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
 	append-flags -fno-strict-aliasing
 
-	econf
+	econf $(use_enable orc)
 	emake || die "emake failed."
 }
 
diff --git a/media-plugins/gst-plugins-ffmpeg/metadata.xml b/media-plugins/gst-plugins-ffmpeg/metadata.xml
index 3abe2ca2733e..861d11263019 100644
--- a/media-plugins/gst-plugins-ffmpeg/metadata.xml
+++ b/media-plugins/gst-plugins-ffmpeg/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gstreamer</herd>
-<herd>gnome</herd>
+	<herd>gstreamer</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="orc">Use <pkg>dev-lang/orc</pkg> for runtime
+			optimisations</flag>
+    </use>
 </pkgmetadata>