Version bump (thanks to Alex Alexander for help). Update to EAPI 4 and use REQUIRED_USE.

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

3 files changed, 188 insertions, 5 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 4021765db5a6..b342fb530c82 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.139 2011/02/25 14:49:51 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.140 2011/03/08 10:40:42 radhermit Exp $
+
+*bitlbee-3.0.2 (08 Mar 2011)
+
+  08 Mar 2011; Tim Harder <radhermit@gentoo.org> +bitlbee-3.0.2.ebuild:
+  Version bump (thanks to Alex Alexander for help). Update to EAPI 4 and use
+  REQUIRED_USE.
 
   25 Feb 2011; Thomas Kahle <tomka@gentoo.org> bitlbee-3.0.1.ebuild:
   x86 stable per bug 347537
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 8bb3d9fdf439..29a8cd5f453c 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -13,18 +13,24 @@ AUX bitlbeed.initd 619 RMD160 198fad260fc60a44897becca7ff442e3152e185d SHA1 105e
 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.2.tar.gz 669827 RMD160 8805a03b84e1207cf96140dc676fc513a4d0fd0a SHA1 59113b1dc440ebd775e6cf324d1cfb698fb20cfc SHA256 a00b7e325d24e05fc9fcfa68355f78cf69dac3badea697d8617083b8fc1e93d8
 DIST bitlbee-3.0.tar.gz 662460 RMD160 7d3e9fbbf2835c014bbaf64d926aa00b3a66624d SHA1 c791d46b974187a1d4cf341418c3d1729f9b9658 SHA256 146d6ec238454c1e735bdb35e8a5f15f913f5eb14d240e8ccd87f205a3376698
 EBUILD bitlbee-1.2.3-r1.ebuild 4847 RMD160 fdf50926a2eb62b90c337b85abd29a42b877fe89 SHA1 d7bd1bf22c96fcddbe16b34ea4eee0aae618dc63 SHA256 85a532a9a0fe4727d509561288b69ba92b549f12e45d7a3b497dfce03d499bd2
 EBUILD bitlbee-1.2.3.ebuild 4787 RMD160 91eaa868a2063ce56e11506c01318ae468a6e3e3 SHA1 9a3fb734afeeb7e037f49a2c78b1d50e9275da58 SHA256 46477796499b2a8a7251673e246b2e3a8631779b698b2f1d29873eb300446227
 EBUILD bitlbee-1.2.8.ebuild 4683 RMD160 ea6ab8deac113106af787e74d59b76f7a9352f02 SHA1 74053ece23aefbe6130e4899ae6883ed96b07ca9 SHA256 2cccea87333751df463aa95a92ba8bc593a10fe8b2dde30aaf4dd830e825d861
 EBUILD bitlbee-3.0.1.ebuild 5551 RMD160 d376217342def6eacc42b8dde502623b1133eb73 SHA1 930693be32dff23a0113577236fe2e29999d6363 SHA256 e01092bfc39e06ef13bb525aac24a6ef425bd95dd6596330d4b6a0c77e5ec383
+EBUILD bitlbee-3.0.2.ebuild 4642 RMD160 6ef898f3880e028d364b600254b1159b1155dd7f SHA1 4bdf0cd9c1545b5b10206840fe7681187de5a361 SHA256 854dc79a99626830462d4c90ec64670f2ee7220afe982a5a20ad3762c5cd4c4f
 EBUILD bitlbee-3.0.ebuild 5501 RMD160 d41c34a90639140a87667b48aac30eb7c448a9ee SHA1 40a556908e372e304402c8764cf84f57e6d059b0 SHA256 9c4c59dcdf2031ffb1a0c944c28bb8904386692001062f6c0388405f1d81ede1
-MISC ChangeLog 21663 RMD160 76a5aa631be7d77d6d31bc7651119344620745dc SHA1 863908b281d3f4cd692f1a5018f8f5ff925f6fee SHA256 7a79517b7ed7808c113cb320b475bdda5879cbba11584bb9113a52bd73e81f36
+MISC ChangeLog 21863 RMD160 b730176cff5a603762616f160f4f773f9c737b46 SHA1 6773d64f9b34d818e7153ae2a93c980a82bc0c12 SHA256 c0c08f10058c263bc5bd2f94da4e9f50e168925f10d242b6e3f36def50d10538
 MISC metadata.xml 1048 RMD160 c56bfb0bdc9d2bdf8e0395355b60a0535d8b6087 SHA1 96d6f2f3c768f5508c07016e0f51f27e4423dd98 SHA256 19b7161da211dc6b51ce8c765a8a72d7dd43a5b1923867c39766cc2e1dbe8f1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAk1nwgYACgkQnZsgo/h8kNY5kgCWN8v4pE+Auix3et+Q3X0wL+oc
-rgCfeonFZ7j+rC8J7hoEwLhwV9yS2rQ=
-=i+4B
+iQEcBAEBAgAGBQJNdgezAAoJEEqz6FtPBkyjMvQIAJUz6lNX6Bvju5YjQ1Jm8HmM
+W+uEZZTUbF4KiKvu67Z8lGi2mn03h/J6a06e1Il1AaPcvdIgpdajIDiI1R/flrYV
+hfrXjmrRIx3JcvYjIyTFhukmMdAbctpux0DQSWRCRy595RSH77BaPEucUNh9unMY
+nerOmPMncIyR5ZJTGYzIOrquwkNhyRkbsScXFwwTgZvS7CBHIzUWwJNAxmdNmJ/H
+fAAI8pPmqXqFJxKCl0dsLwaC0TsmC8NKMbhFHwTtGG4YRJFliRx3or9mNPGULGyn
+Z8aNBBwe9YfazY5t8aG33I5c9No6i5XmYjfPbAAQUtapsHVJbgTKXHvy2dHQ0ls=
+=2Xmb
 -----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.0.2.ebuild b/net-im/bitlbee/bitlbee-3.0.2.ebuild
new file mode 100644
index 000000000000..a92d97f6c1f0
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.0.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.2.ebuild,v 1.1 2011/03/08 10:40:42 radhermit Exp $
+
+EAPI="4"
+inherit eutils toolchain-funcs 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="~amd64 ~ppc ~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 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!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 )"
+
+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
+}
+
+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
+	epatch "${FILESDIR}"/${PN}-3.0.1-ldflags.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}"
+
+	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
+	newconfd "${FILESDIR}"/bitlbee.confd bitlbee
+
+	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
+
+	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
+}