version bump, EAPI 3, bug #327851. added myself as maintainer.

Package-Manager: portage-2.2_rc77/cvs/Linux x86_64

4 files changed, 198 insertions, 3 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 7a0e25ed932c..c2ec797bbf03 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.127 2010/08/10 17:56:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.128 2010/09/08 14:03:39 wired Exp $
+
+*bitlbee-1.2.8 (08 Sep 2010)
+
+  08 Sep 2010; Alex Alexander <wired@gentoo.org> +bitlbee-1.2.8.ebuild,
+  metadata.xml:
+  version bump, EAPI 3, bug #327851. added myself as maintainer.
 
   10 Aug 2010; Markos Chandras <hwoarang@gentoo.org> bitlbee-1.2.7.ebuild:
   Respect LDFLAGS. Bug #331845. Thanks to Diego E. 'Flameeyes' Pettenò
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 3c861202631d..cdc15980dd66 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bitlbee-1.2.2-fix_tests_check_set.patch 452 RMD160 22544fc0acde62566a44ca97a63f5c1a23e29d07 SHA1 5874404077a692a3c8be6fc29b3bbc2ff7324b58 SHA256 1569026c1c9e5d784e6deddbc71f9bf63a58c28fd62325294c733e897a151271
 AUX bitlbee.confd 62 RMD160 f71fff4ab4fe49eebc071d693896f567291bee54 SHA1 80beb974922b2ff6cf9732a7bce1eb03cc10d870 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628
 AUX bitlbee.initd 605 RMD160 183c4a8117556cb474c01ba4038b357a6716f98e SHA1 3427fa5f558b2957046ef1a6afdd4bc2bb8807e3 SHA256 037091df1746b9a477f07cdac52d99f9310055646ce0e10f859835ba105e3fb4
@@ -7,11 +10,30 @@ DIST bitlbee-1.2.3.tar.gz 475748 RMD160 a4e994a97c3a7cc1d2bd6544a9a472d9c40ebb3f
 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
 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
 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
 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
-MISC ChangeLog 19512 RMD160 88c053e963d324d4873405d7adf350b53ef86ab1 SHA1 b53feff61e17ebb1027a54112b2610946fac977f SHA256 0eae8a30dbe89376485e62cb30c50e02118d43eada73dcb245d36458352a4537
-MISC metadata.xml 586 RMD160 282e254ad55623477fd5b82313dc9a5711f699a0 SHA1 3429625d0de931d989ef57a08a308e37e3a612c6 SHA256 90e41bb77cc13eeccea2ffdebb14a271dd57b3fe3422594b6e290975509554ef
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (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
+-----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-1.2.8.ebuild b/net-im/bitlbee/bitlbee-1.2.8.ebuild
new file mode 100644
index 000000000000..c8e8197dfd52
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-1.2.8.ebuild
@@ -0,0 +1,163 @@
+# 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.8.ebuild,v 1.1 2010/09/08 14:03:39 wired 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 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_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"
+}
+
+src_configure() {
+	# 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}/" \
+		-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 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 f721c6ab2118..e821cb77f5bf 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -5,6 +5,10 @@
 	<maintainer>
 		<email>cedk@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
 	<use>
 		<flag name='nss'>Use NSS for SSL support in MSN and Jabber</flag>
 		<flag name='twitter'>Enabel Twitter protocol support</flag>