1 |
pva 09/10/28 13:18:15 |
2 |
|
3 |
Modified: ChangeLog sim-9999.ebuild |
4 |
Log: |
5 |
Dropped kde support from svn ebuild, bug 290867, thank Samuli Suominen for report. If you need kde-3.5 support use kde-sunset overlay. |
6 |
(Portage version: 2.1.7.1/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.100 net-im/sim/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/ChangeLog?rev=1.100&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/ChangeLog?rev=1.100&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/ChangeLog?r1=1.99&r2=1.100 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v |
18 |
retrieving revision 1.99 |
19 |
retrieving revision 1.100 |
20 |
diff -u -r1.99 -r1.100 |
21 |
--- ChangeLog 27 Oct 2009 14:40:30 -0000 1.99 |
22 |
+++ ChangeLog 28 Oct 2009 13:18:15 -0000 1.100 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for net-im/sim |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.99 2009/10/27 14:40:30 pva Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/ChangeLog,v 1.100 2009/10/28 13:18:15 pva Exp $ |
28 |
+ |
29 |
+ 28 Oct 2009; Peter Volkov <pva@g.o> sim-9999.ebuild: |
30 |
+ Dropped kde support from svn ebuild, bug 290867, thank Samuli Suominen for |
31 |
+ report. If you need kde-3.5 support use kde-sunset overlay. |
32 |
|
33 |
27 Oct 2009; Peter Volkov <pva@g.o> sim-0.9.4.3-r3.ebuild: |
34 |
Added migration note, thank Anton Bolshakov for report in bug #275316. |
35 |
|
36 |
|
37 |
|
38 |
1.4 net-im/sim/sim-9999.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-9999.ebuild?rev=1.4&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-9999.ebuild?rev=1.4&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/sim/sim-9999.ebuild?r1=1.3&r2=1.4 |
43 |
|
44 |
Index: sim-9999.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v |
47 |
retrieving revision 1.3 |
48 |
retrieving revision 1.4 |
49 |
diff -u -r1.3 -r1.4 |
50 |
--- sim-9999.ebuild 11 May 2008 13:24:42 -0000 1.3 |
51 |
+++ sim-9999.ebuild 28 Oct 2009 13:18:15 -0000 1.4 |
52 |
@@ -1,6 +1,6 @@ |
53 |
-# Copyright 1999-2008 Gentoo Foundation |
54 |
+# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.3 2008/05/11 13:24:42 pva Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-9999.ebuild,v 1.4 2009/10/28 13:18:15 pva Exp $ |
58 |
|
59 |
EAPI="1" |
60 |
|
61 |
@@ -14,17 +14,15 @@ |
62 |
LICENSE="GPL-2" |
63 |
|
64 |
SLOT="0" |
65 |
-KEYWORDS="~amd64 ~ppc ~x86" |
66 |
-IUSE="debug gpg +jabber kde msn +oscar sms spell ssl weather yahoo livejournal" |
67 |
+KEYWORDS="" |
68 |
+IUSE="debug gpg +jabber msn +oscar sms spell ssl weather yahoo livejournal" |
69 |
|
70 |
# It's possible to disable/enable pluging defining SIMCMAKEOPTS. E.g. put |
71 |
# SIMCMAKEOPTS="-DENABLE_PLUGIN_TRANSPARENT:BOOL=Off" |
72 |
# inside /etc/portage/env/net-im/sim to disable transparent plugin. |
73 |
|
74 |
-# kdebase-data provides the icon "licq.png" |
75 |
-RDEPEND="kde? ( kde-base/kdelibs:3.5 |
76 |
- || ( kde-base/kdebase-data:3.5 kde-base/kdebase:3.5 ) ) |
77 |
- !kde? ( spell? ( app-text/aspell ) ) |
78 |
+RDEPEND=" |
79 |
+ spell? ( app-text/aspell ) |
80 |
x11-libs/qt:3 |
81 |
ssl? ( dev-libs/openssl ) |
82 |
gpg? ( app-crypt/gnupg ) |
83 |
@@ -39,44 +37,12 @@ |
84 |
app-arch/zip |
85 |
x11-proto/scrnsaverproto" |
86 |
|
87 |
-pkg_setup() { |
88 |
- if use kde; then |
89 |
- if use 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 |
- ewarn 'sim with USE="-spell" to avoid this message.' |
95 |
- ebeep |
96 |
- fi |
97 |
- else |
98 |
- if built_with_use "kde-base/kdelibs:3.5" spell; then |
99 |
- ewarn 'kde-base/kdelibs were merged with spell in USE.' |
100 |
- ewarn 'Thus spelling will work in sim. Please, either' |
101 |
- ewarn 'reemerge kde-base/kdelibs without spell in USE or emerge' |
102 |
- ewarn 'sim with USE="spell" to avoid this message.' |
103 |
- ebeep |
104 |
- fi |
105 |
- fi |
106 |
- fi |
107 |
- if ! use jabber && ! use livejournal && ! use msn && ! use oscar && ! use yahoo; then |
108 |
- eerror "Sim requires at least one instant messaging protocol to be" |
109 |
- eerror "activated. The available protocols are:" |
110 |
- eerror "\"jabber livejournal msn oscar yahoo\"." |
111 |
- die "No instant messaging protocol activated." |
112 |
- fi |
113 |
-} |
114 |
- |
115 |
src_compile() { |
116 |
- if use kde; then |
117 |
- set-kdedir 3 |
118 |
- fi |
119 |
mycmakeargs="${mycmakeargs} |
120 |
$(cmake-utils_use_enable debug PLUGIN_LOGGER) |
121 |
$(cmake-utils_use_enable gpg PLUGIN_GPG) |
122 |
$(cmake-utils_use_enable jabber PLUGIN_JABBER) |
123 |
$(cmake-utils_use_enable livejournal PLUGIN_LIVEJOURNAL) |
124 |
- $(cmake-utils_use_enable kde KDE3) |
125 |
$(cmake-utils_use_enable msn PLUGIN_MSN) |
126 |
$(cmake-utils_use_enable oscar PLUGIN_ICQ) |
127 |
$(cmake-utils_use_enable sms PLUGIN_SMS) |
128 |
@@ -84,6 +50,7 @@ |
129 |
$(cmake-utils_use_enable ssl OPENSSL) |
130 |
$(cmake-utils_use_enable weather PLUGIN_WEATHER) |
131 |
$(cmake-utils_use_enable yahoo PLUGIN_YAHOO) |
132 |
+ -DENABLE_KDE3=OFF |
133 |
-DENABLE_PLUGIN_UPDATE:BOOL=Off |
134 |
${SIMCMAKEOPTS}" |
135 |
|
136 |
@@ -94,3 +61,10 @@ |
137 |
cmake-utils_src_install |
138 |
dodoc TODO TODO.CMake README AUTHORS.sim jisp-resources.txt ChangeLog |
139 |
} |
140 |
+ |
141 |
+pkg_postinst() { |
142 |
+ ewarn "Since kde-3.5 is deprecated sim doesn't have kde support any more (#275316)." |
143 |
+ ewarn "If you have used sim built with kde USE flag enabled to migrate on qt only" |
144 |
+ ewarn "version of sim, please, run the following command:" |
145 |
+ ewarn " $ mv ~/.kde3.5/share/apps/sim ~/.sim" |
146 |
+} |