Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Nirbheek Chauhan (nirbheek)" <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/empathy: empathy-2.28.2.ebuild ChangeLog empathy-2.28.2-r1.ebuild empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild
Date: Sun, 28 Feb 2010 12:44:20
Message-Id: E1NliVO-0001Ju-Lv@stork.gentoo.org
1 nirbheek 10/02/28 12:44:18
2
3 Modified: empathy-2.28.2.ebuild ChangeLog
4 Added: empathy-2.28.2-r1.ebuild
5 Removed: empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild
6 Log:
7 Add patch to fix compilation with networkmanager-0.8 (causes dropping of keywords, bug 296548), fixes bug 306977 . Also remove old versions.
8 (Portage version: 2.1.7.17/cvs/Linux i686)
9
10 Revision Changes Path
11 1.4 net-im/empathy/empathy-2.28.2.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild?r1=1.3&r2=1.4
16
17 Index: empathy-2.28.2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- empathy-2.28.2.ebuild 19 Feb 2010 19:33:27 -0000 1.3
24 +++ empathy-2.28.2.ebuild 28 Feb 2010 12:44:17 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v 1.3 2010/02/19 19:33:27 armin76 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v 1.4 2010/02/28 12:44:17 nirbheek Exp $
30
31 EAPI="2"
32
33 @@ -36,7 +36,7 @@
34 net-voip/telepathy-connection-managers
35
36 applet? ( >=gnome-base/gnome-panel-2.10 )
37 - networkmanager? ( >=net-misc/networkmanager-0.7 )
38 + networkmanager? ( =net-misc/networkmanager-0.7* )
39 python? (
40 >=dev-lang/python-2.4.4-r5
41 >=dev-python/pygtk-2 )
42
43
44
45 1.51 net-im/empathy/ChangeLog
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?rev=1.51&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?rev=1.51&content-type=text/plain
49 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?r1=1.50&r2=1.51
50
51 Index: ChangeLog
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v
54 retrieving revision 1.50
55 retrieving revision 1.51
56 diff -u -r1.50 -r1.51
57 --- ChangeLog 19 Feb 2010 19:33:27 -0000 1.50
58 +++ ChangeLog 28 Feb 2010 12:44:17 -0000 1.51
59 @@ -1,6 +1,15 @@
60 # ChangeLog for net-im/empathy
61 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
62 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.50 2010/02/19 19:33:27 armin76 Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.51 2010/02/28 12:44:17 nirbheek Exp $
64 +
65 +*empathy-2.28.2-r1 (28 Feb 2010)
66 +
67 + 28 Feb 2010; Nirbheek Chauhan <nirbheek@g.o>
68 + +files/empathy-2.28-networkmanager-0.8.patch, -empathy-2.28.1.1.ebuild,
69 + -empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuild,
70 + +empathy-2.28.2-r1.ebuild:
71 + Add patch to fix compilation with networkmanager-0.8, fixes bug 306977 .
72 + also remove old versions.
73
74 19 Feb 2010; Raúl Porcel <armin76@g.o> empathy-2.26.2.ebuild,
75 empathy-2.28.1.1.ebuild, empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuild:
76
77
78
79 1.1 net-im/empathy/empathy-2.28.2-r1.ebuild
80
81 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild?rev=1.1&view=markup
82 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild?rev=1.1&content-type=text/plain
83
84 Index: empathy-2.28.2-r1.ebuild
85 ===================================================================
86 # Copyright 1999-2010 Gentoo Foundation
87 # Distributed under the terms of the GNU General Public License v2
88 # $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild,v 1.1 2010/02/28 12:44:17 nirbheek Exp $
89
90 EAPI="2"
91
92 inherit autotools eutils gnome2 multilib
93
94 DESCRIPTION="Telepathy client and library using GTK+"
95 HOMEPAGE="http://live.gnome.org/Empathy"
96
97 LICENSE="GPL-2"
98 SLOT="0"
99 KEYWORDS="~amd64 ~x86"
100 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
101 IUSE="applet networkmanager python spell test webkit" # map
102
103 # FIXME: libnotify & libcanberra hard deps
104 RDEPEND=">=dev-libs/glib-2.16.0
105 >=x11-libs/gtk+-2.16.0
106 >=gnome-base/gconf-2
107 >=dev-libs/dbus-glib-0.51
108 >=gnome-extra/evolution-data-server-1.2
109 >=net-libs/telepathy-glib-0.7.35
110 >=media-libs/libcanberra-0.4[gtk]
111 >=x11-libs/libnotify-0.4.4
112 >=gnome-base/gnome-keyring-2.22
113
114 dev-libs/libunique
115 net-libs/farsight2
116 media-libs/gstreamer:0.10
117 media-libs/gst-plugins-base:0.10
118 net-libs/telepathy-farsight
119 dev-libs/libxml2
120 x11-libs/libX11
121 net-voip/telepathy-connection-managers
122
123 applet? ( >=gnome-base/gnome-panel-2.10 )
124 networkmanager? ( >=net-misc/networkmanager-0.8 )
125 python? (
126 >=dev-lang/python-2.4.4-r5
127 >=dev-python/pygtk-2 )
128 spell? (
129 app-text/enchant
130 app-text/iso-codes )
131 webkit? ( >=net-libs/webkit-gtk-1.1.7 )
132 "
133 # map? (
134 # >=media-libs/libchamplain-0.4[gtk]
135 # >=media-libs/clutter-gtk-0.10:1.0 )
136 DEPEND="${RDEPEND}
137 app-text/scrollkeeper
138 >=app-text/gnome-doc-utils-0.17.3
139 >=dev-util/intltool-0.35.0
140 >=dev-util/pkgconfig-0.16
141 test? (
142 sys-apps/grep
143 >=dev-libs/check-0.9.4 )
144 dev-libs/libxslt
145 virtual/python
146 "
147 PDEPEND=">=net-im/telepathy-mission-control-5"
148
149 DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
150
151 # FIXME: Highly broken with parallel make, mallard strike 2, see bug #286889
152 MAKEOPTS="${MAKEOPTS} -j1"
153
154 pkg_setup() {
155 G2CONF="${G2CONF}
156 --disable-maintainer-mode
157 --disable-static
158 --disable-location
159 --disable-gtk-doc
160 --disable-map
161 $(use_enable applet megaphone)
162 $(use_enable applet nothere)
163 $(use_enable debug)
164 $(use_with networkmanager connectivity nm)
165 $(use_enable python)
166 $(use_enable spell)
167 $(use_enable test coding-style-checks)
168 $(use_enable webkit)
169 "
170 }
171
172 src_prepare() {
173 gnome2_src_prepare
174
175 epatch "${FILESDIR}/empathy-2.28-networkmanager-0.8.patch"
176 eautoreconf
177
178 # Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
179 sed -i "s:-Werror::g" configure || die "sed 1 failed"
180 }
181
182 src_test() {
183 unset DBUS_SESSION_BUS_ADDRESS
184 emake check || die "emake check failed."
185 }
186
187 pkg_preinst() {
188 gnome2_pkg_preinst
189 preserve_old_lib /usr/$(get_libdir)/libempathy.so.23
190 preserve_old_lib /usr/$(get_libdir)/libempathy-gtk.so.19
191 }
192
193 pkg_postinst() {
194 gnome2_pkg_postinst
195 echo
196 elog "Empathy needs telepathy's connection managers to use any IM protocol."
197 elog "See the USE flags on net-voip/telepathy-connection-managers"
198 elog "to install them."
199 preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23
200 preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19
201 }
Report Message
Find on MARC Find on Google Groups