update from ::gnome/next

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

4 files changed, 79 insertions, 63 deletions

diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 2c717596..112e44b9 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1 +1 @@
-EBUILD clutter-9999-r1.ebuild 1727 RMD160 5193ad83f563a4000c9892a29e784460c202ca26 SHA1 7e380eee78ec44ea58d6057c5a874fa27405eb3f SHA256 57c5bb1767ef2e4514bb35bce2ea8df9ff3788481fe912544ed547a2951ed3cb
+EBUILD clutter-9999-r1.ebuild 2292 RMD160 e082cf04374b9e2bdf19b8e266a1145b745d3c15 SHA1 0df5c36a1510b16c8a34b034ae79e347e6376fe8 SHA256 96117cf0c4656f4271798e4319a78954911cef020b7bb6eb2fa01189ce55d2f9
diff --git a/media-libs/clutter/clutter-9999-r1.ebuild b/media-libs/clutter/clutter-9999-r1.ebuild
index d017e4dc..8876977a 100644
--- a/media-libs/clutter/clutter-9999-r1.ebuild
+++ b/media-libs/clutter/clutter-9999-r1.ebuild
@@ -3,24 +3,29 @@
 # $Header: $
 
 EAPI="4"
+CLUTTER_LA_PUNT="yes"
 WANT_AUTOMAKE="1.11"
 
+# Inherit gnome2 after clutter to download sources from gnome.org
+# since clutter-project.org doesn't provide .xz tarballs
 inherit clutter gnome2-live
+
 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
 
 SLOT="1.0"
 IUSE="debug doc +introspection"
 KEYWORDS=""
 
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# XXX: uprof needed for profiling
 RDEPEND="
 	>=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/atk-1.17[introspection?]
 	>=dev-libs/json-glib-0.12[introspection?]
-	>=dev-libs/atk-1.17
-
-	x11-libs/gdk-pixbuf:2
-
+	>=media-libs/cogl-1.7.2:1.0[introspection?,pango]
+	>=x11-libs/cairo-1.10[glib]
+	>=x11-libs/pango-1.20[introspection?]
+	
 	virtual/opengl
 	x11-libs/libdrm
 	x11-libs/libX11
@@ -33,7 +38,6 @@ RDEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
 DEPEND="${RDEPEND}
-	>=media-libs/cogl-1.6
 	sys-devel/gettext
 	dev-util/pkgconfig
 	>=dev-util/gtk-doc-am-1.13
@@ -41,20 +45,17 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.13
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
 		dev-libs/libxslt )"
-DOCS="README NEWS ChangeLog*"
 
-src_prepare() {
-	# Some gettext stuff, we can't run gettextize because that does too much
-	cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po"
-
-	gnome2_src_prepare
+pkg_setup() {
+	DOCS="README NEWS ChangeLog*"
 
 	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
 	# XXX: Profiling, coverage disabled for now
 	# XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
 	#      Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
-	G2CONF="
-		--enable-debug=minimum
+	myconf="--enable-debug=minimum"
+	use debug && myconf="--enable-debug=yes"
+	G2CONF="${G2CONF} ${myconf}
 		--enable-conformance=no
 		--disable-gcov
 		--enable-profile=no
@@ -63,9 +64,21 @@ src_prepare() {
 		--with-flavour=glx
 		$(use_enable introspection)
 		$(use_enable doc docs)"
+}
+
+src_prepare() {
+	# Some gettext stuff, we can't run gettextize because that does too much
+	[[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po"
+
+	gnome2_src_prepare
+
+	# 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"
+}
 
-	if use debug; then
-		G2CONF="${myconf}
-			--enable-debug=yes"
-	fi
+src_install() {
+	clutter_src_install
 }
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index bdf9b880..8c541161 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1 +1 @@
-EBUILD cogl-9999.ebuild 1249 RMD160 e8c056f9ac2100716b3d105c8d9b1cb5b875a00f SHA1 3f3b73e72bf0dac2a09d908f0bd140b13c2a5aec SHA256 401efcd56c8f4e3047e08397b99a46ab4fee36dd0eedbf2f9a4fac57781a097f
+EBUILD cogl-9999.ebuild 1574 RMD160 1388d9b2bb0a66ec134edc4ce50a4f659d7fef5e SHA1 5f8a8371842781ddcda727af58cf12de497cf6d3 SHA256 b4c43201248b2d40766e15896a302552323df56f8638767082c8d93446ae19fd
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index fc92f0bd..4060f023 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -2,58 +2,61 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
-WANT_AUTOMAKE="1.11"
+EAPI="4"
+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-live
-DESCRIPTION="A hardware accelerated 3D graphics API"
 
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.clutter-project.org/"
+
+LICENSE="LGPL-2.1"
 SLOT="1.0"
-IUSE="debug +introspection"
+IUSE="doc examples +introspection +pango"
 KEYWORDS=""
 
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.20
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=dev-libs/atk-1.17
-
-	x11-libs/gdk-pixbuf:2
-
-	virtual/opengl
+# XXX: need uprof for optional profiling support
+COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2:2
 	x11-libs/libdrm
 	x11-libs/libX11
-	x11-libs/libXext
+	>=x11-libs/libXcomposite-0.4
 	x11-libs/libXdamage
-	x11-proto/inputproto
-	>=x11-libs/libXi-1.3
+	x11-libs/libXext
 	>=x11-libs/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
+	virtual/opengl
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	pango? ( >=x11-libs/pango-1.20.0[introspection?] )"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+	!!<media-libs/clutter-1.7"
+DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
-	>=dev-util/gtk-doc-am-1.13"
-DOCS="README NEWS ChangeLog*"
-
-src_prepare() {
-	# Some gettext stuff, we can't run gettextize because that does too much
-	cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po"
-
-	gnome2_src_prepare
-
-	G2CONF="
-		--enable-debug=no
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-glx=yes
-		--enable-gdk-pixbuf=yes
-		$(use_enable introspection)"
-
-	if use debug; then
-		G2CONF="${myconf}
-			--enable-debug=yes"
-	fi
+	sys-devel/gettext
+	doc? ( app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.13 )"
+
+pkg_setup() {
+	DOCS="NEWS README"
+	EXAMPLES="examples/*.c"
+	# XXX: think about gles, quartz, wayland
+	# --with-pic needed due to https://bugzilla.gnome.org/show_bug.cgi?id=653615
+	G2CONF="${G2CONF}
+		--with-pic=both
+		--disable-profile
+		--disable-maintainer-flags
+		--enable-cairo
+		--enable-gdk-pixbuf
+		--enable-gl
+		--enable-glx
+		$(use_enable introspection)
+		$(use_enable pango cogl-pango)"
+}
+
+src_install() {
+	clutter_src_install
 }