Version bump. Require gtk+:3. Do not export private symbols and more.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 18 insertions, 49 deletions

diff --git a/media-libs/clutter-gtk/ChangeLog b/media-libs/clutter-gtk/ChangeLog
index eea5f6fe9652..72ec0c1b0898 100644
--- a/media-libs/clutter-gtk/ChangeLog
+++ b/media-libs/clutter-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/clutter-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.19 2011/03/22 20:12:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.20 2011/04/06 13:11:19 eva Exp $
+
+*clutter-gtk-1.0.0 (06 Apr 2011)
+
+  06 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -clutter-gtk-0.91.8.ebuild, -clutter-gtk-0.91.8-r1.ebuild,
+  +clutter-gtk-1.0.0.ebuild:
+  Version bump. Require gtk+:3. Do not export private symbols and more.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> clutter-gtk-0.10.8.ebuild:
   Marking clutter-gtk-0.10.8 ppc stable for bug 353436
diff --git a/media-libs/clutter-gtk/clutter-gtk-0.91.8-r1.ebuild b/media-libs/clutter-gtk/clutter-gtk-0.91.8-r1.ebuild
deleted file mode 100644
index eff92ab42318..000000000000
--- a/media-libs/clutter-gtk/clutter-gtk-0.91.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.91.8-r1.ebuild,v 1.3 2011/03/21 03:09:11 nirbheek Exp $
-
-EAPI="2"
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter
-
-DESCRIPTION="Clutter-GTK - GTK+3 Integration library for Clutter"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc debug examples +introspection"
-
-# XXX: Needs gtk with X support (!directfb)
-RDEPEND="
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=media-libs/clutter-1.2:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.18
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-EXAMPLES="examples/{*.c,*.ui,redhand.png}"
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--with-flavour=x11
-		--enable-maintainer-flags=no
-		$(use_enable introspection)"
-
-	# Slot the documentation
-	sed -e "s/\(DOC_MODULE.*=.*${PN}\).*/\1-${SLOT}/" \
-		-i doc/reference/Makefile.{am,in} || die "sed failed"
-	mv ${S}/doc/reference/clutter-gtk{,-${SLOT}}-docs.xml || die "mv failed"
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-0.91.8.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.0.0.ebuild
index e5d9e93f2675..d618226e5018 100644
--- a/media-libs/clutter-gtk/clutter-gtk-0.91.8.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.0.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.91.8.ebuild,v 1.3 2011/02/19 23:33:07 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-1.0.0.ebuild,v 1.1 2011/04/06 13:11:19 eva Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+CLUTTER_LA_PUNT="yes"
 
 # inherit clutter after gnome2 so that defaults aren't overriden
 inherit gnome2 clutter
@@ -11,25 +13,23 @@ DESCRIPTION="Clutter-GTK - GTK+3 Integration library for Clutter"
 
 SLOT="1.0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc debug examples +introspection"
+IUSE="doc examples +introspection"
 
 # XXX: Needs gtk with X support (!directfb)
 RDEPEND="
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=media-libs/clutter-1.2:1.0[introspection?]
+	>=x11-libs/gtk+-3:3[introspection?]
+	>=media-libs/clutter-1.4:1.0[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/gettext-0.18
 	doc? ( >=dev-util/gtk-doc-1.14 )"
-EXAMPLES="examples/{*.c,*.ui,redhand.png}"
 
-src_prepare() {
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	EXAMPLES="examples/{*.c,*.ui,redhand.png}"
 	G2CONF="${G2CONF}
 		--with-flavour=x11
 		--enable-maintainer-flags=no
 		$(use_enable introspection)"
-
-	sed -e "s/\(DOC_MODULE.*=.*${PN}\).*/\1-1.0/" \
-		-i doc/reference/Makefile.{am,in} || die "sed failed"
 }