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

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 87 insertions, 9 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/Manifest b/media-libs/clutter/Manifest
index e60ce3bf8df7..2a1a7b289e51 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,5 +1,7 @@
 AUX clutter-1.0.0-disable-tests.patch 1445 RMD160 95018f8fce1d4c2d47ebd16402a02f2c86e0fdbc SHA1 f355cb8f13cb8fd4e192c925ea23efb8ac64f40b SHA256 5e168f0854c0883fc96ae489947b5b4e3b3f5ca36b6b0b461b5acfcd36e0c815
 DIST clutter-1.0.10.tar.bz2 2052074 RMD160 7738b2603298a687bfa056f458e84080bc880d1e SHA1 189684f0346bb895a2b47da64c02260c67e2810e SHA256 6fb98dc4d16a3a98be734cf0a6cc4f8d8179800603c3e41011c414eeaf1f456b
-EBUILD clutter-1.0.10.ebuild 2205 RMD160 305946c583e078e63a060ba715f8b4c0de524a06 SHA1 6b6b31bbf67451b8513d4cd4662a8fb9552e4914 SHA256 9b102b7a540d49fa9bffd0c56149cf6334d8d946573beca775fac77ea5d0c56f
-MISC ChangeLog 456 RMD160 c60133761dcc501cd6df4644d120ca91f8ac5fb8 SHA1 104132ca184112674d2e1a08270356a79d556402 SHA256 c27b541389eefb3f02bf222f20c59006c9bbfe70b02cb34e36debb2e3c3e3a7b
+DIST clutter-1.2.10.tar.bz2 2388873 RMD160 d780f30876f5ac577b2be89cd5630dcc20a803c2 SHA1 15f122315194a09b21fccbc31de6a1ce56918975 SHA256 26cdee7a528eb1346553d16ae8d8d87f35a8a46c0a86829eabd227067e84da5d
+EBUILD clutter-1.0.10.ebuild 2179 RMD160 fb3b0063495ad5d87526878a6638339b655917ed SHA1 f9564a4e47082bdd9cb3b7c63a2a0175f61548d4 SHA256 fd60556949d1ebd7ae17747f7900c47955ba7c25dd4345edc5ef2f764479ddcf
+EBUILD clutter-1.2.10.ebuild 1744 RMD160 276aa0824d7487177dd0b048ca16085b203027ff SHA1 177035480938344f1b1404a4c2598b50de34260f SHA256 11ed87d5db3a1acf24479f47e425b6abc0894db666c3a73294433d6082bc8bad
+MISC ChangeLog 722 RMD160 9da3edb444f18ee55e9c5c16b0749266a25d93d0 SHA1 13ec72baeaf77c34c000274bcaab919605cef76b SHA256 f54041a4b9b7cfcacedc7df34a41427056311116fd1963853bb1bc610459ec0c
 MISC metadata.xml 520 RMD160 c0f6ddaffda6e5e12509cd861547dcacdcccf60b SHA1 f39089709d1b316288bf92aef43aafed23687dfc SHA256 713ccd6e3437e50e71c23aa71d88fccd02b32d739681d12d65a84eeded3f9aad
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}
+}