From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 681A5138E74 for ; Mon, 3 Nov 2014 23:24:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A42E1E0893; Mon, 3 Nov 2014 23:24:33 +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 E4136E0896 for ; Mon, 3 Nov 2014 23:24:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB4AA340488 for ; Mon, 3 Nov 2014 23:24:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 097DC960D for ; Mon, 3 Nov 2014 23:24:26 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1415057037.c76181e80a90081d8bf0ab6d70fe097e4469fe25.eva@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: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: c76181e80a90081d8bf0ab6d70fe097e4469fe25 X-VCS-Branch: master Date: Mon, 3 Nov 2014 23:24:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ec71e9a8-9693-409f-a33c-ccb71fc58186 X-Archives-Hash: 9224af8ba02f3ea5b9a8ea1dd1fb5d51 commit: c76181e80a90081d8bf0ab6d70fe097e4469fe25 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Nov 3 23:21:25 2014 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Nov 3 23:23:57 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c76181e8 media-libs/cogl: sync with gentoo-x86 + fix prepare There is no .in in git, bug #508972. --- media-libs/cogl/cogl-9999.ebuild | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild index 14e5adf..0199c34 100644 --- a/media-libs/cogl/cogl-9999.ebuild +++ b/media-libs/cogl/cogl-9999.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" HOMEPAGE="http://www.clutter-project.org/" LICENSE="MIT BSD" -SLOT="1.0/20" # subslot = .so version +SLOT="2.0/0" # subslot = .so version # doc and profile disable for now due bugs #484750 and #483332 IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile if [[ ${PV} = 9999 ]]; then @@ -69,15 +69,15 @@ fi src_prepare() { # Do not build examples sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \ - -i Makefile.am Makefile.in || die + -i Makefile.am || die if ! use test ; then # For some reason the configure switch will not completely disable # tests being built sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \ - -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ - -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ - -i Makefile.am Makefile.in || die + -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ + -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ + -i Makefile.am || die fi gnome2_src_prepare @@ -95,7 +95,6 @@ src_configure() { --enable-deprecated \ --enable-gdk-pixbuf \ --enable-glib \ - --disable-gtk-doc \ $(use_enable opengl glx) \ $(use_enable opengl gl) \ $(use_enable gles2) \ @@ -107,7 +106,6 @@ src_configure() { $(use_enable pango cogl-pango) \ $(use_enable test unit-tests) \ --disable-profile -# $(use_enable doc gtk-doc) \ # $(use_enable profile) }