Version bump.

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

4 files changed, 222 insertions, 5 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index e183c173b6ea..f4a0d0a6c74b 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.160 2012/07/20 01:33:34 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.161 2012/10/19 09:20:17 radhermit Exp $
+
+*bitlbee-3.0.6 (19 Oct 2012)
+
+  19 Oct 2012; Tim Harder <radhermit@gentoo.org> +bitlbee-3.0.6.ebuild,
+  +files/bitlbee-3.0.6-configure.patch:
+  Version bump.
 
   20 Jul 2012; Anthony G. Basile <blueness@gentoo.org> bitlbee-3.0.5-r1.ebuild:
   Keyword ~ppc64
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 642fa87a68d3..37e2570495ba 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -3,16 +3,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.confd 62 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628 SHA512 36d3bdd518d4f790fac54401f9b27cc8f2af9946b13c1692b3011faf434d8e3159e47553c7f2500f4a47e0c45d8a1c805efa9065caff8db1b051e80fc30d028d WHIRLPOOL 3de14fd8c3cdcd9eae4f0357643109d836aa86c4dfd0fb05407fa523f188daf934536c101a8985556017c3aaba0371cd9d491f1ab589d6db16a70d1de47dbf10
 AUX bitlbee.initd 610 SHA256 fc20fb40dbc8d2daf321dcc4d05854d0f3d89e7601b174c741b42dbb5ec7a830 SHA512 5964ba8f859f6c15cf14002a7ddf52cc2faf431b84c4a5876f894458f9c8584f6f521080079c425431b35a37e42317fe29e865d435d58d0f3afeb3e5c1af1f58 WHIRLPOOL 033a0f9baf0509c1b9792a335bd78899e5ab16885ba16f8606363d97455c1d3294ef52bf575aaa9bfdd460d04d28940138fb91ebf18035a831ef9b31e2a48bc7
 DIST bitlbee-3.0.5.tar.gz 727982 SHA256 a2b18ae0355650b7ec326b8ea7082eb06bb8f8816ad3b4985fe97f729ce84e59
+DIST bitlbee-3.0.6.tar.gz 730918 SHA256 4f3e169f9a8e0cdf7976d2e6f41b9a8f6020a262b5731aa0f91fdb66d17446e8 SHA512 01142dbd6b89e1f80d58a337b3cd2fc7256925e59381563a9010153fce5fb863a76e7855a678d70e109519d2f8fe28f17bdeb2c976eb27f0987d72b82b93f891 WHIRLPOOL 07e4e6d9a16be3fb0d62bc2ec27e309f96ffe541c90cf6c2ce8fb254a217773556fc6e97b00dac26852488b632c479197174999eeabe9afd377f2fd0f7892b36
 EBUILD bitlbee-3.0.5-r1.ebuild 4880 SHA256 db0048cae89eac7c2dedda2b883b996d165a71cec843c92896f2eaf4cddc6894 SHA512 24cdce2511dfa2bd40233f787e9b81213be3b4660403045a28785387808561b2b6acfd9cbb1c378924874764fbbf97fa03cc2829002b704953e750f0dae85ef5 WHIRLPOOL 37f86f7c6e04672d0e9743cca20736ffd5b39e25bc2ab1626673d0702b95dc8918e98bc5636a2c12bd45db76050b24b3318af7b95ac949fec9f2b7e4c17ec099
-MISC ChangeLog 24789 SHA256 13f357f885f5c499a30fc1fe64cefb7e7f6cbcfe9842089f17c1cbba2e722366 SHA512 41a790bdb2f4a108262cd8832a1302445b264f9ed05b87ee706a89e38c7dc3c306c7a2c12df9432a235e9b4f47c3ffafea12faf1ba6fd6c606e292c202d02cf5 WHIRLPOOL 31adf41f7661633b05402b2d499c67d66565450246b24bc758eabdcb257259f86d036759c8a5181716118c9db17410fa148151d8881b6b291b1869b6465c6c16
+EBUILD bitlbee-3.0.6.ebuild 4883 SHA256 1d1a3798b4bef669648033813efc420ee706055f0570c340fee882e5abd56e64 SHA512 2dd686663107100f41156a6db52ce703de14a88b394f19afbadcccaf6ff3e28b566f2a69957078b6f62b7ea31e284ef7265d8fbcbdf1e8b4f0d69a61e61326ea WHIRLPOOL b5b9b8a37de8fcd063ef06e336a8e78380a3be627e3cdd00ac43eaa40d6e2c2ddad676e8e8a812504334e26ff7c7d1ceb6a7f7f3ec253eaa5b30006a9097f258
+MISC ChangeLog 24949 SHA256 ee4304ad49e5f0f6ad0f4d3c637409120955d81e3d85513d4fa9ef4b6b019801 SHA512 75a517eb01bfcb4638e09d88d2952742b1ea1f771be70de3fad54751715e89e1e282edd110a503b5b3955406f37ba36f17f04c4094a2dd1bcfbce9ed99a2306c WHIRLPOOL 603dce3d9385757241dc20a507aa5ef81951a4ea26188a133648ea8baf72bc0767f897fcf369f5be402bd4413f7b5756998c5b8d827a040f891c330b227d921f
 MISC metadata.xml 1075 SHA256 2d88e6eedbc5089e23f646c4ad16acbae51444e0caf81618ab2d93e2374622f0 SHA512 ba4b3bd5abc0ee2376cf2861addebffe45add8a5c22a8bd26f7b24203d7eb1602f1bf7fc8c8cb87bbcd834d33276b246d48616d66f2bf3321f3a66476f61b260 WHIRLPOOL 8391fd2dc5a6036ebdd5973d2971bbdbe98ae34d90ae1bd97c19109ef0478921eba3df96a015bcc1dfb9ef815b050d6ea3d591e6908894ee28829d1a059945f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAItXgACgkQl5yvQNBFVTXgKgCeMjNpPRsvRj4jwMchhZ3rX8ZU
-NsQAoIpRKeNyY7MHqaN/r2Dflx49qQtY
-=26/o
+iQEcBAEBCAAGBQJQgRtWAAoJEEqz6FtPBkyjZ+MIAIthXO7mF2AOv+bmyxmm3C8D
+ACnYq9RU7ejhoTuEAr9pI9c6kHF7Y46Uz25E65LwZyaAB1amfRPG+7Op/Lp1puI7
+C7g1YDEHS3UY3lXVpgaVWwMzRtFOr4P1JgdqSADAMhSo1OrRN3SeB2+nWw6DlfKl
+yDA4/yLPFxlI0kzwCk0pZ0RtPcbk1Y9xXZRqFZSHkN9GP/YMWtiVC34GzmkTbJji
+KEF5BwZTapL/vMIWXKCp6I3k6KRxZxAkMWwukQ6Af0SDU7cc8/rJAB4bgEdwtfYP
+7XdnfSoMnRwESa4j4+lf2pMO2aNa2pyJjxMmuUh3MbA7aCn2jhr0COSEzFtqk8Y=
+=kyxD
 -----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.0.6.ebuild b/net-im/bitlbee/bitlbee-3.0.6.ebuild
new file mode 100644
index 000000000000..733fef6594fe
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.0.6.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.6.ebuild,v 1.1 2012/10/19 09:20:17 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="skype? 2:2.5"
+
+inherit eutils multilib python user
+
+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
+		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
+
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+
+	if use skype ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+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_convert_shebangs 2 protocols/skype/skyped.py
+
+	epatch "${FILESDIR}"/${P}-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
+
+	keepdir /var/run/bitlbee
+	fowners bitlbee:bitlbee /var/run/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.0.6-configure.patch b/net-im/bitlbee/files/bitlbee-3.0.6-configure.patch
new file mode 100644
index 000000000000..a89e718af045
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.0.6-configure.patch
@@ -0,0 +1,17 @@
+--- bitlbee-3.0.6/configure
++++ bitlbee-3.0.6/configure
+@@ -655,14 +655,6 @@
+ 	fi
+ fi
+ 
+-case "$CC" in
+-*gcc* )
+-	echo CFLAGS+=-MMD -MF .depend/\$@.d >> Makefile.settings
+-	for i in . lib protocols protocols/*/; do
+-		mkdir -p $i/.depend
+-	done
+-esac
+-
+ if [ "$msn" = 0 ]; then
+ 	echo '#undef WITH_MSN' >> config.h
+ else