[gentoo-commits] proj/gnome:master commit in: media-libs/gst-plugins-bad/

[Gilles Dartiguelongue]

commit:     34238ed6cb24f39f72c00d81d10dce7264b00374
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 14:25:28 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 15:14:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=34238ed6

media-libs/gst-plugins-bad: copy from gentoo-x86

Compare 0.10 series with 1.0 and update both as needed.

---
 ...1.0.3.ebuild => gst-plugins-bad-0.10.23.ebuild} |   14 ++++++++------
 .../gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild   |    8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23.ebuild
similarity index 73%
copy from media-libs/gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild
copy to media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23.ebuild
index bd4a845..520c4fb 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23.ebuild
@@ -14,13 +14,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x8
 IUSE="+orc"
 
 RDEPEND="
-	>=dev-libs/glib-2.32:2
-	orc? ( >=dev-lang/orc-0.4.16 )
+	>=dev-libs/glib-2.24:2
+	>=media-libs/gst-plugins-base-0.10.36:${SLOT}
+	>=media-libs/gstreamer-0.10.36:${SLOT}
+	orc? ( >=dev-lang/orc-0.4.11 )
 "
-DEPEND="${RDEPEND}
-	=media-libs/gst-plugins-base-${PV}:${SLOT}"
-
-DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	!<media-plugins/gst-plugins-farsight-0.12.11:${SLOT}"
 
 # Avoid --enable-bad passing by the eclass blindly
 GST_PLUGINS_BUILD=""
@@ -41,6 +42,7 @@ src_compile() {
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
 	default
 	prune_libtool_files --modules
 }

diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild
index bd4a845..df178a0 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.0.3.ebuild
@@ -15,12 +15,11 @@ IUSE="+orc"
 
 RDEPEND="
 	>=dev-libs/glib-2.32:2
+	>=media-libs/gst-plugins-base-1:${SLOT}
+	>=media-libs/gstreamer-1:${SLOT}
 	orc? ( >=dev-lang/orc-0.4.16 )
 "
-DEPEND="${RDEPEND}
-	=media-libs/gst-plugins-base-${PV}:${SLOT}"
-
-DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+DEPEND="${RDEPEND}"
 
 # Avoid --enable-bad passing by the eclass blindly
 GST_PLUGINS_BUILD=""
@@ -41,6 +40,7 @@ src_compile() {
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
 	default
 	prune_libtool_files --modules
 }