[gentoo-commits] proj/gnome:master commit in: media-libs/clutter/

[Gilles Dartiguelongue]

commit:     59f20d180ceef5872f9a3719e3faf2a97b27d3ce
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 11:12:00 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 11:30:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=59f20d18

media-libs/clutter: 1.14.6 → 1.16.2

---
 ...lutter-1.13.10.ebuild => clutter-1.16.2.ebuild} | 75 ++++++++++------------
 media-libs/clutter/clutter-9999.ebuild             | 66 ++++++++++---------
 2 files changed, 69 insertions(+), 72 deletions(-)

diff --git a/media-libs/clutter/clutter-1.13.10.ebuild b/media-libs/clutter/clutter-1.16.2.ebuild
similarity index 67%
rename from media-libs/clutter/clutter-1.13.10.ebuild
rename to media-libs/clutter/clutter-1.16.2.ebuild
index 0cd2e08..da4ee38 100644
--- a/media-libs/clutter/clutter-1.13.10.ebuild
+++ b/media-libs/clutter/clutter-1.16.2.ebuild
@@ -8,29 +8,22 @@ CLUTTER_LA_PUNT="yes"
 # Inherit gnome2 after clutter to download sources from gnome.org
 # since clutter-project.org doesn't provide .xz tarballs
 inherit clutter gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
 
 LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
 IUSE="debug doc gtk +introspection test" # evdev tslib
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # XXX: uprof needed for profiling
 # >=libX11-1.3.1 needed for X Generic Event support
 RDEPEND="
-	>=dev-libs/glib-2.31.19:2
+	>=dev-libs/glib-2.37.3:2
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.13.4:1.0=[introspection?,pango]
+	>=media-libs/cogl-1.15.9:1.0=[introspection?,pango]
 	media-libs/fontconfig
 	>=x11-libs/cairo-1.10:=[glib]
 	>=x11-libs/pango-1.30[introspection?]
@@ -42,11 +35,11 @@ RDEPEND="
 	x11-libs/libXdamage
 	x11-proto/inputproto
 	>=x11-libs/libXi-1.3
-	>=x11-libs/libXfixes-3
 	>=x11-libs/libXcomposite-0.4
 
 	gtk? ( >=x11-libs/gtk+-3.3.18:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.15
 	virtual/pkgconfig
@@ -59,9 +52,19 @@ DEPEND="${RDEPEND}
 
 # Tests fail with both swrast and llvmpipe
 # They pass under r600g or i965, so the bug is in mesa
-RESTRICT="test"
+#RESTRICT="test"
 
 src_prepare() {
+	# We only need conformance tests, the rest are useless for us
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility data conform/g' \
+		-i tests/Makefile.am || die "am tests sed failed"
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility data conform/g' \
+		-i tests/Makefile.in || die "in tests sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
 	DOCS="README NEWS ChangeLog*"
 
 	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
@@ -69,33 +72,25 @@ src_prepare() {
 	# XXX: Profiling, coverage disabled for now
 	# XXX: What about cex100/egl/osx/wayland/win32 backends?
 	# XXX: evdev/tslib input seem to be experimental?
-	G2CONF="${G2CONF} ${myconf}
-		--enable-xinput
-		--enable-x11-backend=yes
-		--disable-profile
-		--disable-maintainer-flags
-		--disable-gcov
-		--disable-cex100-backend
-		--disable-egl-backend
-		--disable-quartz-backend
-		--disable-wayland-backend
-		--disable-win32-backend
-		--disable-tslib-input
-		--disable-evdev-input
-		$(usex debug --enable-debug=yes --enable-debug=minimum)
-		$(use_enable gtk gdk-backend)
-		$(use_enable introspection)
-		$(use_enable doc docs)
-		$(use_enable test conformance)
-		$(use_enable test gdk-pixbuf)"
-
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-
-	gnome2_src_prepare
+	gnome2_src_configure \
+		--enable-xinput \
+		--enable-x11-backend=yes \
+		--disable-profile \
+		--disable-maintainer-flags \
+		--disable-gcov \
+		--disable-cex100-backend \
+		--disable-egl-backend \
+		--disable-quartz-backend \
+		--disable-wayland-backend \
+		--disable-win32-backend \
+		--disable-tslib-input \
+		--disable-evdev-input \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable doc docs) \
+		$(use_enable gtk gdk-backend) \
+		$(use_enable introspection) \
+		$(use_enable test conformance) \
+		$(use_enable test gdk-pixbuf)
 }
 
 src_compile() {

diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index 0cd2e08..098e26a 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -27,10 +27,10 @@ fi
 # XXX: uprof needed for profiling
 # >=libX11-1.3.1 needed for X Generic Event support
 RDEPEND="
-	>=dev-libs/glib-2.31.19:2
+	>=dev-libs/glib-2.37.3:2
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.13.4:1.0=[introspection?,pango]
+	>=media-libs/cogl-1.15.9:1.0=[introspection?,pango]
 	media-libs/fontconfig
 	>=x11-libs/cairo-1.10:=[glib]
 	>=x11-libs/pango-1.30[introspection?]
@@ -42,11 +42,11 @@ RDEPEND="
 	x11-libs/libXdamage
 	x11-proto/inputproto
 	>=x11-libs/libXi-1.3
-	>=x11-libs/libXfixes-3
 	>=x11-libs/libXcomposite-0.4
 
 	gtk? ( >=x11-libs/gtk+-3.3.18:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.15
 	virtual/pkgconfig
@@ -59,36 +59,9 @@ DEPEND="${RDEPEND}
 
 # Tests fail with both swrast and llvmpipe
 # They pass under r600g or i965, so the bug is in mesa
-RESTRICT="test"
+#RESTRICT="test"
 
 src_prepare() {
-	DOCS="README NEWS ChangeLog*"
-
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# (GLX error blabla)
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What about cex100/egl/osx/wayland/win32 backends?
-	# XXX: evdev/tslib input seem to be experimental?
-	G2CONF="${G2CONF} ${myconf}
-		--enable-xinput
-		--enable-x11-backend=yes
-		--disable-profile
-		--disable-maintainer-flags
-		--disable-gcov
-		--disable-cex100-backend
-		--disable-egl-backend
-		--disable-quartz-backend
-		--disable-wayland-backend
-		--disable-win32-backend
-		--disable-tslib-input
-		--disable-evdev-input
-		$(usex debug --enable-debug=yes --enable-debug=minimum)
-		$(use_enable gtk gdk-backend)
-		$(use_enable introspection)
-		$(use_enable doc docs)
-		$(use_enable test conformance)
-		$(use_enable test gdk-pixbuf)"
-
 	# We only need conformance tests, the rest are useless for us
 	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
 		-i tests/Makefile.am || die "am tests sed failed"
@@ -98,6 +71,35 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	DOCS="README NEWS ChangeLog*"
+
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# (GLX error blabla)
+	# XXX: Profiling, coverage disabled for now
+	# XXX: What about cex100/egl/osx/wayland/win32 backends?
+	# XXX: evdev/tslib input seem to be experimental?
+	gnome2_src_configure \
+		--enable-xinput \
+		--enable-x11-backend=yes \
+		--disable-profile \
+		--disable-maintainer-flags \
+		--disable-gcov \
+		--disable-cex100-backend \
+		--disable-egl-backend \
+		--disable-quartz-backend \
+		--disable-wayland-backend \
+		--disable-win32-backend \
+		--disable-tslib-input \
+		--disable-evdev-input \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable doc docs) \
+		$(use_enable gtk gdk-backend) \
+		$(use_enable introspection) \
+		$(use_enable test conformance) \
+		$(use_enable test gdk-pixbuf)
+}
+
 src_compile() {
 	default
 	if use test; then