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

["Priit Laes" <plaes@plaes.org>]

commit:     3e3af12ef71fbf1dbc1a54414938e45c8607ffbe
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Jan 30 17:29:52 2016 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Jan 30 17:29:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3e3af12e

media-libs/cogl: Update live ebuild to not use removed clutter eclass

 media-libs/cogl/cogl-9999.ebuild | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 10d4c6d..b1e1c85 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -3,10 +3,9 @@
 # $Id$
 
 EAPI="5"
-CLUTTER_LA_PUNT="yes"
+GCONF_DEBUG="yes"
 
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 multilib virtualx
+inherit gnome2 multilib virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -53,7 +52,8 @@ COMMON_DEPEND="
 "
 # before clutter-1.7, cogl was part of clutter
 RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7"
+	!<media-libs/clutter-1.7
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	sys-devel/gettext
@@ -134,9 +134,12 @@ src_test() {
 
 src_install() {
 	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,*.jpg}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,*.jpg}
+	fi
 
-	clutter_src_install
+	gnome2_src_install
 
 	# Remove silly examples-data directory
 	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die