Bump to 1.2.10 (no more SDL, uses external json-glib, API/ABI compatible with 1.0.10, etc.), fix introspection deps for 1.0.10

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 83 insertions, 7 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 24f9165d8d4e..b7c2ffcbb35c 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.1 2010/02/26 21:41:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.2 2010/06/25 14:14:56 nirbheek Exp $
+
+*clutter-1.2.10 (25 Jun 2010)
+
+  25 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org> clutter-1.0.10.ebuild,
+  +clutter-1.2.10.ebuild:
+  Bump to 1.2.10 (no more SDL, uses external json-glib, API/ABI compatible
+  with 1.0.10, etc.), fix introspection deps for 1.0.10
 
 *clutter-1.0.10 (26 Feb 2010)
 
diff --git a/media-libs/clutter/clutter-1.0.10.ebuild b/media-libs/clutter/clutter-1.0.10.ebuild
index 5eaee9b569c2..d8fd78a699be 100644
--- a/media-libs/clutter/clutter-1.0.10.ebuild
+++ b/media-libs/clutter/clutter-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.0.10.ebuild,v 1.1 2010/02/26 21:41:15 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.0.10.ebuild,v 1.2 2010/06/25 14:14:56 nirbheek Exp $
 
 EAPI="2"
 
@@ -10,11 +10,11 @@ DESCRIPTION="Clutter is a library for creating graphical user interfaces"
 
 SLOT="1.0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +gtk introspection +opengl"
+IUSE="debug doc +gtk +introspection +opengl"
 
 RDEPEND=">=dev-libs/glib-2.16
 	>=x11-libs/cairo-1.4
-	>=x11-libs/pango-1.20
+	>=x11-libs/pango-1.20[introspection?]
 
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	opengl? (
@@ -36,9 +36,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.11
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
 		app-text/xmlto )
-	introspection? (
-		>=dev-libs/gobject-introspection-0.6.4
-		>=dev-libs/gir-repository-0.6.3[pango] )"
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
 
 src_configure() {
 	local myconf=""
diff --git a/media-libs/clutter/clutter-1.2.10.ebuild b/media-libs/clutter/clutter-1.2.10.ebuild
new file mode 100644
index 000000000000..80b69001f04c
--- /dev/null
+++ b/media-libs/clutter/clutter-1.2.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.2.10.ebuild,v 1.1 2010/06/25 14:14:56 nirbheek Exp $
+
+EAPI="2"
+
+inherit clutter
+
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +gtk +introspection"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/cairo-1.4
+	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/json-glib-0.8[introspection?]
+
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXdamage
+	x11-libs/libXi
+	x11-proto/inputproto
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXcomposite-0.4
+
+	gtk? ( >=x11-libs/gtk+-2.0 )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/gtk-doc-am
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
+		dev-libs/libxslt )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
+
+src_configure() {
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# XXX: Profiling, coverage disabled for now
+	# FIXME: Uses internal json-glib
+	local myconf="
+		--enable-debug=minimum
+		--enable-cogl-debug=minimum
+		--enable-conformance=no
+		--disable-gcov
+		--enable-profile=no
+		--enable-maintainer-flags=no
+		--enable-xinput
+		--with-json=system
+		--with-flavour=glx
+		--with-imagebackend=gdk-pixbuf
+		$(use_enable introspection)
+		$(use_enable doc docs)"
+
+	if ! use gtk; then
+		myconf="${myconf} --with-imagebackend=internal"
+		# Internal image backend is experimental
+		ewarn "You have selected the experimental internal image backend"
+	fi
+
+	if use debug; then
+		myconf="${myconf}
+			--enable-debug=yes
+			--enable-cogl-debug=yes"
+	fi
+
+	econf ${myconf}
+}