Semi auto-sync

(manually editted for 9m 53s) -- sys-process/lsof (2012-05-17 12:38:27.080064000 +0200)

(Portage version: 2.2.01.20430-prefix/svn/SunOS i386, signed Manifest commit with key C5C74E89)

7 files changed, 573 insertions, 4 deletions

diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index 222aff8d7f..a4b747f7bf 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for sys-process/lsof
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.78 2010/08/29 18:12:39 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.90 2012/05/24 05:43:53 vapier Exp $
+
+  24 May 2012; Mike Frysinger <vapier@gentoo.org> lsof-4.84-r1.ebuild:
+  Move to usex() from eutils.eclass.
+
+  29 Apr 2012; Markus Meier <maekke@gentoo.org> lsof-4.85-r2.ebuild:
+  arm stable, bug #413273
+
+  28 Apr 2012; <nixnut@gentoo.org> lsof-4.85-r2.ebuild:
+  ppc stable #413273
+
+  24 Apr 2012; Jeroen Roovers <jer@gentoo.org> lsof-4.85-r2.ebuild:
+  Stable for HPPA (bug #413273).
+
+  24 Apr 2012; Agostino Sarubbo <ago@gentoo.org> lsof-4.85-r2.ebuild:
+  Stable for amd64, wrt bug #413273
+
+  24 Apr 2012; Jeff Horelick <jdhore@gentoo.org> lsof-4.85-r2.ebuild:
+  marked x86 per bug 413273
+
+  23 Apr 2012; Brent Baude <ranger@gentoo.org> lsof-4.85-r2.ebuild:
+  Marking lsof-4.85-r2 ppc64 for bug 413273
+
+  23 Apr 2012; Mike Frysinger <vapier@gentoo.org> lsof-4.84-r1.ebuild,
+  lsof-4.85-r1.ebuild, lsof-4.85-r2.ebuild, lsof-4.85.ebuild:
+  We need -DHASNORPC_H too to disable rpc support.
+
+*lsof-4.85-r2 (15 Nov 2011)
+
+  15 Nov 2011; Mike Frysinger <vapier@gentoo.org> +lsof-4.85-r2.ebuild:
+  Put example scripts behind USE=examples.
+
+*lsof-4.85-r1 (30 Oct 2011)
+
+  30 Oct 2011; Mike Frysinger <vapier@gentoo.org> +lsof-4.85-r1.ebuild,
+  +files/lsof-4.85-arg.c.patch:
+  Add fix from upstream #388555 by Lars Wendler (Polynomial-C).
+
+*lsof-4.85 (29 Sep 2011)
+
+  29 Sep 2011; Mike Frysinger <vapier@gentoo.org> +lsof-4.85.ebuild:
+  Version bump.
+
+*lsof-4.84-r1 (17 Sep 2011)
+
+  17 Sep 2011; Mike Frysinger <vapier@gentoo.org> +lsof-4.84-r1.ebuild,
+  +files/lsof-4.84-rpc.patch, metadata.xml:
+  Clean up build logic by testing the compiler rather than poking around the
+  filesystem. Support USE=ipv6. Support building with libtirpc rather than
+  glibc and do so with USE=rpc #370833 by kabel.
 
   29 Aug 2010; Raúl Porcel <armin76@gentoo.org> lsof-4.83.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #331143
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 16e695713f..576fbc1578 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lsof-4.78-answer-config.patch 2217 RMD160 a8ecfaf246398a016f2ce942ba8142f2554f1fc1 SHA1 0708b69847a6ff8619cbc514a915f80f6db2db84 SHA256 61dafde48ff6ebb469b2e318ea8c45c5ecafc3bc229098ed9fdad84feb25d444
 AUX lsof-4.78-config-solaris.patch 736 RMD160 507aa34e8ca5b768d907cd3abe726a71b82f3d5e SHA1 8b80a3004ca37c650fed3d22bec834106c3dbb76 SHA256 99376da963fdb625f582b217f72312ca462deb876a5e029747489ccd6e3b3625
 AUX lsof-4.78-freebsd.patch 455 RMD160 8595b877ed722cffda486232cbbbbe6cfc61b4f7 SHA1 a5ce7efd2fd074fdd97114e1f4fc0822b83d0834 SHA256 6a3c841f11fbabb17cf8ff7c6c7b19c04cf169dc01002ee243370003fd81367b
@@ -7,12 +10,24 @@ AUX lsof-4.81-config-solaris.patch 742 RMD160 1fe6574171907d69a704f63b0b41fa8f07
 AUX lsof-4.81-proc_c.patch 309 RMD160 9ebe1cb0b82b837d2afc829e4bc5ef82b4c461f8 SHA1 c4d1507dc5f5d465b30b0b25920769e95855ef7c SHA256 dafc4b0e6660586ea07553246cddf5c681e72bc383d48578a7ca37e5f6d08950
 AUX lsof-4.81-recmake.patch 635 RMD160 8381ac62c03f92c5da2c7c3f65170a30165c2d63 SHA1 29f29ce05e6d143f15a9c3f03578d78ae27b6a2e SHA256 b64bb2a39639364e6341a697d81a4cc7779731d4b8d47ccb527c5b40d06a18ba
 AUX lsof-4.82-config-solaris.patch 526 RMD160 8818b9809ecd139bb15a16556c15356bdfc6d0dc SHA1 f06ebe768147541afe275eb0e3aac6ddc2845297 SHA256 edbcf11b4275e53501e8a306509bed653591a6824375ac50886cd24094088851
+AUX lsof-4.84-rpc.patch 7293 RMD160 ca0d8a0bd21d8f35cb4e0ab3c2c3461a31722cd5 SHA1 1eac4890fb4cfcce8b949b0c01137f6f818a7c64 SHA256 465080c325f5e6a64cd51e4bbefbce6136368e034cf0dd4a4e65424f687b19a1
+AUX lsof-4.85-arg.c.patch 703 RMD160 cea650d614ff88741d30215fcb0107ee107347ea SHA1 b5af3bcbc91426f0ea07760bd15fa4bf687f9806 SHA256 a517f97ae897dc1d1c7c4e1eeb2fe4a4dab646004c07457709f823e41e57bd43
 AUX solaris11-extdirent.h 2286 RMD160 ac38bf290872bdce2f90ce6277beec1cd9233d6f SHA1 15191c6495bf5e3fc04842e3abd288e33990de32 SHA256 f7c624e8b3c733790d8552de31083e78d3c78f61993082cb3ab54e97619c8b94
 DIST lsof_4.82.tar.bz2 793919 RMD160 de7e8441ec80ce13ba7dbf8b023a6403bd670841 SHA1 200aaf7494bddab4c47eea2466c65e57ef2f3786 SHA256 cbfa9fb6ce21b77f1be8a9c0b7fa245965120d968876212697b92617c2b0bd0f
 DIST lsof_4.83.tar.bz2 753094 RMD160 9a03b41362d68f93d9e7c2db824c8af6df978aa1 SHA1 1aee4c8de6959d84613030a65e90855a922493bf SHA256 b89f930bbe36b970e3cd070b9860ee701d8c7285ffedf2fbcec0e5fa3cb1f544
 DIST lsof_4.84.tar.bz2 758615 RMD160 c7df81cb9c83d4e03db395397912138953529510 SHA1 b4fd6011fc183c0602bbba2116b8335a0c57917b SHA256 20893a2d9b443fba519602f05692d5f72054a9f6dc1236bcb2616cc5330dc725
+DIST lsof_4.85.tar.bz2 763397 RMD160 8ce0e8aa4345b9c2063e9ea88a54dadcab635613 SHA1 d6b40a2de66f541e950b3f174437c9ede7d12b6f SHA256 49aa58e63539c45bada514a6a2e5a1c9f946ada1f4137dc9154cf4bf6054a1c1
 EBUILD lsof-4.82.ebuild 2381 RMD160 3cd5695753ea56c2664654728a466ed6ff1661f8 SHA1 c422b020bb07893cec01ee1bafb63be1902b97e2 SHA256 1c6478be8928d385a5cf07fa4bd8c1dc652d41b8eb4ac39e3ebc402bab21e323
 EBUILD lsof-4.83.ebuild 2287 RMD160 02e9100a6330ff64e3b137b068a05e33f2192575 SHA1 a242ef6f280618b63c27e91790fa77a10ed9d46c SHA256 2a24a3028d1bb7f058e5287619fe041fa1e753e7de17a9cabd6577d2046048ec
+EBUILD lsof-4.84-r1.ebuild 2741 RMD160 55dfc4b7970bb9509741c75bcf276e8f116d9fd2 SHA1 2fd1250340fbc67ecf117fab6508b857549420e7 SHA256 a050241be5df5d6b49cd89c4ecf25232a23bdf2a9817edde80642401025fe2d0
 EBUILD lsof-4.84.ebuild 2297 RMD160 727d045d5214f74d3e7d719dec082dcf06fc5bd7 SHA1 0d65a6e19ac49adbba4a2e1f1e968b2e13c355b4 SHA256 c528ce6d7a10aab3f132a5bd8f57a13f0a54db922ef5051ca9f5286a11cbb67c
-MISC ChangeLog 13088 RMD160 9ca3c6051606498e876e496faa131c58d87a9d8c SHA1 9ee38cfe21bf737ad1b0317e8546f3bab2f1ecd8 SHA256 ed78c2ea0cc696a6e77bbd5ef53880656d8875aa7ad4ed2a7536f195cc767807
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD lsof-4.85-r2.ebuild 2776 RMD160 4d1324c871c271959aff7f4b14da92a8867a6a63 SHA1 694c6fa4027732d1308c3968958315c81542113e SHA256 99f85e3031e356aa4e3295dd0b96d1c512731a70d468ef0c70933ea44cb778a5
+MISC ChangeLog 14778 RMD160 693273b89e9c2d8e8a7988ad53e01b0af8cd5f63 SHA1 76e6bdce7b0462394e04ee4f5c996ca9000c4875 SHA256 97c9999ccaade689f0446c2b8162d7ccb1b05e2ee49212311a6cdfd306173d3c
+MISC metadata.xml 238 RMD160 c0918b440085b691a6da31dba31384758ae4d214 SHA1 2cae35a26364573c7399f53668fb73dd6923b09f SHA256 27f27d7c7ba9fb670a6867a79ff8af354e48735f9bd672d387d96b4bd49d415b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (SunOS)
+
+iEYEARECAAYFAk/A68QACgkQX3X2B8XHTomRlwCgo/VHCt8j9mhLzyYDDGh76k0z
+Vx0An20GUC2/DqYIMS1cS51IDfobFUrU
+=eBnW
+-----END PGP SIGNATURE-----
diff --git a/sys-process/lsof/files/lsof-4.84-rpc.patch b/sys-process/lsof/files/lsof-4.84-rpc.patch
new file mode 100644
index 0000000000..3dd3ce2005
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.84-rpc.patch
@@ -0,0 +1,282 @@
+--- 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/files/lsof-4.85-arg.c.patch b/sys-process/lsof/files/lsof-4.85-arg.c.patch
new file mode 100644
index 0000000000..98838cd772
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.85-arg.c.patch
@@ -0,0 +1,30 @@
+arg.c.patch	Patches: lsof_4.85_src/arg.c
+
+			 Importance: major for all dialects supporting
+				     the +|-e option (e.g., Linux)
+
+			 Function: this patch corrects a bug in the
+				   accumulation of multiple +|-e
+				   option values
+
+*** /tmp/T0iAaaeo	Thu Oct 20 14:08:43 2011
+--- arg.c	Thu Oct 20 14:03:49 2011
+***************
+*** 778,785 ****
+  	ep->pathl = i;
+  	ep->rdlnk = rdlnk;
+  	ep->mp = (struct mounts *)NULL;
+! 	if (!(ep->next = Efsysl))
+! 	    Efsysl = ep;
+  	return(0);
+  }
+  #endif	/* defined(HASEOPT) */
+--- 778,785 ----
+  	ep->pathl = i;
+  	ep->rdlnk = rdlnk;
+  	ep->mp = (struct mounts *)NULL;
+! 	ep->next = Efsysl;
+! 	Efsysl = ep;
+  	return(0);
+  }
+  #endif	/* defined(HASEOPT) */
diff --git a/sys-process/lsof/lsof-4.84-r1.ebuild b/sys-process/lsof/lsof-4.84-r1.ebuild
new file mode 100644
index 0000000000..89a3279ede
--- /dev/null
+++ b/sys-process/lsof/lsof-4.84-r1.ebuild
@@ -0,0 +1,94 @@
+# 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="~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6 rpc selinux static"
+
+RDEPEND="rpc? ( net-libs/libtirpc )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}/${MY_P}_src
+
+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
+
+	epatch "${FILESDIR}"/${PN}-4.81-aix.patch #278831
+}
+
+target() {
+	case ${CHOST} in
+		*-darwin*)  echo darwin  ;;
+		*-freebsd*) echo freebsd ;;
+		*-solaris*) echo solaris ;;
+		*-aix*)     echo aixgcc  ;;
+		*)          echo linux   ;;
+	esac
+}
+ar() {
+	case ${CHOST} in
+		*-aix*)     echo "ar -X32_64 -v -q" ;;
+		*)          echo "$(tc-getAR) rc"   ;;
+	esac
+}
+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
+	touch .neverCust
+	LINUX_HASSELINUX=$(usex selinux y n) \
+	LSOF_INCLUDE=${T} \
+	LSOF_CC=$(tc-getCC) \
+	LSOF_AR="$(ar)" \
+	LSOF_RANLIB=$(tc-getRANLIB) \
+	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
+	./Configure -n $(target) < /dev/null || 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*
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "Note: to use lsof on Solaris you need read permissions on"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
+	fi
+}
diff --git a/sys-process/lsof/lsof-4.85-r2.ebuild b/sys-process/lsof/lsof-4.85-r2.ebuild
new file mode 100644
index 0000000000..723ae54980
--- /dev/null
+++ b/sys-process/lsof/lsof-4.85-r2.ebuild
@@ -0,0 +1,96 @@
+# 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-r2.ebuild,v 1.8 2012/04/29 16:37:32 maekke 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="~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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_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
+
+	epatch "${FILESDIR}"/${PN}-4.81-aix.patch #278831
+}
+
+target() {
+	case ${CHOST} in
+		*-darwin*)  echo darwin  ;;
+		*-freebsd*) echo freebsd ;;
+		*-solaris*) echo solaris ;;
+		*-aix*)     echo aixgcc  ;;
+		*)          echo linux   ;;
+	esac
+}
+ar() {
+	case ${CHOST} in
+		*-aix*)     echo "ar -X32_64 -v -q" ;;
+		*)          echo "$(tc-getAR) rc"   ;;
+	esac
+}
+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
+	touch .neverCust
+	LINUX_HASSELINUX=$(usex selinux y n) \
+	LSOF_INCLUDE=${T} \
+	LSOF_CC=$(tc-getCC) \
+	LSOF_AR="$(ar)" \
+	LSOF_RANLIB=$(tc-getRANLIB) \
+	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
+	./Configure -n $(target) < /dev/null || 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*
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "Note: to use lsof on Solaris you need read permissions on"
+		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
+	fi
+}
diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
index 96a2d58636..49fb858fab 100644
--- a/sys-process/lsof/metadata.xml
+++ b/sys-process/lsof/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+ <flag name='rpc'>support looking up RPC service info</flag>
+</use>
 </pkgmetadata>