Unmask and cleanup.

7 files changed, 7 insertions, 95 deletions

diff --git a/net-misc/autossh/ChangeLog b/net-misc/autossh/ChangeLog
index e949042d9ba0..af0ade8f15d6 100644
--- a/net-misc/autossh/ChangeLog
+++ b/net-misc/autossh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/autossh
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/ChangeLog,v 1.11 2004/07/01 20:42:56 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/ChangeLog,v 1.12 2004/07/19 13:47:00 aliz Exp $
+
+  19 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> autossh-1.2c.ebuild,
+  autossh-1.2d.ebuild, autossh-1.2f.ebuild, files/autossh-1.2d-reuse.patch:
+  Unmask and cleanup.
 
   01 Jul 2004; Jon Hood <squinky86@gentoo.org> autossh-1.2c.ebuild,
   autossh-1.2d.ebuild, autossh-1.2e.ebuild, autossh-1.2f.ebuild:
diff --git a/net-misc/autossh/autossh-1.2c.ebuild b/net-misc/autossh/autossh-1.2c.ebuild
deleted file mode 100644
index b55931dc3879..000000000000
--- a/net-misc/autossh/autossh-1.2c.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2c.ebuild,v 1.7 2004/07/15 02:39:08 agriffis Exp $
-
-IUSE=""
-DESCRIPTION="Automatically restart SSH sessions and tunnels"
-HOMEPAGE="http://www.harding.motd.ca/autossh/"
-LICENSE="BSD"
-KEYWORDS="x86"
-SRC_URI="http://www.harding.motd.ca/autossh/${P}.tgz"
-SLOT="0"
-
-DEPEND="virtual/libc
-	sys-apps/sed"
-RDEPEND="virtual/libc
-	net-misc/openssh"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	mv Makefile.linux Makefile.linux.orig
-	sed "s/CFLAGS=/CFLAGS=${CFLAGS}/g" Makefile.linux.orig >Makefile.linux
-}
-
-src_compile() {
-	emake -f Makefile.linux || die "make failed"
-}
-
-src_install() {
-	dobin autossh
-	dodoc CHANGES README autossh.host rscreen
-	doman autossh.1
-}
diff --git a/net-misc/autossh/autossh-1.2d.ebuild b/net-misc/autossh/autossh-1.2d.ebuild
deleted file mode 100644
index fb37301aa913..000000000000
--- a/net-misc/autossh/autossh-1.2d.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2d.ebuild,v 1.9 2004/07/15 02:39:08 agriffis Exp $
-
-DESCRIPTION="Automatically restart SSH sessions and tunnels"
-HOMEPAGE="http://www.harding.motd.ca/autossh/"
-LICENSE="BSD"
-KEYWORDS="x86 ~sparc"
-SRC_URI="http://www.harding.motd.ca/autossh/${P}.tgz"
-SLOT="0"
-IUSE=""
-DEPEND="virtual/libc
-	sys-apps/sed"
-RDEPEND="virtual/libc
-	net-misc/openssh"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	patch -p0 -l < ${FILESDIR}/${P}-reuse.patch
-	mv Makefile.linux Makefile.linux.orig
-	sed "s/CFLAGS=/CFLAGS=${CFLAGS}/g" Makefile.linux.orig >Makefile.linux
-}
-
-src_compile() {
-	emake -f Makefile.linux || die "make failed"
-}
-
-src_install() {
-	dobin autossh
-	dodoc CHANGES README autossh.host rscreen
-	doman autossh.1
-}
diff --git a/net-misc/autossh/autossh-1.2f.ebuild b/net-misc/autossh/autossh-1.2f.ebuild
index b1f15660e804..eee2d90f8328 100644
--- a/net-misc/autossh/autossh-1.2f.ebuild
+++ b/net-misc/autossh/autossh-1.2f.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2f.ebuild,v 1.6 2004/07/15 02:39:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.2f.ebuild,v 1.7 2004/07/19 13:47:01 aliz Exp $
 
 DESCRIPTION="Automatically restart SSH sessions and tunnels"
 HOMEPAGE="http://www.harding.motd.ca/autossh/"
 LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~alpha ~ia64 amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~alpha ~ia64 amd64 ~ppc"
 SRC_URI="http://www.harding.motd.ca/autossh/${P}.tgz"
 SLOT="0"
 IUSE=""
diff --git a/net-misc/autossh/files/autossh-1.2d-reuse.patch b/net-misc/autossh/files/autossh-1.2d-reuse.patch
deleted file mode 100644
index 202a788fece4..000000000000
--- a/net-misc/autossh/files/autossh-1.2d-reuse.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u autossh.c autossh.c-jedi 
---- autossh.c  2003-02-14 00:47:46.000000000 +0100 
-+++ autossh.c-jedi     2003-03-01 14:42:03.000000000 +0100 
-@@ -955,6 +955,7 @@ 
- { 
-       int sock; 
-       struct addrinfo *res; 
-+      int on = 1; 
- 
-       /* 
-        * Unlike conn_remote, we don't need to cache the 
-@@ -967,6 +968,10 @@ 
-           res->ai_protocol)) == -1) 
-               xerrlog(LOG_ERR, "socket: %s", strerror(errno)); 
- 
-+      if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, 
-+                       (char *) &on, sizeof on) != 0) { 
-+              xerrlog(LOG_ERR, "socket: %s", strerror(errno)); 
-+       } 
-       if (bind(sock, (struct sockaddr *)res->ai_addr, 
-           res->ai_addrlen) == -1) 
-               xerrlog(LOG_ERR, "bind: %s", strerror(errno)); 
diff --git a/net-misc/autossh/files/digest-autossh-1.2c b/net-misc/autossh/files/digest-autossh-1.2c
deleted file mode 100644
index ee5dbe61ca56..000000000000
--- a/net-misc/autossh/files/digest-autossh-1.2c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9cd82217fdb2cff2ef61e93f6e4bada0 autossh-1.2c.tgz 15465
diff --git a/net-misc/autossh/files/digest-autossh-1.2d b/net-misc/autossh/files/digest-autossh-1.2d
deleted file mode 100644
index 6dc0026bee9d..000000000000
--- a/net-misc/autossh/files/digest-autossh-1.2d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e73d325a8286ac3d8eddf63f2043d0d autossh-1.2d.tgz 15548