1 |
wired 11/11/14 23:31:48 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: bitlbee-3.0.3-r1.ebuild |
5 |
Log: |
6 |
fix for msn login failures |
7 |
|
8 |
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.148 net-im/bitlbee/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.148&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?rev=1.148&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/ChangeLog?r1=1.147&r2=1.148 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v |
20 |
retrieving revision 1.147 |
21 |
retrieving revision 1.148 |
22 |
diff -u -r1.147 -r1.148 |
23 |
--- ChangeLog 11 Oct 2011 19:33:24 -0000 1.147 |
24 |
+++ ChangeLog 14 Nov 2011 23:31:48 -0000 1.148 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-im/bitlbee |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.147 2011/10/11 19:33:24 radhermit Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.148 2011/11/14 23:31:48 wired Exp $ |
30 |
+ |
31 |
+*bitlbee-3.0.3-r1 (14 Nov 2011) |
32 |
+ |
33 |
+ 14 Nov 2011; Alex Alexander <wired@g.o> +bitlbee-3.0.3-r1.ebuild, |
34 |
+ +files/bitlbee-3.0.3-msn-login-fix.patch: |
35 |
+ fix for msn login failures |
36 |
|
37 |
11 Oct 2011; Tim Harder <radhermit@g.o> |
38 |
-files/bitlbee-1.2.2-fix_tests_check_set.patch, -bitlbee-1.2.3.ebuild, |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-im/bitlbee/bitlbee-3.0.3-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.0.3-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/bitlbee-3.0.3-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: bitlbee-3.0.3-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2011 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.3-r1.ebuild,v 1.1 2011/11/14 23:31:48 wired Exp $ |
52 |
|
53 |
EAPI="4" |
54 |
inherit eutils multilib |
55 |
|
56 |
DESCRIPTION="irc to IM gateway that support multiple IM protocols" |
57 |
HOMEPAGE="http://www.bitlbee.org/" |
58 |
SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" |
63 |
IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl test twitter +yahoo xinetd" # ldap - Bug 195758 |
64 |
|
65 |
COMMON_DEPEND="purple? ( net-im/pidgin ) |
66 |
libevent? ( dev-libs/libevent ) |
67 |
!libevent? ( >=dev-libs/glib-2.4 ) |
68 |
otr? ( net-libs/libotr ) |
69 |
gnutls? ( net-libs/gnutls ) |
70 |
!gnutls? ( |
71 |
nss? ( dev-libs/nss ) |
72 |
!nss? ( ssl? ( dev-libs/openssl ) ) |
73 |
)" |
74 |
# ldap? ( net-nds/openldap )" |
75 |
DEPEND="${COMMON_DEPEND} |
76 |
dev-util/pkgconfig |
77 |
test? ( dev-libs/check )" |
78 |
|
79 |
RDEPEND="${COMMON_DEPEND} |
80 |
virtual/logger |
81 |
xinetd? ( sys-apps/xinetd )" |
82 |
|
83 |
REQUIRED_USE="^^ ( purple || ( jabber msn oscar yahoo ) ) |
84 |
msn? ( || ( gnutls nss ssl ) ) |
85 |
jabber? ( !nss )" |
86 |
|
87 |
pkg_setup() { |
88 |
if use jabber && ! use gnutls && ! use ssl ; then |
89 |
einfo |
90 |
elog "You have enabled support for Jabber but do not have SSL" |
91 |
elog "support enabled. This *will* prevent bitlbee from being" |
92 |
elog "able to connect to SSL enabled Jabber servers. If you need to" |
93 |
elog "connect to Jabber over SSL, enable ONE of the following use" |
94 |
elog "flags: gnutls or ssl" |
95 |
einfo |
96 |
fi |
97 |
|
98 |
enewgroup bitlbee |
99 |
enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee |
100 |
} |
101 |
|
102 |
src_prepare() { |
103 |
sed -i \ |
104 |
-e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ |
105 |
-e "s/nobody/bitlbee/" \ |
106 |
-e "s/}/ disable = yes\n}/" \ |
107 |
doc/bitlbee.xinetd || die "sed failed in xinetd" |
108 |
|
109 |
sed -i \ |
110 |
-e "s@mozilla-nss@nss@g" \ |
111 |
configure || die "sed failed in configure" |
112 |
|
113 |
epatch "${FILESDIR}"/${PN}-3.0-configure.patch |
114 |
|
115 |
# fix for msn login issues |
116 |
epatch "${FILESDIR}"/${P}-msn-login-fix.patch |
117 |
} |
118 |
|
119 |
src_configure() { |
120 |
# ldap hard-disabled for now |
121 |
local myconf="--ldap=0" |
122 |
|
123 |
# setup plugins, protocol, ipv6 and debug |
124 |
for flag in debug ipv6 msn jabber oscar plugins purple twitter yahoo ; do |
125 |
if use ${flag} ; then |
126 |
myconf="${myconf} --${flag}=1" |
127 |
else |
128 |
myconf="${myconf} --${flag}=0" |
129 |
fi |
130 |
done |
131 |
|
132 |
# set otr |
133 |
if use otr && use plugins ; then |
134 |
myconf="${myconf} --otr=plugin" |
135 |
else |
136 |
if use otr ; then |
137 |
ewarn "OTR support has been disabled automatically because it" |
138 |
ewarn "requires the plugins USE flag." |
139 |
fi |
140 |
myconf="${myconf} --otr=0" |
141 |
fi |
142 |
|
143 |
# setup ssl use flags |
144 |
if use gnutls ; then |
145 |
myconf="${myconf} --ssl=gnutls" |
146 |
einfo "Using gnutls for SSL support" |
147 |
elif use ssl ; then |
148 |
myconf="${myconf} --ssl=openssl" |
149 |
einfo "Using openssl for SSL support" |
150 |
elif use nss ; then |
151 |
myconf="${myconf} --ssl=nss" |
152 |
einfo "Using nss for SSL support" |
153 |
else |
154 |
myconf="${myconf} --ssl=bogus" |
155 |
einfo "You will not have any encryption support enabled." |
156 |
fi |
157 |
|
158 |
# set event handler |
159 |
if use libevent ; then |
160 |
myconf="${myconf} --events=libevent" |
161 |
else |
162 |
myconf="${myconf} --events=glib" |
163 |
fi |
164 |
|
165 |
# NOTE: bitlbee's configure script is not an autotool creation, |
166 |
# so that is why we don't use econf. |
167 |
./configure --prefix=/usr --datadir=/usr/share/bitlbee \ |
168 |
--etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \ |
169 |
--strip=0 ${myconf} || die "econf failed" |
170 |
|
171 |
sed -i \ |
172 |
-e "/^EFLAGS/s:=:&${LDFLAGS} :" \ |
173 |
Makefile.settings || die "sed failed" |
174 |
} |
175 |
|
176 |
src_install() { |
177 |
emake install install-etc install-doc install-dev DESTDIR="${D}" |
178 |
|
179 |
keepdir /var/lib/bitlbee |
180 |
fperms 700 /var/lib/bitlbee |
181 |
fowners bitlbee:bitlbee /var/lib/bitlbee |
182 |
|
183 |
dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} |
184 |
dodoc doc/user-guide/user-guide.txt |
185 |
dohtml doc/user-guide/*.html |
186 |
|
187 |
doman doc/bitlbee.8 doc/bitlbee.conf.5 |
188 |
|
189 |
if use xinetd ; then |
190 |
insinto /etc/xinetd.d |
191 |
newins doc/bitlbee.xinetd bitlbee |
192 |
fi |
193 |
|
194 |
newinitd "${FILESDIR}"/bitlbee.initd bitlbee |
195 |
newconfd "${FILESDIR}"/bitlbee.confd bitlbee |
196 |
|
197 |
keepdir /var/run/bitlbee |
198 |
fowners bitlbee:bitlbee /var/run/bitlbee |
199 |
|
200 |
exeinto /usr/share/bitlbee |
201 |
cd utils |
202 |
doexe convert_purple.py bitlbee-ctl.pl |
203 |
} |
204 |
|
205 |
pkg_postinst() { |
206 |
chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee |
207 |
chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee |
208 |
|
209 |
einfo |
210 |
elog "The utils included in bitlbee are now located in /usr/share/bitlbee" |
211 |
elog |
212 |
elog "NOTE: The IRSSI script is no longer provided by BitlBee." |
213 |
elog |
214 |
elog "The bitlbeed init script has been replaced by bitlbee." |
215 |
elog "You must update your configuration." |
216 |
einfo |
217 |
} |