From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-860571-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 65BD458973
	for <garchives@archives.gentoo.org>; Sat, 30 Jan 2016 17:33:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B34A221C007;
	Sat, 30 Jan 2016 17:33:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 2302421C007
	for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 17:33:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E0810340CE7
	for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 17:33:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id F2178C0
	for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 17:33:36 +0000 (UTC)
From: "Priit Laes" <plaes@plaes.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" <plaes@plaes.org>
Message-ID: <1454174992.3e3af12ef71fbf1dbc1a54414938e45c8607ffbe.plaes@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
X-VCS-Repository: proj/gnome
X-VCS-Files: media-libs/cogl/cogl-9999.ebuild
X-VCS-Directories: media-libs/cogl/
X-VCS-Committer: plaes
X-VCS-Committer-Name: Priit Laes
X-VCS-Revision: 3e3af12ef71fbf1dbc1a54414938e45c8607ffbe
X-VCS-Branch: master
Date: Sat, 30 Jan 2016 17:33:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 78195c62-5852-4058-937b-75b633b3afd8
X-Archives-Hash: a29a893b03c661b2575a7d61471a5fa9

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