1 |
commit: c26b1c5bb89f96eb3b5a1254de7dfc650aed4843 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 26 07:55:36 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Sep 26 08:28:10 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c26b1c5b |
7 |
|
8 |
media-libs/mash: 0.1.0 → 0.2.0 |
9 |
|
10 |
Version bump. Bump the slot version (since the .pc file, library name, |
11 |
etc. were all renamed from mash-0.1 to mash-0.2), but add a blocker due |
12 |
to file collisions on documentation. The blocker should be automatically |
13 |
resolvable via the upcoming gnome-color-manager update. |
14 |
|
15 |
Also, stop using clutter.eclass; the ebuild was only using it to set |
16 |
SRC_URI - and to use .xz tarballs, it would have to set SRC_URI manually |
17 |
anyway. |
18 |
|
19 |
--- |
20 |
.../mash/{mash-0.1.0.ebuild => mash-0.2.0.ebuild} | 28 ++++++++++++++----- |
21 |
media-libs/mash/mash-9999.ebuild | 26 +++++++++++++----- |
22 |
2 files changed, 39 insertions(+), 15 deletions(-) |
23 |
|
24 |
diff --git a/media-libs/mash/mash-0.1.0.ebuild b/media-libs/mash/mash-0.2.0.ebuild |
25 |
similarity index 61% |
26 |
rename from media-libs/mash/mash-0.1.0.ebuild |
27 |
rename to media-libs/mash/mash-0.2.0.ebuild |
28 |
index 02cafd2..91006df 100644 |
29 |
--- a/media-libs/mash/mash-0.1.0.ebuild |
30 |
+++ b/media-libs/mash/mash-0.2.0.ebuild |
31 |
@@ -4,20 +4,24 @@ |
32 |
|
33 |
EAPI="4" |
34 |
GCONF_DEBUG="no" |
35 |
-CLUTTER_LA_PUNT="yes" |
36 |
+GNOME2_LA_PUNT="yes" |
37 |
|
38 |
-# Inherit clutter after gnome2 to download sources from clutter-project.org |
39 |
-inherit autotools eutils gnome2 clutter |
40 |
+# clutter.eclass does not support .xz tarballs |
41 |
+inherit autotools eutils gnome2 versionator |
42 |
if [[ ${PV} = 9999 ]]; then |
43 |
+ SRC_URI="" |
44 |
EGIT_REPO_URI="git://github.com/clutter-project/mash.git" |
45 |
inherit gnome2-live |
46 |
+else |
47 |
+ RV=($(get_version_components)) |
48 |
+ SRC_URI="http://source.clutter-project.org/sources/${PN}/${RV[0]}.${RV[1]}/${P}.tar.xz" |
49 |
fi |
50 |
|
51 |
DESCRIPTION="A library for rendering 3D models with Clutter" |
52 |
HOMEPAGE="http://wiki.clutter-project.org/wiki/Mash" |
53 |
|
54 |
LICENSE="LGPL-2.1" |
55 |
-SLOT="0.1" |
56 |
+SLOT="0.2" |
57 |
IUSE="doc examples +introspection" |
58 |
if [[ ${PV} = 9999 ]]; then |
59 |
KEYWORDS="" |
60 |
@@ -27,18 +31,21 @@ fi |
61 |
|
62 |
# Automagically detects x11-libs/mx, but only uses it for building examples |
63 |
RDEPEND=">=dev-libs/glib-2.16:2 |
64 |
- >=media-libs/clutter-1.2:1.0[introspection?] |
65 |
+ >=media-libs/clutter-1.5.10:1.0[introspection?] |
66 |
media-libs/rply |
67 |
virtual/opengl |
68 |
|
69 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.1 )" |
70 |
+ introspection? ( >=dev-libs/gobject-introspection-0.6.1 ) |
71 |
+ |
72 |
+ !media-libs/mash:0.1" |
73 |
+# Block on slot 0.1 due to file collisions in /usr/share/gtk-doc |
74 |
+# XXX: remove blocker in Oct 2011 |
75 |
DEPEND="${RDEPEND} |
76 |
dev-util/pkgconfig |
77 |
doc? ( >=dev-util/gtk-doc-1.14 )" |
78 |
|
79 |
pkg_setup() { |
80 |
DOCS="AUTHORS NEWS README" |
81 |
- EXAMPLES="example/{*.c,*.ply}" |
82 |
G2CONF="${G2CONF} |
83 |
--disable-static |
84 |
$(use_enable introspection)" |
85 |
@@ -51,5 +58,10 @@ src_prepare() { |
86 |
} |
87 |
|
88 |
src_install() { |
89 |
- clutter_src_install |
90 |
+ gnome2_src_install |
91 |
+ |
92 |
+ if use examples; then |
93 |
+ insinto /usr/share/doc/${PF}/examples |
94 |
+ doins example/{*.c,*.ply} |
95 |
+ fi |
96 |
} |
97 |
|
98 |
diff --git a/media-libs/mash/mash-9999.ebuild b/media-libs/mash/mash-9999.ebuild |
99 |
index 29a5720..91006df 100644 |
100 |
--- a/media-libs/mash/mash-9999.ebuild |
101 |
+++ b/media-libs/mash/mash-9999.ebuild |
102 |
@@ -4,20 +4,24 @@ |
103 |
|
104 |
EAPI="4" |
105 |
GCONF_DEBUG="no" |
106 |
-CLUTTER_LA_PUNT="yes" |
107 |
+GNOME2_LA_PUNT="yes" |
108 |
|
109 |
-# Inherit clutter after gnome2 to download sources from clutter-project.org |
110 |
-inherit autotools eutils gnome2 clutter |
111 |
+# clutter.eclass does not support .xz tarballs |
112 |
+inherit autotools eutils gnome2 versionator |
113 |
if [[ ${PV} = 9999 ]]; then |
114 |
+ SRC_URI="" |
115 |
EGIT_REPO_URI="git://github.com/clutter-project/mash.git" |
116 |
inherit gnome2-live |
117 |
+else |
118 |
+ RV=($(get_version_components)) |
119 |
+ SRC_URI="http://source.clutter-project.org/sources/${PN}/${RV[0]}.${RV[1]}/${P}.tar.xz" |
120 |
fi |
121 |
|
122 |
DESCRIPTION="A library for rendering 3D models with Clutter" |
123 |
HOMEPAGE="http://wiki.clutter-project.org/wiki/Mash" |
124 |
|
125 |
LICENSE="LGPL-2.1" |
126 |
-SLOT="0.1" |
127 |
+SLOT="0.2" |
128 |
IUSE="doc examples +introspection" |
129 |
if [[ ${PV} = 9999 ]]; then |
130 |
KEYWORDS="" |
131 |
@@ -31,14 +35,17 @@ RDEPEND=">=dev-libs/glib-2.16:2 |
132 |
media-libs/rply |
133 |
virtual/opengl |
134 |
|
135 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.1 )" |
136 |
+ introspection? ( >=dev-libs/gobject-introspection-0.6.1 ) |
137 |
+ |
138 |
+ !media-libs/mash:0.1" |
139 |
+# Block on slot 0.1 due to file collisions in /usr/share/gtk-doc |
140 |
+# XXX: remove blocker in Oct 2011 |
141 |
DEPEND="${RDEPEND} |
142 |
dev-util/pkgconfig |
143 |
doc? ( >=dev-util/gtk-doc-1.14 )" |
144 |
|
145 |
pkg_setup() { |
146 |
DOCS="AUTHORS NEWS README" |
147 |
- EXAMPLES="example/{*.c,*.css,*.ply}" |
148 |
G2CONF="${G2CONF} |
149 |
--disable-static |
150 |
$(use_enable introspection)" |
151 |
@@ -51,5 +58,10 @@ src_prepare() { |
152 |
} |
153 |
|
154 |
src_install() { |
155 |
- clutter_src_install |
156 |
+ gnome2_src_install |
157 |
+ |
158 |
+ if use examples; then |
159 |
+ insinto /usr/share/doc/${PF}/examples |
160 |
+ doins example/{*.c,*.ply} |
161 |
+ fi |
162 |
} |