Update to EAPI5. Drop old.

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

4 files changed, 16 insertions, 42 deletions

diff --git a/media-libs/clutter-gtk/ChangeLog b/media-libs/clutter-gtk/ChangeLog
index 9515e46a6da5..15d249dbc1a3 100644
--- a/media-libs/clutter-gtk/ChangeLog
+++ b/media-libs/clutter-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/clutter-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.36 2012/10/17 23:11:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.37 2012/12/05 23:20:14 tetromino Exp $
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  clutter-gtk-1.0.4.ebuild, -clutter-gtk-1.2.0.ebuild,
+  clutter-gtk-1.4.0.ebuild:
+  Update to EAPI5. Drop old.
 
 *clutter-gtk-1.4.0 (17 Oct 2012)
 
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild
index 4bc3b19f9610..4fd50e188a7c 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild
@@ -1,8 +1,8 @@
 # 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.9 2012/10/17 23:11:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.0.4.ebuild,v 1.10 2012/12/05 23:20:14 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 CLUTTER_LA_PUNT="yes"
 
@@ -19,17 +19,19 @@ IUSE="examples +introspection"
 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"
 
-pkg_setup() {
+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.2.0.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.2.0.ebuild
deleted file mode 100644
index 072844a2687b..000000000000
--- a/media-libs/clutter-gtk/clutter-gtk-1.2.0.ebuild
+++ /dev/null
@@ -1,35 +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.2.0.ebuild,v 1.5 2012/10/17 23:11:58 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter gnome.org
-
-DESCRIPTION="Clutter-GTK - GTK+3 Integration library for 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.2.0:3[introspection?]
-	>=media-libs/clutter-1.9.16: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"
-
-pkg_setup() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,redhand.png}"
-	G2CONF="${G2CONF}
-		--disable-maintainer-flags
-		--enable-deprecated
-		$(use_enable introspection)"
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.4.0.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.4.0.ebuild
index 0b5688b34def..053edc393f79 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.4.0.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.4.0.ebuild
@@ -1,8 +1,8 @@
 # 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.4.0.ebuild,v 1.1 2012/10/17 23:11:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.4.0.ebuild,v 1.2 2012/12/05 23:20:14 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 CLUTTER_LA_PUNT="yes"
 
@@ -18,17 +18,19 @@ IUSE="examples +introspection"
 RDEPEND="
 	>=x11-libs/gtk+-3.2.0:3[introspection?]
 	>=media-libs/clutter-1.9.16: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"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="NEWS README"
 	EXAMPLES="examples/{*.c,redhand.png}"
 	G2CONF="${G2CONF}
 		--disable-maintainer-flags
 		--enable-deprecated
 		$(use_enable introspection)"
+	gnome2_src_prepare
 }