10 files changed, 8 insertions, 837 deletions
diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index 8416467ca130..0c430e4e00bd 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/lsof
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.95 2013/04/27 10:11:51 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.96 2014/01/07 10:30:54 polynomial-c Exp $
+
+  07 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> -lsof-4.82.ebuild,
+  -lsof-4.83.ebuild, -lsof-4.84.ebuild, -lsof-4.84-r1.ebuild,
+  -lsof-4.85.ebuild, -lsof-4.85-r1.ebuild, -lsof-4.86.ebuild,
+  -lsof-4.87.ebuild, -files/lsof-4.84-rpc.patch:
+  Removed old versions and files.
 
 *lsof-4.87-r1 (27 Apr 2013)
 
diff --git a/sys-process/lsof/files/lsof-4.84-rpc.patch b/sys-process/lsof/files/lsof-4.84-rpc.patch
deleted file mode 100644
index 3dd3ce2005cf..000000000000
--- a/sys-process/lsof/files/lsof-4.84-rpc.patch
+++ /dev/null
@@ -1,282 +0,0 @@
---- lsof_4.84_src/Configure
-+++ lsof_4.84_src/Configure
-@@ -2740,6 +2740,13 @@
-       LSOF_CFGF="$LSOF_CFGF -DHASIPv6"
-     fi	# }
- 
-+    # Test for rpc/rpc.h
-+
-+    if ! test -r ${LSOF_INCLUDE}/rpc/rpc.h	# {
-+    then
-+      LSOF_CFGF="$LSOF_CFGF -DHASNOTRPC"
-+    fi	# }
-+
-     # Test for SELinux support.
- 
-     LSOF_TMP1=0
---- lsof_4.84_src/dialects/linux/dlsof.h
-+++ lsof_4.84_src/dialects/linux/dlsof.h
-@@ -56,8 +56,10 @@
- #include <linux/tcp.h>
- # endif	/* defined(GLIBCV) || defined(__UCLIBC__) */
- 
-+# if	!defined(HASNOTRPC)
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
-+# endif	/* !defined(HASNOTRPC) */
-  
- #if	defined(HASSELINUX)
- #include <selinux/selinux.h>
---- lsof_4.84_src/lsof.h
-+++ lsof_4.84_src/lsof.h
-@@ -609,7 +609,9 @@
- extern int Foffset;
- extern int Fovhd;
- extern int Fport;
-+#if	!defined(HASNOTRPC)
- extern int FportMap;
-+#endif	/* !defined(HASNOTRPC) */
- extern int Fpgid;
- extern int Fppid;
- extern int Fsize;
---- lsof_4.84_src/main.c
-+++ lsof_4.84_src/main.c
-@@ -154,7 +154,7 @@
-  * Create option mask.
-  */
- 	(void) snpf(options, sizeof(options),
--	    "?a%sbc:D:d:%sf:F:g:hi:%s%slL:%sMnNo:Op:Pr:%ss:S:tT:u:UvVwx:%s%s%s",
-+	    "?a%sbc:D:d:%sf:F:g:hi:%s%slL:%s%snNo:Op:Pr:%ss:S:tT:u:UvVwx:%s%s%s",
- 
- #if	defined(HAS_AFS) && defined(HASAOPT)
- 	    "A:",
-@@ -186,6 +186,12 @@
- 	    "",
- #endif	/* defined(HASMOPT) || defined(HASMNTSUP) */
- 
-+#if	!defined(HASNOTRPC)
-+	    "M",
-+#else	/* defined(HASNOTRPC) */
-+	    "",
-+#endif	/* defined(HASNOTRPC) */
-+
- #if	defined(HASPPID)
- 	    "R",
- #else	/* !defined(HASPPID) */
-@@ -643,9 +649,11 @@
- 		break;
- #endif	/* defined(HASMOPT) || defined(HASMNTSUP) */
- 
-+#if	!defined(HASNOTRPC)
- 	    case 'M':
- 		FportMap = (GOp == '+') ? 1 : 0;
- 		break;
-+#endif	/* !defined(HASNOTRPC) */
- 	    case 'n':
- 		Fhost = (GOp == '-') ? 0 : 1;
- 		break;
---- lsof_4.84_src/print.c
-+++ lsof_4.84_src/print.c
-@@ -67,8 +67,11 @@
- 	struct porttab *next;
- };
- 
--
-+#if	defined(HASNOTRPC)
-+static struct porttab **Pth[2] = { NULL, NULL };
-+#else	/* !defined(HASNOTRPC) */
- static struct porttab **Pth[4] = { NULL, NULL, NULL, NULL };
-+#endif	/* !defined(HASNOTRPC) */
- 						/* port hash buckets:
- 						 * Pth[0] for TCP service names
- 						 * Pth[1] for UDP service names
-@@ -78,12 +81,14 @@
- #define HASHPORT(p)	(((((int)(p)) * 31415) >> 3) & (PORTHASHBUCKETS - 1))
- 
- 
-+#if	!defined(HASNOTRPC)
- _PROTOTYPE(static void fill_portmap,(void));
-+_PROTOTYPE(static void update_portmap,(struct porttab *pt, char *pn));
-+#endif	/* !defined(HASNOTRPC) */
- _PROTOTYPE(static void fill_porttab,(void));
- _PROTOTYPE(static char *lkup_port,(int p, int pr, int src));
- _PROTOTYPE(static char *lkup_svcnam,(int h, int p, int pr, int ss));
- _PROTOTYPE(static int printinaddr,(void));
--_PROTOTYPE(static void update_portmap,(struct porttab *pt, char *pn));
- 
- 
- /*
-@@ -104,6 +109,7 @@
- }
- 
- 
-+#if	!defined(HASNOTRPC)
- /*
-  * fill_portmap() -- fill the RPC portmap program name table via a conversation
-  *		     with the portmapper
-@@ -267,6 +273,7 @@
- 	}
- 	clnt_destroy(c);
- }
-+#endif	/* !defined(HASNOTRPC) */
- 
- 
- /*
-@@ -468,8 +475,12 @@
-  * If the hash buckets haven't been allocated, do so.
-  */
- 	if (!Pth[0]) {
-+#if	defined(HASNOTRPC)
-+	    for (h = 0; h < 2; h++) {
-+#else	/* !defined(HASNOTRPC) */
- 	    nh = FportMap ? 4 : 2;
- 	    for (h = 0; h < nh; h++) {
-+#endif	/* !defined(HASNOTRPC) */
- 		if (!(Pth[h] = (struct porttab **)calloc(PORTHASHBUCKETS,
- 				sizeof(struct porttab *))))
- 		{
-@@ -483,6 +494,7 @@
- 		}
- 	    }
- 	}
-+#if	!defined(HASNOTRPC)
- /*
-  * If we're looking up program names for portmapped ports, make sure the
-  * portmap table has been loaded.
-@@ -491,11 +503,13 @@
- 	    (void) fill_portmap();
- 	    pm++;
- 	}
-+#endif	/* !defined(HASNOTRPC) */
- /*
-  * Hash the port and see if its name has been cached.  Look for a local
-  * port first in the portmap, if portmap searching is enabled.
-  */
- 	h = HASHPORT(p);
-+#if	!defined(HASNOTRPC)
- 	if (!src && FportMap) {
- 	    for (pt = Pth[pr+2][h]; pt; pt = pt->next) {
- 		if (pt->port != p)
-@@ -511,6 +525,7 @@
- 		return(pt->name);
- 	    }
- 	}
-+#endif	/* !defined(HASNOTRPC) */
- 	for (pt = Pth[pr][h]; pt; pt = pt->next) {
- 	    if (pt->port == p)
- 		return(pt->name);
-@@ -1154,7 +1169,11 @@
- 	 * Process the port number.
- 	 */
- 	    if (Lf->li[i].p > 0) {
--		if (Fport || FportMap) {
-+		if (Fport
-+#if	!defined(HASNOTRPC)
-+		||  FportMap
-+#endif	/* !defined(HASNOTRPC) */
-+		) {
- 
- 		/*
- 		 * If converting port numbers to service names, or looking
-@@ -1167,9 +1186,10 @@
- 		 * loopback address 127.0.0.1.  (Test 2 may not always work
- 		 * -- e.g., on hosts with multiple interfaces.)
- 		 */
-+#if	!defined(HASNOTRPC)
- 		    if ((src = i) && FportMap) {
- 
--#if	defined(HASIPv6)
-+# if	defined(HASIPv6)
- 			if (Lf->li[0].af == AF_INET6) {
- 			    if (IN6_IS_ADDR_LOOPBACK(&Lf->li[i].ia.a6)
- 			    ||  IN6_ARE_ADDR_EQUAL(&Lf->li[0].ia.a6,
-@@ -1177,7 +1197,7 @@
- 			    )
- 				src = 0;
- 			} else
--#endif	/* defined(HASIPv6) */
-+# endif	/* defined(HASIPv6) */
- 
- 			if (Lf->li[0].af == AF_INET) {
- 			    if (Lf->li[i].ia.a4.s_addr == htonl(INADDR_LOOPBACK)
-@@ -1186,6 +1206,7 @@
- 				src = 0;
- 			}
- 		    }
-+#endif	/* !defined(HASNOTRPC) */
- 		    if (strcasecmp(Lf->iproto, "TCP") == 0)
- 			port = lkup_port(Lf->li[i].p, 0, src);
- 		    else if (strcasecmp(Lf->iproto, "UDP") == 0)
-@@ -2748,6 +2769,7 @@
- }
- 
- 
-+#if !defined(HASNOTRPC)
- /*
-  * update_portmap() - update a portmap entry with its port number or service
-  *		      name
-@@ -2780,3 +2802,4 @@
- 	pt->nl = nl;
- 	pt->ss = 1;
- }
-+#endif /* !defined(HASNOTRPC) */
---- lsof_4.84_src/store.c
-+++ lsof_4.84_src/store.c
-@@ -156,11 +156,13 @@
- int Fovhd = 0;			/* -O option status */
- int Fport = 1;			/* -P option status */
- 
--#if	defined(HASPMAPENABLED)
-+#if	!defined(HASNOTRPC)
-+# if	defined(HASPMAPENABLED)
- int FportMap = 1;		/* +|-M option status */
--#else	/* !defined(HASPMAPENABLED) */
-+# else	/* !defined(HASPMAPENABLED) */
- int FportMap = 0;		/* +|-M option status */
--#endif	/* defined(HASPMAPENABLED) */
-+# endif	/* defined(HASPMAPENABLED) */
-+#endif	/* !defined(HASNOTRPC) */
- 
- int Fpgid = 0;			/* -g option status */
- int Fppid = 0;			/* -R option status */
---- lsof_4.84_src/usage.c
-+++ lsof_4.84_src/usage.c
-@@ -453,8 +453,12 @@
- 		);
- #endif	/* defined(HASMOPT) || defined(HASMNTSUP) */
- 
-+#if	!defined(HASNOTRPC)
-+	    (void) fprintf(stderr, " [+|-M]");
-+#endif	/* !defined(HASNOTRPC) */
-+
- 	    (void) fprintf(stderr,
--		" [+|-M] [-o [o]] [-p s]\n[+|-r [t]]%s [-S [t]] [-T [t]]",
-+		" [-o [o]] [-p s]\n[+|-r [t]]%s [-S [t]] [-T [t]]",
- 
- #if	defined(HASTCPUDPSTATE)
- 		" [-s [p:s]]"
-@@ -690,16 +694,19 @@
- # endif	/* defined(HASMNTSUP) */
- #endif	/* defined(HASMOPT) || defined(HASMNTSUP) */
- 
-+#if	!defined(HASNOTRPC)
- 	    (void) snpf(buf, sizeof(buf), "+|-M   portMap registration (%s)",
--
--#if	defined(HASPMAPENABLED)
-+# if	defined(HASPMAPENABLED)
- 		"+"
--#else	/* !defined(HASPMAPENABLED) */
-+# else	/* !defined(HASPMAPENABLED) */
- 		"-"
--#endif	/* defined(HASPMAPENABLED) */
--
-+# endif	/* defined(HASPMAPENABLED) */
- 	    );
-+#else	/* defined(HASNOTRPC) */
-+	    buf[0] = '\0';
-+#endif	/* defined(HASNOTRPC) */
- 	    (void) fprintf(stderr, "  %-36.36s", buf);
-+
- 	    (void) snpf(buf, sizeof(buf), "-o o   o 0t offset digits (%d)",
- 		OFFDECDIG);
- 	    (void) fprintf(stderr, "  %s\n", buf);
diff --git a/sys-process/lsof/lsof-4.82.ebuild b/sys-process/lsof/lsof-4.82.ebuild
deleted file mode 100644
index 60fed97bf2ad..000000000000
--- a/sys-process/lsof/lsof-4.82.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.82.ebuild,v 1.9 2010/02/01 17:58:35 hwoarang Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="static selinux"
-
-DEPEND="selinux? ( sys-libs/libselinux )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-	cd "${S}"
-
-	sed -i \
-		-e '/LSOF_CFGF="-/s:=":="$LSOF_CFGF :' \
-		-e '/^LSOF_CFGF=/s:$:" ${CFLAGS} ${CPPFLAGS}":' \
-		-e "/^LSOF_CFGL=/s:\$:' \$(LDFLAGS)':" \
-		-e "/^LSOF_RANLIB/s:ranlib:$(tc-getRANLIB):" \
-		Configure
-}
-
-yesno() { use $1 && echo y || echo n ; }
-target() { use kernel_FreeBSD && echo freebsd || echo linux ; }
-
-src_compile() {
-	use static && append-ldflags -static
-
-	touch .neverInv
-	LINUX_HASSELINUX=$(yesno selinux) \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	./Configure -n $(target) || die
-
-	emake DEBUG="" all || die "emake failed"
-}
-
-src_install() {
-	dobin lsof || die "dosbin"
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/*
-
-	doman lsof.8
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.83.ebuild b/sys-process/lsof/lsof-4.83.ebuild
deleted file mode 100644
index e1669b06799b..000000000000
--- a/sys-process/lsof/lsof-4.83.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.83.ebuild,v 1.6 2010/08/29 18:12:39 armin76 Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="static selinux"
-
-DEPEND="selinux? ( sys-libs/libselinux )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-yesno() { use $1 && echo y || echo n ; }
-target() { use kernel_FreeBSD && echo freebsd || echo linux ; }
-
-src_compile() {
-	use static && append-ldflags -static
-
-	touch .neverInv
-	LINUX_HASSELINUX=$(yesno selinux) \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	LSOF_CFGL="${CFLAGS} ${LDFLAGS}" \
-	./Configure -n $(target) || die
-
-	emake DEBUG="" all || die "emake failed"
-}
-
-src_install() {
-	dobin lsof || die "dosbin"
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/*
-
-	doman lsof.8
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.84-r1.ebuild b/sys-process/lsof/lsof-4.84-r1.ebuild
deleted file mode 100644
index bb2abc241deb..000000000000
--- a/sys-process/lsof/lsof-4.84-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.84-r1.ebuild,v 1.3 2012/05/24 05:43:53 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.84-rpc.patch #370833
-	# convert `test -r header.h` into a compile test
-	sed -i -r \
-		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() { usex kernel_FreeBSD freebsd linux ; }
-src_configure() {
-	use static && append-ldflags -static
-
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all || die
-}
-
-src_install() {
-	dobin lsof || die
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/* || die
-
-	doman lsof.8 || die
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.84.ebuild b/sys-process/lsof/lsof-4.84.ebuild
deleted file mode 100644
index e8e3f42e7c73..000000000000
--- a/sys-process/lsof/lsof-4.84.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.84.ebuild,v 1.2 2010/08/11 17:59:33 josejx Exp $
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static selinux"
-
-DEPEND="selinux? ( sys-libs/libselinux )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-yesno() { use $1 && echo y || echo n ; }
-target() { use kernel_FreeBSD && echo freebsd || echo linux ; }
-
-src_compile() {
-	use static && append-ldflags -static
-
-	touch .neverInv
-	LINUX_HASSELINUX=$(yesno selinux) \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	LSOF_CFGL="${CFLAGS} ${LDFLAGS}" \
-	./Configure -n $(target) || die
-
-	emake DEBUG="" all || die "emake failed"
-}
-
-src_install() {
-	dobin lsof || die "dosbin"
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/*
-
-	doman lsof.8
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.85-r1.ebuild b/sys-process/lsof/lsof-4.85-r1.ebuild
deleted file mode 100644
index 7eb904531efe..000000000000
--- a/sys-process/lsof/lsof-4.85-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85-r1.ebuild,v 1.2 2012/04/23 16:06:18 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-arg.c.patch #388555
-	# convert `test -r header.h` into a compile test
-	sed -i -r \
-		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() { usex kernel_FreeBSD freebsd linux ; }
-src_configure() {
-	use static && append-ldflags -static
-
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all || die
-}
-
-src_install() {
-	dobin lsof || die
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/* || die
-
-	doman lsof.8 || die
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.85.ebuild b/sys-process/lsof/lsof-4.85.ebuild
deleted file mode 100644
index 6866a0314e1f..000000000000
--- a/sys-process/lsof/lsof-4.85.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85.ebuild,v 1.2 2012/04/23 16:06:18 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	# convert `test -r header.h` into a compile test
-	sed -i -r \
-		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() { usex kernel_FreeBSD freebsd linux ; }
-src_configure() {
-	use static && append-ldflags -static
-
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all || die
-}
-
-src_install() {
-	dobin lsof || die
-
-	insinto /usr/share/lsof/scripts
-	doins scripts/* || die
-
-	doman lsof.8 || die
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.86.ebuild b/sys-process/lsof/lsof-4.86.ebuild
deleted file mode 100644
index d7e458613e4f..000000000000
--- a/sys-process/lsof/lsof-4.86.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.86.ebuild,v 1.1 2012/09/04 20:36:08 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="examples ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
-	# convert `test -r header.h` into a compile test
-	sed -i -r \
-		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() { usex kernel_FreeBSD freebsd linux ; }
-src_configure() {
-	use static && append-ldflags -static
-
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all || die
-}
-
-src_install() {
-	dobin lsof || die
-
-	if use examples ; then
-		insinto /usr/share/lsof/scripts
-		doins scripts/* || die
-	fi
-
-	doman lsof.8 || die
-	dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.87.ebuild b/sys-process/lsof/lsof-4.87.ebuild
deleted file mode 100644
index b2628fa654b4..000000000000
--- a/sys-process/lsof/lsof-4.87.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.87.ebuild,v 1.1 2013/01/06 21:31:41 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="examples ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
-	# convert `test -r header.h` into a compile test
-	sed -i -r \
-		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() { usex kernel_FreeBSD freebsd linux ; }
-src_configure() {
-	use static && append-ldflags -static
-
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all || die
-}
-
-src_install() {
-	dobin lsof || die
-
-	if use examples ; then
-		insinto /usr/share/lsof/scripts
-		doins scripts/* || die
-	fi
-
-	doman lsof.8 || die
-	dodoc 00*
-}