1 |
pva 08/01/22 13:38:28 |
2 |
|
3 |
Modified: sim-9999.ebuild ChangeLog sim-0.9.4.3-r1.ebuild |
4 |
Removed: sim-0.9.4.3.ebuild |
5 |
Log: |
6 |
Fixed depends for kde-4, bug 206732, thank Ingmar Vanhassel for the fix. Updated sim live svn ebuild to use cmake based build, bug 200684, thank you Bernd Steinhauser <gentoo AT bernd-steinhauser.de> for work on this. |
7 |
(Portage version: 2.1.3.19) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-im/sim/sim-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-9999.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-9999.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-9999.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: sim-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- sim-9999.ebuild 14 Dec 2007 17:11:21 -0000 1.1 |
23 |
+++ sim-9999.ebuild 22 Jan 2008 13:38:27 -0000 1.2 |
24 |
@@ -1,12 +1,13 @@ |
25 |
-# Copyright 1999-2007 Gentoo Foundation |
26 |
+# Copyright 1999-2008 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.1 2007/12/14 17:11:21 pva Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.2 2008/01/22 13:38:27 pva Exp $ |
30 |
|
31 |
-inherit subversion kde-functions eutils flag-o-matic |
32 |
+EAPI="1" |
33 |
+ |
34 |
+inherit cmake-utils kde-functions eutils flag-o-matic subversion |
35 |
|
36 |
ESVN_REPO_URI="svn://svn.berlios.de/sim-im/trunk" |
37 |
ESVN_PROJECT="sim-im" |
38 |
-ESVN_BOOTSTRAP="make -f ./admin/Makefile.common" |
39 |
|
40 |
DESCRIPTION="Simple Instant Messenger (with KDE support). ICQ/AIM/Jabber/MSN/Yahoo." |
41 |
HOMEPAGE="http://sim-im.org/" |
42 |
@@ -14,28 +15,34 @@ |
43 |
|
44 |
SLOT="0" |
45 |
KEYWORDS="~amd64 ~ppc ~x86" |
46 |
-IUSE="debug kde spell ssl" |
47 |
+IUSE="debug gpg +jabber kde msn +oscar sms spell ssl weather yahoo livejournal" |
48 |
+ |
49 |
+# It's possible to disable/enable pluging defining SIMCMAKEOPTS. E.g. put |
50 |
+# SIMCMAKEOPTS="-DENABLE_PLUGIN_TRANSPARENT:BOOL=Off" |
51 |
+# inside /etc/portage/env/net-im/sim to disable transparent plugin. |
52 |
|
53 |
# kdebase-data provides the icon "licq.png" |
54 |
-RDEPEND="kde? ( kde-base/kdelibs |
55 |
- || ( kde-base/kdebase-data kde-base/kdebase ) ) |
56 |
- !kde? ( $(qt_min_version 3) |
57 |
- spell? ( app-text/aspell ) ) |
58 |
- ssl? ( dev-libs/openssl ) |
59 |
- dev-libs/libxml2 |
60 |
- dev-libs/libxslt |
61 |
- sys-libs/zlib |
62 |
- x11-libs/libXScrnSaver" |
63 |
- |
64 |
-DEPEND="${RDEPEND} |
65 |
- sys-devel/flex |
66 |
- app-arch/zip |
67 |
- x11-proto/scrnsaverproto" |
68 |
+DEPEND="kde? ( kde-base/kdelibs:3.5 ) |
69 |
+ !kde? ( spell? ( app-text/aspell ) ) |
70 |
+ x11-libs/qt:3 |
71 |
+ ssl? ( dev-libs/openssl ) |
72 |
+ dev-libs/libxml2 |
73 |
+ dev-libs/libxslt |
74 |
+ sys-libs/zlib |
75 |
+ media-libs/fontconfig |
76 |
+ x11-libs/libXScrnSaver" |
77 |
+ |
78 |
+RDEPEND="${DEPEND} |
79 |
+ kde? ( || ( kde-base/kdebase-data:3.5 kde-base/kdebase:3.5 ) ) |
80 |
+ gpg? ( app-crypt/gnupg ) |
81 |
+ sys-devel/flex |
82 |
+ app-arch/zip |
83 |
+ x11-proto/scrnsaverproto" |
84 |
|
85 |
pkg_setup() { |
86 |
- if use kde ; then |
87 |
+ if use kde; then |
88 |
if use spell; then |
89 |
- if ! built_with_use kde-base/kdelibs spell ; then |
90 |
+ if ! built_with_use "kde-base/kdelibs:3.5" spell; then |
91 |
ewarn "kde-base/kdelibs were merged without spell in USE." |
92 |
ewarn "Thus spelling will not work in sim. Please, either" |
93 |
ewarn "reemerge kde-base/kdelibs with spell in USE or emerge" |
94 |
@@ -43,7 +50,7 @@ |
95 |
ebeep |
96 |
fi |
97 |
else |
98 |
- if built_with_use kde-base/kdelibs spell ; then |
99 |
+ if built_with_use "kde-base/kdelibs:3.5" spell; then |
100 |
ewarn 'kde-base/kdelibs were merged with spell in USE.' |
101 |
ewarn 'Thus spelling will work in sim. Please, either' |
102 |
ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge' |
103 |
@@ -51,36 +58,39 @@ |
104 |
ebeep |
105 |
fi |
106 |
fi |
107 |
- if ! built_with_use kde-base/kdelibs arts ; then |
108 |
- myconf="--without-arts" |
109 |
- fi |
110 |
fi |
111 |
-} |
112 |
- |
113 |
-src_unpack() { |
114 |
- subversion_src_unpack |
115 |
- |
116 |
- if use kde ; then |
117 |
- set-kdedir 3 |
118 |
+ if ! use jabber && ! use livejournal && ! use msn && ! use oscar && ! use yahoo; then |
119 |
+ eerror "Sim requires at least one instant messaging protocol to be" |
120 |
+ eerror "activated. The available protocols are:" |
121 |
+ eerror "\"jabber livejournal msn oscar yahoo\"." |
122 |
+ die "No instant messaging protocol activated." |
123 |
fi |
124 |
} |
125 |
|
126 |
src_compile() { |
127 |
- filter-flags -fstack-protector -fstack-protector-all |
128 |
- |
129 |
- # Workaround for bug #119906 |
130 |
- append-flags -fno-stack-protector |
131 |
- |
132 |
- use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell" |
133 |
- |
134 |
- econf ${myconf} `use_enable kde` \ |
135 |
- `use_with ssl` \ |
136 |
- `use_enable debug` || die "econf failed" |
137 |
+ if use kde; then |
138 |
+ set-kdedir 3 |
139 |
+ fi |
140 |
+ mycmakeargs="${mycmakeargs} |
141 |
+ $(cmake-utils_use_enable debug PLUGIN_LOGGER) |
142 |
+ $(cmake-utils_use_enable gpg PLUGIN_GPG) |
143 |
+ $(cmake-utils_use_enable jabber PLUGIN_JABBER) |
144 |
+ $(cmake-utils_use_enable livejournal PLUGIN_LIVEJOURNAL) |
145 |
+ $(cmake-utils_use_enable kde KDE3) |
146 |
+ $(cmake-utils_use_enable msn PLUGIN_MSN) |
147 |
+ $(cmake-utils_use_enable oscar PLUGIN_ICQ) |
148 |
+ $(cmake-utils_use_enable sms PLUGIN_SMS) |
149 |
+ $(cmake-utils_use_enable spell PLUGIN_SPELL) |
150 |
+ $(cmake-utils_use_enable ssl OPENSSL) |
151 |
+ $(cmake-utils_use_enable weather PLUGIN_WEATHER) |
152 |
+ $(cmake-utils_use_enable yahoo PLUGIN_YAHOO) |
153 |
+ -DENABLE_PLUGIN_UPDATE:BOOL=Off |
154 |
+ ${SIMCMAKEOPTS}" |
155 |
|
156 |
- emake || die "make failed" |
157 |
+ cmake-utils_src_compile |
158 |
} |
159 |
|
160 |
src_install() { |
161 |
- make DESTDIR="${D}" install || die "make install failed." |
162 |
- dodoc TODO README AUTHORS.sim jisp-resources.txt ChangeLog |
163 |
+ cmake-utils_src_install |
164 |
+ dodoc TODO TODO.CMake README AUTHORS.sim jisp-resources.txt ChangeLog |
165 |
} |
166 |
|
167 |
|
168 |
|
169 |
1.86 net-im/sim/ChangeLog |
170 |
|
171 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/ChangeLog?rev=1.86&view=markup |
172 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/ChangeLog?rev=1.86&content-type=text/plain |
173 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/ChangeLog?r1=1.85&r2=1.86 |
174 |
|
175 |
Index: ChangeLog |
176 |
=================================================================== |
177 |
RCS file: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v |
178 |
retrieving revision 1.85 |
179 |
retrieving revision 1.86 |
180 |
diff -u -r1.85 -r1.86 |
181 |
--- ChangeLog 14 Jan 2008 19:00:05 -0000 1.85 |
182 |
+++ ChangeLog 22 Jan 2008 13:38:27 -0000 1.86 |
183 |
@@ -1,6 +1,13 @@ |
184 |
# ChangeLog for net-im/sim |
185 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
186 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.85 2008/01/14 19:00:05 angelos Exp $ |
187 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.86 2008/01/22 13:38:27 pva Exp $ |
188 |
+ |
189 |
+ 22 Jan 2008; <pva@g.o> -sim-0.9.4.3.ebuild, sim-0.9.4.3-r1.ebuild, |
190 |
+ sim-9999.ebuild: |
191 |
+ Fixed depends for kde-4, bug 206732, thank Ingmar Vanhassel for the fix. |
192 |
+ Updated sim live svn ebuild to use cmake based build, bug 200684, thank you |
193 |
+ Bernd Steinhauser <gentoo AT bernd-steinhauser.de> for work on this. Removed |
194 |
+ old ebuild. |
195 |
|
196 |
14 Jan 2008; Christoph Mende <angelos@g.o> sim-0.9.4.3-r1.ebuild: |
197 |
Stable on amd64 wrt bug #202113 |
198 |
|
199 |
|
200 |
|
201 |
1.7 net-im/sim/sim-0.9.4.3-r1.ebuild |
202 |
|
203 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild?rev=1.7&view=markup |
204 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild?rev=1.7&content-type=text/plain |
205 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild?r1=1.6&r2=1.7 |
206 |
|
207 |
Index: sim-0.9.4.3-r1.ebuild |
208 |
=================================================================== |
209 |
RCS file: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v |
210 |
retrieving revision 1.6 |
211 |
retrieving revision 1.7 |
212 |
diff -u -r1.6 -r1.7 |
213 |
--- sim-0.9.4.3-r1.ebuild 14 Jan 2008 19:00:05 -0000 1.6 |
214 |
+++ sim-0.9.4.3-r1.ebuild 22 Jan 2008 13:38:27 -0000 1.7 |
215 |
@@ -1,6 +1,6 @@ |
216 |
# Copyright 1999-2008 Gentoo Foundation |
217 |
# Distributed under the terms of the GNU General Public License v2 |
218 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.6 2008/01/14 19:00:05 angelos Exp $ |
219 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.9.4.3-r1.ebuild,v 1.7 2008/01/22 13:38:27 pva Exp $ |
220 |
|
221 |
inherit kde-functions eutils flag-o-matic |
222 |
|
223 |
@@ -17,8 +17,8 @@ |
224 |
RESTRICT="fetch" |
225 |
|
226 |
# kdebase-data provides the icon "licq.png" |
227 |
-RDEPEND="kde? ( kde-base/kdelibs |
228 |
- || ( kde-base/kdebase-data kde-base/kdebase ) ) |
229 |
+RDEPEND="kde? ( =kde-base/kdelibs-3.5* |
230 |
+ || ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* ) ) |
231 |
!kde? ( $(qt_min_version 3) |
232 |
spell? ( app-text/aspell ) ) |
233 |
ssl? ( dev-libs/openssl ) |
234 |
@@ -44,9 +44,9 @@ |
235 |
} |
236 |
|
237 |
pkg_setup() { |
238 |
- if use kde ; then |
239 |
+ if use kde; then |
240 |
if use spell; then |
241 |
- if ! built_with_use kde-base/kdelibs spell ; then |
242 |
+ if ! built_with_use "=kde-base/kdelibs-3.5*" spell; then |
243 |
ewarn "kde-base/kdelibs were merged without spell in USE." |
244 |
ewarn "Thus spelling will not work in sim. Please, either" |
245 |
ewarn "reemerge kde-base/kdelibs with spell in USE or emerge" |
246 |
@@ -54,7 +54,7 @@ |
247 |
ebeep |
248 |
fi |
249 |
else |
250 |
- if built_with_use kde-base/kdelibs spell ; then |
251 |
+ if built_with_use "=kde-base/kdelibs-3.5*" spell; then |
252 |
ewarn 'kde-base/kdelibs were merged with spell in USE.' |
253 |
ewarn 'Thus spelling will work in sim. Please, either' |
254 |
ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge' |
255 |
@@ -62,7 +62,7 @@ |
256 |
ebeep |
257 |
fi |
258 |
fi |
259 |
- if ! built_with_use kde-base/kdelibs arts ; then |
260 |
+ if ! built_with_use "=kde-base/kdelibs-3.5*" arts; then |
261 |
myconf="--without-arts" |
262 |
fi |
263 |
fi |
264 |
@@ -74,8 +74,8 @@ |
265 |
|
266 |
epatch "${FILESDIR}"/${P}-double-message-fix.patch |
267 |
epatch ../${P}-r1919_1924.patch |
268 |
- if use kde ; then |
269 |
- set-kdedir 3 |
270 |
+ if use kde; then |
271 |
+ set-kdedir 3 |
272 |
fi |
273 |
} |
274 |
|
275 |
@@ -87,9 +87,9 @@ |
276 |
|
277 |
use kde || use spell || export DO_NOT_COMPILE="$DO_NOT_COMPILE plugins/spell" |
278 |
|
279 |
- econf ${myconf} `use_enable kde` \ |
280 |
- `use_with ssl` \ |
281 |
- `use_enable debug` || die "econf failed" |
282 |
+ econf ${myconf} $(use_enable kde) \ |
283 |
+ $(use_with ssl) \ |
284 |
+ $(use_enable debug) || die "econf failed" |
285 |
|
286 |
emake -j1 || die "make failed" |
287 |
} |
288 |
|
289 |
|
290 |
|
291 |
-- |
292 |
gentoo-commits@l.g.o mailing list |