Adust the irssi and silc-client blockers.

(Portage version: 2.1.2_pre2-r9)

2 files changed, 15 insertions, 22 deletions

diff --git a/net-irc/irssi-svn/ChangeLog b/net-irc/irssi-svn/ChangeLog
index 6a18c2f73cd6..0bb74e0df4c3 100644
--- a/net-irc/irssi-svn/ChangeLog
+++ b/net-irc/irssi-svn/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-irc/irssi-svn
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/ChangeLog,v 1.17 2006/09/15 21:15:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/ChangeLog,v 1.18 2006/10/13 12:05:12 swegener Exp $
+
+  13 Oct 2006; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
+  Adust the irssi and silc-client blockers.
 
   15 Sep 2006; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
-  Remove treiling slash from ESVN_REPO_URI, thanks to Emanuele Giaquinta.
+  Remove trailing slash from ESVN_REPO_URI, thanks to Emanuele Giaquinta.
 
   01 Aug 2006; Sven Wegener <swegener@gentoo.org> irssi-svn-0.3.ebuild:
   Port changes from the regular irssi package to irssi-svn.
diff --git a/net-irc/irssi-svn/irssi-svn-0.3.ebuild b/net-irc/irssi-svn/irssi-svn-0.3.ebuild
index 03bd783c2b7b..7b585276ee4e 100644
--- a/net-irc/irssi-svn/irssi-svn-0.3.ebuild
+++ b/net-irc/irssi-svn/irssi-svn-0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/irssi-svn-0.3.ebuild,v 1.18 2006/09/15 21:15:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-svn/irssi-svn-0.3.ebuild,v 1.19 2006/10/13 12:05:12 swegener Exp $
 
-inherit subversion perl-app flag-o-matic
+inherit subversion perl-module flag-o-matic
 
 ESVN_REPO_URI="http://svn.irssi.org/repos/irssi/trunk"
 ESVN_PROJECT="irssi"
@@ -15,17 +15,19 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE="ipv6 perl ssl socks5"
 
-RDEPEND="!net-irc/irssi
+RDEPEND="sys-libs/ncurses
 	>=dev-libs/glib-2.2.1
-	sys-libs/ncurses
 	ssl? ( dev-libs/openssl )
 	perl? ( dev-lang/perl )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
+	>=sys-devel/autoconf-2.58
 	dev-lang/perl
-	www-client/lynx
-	>=sys-devel/autoconf-2.58"
+	www-client/lynx"
+RDEPEND="${RDEPEND}
+	perl? ( !net-im/silc-client )
+	!net-irc/irssi"
 
 src_unpack() {
 	subversion_src_unpack
@@ -41,33 +43,21 @@ src_compile() {
 		--with-proxy \
 		--with-ncurses \
 		--with-perl-lib=vendor \
-		$(use_enable ssl) \
 		$(use_with perl) \
-		$(use_enable ipv6) \
 		$(use_with socks5 socks) \
+		$(use_enable ssl) \
+		$(use_enable ipv6) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	if use perl
-	then
-		for dir in "${S}"/src/perl/{common,irc,textui,ui}
-		do
-			cd "${dir}"
-			perl-app_src_prep
-		done
-		cd "${S}"
-	fi
-
 	make \
 		DESTDIR="${D}" \
 		docdir=/usr/share/doc/${PF} \
-		gnulocaledir="${D}"/usr/share/locale \
 		install || die "make install failed"
 
 	use perl && fixlocalpod
 
 	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
-	dohtml -r "${S}"/docs/. || die "dohtml failed"
 }