Version bump and add twitter USE flag

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 182 insertions, 5 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index ae884171e6d3..f6db6324d923 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # 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.124 2010/03/04 17:46:59 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.125 2010/04/29 21:40:29 cedk Exp $
+
+*bitlbee-1.2.6a (29 Apr 2010)
+
+  29 Apr 2010; Cédric Krier <cedk@gentoo.org> +bitlbee-1.2.6a.ebuild,
+  metadata.xml:
+  Version bump and add twitter USE flag
 
   04 Mar 2010; Cédric Krier <cedk@gentoo.org> files/bitlbee.confd,
   files/bitlbee.initd:
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index f006b6dda519..5cf012a15f88 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -5,9 +5,11 @@ 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.4.tar.gz 483115 RMD160 d18221ada6c99184e5c8e1d2c8292a4f577d51d0 SHA1 fa1e8a1f278cf566be2af4849e9c70a830153dd7 SHA256 c2f5f464dd44ab77435eb621e623780937b4a150a271d99d71b8079403948cd3
+DIST bitlbee-1.2.6a.tar.gz 503842 RMD160 2040534ed84ae6635685ef465ff12b933870d51d SHA1 26f79ae2c73d818c0c0d6c7f71f0f154f49ff1c2 SHA256 f00fee060f4538bf8d18c0c7097cb9a4a0484dae25369fb827edf4f3f65612cb
 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
 EBUILD bitlbee-1.2.4.ebuild 4803 RMD160 db77bee4028c320475a9ee7b94f659bc22b2e0e0 SHA1 8321e4407829f1c5aa31be0141528300076c7312 SHA256 346d23c28c84ed338b81e7a1e888616b55154e8f7705c75f7feb9ce36ae1b574
-MISC ChangeLog 19046 RMD160 cb5beba401a5913fa3b2cc709e54d4c09cbe7dfd SHA1 5c98848608b7713ab669cb5bba2761ae38f60226 SHA256 305e72e06a60f9b07461ee506e61355ce15a11bb315ff03e18a104d8018e44db
-MISC metadata.xml 526 RMD160 962ae22fcec98d00ffe7c399a5aafb53c9f2a0dd SHA1 80d98eaf4c9a652adb79cf3b0cd3d6c6c25e06c0 SHA256 487bd953ddfca7c67071caefb3ca22387a4845d1e8b3dd34d45b101b95aafd9b
+EBUILD bitlbee-1.2.6a.ebuild 4847 RMD160 cb98f5a89cfbd4d70f5fa827111e2e5a162009cd SHA1 289fe217d321798ec8dce33aa619a9319418a4a7 SHA256 38656bf49c8ad68ee3e891cd52d536bf4bebc2ff4420609d0b85f59a21958386
+MISC ChangeLog 19205 RMD160 dd70d031ed3f33c111c214a111213d69e73cf6d0 SHA1 1b7b5029e79cefe95f563901232ada03bbc806e0 SHA256 c2fe720c766ecf0c26959ac005037a838a438fae49822b6df33c76437b733bc0
+MISC metadata.xml 586 RMD160 282e254ad55623477fd5b82313dc9a5711f699a0 SHA1 3429625d0de931d989ef57a08a308e37e3a612c6 SHA256 90e41bb77cc13eeccea2ffdebb14a271dd57b3fe3422594b6e290975509554ef
diff --git a/net-im/bitlbee/bitlbee-1.2.6a.ebuild b/net-im/bitlbee/bitlbee-1.2.6a.ebuild
new file mode 100644
index 000000000000..2f3a56537318
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-1.2.6a.ebuild
@@ -0,0 +1,168 @@
+# 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-1.2.6a.ebuild,v 1.1 2010/04/29 21:40:29 cedk Exp $
+
+EAPI="1"
+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 msn nss +oscar ssl test twitter +yahoo xinetd" # ldap - Bug 195758
+
+COMMON_DEPEND=">=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() {
+	elog "Note: Support for all IM protocols are controlled by use flags."
+	elog "      Make sure you've enabled the flags you want."
+	elog
+	confutils_require_any jabber msn oscar twitter yahoo
+
+	# 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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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"
+}
+
+src_compile() {
+	# ldap hard-disabled for now
+	local myconf="--ldap=0"
+
+	# setup protocol, ipv6 and debug
+	for flag in debug ipv6 msn jabber oscar twitter yahoo ; do
+		if use ${flag} ; then
+			myconf="${myconf} --${flag}=1"
+		else
+			myconf="${myconf} --${flag}=0"
+		fi
+	done
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf="${myconf} --ssl=gnutls"
+		einfo "Use gnutls as SSL support"
+	elif use ssl ; then
+		myconf="${myconf} --ssl=openssl"
+		einfo "Use openssl as SSL support"
+	elif use nss ; then
+		myconf="${myconf} --ssl=nss"
+		einfo "Use nss as SSL support"
+	else
+		myconf="${myconf} --ssl=bogus"
+		einfo "You will not have any encryption support enabled."
+	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}/" \
+		Makefile.settings || die "sed failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failed"
+	make install-etc DESTDIR="${D}" || die "install failed"
+	make install-doc DESTDIR="${D}" || die "install failed"
+	make 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 centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl
+	doins 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/metadata.xml b/net-im/bitlbee/metadata.xml
index e8f76467a7d2..f721c6ab2118 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -5,8 +5,9 @@
 	<maintainer>
 		<email>cedk@gentoo.org</email>
 	</maintainer>
-	<use> 
-		<flag name='nss'>Use NSS for SSL support in MSN and Jabber.</flag>
+	<use>
+		<flag name='nss'>Use NSS for SSL support in MSN and Jabber</flag>
+		<flag name='twitter'>Enabel Twitter protocol support</flag>
 	</use>
 	<longdescription>
 		Bitlbee as an IRC to IM gateway. It provides an irc server that allows