We need -DHASNORPC_H too to disable rpc support.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 38 insertions, 24 deletions

diff --git a/sys-process/lsof/ChangeLog b/sys-process/lsof/ChangeLog
index 08b1ab838c88..33521e1372bd 100644
--- a/sys-process/lsof/ChangeLog
+++ b/sys-process/lsof/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/lsof
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.82 2011/11/15 05:03:29 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/ChangeLog,v 1.83 2012/04/23 16:06:18 vapier Exp $
+
+  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)
 
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 18a21e497862..32c9126697fb 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
@@ -9,17 +9,27 @@ DIST lsof_4.84.tar.bz2 758615 RMD160 c7df81cb9c83d4e03db395397912138953529510 SH
 DIST lsof_4.85.tar.bz2 763397 RMD160 8ce0e8aa4345b9c2063e9ea88a54dadcab635613 SHA1 d6b40a2de66f541e950b3f174437c9ede7d12b6f SHA256 49aa58e63539c45bada514a6a2e5a1c9f946ada1f4137dc9154cf4bf6054a1c1
 EBUILD lsof-4.82.ebuild 1564 RMD160 d451bf9bbf6318334a8e50f4b1d2ae50e38c327b SHA1 1a61666e103094593ca8af48af34e161a43bb95b SHA256 ac4cdea0e1eda34519b941d1c683de9e4b0d67180ee3d0581dfb40dd180263e9
 EBUILD lsof-4.83.ebuild 1448 RMD160 147c474f1ae07368acd3896ec6f292abe7000e2e SHA1 9f5c74270d5dc5e48677f6722ff33fb89dfdb6f1 SHA256 4bbeb0a560aed53ac126fb73acb1bba70daba2b1de4a5a7dc8d031ffcb6bab4b
-EBUILD lsof-4.84-r1.ebuild 2301 RMD160 d319902f9f28d8a001dd6f59b0408210d7c279d9 SHA1 f3a579c5dbf91874378f643cf049380c0da0d0ad SHA256 d23f45467e684650db4c414f0b9262243be1bd838e5faf365acb64e3b6583231
+EBUILD lsof-4.84-r1.ebuild 2316 RMD160 54d62117fac7de1e1dedf77775a3c6a75bc06e2c SHA1 51bbf8bd7975be4dbe0c223f4c32b5b251e8e279 SHA256 864e5b8db3e5f5235b882f61a7b3a7872ba1040c12d12596c989a6d9d4d8f72d
 EBUILD lsof-4.84.ebuild 1455 RMD160 e5e3839ad68d999b73adb619d1bfd8b91bfc74f3 SHA1 77db0f08cd793614322f2ca1e03580d7e158f428 SHA256 1a14c9fddadb2c80100da2b85d6cb2d641bfeab61d67b342382d0cf6773198f9
-EBUILD lsof-4.85-r1.ebuild 2249 RMD160 9b2e103a3126a45db9818a9537192b8bc7cd506f SHA1 a0c5af67437d87bb6b4c6a95b23cf56e2f5cdbea SHA256 ebe1c48ce0fc4aa28d19ce528493401df7622df6cc5c23be1b725c064c49199d
-EBUILD lsof-4.85-r2.ebuild 2288 RMD160 78288e2aeb50fa20a52f8c671900c616a4f19082 SHA1 d0c7a49b4c4af593343b3fe47c7c7c7cdf7c3cbc SHA256 5c834124bf666331e140b1d3d4ef7ae2c4746f2975001176c1ee731fac4b0950
-EBUILD lsof-4.85.ebuild 2199 RMD160 19f1938c62927d045ae1a06365dbbb37161f6285 SHA1 0a6a4189422edad9dc0d298be805166fc02643f9 SHA256 3d921d7130c2b329b9c6b066b7725df7e5fc563ff79a075ed04244a824d79ec3
-MISC ChangeLog 13889 RMD160 6b48c8b64b136df311f47720efb03950029495eb SHA1 3e107294bdf1d56ef955df16f588dcd1ca48c57f SHA256 f8a457ad1c70f132dd6c3507d5d1a4502bc46c22296502617f4f886e896ee06c
+EBUILD lsof-4.85-r1.ebuild 2264 RMD160 90d1f0a420d6fb9f62d75a5aed2665df0096b9cf SHA1 a2ffc805e71bb960db23188655600abb4668b532 SHA256 dbe1416689172792b9debfae6329cba78196c89efcf639ca7f5e564168aeea82
+EBUILD lsof-4.85-r2.ebuild 2303 RMD160 b78bcd180c1d9f0463a319cc5875b8a977d2af8f SHA1 f42ab3ab23d947d52951fb5d08363ebeca8f2685 SHA256 3a75cbee94ee3673b5419e391b041fabdde16bc9527271a63fc32c1587b79cd3
+EBUILD lsof-4.85.ebuild 2214 RMD160 7ac17db847bf6bd985ec33fd520cd1f31ec469e7 SHA1 5047dd85e68450a5e3484f879169d6ea5d4e6936 SHA256 44833225a1b75cf66131f35220fee6b4f33de11d35bb505792abca040e27fc9c
+MISC ChangeLog 14074 RMD160 e9974a3e0792506ba961e336b0fcc90085a8215d SHA1 4158cbf4145a5a291356c737bb48ee4ba920661f SHA256 a04cfdadc380237fde4362fecdc2bc86a4dcf268fb4176fb905866fefaf12733
 MISC metadata.xml 238 RMD160 c0918b440085b691a6da31dba31384758ae4d214 SHA1 2cae35a26364573c7399f53668fb73dd6923b09f SHA256 27f27d7c7ba9fb670a6867a79ff8af354e48735f9bd672d387d96b4bd49d415b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk7B8qkACgkQaC/OocHi7JahqQD6Awr94oQWYmaWYwfIp0inyuKw
-DVXtXkg+G5FecwUxAmwA/0Ip7gSDh6hBizDT1Y5BFnQyDDEs0FV61gS4y041VFsX
-=9sQZ
+iQIcBAEBAgAGBQJPlX5WAAoJELEHsLL7fEFWEjUP/A04BjJj8urJmaJ9JhEk7U8Y
+dztHFFIE6RQ0cFFcYL4djrZkkOgAR5F+h+PVYakltooXe8Or+Bnb7h2unVfMcSEA
+pjuPGomvRtCOSiaS/HZFVIndm1xPuEX+qpVjY2oKHfHesZLgPqkaReQh+3K22mtK
++OzUxfnRnam+D5rGGCouBjnhG9yKUtqirCcNn5CdOOJLDmX9G/ayrf+RnJAqVQbF
+RbgMEvTNzjOM+E9HhXKLoyl6EzLOJCREqzM0L6zULvOa0rG+XxraWHQ2XR4OfLkZ
+rfhZ/5ID3P88qicr+KmVuyvcZng21ASSYmEEQ74QZyRWpyxb/ahNg31ZUaARZ4gb
+lHO48D0Jn0ThuuXYnHc/S438Wu6NUDIML0KbXx70s4P/iyjnzshkeku9nymXd/75
+rvnoVd+lbbWze0w8ztzqXPDdSc/OqkjDGEVy0/zAMaffXuOh7+gwoGSp1JUwUDcv
+V9ULPq54EA8XUNnSpYEwVOStDIgzxd4FX4EDCeuIesyKY79sCB0g3xQBUG28XxqW
+Tf46m5Cz/jMMDsRBPcaZ+UgLgQysSZt1I90dNg+qj+v/CV3k+blG6ZVTm8fsBTZd
+MQbn2pd2GjvaCeJyCMFVzjs64tlytyQSw7AXkyZR1Knj/qdVQL+EGW2HiRDIFkok
+/LDfgxOmpccjcJu9oCaH
+=Fl/j
 -----END PGP SIGNATURE-----
diff --git a/sys-process/lsof/lsof-4.84-r1.ebuild b/sys-process/lsof/lsof-4.84-r1.ebuild
index d9d9ea808c66..33d05a802b7a 100644
--- a/sys-process/lsof/lsof-4.84-r1.ebuild
+++ b/sys-process/lsof/lsof-4.84-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/09/17 22:55:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.84-r1.ebuild,v 1.2 2012/04/23 16:06:18 vapier Exp $
 
 EAPI="2"
 
@@ -44,7 +44,7 @@ target() { usex kernel_FreeBSD freebsd linux ; }
 src_configure() {
 	use static && append-ldflags -static
 
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" -DHASNOTRPC)
+	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
 	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
 
 	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
diff --git a/sys-process/lsof/lsof-4.85-r1.ebuild b/sys-process/lsof/lsof-4.85-r1.ebuild
index d77bc7818538..7eb904531efe 100644
--- a/sys-process/lsof/lsof-4.85-r1.ebuild
+++ b/sys-process/lsof/lsof-4.85-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/10/30 23:28:18 vapier Exp $
+# $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"
 
@@ -43,7 +43,7 @@ target() { usex kernel_FreeBSD freebsd linux ; }
 src_configure() {
 	use static && append-ldflags -static
 
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" -DHASNOTRPC)
+	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
 	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
 
 	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
diff --git a/sys-process/lsof/lsof-4.85-r2.ebuild b/sys-process/lsof/lsof-4.85-r2.ebuild
index 7f26b895c979..ba9d7250ef73 100644
--- a/sys-process/lsof/lsof-4.85-r2.ebuild
+++ b/sys-process/lsof/lsof-4.85-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/11/15 05:03:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85-r2.ebuild,v 1.2 2012/04/23 16:06:18 vapier Exp $
 
 EAPI="2"
 
@@ -43,7 +43,7 @@ target() { usex kernel_FreeBSD freebsd linux ; }
 src_configure() {
 	use static && append-ldflags -static
 
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" -DHASNOTRPC)
+	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
 	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
 
 	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
diff --git a/sys-process/lsof/lsof-4.85.ebuild b/sys-process/lsof/lsof-4.85.ebuild
index 009f9ffc979d..6866a0314e1f 100644
--- a/sys-process/lsof/lsof-4.85.ebuild
+++ b/sys-process/lsof/lsof-4.85.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/09/29 03:15:30 vapier Exp $
+# $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"
 
@@ -42,7 +42,7 @@ target() { usex kernel_FreeBSD freebsd linux ; }
 src_configure() {
 	use static && append-ldflags -static
 
-	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" -DHASNOTRPC)
+	append-cppflags $(usex rpc "$($(tc-getPKG_CONFIG) libtirpc --cflags)" "-DHASNOTRPC -DHASNORPC_H")
 	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
 
 	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \