commit: 4fd35bb40d2b48f3ebe7fb90574f6068e07aa0b2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 14 20:57:19 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 20:33:33 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4fd35bb4
media-libs/cogl: 1.16.2 → 1.18.0
---
.../cogl/{cogl-9999.ebuild => cogl-1.18.0.ebuild} | 26 ++++++----------------
media-libs/cogl/cogl-9999.ebuild | 7 +++---
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/media-libs/cogl/cogl-9999.ebuild
b/media-libs/cogl/cogl-1.18.0.ebuild
similarity index 89%
copy from media-libs/cogl/cogl-9999.ebuild
copy to media-libs/cogl/cogl-1.18.0.ebuild
index 18ee627..882c317 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,23 +7,15 @@ CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
inherit clutter gnome2 multilib virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="http://www.clutter-project.org/";
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/12" # subslot = .so version
+LICENSE="MIT BSD"
+SLOT="1.0/20" # 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
- KEYWORDS=""
- IUSE="${IUSE} doc"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
@@ -56,14 +48,10 @@ DEPEND="${COMMON_DEPEND}
app-admin/eselect-opengl
media-libs/mesa[classic] )
"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.13 )"
-fi
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# Fox some reason GL3 conformance test all fails again...
+RESTRICT="test"
src_prepare() {
# Do not build examples
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index 18ee627..14e5adf 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -14,8 +14,8 @@ fi
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="http://www.clutter-project.org/";
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/12" # subslot = .so version
+LICENSE="MIT BSD"
+SLOT="1.0/20" # 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
@@ -56,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
app-admin/eselect-opengl
media-libs/mesa[classic] )
"
+
# Need classic mesa swrast for tests, llvmpipe causes a test failure
if [[ ${PV} = 9999 ]]; then
