Version bump (thanks to wired for helping). This version adds support for file transfers, OTR encryption, plugins, optional libpurple support, event handling using libevent, and many other updates. Added myself to the maintainer list.

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

6 files changed, 258 insertions, 19 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index c2ec797bbf03..3c05486082d0 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,16 @@
 # 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.128 2010/09/08 14:03:39 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.129 2010/10/28 19:53:41 radhermit Exp $
+
+*bitlbee-3.0 (28 Oct 2010)
+
+  28 Oct 2010; Tim Harder <radhermit@gentoo.org> +bitlbee-3.0.ebuild,
+  +files/bitlbee-3.0-configure.patch, +files/bitlbee-3.0-jabber.patch,
+  metadata.xml:
+  Version bump (thanks to wired for helping). This version adds support for
+  file transfers, OTR encryption, plugins, optional libpurple support, event
+  handling using libevent, and many other updates. Added myself to the
+  maintainer list.
 
 *bitlbee-1.2.8 (08 Sep 2010)
 
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index cdc15980dd66..e809cfd5750d 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,7 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX bitlbee-1.2.2-fix_tests_check_set.patch 452 RMD160 22544fc0acde62566a44ca97a63f5c1a23e29d07 SHA1 5874404077a692a3c8be6fc29b3bbc2ff7324b58 SHA256 1569026c1c9e5d784e6deddbc71f9bf63a58c28fd62325294c733e897a151271
+AUX bitlbee-3.0-configure.patch 393 RMD160 eb546e7271549cd56b87168ccf0ccb3ffb80742d SHA1 7762bae624acf765d3905b46b84448762694a25f SHA256 615e0cadb52abea5c133f8588b7d772c787bee725f11a986bed90226e5da4acd
+AUX bitlbee-3.0-jabber.patch 481 RMD160 e3c96940bc3288ec34ade677f6a359d53753fd84 SHA1 f0cfd20158be0ae99b470db7409c0ae2438f10d1 SHA256 0d65fbe01c2a59b20f5f9f21c1bc3c9832c4d6332286f6eb8e47977327d5b6cd
 AUX bitlbee.confd 62 RMD160 f71fff4ab4fe49eebc071d693896f567291bee54 SHA1 80beb974922b2ff6cf9732a7bce1eb03cc10d870 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628
 AUX bitlbee.initd 605 RMD160 183c4a8117556cb474c01ba4038b357a6716f98e SHA1 3427fa5f558b2957046ef1a6afdd4bc2bb8807e3 SHA256 037091df1746b9a477f07cdac52d99f9310055646ce0e10f859835ba105e3fb4
 AUX bitlbeed.confd2 524 RMD160 13aeb8ebb6b2885a310ba8606d1994aced3c1cb6 SHA1 7ac73948da0ffeb705482cf1d05a6fa93c267f3d SHA256 8f9e258452d62eb15990b465e1f74251e7ceb4d6b2c93a35c42a026d75e96418
@@ -11,6 +13,7 @@ DIST bitlbee-1.2.4.tar.gz 483115 RMD160 d18221ada6c99184e5c8e1d2c8292a4f577d51d0
 DIST bitlbee-1.2.6a.tar.gz 503842 RMD160 2040534ed84ae6635685ef465ff12b933870d51d SHA1 26f79ae2c73d818c0c0d6c7f71f0f154f49ff1c2 SHA256 f00fee060f4538bf8d18c0c7097cb9a4a0484dae25369fb827edf4f3f65612cb
 DIST bitlbee-1.2.7.tar.gz 510458 RMD160 5eec7fff68ade914d3e1da5b0e149ac963446827 SHA1 d1ed04a5ff18de67d96ba51d8a11bbd8e6d78ef3 SHA256 3b042b2f1aeac323cf5ef08b3203e7e5a199bb0b4de3d009236cd228fae6bf3a
 DIST bitlbee-1.2.8.tar.gz 513768 RMD160 151b7d9b854b1199edd8ef08a2e6a90b8dcbb545 SHA1 9c8cfea597d28604aa99c32c2a57b0087f42e6af SHA256 3a061b88776699001b774bc323e0a0ffdcd5cde6dec2dda965bc1aa2f2ee8e86
+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.4-r1.ebuild 4825 RMD160 d8cf8360d17590e9d60658b6afaac26f4dc98284 SHA1 9aeab2a4ae01f04167838d7c64bc68743c6d749a SHA256 dcdd5d1a5c978b24653a3a5367ca0eb76dba8c84e1a482ae7547d06394d232a5
@@ -18,22 +21,17 @@ EBUILD bitlbee-1.2.4.ebuild 4803 RMD160 db77bee4028c320475a9ee7b94f659bc22b2e0e0
 EBUILD bitlbee-1.2.6a.ebuild 4847 RMD160 cb98f5a89cfbd4d70f5fa827111e2e5a162009cd SHA1 289fe217d321798ec8dce33aa619a9319418a4a7 SHA256 38656bf49c8ad68ee3e891cd52d536bf4bebc2ff4420609d0b85f59a21958386
 EBUILD bitlbee-1.2.7.ebuild 4886 RMD160 6b9c8e552bb119a55a7c9ae78d4edc7426d6d51d SHA1 5873039c50b13ffda4f2fc5aa4cfe89c4a5cc2ab SHA256 6a0cfbaed80522a4c4b34d6bc730518353c6ea87a0339cef800563387e084867
 EBUILD bitlbee-1.2.8.ebuild 4701 RMD160 e5232cfcd9c80b13c679dd0a3408247f5c1c05b7 SHA1 b487b18aad197f7f45f923c26e53e46006a70315 SHA256 4c005de0a05b47d81924b1160d2cfa0f35f841f5b9321bd40a0d7b30849862ce
-MISC ChangeLog 19693 RMD160 0777ffc8557adf14f96fd5111360f7cb3a2774e6 SHA1 06e845817654760c7014a03a87cbe0c89118d0c8 SHA256 7093dbe41ecd8523f5fea52c59076af7911ebcf27751cc892af9804145a36b0d
-MISC metadata.xml 679 RMD160 dc9f3136f16a11fb79337a1bfe7ad72f61f714a0 SHA1 aed2eba4fe76a23586765313dedf131a3e878505 SHA256 f47d016299b7c83f9d6f1b6529f85119c68691dfa875cdacd8da2b6c200b37e6
+EBUILD bitlbee-3.0.ebuild 5445 RMD160 d1f67ddf799e413de5caca8722cb75eb87ca895d SHA1 75b15ce9490fc2140f9555b459e91754857815cd SHA256 fb378649929f5b2b38d160dd8e2d8543cddffa8a5e76cd04fa5a1fb40e20a898
+MISC ChangeLog 20126 RMD160 ca91979d8c6d3b38e07353d7be9a1b527fef03f8 SHA1 333e1b7cf74ef98d0d6fd408a0ae0020a30b86b0 SHA256 51463b52e9eb80f53804a4146d96a5fd9d2bac3094aad9f5dc15c84213d54ee8
+MISC metadata.xml 1048 RMD160 c56bfb0bdc9d2bdf8e0395355b60a0535d8b6087 SHA1 96d6f2f3c768f5508c07016e0f51f27e4423dd98 SHA256 19b7161da211dc6b51ce8c765a8a72d7dd43a5b1923867c39766cc2e1dbe8f1b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBCAAGBQJMh5faAAoJEDZF8K7rm0r6pBAP/iC49CfiJ8jqKD5bZmRTvmiO
-K4An4BZ9FImqaxDuGIBlre0xZrH2Jaw0u1L4YY23zQc+ZQjf37Ni4+GGmnv8iiUY
-gplAicB2Qjp2Vm2DOjqZnt/ECAhM6IPBeDn9Ns4mcOymXjNcGdVgiEoMLuACr64g
-7HfQ3e2HQ6iQYUdbr8MswmYUMujvZkCRrmno29JVXGy/ClPezL9Q8Cm5cF498DWZ
-Iwye68PR6VJpe2cyT7hCL7NzuPuoahkqo8e7sZxvGmkVLLjKHDPhxg6F9Vff+mg1
-cGxEWxEVPclgM4T2tHeodVVzgQRPBCoGgFPVu285urZvkoF/4mkdAPtLXrEB83ue
-psrStLgsxng+VkLatIbilnwG9GlfYkvsYfZv7oR+LKuv+dsHa/IwyPqbHfNo2ITg
-FlnCr9kz0jRl01SZ7DvhQ4/EQeR7WjDVQpvdWsVkv3GVxd3/GKYEbVBxfRXjm6fN
-wj2Z+M8nIT/Fk0y+VFGhjJeTmN3IxKhsRYHOBMn2jRoZMek1gX5g/tacGtFNN5Ab
-2eietePmMPlrwR8Vow2taB0CzMmpvOld4OH0qWHhyJxjYWaj18Usq2fjwAmnOFj5
-AAxpKxB2Bfme2ILTfdUDguh6qKCzVjc74qWKp12Ney8Epw3SN/IeWgC9C2+Vbty5
-B4GFlFm+wbbAk63nVbES
-=Vuej
+iQEcBAEBAgAGBQJMydTPAAoJEEqz6FtPBkyjPx8IAIL5bfW6TYlZwWzzD7vLM+1n
+IonDoYvnWMcYsccpU6UaO0DRs7/n9Ns0NfKSSUmiaYBXSR7O+fVzw8VSmLy6ZlAU
+bbTKEKMUcccGqAPG3FVGnN8jJOnCEGcatEgQqHU9IPWXAc0526LOwBnPdJ/sxvKe
+A9yad1TtL8w8HxDT4x5toyaBQfXkK1K34VTkld9HjJ6PAmAB2wUhz6IEPgjr1tu/
+88q4y379GXzb1FAegpXllDzforX2EuJk/lZ74l2tXC7S9UfjXLTLaOuVABrGdCFr
+ElwA2nqXd3Gb18jJI0uN6S+r1dDxcvK52K8bsBwE6LZzXwZjW+0U/W1FYq7u9EM=
+=tp6k
 -----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.0.ebuild b/net-im/bitlbee/bitlbee-3.0.ebuild
new file mode 100644
index 000000000000..a87ca94062b6
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.0.ebuild
@@ -0,0 +1,192 @@
+# 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.ebuild,v 1.1 2010/10/28 19:53:41 radhermit Exp $
+
+EAPI="3"
+inherit eutils toolchain-funcs confutils
+
+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 )
+	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}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-jabber.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 --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."
+}
diff --git a/net-im/bitlbee/files/bitlbee-3.0-configure.patch b/net-im/bitlbee/files/bitlbee-3.0-configure.patch
new file mode 100644
index 000000000000..811f9d59e4a0
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.0-configure.patch
@@ -0,0 +1,17 @@
+--- bitlbee-3.0/configure.orig	2010-10-21 17:51:31.000000000 -0700
++++ bitlbee-3.0/configure	2010-10-26 22:07:44.620843056 -0700
+@@ -609,14 +609,6 @@
+ 	fi
+ fi
+ 
+-case "$CC" in
+-*gcc* )
+-	echo CFLAGS+=-MD -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
diff --git a/net-im/bitlbee/files/bitlbee-3.0-jabber.patch b/net-im/bitlbee/files/bitlbee-3.0-jabber.patch
new file mode 100644
index 000000000000..fd8d0de81d3b
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.0-jabber.patch
@@ -0,0 +1,14 @@
+--- protocols/jabber/jabber_util.c	2010-10-21 00:11:02 +0000
++++ protocols/jabber/jabber_util.c	2010-10-22 23:46:44 +0000
+@@ -579,8 +579,9 @@
+ 		    ( ( s == NULL && bud->resource == NULL ) ||
+ 		      ( bud->resource && s && strcmp( bud->resource, s + 1 ) == 0 ) ) )
+ 		{
++			int st = jabber_buddy_remove_bare( ic, full_jid );
+ 			g_free( full_jid );
+-			return jabber_buddy_remove_bare( ic, full_jid_ );
++			return st;
+ 		}
+ 		else if( s == NULL || bud->resource == NULL )
+ 		{
+
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index e821cb77f5bf..a3268ce136cf 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -9,9 +9,17 @@
 		<email>wired@gentoo.org</email>
 		<name>Alex Alexander</name>
 	</maintainer>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
 	<use>
+		<flag name='libevent'>Use libevent for event handling</flag>
 		<flag name='nss'>Use NSS for SSL support in MSN and Jabber</flag>
-		<flag name='twitter'>Enabel Twitter protocol support</flag>
+		<flag name='otr'>Enable support for encrypted conversations</flag>
+		<flag name='plugins'>Enable support for plugins</flag>
+		<flag name='purple'>Use libpurple instead of the built-in IM protocol support</flag>
+		<flag name='twitter'>Enable Twitter protocol support</flag>
 	</use>
 	<longdescription>
 		Bitlbee as an IRC to IM gateway. It provides an irc server that allows