Use glib2 (this ebuild accidentally regressed from 0.8.6-r6). Don't build the bot, which is apparently broken and unsupported. Mark stable on x86, alpha and ia64. These changes fix bugs 33603, 35614 and 35532 and follow discussion with Greg F. in December.

3 files changed, 17 insertions, 13 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index bb04e755ecd8..98925cf220ad 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/irssi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.39 2003/12/12 16:55:26 gregf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.40 2004/01/05 18:39:43 agriffis Exp $
+
+  05 Jan 2004; Aron Griffis <agriffis@gentoo.org> irssi-0.8.9.ebuild:
+  Use glib2 (this ebuild accidentally regressed from 0.8.6-r6).  Don't
+  build the bot, which is apparently broken and unsupported.  Mark
+  stable on x86, alpha and ia64.  These changes fix bugs 33603, 35614
+  and 35532 and follow discussion with Greg F. in December.
 
   12 Dec 2003; Greg Fitzgerald <gregf@gentoo.org> irssi-0.8.9.ebuild:
   Fixed patch problem, closes bug #35657
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 5ad072aa0fc0..47e5c782e547 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,10 +1,10 @@
-MD5 6aa984618ef91ce9992a259ee0bd21bd ChangeLog 5388
-MD5 b0bf2474d39dca2a2102ebe53397cd4f irssi-0.8.6-r5.ebuild 2106
+MD5 36629aae4a0af9630a181d9a8f1929f9 ChangeLog 5730
+MD5 4f1b7f5e174595381db2bdc6029396e7 irssi-0.8.9.ebuild 2068
 MD5 19cec9fbdc8d10da071b41327b6dd90d irssi-0.8.6-r6.ebuild 2112
-MD5 73cba588a8ccde5b97cc0c19852ab680 irssi-0.8.9.ebuild 2114
+MD5 b0bf2474d39dca2a2102ebe53397cd4f irssi-0.8.6-r5.ebuild 2106
 MD5 66fbf3744370d75438e10d4d8b6a3900 metadata.xml 250
-MD5 cb17857da5af4446fef7e94d553277de files/digest-irssi-0.8.6-r5 64
-MD5 cb17857da5af4446fef7e94d553277de files/digest-irssi-0.8.6-r6 64
 MD5 d8d32d5f69fd1bccf2928c4bad648cd6 files/digest-irssi-0.8.9 64
-MD5 e75d250d81ec4a41f6bff2130b4d6a0b files/irssi-0.8.6-configure.patch 976
 MD5 fdac3a93d9b1589031a28d5a36029e6d files/irssi-0.8.8-configure.patch 531
+MD5 cb17857da5af4446fef7e94d553277de files/digest-irssi-0.8.6-r6 64
+MD5 cb17857da5af4446fef7e94d553277de files/digest-irssi-0.8.6-r5 64
+MD5 e75d250d81ec4a41f6bff2130b4d6a0b files/irssi-0.8.6-configure.patch 976
diff --git a/net-irc/irssi/irssi-0.8.9.ebuild b/net-irc/irssi/irssi-0.8.9.ebuild
index 5b019a7df487..b859a5522eb9 100644
--- a/net-irc/irssi/irssi-0.8.9.ebuild
+++ b/net-irc/irssi/irssi-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.9.ebuild,v 1.2 2003/12/12 16:55:26 gregf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.9.ebuild,v 1.3 2004/01/05 18:39:43 agriffis Exp $
 
 IUSE="nls ipv6 perl ssl"
 
@@ -10,7 +10,7 @@ DESCRIPTION="A modular textUI IRC client with IPv6 support."
 SRC_URI="http://irssi.org/files/${P}.tar.bz2"
 HOMEPAGE="http://irssi.org/"
 
-DEPEND=">=dev-libs/glib-1.2
+DEPEND=">=dev-libs/glib-2.2.1
 	sys-libs/ncurses
 	>=sys-apps/sed-4
 	perl? ( dev-lang/perl )
@@ -21,7 +21,7 @@ RDEPEND="nls? ( sys-devel/gettext )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc alpha ~hppa ~mips ~amd64 ia64"
 
 src_unpack() {
 	unpack ${A}
@@ -32,15 +32,13 @@ src_unpack() {
 	sed -i \
 		-e 's/[^ 	]\+\.html//g' docs/Makefile.in || \
 			die "sed doc/Makefile.in failed"
-
-#	epatch ${FILESDIR}/${P}-configure.patch || die
 }
 
 src_compile() {
 	# Note: there is an option to build a GUI for irssi, but according
 	# to the website the GUI is no longer developed, so that option is
 	# not used here.
-	local myconf="--without-servertest --with-bot --with-proxy --with-ncurses"
+	local myconf="--with-glib2 --without-servertest --with-proxy --with-ncurses"
 
 	myconf="${myconf} `use_enable nls`"
 	myconf="${myconf} `use_with perl`"