Gentoo Archives: gentoo-commits

From: Alexandre Restovtsev <tetromino@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
Date: Sat, 29 Oct 2011 19:42:02
Message-Id: 47e1f6c9f8ea515e4f44a2ab2799f7323a8f7085.tetromino@gentoo
1 commit: 47e1f6c9f8ea515e4f44a2ab2799f7323a8f7085
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 29 19:33:42 2011 +0000
4 Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
5 CommitDate: Sat Oct 29 19:33:42 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=47e1f6c9
7
8 media-libs/cogl: 1.8.2 moved to gx86; update keywords from gx86
9
10 ---
11 media-libs/cogl/cogl-1.8.2.ebuild | 74 -------------------------------------
12 media-libs/cogl/cogl-9999.ebuild | 2 +-
13 2 files changed, 1 insertions(+), 75 deletions(-)
14
15 diff --git a/media-libs/cogl/cogl-1.8.2.ebuild b/media-libs/cogl/cogl-1.8.2.ebuild
16 deleted file mode 100644
17 index 83eccfd..0000000
18 --- a/media-libs/cogl/cogl-1.8.2.ebuild
19 +++ /dev/null
20 @@ -1,74 +0,0 @@
21 -# Copyright 1999-2011 Gentoo Foundation
22 -# Distributed under the terms of the GNU General Public License v2
23 -# $Header: $
24 -
25 -EAPI="4"
26 -CLUTTER_LA_PUNT="yes"
27 -
28 -# Inherit gnome2 after clutter to download sources from gnome.org
29 -inherit clutter gnome2 virtualx
30 -if [[ ${PV} = 9999 ]]; then
31 - inherit gnome2-live
32 -fi
33 -
34 -DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
35 -HOMEPAGE="http://www.clutter-project.org/"
36 -
37 -LICENSE="LGPL-2.1"
38 -SLOT="1.0"
39 -IUSE="doc examples +introspection +pango"
40 -if [[ ${PV} = 9999 ]]; then
41 - KEYWORDS=""
42 -else
43 - KEYWORDS="~amd64 ~x86"
44 -fi
45 -
46 -# XXX: need uprof for optional profiling support
47 -COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
48 - x11-libs/cairo
49 - >=x11-libs/gdk-pixbuf-2:2
50 - x11-libs/libdrm
51 - x11-libs/libX11
52 - >=x11-libs/libXcomposite-0.4
53 - x11-libs/libXdamage
54 - x11-libs/libXext
55 - >=x11-libs/libXfixes-3
56 - virtual/opengl
57 -
58 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
59 - pango? ( >=x11-libs/pango-1.20.0[introspection?] )"
60 -# before clutter-1.7, cogl was part of clutter
61 -RDEPEND="${COMMON_DEPEND}
62 - !<media-libs/clutter-1.7"
63 -DEPEND="${COMMON_DEPEND}
64 - dev-util/pkgconfig
65 - sys-devel/gettext
66 - doc? ( app-text/docbook-xml-dtd:4.1.2
67 - >=dev-util/gtk-doc-1.13 )"
68 -
69 -# XXX: at least when using nvidia-drivers, tests fail under Xemake/Xvfb, no
70 -# matter whether "eselect opengl" is set to nvidia or xorg-x11.
71 -RESTRICT="test"
72 -
73 -pkg_setup() {
74 - DOCS="NEWS README"
75 - EXAMPLES="examples/{*.c,*.jpg}"
76 - # XXX: think about gles, quartz, wayland
77 - G2CONF="${G2CONF}
78 - --disable-profile
79 - --disable-maintainer-flags
80 - --enable-cairo
81 - --enable-gdk-pixbuf
82 - --enable-gl
83 - --enable-glx
84 - $(use_enable introspection)
85 - $(use_enable pango cogl-pango)"
86 -}
87 -
88 -src_test() {
89 - Xemake check
90 -}
91 -
92 -src_install() {
93 - clutter_src_install
94 -}
95
96 diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
97 index 83eccfd..d4e7653 100644
98 --- a/media-libs/cogl/cogl-9999.ebuild
99 +++ b/media-libs/cogl/cogl-9999.ebuild
100 @@ -20,7 +20,7 @@ IUSE="doc examples +introspection +pango"
101 if [[ ${PV} = 9999 ]]; then
102 KEYWORDS=""
103 else
104 - KEYWORDS="~amd64 ~x86"
105 + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
106 fi
107
108 # XXX: need uprof for optional profiling support