Version bump; Remove old test version

(Portage version: 2.0.51.22-r2)

6 files changed, 17 insertions, 21 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 62671426178d..bb0eb50d9afd 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2005/08/28 15:04:57 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.17 2005/10/04 21:13:34 mrness Exp $
+
+*dante-1.1.18 (04 Oct 2005)
+
+  04 Oct 2005; Alin Nastac <mrness@gentoo.org>
+  -files/dante-1.1.16-socksify.patch, +files/dante-1.1.18-socksify.patch,
+  -dante-1.1.16.ebuild, +dante-1.1.18.ebuild:
+  Version bump. Remove old test version.
 
   28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> dante-1.1.15-r2.ebuild:
   Stable on amd64.
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 5fc40efed070..5d6d05eeca70 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 633c678a48846de5c6ecb2729f85aedc dante-1.1.15-r2.ebuild 2500
 MD5 df4601e1c535460e73b20e28264bb02e dante-1.1.17.ebuild 2335
 MD5 4d196387e01aa6fa4f0f852781b47a58 dante-1.1.15-r1.ebuild 2320
-MD5 91570be053f5eb379209134d36353dea dante-1.1.16.ebuild 2371
+MD5 01e811b1b99922c1d13cc04124c2218f dante-1.1.18.ebuild 2327
 MD5 66e9abe53282ed8ab156e37ee8e8b918 ChangeLog 9319
 MD5 19688263fcbda666eeb085869012f86a metadata.xml 246
 MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.15_pre1-socksify.patch 811
@@ -13,7 +10,6 @@ MD5 7573426ad7edc9ea4dd95f020205fda4 files/sockd.conf-with-pam.patch 295
 MD5 5e74662c76571e30e6a190a2d4d1193a files/dante-1.1.15-optionalpam.patch 10896
 MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15-r1 64
 MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15-r2 64
-MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.16-socksify.patch 811
 MD5 aa0bc92f8670b91aaf92f1e89b7e06c7 files/sockd.conf 7031
 MD5 cf06ad88e50a36ba1326579ab64366b8 files/socks.conf 4185
 MD5 05b76026b104b3a12fcd5d42aecc3041 files/sockd.conf-with-libwrap.patch 870
@@ -21,12 +17,6 @@ MD5 72d9add89e45e3cb921c99d79bdf31a7 files/dante-1.1.15-bindresvport.patch 485
 MD5 30064015b5702cf8059a1639167e8a3f files/dante-1.1.15-getipnodebyname.patch 789
 MD5 eb2041b3f61750335f8702515cb20b7c files/dante-sockd-conf 463
 MD5 1ff7ae828153ebdd013aa82e5c247b7f files/dante-sockd-init 1722
-MD5 fef7d90f2aa02a4dbd6cbc92e999faca files/digest-dante-1.1.16 64
 MD5 38aeb8f6554e02b57e1624594e62cfd9 files/digest-dante-1.1.17 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDEdK1ntT9W3vfTuoRAhQsAJ0V/tYBb0UQWpj4fkEwsiLKlO2pRACfSoWg
-DZ5Q5L3PYDyZLKgQY8/Ck/4=
-=L08B
------END PGP SIGNATURE-----
+MD5 d4207d41125a3aa07fab48cc977a786c files/digest-dante-1.1.18 64
+MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.18-socksify.patch 811
diff --git a/net-proxy/dante/dante-1.1.16.ebuild b/net-proxy/dante/dante-1.1.18.ebuild
index 1b30c969ad87..314c2bad91e1 100644
--- a/net-proxy/dante/dante-1.1.16.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.16.ebuild,v 1.5 2005/07/23 08:23:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.18.ebuild,v 1.1 2005/10/04 21:13:34 mrness Exp $
 
 inherit fixheadtails eutils
 
@@ -26,10 +26,10 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-socksify.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-socksify.patch
 
-	ht_fix_file configure configure.ac
+	ht_fix_file configure
 	sed -i \
 		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
 		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
@@ -37,7 +37,6 @@ src_unpack() {
 }
 
 src_compile() {
-	libtoolize --copy --force
 	econf \
 		`use_enable debug` \
 		`use_enable tcpd libwrap` \
@@ -73,7 +72,7 @@ src_install() {
 	newins ${FILESDIR}/dante-sockd-conf dante-sockd
 
 	# install documentation
-	dodoc BUGS CREDITS NEWS README SUPPORT TODO VERSION
+	dodoc BUGS CREDITS NEWS README SUPPORT TODO
 	docinto txt
 	cd doc
 	dodoc README* *.txt SOCKS4.*
diff --git a/net-proxy/dante/files/dante-1.1.16-socksify.patch b/net-proxy/dante/files/dante-1.1.18-socksify.patch
index 632deb1f9b58..632deb1f9b58 100644
--- a/net-proxy/dante/files/dante-1.1.16-socksify.patch
+++ b/net-proxy/dante/files/dante-1.1.18-socksify.patch
diff --git a/net-proxy/dante/files/digest-dante-1.1.16 b/net-proxy/dante/files/digest-dante-1.1.16
deleted file mode 100644
index faf1dc80869f..000000000000
--- a/net-proxy/dante/files/digest-dante-1.1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7493ac842bb83c5a307ec4ef33b938b dante-1.1.16.tar.gz 845001
diff --git a/net-proxy/dante/files/digest-dante-1.1.18 b/net-proxy/dante/files/digest-dante-1.1.18
new file mode 100644
index 000000000000..e5c4eafef405
--- /dev/null
+++ b/net-proxy/dante/files/digest-dante-1.1.18
@@ -0,0 +1 @@
+MD5 b6f5e1a00c7311f99632ed300ce26f5f dante-1.1.18.tar.gz 847433