socks fix #11314

5 files changed, 10 insertions, 134 deletions

diff --git a/net-im/silc-client/files/digest-silc-client-0.9.4 b/net-im/silc-client/files/digest-silc-client-0.9.4
deleted file mode 100644
index 34d8900966c9..000000000000
--- a/net-im/silc-client/files/digest-silc-client-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55edd3c53479effc257cf00c07df12d2 silc-client-0.9.4.tar.bz2 1394004
diff --git a/net-im/silc-client/files/digest-silc-client-0.9.5.1 b/net-im/silc-client/files/digest-silc-client-0.9.5.1
deleted file mode 100644
index f31a14ed60f6..000000000000
--- a/net-im/silc-client/files/digest-silc-client-0.9.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d12658655f9eb681fe769b0e2bd0d89 silc-client-0.9.5.1.tar.bz2 1401244
diff --git a/net-im/silc-client/silc-client-0.9.11.ebuild b/net-im/silc-client/silc-client-0.9.11.ebuild
index 490dc4a996fa..f1aab45c4c05 100644
--- a/net-im/silc-client/silc-client-0.9.11.ebuild
+++ b/net-im/silc-client/silc-client-0.9.11.ebuild
@@ -1,42 +1,35 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.11.ebuild,v 1.3 2003/02/13 14:12:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.11.ebuild,v 1.4 2003/03/04 07:21:18 vapier Exp $
 
-IUSE="socks5 ipv6 perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="silc-client is an IRSSI-based text client for Secure Internet Live Conferencing."
+DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org"
+HOMEPAGE="http://silcnet.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
+IUSE="ipv6 perl"
 
 DEPEND="=dev-libs/glib-1.2*
 	perl? ( sys-devel/perl )
 	sys-libs/ncurses"
 
 src_compile() {
-
-	myconf="--with-ncurses"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	use socks5 && myconf="${myconf} --with-socks5"
-
 	econf \
-	    --mandir=${D}/usr/share/man \
+		--mandir=${D}/usr/share/man \
 		--with-helpdir=/usr/share/silc/help \
 		--with-docdir=/usr/share/doc/${P} \
 		--with-simdir=/usr/lib/silc/modules \
 		--with-logsdir=/var/log/silc \
-		${myconf} || die "./configure failed"
+		--with-ncurses \
+		`use_with ipv6` \
+		|| die "./configure failed"
 
 	make || die "make failed"
 }
 
-src_install () {
+src_install() {
 	myflags=""
 	if [ "`use perl`" ]
 	then
@@ -52,4 +45,3 @@ src_install () {
 	make DESTDIR=${D} ${myflags} install || die "make install failed"
 	rmdir ${D}/usr/include
 }
-
diff --git a/net-im/silc-client/silc-client-0.9.4.ebuild b/net-im/silc-client/silc-client-0.9.4.ebuild
deleted file mode 100644
index e8757b3ec1fb..000000000000
--- a/net-im/silc-client/silc-client-0.9.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.4.ebuild,v 1.7 2003/02/13 14:12:47 vapier Exp $
-
-IUSE="socks5 ipv6 perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IRSSI-based text client for Secure Internet Live Conferencing."
-SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND="=dev-libs/glib-1.2*
-	perl? ( sys-devel/perl )
-	sys-libs/ncurses"
-
-src_compile() {
-
-	myconf="--with-ncurses"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	use socks5 && myconf="${myconf} --with-socks5"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/silc/help \
-		--with-docdir=/usr/share/doc/${P} \
-		--with-simdir=/usr/lib/silc/modules \
-		--with-logsdir=/var/log/silc \
-		${myconf} || die "./configure failed"
-
-	make || die "make failed"
-}
-
-src_install () {
-	myflags=""
-	if [ "`use perl`" ]
-	then
-		R1="s/installsitearch='//"
-		R2="s/';//"
-		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
-		myflags="${myflags} INSTALLPRIVLIB=${D}/usr"
-		myflags="${myflags} INSTALLARCHLIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITELIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITEARCH=${D}/${perl_sitearch}"
-	fi
-
-	make DESTDIR=${D} ${myflags} install || die "make install failed"
-	rmdir ${D}/usr/include
-}
-
diff --git a/net-im/silc-client/silc-client-0.9.5.1.ebuild b/net-im/silc-client/silc-client-0.9.5.1.ebuild
deleted file mode 100644
index 3ce09dcb6076..000000000000
--- a/net-im/silc-client/silc-client-0.9.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.5.1.ebuild,v 1.6 2003/02/13 14:12:53 vapier Exp $
-
-IUSE="socks5 ipv6 perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An IRSSI-based text client for Secure Internet Live Conferencing."
-SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
-HOMEPAGE="http://silcnet.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND="=dev-libs/glib-1.2*
-	perl? ( sys-devel/perl )
-	sys-libs/ncurses"
-
-src_compile() {
-
-	myconf="--with-ncurses"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	use socks5 && myconf="${myconf} --with-socks5"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/silc/help \
-		--with-docdir=/usr/share/doc/${P} \
-		--with-simdir=/usr/lib/silc/modules \
-		--with-logsdir=/var/log/silc \
-		${myconf} || die "./configure failed"
-
-	make || die "make failed"
-}
-
-src_install () {
-	myflags=""
-	if [ "`use perl`" ]
-	then
-		R1="s/installsitearch='//"
-		R2="s/';//"
-		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
-		myflags="${myflags} INSTALLPRIVLIB=${D}/usr"
-		myflags="${myflags} INSTALLARCHLIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITELIB=${D}/${perl_sitearch}"
-		myflags="${myflags} INSTALLSITEARCH=${D}/${perl_sitearch}"
-	fi
-
-	make DESTDIR=${D} ${myflags} install || die "make install failed"
-	rmdir ${D}/usr/include
-}
-