remove old test version; x86

(Portage version: 2.0.51.22-r3)

5 files changed, 8 insertions, 104 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 40db928b56ea..b435331d9f5d 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.18 2005/11/15 22:19:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.19 2005/11/16 05:59:10 mrness Exp $
+
+  16 Nov 2005; Alin Nastac <mrness@gentoo.org>
+  -files/dante-1.1.17-socksify.patch, -dante-1.1.17.ebuild,
+  dante-1.1.18.ebuild:
+  Remove old test version. Mark stable on x86.
 
   15 Nov 2005; Alin Nastac <mrness@gentoo.org> dante-1.1.17.ebuild,
   dante-1.1.18.ebuild:
diff --git a/net-proxy/dante/dante-1.1.17.ebuild b/net-proxy/dante/dante-1.1.17.ebuild
deleted file mode 100644
index 7ebecbab6cda..000000000000
--- a/net-proxy/dante/dante-1.1.17.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.17.ebuild,v 1.6 2005/11/15 22:19:50 mrness Exp $
-
-inherit fixheadtails eutils
-
-DESCRIPTION="A free socks4,5 and msproxy implementation"
-HOMEPAGE="http://www.inet.no/dante/"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="tcpd debug selinux pam"
-
-RDEPEND="virtual/libc
-	pam? ( sys-libs/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	selinux? ( sec-policy/selinux-dante )
-	userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-socksify.patch
-
-	ht_fix_file configure
-	sed -i \
-		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
-		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
-		doc/{faq.ps,faq.tex,sockd.8,sockd.conf.5,socks.conf.5}
-}
-
-src_compile() {
-	econf \
-		`use_enable debug` \
-		`use_enable tcpd libwrap` \
-		`use_with pam` \
-		--with-socks-conf=/etc/socks/socks.conf \
-		--with-sockd-conf=/etc/socks/sockd.conf \
-		|| die "bad ./configure"
-	# the comments in the source say this is only useful for 2.0 kernels ...
-	# well it may fix 2.0 but it breaks with 2.6 :)
-	[ "${KV:0:3}" == "2.6" ] && sed -i 's:if HAVE_LINUX_ECCENTRICITIES:if 0:' include/common.h
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# bor: comment libdl.so out it seems to work just fine without it
-	sed -i -e 's:libdl\.so::' ${D}/usr/bin/socksify || die 'sed failed'
-
-	# default configuration files
-	insinto /etc/socks
-	doins ${FILESDIR}/sock?.conf
-	cd ${D}/etc/socks && {
-		use pam && epatch ${FILESDIR}/sockd.conf-with-pam.patch
-		use tcpd && epatch ${FILESDIR}/sockd.conf-with-libwrap.patch
-	}
-	cd ${S}
-
-	# our init script
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dante-sockd-init dante-sockd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/dante-sockd-conf dante-sockd
-
-	# install documentation
-	dodoc BUGS CREDITS NEWS README SUPPORT TODO VERSION
-	docinto txt
-	cd doc
-	dodoc README* *.txt SOCKS4.*
-	docinto example
-	cd ../example
-	dodoc *.conf
-}
-
-pkg_postinst() {
-	enewuser sockd -1 -1 /etc/socks daemon
-}
diff --git a/net-proxy/dante/dante-1.1.18.ebuild b/net-proxy/dante/dante-1.1.18.ebuild
index 7d8cbc0c8f9f..12dbc9d57138 100644
--- a/net-proxy/dante/dante-1.1.18.ebuild
+++ b/net-proxy/dante/dante-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.18.ebuild,v 1.2 2005/11/15 22:19:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.18.ebuild,v 1.3 2005/11/16 05:59:10 mrness Exp $
 
 inherit fixheadtails eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="tcpd debug selinux pam"
 
 RDEPEND="virtual/libc
diff --git a/net-proxy/dante/files/dante-1.1.17-socksify.patch b/net-proxy/dante/files/dante-1.1.17-socksify.patch
deleted file mode 100644
index 632deb1f9b58..000000000000
--- a/net-proxy/dante/files/dante-1.1.17-socksify.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dante-1.1.15-pre1/bin/socksify.in.agriffis	2004-11-04 16:07:04.000000000 -0500
-+++ dante-1.1.15-pre1/bin/socksify.in	2004-11-04 16:07:08.977460049 -0500
-@@ -60,7 +60,11 @@
- @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}"
- export @PRELOAD_VARIABLE@
- 
--LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
--export LD_LIBRARY_PATH
-+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where
-+# LD_PRELOAD can contain a full path to the library.  Setting the
-+# following breaks socksify on Linux/Alpha at least with
-+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis)
-+#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
-+#export LD_LIBRARY_PATH
- 
- exec "$@"
diff --git a/net-proxy/dante/files/digest-dante-1.1.17 b/net-proxy/dante/files/digest-dante-1.1.17
deleted file mode 100644
index 3f164a039ddb..000000000000
--- a/net-proxy/dante/files/digest-dante-1.1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da9b9fcf8a5c9fb6e8e18a4c6a31cbbc dante-1.1.17.tar.gz 845155