Version bump to new bugfix release.

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

3 files changed, 209 insertions, 9 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 02073e0c5274..7235a1dcbd99 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.131 2010/10/29 00:18:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.132 2010/11/25 05:08:12 radhermit Exp $
+
+*bitlbee-3.0.1 (25 Nov 2010)
+
+  25 Nov 2010; Tim Harder <radhermit@gentoo.org> +bitlbee-3.0.1.ebuild:
+  Version bump to new bugfix release.
 
   29 Oct 2010; Tim Harder <radhermit@gentoo.org> bitlbee-3.0.ebuild:
   Add conditional otr dependency on net-libs/libotr (bug #343181 by Manu
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 7cca54980360..d1bce5d4145d 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -10,21 +10,23 @@ AUX bitlbeed.confd2 524 RMD160 13aeb8ebb6b2885a310ba8606d1994aced3c1cb6 SHA1 7ac
 AUX bitlbeed.initd 619 RMD160 198fad260fc60a44897becca7ff442e3152e185d SHA1 105ec657f49b4be1fec46d8246eba988ea41e341 SHA256 32757768687046e379bf2f57dafcc8ce313b936431af1dcf835bef681d266a84
 DIST bitlbee-1.2.3.tar.gz 475748 RMD160 a4e994a97c3a7cc1d2bd6544a9a472d9c40ebb3f SHA1 cfa152bd4d0ff703feaeedf55dbab84b64657dc8 SHA256 0cbb30188c829dc486f8d1a4157626280f93ae2a60c9f6846fe6414c416745e2
 DIST bitlbee-1.2.8.tar.gz 513768 RMD160 151b7d9b854b1199edd8ef08a2e6a90b8dcbb545 SHA1 9c8cfea597d28604aa99c32c2a57b0087f42e6af SHA256 3a061b88776699001b774bc323e0a0ffdcd5cde6dec2dda965bc1aa2f2ee8e86
+DIST bitlbee-3.0.1.tar.gz 668353 RMD160 cc62179e807ef175db0c2351d9363f118e28f394 SHA1 f3a0651d723b71b08f0dad3b5cb2843608d5c265 SHA256 408a737b35db4b9c407e3db09b2d2e7b528836a68e2d783373254b78812bf608
 DIST bitlbee-3.0.tar.gz 662460 RMD160 7d3e9fbbf2835c014bbaf64d926aa00b3a66624d SHA1 c791d46b974187a1d4cf341418c3d1729f9b9658 SHA256 146d6ec238454c1e735bdb35e8a5f15f913f5eb14d240e8ccd87f205a3376698
 EBUILD bitlbee-1.2.3-r1.ebuild 4863 RMD160 32a95adae127449287702307aa49482ddf2b5b82 SHA1 4606d2e829437320338f92f9257f4da752a43779 SHA256 305d91bb747e6f81f35808b498d966fa086a7849eee4d284f3c60c21b2bc0ecd
 EBUILD bitlbee-1.2.3.ebuild 4807 RMD160 9efe0aaae3595f57f426b2435b4134bc201998c9 SHA1 5a28e18d4622b5548658e85ad983f27f4012df20 SHA256 182ac2d29660c9c220693052fc2a8b8d8eaacbffadc3f6a69e955d431ceca83a
 EBUILD bitlbee-1.2.8.ebuild 4701 RMD160 e5232cfcd9c80b13c679dd0a3408247f5c1c05b7 SHA1 b487b18aad197f7f45f923c26e53e46006a70315 SHA256 4c005de0a05b47d81924b1160d2cfa0f35f841f5b9321bd40a0d7b30849862ce
+EBUILD bitlbee-3.0.1.ebuild 5490 RMD160 7b8122f8df46326fe0f6bbf88fdc26d5c0bd0e55 SHA1 ad37304f33c4c5c554e5e6bab5723392d3407759 SHA256 d530d72e976be040ea4e336e7a80e15381eba4e6ae3c4207134fd86bd165aae7
 EBUILD bitlbee-3.0.ebuild 5523 RMD160 2e8f88b8e88048e2ed73b56bece4425e2d7ad2e1 SHA1 4def40fa23cc93edc4674b51ca5c166aa81d0b42 SHA256 cf96c048c9a5b24d283f27409299e592de1c43296f90fb1e6f565902f774ce36
-MISC ChangeLog 20510 RMD160 5c450a219ef9caa0709400b0a819c116e998d469 SHA1 e8b2cf8e771344fefc756aa4b6ec608347b31936 SHA256 7a4edabf8f02c3a021b4376166c7838d0305d1ddb9854cba48cd866201f9befb
+MISC ChangeLog 20651 RMD160 91bf42b44fbbff8817fdfcaa56a17a2e3c174f94 SHA1 c1c53c877cd200e4406ae7648151b17f1a030d16 SHA256 e8db9223e3b796cc012255db4f786e1adc5dd3c112378b6687de1a992827bd30
 MISC metadata.xml 1048 RMD160 c56bfb0bdc9d2bdf8e0395355b60a0535d8b6087 SHA1 96d6f2f3c768f5508c07016e0f51f27e4423dd98 SHA256 19b7161da211dc6b51ce8c765a8a72d7dd43a5b1923867c39766cc2e1dbe8f1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMyhLEAAoJEEqz6FtPBkyjGREIAIhQ052yT2zbpvKbryuPvzAq
-8U6Z1ynPvUtAm2BBO3Qmuz8/e/4wgottXQ8c2B4GCMAdnxhYH4RZdq6S/B4B3BmL
-Fbxr7CxqRBsYXQEsg+YbKxuLoU7K5zVtgaGusLEBhhrgV76PFONDd5YiX7R+NMp3
-59VPCMGWJObrNtXAn1q+f7sh58YPEzE7sYKCKeLJST7XdeR8jRxGl99W+IxGkXVY
-HK0wEZufDU6DEtEIfAPH65+Y+d1FcXnWZqH72rYizCoznsswKtw63qilhSfsKPH7
-xM6FcR6gk5r591QnaEUFAORvDMJpMfj6BXcgsqD0SeVcidTgE65TGAOmXOmneX0=
-=mvQS
+iQEcBAEBAgAGBQJM7e9GAAoJEEqz6FtPBkyjTzkH/31TXYFJLU4ieNWVAieDJ/Xo
+4qWSsODyArD8sPGqIr1ZeteRTmPP62NpKrIqM3PYKT4p3j2HIRO0+yPdfUHcSN2i
+ZEpDPBOM9IHOoceux1b8iegI989Dv6S9CFDwkxI/Qx/VxFhk7iUFAMlqrnXH0Bj+
+Yyy4bYegAqSghHY/0OslIPi6FrjcgGbk8SlzEfcFEFjoGLGu6dVMt3Ok31qkhLJt
+d8BO7PA7PPYynNjdGGC1sLDqP6Q/RmH5WyNtRLeIrwyDgj0NPzT4YanjquELKULX
+OdAaOym1klqPWCO1Q7ZFZvxtcb4Ejpt4bwn9y6S/4V+9xhSzoy3TmQQ2IusqfkM=
+=UQhJ
 -----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.0.1.ebuild b/net-im/bitlbee/bitlbee-3.0.1.ebuild
new file mode 100644
index 000000000000..b0923ad11218
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.0.1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.1.ebuild,v 1.1 2010/11/25 05:08:12 radhermit Exp $
+
+EAPI="3"
+inherit eutils toolchain-funcs confutils multilib
+
+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="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple 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 )
+	msn? ( gnutls? ( net-libs/gnutls )
+		!gnutls? ( nss? ( dev-libs/nss ) )
+		!gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) )
+		)
+	jabber? ( gnutls? ( net-libs/gnutls )
+		!gnutls? ( nss? ( dev-libs/nss ) )
+		!gnutls? ( !nss? ( ssl? ( dev-libs/openssl ) ) )
+		)"
+	# ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	xinetd? ( sys-apps/xinetd )"
+
+pkg_setup() {
+	if use purple ; then
+		elog "You have enabled libpurple support. This disables all the other"
+		elog "    protocol modules, since everything is handled by libpurple."
+		elog
+	else
+		elog "Support for all IM protocols are controlled by use flags."
+		elog "    Make sure you've enabled the flags you want."
+		elog
+	fi
+
+	confutils_require_any jabber msn oscar twitter yahoo purple
+
+	# At the request of upstream, die if MSN Messenger support is enabled
+	# but no SSL support has been enabled
+	confutils_use_depend_any msn gnutls nss ssl
+
+	if use jabber && ! use gnutls && ! use ssl ; then
+		if use nss ; then
+			ewarn ""
+			ewarn "You have enabled nss and jabber"
+			ewarn "but nss doesn't work with jabber"
+			ewarn "Enable ONE of the following use instead"
+			ewarn "flags: gnutls or ssl"
+			ewarn ""
+			die "nss with jabber doesn't work"
+		fi
+		elog ""
+		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"
+		elog ""
+	fi
+
+	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"
+
+	epatch "${FILESDIR}"/${PN}-3.0-configure.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 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 "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die "sed failed"
+}
+
+src_install() {
+	emake install install-etc install-doc install-dev DESTDIR="${D}" ||
+		die "install failed"
+
+	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 -A xml doc/user-guide/*.xml
+	dohtml -A xsl doc/user-guide/*.xsl
+	dohtml doc/user-guide/*.html
+
+	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 || die
+	newconfd "${FILESDIR}"/bitlbee.confd bitlbee || die
+
+	keepdir /var/run/bitlbee
+	fowners bitlbee:bitlbee /var/run/bitlbee
+
+	dodir /usr/share/bitlbee
+	insinto /usr/share/bitlbee
+	cd utils
+	doins convert_purple.py bitlbee-ctl.pl
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+	chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+
+	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."
+}