Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/bitlbee: metadata.xml ChangeLog bitlbee-1.2.8.ebuild
Date: Wed, 08 Sep 2010 14:03:49
Message-Id: 20100908140339.53A6C20051@flycatcher.gentoo.org
1 wired 10/09/08 14:03:39
2
3 Modified: metadata.xml ChangeLog
4 Added: bitlbee-1.2.8.ebuild
5 Log:
6 version bump, EAPI 3, bug #327851. added myself as maintainer.
7
8 (Portage version: 2.2_rc77/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.6 net-im/bitlbee/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/metadata.xml?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/metadata.xml?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/metadata.xml?r1=1.5&r2=1.6
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/metadata.xml,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- metadata.xml 29 Apr 2010 21:40:29 -0000 1.5
24 +++ metadata.xml 8 Sep 2010 14:03:39 -0000 1.6
25 @@ -5,6 +5,10 @@
26 <maintainer>
27 <email>cedk@g.o</email>
28 </maintainer>
29 + <maintainer>
30 + <email>wired@g.o</email>
31 + <name>Alex Alexander</name>
32 + </maintainer>
33 <use>
34 <flag name='nss'>Use NSS for SSL support in MSN and Jabber</flag>
35 <flag name='twitter'>Enabel Twitter protocol support</flag>
36
37
38
39 1.128 net-im/bitlbee/ChangeLog
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.128&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.128&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?r1=1.127&r2=1.128
44
45 Index: ChangeLog
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v
48 retrieving revision 1.127
49 retrieving revision 1.128
50 diff -u -r1.127 -r1.128
51 --- ChangeLog 10 Aug 2010 17:56:57 -0000 1.127
52 +++ ChangeLog 8 Sep 2010 14:03:39 -0000 1.128
53 @@ -1,6 +1,12 @@
54 # ChangeLog for net-im/bitlbee
55 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
56 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.127 2010/08/10 17:56:57 hwoarang Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.128 2010/09/08 14:03:39 wired Exp $
58 +
59 +*bitlbee-1.2.8 (08 Sep 2010)
60 +
61 + 08 Sep 2010; Alex Alexander <wired@g.o> +bitlbee-1.2.8.ebuild,
62 + metadata.xml:
63 + version bump, EAPI 3, bug #327851. added myself as maintainer.
64
65 10 Aug 2010; Markos Chandras <hwoarang@g.o> bitlbee-1.2.7.ebuild:
66 Respect LDFLAGS. Bug #331845. Thanks to Diego E. 'Flameeyes' Pettenò
67
68
69
70 1.1 net-im/bitlbee/bitlbee-1.2.8.ebuild
71
72 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-1.2.8.ebuild?rev=1.1&view=markup
73 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-1.2.8.ebuild?rev=1.1&content-type=text/plain
74
75 Index: bitlbee-1.2.8.ebuild
76 ===================================================================
77 # Copyright 1999-2010 Gentoo Foundation
78 # Distributed under the terms of the GNU General Public License v2
79 # $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.8.ebuild,v 1.1 2010/09/08 14:03:39 wired Exp $
80
81 EAPI="3"
82 inherit eutils toolchain-funcs confutils
83
84 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
85 HOMEPAGE="http://www.bitlbee.org/"
86 SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
87
88 LICENSE="GPL-2"
89 SLOT="0"
90 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
91 IUSE="debug gnutls ipv6 +jabber msn nss +oscar ssl test twitter +yahoo xinetd" # ldap - Bug 195758
92
93 COMMON_DEPEND=">=dev-libs/glib-2.4
94 msn? ( gnutls? ( net-libs/gnutls )
95 !gnutls? ( nss? ( dev-libs/nss ) )
96 !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) )
97 )
98 jabber? ( gnutls? ( net-libs/gnutls )
99 !gnutls? ( nss? ( dev-libs/nss ) )
100 !gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) )
101 )"
102 # ldap? ( net-nds/openldap )"
103 DEPEND="${COMMON_DEPEND}
104 dev-util/pkgconfig
105 test? ( dev-libs/check )"
106
107 RDEPEND="${COMMON_DEPEND}
108 virtual/logger
109 xinetd? ( sys-apps/xinetd )"
110
111 pkg_setup() {
112 elog "Note: Support for all IM protocols are controlled by use flags."
113 elog " Make sure you've enabled the flags you want."
114 elog
115 confutils_require_any jabber msn oscar twitter yahoo
116
117 # At the request of upstream, die if MSN Messenger support is enabled
118 # but no SSL support has been enabled
119 confutils_use_depend_any msn gnutls nss ssl
120
121 if use jabber && ! use gnutls && ! use ssl ; then
122 if use nss; then
123 ewarn ""
124 ewarn "You have enabled nss and jabber"
125 ewarn "but nss doesn't work with jabber"
126 ewarn "Enable ONE of the following use instead"
127 ewarn "flags: gnutls or ssl"
128 ewarn ""
129 die "nss with jabber doesn't work"
130 fi
131 elog ""
132 elog "You have enabled support for Jabber but do not have SSL"
133 elog "support enabled. This *will* prevent bitlbee from being"
134 elog "able to connect to SSL enabled Jabber servers. If you need to"
135 elog "connect to Jabber over SSL, enable ONE of the following use"
136 elog "flags: gnutls or ssl"
137 elog ""
138 fi
139
140 enewgroup bitlbee
141 enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
142 }
143
144 src_prepare() {
145 sed -i \
146 -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
147 -e "s/nobody/bitlbee/" \
148 -e "s/}/ disable = yes\n}/" \
149 doc/bitlbee.xinetd || die "sed failed in xinetd"
150
151 sed -i \
152 -e "s@mozilla-nss@nss@g" \
153 configure || die "sed failed in configure"
154 }
155
156 src_configure() {
157 # ldap hard-disabled for now
158 local myconf="--ldap=0"
159
160 # setup protocol, ipv6 and debug
161 for flag in debug ipv6 msn jabber oscar twitter yahoo ; do
162 if use ${flag} ; then
163 myconf="${myconf} --${flag}=1"
164 else
165 myconf="${myconf} --${flag}=0"
166 fi
167 done
168
169 # setup ssl use flags
170 if use gnutls ; then
171 myconf="${myconf} --ssl=gnutls"
172 einfo "Use gnutls as SSL support"
173 elif use ssl ; then
174 myconf="${myconf} --ssl=openssl"
175 einfo "Use openssl as SSL support"
176 elif use nss ; then
177 myconf="${myconf} --ssl=nss"
178 einfo "Use nss as SSL support"
179 else
180 myconf="${myconf} --ssl=bogus"
181 einfo "You will not have any encryption support enabled."
182 fi
183
184 # NOTE: bitlbee's configure script is not an autotool creation,
185 # so that is why we don't use econf.
186 ./configure --prefix=/usr --datadir=/usr/share/bitlbee \
187 --etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed"
188
189 sed -i \
190 -e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \
191 -e "/^EFLAGS/s:=:&${LDFLAGS} :" \
192 Makefile.settings || die "sed failed"
193 }
194
195 src_install() {
196 emake install install-etc install-doc install-dev DESTDIR="${D}" ||
197 die "install failed"
198
199 keepdir /var/lib/bitlbee
200 fperms 700 /var/lib/bitlbee
201 fowners bitlbee:bitlbee /var/lib/bitlbee
202
203 dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
204 dodoc doc/user-guide/user-guide.txt
205 dohtml -A xml doc/user-guide/*.xml
206 dohtml -A xsl doc/user-guide/*.xsl
207 dohtml doc/user-guide/*.html
208
209 doman doc/bitlbee.8 doc/bitlbee.conf.5
210
211 if use xinetd; then
212 insinto /etc/xinetd.d
213 newins doc/bitlbee.xinetd bitlbee
214 fi
215
216 newinitd "${FILESDIR}"/bitlbee.initd bitlbee || die
217 newconfd "${FILESDIR}"/bitlbee.confd bitlbee || die
218
219 keepdir /var/run/bitlbee
220 fowners bitlbee:bitlbee /var/run/bitlbee
221
222 dodir /usr/share/bitlbee
223 insinto /usr/share/bitlbee
224 cd utils
225 doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl
226 doins bitlbee-ctl.pl
227 }
228
229 pkg_postinst() {
230 chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
231 chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
232
233 elog "The utils included in bitlbee are now located in /usr/share/bitlbee"
234 elog
235 elog "NOTE: The IRSSI script is no longer provided by BitlBee."
236 elog
237 elog "The bitlbeed init script has been replaced by bitlbee."
238 elog "You must update your configuration."
239 }