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

[Gilles Dartiguelongue]

commit:     14f938677bea36785cc3b9342c3ad7c907ba4e35
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=14f93867

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

Compare 0.10 series with 1.0 and update both as needed.

---
 ....0.3.ebuild => gst-plugins-ugly-0.10.19.ebuild} |   14 ++++++++------
 .../gst-plugins-ugly/gst-plugins-ugly-1.0.3.ebuild |    6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.0.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-0.10.19.ebuild
similarity index 74%
copy from media-libs/gst-plugins-ugly/gst-plugins-ugly-1.0.3.ebuild
copy to media-libs/gst-plugins-ugly/gst-plugins-ugly-0.10.19.ebuild
index da4f565..7a43407 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.0.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-0.10.19.ebuild
@@ -15,15 +15,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 IUSE="+orc"
 
 RDEPEND="
-	>=dev-libs/glib-2.32:2
-	orc? ( >=dev-lang/orc-0.4.16 )
+	>=dev-libs/glib-2.24:2
+	>=media-libs/gstreamer-0.10.36:${SLOT}
+	>=media-libs/gst-plugins-base-0.10.36:${SLOT}
+	orc? ( >=dev-lang/orc-0.4.11 )
 "
 DEPEND="${RDEPEND}
-	=media-libs/gst-plugins-base-${PV}:${SLOT}
-	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/gtk-doc-am-1.3
 "
-
-DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+RDEPEND="${RDEPEND}
+	!<media-libs/gst-plugins-bad-0.10.13"
 
 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-ugly/gst-plugins-ugly-1.0.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.0.3.ebuild
index da4f565..3e926b3 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.0.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.0.3.ebuild
@@ -16,15 +16,14 @@ IUSE="+orc"
 
 RDEPEND="
 	>=dev-libs/glib-2.32:2
+	>=media-libs/gstreamer-1:${SLOT}
+	>=media-libs/gst-plugins-base-1:${SLOT}
 	orc? ( >=dev-lang/orc-0.4.16 )
 "
 DEPEND="${RDEPEND}
-	=media-libs/gst-plugins-base-${PV}:${SLOT}
 	>=dev-util/gtk-doc-am-1.12
 "
 
-DOCS="AUTHORS ChangeLog NEWS README RELEASE"
-
 GST_PLUGINS_BUILD=""
 
 src_configure() {
@@ -41,6 +40,7 @@ src_compile() {
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
 	default
 	prune_libtool_files --modules
 }