Clean up old revisions. Add back ~arm to 2.0 slot, it seems it was mistakenly dropped.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 9 insertions, 127 deletions

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index 0a3b60fcc766..d013210a9ffd 100644
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.41 2013/03/25 16:31:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.42 2013/03/29 23:11:53 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -clutter-gst-1.4.6.ebuild, -clutter-gst-1.9.92.ebuild,
+  clutter-gst-2.0.0.ebuild:
+  Clean up old revisions. Add back ~arm to 2.0 slot, it seems it was mistakenly
+  dropped.
 
   25 Mar 2013; Agostino Sarubbo <ago@gentoo.org> clutter-gst-1.6.0-r1.ebuild,
   clutter-gst-2.0.0.ebuild:
diff --git a/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild b/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild
deleted file mode 100644
index 26ffef64a1fc..000000000000
--- a/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild,v 1.8 2013/01/23 04:53:18 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-# inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
-# no PYTHON_DEPEND, python2 is just a build-time dependency
-inherit autotools python gnome2 clutter gnome.org
-
-DESCRIPTION="GStreamer integration library for Clutter"
-
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~ppc x86"
-IUSE="examples +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	>=media-libs/clutter-1.4.0:1.0[introspection?]
-	media-libs/cogl:1.0=[introspection?]
-	>=media-libs/gstreamer-0.10.26:0.10[introspection?]
-	media-libs/gst-plugins-base:0.10[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="AUTHORS NEWS README"
-	EXAMPLES="examples/{*.c,*.png,README}"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-
-	# bug #401383, https://bugzilla.gnome.org/show_bug.cgi?id=669054
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_compile() {
-	# Clutter tries to access dri without userpriv, upstream bug #661873
-	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-	unset DISPLAY
-	default
-}
diff --git a/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild b/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild
deleted file mode 100644
index 16c0ffe797bc..000000000000
--- a/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild,v 1.6 2013/02/02 22:46:17 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-# inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
-# no PYTHON_DEPEND, python2 is just a build-time dependency
-inherit python gnome2 clutter gnome.org
-
-DESCRIPTION="GStreamer integration library for Clutter"
-
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples +introspection"
-
-# FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	>=media-libs/clutter-1.6.0:1.0=[introspection?]
-	>=media-libs/cogl-1.8:1.0=[introspection?]
-	media-libs/gstreamer:1.0[introspection?]
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-base:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	=dev-lang/python-2*
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="AUTHORS NEWS README"
-	EXAMPLES="examples/{*.c,*.png,README}"
-	G2CONF="${G2CONF}
-		--disable-maintainer-flags
-		$(use_enable introspection)"
-
-	# Make doc parallel installable
-	cd "${S}"/doc/reference
-	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
-		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
-		-i Makefile.am Makefile.in || die
-	sed -e "s/\(<book.*name=\"\)clutter-gst/\1${PN}-${SLOT}/" \
-		-i html/clutter-gst.devhelp2 || die
-	mv clutter-gst-docs{,-${SLOT}}.sgml || die
-	mv clutter-gst-overrides{,-${SLOT}}.txt || die
-	mv clutter-gst-sections{,-${SLOT}}.txt || die
-	mv clutter-gst{,-${SLOT}}.types || die
-	mv html/clutter-gst{,-${SLOT}}.devhelp2
-
-	cd "${S}"
-	gnome2_src_prepare
-}
-
-src_compile() {
-	# Clutter tries to access dri without userpriv, upstream bug #661873
-	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-	unset DISPLAY
-	default
-}
diff --git a/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild b/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild
index fa4910b96ae0..41b69b234e9c 100644
--- a/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild,v 1.3 2013/03/25 16:31:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild,v 1.4 2013/03/29 23:11:53 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ inherit python gnome2 clutter gnome.org
 DESCRIPTION="GStreamer integration library for Clutter"
 
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples +introspection"
 
 # FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic