Rev bump. Fixes problem in bug #71990 where enabling the ssl useflag clobbers all other useflag settings. Thanks to Enrique D. Bosch <presidev@presi.org> for the patch.

4 files changed, 132 insertions, 15 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 7118370465a2..2a15ef158190 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.46 2004/10/31 23:34:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.47 2004/11/24 02:30:35 weeve Exp $
+
+*bitlbee-0.91-r1 (23 Nov 2004)
+
+  23 Nov 2004; Jason Wever <weeve@gentoo.org> +bitlbee-0.91-r1.ebuild:
+  Rev bump. Fixes problem in bug #71990 where enabling the ssl useflag
+  clobbers all other useflag settings. Thanks to Enrique D. Bosch
+  <presidev@presi.org> for the patch.
 
   01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> bitlbee-0.91.ebuild:
   Stable on alpha.
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index e3c323b346d8..31e043c43924 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 692ceb7d9233da30e3853f1999b6ac87 ChangeLog 7406
+MD5 5a91581451ec546905b2ea5ac3ae5d73 bitlbee-0.91-r1.ebuild 3188
 MD5 5a91581451ec546905b2ea5ac3ae5d73 bitlbee-0.91.ebuild 3188
 MD5 1ea53830f16bd092d99a424877021ed6 bitlbee-0.84.ebuild 2389
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
-MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
-MD5 2332b3b72a6b0501882bacd09921c3ce files/bitlbee-0.84-passport.diff 976
-MD5 ca5844d2edbb81e8ab4c8042e122aeb6 files/bitlbeed.init 724
 MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 ccb2adcfc701f086102639f5d5b38802 files/bitlbee-0.82-segv.diff 415
+MD5 2332b3b72a6b0501882bacd09921c3ce files/bitlbee-0.84-passport.diff 976
+MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
+MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
+MD5 ca5844d2edbb81e8ab4c8042e122aeb6 files/bitlbeed.init 724
+MD5 70d0e8bb8d7639b86e3ee8c0bda16334 files/digest-bitlbee-0.91-r1 64
 MD5 70d0e8bb8d7639b86e3ee8c0bda16334 files/digest-bitlbee-0.91 64
 MD5 b5361a82a904f5e2bf9c5a6d0717f374 files/digest-bitlbee-0.84 64
-MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBhXaGugEuf3OQ0akRAsWbAKCgP+yPAQwEkuvKJO4Z7e5RjhqkEACdHF2c
-XSBVxXbsF2noE2LKxzuN9IY=
-=Ot9N
------END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-0.91-r1.ebuild b/net-im/bitlbee/bitlbee-0.91-r1.ebuild
new file mode 100644
index 000000000000..beb691d3fd26
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-0.91-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.91-r1.ebuild,v 1.1 2004/11/24 02:30:35 weeve Exp $
+
+inherit eutils gcc
+
+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="x86 ~ppc sparc alpha ~ia64 ~amd64"
+IUSE="debug jabber msn oscar yahoo flood ssl"
+
+DEPEND="virtual/libc
+	>=dev-libs/glib-2.0
+	msn? ( net-libs/gnutls )
+	jabber? ( ssl? ( net-libs/gnutls ) )"
+
+no_flags_die() {
+	eerror ""
+	eerror "Please choose a protocol or protocols to use with"
+	eerror "bitlbee by enabling the useflag for the protocol"
+	eerror "desired."
+	eerror ""
+	eerror " Valid useflags are;"
+	eerror " jabber, msn, oscar and yahoo"
+	die "No IM protocols selected!"
+}
+
+pkg_setup() {
+	einfo "Note: as of bitlbee-0.82-r1, all protocols are useflags."
+	einfo "      Make sure you've enabled the flags you want."
+
+	use jabber || use msn || use oscar || use yahoo || no_flags_die
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# 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"
+	use flood && myconf="${myconf} --flood=1"
+
+	if ( ( use jabber && use ssl ) || use msn ); then
+		myconf="--ssl=gnutls"
+	else
+		myconf="--ssl=bogus"
+	fi
+
+	econf --datadir=/usr/share/bitlbee --etcdir=/etc/bitlbee ${myconf} \
+		|| die "econf failed"
+
+	emake || die "make failed"
+
+	# make bitlbeed forking server
+	cd utils
+	$(gcc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
+}
+
+src_install() {
+	dodir /var/lib/bitlbee
+	make install DESTDIR=${D} || die "install failed"
+	make install-etc DESTDIR=${D} || die "install failed"
+	make install-doc DESTDIR=${D} || die "install failed"
+	keepdir /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO,user-guide.txt}
+	dohtml -A sgml doc/*.sgml
+	dohtml -A xml doc/*.xml
+	dohtml -A xsl doc/*.xsl
+	dohtml doc/*.html
+
+	doman doc/bitlbee.8 doc/bitlbee.conf.5
+
+	dobin utils/bitlbeed
+
+	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
+
+	dodir /usr/share/bitlbee
+	cp ${S}/utils/* ${D}/usr/share/bitlbee
+	rm ${D}/usr/share/bitlbee/bitlbeed*
+
+	has_version net-irc/irssi && [ -d /usr/share/irssi/scripts ] && \
+		dodir /usr/share/irssi/scripts && \
+		dosym /usr/share/bitlbee/bitlbee_tab_completion.pl \
+			/usr/share/irssi/scripts/bitlbee_tab_completion.pl
+
+}
+
+pkg_postinst() {
+	chown nobody:nobody ${ROOT}/var/lib/bitlbee
+	chmod 700 ${ROOT}/var/lib/bitlbee
+	einfo "The utils included in bitlbee (other than bitlbeed) are now"
+	einfo "located in /usr/share/bitlbee"
+}
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.91-r1 b/net-im/bitlbee/files/digest-bitlbee-0.91-r1
new file mode 100644
index 000000000000..e51de342329c
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-0.91-r1
@@ -0,0 +1 @@
+MD5 a2fa42959708fd06eb281f03a7d7d3fe bitlbee-0.91.tar.gz 462675