Bump to 1.2.14, bugfix release. Remove old 1.0 release that was completely unusable.

Package-Manager: portage-2.1.9.10/cvs/Linux x86_64

4 files changed, 82 insertions, 101 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 4a9180c784e2..022447cbea85 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.5 2010/09/25 13:44:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.6 2010/09/25 22:41:23 nirbheek Exp $
+
+*clutter-1.2.14 (25 Sep 2010)
+
+  25 Sep 2010; <nirbheek@gentoo.org> -clutter-1.0.10.ebuild,
+  +clutter-1.2.14.ebuild:
+  Bump to 1.2.14, bugfix release. Remove old 1.0 release that was completely
+  unusable.
 
   25 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> clutter-1.2.12.ebuild:
   Fix dependency on gobject-introspection, bug #337457.
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 3ce61e65ffe2..0ed5f60245c2 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 DIST clutter-1.2.10.tar.bz2 2388873 RMD160 d780f30876f5ac577b2be89cd5630dcc20a803c2 SHA1 15f122315194a09b21fccbc31de6a1ce56918975 SHA256 26cdee7a528eb1346553d16ae8d8d87f35a8a46c0a86829eabd227067e84da5d
 DIST clutter-1.2.12.tar.bz2 2396325 RMD160 6fc93feda3dcdd5f17ff7c40661211b078210b34 SHA1 70feff8c3c2bbf2d4ed7ed6ecae6ad04a464d499 SHA256 4582e6579897374d1f8ce51daa330311ebb90033fad95d5f076c1e9392b4ae68
-EBUILD clutter-1.0.10.ebuild 2179 RMD160 fb3b0063495ad5d87526878a6638339b655917ed SHA1 f9564a4e47082bdd9cb3b7c63a2a0175f61548d4 SHA256 fd60556949d1ebd7ae17747f7900c47955ba7c25dd4345edc5ef2f764479ddcf
+DIST clutter-1.2.14.tar.bz2 2405660 RMD160 2498feed53d78946b6336b501711493d99abfe74 SHA1 bd8f770c3f3b48954652e87a100d2659bee2176d SHA256 f9b7e6b8338662f8b0961579f6ad0f56b6696e65f2f122353fa0390959acc744
 EBUILD clutter-1.2.10.ebuild 1752 RMD160 7f74771118544579110c1845dad5acc74d581cdb SHA1 f41e9aae496f521afcbbec5bf755d09055797852 SHA256 82fda7839af7e847dcd314bfd10ab5f558cf86dc960e0a697af0574a49b06340
 EBUILD clutter-1.2.12.ebuild 1773 RMD160 70d5d7df4c602855057275b43cf120ddf38ceb94 SHA1 9249b2c44f527b34913d4038d0a5990704b314a5 SHA256 2a2b5a8c662513a9804f4d06b09a4e37c4b500c653f8d14b23ca32ccd937ae94
-MISC ChangeLog 1105 RMD160 ad14ceda7c0252804b8bd1057684319b117cd8ac SHA1 88cbb87873da9c5ac2d6261e40046acb09b3f7c2 SHA256 d79d84c63690f9137698f1bdccd57caab71d8cfce87200d422a9d3fe52c00ddb
+EBUILD clutter-1.2.14.ebuild 1744 RMD160 8ceb9d6c5df472041da772d8bc0f87197514d751 SHA1 e0fd33c8ae350deaf6a148ece105f54d620d79f5 SHA256 4e6f6e681784517a916b29ca47ea30f068f4ed499bf410c96c4b0704f4c8cfc6
+MISC ChangeLog 1318 RMD160 06f58b7c7de35f077e7b32e13711e65650ea1883 SHA1 fce981e91ad57881e0940b00c8951f8860a6900c SHA256 f0574bade140f81ce38bc02da57e9e9a2353e6d40a5420346eca2753ca8e6729
 MISC metadata.xml 520 RMD160 c0f6ddaffda6e5e12509cd861547dcacdcccf60b SHA1 f39089709d1b316288bf92aef43aafed23687dfc SHA256 713ccd6e3437e50e71c23aa71d88fccd02b32d739681d12d65a84eeded3f9aad
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyd/K8ACgkQ1fmVwcYIWAZmcACfYhnYDgc0wIyuUU/zbOdDfeFi
-S/QAn1CtC/aBU02oBZhS9l+MIlqKT8b8
-=9XXz
------END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.0.10.ebuild b/media-libs/clutter/clutter-1.0.10.ebuild
deleted file mode 100644
index d8fd78a699be..000000000000
--- a/media-libs/clutter/clutter-1.0.10.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.2 2010/06/25 14:14:56 nirbheek Exp $
-
-EAPI="2"
-
-inherit autotools clutter
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +gtk +introspection +opengl"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/cairo-1.4
-	>=x11-libs/pango-1.20[introspection?]
-
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	opengl? (
-		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 )
-	!opengl? ( media-libs/libsdl )
-"
-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]
-		app-text/xmlto )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
-
-src_configure() {
-	local myconf=""
-
-	if use opengl; then
-		elog "Using GLX for OpenGL backend"
-		myconf="${myconf} --with-flavour=glx"
-	else
-		elog "Using SDL for OpenGL backend"
-		myconf="${myconf} --with-flavour=sdl"
-		ewarn "You have disabled OpenGL, do not report bugs about breakage"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --with-imagebackend=gdk-pixbuf"
-	else
-		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=minimum
-			--enable-cogl-debug=minimum"
-	fi
-
-	# FIXME: Tests are interactive, not of use for us
-	# FIXME: Using external json-glib breaks introspection
-	myconf="${myconf}
-		--disable-tests
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-json=internal
-		$(use_enable introspection)
-		$(use_enable doc manual)"
-	econf ${myconf}
-}
-
-src_prepare() {
-	# Make it libtool-1 compatible
-	rm -v build/autotools/lt* build/autotools/libtool.m4 || die "removing libtool macros failed"
-
-	# FIXME: Tests are interactive, not of use for us
-	epatch "${FILESDIR}/${PN}-1.0.0-disable-tests.patch"
-
-	eautoreconf
-}
diff --git a/media-libs/clutter/clutter-1.2.14.ebuild b/media-libs/clutter/clutter-1.2.14.ebuild
new file mode 100644
index 000000000000..c0df71fe236f
--- /dev/null
+++ b/media-libs/clutter/clutter-1.2.14.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.14.ebuild,v 1.1 2010/09/25 22:41:23 nirbheek Exp $
+
+EAPI="2"
+
+inherit clutter
+
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc64 ~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/pkgconfig
+	>=dev-util/gtk-doc-am-1.11
+	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
+	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}
+}