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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     47de21f6c162cbd233f2e998e9b30f1382327ec4
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 21:04:44 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 20:33:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=47de21f6

media-libs/clutter: 1.16.4-r1 → 1.18.0

---
 .../{clutter-9999.ebuild => clutter-1.18.0.ebuild} | 30 ++++++----------------
 media-libs/clutter/clutter-9999.ebuild             | 21 +++++----------
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-1.18.0.ebuild
similarity index 82%
copy from media-libs/clutter/clutter-9999.ebuild
copy to media-libs/clutter/clutter-1.18.0.ebuild
index dee41ec..d3ff5ae 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-1.18.0.ebuild
@@ -8,31 +8,25 @@ 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
+# XXX: evdev input requires libinput and gudev >= 136
 RDEPEND="
 	>=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.15.9:1.0=[introspection?,pango]
+	>=media-libs/cogl-1.17.3:1.0=[introspection?,pango]
 	media-libs/fontconfig
-	>=x11-libs/cairo-1.10:=[glib]
+	>=x11-libs/cairo-1.12:=[glib]
 	>=x11-libs/pango-1.30[introspection?]
 
 	virtual/opengl
@@ -48,7 +42,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/gtk-doc-am-1.20
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.17
 	doc? (
@@ -63,9 +57,9 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility data conform/g' \
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
 		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility data conform/g' \
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
 		-i tests/Makefile.in || die "in tests sed failed"
 
 	gnome2_src_prepare
@@ -96,19 +90,11 @@ src_configure() {
 		$(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
-		emake -C tests/conform
-	fi
-}
-
 src_test() {
-	Xemake check
+	Xemake check -C tests/conform
 }
 
 src_install() {

diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index dee41ec..f90ec47 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -26,13 +26,14 @@ fi
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # XXX: uprof needed for profiling
 # >=libX11-1.3.1 needed for X Generic Event support
+# XXX: evdev input requires libinput and gudev >= 136
 RDEPEND="
 	>=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.15.9:1.0=[introspection?,pango]
+	>=media-libs/cogl-1.17.3:1.0=[introspection?,pango]
 	media-libs/fontconfig
-	>=x11-libs/cairo-1.10:=[glib]
+	>=x11-libs/cairo-1.12:=[glib]
 	>=x11-libs/pango-1.30[introspection?]
 
 	virtual/opengl
@@ -48,7 +49,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/gtk-doc-am-1.20
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.17
 	doc? (
@@ -63,9 +64,9 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility data conform/g' \
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
 		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility data conform/g' \
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
 		-i tests/Makefile.in || die "in tests sed failed"
 
 	gnome2_src_prepare
@@ -96,19 +97,11 @@ src_configure() {
 		$(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
-		emake -C tests/conform
-	fi
-}
-
 src_test() {
-	Xemake check
+	Xemake check -C tests/conform
 }
 
 src_install() {