Version bump to 0.90 and removed old ebuilds for 0.85 and 0.85-r1.

7 files changed, 38 insertions, 119 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index df52d8c20567..a2e6f2e5f0f1 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.36 2004/04/26 04:45:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.37 2004/05/30 01:06:41 weeve Exp $
+
+*bitlbee-0.90 (29 May 2004)
+
+  29 May 2004; Jason Wever <weeve@gentoo.org> -bitlbee-0.85-r1.ebuild,
+  -bitlbee-0.85.ebuild, +bitlbee-0.90.ebuild:
+  Version bump to 0.90 and removed old ebuilds for 0.85 and 0.85-r1.
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org> bitlbee-0.84.ebuild,
   bitlbee-0.85-r1.ebuild, bitlbee-0.85.ebuild, bitlbee-0.85a.ebuild:
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 87e50c8020ff..db7be780ded1 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,17 +1,19 @@
-MD5 4cca8815767c30a961607822df473659 bitlbee-0.84.ebuild 2439
-MD5 6f5bc80fcfb9c9a9a4c801cadcd9dc48 bitlbee-0.85a.ebuild 2447
-MD5 9ab0e21c83eeb97a535ef58558cd42e7 bitlbee-0.85.ebuild 2430
 MD5 7027271a64f17e99e78065b434bd62bb ChangeLog 6031
+MD5 31e52b92240d7161ed122992e7b6491e bitlbee-0.90.ebuild 2780
+MD5 4cca8815767c30a961607822df473659 bitlbee-0.84.ebuild 2439
 MD5 5100dc69c4a0db4ba406bcfed3bc99bc bitlbee-0.85-r1.ebuild 2550
+MD5 9ab0e21c83eeb97a535ef58558cd42e7 bitlbee-0.85.ebuild 2430
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
+MD5 6f5bc80fcfb9c9a9a4c801cadcd9dc48 bitlbee-0.85a.ebuild 2447
+MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 ccb2adcfc701f086102639f5d5b38802 files/bitlbee-0.82-segv.diff 415
-MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
-MD5 7bee4259ae731f2c975e0a9d4b9aefb2 files/digest-bitlbee-0.85-r1 64
-MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
 MD5 2332b3b72a6b0501882bacd09921c3ce files/bitlbee-0.84-passport.diff 976
+MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
+MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
+MD5 658374790b73d4b9550b497f55d0b9ed files/bitlbeed.init 730
+MD5 3c50c03225e8618f3bc586dca3d2644b files/digest-bitlbee-0.90 64
 MD5 b5361a82a904f5e2bf9c5a6d0717f374 files/digest-bitlbee-0.84 64
 MD5 7bee4259ae731f2c975e0a9d4b9aefb2 files/digest-bitlbee-0.85 64
-MD5 658374790b73d4b9550b497f55d0b9ed files/bitlbeed.init 730
-MD5 3697485d9a040cc81ff7f9d766ec1436 files/digest-bitlbee-0.85a 65
-MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
+MD5 7bee4259ae731f2c975e0a9d4b9aefb2 files/digest-bitlbee-0.85-r1 64
 MD5 6668146d14da88ef8240b49671db3e9b files/yahoo.diff 25463
+MD5 3697485d9a040cc81ff7f9d766ec1436 files/digest-bitlbee-0.85a 65
diff --git a/net-im/bitlbee/bitlbee-0.85.ebuild b/net-im/bitlbee/bitlbee-0.85.ebuild
deleted file mode 100644
index dda7756ef215..000000000000
--- a/net-im/bitlbee/bitlbee-0.85.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.85.ebuild,v 1.2 2004/04/26 04:45:32 agriffis 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"
-IUSE="debug jabber msn oscar yahoo"
-
-DEPEND="virtual/glibc
-	msn? ( 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"
-
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc/bitlbee ${myconf} || die "econf failed"
-	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.85-r1.ebuild b/net-im/bitlbee/bitlbee-0.90.ebuild
index 794dc0fa36c5..d538d41ddf03 100644
--- a/net-im/bitlbee/bitlbee-0.85-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-0.90.ebuild
@@ -1,6 +1,6 @@
 # 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.85-r1.ebuild,v 1.3 2004/04/26 04:45:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.90.ebuild,v 1.1 2004/05/30 01:06:41 weeve Exp $
 
 inherit eutils
 
@@ -10,10 +10,11 @@ SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
-IUSE="debug jabber msn oscar yahoo"
+KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~ppc"
+IUSE="debug jabber msn oscar yahoo flood"
 
 DEPEND="virtual/glibc
+	>=dev-libs/glib-2.0
 	msn? ( net-libs/gnutls )"
 
 no_flags_die() {
@@ -40,22 +41,21 @@ src_unpack() {
 	# Patch the default xinetd file to add/adjust values to Gentoo defaults
 	cd ${S}/doc
 	epatch ${FILESDIR}/${PN}-0.80-xinetd.patch
-
-	# Patch to fix msn login problems from the bitlbee team
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.84-passport.diff
 }
 
 src_compile() {
 	# setup useflags
 	local myconf
 	use debug && myconf="${myconf} --debug=1"
-	use msn || myconf="${myconf} --msn=0"
+	use msn || myconf="${myconf} --msn=0 --ssl=gnutls"
 	use jabber || myconf="${myconf} --jabber=0"
 	use oscar || myconf="${myconf} --oscar=0"
 	use yahoo || myconf="${myconf} --yahoo=0"
+	use flood && myconf="${myconf} --flood=1"
+
+	econf --datadir=/usr/share/bitlbee --etcdir=/etc/bitlbee ${myconf} \
+		|| die "econf failed"
 
-	econf --datadir=/usr/share/bitlbee --etcdir=/etc/bitlbee ${myconf} || die "econf failed"
 	emake || die "make failed"
 
 	# make bitlbeed forking server
@@ -73,11 +73,13 @@ src_install() {
 	keepdir /var/lib/bitlbee
 
 	dodoc COPYING
-	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,RELEASE-SPEECH-0.90,TODO}
 	dohtml -A sgml doc/*.sgml
-	doman doc/bitlbee.8
+	dohtml doc/*.html
+
+	doman doc/bitlbee.8 doc/bitlbee.conf.5
 
-	dobin utils/bitlbeed utils/create_nicksfile.pl
+	dobin utils/bitlbeed
 
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
@@ -91,9 +93,14 @@ src_install() {
 	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 /var/lib/bitlbee
 	chmod 700 /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.85 b/net-im/bitlbee/files/digest-bitlbee-0.85
deleted file mode 100644
index 9abd23ff72b1..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.85
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3952efbe51f43aa8c99d004319728dbb bitlbee-0.85.tar.gz 470233
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.85-r1 b/net-im/bitlbee/files/digest-bitlbee-0.85-r1
deleted file mode 100644
index 9abd23ff72b1..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.85-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3952efbe51f43aa8c99d004319728dbb bitlbee-0.85.tar.gz 470233
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.90 b/net-im/bitlbee/files/digest-bitlbee-0.90
new file mode 100644
index 000000000000..8cdd97d1aa81
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-0.90
@@ -0,0 +1 @@
+MD5 b6a7093651141e95b6ac78bf3eec95f3 bitlbee-0.90.tar.gz 433321