Gentoo Archives: gentoo-commits

From: Priit Laes <plaes@×××××.org>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: media-libs/clutter-gtk/
Date: Sat, 30 Jan 2016 17:33:42
Message-Id: 1454175159.ab86109235171cfbad54f0c74b1be6af268acaea.plaes@gentoo
1 commit: ab86109235171cfbad54f0c74b1be6af268acaea
2 Author: Priit Laes <plaes <AT> plaes <DOT> org>
3 AuthorDate: Sat Jan 30 17:32:39 2016 +0000
4 Commit: Priit Laes <plaes <AT> plaes <DOT> org>
5 CommitDate: Sat Jan 30 17:32:39 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ab861092
7
8 media-libs/clutter-gtk: Drop removed clutter eclass usage
9
10 media-libs/clutter-gtk/clutter-gtk-9999.ebuild | 26 ++++++++++++++++----------
11 1 file changed, 16 insertions(+), 10 deletions(-)
12
13 diff --git a/media-libs/clutter-gtk/clutter-gtk-9999.ebuild b/media-libs/clutter-gtk/clutter-gtk-9999.ebuild
14 index e284041..ca18131 100644
15 --- a/media-libs/clutter-gtk/clutter-gtk-9999.ebuild
16 +++ b/media-libs/clutter-gtk/clutter-gtk-9999.ebuild
17 @@ -4,32 +4,31 @@
18
19 EAPI="5"
20 GCONF_DEBUG="yes"
21 -CLUTTER_LA_PUNT="yes"
22 +GNOME2_LA_PUNT="yes"
23
24 -# inherit clutter after gnome2 so that defaults aren't overriden
25 -inherit gnome2 clutter gnome.org
26 +inherit gnome2
27 if [[ ${PV} = 9999 ]]; then
28 inherit gnome2-live
29 fi
30
31 DESCRIPTION="Library for embedding a Clutter canvas (stage) in GTK+"
32 HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
33 +LICENSE="LGPL-2.1+"
34
35 SLOT="1.0"
36 -IUSE="examples +introspection"
37 if [[ ${PV} = 9999 ]]; then
38 KEYWORDS=""
39 IUSE="${IUSE} doc"
40 else
41 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
42 fi
43 +IUSE="X examples gtk +introspection wayland"
44
45 -# XXX: Needs gtk with X support (!directfb)
46 RDEPEND="
47 - >=x11-libs/gtk+-3.6.0:3[introspection?]
48 - >=media-libs/clutter-1.18:1.0[introspection?]
49 + >=x11-libs/gtk+-3.8.0:3[X=,introspection?,wayland=]
50 + >=media-libs/clutter-1.23.7:1.0[X=,gtk=,introspection?,wayland=]
51 media-libs/cogl:1.0=[introspection?]
52 - introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
53 + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
54 "
55 DEPEND="${RDEPEND}
56 dev-util/gtk-doc-am
57 @@ -38,10 +37,17 @@ DEPEND="${RDEPEND}
58 "
59
60 src_configure() {
61 - DOCS="NEWS README"
62 - EXAMPLES="examples/{*.c,redhand.png}"
63 gnome2_src_configure \
64 --disable-maintainer-flags \
65 --enable-deprecated \
66 $(use_enable introspection)
67 }
68 +
69 +src_install() {
70 + gnome2_src_install
71 +
72 + if use examples; then
73 + insinto /usr/share/doc/${PF}/examples
74 + doins examples/{*.c,redhand.png}
75 + fi
76 +}