1 |
pva 10/11/28 18:41:26 |
2 |
|
3 |
Modified: psi-9999.ebuild metadata.xml ChangeLog |
4 |
Log: |
5 |
Fixed debug USE flag, update svn paths, thank Nikoli for this job. |
6 |
|
7 |
(Portage version: 2.1.9.24/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.9 net-im/psi/psi-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.9&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.9&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.8&r2=1.9 |
15 |
|
16 |
Index: psi-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v |
19 |
retrieving revision 1.8 |
20 |
retrieving revision 1.9 |
21 |
diff -u -r1.8 -r1.9 |
22 |
--- psi-9999.ebuild 16 Nov 2010 20:15:46 -0000 1.8 |
23 |
+++ psi-9999.ebuild 28 Nov 2010 18:41:26 -0000 1.9 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.8 2010/11/16 20:15:46 pva Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.9 2010/11/28 18:41:26 pva Exp $ |
29 |
|
30 |
EAPI="2" |
31 |
|
32 |
@@ -11,7 +11,7 @@ |
33 |
LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n" |
34 |
|
35 |
ESVN_DISABLE_DEPENDENCIES="true" |
36 |
-ESVN_REPO_URI="http://psi-dev.googlecode.com/svn/trunk" |
37 |
+ESVN_REPO_URI="http://psi-dev.googlecode.com/svn/trunk/patches" |
38 |
ESVN_PROJECT="psiplus" |
39 |
|
40 |
inherit eutils qt4-r2 multilib git subversion |
41 |
@@ -21,7 +21,7 @@ |
42 |
LICENSE="GPL-2" |
43 |
SLOT="0" |
44 |
KEYWORDS="" |
45 |
-IUSE="crypt dbus doc enchant extras jingle iconsets spell ssl xscreensaver powersave |
46 |
+IUSE="crypt dbus debug doc enchant extras jingle iconsets spell ssl xscreensaver powersave |
47 |
plugins -whiteboarding webkit" |
48 |
|
49 |
RDEPEND=">=x11-libs/qt-gui-4.4:4[qt3support,dbus?] |
50 |
@@ -41,8 +41,9 @@ |
51 |
${SUBVERSION_DEPEND} |
52 |
sys-devel/qconf |
53 |
) |
54 |
- doc? ( app-doc/doxygen )" |
55 |
- |
56 |
+ doc? ( app-doc/doxygen ) |
57 |
+ dev-util/pkgconfig |
58 |
+" |
59 |
PDEPEND="crypt? ( app-crypt/qca-gnupg:2 ) |
60 |
jingle? ( |
61 |
net-im/psimedia |
62 |
@@ -59,21 +60,20 @@ |
63 |
done |
64 |
|
65 |
if use extras; then |
66 |
- ewarn |
67 |
+ echo |
68 |
ewarn "You're about to build heavily patched version of Psi called Psi+." |
69 |
ewarn "It has really nice features but still is under heavy development." |
70 |
ewarn "Take a look at homepage for more info: http://code.google.com/p/psi-dev" |
71 |
ewarn "If you wish to disable some patches just put" |
72 |
ewarn "MY_EPATCH_EXCLUDE=\"list of patches\"" |
73 |
ewarn "into /etc/portage/env/${CATEGORY}/${PN} file." |
74 |
- ewarn |
75 |
+ echo |
76 |
ewarn "Note: some patches depend on other. So if you disabled some patch" |
77 |
ewarn "and other started to fail to apply, you'll have to disable patches" |
78 |
ewarn "that fail too." |
79 |
- ebeep |
80 |
|
81 |
if use iconsets; then |
82 |
- ewarn |
83 |
+ echo |
84 |
ewarn "Some artwork is from open source projects, but some is provided 'as-is'" |
85 |
ewarn "and has not clear licensing." |
86 |
ewarn "Possibly this build is not redistributable in some countries." |
87 |
@@ -100,13 +100,13 @@ |
88 |
done |
89 |
|
90 |
if use extras; then |
91 |
- S="${WORKDIR}/patches" subversion_fetch "${ESVN_REPO_URI}/patches" |
92 |
+ S="${WORKDIR}/patches" subversion_fetch |
93 |
if use iconsets; then |
94 |
- subversion_fetch "${ESVN_REPO_URI}/iconsets" "iconsets" |
95 |
+ subversion_fetch "${ESVN_REPO_URI%patches}iconsets" "iconsets" |
96 |
else |
97 |
for x in activities affiliations clients moods roster system; do |
98 |
- ESVN_PROJECT="psiplus/${x}" |
99 |
- subversion_fetch "${ESVN_REPO_URI}/iconsets/${x}/default" "iconsets/${x}/default" |
100 |
+ ESVN_PROJECT="psiplus/${x}" \ |
101 |
+ subversion_fetch "${ESVN_REPO_URI%patches}iconsets/${x}/default" "iconsets/${x}/default" |
102 |
done |
103 |
fi |
104 |
fi |
105 |
@@ -146,7 +146,9 @@ |
106 |
--qtdir=/usr |
107 |
--disable-bundled-qca |
108 |
--disable-growl |
109 |
+ --no-separate-debug-info |
110 |
$(use dbus || echo '--disable-qdbus') |
111 |
+ $(use debug && echo '--debug') |
112 |
$(use spell && { |
113 |
use enchant && echo '--disable-aspell' || echo '--disable-enchant' |
114 |
} || echo '--disable-aspell --disable-enchant') |
115 |
|
116 |
|
117 |
|
118 |
1.10 net-im/psi/metadata.xml |
119 |
|
120 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/metadata.xml?rev=1.10&view=markup |
121 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/metadata.xml?rev=1.10&content-type=text/plain |
122 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/metadata.xml?r1=1.9&r2=1.10 |
123 |
|
124 |
Index: metadata.xml |
125 |
=================================================================== |
126 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/metadata.xml,v |
127 |
retrieving revision 1.9 |
128 |
retrieving revision 1.10 |
129 |
diff -u -r1.9 -r1.10 |
130 |
--- metadata.xml 22 Jul 2010 13:30:33 -0000 1.9 |
131 |
+++ metadata.xml 28 Nov 2010 18:41:26 -0000 1.10 |
132 |
@@ -5,6 +5,10 @@ |
133 |
<maintainer> |
134 |
<email>pva@g.o</email> |
135 |
</maintainer> |
136 |
+<maintainer> |
137 |
+ <email>nikoli@×××××××.com</email> |
138 |
+ <name>Nikoli</name> |
139 |
+</maintainer> |
140 |
<longdescription>Psi is a very good jabber client that uses QT</longdescription> |
141 |
<use> |
142 |
<flag name='enchant'>Use enchant spell engine instead of aspell</flag> |
143 |
|
144 |
|
145 |
|
146 |
1.203 net-im/psi/ChangeLog |
147 |
|
148 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.203&view=markup |
149 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.203&content-type=text/plain |
150 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.202&r2=1.203 |
151 |
|
152 |
Index: ChangeLog |
153 |
=================================================================== |
154 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v |
155 |
retrieving revision 1.202 |
156 |
retrieving revision 1.203 |
157 |
diff -u -r1.202 -r1.203 |
158 |
--- ChangeLog 16 Nov 2010 20:15:46 -0000 1.202 |
159 |
+++ ChangeLog 28 Nov 2010 18:41:26 -0000 1.203 |
160 |
@@ -1,6 +1,9 @@ |
161 |
# ChangeLog for net-im/psi |
162 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
163 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.202 2010/11/16 20:15:46 pva Exp $ |
164 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.203 2010/11/28 18:41:26 pva Exp $ |
165 |
+ |
166 |
+ 28 Nov 2010; Peter Volkov <pva@g.o> psi-9999.ebuild, metadata.xml: |
167 |
+ Fixed debug USE flag, update svn paths, thank Nikoli for this job. |
168 |
|
169 |
16 Nov 2010; Peter Volkov <pva@g.o> psi-9999.ebuild: |
170 |
Some icons were not installed, thank Nikoli for this job. |