Updated bitlbee to support toolchain-funcs eclass instead of gcc and added a new rev bump to resolve bug #74367.

Package-Manager: portage-2.0.51.21-r1

10 files changed, 41 insertions, 243 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 3f4ff1a53cad..467933c7ac61 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,14 @@
 # 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.52 2005/05/01 18:18:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.53 2005/05/15 22:17:06 weeve Exp $
+
+*bitlbee-0.92-r1 (15 May 2005)
+
+  15 May 2005; Jason Wever <weeve@gentoo.org> -bitlbee-0.84.ebuild,
+  -bitlbee-0.91.ebuild, -bitlbee-0.91-r1.ebuild, bitlbee-0.92.ebuild,
+  +bitlbee-0.92-r1.ebuild:
+  Updated bitlbee to support toolchain-funcs eclass instead of gcc and added a
+  new rev bump to resolve bug #74367.
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org> bitlbee-0.92.ebuild:
   Stable on ppc.
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 0f25318a858f..c0d29b6b26c6 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,17 +1,13 @@
+MD5 fd216c9c99610ccc556da898f8ce8d02 ChangeLog 8626
+MD5 966945411ce792116eaca60972578869 bitlbee-0.92-r1.ebuild 3491
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
-MD5 56102cad08cf50c659b38eaec74a3aa3 ChangeLog 8312
-MD5 791b4241dfbddea3ea0e734bd9b0a060 bitlbee-0.91-r1.ebuild 3210
-MD5 078639e22380e238a42187f0fac8b314 bitlbee-0.84.ebuild 2384
-MD5 7ef215cf3458cfc8f9eb21fb6de0acc7 bitlbee-0.92.ebuild 3117
-MD5 3eb3dfcae54d604bb9831af02524cdcb bitlbee-0.91.ebuild 3187
-MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
-MD5 bb2f200c9009854a3231720cc1e04ed1 files/bitlbee-gentoohack.patch 1015
+MD5 fb98267549502ea8bc56340613a29c29 bitlbee-0.92.ebuild 3127
+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 b5361a82a904f5e2bf9c5a6d0717f374 files/digest-bitlbee-0.84 64
+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 ccb2adcfc701f086102639f5d5b38802 files/bitlbee-0.82-segv.diff 415
-MD5 70d0e8bb8d7639b86e3ee8c0bda16334 files/digest-bitlbee-0.91 64
-MD5 70d0e8bb8d7639b86e3ee8c0bda16334 files/digest-bitlbee-0.91-r1 64
-MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
-MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
diff --git a/net-im/bitlbee/bitlbee-0.84.ebuild b/net-im/bitlbee/bitlbee-0.84.ebuild
deleted file mode 100644
index d1e6a4dfe2c6..000000000000
--- a/net-im/bitlbee/bitlbee-0.84.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.84.ebuild,v 1.8 2005/02/27 16:13:11 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 sparc alpha ia64"
-IUSE="debug jabber msn oscar yahoo"
-
-DEPEND="virtual/libc
-	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
-	$(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"
-	keepdir /var/lib/bitlbee
-
-	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 ${ROOT}/var/lib/bitlbee
-	chmod 700 ${ROOT}/var/lib/bitlbee
-}
diff --git a/net-im/bitlbee/bitlbee-0.91.ebuild b/net-im/bitlbee/bitlbee-0.91.ebuild
deleted file mode 100644
index 25407731505f..000000000000
--- a/net-im/bitlbee/bitlbee-0.91.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.91.ebuild,v 1.6 2005/02/27 16:13:11 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/bitlbee-0.91-r1.ebuild b/net-im/bitlbee/bitlbee-0.92-r1.ebuild
index aa1e5b016519..f686e1148fcc 100644
--- a/net-im/bitlbee/bitlbee-0.91-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-0.92-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.91-r1.ebuild,v 1.3 2005/02/27 16:13:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92-r1.ebuild,v 1.1 2005/05/15 22:17:06 weeve Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
 HOMEPAGE="http://www.bitlbee.org/"
@@ -10,13 +10,15 @@ 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"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+IUSE="debug jabber msn oscar yahoo flood gnutls openssl"
 
 DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
-	msn? ( net-libs/gnutls )
-	jabber? ( ssl? ( net-libs/gnutls ) )"
+	msn? ( gnutls? ( net-libs/gnutls )
+		   openssl? ( dev-libs/openssl ) )
+	jabber? ( gnutls? ( net-libs/gnutls )
+			  openssl? ( dev-libs/openssl ) )"
 
 no_flags_die() {
 	eerror ""
@@ -32,6 +34,8 @@ no_flags_die() {
 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 "To use jabber over SSL or MSN Messenger, you will need to enable"
+	einfo "either the gnutls, nss or openssl useflags."
 
 	use jabber || use msn || use oscar || use yahoo || no_flags_die
 }
@@ -41,6 +45,7 @@ src_unpack() {
 
 	# 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
 }
 
 src_compile() {
@@ -51,11 +56,13 @@ src_compile() {
 	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 nss && myconf="${myconf} --ssl=nss"
+	use openssl && myconf="${myconf} --ssl=openssl"
 	use flood && myconf="${myconf} --flood=1"
 
-	if ( ( use jabber && use ssl ) || use msn ); then
-		myconf="${myconf} --ssl=gnutls"
-	else
+	if ( ( use jabber && use ssl ) || use msn ) && !gnutls && !nss \
+		&& !openssl; then
 		myconf="${myconf} --ssl=bogus"
 	fi
 
@@ -66,7 +73,7 @@ src_compile() {
 
 	# make bitlbeed forking server
 	cd utils
-	$(gcc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
+	$(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
 }
 
 src_install() {
@@ -102,11 +109,6 @@ src_install() {
 	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() {
@@ -114,4 +116,6 @@ pkg_postinst() {
 	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/bitlbee-0.92.ebuild b/net-im/bitlbee/bitlbee-0.92.ebuild
index 95269e8e3933..15675b45fcd3 100644
--- a/net-im/bitlbee/bitlbee-0.92.ebuild
+++ b/net-im/bitlbee/bitlbee-0.92.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.5 2005/05/01 18:18:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92.ebuild,v 1.6 2005/05/15 22:17:06 weeve Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="irc to IM gateway that support multiple IM protocols"
 HOMEPAGE="http://www.bitlbee.org/"
@@ -67,7 +67,7 @@ src_compile() {
 
 	# make bitlbeed forking server
 	cd utils
-	$(gcc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
+	$(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
 }
 
 src_install() {
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.84 b/net-im/bitlbee/files/digest-bitlbee-0.84
deleted file mode 100644
index b18a650bce32..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.84
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d633383a67ff89b064c2bcd4822f6157 bitlbee-0.84.tar.gz 473930
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.91 b/net-im/bitlbee/files/digest-bitlbee-0.91
deleted file mode 100644
index e51de342329c..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2fa42959708fd06eb281f03a7d7d3fe bitlbee-0.91.tar.gz 462675
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.91-r1 b/net-im/bitlbee/files/digest-bitlbee-0.91-r1
deleted file mode 100644
index e51de342329c..000000000000
--- a/net-im/bitlbee/files/digest-bitlbee-0.91-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2fa42959708fd06eb281f03a7d7d3fe bitlbee-0.91.tar.gz 462675
diff --git a/net-im/bitlbee/files/digest-bitlbee-0.92-r1 b/net-im/bitlbee/files/digest-bitlbee-0.92-r1
new file mode 100644
index 000000000000..c8861218390d
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-0.92-r1
@@ -0,0 +1 @@
+MD5 0ffec374b76f376f75b2cab95636a0de bitlbee-0.92.tar.gz 464110