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.

(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)

5 files changed, 243 insertions, 2 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/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