1 |
commit: 3e3af12ef71fbf1dbc1a54414938e45c8607ffbe |
2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
3 |
AuthorDate: Sat Jan 30 17:29:52 2016 +0000 |
4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
5 |
CommitDate: Sat Jan 30 17:29:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3e3af12e |
7 |
|
8 |
media-libs/cogl: Update live ebuild to not use removed clutter eclass |
9 |
|
10 |
media-libs/cogl/cogl-9999.ebuild | 15 +++++++++------ |
11 |
1 file changed, 9 insertions(+), 6 deletions(-) |
12 |
|
13 |
diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild |
14 |
index 10d4c6d..b1e1c85 100644 |
15 |
--- a/media-libs/cogl/cogl-9999.ebuild |
16 |
+++ b/media-libs/cogl/cogl-9999.ebuild |
17 |
@@ -3,10 +3,9 @@ |
18 |
# $Id$ |
19 |
|
20 |
EAPI="5" |
21 |
-CLUTTER_LA_PUNT="yes" |
22 |
+GCONF_DEBUG="yes" |
23 |
|
24 |
-# Inherit gnome2 after clutter to download sources from gnome.org |
25 |
-inherit clutter gnome2 multilib virtualx |
26 |
+inherit gnome2 multilib virtualx |
27 |
if [[ ${PV} = 9999 ]]; then |
28 |
inherit gnome2-live |
29 |
fi |
30 |
@@ -53,7 +52,8 @@ COMMON_DEPEND=" |
31 |
" |
32 |
# before clutter-1.7, cogl was part of clutter |
33 |
RDEPEND="${COMMON_DEPEND} |
34 |
- !<media-libs/clutter-1.7" |
35 |
+ !<media-libs/clutter-1.7 |
36 |
+" |
37 |
DEPEND="${COMMON_DEPEND} |
38 |
>=dev-util/gtk-doc-am-1.13 |
39 |
sys-devel/gettext |
40 |
@@ -134,9 +134,12 @@ src_test() { |
41 |
|
42 |
src_install() { |
43 |
DOCS="NEWS README" |
44 |
- EXAMPLES="examples/{*.c,*.jpg}" |
45 |
+ if use examples; then |
46 |
+ insinto /usr/share/doc/${PF}/examples |
47 |
+ doins examples/{*.c,*.jpg} |
48 |
+ fi |
49 |
|
50 |
- clutter_src_install |
51 |
+ gnome2_src_install |
52 |
|
53 |
# Remove silly examples-data directory |
54 |
rm -rvf "${ED}/usr/share/cogl/examples-data/" || die |