Clean up old revision.

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

3 files changed, 15 insertions, 48 deletions

diff --git a/media-libs/clutter-gtk/ChangeLog b/media-libs/clutter-gtk/ChangeLog
index 89cefedbe82c..c89e820403cc 100644
--- a/media-libs/clutter-gtk/ChangeLog
+++ b/media-libs/clutter-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/clutter-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.47 2013/03/28 17:40:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.48 2013/03/29 23:11:10 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -clutter-gtk-1.0.4.ebuild, clutter-gtk-1.4.4.ebuild:
+  Clean up old revision.
 
 *clutter-gtk-1.4.4 (28 Mar 2013)
 
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild
deleted file mode 100644
index bc580d64b242..000000000000
--- a/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild,v 1.11 2012/12/17 19:50:36 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter gnome.org
-
-DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
-HOMEPAGE="http://live.gnome.org/Clutter"
-
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 x86"
-IUSE="examples +introspection"
-
-# XXX: Needs gtk with X support (!directfb)
-RDEPEND="
-	>=x11-libs/gtk+-3:3[introspection?]
-	>=media-libs/clutter-1.4:1.0[introspection?]
-	media-libs/cogl:1.0=[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-src_prepare() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,redhand.png}"
-	G2CONF="${G2CONF}
-		--with-flavour=x11
-		--enable-maintainer-flags=no
-		$(use_enable introspection)"
-	gnome2_src_prepare
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.4.4.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.4.4.ebuild
index 150e646ff40e..976102ddc1f9 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.4.4.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.4.4.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-gtk/clutter-gtk-1.4.4.ebuild,v 1.1 2013/03/28 17:40:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.4.4.ebuild,v 1.2 2013/03/29 23:11:10 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -20,18 +20,19 @@ RDEPEND="
 	>=x11-libs/gtk+-3.6.0:3[introspection?]
 	>=media-libs/clutter-1.13.7:1.0[introspection?]
 	media-libs/cogl:1.0=[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-src_prepare() {
+src_configure() {
 	DOCS="NEWS README"
 	EXAMPLES="examples/{*.c,redhand.png}"
-	G2CONF="${G2CONF}
-		--disable-maintainer-flags
-		--enable-deprecated
-		$(use_enable introspection)"
-	gnome2_src_prepare
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-deprecated \
+		$(use_enable introspection)
 }