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

Gentoo Archives: gentoo-commits

From: "Thomas Anderson (gentoofan23)" <gentoofan23@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/jabberd: ChangeLog metadata.xml jabberd-1.6.1.1-r1.ebuild jabberd-1.6.1.1.ebuild
Date: Fri, 20 Jun 2008 19:16:56
Message-Id: E1K9m6M-0005ea-Hs@stork.gentoo.org
1 gentoofan23 08/06/20 19:16:50
2
3 Modified: ChangeLog metadata.xml
4 Added: jabberd-1.6.1.1-r1.ebuild
5 Removed: jabberd-1.6.1.1.ebuild
6 Log:
7 Revision bump; fixes bug #228021, bug #228375, and bug #226411; Also removing nelchael from metadata.xml as he is no longer maintaining this package; Remove USE flags that do nothing; Disable conditional gnutls dependency as its always necessary
8 (Portage version: 2.1.4.4)
9
10 Revision Changes Path
11 1.106 net-im/jabberd/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/ChangeLog?rev=1.106&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/ChangeLog?rev=1.106&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/ChangeLog?r1=1.105&r2=1.106
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v
20 retrieving revision 1.105
21 retrieving revision 1.106
22 diff -u -r1.105 -r1.106
23 --- ChangeLog 18 Jun 2008 12:24:55 -0000 1.105
24 +++ ChangeLog 20 Jun 2008 19:16:49 -0000 1.106
25 @@ -1,6 +1,17 @@
26 # ChangeLog for net-im/jabberd
27 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.105 2008/06/18 12:24:55 nelchael Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.106 2008/06/20 19:16:49 gentoofan23 Exp $
30 +
31 +*jabberd-1.6.1.1-r1 (20 Jun 2008)
32 +
33 + 20 Jun 2008; Thomas Anderson <gentoofan23@g.o>
34 + files/jabberd-1.6.1.1-sandbox.patch,
35 + +files/jabberd-1.6.1.1-undefineddebug.patch, metadata.xml,
36 + -jabberd-1.6.1.1.ebuild, +jabberd-1.6.1.1-r1.ebuild:
37 + Revision bump; fixes bug #228021, bug #228375, and bug #226411; Also
38 + removing nelchael from metadata.xml as he is no longer maintaining this
39 + package; Remove USE flags that do nothing; Disable conditional gnutls
40 + dependency as its always necessary
41
42 18 Jun 2008; Krzysiek Pawlik <nelchael@g.o>
43 +files/jabberd-1.6.1.1.init:
44
45
46
47 1.8 net-im/jabberd/metadata.xml
48
49 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/metadata.xml?rev=1.8&view=markup
50 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/metadata.xml?rev=1.8&content-type=text/plain
51 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/metadata.xml?r1=1.7&r2=1.8
52
53 Index: metadata.xml
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd/metadata.xml,v
56 retrieving revision 1.7
57 retrieving revision 1.8
58 diff -u -r1.7 -r1.8
59 --- metadata.xml 9 Jun 2008 20:22:03 -0000 1.7
60 +++ metadata.xml 20 Jun 2008 19:16:50 -0000 1.8
61 @@ -2,11 +2,7 @@
62 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
63 <pkgmetadata>
64 <maintainer>
65 - <email>nelchael@g.o</email>
66 - <name>Krzysiek Pawlik</name>
67 - </maintainer>
68 - <maintainer>
69 - <email>gentoofan23@×××××.com</email>
70 + <email>gentoofan23@g.o</email>
71 <name>Thomas Anderson</name>
72 </maintainer>
73 <herd>net-im</herd>
74
75
76
77 1.1 net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
78
79 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild?rev=1.1&view=markup
80 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild?rev=1.1&content-type=text/plain
81
82 Index: jabberd-1.6.1.1-r1.ebuild
83 ===================================================================
84 # Copyright 1999-2008 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 # $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.1 2008/06/20 19:16:50 gentoofan23 Exp $
87
88 WANT_AUTOMAKE="1.9"
89 inherit autotools eutils
90
91 DESCRIPTION="Open-source Jabber server"
92 HOMEPAGE="http://www.jabber.org"
93 SRC_URI="http://download.jabberd.org/jabberd14/jabberd14-${PV}.tar.gz"
94
95 SLOT="0"
96 LICENSE="GPL-2"
97 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
98 IUSE="mysql postgres"
99
100 RDEPEND=">=net-im/jabber-base-0.01
101 >=dev-libs/pth-1.4.0
102 dev-libs/expat
103 net-dns/libidn
104 mysql? ( virtual/mysql )
105 postgres? ( virtual/postgresql-server )
106 net-libs/gnutls
107 dev-libs/popt"
108 DEPEND="${RDEPEND}
109 dev-util/pkgconfig
110 !net-im/jabberd2"
111
112 S=${WORKDIR}/jabberd14-${PV}
113
114 pkg_setup() {
115 if use ipv6; then
116 ewarn "Without full ipv6 support, jabberd will show the error:"
117 ewarn ' "mio unable to listen"'
118 ewarn "To fix this, emerge jabberd without the ipv6 USE flag."
119 fi
120 }
121
122 src_unpack() {
123 unpack ${A}
124 cd "${S}"
125
126 #Shamelessly stolen from Freebsd
127 epatch "${FILESDIR}/${P}-gnutls2.2.patch"
128 ## Gentoo bug #200616
129 epatch "${FILESDIR}/${P}-sandbox.patch"
130 epatch "${FILESDIR}/${P}-parallel-make.patch"
131 epatch "${FILESDIR}/${P}-undefineddebug.patch"
132
133 eautoreconf || die "Reconfiguring autotools failed!"
134 }
135
136 src_compile() {
137 unset LC_ALL LC_CTYPE
138
139 econf \
140 --sysconfdir=/etc/jabber \
141 $(use_with mysql) \
142 $(use_with postgres postgresql) \
143 || die "econf failed"
144
145 emake || die "emake failed"
146 }
147
148 src_install() {
149 emake DESTDIR="${D}" install || die "make install failed"
150
151 newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed"
152
153 # net-im/jabber-base provides needed directories
154 rm -rf "${D}/var"
155 mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
156 mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
157
158 sed -i \
159 -e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
160 -e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
161 -e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
162 -e 's,jabber.pid,jabberd14.pid,g' \
163 "${D}"/etc/jabber/jabberd.xml{,.dist} \
164 || die "sed failed"
165
166 }
167
168 pkg_postinst() {
169
170 echo
171 elog 'The various IM transports for jabber are now separate packages,'
172 elog 'which you will need to install separately if you want them:'
173 elog ' net-im/jit - ICQ transport'
174 elog ' net-im/pymsn-t - MSN transport'
175 elog ' net-im/jud - Jabber User Directory'
176 elog ' net-im/yahoo-transport - Yahoo IM system'
177 elog ' net-im/mu-conference - Jabber multi user conference'
178 echo
179 ewarn 'If upgrading from an older version, please stop jabberd BEFORE'
180 ewarn 'updating the init.d script, or you will end with a "dead" server.'
181 ewarn
182 ewarn 'The configuration filename has changed:'
183 ewarn ' Configure your server in /etc/jabber/jabberd.xml'
184 echo
185 ebeep
186
187 }
188
189
190
191 --
192 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups