1 |
eva 11/02/27 17:28:32 |
2 |
|
3 |
Modified: metadata.xml ChangeLog empathy-2.32.2.ebuild |
4 |
Added: empathy-2.33.2.ebuild |
5 |
Log: |
6 |
Add <folks-0.3 blocker for empathy-2.32. Bump to 2.33.2, uses new telepathy-logger and folks APIs. |
7 |
|
8 |
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64, RepoMan options: --force) |
9 |
|
10 |
Revision Changes Path |
11 |
1.9 net-im/empathy/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/metadata.xml?rev=1.9&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/metadata.xml?rev=1.9&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/metadata.xml?r1=1.8&r2=1.9 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/metadata.xml,v |
20 |
retrieving revision 1.8 |
21 |
retrieving revision 1.9 |
22 |
diff -u -r1.8 -r1.9 |
23 |
--- metadata.xml 4 Dec 2010 19:16:37 -0000 1.8 |
24 |
+++ metadata.xml 27 Feb 2011 17:28:32 -0000 1.9 |
25 |
@@ -4,6 +4,7 @@ |
26 |
<herd>net-im</herd> |
27 |
<herd>gnome</herd> |
28 |
<use> |
29 |
+ <flag name="map">Enable world map support through <pkg>media-libs/libchamplain</pkg>.</flag> |
30 |
<flag name="nautilus">Enable nautilus-sendto support</flag> |
31 |
<flag name="webkit">Build support for Adium-style HTML-based conversation |
32 |
window themes using <pkg>net-libs/webkit-gtk</pkg></flag> |
33 |
|
34 |
|
35 |
|
36 |
1.77 net-im/empathy/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/ChangeLog?rev=1.77&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/ChangeLog?rev=1.77&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/ChangeLog?r1=1.76&r2=1.77 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v |
45 |
retrieving revision 1.76 |
46 |
retrieving revision 1.77 |
47 |
diff -u -r1.76 -r1.77 |
48 |
--- ChangeLog 27 Feb 2011 15:16:28 -0000 1.76 |
49 |
+++ ChangeLog 27 Feb 2011 17:28:32 -0000 1.77 |
50 |
@@ -1,6 +1,13 @@ |
51 |
# ChangeLog for net-im/empathy |
52 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.76 2011/02/27 15:16:28 eva Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.77 2011/02/27 17:28:32 eva Exp $ |
55 |
+ |
56 |
+*empathy-2.33.2 (27 Feb 2011) |
57 |
+ |
58 |
+ 27 Feb 2011; Gilles Dartiguelongue <eva@g.o> empathy-2.32.2.ebuild, |
59 |
+ +empathy-2.33.2.ebuild, metadata.xml: |
60 |
+ Add <folks-0.3 blocker for empathy-2.32. Bump to 2.33.2, uses new |
61 |
+ telepathy-logger and folks APIs. |
62 |
|
63 |
27 Feb 2011; Gilles Dartiguelongue <eva@g.o> empathy-2.32.2.ebuild: |
64 |
Pin libunique dependency to slot 1. |
65 |
|
66 |
|
67 |
|
68 |
1.11 net-im/empathy/empathy-2.32.2.ebuild |
69 |
|
70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild?rev=1.11&view=markup |
71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild?rev=1.11&content-type=text/plain |
72 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild?r1=1.10&r2=1.11 |
73 |
|
74 |
Index: empathy-2.32.2.ebuild |
75 |
=================================================================== |
76 |
RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v |
77 |
retrieving revision 1.10 |
78 |
retrieving revision 1.11 |
79 |
diff -u -r1.10 -r1.11 |
80 |
--- empathy-2.32.2.ebuild 27 Feb 2011 15:16:28 -0000 1.10 |
81 |
+++ empathy-2.32.2.ebuild 27 Feb 2011 17:28:32 -0000 1.11 |
82 |
@@ -1,6 +1,6 @@ |
83 |
# Copyright 1999-2011 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.10 2011/02/27 15:16:28 eva Exp $ |
86 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.11 2011/02/27 17:28:32 eva Exp $ |
87 |
|
88 |
EAPI="3" |
89 |
GCONF_DEBUG="yes" |
90 |
@@ -29,6 +29,7 @@ |
91 |
>=gnome-base/gnome-keyring-2.26 |
92 |
>=net-libs/gnutls-2.8.5 |
93 |
>=dev-libs/folks-0.1.15 |
94 |
+ <dev-libs/folks-0.3 |
95 |
|
96 |
>=dev-libs/libunique-1.1.6:1 |
97 |
net-libs/farsight2 |
98 |
|
99 |
|
100 |
|
101 |
1.1 net-im/empathy/empathy-2.33.2.ebuild |
102 |
|
103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/empathy-2.33.2.ebuild?rev=1.1&view=markup |
104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/empathy-2.33.2.ebuild?rev=1.1&content-type=text/plain |
105 |
|
106 |
Index: empathy-2.33.2.ebuild |
107 |
=================================================================== |
108 |
# Copyright 1999-2011 Gentoo Foundation |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.33.2.ebuild,v 1.1 2011/02/27 17:28:32 eva Exp $ |
111 |
|
112 |
EAPI="3" |
113 |
GCONF_DEBUG="yes" |
114 |
PYTHON_DEPEND="2:2.4" |
115 |
|
116 |
inherit eutils gnome2 multilib python |
117 |
|
118 |
DESCRIPTION="Telepathy client and library using GTK+" |
119 |
HOMEPAGE="http://live.gnome.org/Empathy" |
120 |
|
121 |
LICENSE="GPL-2" |
122 |
SLOT="0" |
123 |
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" |
124 |
# FIXME: Add location support once geoclue stops being idiotic with automagic deps |
125 |
IUSE="eds map nautilus networkmanager spell test webkit" |
126 |
|
127 |
# FIXME: libnotify & libcanberra hard deps |
128 |
# gst-plugins-bad is required for the valve plugin. This should move to good |
129 |
# eventually at which point the dep can be dropped |
130 |
RDEPEND=">=dev-libs/glib-2.27.2:2 |
131 |
>=x11-libs/gtk+-2.22:2 |
132 |
>=dev-libs/dbus-glib-0.51 |
133 |
>=net-libs/telepathy-glib-0.13.12 |
134 |
>=media-libs/libcanberra-0.4[gtk] |
135 |
>=x11-libs/libnotify-0.7 |
136 |
>=gnome-base/gnome-keyring-2.26 |
137 |
>=net-libs/gnutls-2.8.5 |
138 |
>=dev-libs/folks-0.3.5 |
139 |
|
140 |
>=dev-libs/libunique-1.1.6:1 |
141 |
net-libs/farsight2 |
142 |
media-libs/gstreamer:0.10 |
143 |
media-libs/gst-plugins-base:0.10 |
144 |
media-libs/gst-plugins-bad |
145 |
media-plugins/gst-plugins-gconf |
146 |
>=net-libs/telepathy-farsight-0.0.14 |
147 |
dev-libs/libxml2 |
148 |
x11-libs/libX11 |
149 |
net-voip/telepathy-connection-managers |
150 |
>=net-im/telepathy-logger-0.2.0 |
151 |
|
152 |
eds? ( >=gnome-extra/evolution-data-server-1.2 ) |
153 |
map? ( |
154 |
>=media-libs/libchamplain-0.7.1:0.8[gtk] |
155 |
>=media-libs/clutter-gtk-0.10:0.10 ) |
156 |
nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 ) |
157 |
networkmanager? ( >=net-misc/networkmanager-0.7 ) |
158 |
spell? ( |
159 |
>=app-text/enchant-1.2 |
160 |
>=app-text/iso-codes-0.35 ) |
161 |
webkit? ( >=net-libs/webkit-gtk-1.1.15 ) |
162 |
" |
163 |
DEPEND="${RDEPEND} |
164 |
app-text/scrollkeeper |
165 |
>=app-text/gnome-doc-utils-0.17.3 |
166 |
>=dev-util/intltool-0.35.0 |
167 |
>=dev-util/pkgconfig-0.16 |
168 |
test? ( |
169 |
sys-apps/grep |
170 |
>=dev-libs/check-0.9.4 ) |
171 |
dev-libs/libxslt |
172 |
" |
173 |
PDEPEND=">=net-im/telepathy-mission-control-5" |
174 |
|
175 |
pkg_setup() { |
176 |
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" |
177 |
|
178 |
# call support needs unreleased telepathy-farstream |
179 |
G2CONF="${G2CONF} |
180 |
--enable-silent-rules |
181 |
--disable-coding-style-checks |
182 |
--disable-schemas-compile |
183 |
--disable-static |
184 |
--disable-call |
185 |
--disable-location |
186 |
--disable-control-center-embedding |
187 |
--disable-Werror |
188 |
$(use_enable debug) |
189 |
$(use_with eds) |
190 |
$(use_enable map) |
191 |
$(use_enable nautilus nautilus-sendto) |
192 |
$(use_with networkmanager connectivity nm) |
193 |
$(use_enable spell) |
194 |
$(use_enable webkit)" |
195 |
|
196 |
# Build time python tools needs python2 |
197 |
python_set_active_version 2 |
198 |
} |
199 |
|
200 |
src_prepare() { |
201 |
gnome2_src_prepare |
202 |
python_convert_shebangs -r 2 . |
203 |
} |
204 |
|
205 |
src_test() { |
206 |
unset DBUS_SESSION_BUS_ADDRESS |
207 |
emake check || die "emake check failed." |
208 |
} |
209 |
|
210 |
src_install() { |
211 |
gnome2_pkg_postinst |
212 |
# nautilus-sendto plugin doesn't need this |
213 |
find "${ED}" -name "*.la" -delete |
214 |
} |
215 |
|
216 |
pkg_postinst() { |
217 |
gnome2_pkg_postinst |
218 |
elog "Empathy needs telepathy's connection managers to use any IM protocol." |
219 |
elog "See the USE flags on net-voip/telepathy-connection-managers" |
220 |
elog "to install them." |
221 |
} |