1 |
commit: a4be8125ac4faa84510a08ce761cb389c797c3b0 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 22 21:34:44 2012 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 22 21:34:44 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=a4be8125 |
7 |
|
8 |
gnome-extra/gnome-globalmenu: fix repoman warnings and update ebuild style |
9 |
|
10 |
--- |
11 |
gnome-extra/gnome-globalmenu/Manifest | 12 ++++- |
12 |
.../gnome-globalmenu-0.7.10.ebuild | 25 ++++------ |
13 |
.../gnome-globalmenu/gnome-globalmenu-9999.ebuild | 51 ++++++++++---------- |
14 |
gnome-extra/gnome-globalmenu/metadata.xml | 2 + |
15 |
4 files changed, 48 insertions(+), 42 deletions(-) |
16 |
|
17 |
diff --git a/gnome-extra/gnome-globalmenu/Manifest b/gnome-extra/gnome-globalmenu/Manifest |
18 |
index 1eae72e..d110816 100644 |
19 |
--- a/gnome-extra/gnome-globalmenu/Manifest |
20 |
+++ b/gnome-extra/gnome-globalmenu/Manifest |
21 |
@@ -1 +1,11 @@ |
22 |
-DIST gnome-globalmenu-0.7.10.tar.bz2 565247 RMD160 c4cea0ead15ac76255e5ec1a8db82c8bf2d0bdf0 SHA1 0b1a845ea038b4f44e28112463fec7aac300a0b6 SHA256 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89 |
23 |
+-----BEGIN PGP SIGNED MESSAGE----- |
24 |
+Hash: SHA512 |
25 |
+ |
26 |
+DIST gnome-globalmenu-0.7.10.tar.bz2 565247 SHA256 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89 |
27 |
+-----BEGIN PGP SIGNATURE----- |
28 |
+Version: GnuPG v2.0.19 (GNU/Linux) |
29 |
+ |
30 |
+iEYEAREKAAYFAlCumnUACgkQ1fmVwcYIWAbPbgCeI/nGUGnkcqpCYeZBoLNkJwaf |
31 |
+3MMAoM+swvepyotkZQToGEl1oLZm4IdC |
32 |
+=iWUw |
33 |
+-----END PGP SIGNATURE----- |
34 |
|
35 |
diff --git a/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild b/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild |
36 |
index 998bef5..fbb879d 100644 |
37 |
--- a/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild |
38 |
+++ b/gnome-extra/gnome-globalmenu/gnome-globalmenu-0.7.10.ebuild |
39 |
@@ -1,11 +1,12 @@ |
40 |
-# Copyright 1999-2010 Gentoo Foundation |
41 |
+# Copyright 1999-2012 Gentoo Foundation |
42 |
# Distributed under the terms of the GNU General Public License v2 |
43 |
# $Header: $ |
44 |
|
45 |
-EAPI="3" |
46 |
+EAPI="4" |
47 |
GCONF_DEBUG="no" |
48 |
+GNOME2_LA_PUNT="yes" |
49 |
|
50 |
-inherit autotools eutils gnome2 |
51 |
+inherit eutils gnome2 |
52 |
|
53 |
MY_P=${P/_p/_} |
54 |
|
55 |
@@ -22,7 +23,7 @@ RDEPEND=">=x11-libs/gtk+-2.10:2 |
56 |
>=dev-libs/glib-2.10:2 |
57 |
gnome-base/gconf:2 |
58 |
>=x11-libs/libwnck-2.16:1 |
59 |
- >=gnome-base/gnome-menus-2.16 |
60 |
+ >=gnome-base/gnome-menus-2.16:0 |
61 |
>=x11-libs/libX11-1.1.0 |
62 |
gnome? ( |
63 |
>=gnome-base/gnome-panel-2.16 |
64 |
@@ -32,12 +33,12 @@ RDEPEND=">=x11-libs/gtk+-2.10:2 |
65 |
" |
66 |
DEPEND="${RDEPEND} |
67 |
dev-util/intltool |
68 |
- dev-util/pkgconfig |
69 |
+ virtual/pkgconfig |
70 |
>=dev-lang/vala-0.7.7:0.10" |
71 |
|
72 |
S="${WORKDIR}/${MY_P}" |
73 |
|
74 |
-pkg_setup() { |
75 |
+src_prepare() { |
76 |
DOCS="AUTHORS ChangeLog NEWS README*" |
77 |
G2CONF="${G2CONF} |
78 |
--docdir=/usr/share/doc/${PF} |
79 |
@@ -47,10 +48,6 @@ pkg_setup() { |
80 |
VALAC_BIN=$(type -P valac-0.10)" |
81 |
# Does not enable anything |
82 |
#$(use_with introspection gir) |
83 |
-} |
84 |
- |
85 |
-src_prepare() { |
86 |
- gnome2_src_prepare |
87 |
|
88 |
# Append missing files |
89 |
cat >>po/POTFILES.in <<EOF |
90 |
@@ -66,9 +63,5 @@ libserver/widgets/menuitem.c |
91 |
tools/globalmenu-settings.c |
92 |
EOF |
93 |
|
94 |
-} |
95 |
- |
96 |
-src_install() { |
97 |
- gnome2_src_install |
98 |
- find "${ED}" -name "*.la" -delete |
99 |
-} |
100 |
+ gnome2_src_prepare |
101 |
+} |
102 |
\ No newline at end of file |
103 |
|
104 |
diff --git a/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild b/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild |
105 |
index 7ebcfe1..5126942 100644 |
106 |
--- a/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild |
107 |
+++ b/gnome-extra/gnome-globalmenu/gnome-globalmenu-9999.ebuild |
108 |
@@ -1,8 +1,10 @@ |
109 |
-# Copyright 1999-2010 Gentoo Foundation |
110 |
+# Copyright 1999-2012 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
# $Header: $ |
113 |
|
114 |
-EAPI="2" |
115 |
+EAPI="4" |
116 |
+GCONF_DEBUG="no" |
117 |
+GNOME2_LA_PUNT="yes" |
118 |
|
119 |
inherit autotools eutils gnome2 |
120 |
|
121 |
@@ -22,33 +24,24 @@ HOMEPAGE="http://code.google.com/p/gnome2-globalmenu/" |
122 |
|
123 |
LICENSE="GPL-2" |
124 |
SLOT="0" |
125 |
-IUSE="gnome test xfce" |
126 |
+IUSE="gnome +introspection xfce" |
127 |
|
128 |
-# XXX: vala dependency raised for build issues |
129 |
-RDEPEND=">=x11-libs/gtk+-2.10.0 |
130 |
- >=dev-libs/glib-2.10.0 |
131 |
- >=gnome-base/gconf-2 |
132 |
- >=x11-libs/libwnck-2.16.0 |
133 |
- >=gnome-base/gnome-menus-2.16.0 |
134 |
+RDEPEND=">=x11-libs/gtk+-2.10:2 |
135 |
+ >=dev-libs/glib-2.10:2 |
136 |
+ gnome-base/gconf:2 |
137 |
+ >=x11-libs/libwnck-2.16:1 |
138 |
+ >=gnome-base/gnome-menus-2.16:0 |
139 |
+ >=x11-libs/libX11-1.1.0 |
140 |
gnome? ( |
141 |
- >=gnome-base/gnome-panel-2.16.0 |
142 |
+ >=gnome-base/gnome-panel-2.16 |
143 |
>=x11-libs/libnotify-0.4.4 ) |
144 |
xfce? ( |
145 |
>=xfce-base/xfce4-panel-4.4.3 ) |
146 |
- >=x11-libs/libX11-1.1.0" |
147 |
+" |
148 |
DEPEND="${RDEPEND} |
149 |
dev-util/intltool |
150 |
- dev-util/pkgconfig |
151 |
- >=dev-lang/vala-0.7.7" |
152 |
- |
153 |
-pkg_setup() { |
154 |
- G2CONF="${G2CONF} |
155 |
- --without-gir |
156 |
- --docdir=/usr/share/doc/${PF} |
157 |
- $(use_enable test tests) |
158 |
- $(use_with gnome gnome-panel) |
159 |
- $(use_with xfce xfce4-panel)" |
160 |
-} |
161 |
+ virtual/pkgconfig |
162 |
+ >=dev-lang/vala-0.7.7:0.10" |
163 |
|
164 |
src_unpack() { |
165 |
if [[ ${PV} == "9999" ]]; then |
166 |
@@ -60,7 +53,14 @@ src_unpack() { |
167 |
} |
168 |
|
169 |
src_prepare() { |
170 |
- gnome2_src_prepare |
171 |
+ G2CONF="${G2CONF} |
172 |
+ --docdir=/usr/share/doc/${PF} |
173 |
+ --without-gir |
174 |
+ $(use_with gnome gnome-panel) |
175 |
+ $(use_with xfce xfce4-panel) |
176 |
+ VALAC_BIN=$(type -P valac-0.10)" |
177 |
+ # Does not enable anything |
178 |
+ #$(use_with introspection gir) |
179 |
|
180 |
# INSTALL is not useful or existing depending on version |
181 |
sed 's/\(doc_DATA.*\)INSTALL/\1/' \ |
182 |
@@ -69,6 +69,7 @@ src_prepare() { |
183 |
# Fix compilation problem with --as-needed |
184 |
epatch "${FILESDIR}/${PN}-0.7.7-as-needed.patch" |
185 |
|
186 |
- intltoolize --force --copy --automake || die "intltoolize failed" |
187 |
AT_M4DIR="autotools" eautoreconf |
188 |
-} |
189 |
+ |
190 |
+ gnome2_src_prepare |
191 |
+} |
192 |
\ No newline at end of file |
193 |
|
194 |
diff --git a/gnome-extra/gnome-globalmenu/metadata.xml b/gnome-extra/gnome-globalmenu/metadata.xml |
195 |
index bb3fcca..d5b1181 100644 |
196 |
--- a/gnome-extra/gnome-globalmenu/metadata.xml |
197 |
+++ b/gnome-extra/gnome-globalmenu/metadata.xml |
198 |
@@ -6,6 +6,8 @@ |
199 |
<name>Gilles Dartiguelongue</name> |
200 |
</maintainer> |
201 |
<use> |
202 |
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for |
203 |
+ introspection</flag> |
204 |
<flag name="xfce">Support for Xfce desktop</flag> |
205 |
</use> |
206 |
<upstream> |