1 |
commit: 4b7437c00b4e5673711e520dfc0538a0c6c7d5df |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 11 03:59:41 2012 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 11 03:59:41 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4b7437c0 |
7 |
|
8 |
net-misc/spice-gtk: moved to tree, sync 9999 with tree |
9 |
|
10 |
--- |
11 |
net-misc/spice-gtk/spice-gtk-0.7.159.ebuild | 123 --------------------------- |
12 |
net-misc/spice-gtk/spice-gtk-9999.ebuild | 41 ++++++--- |
13 |
2 files changed, 28 insertions(+), 136 deletions(-) |
14 |
|
15 |
diff --git a/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild b/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild |
16 |
deleted file mode 100644 |
17 |
index e3c9bef..0000000 |
18 |
--- a/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild |
19 |
+++ /dev/null |
20 |
@@ -1,123 +0,0 @@ |
21 |
-# Copyright 1999-2011 Gentoo Foundation |
22 |
-# Distributed under the terms of the GNU General Public License v2 |
23 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.7.ebuild,v 1.2 2011/10/19 08:37:10 dev-zero Exp $ |
24 |
- |
25 |
-EAPI="4" |
26 |
-GCONF_DEBUG="no" |
27 |
- |
28 |
-inherit eutils python gnome2-utils |
29 |
-if [[ ${PV} = 9999 ]]; then |
30 |
- inherit gnome2-live |
31 |
-fi |
32 |
- |
33 |
-PYTHON_DEPEND="python? 2" |
34 |
- |
35 |
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI." |
36 |
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" |
37 |
- |
38 |
-LICENSE="LGPL-2.1" |
39 |
-SLOT="0" |
40 |
-if [[ ${PV} = 9999 ]]; then |
41 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/spice/${PN}" |
42 |
- KEYWORDS="" |
43 |
-else |
44 |
- SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" |
45 |
- KEYWORDS="~amd64 ~x86" |
46 |
-fi |
47 |
-IUSE="+cairo doc gnome gstreamer gtk3 +introspection kde +pulseaudio python sasl static-libs vala" |
48 |
- |
49 |
-RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) |
50 |
- gstreamer? ( |
51 |
- media-libs/gstreamer:0.10 |
52 |
- media-libs/gst-plugins-base:0.10 ) |
53 |
- >=app-emulation/spice-protocol-0.9.1 |
54 |
- >=x11-libs/pixman-0.17.7 |
55 |
- >=media-libs/celt-0.5.1.1:0.5.1 |
56 |
- dev-libs/openssl |
57 |
- gtk3? ( x11-libs/gtk+:3[introspection?] ) |
58 |
- !gtk3? ( x11-libs/gtk+:2[introspection?] ) |
59 |
- >=dev-libs/glib-2.26:2 |
60 |
- >=x11-libs/cairo-1.2 |
61 |
- virtual/jpeg |
62 |
- sys-libs/zlib |
63 |
- introspection? ( dev-libs/gobject-introspection ) |
64 |
- python? ( dev-python/pygtk:2 ) |
65 |
- sasl? ( dev-libs/cyrus-sasl ) |
66 |
- gnome? ( gnome-base/gconf )" |
67 |
-DEPEND="${RDEPEND} |
68 |
- vala? ( dev-lang/vala:0.14 ) |
69 |
- dev-lang/python |
70 |
- dev-lang/perl |
71 |
- dev-perl/Text-CSV |
72 |
- dev-python/pyparsing |
73 |
- dev-util/pkgconfig" |
74 |
- |
75 |
-pkg_setup() { |
76 |
- if use gstreamer && use pulseaudio ; then |
77 |
- ewarn "spice-gtk can use only one audio backend: gstreamer will be used since you enabled both." |
78 |
- fi |
79 |
-} |
80 |
- |
81 |
-src_configure() { |
82 |
- local audio="no" |
83 |
- local gtk="2.0" |
84 |
- |
85 |
- use pulseaudio && audio="pulse" |
86 |
- use gstreamer && audio="gstreamer" |
87 |
- # TODO: do a double build like gtk-vnc does to install both gtk2 & gtk3 libs |
88 |
- use gtk3 && gtk="3.0" |
89 |
- if use vala ; then |
90 |
- rm -vf gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c # force vala regen |
91 |
- fi |
92 |
- |
93 |
- # TODO: usbredirection support |
94 |
- # needs libusbredirhost, newer libusb, policykit, libacl |
95 |
- econf \ |
96 |
- VALAC=$(type -P valac-0.14) \ |
97 |
- VAPIGEN=$(type -P vapigen-0.14) \ |
98 |
- $(use_enable static-libs static) \ |
99 |
- $(use_enable introspection) \ |
100 |
- --with-audio="${audio}" \ |
101 |
- $(use_with !cairo x11) \ |
102 |
- $(use_with python) \ |
103 |
- $(use_with sasl) \ |
104 |
- $(use_enable vala) \ |
105 |
- --with-gtk="${gtk}" \ |
106 |
- --disable-smartcard \ |
107 |
- --disable-usbredir \ |
108 |
- --disable-werror |
109 |
-} |
110 |
- |
111 |
-src_install() { |
112 |
- emake -j1 DESTDIR="${D}" install || die "emake install failed" |
113 |
- |
114 |
- use static-libs || rm -rf "${D}"/usr/lib*/*.la |
115 |
- use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la |
116 |
- use doc || rm -rf "${D}/usr/share/gtk-doc" |
117 |
- |
118 |
- dodoc AUTHORS NEWS README TODO |
119 |
- |
120 |
- make_desktop_entry spicy Spicy "" net |
121 |
- |
122 |
- if use gnome ; then |
123 |
- insinto /etc/gconf/schemas |
124 |
- doins "${FILESDIR}/spice.schemas" |
125 |
- fi |
126 |
- if use kde ; then |
127 |
- insinto /usr/share/kde4/services |
128 |
- doins "${FILESDIR}/spice.protocol" |
129 |
- fi |
130 |
- |
131 |
-} |
132 |
- |
133 |
-pkg_preinst() { |
134 |
- use gnome && gnome2_gconf_savelist |
135 |
-} |
136 |
- |
137 |
-pkg_postinst() { |
138 |
- use gnome && gnome2_gconf_install |
139 |
-} |
140 |
- |
141 |
-pkg_prerm() { |
142 |
- use gnome && gnome2_gconf_uninstall |
143 |
-} |
144 |
|
145 |
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild |
146 |
index e3c9bef..fc11a65 100644 |
147 |
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild |
148 |
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild |
149 |
@@ -24,8 +24,10 @@ else |
150 |
SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" |
151 |
KEYWORDS="~amd64 ~x86" |
152 |
fi |
153 |
-IUSE="+cairo doc gnome gstreamer gtk3 +introspection kde +pulseaudio python sasl static-libs vala" |
154 |
+IUSE="doc gnome gstreamer gtk3 +introspection kde policykit +pulseaudio |
155 |
+python sasl static-libs usbredir vala" |
156 |
|
157 |
+# TODO: check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h |
158 |
RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) |
159 |
gstreamer? ( |
160 |
media-libs/gstreamer:0.10 |
161 |
@@ -43,14 +45,28 @@ RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) |
162 |
introspection? ( dev-libs/gobject-introspection ) |
163 |
python? ( dev-python/pygtk:2 ) |
164 |
sasl? ( dev-libs/cyrus-sasl ) |
165 |
- gnome? ( gnome-base/gconf )" |
166 |
+ gnome? ( gnome-base/gconf ) |
167 |
+ usbredir? ( |
168 |
+ policykit? ( |
169 |
+ sys-auth/polkit |
170 |
+ sys-apps/acl ) |
171 |
+ >=dev-libs/libusb-1.0.9_rc1 |
172 |
+ >=sys-apps/usbredir-0.3.1 |
173 |
+ sys-fs/udev[gudev] )" |
174 |
DEPEND="${RDEPEND} |
175 |
vala? ( dev-lang/vala:0.14 ) |
176 |
dev-lang/python |
177 |
- dev-lang/perl |
178 |
- dev-perl/Text-CSV |
179 |
dev-python/pyparsing |
180 |
- dev-util/pkgconfig" |
181 |
+ dev-util/pkgconfig |
182 |
+ >=dev-util/intltool-0.40.0 |
183 |
+ >=sys-devel/gettext-0.17" |
184 |
+ |
185 |
+if [[ ${PV} = 9999 ]]; then |
186 |
+ DEPEND="${DEPEND} |
187 |
+ dev-lang/vala:0.14 |
188 |
+ dev-lang/perl |
189 |
+ dev-perl/Text-CSV" |
190 |
+fi |
191 |
|
192 |
pkg_setup() { |
193 |
if use gstreamer && use pulseaudio ; then |
194 |
@@ -67,35 +83,34 @@ src_configure() { |
195 |
# TODO: do a double build like gtk-vnc does to install both gtk2 & gtk3 libs |
196 |
use gtk3 && gtk="3.0" |
197 |
if use vala ; then |
198 |
- rm -vf gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c # force vala regen |
199 |
+ # force vala regen for MinGW, etc |
200 |
+ rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c |
201 |
fi |
202 |
|
203 |
- # TODO: usbredirection support |
204 |
- # needs libusbredirhost, newer libusb, policykit, libacl |
205 |
- econf \ |
206 |
+ econf --disable-maintainer-mode \ |
207 |
VALAC=$(type -P valac-0.14) \ |
208 |
VAPIGEN=$(type -P vapigen-0.14) \ |
209 |
$(use_enable static-libs static) \ |
210 |
$(use_enable introspection) \ |
211 |
--with-audio="${audio}" \ |
212 |
- $(use_with !cairo x11) \ |
213 |
$(use_with python) \ |
214 |
$(use_with sasl) \ |
215 |
+ $(use_enable usbredir) \ |
216 |
+ $(use_enable policykit polkit) \ |
217 |
$(use_enable vala) \ |
218 |
--with-gtk="${gtk}" \ |
219 |
--disable-smartcard \ |
220 |
- --disable-usbredir \ |
221 |
--disable-werror |
222 |
} |
223 |
|
224 |
src_install() { |
225 |
- emake -j1 DESTDIR="${D}" install || die "emake install failed" |
226 |
+ emake -j1 DESTDIR="${D}" install |
227 |
|
228 |
use static-libs || rm -rf "${D}"/usr/lib*/*.la |
229 |
use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la |
230 |
use doc || rm -rf "${D}/usr/share/gtk-doc" |
231 |
|
232 |
- dodoc AUTHORS NEWS README TODO |
233 |
+ dodoc AUTHORS NEWS README THANKS TODO |
234 |
|
235 |
make_desktop_entry spicy Spicy "" net |