Revision bump, resolves bug #97098.

(Portage version: 2.0.51.22-r1)

4 files changed, 159 insertions, 4 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 467933c7ac61..c95010c386ac 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.53 2005/05/15 22:17:06 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.54 2005/07/16 21:34:10 weeve Exp $
+
+*bitlbee-0.92-r2 (16 Jul 2005)
+
+  16 Jul 2005; Jason Wever <weeve@gentoo.org> +bitlbee-0.92-r2.ebuild:
+  Revision bump, resolves bug #97098.
 
 *bitlbee-0.92-r1 (15 May 2005)
 
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index c0d29b6b26c6..e5933c4d238a 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,13 +1,15 @@
 MD5 fd216c9c99610ccc556da898f8ce8d02 ChangeLog 8626
 MD5 966945411ce792116eaca60972578869 bitlbee-0.92-r1.ebuild 3491
-MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
 MD5 fb98267549502ea8bc56340613a29c29 bitlbee-0.92.ebuild 3127
+MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
+MD5 833e3806ec4b84fa75d043a5bd20b78a bitlbee-0.92-r2.ebuild 4246
 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 bb2f200c9009854a3231720cc1e04ed1 files/bitlbee-gentoohack.patch 1015
 MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
 MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
 MD5 ca5844d2edbb81e8ab4c8042e122aeb6 files/bitlbeed.init 724
-MD5 6b480c57366738ceb275d86aece12bc7 files/digest-bitlbee-0.92-r1 64
-MD5 bb2f200c9009854a3231720cc1e04ed1 files/bitlbee-gentoohack.patch 1015
 MD5 6b480c57366738ceb275d86aece12bc7 files/digest-bitlbee-0.92 64
+MD5 6b480c57366738ceb275d86aece12bc7 files/digest-bitlbee-0.92-r1 64
+MD5 f6bb34a36e7f5f5d61aa430d2614a56a files/digest-bitlbee-0.92-r2 189
diff --git a/net-im/bitlbee/bitlbee-0.92-r2.ebuild b/net-im/bitlbee/bitlbee-0.92-r2.ebuild
new file mode 100644
index 000000000000..03576e180c50
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-0.92-r2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92-r2.ebuild,v 1.1 2005/07/16 21:34:11 weeve Exp $
+
+inherit eutils toolchain-funcs
+
+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
+		 aimextras? ( http://get.bitlbee.org/patches/hanji/all.patch )
+		 msnextras? ( http://www.bitlbee.be/andy/bitlbee-0.92-msn6.akke.patch )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+IUSE="debug jabber msn oscar yahoo flood gnutls openssl aimextras msnextras"
+
+DEPEND="virtual/libc
+	>=dev-libs/glib-2.0
+	msn? ( gnutls? ( net-libs/gnutls )
+		   openssl? ( dev-libs/openssl ) )
+	jabber? ( gnutls? ( net-libs/gnutls )
+			  openssl? ( dev-libs/openssl ) )"
+
+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."
+	einfo ""
+	einfo "To use jabber over SSL or MSN Messenger, you will need to enable"
+	einfo "either the gnutls or openssl useflags."
+
+	if use aimextras; then
+		einfo ""
+		einfo "NOTE: This is a patch for extra AIM functionality that is NOT"
+		einfo "      supported by upstream.  Please do not report any problems"
+		einfo "      to them about this as they will be ignored."
+	fi
+
+	if use msnextras; then
+		einfo ""
+		einfo "NOTE: This is a patch for extra MSN functionality that is NOT"
+		einfo "      supported by upstream.  Please do not report any problems"
+		einfo "      to them about this as they will be ignored."
+	fi
+
+	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
+	cd ${S} && epatch ${FILESDIR}/${PN}-gentoohack.patch
+
+	if use aimextras; then
+		epatch ${DISTDIR}/all.patch
+	fi
+
+	if use msnextras; then
+		epatch ${DISTDIR}/${P}-msn6.akke.patch
+	fi
+
+}
+
+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 gnutls && myconf="${myconf} --ssl=gnutls"
+	use openssl && myconf="${myconf} --ssl=openssl"
+	use flood && myconf="${myconf} --flood=1"
+
+	if ( ( use jabber && ( use gnutls || use openssl ) ) || use msn ) && !gnutls && !openssl; then
+		myconf="${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
+	$(tc-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*
+
+}
+
+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"
+	einfo
+	einfo "NOTE: The irssi script is no longer provided by bitlbee."
+}
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.92-r2 b/net-im/bitlbee/files/digest-bitlbee-0.92-r2
new file mode 100644
index 000000000000..808f4e2facb6
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-0.92-r2
@@ -0,0 +1,3 @@
+MD5 0ffec374b76f376f75b2cab95636a0de bitlbee-0.92.tar.gz 464110
+MD5 e2bfa862645c776500fdd0f75cd93bda all.patch 38874
+MD5 fd78a28895c73d9afe39ddfed2af7076 bitlbee-0.92-msn6.akke.patch 86602