Stabilized 0.81a for x86 and sparc, and revbumped 0.82 to 0.82-r1 to add local useflags for all protocols, which resolves bug #33606.

5 files changed, 101 insertions, 6 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index f16de1904643..52ff8d3df95f 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.20 2003/11/06 21:02:21 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.21 2003/11/19 19:37:52 weeve Exp $
+
+*bitlbee-0.82-r1 (19 Nov 2003)
+
+  19 Nov 2003; Jason Wever <weeve@gentoo.org> bitlbee-0.81a.ebuild,
+  bitlbee-0.82-r1.ebuild:
+  Stabilized 0.81a for x86 and sparc, and revbumped 0.82 to 0.82-r1 to add local
+  useflags for all protocols, which resolves bug #33606.
 
 *bitlbee-0.82 (06 Nov 2003)
 
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 66af1bddf9df..8cea61d4554b 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,4 +1,4 @@
-MD5 8b7674dd1c263334129916fbfad9ea92 ChangeLog 3358
+MD5 cfba62dbf89b7b3bed8ab5b7e4e2d3b5 ChangeLog 3623
 MD5 23ee60306a0cf6969d18a55e3409053c bitlbee-0.72.ebuild 1088
 MD5 f0edb4325376030565902192f83cabe8 bitlbee-0.73-r1.ebuild 1328
 MD5 abf8374300f5e107e68a298db32da1e6 bitlbee-0.73.ebuild 1088
@@ -8,8 +8,8 @@ MD5 be64c422fc7b104525f44ec6936d97da bitlbee-0.80-r2.ebuild 1571
 MD5 94b8adf097f6f9ea3d51f2afa75c0617 bitlbee-0.80.ebuild 1304
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
 MD5 00400d96dbff0a3e882192e90a08018f bitlbee-0.82.ebuild 1913
-MD5 2332b535cea5bad587f39cd8daf3359f bitlbee-0.81a.ebuild 1653
-MD5 7a239c1d0a3004e58084e17f9204c066 bitlbee-0.82-r1.ebuild 2223
+MD5 b5fab5f98ccea3987fd261ce1f1fa832 bitlbee-0.81a.ebuild 1651
+MD5 e58d66ab4b1f22042cd41d9775129f58 bitlbee-0.82-r1.ebuild 2209
 MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
 MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
diff --git a/net-im/bitlbee/bitlbee-0.81a.ebuild b/net-im/bitlbee/bitlbee-0.81a.ebuild
index 00ab59af4d06..da42230dbed5 100644
--- a/net-im/bitlbee/bitlbee-0.81a.ebuild
+++ b/net-im/bitlbee/bitlbee-0.81a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.81a.ebuild,v 1.1 2003/10/16 20:10:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.81a.ebuild,v 1.2 2003/11/19 19:37:52 weeve Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 sparc ~alpha"
 IUSE="tcpd"
 
 DEPEND="virtual/glibc"
diff --git a/net-im/bitlbee/bitlbee-0.82-r1.ebuild b/net-im/bitlbee/bitlbee-0.82-r1.ebuild
new file mode 100644
index 000000000000..a50d203195d9
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-0.82-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.82-r1.ebuild,v 1.1 2003/11/19 19:37:52 weeve Exp $
+
+inherit eutils
+
+DESCRIPTION="Bitlbee is an 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="~x86 ~sparc ~alpha"
+IUSE="debug jabber msn oscar yahoo"
+
+DEPEND="virtual/glibc
+	msn? ( >=net-libs/libsoup-1.99.26 )"
+
+pkg_setup() {
+	einfo "Note: as of bitlbee-0.82-r1, all protocols are useflags."
+	einfo "      Make sure you've enabled the flags you want."
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# Patch from bitlbee to fix a segfault when trying to enable 
+	# unsupported accounts.
+	cd ${S}
+	epatch ${FILESDIR}/${P}-segv.diff
+
+	# Patch the default xinetd file to add/adjust values to Gentoo defaults
+	cd ${S}/doc
+	epatch ${FILESDIR}/${PN}-0.80-xinetd.patch
+}
+
+src_compile() {
+	# setup useflags
+	local myconf
+	use debug && myconf="${myconf} --debug=1"
+	use msn || myconf="${myconf} --msn=0"
+	use jabber || myconf="${myconf} --jabber=0"
+	use oscar || myconf="${myconf} --oscar=0"
+	use yahoo || myconf="${myconf} --yahoo=0"
+
+	econf --datadir=/usr/share/bitlbee --etcdir=/etc/bitlbee ${myconf}
+	emake || die "make failed"
+
+	# make bitlbeed forking server
+	cd utils
+	[ -n "${CC}" ] \
+		&& ${CC} ${CFLAGS} bitlbeed.c -o bitlbeed \
+		|| gcc ${CFLAGS} bitlbeed.c -o bitlbeed
+
+}
+
+src_install() {
+	mkdir -p ${D}/var/lib/bitlbee
+	make install DESTDIR=${D} || die "install failed"
+	make install-etc DESTDIR=${D} || die "install failed"
+	keepdir /var/lib/bitlbee
+
+	dodoc COPYING
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
+	dohtml -A sgml doc/*.sgml
+	doman doc/bitlbee.8
+
+	dobin utils/bitlbeed utils/create_nicksfile.pl
+
+	insinto /etc/xinetd.d
+	newins doc/bitlbee.xinetd bitlbee
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+
+	dodir /var/run/bitlbeed
+	keepdir /var/run/bitlbeed
+
+}
+
+pkg_postinst() {
+	chown nobody:nobody /var/lib/bitlbee
+	chmod 700 /var/lib/bitlbee
+}
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.82-r1 b/net-im/bitlbee/files/digest-bitlbee-0.82-r1
new file mode 100644
index 000000000000..dc13c008305e
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-0.82-r1
@@ -0,0 +1 @@
+MD5 fecb84a97e13a46b45989d71e7723b35 bitlbee-0.82.tar.gz 375607