Updated dependencies.

7 files changed, 27 insertions, 105 deletions

diff --git a/net-irc/irssi-cvs/ChangeLog b/net-irc/irssi-cvs/ChangeLog
index 45696bcf5c95..2a7814310714 100644
--- a/net-irc/irssi-cvs/ChangeLog
+++ b/net-irc/irssi-cvs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-irc/irssi-cvs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-cvs/ChangeLog,v 1.6 2004/06/24 23:06:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-cvs/ChangeLog,v 1.7 2004/07/07 22:42:15 swegener Exp $
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> irssi-cvs-0.2.ebuild:
+  Updated dependencies.
 
   29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   irssi-cvs-0.2.ebuild:
diff --git a/net-irc/irssi-cvs/irssi-cvs-0.2.ebuild b/net-irc/irssi-cvs/irssi-cvs-0.2.ebuild
index 514f798d54f3..a8f29d384cb3 100644
--- a/net-irc/irssi-cvs/irssi-cvs-0.2.ebuild
+++ b/net-irc/irssi-cvs/irssi-cvs-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-cvs/irssi-cvs-0.2.ebuild,v 1.5 2004/06/24 23:06:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-cvs/irssi-cvs-0.2.ebuild,v 1.6 2004/07/07 22:42:15 swegener Exp $
 
 ECVS_SERVER="cvs.irssi.org:/home/cvs"
 ECVS_MODULE="irssi"
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc ~alpha hppa ~mips"
 IUSE="nls ipv6 perl ssl"
 
-DEPEND=">=dev-libs/glib-2.2.1
-		sys-libs/ncurses
-		perl? ( dev-lang/perl )
-		!net-irc/irssi
-		>=sys-devel/autoconf-2.58"
-RDEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=">=dev-libs/glib-2.2.1
+	sys-libs/ncurses
+	perl? ( dev-lang/perl )
+	!net-irc/irssi"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/autoconf-2.58"
 
 S=${WORKDIR}/${ECVS_MODULE}
 
diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index 92bceed0db38..4a0d7b50015f 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/irssi
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.49 2004/06/24 23:05:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.50 2004/07/07 22:42:52 swegener Exp $
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> -irssi-0.8.6-r5.ebuild,
+  irssi-0.8.6-r6.ebuild, irssi-0.8.9.ebuild:
+  Updated dependencies and ebuild cleanup.
 
   18 Jun 2004; Sven Wegener <swegener@gentoo.org> irssi-0.8.9.ebuild:
   Added dev-libs/glib to RDEPEND. Closes bug #54323.
diff --git a/net-irc/irssi/files/digest-irssi-0.8.6-r5 b/net-irc/irssi/files/digest-irssi-0.8.6-r5
deleted file mode 100644
index 0ecb65f16bf8..000000000000
--- a/net-irc/irssi/files/digest-irssi-0.8.6-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d66982723e2eb8780ae3b8b3a7ba08d irssi-0.8.6.tar.bz2 746551
diff --git a/net-irc/irssi/irssi-0.8.6-r5.ebuild b/net-irc/irssi/irssi-0.8.6-r5.ebuild
deleted file mode 100644
index ab312fcf559f..000000000000
--- a/net-irc/irssi/irssi-0.8.6-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.6-r5.ebuild,v 1.4 2004/06/24 23:05:44 agriffis Exp $
-
-IUSE="nls ipv6 perl ssl"
-
-inherit perl-module eutils
-
-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
-	sys-libs/ncurses
-	>=sys-apps/sed-4
-	perl? ( dev-lang/perl )
-	ssl? ( dev-libs/openssl )
-	!net-irc/irssi-cvs
-	socks5? ( >=net-misc/dante-1.1.13 )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa mips amd64 ia64"
-
-src_unpack() {
-	unpack ${A}
-
-	# Ugly hack to work around compression of the html files.
-	# Remove this if prepalldocs is changed to avoid gzipping html files.
-	cd ${S} && \
-	sed -i \
-		-e 's/[^ 	]\+\.html//g' docs/Makefile.in || \
-			die "sed doc/Makefile.in failed"
-
-	epatch ${FILESDIR}/irssi-0.8.6-configure.patch
-}
-
-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"
-
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_with perl`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_with socks5 socks`"
-	if use ssl; then
-		myconf="${myconf} --with-openssl-include=/usr --with-openssl-libs=/usr"
-	else
-		myconf="${myconf} --disable-ssl"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	myflags=""
-
-	if use perl; then
-		cd ${S}/src/perl/common; perl-module_src_prep
-		cd ${S}/src/perl/irc;    perl-module_src_prep
-		cd ${S}/src/perl/textui; perl-module_src_prep
-		cd ${S}/src/perl/ui;     perl-module_src_prep
-		cd ${S}
-	fi
-
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		gnulocaledir=${D}/usr/share/locale \
-		${myflags} \
-		install || die
-
-	prepalldocs
-	dodoc AUTHORS ChangeLog README TODO NEWS
-	cd ${S}/docs
-	dohtml -r . || die "dohtml failed"
-}
diff --git a/net-irc/irssi/irssi-0.8.6-r6.ebuild b/net-irc/irssi/irssi-0.8.6-r6.ebuild
index 1590a50e1cc3..cfe04a9aea4e 100644
--- a/net-irc/irssi/irssi-0.8.6-r6.ebuild
+++ b/net-irc/irssi/irssi-0.8.6-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.6-r6.ebuild,v 1.3 2004/06/24 23:05:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.6-r6.ebuild,v 1.4 2004/07/07 22:42:52 swegener Exp $
 
 IUSE="nls ipv6 perl ssl"
 
@@ -10,14 +10,15 @@ 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-2.2.1
+RDEPEND=">=dev-libs/glib-2.2.1
 	sys-libs/ncurses
-	>=sys-apps/sed-4
 	perl? ( dev-lang/perl )
 	ssl? ( dev-libs/openssl )
 	!net-irc/irssi-cvs
 	socks5? ( >=net-misc/dante-1.1.13 )"
-RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	nls? ( sys-devel/gettext )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-irc/irssi/irssi-0.8.9.ebuild b/net-irc/irssi/irssi-0.8.9.ebuild
index e630d3e9cdc8..3cb076b3bcac 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-2004 Gentoo Foundation
 # 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.12 2004/06/24 23:05:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.9.ebuild,v 1.13 2004/07/07 22:42:52 swegener Exp $
 
 IUSE="nls ipv6 perl ssl socks5"
 
@@ -10,20 +10,15 @@ DESCRIPTION="A modular textUI IRC client with IPv6 support."
 SRC_URI="http://irssi.org/files/${P}.tar.bz2"
 HOMEPAGE="http://irssi.org/"
 
-DEPEND="!net-irc/irssi-cvs
-	>=dev-libs/glib-2.2.1
-	sys-libs/ncurses
-	>=sys-apps/sed-4
-	ssl? ( dev-libs/openssl )
-	perl? ( dev-lang/perl )
-	socks5? ( >=net-misc/dante-1.1.13 )"
-
-RDEPEND="nls? ( sys-devel/gettext )
+RDEPEND="!net-irc/irssi-cvs
 	>=dev-libs/glib-2.2.1
 	sys-libs/ncurses
 	ssl? ( dev-libs/openssl )
 	perl? ( dev-lang/perl )
 	socks5? ( >=net-misc/dante-1.1.13 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-apps/sed-4"
 
 SLOT="0"
 LICENSE="GPL-2"