Bump to version 3.2.1

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB0A72FD2

4 files changed, 213 insertions, 18 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index c92d17be705f..10942d959a33 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.165 2013/09/05 18:59:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.166 2013/12/17 15:57:49 vikraman Exp $
+
+*bitlbee-3.2.1 (17 Dec 2013)
+
+  17 Dec 2013; Vikraman <vikraman@gentoo.org> +bitlbee-3.2.1.ebuild,
+  +files/bitlbee-3.2.1-configure.patch:
+  Bump to version 3.2.1
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> bitlbee-3.2.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index aeb874bec4f9..7b04cdfb3b70 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -4,32 +4,23 @@ Hash: SHA256
 AUX bitlbee-3.0-configure.patch 393 SHA256 615e0cadb52abea5c133f8588b7d772c787bee725f11a986bed90226e5da4acd SHA512 9e28f030a952989082489ddd456ff2d1c334aadeb7047ca9e4a551867130c1ec99438321158ecdbb9b757675a2092eac46b973966f742630b3a017bba9851ead WHIRLPOOL 075f35b0042cba28a8e8e9db97f185b867fc149cd8711be5eaba831fc34d6ba81934873800335a2eddbebc4f64f9dbdca1c7395028087dad13325c39043bb35b
 AUX bitlbee-3.0.5-parallel-make.patch 455 SHA256 ba2fbcad2de8e18229f415f19c3bb13817f00d42b5941efb60e83141fff6c718 SHA512 08bc1d76e4f26ec379c3a483800db061fe460eaf56401c33f2e41691235e550ec61acff6667483549549046c43a0af18b8e7792b7428db4172fffb1bcefd4805 WHIRLPOOL 600b21c266eadda27366952afc2bf2ad1960a3dea5580663c642a6916f56b65d2637827f1e13ba39de45fad23b57c5c701765d6076b042ceeade785572d5b289
 AUX bitlbee-3.0.6-configure.patch 321 SHA256 12bc44ebf9630ce3debc988a095d1bbc70015410b8584b66ae7603f50eb03b6a SHA512 253852c254fbc39a309d7dcac5cf797d1757fb9b2303133c81973dc6d25223f00d97668a513d5bd2bae8f7764e7bb9f8f31da4620be9bfb8cd220dcf0d4e979c WHIRLPOOL cd7e3f29dff0255119ee3619ae2b0b6f6f4c18bbdc9d5e93a81cd51ddaa4a7d50ee50750e49f0e0f200f0f7396a8b3969dea53a48dba045ed9f8566c4db4f4df
+AUX bitlbee-3.2.1-configure.patch 327 SHA256 cb1284ef8548d78fe42ad626bf5224cd45f577e9a59dcb0038c1aa18851ffb1f SHA512 5414caaeb566670345f70d0d78e94e5cb119bdd6938deb6ba4666bf026d006dd33d394acbcf1304ed3181cbc698fbe69dcc8b332b975c28bddd95ce1968ae491 WHIRLPOOL faa56d1480626c1a7acd1af95613612c6745cfc72e9c6fad925d53cf8cb10c769f605baee850feff5fd687f859ac161af40426cb22f9215a89915749dc24762d
 AUX bitlbee.confd 62 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628 SHA512 36d3bdd518d4f790fac54401f9b27cc8f2af9946b13c1692b3011faf434d8e3159e47553c7f2500f4a47e0c45d8a1c805efa9065caff8db1b051e80fc30d028d WHIRLPOOL 3de14fd8c3cdcd9eae4f0357643109d836aa86c4dfd0fb05407fa523f188daf934536c101a8985556017c3aaba0371cd9d491f1ab589d6db16a70d1de47dbf10
 AUX bitlbee.initd 667 SHA256 2eaef8071b34c1a3d55271d283b31e25e081791e48a6a55eb394912e4954ba48 SHA512 b3e7f7b07fa106e44981ab311bf874584c1ae2189e90865b4d49cc1046e52cbe96c2e04156bbf36796b376766fca0afbd579e6053da06f0bdf027e5687f99fa2 WHIRLPOOL 5dfbfe88391358066f78a802ab77ac8f50117124db47c866ef7559bbaa6614e3080c82ab83fb91419a7a48a44a73efdbe7f8bf22a607a6c3c172c64ff271226d
 DIST bitlbee-3.0.5.tar.gz 727982 SHA256 a2b18ae0355650b7ec326b8ea7082eb06bb8f8816ad3b4985fe97f729ce84e59
 DIST bitlbee-3.0.6.tar.gz 730918 SHA256 4f3e169f9a8e0cdf7976d2e6f41b9a8f6020a262b5731aa0f91fdb66d17446e8 SHA512 01142dbd6b89e1f80d58a337b3cd2fc7256925e59381563a9010153fce5fb863a76e7855a678d70e109519d2f8fe28f17bdeb2c976eb27f0987d72b82b93f891 WHIRLPOOL 07e4e6d9a16be3fb0d62bc2ec27e309f96ffe541c90cf6c2ce8fb254a217773556fc6e97b00dac26852488b632c479197174999eeabe9afd377f2fd0f7892b36
+DIST bitlbee-3.2.1.tar.gz 657595 SHA256 00f411dd7d6d28f30f0e73e46c9cbe88b4006e7f03adfe07b90a97280a290f59 SHA512 5df1ab94602a801024a459ef166e5515e94e202773b8ade838c55967865f706291d3b3fa63bdd7737d461e96cf8af2f191d5ea4451e14149ac28edb9f5bfce9f WHIRLPOOL 37fc1c84ca512d52b9a16ad54af68891839f4cb4f8af8883d5bf5f3597ffa5952dd4d8f9ad4fd7cda3cb654be21ba206a6fdd6811ea3c67eb00acf7233041a36
 DIST bitlbee-3.2.tar.gz 666404 SHA256 1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030 SHA512 e9479c7ffa17269fc3330dccdb48f26dafdc6bc2decbea52af1a8ad029db89bcbc87d502ec7bb60694693ad1033671cc3e546024291d671fc1380be8bd5ebb69 WHIRLPOOL c2aa53cf8fa48155d65578fde6a0aa12d2e9eb74643575ae1d959918949fc4bc9d9c111e4222526782f44e973e278d74893270c371e7fa5cbd1914a175e20771
 EBUILD bitlbee-3.0.5-r1.ebuild 4807 SHA256 3b803653e44f8364977f8d233748d398ea3466ab65c8bf02ce1ec20204fd2cfe SHA512 415d070a22ec127f7f405517521257d5ca8803173302e04582b66b3e6b72c5579217d44dd00083c56e26eafa2d3480d96855fead83a5bab0338ce126f3492295 WHIRLPOOL be7192a8321a9ab406f04addbd1a020ca7d708c6cbb96bcbf07b3895bc625f4f22e3572bb86664ede67c85c220f3e222956cf8bf783758b3db5380e9505b70ae
 EBUILD bitlbee-3.0.6.ebuild 4809 SHA256 65dd9226a7a738d737029b624a49e07161e04e2cd71741189cdfba072f1275eb SHA512 4bc0a2876864848a0fe2d78b7ccc60f98cd879bd7ccec5f37b8c69af2a5117ed9eeefcd5ec55d44e86a086e7f718106024ced518b333374636452919c48cb014 WHIRLPOOL dac810f05e6bbb01d1c358cbb0823edfcced07a03d965f2ed6d8d31bebd79cc482aac4d97d2fc72d96636a5114de87a084c68739593c1386d46939a1cc3e22ea
+EBUILD bitlbee-3.2.1.ebuild 4813 SHA256 37f15c92d9a27407d0430cedea3aeba4cb0fb85c205d5efa6c7f7af202136029 SHA512 8cfa12bbf5ee647ec06c6546d39bfd415fc0d0b6a1d8d727598e88a35f2e134e30cd023deb68c7c4b52abac6308ef4b95e731f76ec4157e08db1d3b7239cbce4 WHIRLPOOL b1cb1d29ab7adc16953793d02771da6e0eb36236d4184f10a9efacd8c88f43069f8bdedb0a28fafed28e3f103af5f6b1b657f3b87f532b16e130a2de70486edd
 EBUILD bitlbee-3.2.ebuild 4809 SHA256 f28d4b4cae595e35654b566d4cae7ba0f811df1b21d7c0961b35fa4d1e996a63 SHA512 bf4ee7f6e439f4d28cc02f0e6da68769adc3793cff4854ebe11d010042c71b281bdf05c091ba7fe28e7b2b5821ee48b4020cc320423abd71232bc33e2d53c588 WHIRLPOOL ace8bbb6119e86a99b0ae27f6d1757ac63e6d6c57dec1d99abc4c4ec1e87fa210835cf7fdd6ec0d4ae805414a578b54fd5644e1a6b187a08d522397e251d0e74
-MISC ChangeLog 25489 SHA256 d965e429cc9e0cb4f7da0c3a4e0af8e62167f2f768ab9bdcebd1305ef76c5a71 SHA512 355d6cefee05714471e9135cbfe40a0e52f8c98c8765e059ce3ccb3f2cc38284cc235483c0038f3754cba56d37b796f0510f0ad9e7b9862732f85d0d7a366d08 WHIRLPOOL e76ed3b5d88a7efd1ec1bb0464d82ddca71882848e107ff7cc6bfe0bcd89d9d5622964fd8739a7dab40b49801cf7171ac41a1d2f82590c8c2a84cb76aaa956ec
+MISC ChangeLog 25655 SHA256 4e32402baf53360418bc61ff56e8e8194b1575e33d3417a9c0c5329ace72ddec SHA512 d69321f8b0d795cc3457f7f580d98403c62e9cba8e29e21f92525ccec3c37e3cd2c0ecd31115e03919734b83b89d4d59752549dcc4121c418ff107c3b2096ec9 WHIRLPOOL 2208b96e0cb78c6bb15077a4159e24713385bb95460ce035004556aa5d61dc8724a4878c348eabffd149f2d870e12c2afe83eeb143ff774510d826ebfd2817c7
 MISC metadata.xml 1013 SHA256 c0059a06732d902f41537aa682fc705ae7b09ab0d3ed49ade65ed18636ea3b77 SHA512 9f7c3fd74181988e03d3c569e2d55ee83df40804bf4c2496c05acd5a4a8b21db575b1d55b92a26e34c37c3fe4b4a2a771cd8adc80779c570a541751550a2f93e WHIRLPOOL 94eedc807937a9a46b830c1c629317916aa6e6a31e589ad0a70d4653660bf033fe049f6bcbf11260356e9271e9766875829486c71620e010ef6c844320a809da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNTGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObaUP/2iRyG0gYiNlsAv0+ED/iKCU
-PSFA7sfD+D0vuwNx30pwHS7gckBzahiRar2ZrtWSmAIixYCqhWBtPPkeYVrzPrgz
-Xw54+2uVpB33YMeBLt0FWggdpn0oM35jKopblmpMCuhb3ZHKUhVPVzkL0tKB7q+u
-B8T1F3IgOLpxs/vm5ec2LEMQHDtnaibLzaGjox62OzG3kCxfKBuGNnOeg1S/uTaZ
-bf+HyFS8uLpNU9BrrE5YTY2SU1nhxoUl2bswJ4sLCDswzRK+JZ8Vy5gFTX8O1/Mf
-M3lEcsMe2oPWxi6FMgA22/rIGGXTI5JXBae1ow1GfKqPgWIu2LY5aAQEIi3GXe6Q
-6vp8BJFQo3RZHfkFyuLguFBY2al+puiTgu0Yu+vWDik4l6o3pAeY8YwTsBj37i/Q
-uFJuVdhPND0exCchasMtH9p63LoFfLWtRGDFsBKlCJ37fBO31qI4J9IqFB6ldYep
-k63U2KCeIkx3y7MYExzLkEnWhRwx1LX284o3maxCddfZMi66ohDIUDg0Wc9KLm8x
-LD5fndo5/tQRRVOgDnSI7r0/BDVJrE4Fp/6lzSi0BkovUASiwR0xTEaXMr7p87jK
-f1rlOoV4KSwK5WZ4aFkvORjASDMUlkVuS0c2bwhBZJElEarMsjgInSThyZ5bnBhD
-EV+N6z8YEqzXAUuln21F
-=Q25O
+iF4EAREIAAYFAlKwdIEACgkQR91UhLCnL9LytAEAzr+ycBpe9RuUVQaWEFvONqyd
+eZXI3aXiYaGcxapDJK8BANwkKTPvScS/yx8HkXIkc6+sKCyv9SOydou8QMtwNn2I
+=pWf3
 -----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.2.1.ebuild b/net-im/bitlbee/bitlbee-3.2.1.ebuild
new file mode 100644
index 000000000000..7ce88228db16
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.2.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.1.ebuild,v 1.1 2013/12/17 15:57:49 vikraman Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils multilib user python-single-r1
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
+SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple
+skype ssl test twitter +yahoo xinetd" # ldap - Bug 195758
+
+COMMON_DEPEND="purple? ( net-im/pidgin )
+	libevent? ( dev-libs/libevent )
+	!libevent? ( >=dev-libs/glib-2.4 )
+	otr? ( net-libs/libotr )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? ( ssl? ( dev-libs/openssl ) )
+	)"
+	# ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	skype? ( app-text/asciidoc )
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	skype? (
+		dev-python/skype4py[${PYTHON_USEDEP}]
+		net-im/skype
+	)
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="^^ ( purple || ( jabber msn oscar yahoo ) )
+	msn? ( || ( gnutls nss ssl ) )
+	jabber? ( !nss )"
+
+pkg_setup() {
+	if use jabber && ! use gnutls && ! use ssl ; then
+		einfo
+		elog "You have enabled support for Jabber but do not have SSL"
+		elog "support enabled.  This *will* prevent bitlbee from being"
+		elog "able to connect to SSL enabled Jabber servers.  If you need to"
+		elog "connect to Jabber over SSL, enable ONE of the following use"
+		elog "flags: gnutls or ssl"
+		einfo
+	fi
+
+	use skype && python-single-r1_pkg_setup
+
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+	sed -i \
+		-e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
+		-e "s/nobody/bitlbee/" \
+		-e "s/}/	disable         = yes\n}/" \
+		doc/bitlbee.xinetd || die "sed failed in xinetd"
+
+	sed -i \
+		-e "s@mozilla-nss@nss@g" \
+		configure || die "sed failed in configure"
+
+	use skype && python_fix_shebang protocols/skype/skyped.py
+
+	epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch
+	epatch "${FILESDIR}"/${PN}-3.0.5-parallel-make.patch
+}
+
+src_configure() {
+	# ldap hard-disabled for now
+	local myconf="--ldap=0"
+
+	# setup plugins, protocol, ipv6 and debug
+	for flag in debug ipv6 msn jabber oscar plugins purple skype twitter yahoo ; do
+		if use ${flag} ; then
+			myconf="${myconf} --${flag}=1"
+		else
+			myconf="${myconf} --${flag}=0"
+		fi
+	done
+
+	# set otr
+	if use otr && use plugins ; then
+		myconf="${myconf} --otr=plugin"
+	else
+		if use otr ; then
+			ewarn "OTR support has been disabled automatically because it"
+			ewarn "requires the plugins USE flag."
+		fi
+		myconf="${myconf} --otr=0"
+	fi
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf="${myconf} --ssl=gnutls"
+		einfo "Using gnutls for SSL support"
+	elif use ssl ; then
+		myconf="${myconf} --ssl=openssl"
+		einfo "Using openssl for SSL support"
+	elif use nss ; then
+		myconf="${myconf} --ssl=nss"
+		einfo "Using nss for SSL support"
+	else
+		myconf="${myconf} --ssl=bogus"
+		einfo "You will not have any encryption support enabled."
+	fi
+
+	# set event handler
+	if use libevent ; then
+		myconf="${myconf} --events=libevent"
+	else
+		myconf="${myconf} --events=glib"
+	fi
+
+	# NOTE: bitlbee's configure script is not an autotool creation,
+	# so that is why we don't use econf.
+	./configure --prefix=/usr --datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \
+		--strip=0 ${myconf} || die "econf failed"
+
+	sed -i \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die "sed failed"
+}
+
+src_install() {
+	emake install install-etc install-doc install-dev DESTDIR="${D}"
+
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+	dodoc doc/user-guide/user-guide.txt
+	dohtml doc/user-guide/*.html
+
+	if use skype ; then
+		newdoc protocols/skype/NEWS NEWS-skype
+		newdoc protocols/skype/README README-skype
+	fi
+
+	doman doc/bitlbee.8 doc/bitlbee.conf.5
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbee.initd bitlbee
+	newconfd "${FILESDIR}"/bitlbee.confd bitlbee
+
+	exeinto /usr/share/bitlbee
+	cd utils
+	doexe convert_purple.py bitlbee-ctl.pl
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+	chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+
+	einfo
+	elog "The utils included in bitlbee are now located in /usr/share/bitlbee"
+	elog
+	elog "NOTE: The IRSSI script is no longer provided by BitlBee."
+	elog
+	elog "The bitlbeed init script has been replaced by bitlbee."
+	elog "You must update your configuration."
+	einfo
+}
diff --git a/net-im/bitlbee/files/bitlbee-3.2.1-configure.patch b/net-im/bitlbee/files/bitlbee-3.2.1-configure.patch
new file mode 100644
index 000000000000..5bde108af32c
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.2.1-configure.patch
@@ -0,0 +1,17 @@
+--- bitlbee-3.0.6/configure
++++ bitlbee-3.0.6/configure
+@@ -612,14 +612,6 @@
+ 	fi
+ fi
+ 
+-case "$CC" in
+-*gcc* )
+-	echo CFLAGS+=-MMD -MF .depend/\$@.d >> Makefile.settings
+-	for i in . lib tests protocols protocols/*/; do
+-		mkdir -p $i/.depend
+-	done
+-esac
+-
+ if [ "$msn" = 0 ]; then
+ 	echo '#undef WITH_MSN' >> config.h
+ else