Added checks to 0.82-r1 and 0.83 to fail if no protocols selected at request of upstream author. Old ebuild cleanup.

20 files changed, 42 insertions, 496 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 72e5a2098f8a..4dd84df554c7 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.23 2003/12/31 14:13:52 weeve Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.24 2004/01/09 20:45:21 weeve Exp $
+
+  09 Jan 2004; Jason Wever <weeve@gentoo.org> bitlbee-0.72.ebuild,
+  bitlbee-0.73-r1.ebuild, bitlbee-0.73.ebuild, bitlbee-0.74a.ebuild,
+  bitlbee-0.80-r1.ebuild, bitlbee-0.80.ebuild, bitlbee-0.81a.ebuild,
+  bitlbee-0.82-r1.ebuild, bitlbee-0.82.ebuild, bitlbee-0.83.ebuild:
+  Added checks to 0.82-r1 and 0.83 to fail if no protocols selected at request
+  of upstream author. Old ebuild cleanup.
 
 *bitlbee-0.83 (31 Dec 2003)
 
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 28dfd0afc7dc..dd5404d6ff35 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,30 +1,14 @@
-MD5 3c5c1c1f92d998c7fd79a0d985fc9539 ChangeLog 3840
-MD5 23ee60306a0cf6969d18a55e3409053c bitlbee-0.72.ebuild 1088
-MD5 f0edb4325376030565902192f83cabe8 bitlbee-0.73-r1.ebuild 1328
-MD5 abf8374300f5e107e68a298db32da1e6 bitlbee-0.73.ebuild 1088
-MD5 74f2a67871962ff31e1d2b6a14ce8f71 bitlbee-0.74a.ebuild 1326
-MD5 dd79ef42e1362999f2f979c4ed604f69 bitlbee-0.80-r1.ebuild 1451
+MD5 52eae340d0c957b87d24284037339b5a ChangeLog 4235
 MD5 be64c422fc7b104525f44ec6936d97da bitlbee-0.80-r2.ebuild 1571
-MD5 94b8adf097f6f9ea3d51f2afa75c0617 bitlbee-0.80.ebuild 1304
-MD5 b5fab5f98ccea3987fd261ce1f1fa832 bitlbee-0.81a.ebuild 1651
-MD5 eae8a9220d4d1faf31fc43404868312c bitlbee-0.82-r1.ebuild 2207
-MD5 00400d96dbff0a3e882192e90a08018f bitlbee-0.82.ebuild 1913
+MD5 3c19511150e0223b4b4ef30035afa937 bitlbee-0.82-r1.ebuild 2557
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
-MD5 51478fc6bdbfd7f049123c1f16dec7f8 bitlbee-0.83.ebuild 2066
+MD5 8a14b0abea7327eee82411cfedf71afd bitlbee-0.83.ebuild 2416
 MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 ccb2adcfc701f086102639f5d5b38802 files/bitlbee-0.82-segv.diff 415
 MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
 MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
 MD5 f30a0b316c8362446df532544d73a93c files/bitlbeed.init 733
-MD5 4b739ca4a0982ccfda988bb664db9b55 files/digest-bitlbee-0.72 201
-MD5 208f8bc3e515b98d70467d031d9d9fc0 files/digest-bitlbee-0.73 64
-MD5 208f8bc3e515b98d70467d031d9d9fc0 files/digest-bitlbee-0.73-r1 64
-MD5 8de9879ddbed4e2fbba0fd6b3e2e898a files/digest-bitlbee-0.74a 65
-MD5 e20daee3dcba62b15424f0f72838bf64 files/digest-bitlbee-0.80 64
-MD5 e20daee3dcba62b15424f0f72838bf64 files/digest-bitlbee-0.80-r1 64
 MD5 e20daee3dcba62b15424f0f72838bf64 files/digest-bitlbee-0.80-r2 64
-MD5 e1fb6ff9d8cb050a38e3b988e57abd6a files/digest-bitlbee-0.81a 65
-MD5 f28bfc3eed8f41e2ed33ce03e06a9659 files/digest-bitlbee-0.82 64
 MD5 f28bfc3eed8f41e2ed33ce03e06a9659 files/digest-bitlbee-0.82-r1 64
 MD5 6668146d14da88ef8240b49671db3e9b files/yahoo.diff 25463
 MD5 eb12cb1db8e960d657004dfd7dfdd818 files/digest-bitlbee-0.83 64
diff --git a/net-im/bitlbee/bitlbee-0.72.ebuild b/net-im/bitlbee/bitlbee-0.72.ebuild
deleted file mode 100644
index 34962a4f94fd..000000000000
--- a/net-im/bitlbee/bitlbee-0.72.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.72.ebuild,v 1.5 2003/10/16 15:16:56 pyrania Exp $
-
-inherit eutils
-
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.lintux.cx/bitlbee.html"
-SRC_URI="http://www.lintux.cx/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Patch the default xinetd file to add/adjust values to Gentoo defaults
-	cd ${S}/doc
-	epatch ${FILESDIR}/${PN}-xinetd.patch
-}
-
-src_compile() {
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc
-	emake
-}
-
-src_install() {
-	mkdir -p ${D}/var/lib/bitlbee
-	chown nobody:nobody ${D}/var/lib/bitlbee
-	chmod 700 ${D}/var/lib/bitlbee
-	make install DESTDIR=${D}
-
-	dodoc COPYING
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
-	doman doc/bitlbee.8
-
-	insinto /etc/xinetd.d
-	newins doc/bitlbee.xinetd bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-0.73-r1.ebuild b/net-im/bitlbee/bitlbee-0.73-r1.ebuild
deleted file mode 100644
index 4cda2a65b0af..000000000000
--- a/net-im/bitlbee/bitlbee-0.73-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.73-r1.ebuild,v 1.5 2003/10/16 15:16:56 pyrania Exp $
-
-inherit eutils
-
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.lintux.cx/bitlbee.html"
-SRC_URI="http://www.lintux.cx/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Patch the default xinetd file to add/adjust values to Gentoo defaults
-	cd ${S}/doc
-	epatch ${FILESDIR}/${PN}-xinetd.patch
-}
-
-src_compile() {
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc
-	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"
-
-	dodoc COPYING
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
-	doman doc/bitlbee.8
-
-	dobin utils/bitlbeed
-
-	insinto /etc/xinetd.d
-	newins doc/bitlbee.xinetd bitlbee
-}
-
-pkg_postinst() {
-	chown nobody:nobody /var/lib/bitlbee
-	chmod 700 /var/lib/bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-0.73.ebuild b/net-im/bitlbee/bitlbee-0.73.ebuild
deleted file mode 100644
index a71ff656b3b0..000000000000
--- a/net-im/bitlbee/bitlbee-0.73.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.73.ebuild,v 1.4 2003/10/16 15:16:56 pyrania Exp $
-
-inherit eutils
-
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.lintux.cx/bitlbee.html"
-SRC_URI="http://www.lintux.cx/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Patch the default xinetd file to add/adjust values to Gentoo defaults
-	cd ${S}/doc
-	epatch ${FILESDIR}/${PN}-xinetd.patch
-}
-
-src_compile() {
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc
-	emake
-}
-
-src_install() {
-	mkdir -p ${D}/var/lib/bitlbee
-	chown nobody:nobody ${D}/var/lib/bitlbee
-	chmod 700 ${D}/var/lib/bitlbee
-	make install DESTDIR=${D}
-
-	dodoc COPYING
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
-	doman doc/bitlbee.8
-
-	insinto /etc/xinetd.d
-	newins doc/bitlbee.xinetd bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-0.74a.ebuild b/net-im/bitlbee/bitlbee-0.74a.ebuild
deleted file mode 100644
index 75279bb5484a..000000000000
--- a/net-im/bitlbee/bitlbee-0.74a.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.74a.ebuild,v 1.3 2003/10/16 15:16:56 pyrania Exp $
-
-inherit eutils
-
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.lintux.cx/bitlbee.html"
-SRC_URI="http://www.lintux.cx/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Patch the default xinetd file to add/adjust values to Gentoo defaults
-	cd ${S}/doc
-	epatch ${FILESDIR}/${PN}-xinetd.patch
-}
-
-src_compile() {
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc
-	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"
-
-	dodoc COPYING
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
-	doman doc/bitlbee.8
-
-	dobin utils/bitlbeed
-
-	insinto /etc/xinetd.d
-	newins doc/bitlbee.xinetd bitlbee
-}
-
-pkg_postinst() {
-	chown nobody:nobody /var/lib/bitlbee
-	chmod 700 /var/lib/bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-0.80-r1.ebuild b/net-im/bitlbee/bitlbee-0.80-r1.ebuild
deleted file mode 100644
index 941acc0eb0da..000000000000
--- a/net-im/bitlbee/bitlbee-0.80-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.80-r1.ebuild,v 1.3 2003/10/16 15:16:56 pyrania Exp $
-
-inherit eutils
-
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.lintux.cx/bitlbee.html"
-SRC_URI="http://www.lintux.cx/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc alpha"
-IUSE=""
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Patch the default xinetd file to add/adjust values to Gentoo defaults
-	cd ${S}/doc
-	epatch ${FILESDIR}/${P}-xinetd.patch
-}
-
-src_compile() {
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc
-	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"
-
-	dodoc COPYING
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
-	dohtml -A sgml doc/*.sgml
-	doman doc/bitlbee.8
-
-	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
-}
-
-pkg_postinst() {
-	chown nobody:nobody /var/lib/bitlbee
-	chmod 700 /var/lib/bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-0.80.ebuild b/net-im/bitlbee/bitlbee-0.80.ebuild
deleted file mode 100644
index 30b8bbe6dd80..000000000000
--- a/net-im/bitlbee/bitlbee-0.80.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.80.ebuild,v 1.6 2003/10/16 15:16:56 pyrania Exp $
-
-inherit eutils
-
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.lintux.cx/bitlbee.html"
-SRC_URI="http://www.lintux.cx/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~alpha"
-IUSE=""
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Patch the default xinetd file to add/adjust values to Gentoo defaults
-	cd ${S}/doc
-	epatch ${FILESDIR}/${P}-xinetd.patch
-}
-
-src_compile() {
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc
-	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"
-
-	dodoc COPYING
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
-	dohtml -A sgml doc/*.sgml
-	doman doc/bitlbee.8
-
-	dobin utils/bitlbeed
-
-	insinto /etc/xinetd.d
-	newins doc/bitlbee.xinetd bitlbee
-}
-
-pkg_postinst() {
-	chown nobody:nobody /var/lib/bitlbee
-	chmod 700 /var/lib/bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-0.81a.ebuild b/net-im/bitlbee/bitlbee-0.81a.ebuild
deleted file mode 100644
index da42230dbed5..000000000000
--- a/net-im/bitlbee/bitlbee-0.81a.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.2 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="tcpd"
-
-DEPEND="virtual/glibc"
-
-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() {
-	local myconf
-	use tcpd && myconf="${myconf} --tcpd=1"
-	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
-
-	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/bitlbee-0.82-r1.ebuild b/net-im/bitlbee/bitlbee-0.82-r1.ebuild
index a0d9f15cc819..bbf46b9d019c 100644
--- a/net-im/bitlbee/bitlbee-0.82-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-0.82-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.2 2003/12/25 16:14:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.82-r1.ebuild,v 1.3 2004/01/09 20:45:21 weeve Exp $
 
 inherit eutils
 
@@ -16,9 +16,22 @@ IUSE="debug jabber msn oscar yahoo"
 DEPEND="virtual/glibc
 	msn? ( >=net-libs/libsoup-1.99.26 )"
 
+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() {
diff --git a/net-im/bitlbee/bitlbee-0.82.ebuild b/net-im/bitlbee/bitlbee-0.82.ebuild
deleted file mode 100644
index 94e9794a72cf..000000000000
--- a/net-im/bitlbee/bitlbee-0.82.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.ebuild,v 1.1 2003/11/06 21:02:21 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 msn"
-
-DEPEND="virtual/glibc
-	msn? ( >=net-libs/libsoup-1.99.26 )"
-
-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"
-
-	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/bitlbee-0.83.ebuild b/net-im/bitlbee/bitlbee-0.83.ebuild
index f3180e0c12ca..81381d047774 100644
--- a/net-im/bitlbee/bitlbee-0.83.ebuild
+++ b/net-im/bitlbee/bitlbee-0.83.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.83.ebuild,v 1.1 2003/12/31 14:13:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.83.ebuild,v 1.2 2004/01/09 20:45:21 weeve Exp $
 
 inherit eutils
 
@@ -16,9 +16,22 @@ IUSE="debug jabber msn oscar yahoo"
 DEPEND="virtual/glibc
 	msn? ( >=net-libs/libsoup-1.99.26 )"
 
+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() {
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.72 b/net-im/bitlbee/files/digest-bitlbee-0.72
deleted file mode 100644
index a0c0f6041de9..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.72
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 144e462c0af1d82a3412a237519b32ca /files/bitlbee-0.72-xinetd.patch 519
-MD5 04c257f75442d3cfefdae1da1931e670 /bitlbee-0.72.ebuild 1093
-MD5 07ed111a79ccd3299eff2c4cd15fa639 bitlbee-0.72.tar.gz 322185
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.73 b/net-im/bitlbee/files/digest-bitlbee-0.73
deleted file mode 100644
index a73473f0fbfb..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.73
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4ad3456e42df3c9a0fa2c1d3846ee29 bitlbee-0.73.tar.gz 333099
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.73-r1 b/net-im/bitlbee/files/digest-bitlbee-0.73-r1
deleted file mode 100644
index a73473f0fbfb..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.73-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4ad3456e42df3c9a0fa2c1d3846ee29 bitlbee-0.73.tar.gz 333099
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.74a b/net-im/bitlbee/files/digest-bitlbee-0.74a
deleted file mode 100644
index 71e89feba53c..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.74a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03e59381091c4c41ca01e4547ae12be1 bitlbee-0.74a.tar.gz 333311
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.80 b/net-im/bitlbee/files/digest-bitlbee-0.80
deleted file mode 100644
index 84df83fac49a..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.80
+++ /dev/null
@@ -1 +0,0 @@
-MD5 96d947bef8c6c40c865beaeee59737eb bitlbee-0.80.tar.gz 351775
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.80-r1 b/net-im/bitlbee/files/digest-bitlbee-0.80-r1
deleted file mode 100644
index 84df83fac49a..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.80-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 96d947bef8c6c40c865beaeee59737eb bitlbee-0.80.tar.gz 351775
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.81a b/net-im/bitlbee/files/digest-bitlbee-0.81a
deleted file mode 100644
index 7680583eacfe..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.81a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4407b3d56ed2e4e6a9f7246b193c30c bitlbee-0.81a.tar.gz 373025
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.82 b/net-im/bitlbee/files/digest-bitlbee-0.82
deleted file mode 100644
index dc13c008305e..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.82
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fecb84a97e13a46b45989d71e7723b35 bitlbee-0.82.tar.gz 375607