Touchup peekfd handling #175776 by Harald van Dijk.

Package-Manager: portage-2.1.2.5

4 files changed, 35 insertions, 13 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index f6ecaa0262d7..3facc4fb5c50 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.56 2007/04/25 02:31:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.57 2007/05/02 20:47:54 vapier Exp $
+
+  02 May 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/psmisc-22.5-user-header.patch, psmisc-22.5.ebuild:
+  Touchup peekfd handling #175776 by Harald van Dijk.
 
 *psmisc-22.5 (25 Apr 2007)
 
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 6c1765a40e90..fddb96d56bf2 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -5,6 +5,10 @@ AUX psmisc-22.2-gcc2.patch 1625 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699
 MD5 4b14fe14a62770a45a7e3bc5cd54ea26 files/psmisc-22.2-gcc2.patch 1625
 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 files/psmisc-22.2-gcc2.patch 1625
 SHA256 6a710d66db02902db9b99d57abde991ab172b7a41b29b33eb3e552422e0843b5 files/psmisc-22.2-gcc2.patch 1625
+AUX psmisc-22.5-user-header.patch 234 RMD160 a284b4898a868894a5956a689f5c64969422c2ce SHA1 c01a28043beb7acc4b05d96d016c16275af6a07b SHA256 68035208f6e4d94af61c79fcb3041a2607c8df19d751f0650dc46ca13ec7aedb
+MD5 d07d5aedc05be5004bdb89e44ecde323 files/psmisc-22.5-user-header.patch 234
+RMD160 a284b4898a868894a5956a689f5c64969422c2ce files/psmisc-22.5-user-header.patch 234
+SHA256 68035208f6e4d94af61c79fcb3041a2607c8df19d751f0650dc46ca13ec7aedb files/psmisc-22.5-user-header.patch 234
 DIST psmisc-22.2.tar.gz 244247 RMD160 aaa11a5bb4139fbe571177518ebc79198e9e2d57 SHA1 1ae222803c5b5967a1b93e69f08330e0cdc1a554 SHA256 6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f
 DIST psmisc-22.3.tar.gz 257325 RMD160 1db16a81030e22fe66f1d770bba8792679c70395 SHA1 262e5a738c323f5b1f0a112c6fcc906f9860e948 SHA256 9b561fec2ed2e1199f6cd5dfec44b3d0fe78320bc4417b6dea5290cdd20acf1f
 DIST psmisc-22.5.tar.gz 277404 RMD160 315e02a601b8729696244379038885365978ebbe SHA1 0fd6c52dd0dad464a9be7baa79fb810caf43c923 SHA256 f1cfe0b3b85cf06ef67d4648b59b896abce1a3f2a810d694567aff7e33273c02
@@ -16,14 +20,14 @@ EBUILD psmisc-22.3.ebuild 1172 RMD160 4c2f6b2a5a35279318e4285af7256204b9a1e274 S
 MD5 b73129512fca00bec6f6af51e4f6b689 psmisc-22.3.ebuild 1172
 RMD160 4c2f6b2a5a35279318e4285af7256204b9a1e274 psmisc-22.3.ebuild 1172
 SHA256 3ee134fe3507ad038ddeafb2e0cb3b07ed2683de0acc5fba2ead0521e08c3783 psmisc-22.3.ebuild 1172
-EBUILD psmisc-22.5.ebuild 1017 RMD160 693711661c70f600351772d687230b27fa9af7cf SHA1 75e9a663ffefb62f2d6af27d5b1065bc5cc06d07 SHA256 eaa52088a598a2d328f84a3f70b7160390b9affc5d09bb62028acc0e2cad978b
-MD5 7b814cdf565de51201a7c954cf530454 psmisc-22.5.ebuild 1017
-RMD160 693711661c70f600351772d687230b27fa9af7cf psmisc-22.5.ebuild 1017
-SHA256 eaa52088a598a2d328f84a3f70b7160390b9affc5d09bb62028acc0e2cad978b psmisc-22.5.ebuild 1017
-MISC ChangeLog 12390 RMD160 54e75834bde356ec9fc90422bfa0c344cb1b224c SHA1 217a2fb43e1ef787f794e62e5fb6de4353824041 SHA256 e64185538922759baa3c736e20b327b79756673c41d1f3209a6f7723f46340bf
-MD5 c397e3b8a13080818fec63c556a31532 ChangeLog 12390
-RMD160 54e75834bde356ec9fc90422bfa0c344cb1b224c ChangeLog 12390
-SHA256 e64185538922759baa3c736e20b327b79756673c41d1f3209a6f7723f46340bf ChangeLog 12390
+EBUILD psmisc-22.5.ebuild 1189 RMD160 498bb93e72ed900081a339bbebb5e444c516903d SHA1 a4695e69d58c67c34595e3df078977ef1a266fe6 SHA256 b12bd92896586ff7874de3ac9a3dcb0b614d8b8aaf4487bbf6baf8af506f02e9
+MD5 60adfcef08b0704d68f602d46d4630b2 psmisc-22.5.ebuild 1189
+RMD160 498bb93e72ed900081a339bbebb5e444c516903d psmisc-22.5.ebuild 1189
+SHA256 b12bd92896586ff7874de3ac9a3dcb0b614d8b8aaf4487bbf6baf8af506f02e9 psmisc-22.5.ebuild 1189
+MISC ChangeLog 12555 RMD160 c42d0f5053fa779741117006c5b22a748fc2c9c1 SHA1 72893df4bdce5094af7b4331bbaf4ee24d740d13 SHA256 feba4a519b659875c5fdfb9b9a3e74f950b29e59517f9452cf166a9ab0060d4c
+MD5 6165dc89b634fb13f5d76ff5f619f118 ChangeLog 12555
+RMD160 c42d0f5053fa779741117006c5b22a748fc2c9c1 ChangeLog 12555
+SHA256 feba4a519b659875c5fdfb9b9a3e74f950b29e59517f9452cf166a9ab0060d4c ChangeLog 12555
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -40,7 +44,7 @@ SHA256 731c1dbe435888285f4ad568ed5587e849cdbeb2757a20b270e4da3ade756472 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGLr2M8bi6rjpTunYRArRiAKCxNhoe54QraI/F2/QaWIoMsg6bhwCgkY+K
-adz0eDxw4Hm8k9wN0qtnR3c=
-=pX+2
+iD8DBQFGOPkK8bi6rjpTunYRAheUAJwIOk12SWORip/zSf33/dFndW4uPACgr1AQ
+o0eomjqxbCjJLaioGlGKIK4=
+=NlDy
 -----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/psmisc-22.5-user-header.patch b/sys-process/psmisc/files/psmisc-22.5-user-header.patch
new file mode 100644
index 000000000000..c982dde795fa
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.5-user-header.patch
@@ -0,0 +1,11 @@
+--- src/peekfd.c
++++ src/peekfd.c
+@@ -26,7 +26,7 @@
+ #include <sys/ptrace.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <linux/user.h>
++#include <sys/user.h>
+ #include <stdlib.h>
+ #include <getopt.h>
+ #include <ctype.h>
diff --git a/sys-process/psmisc/psmisc-22.5.ebuild b/sys-process/psmisc/psmisc-22.5.ebuild
index fca127ffe44d..f9dd116ae4c0 100644
--- a/sys-process/psmisc/psmisc-22.5.ebuild
+++ b/sys-process/psmisc/psmisc-22.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.5.ebuild,v 1.1 2007/04/25 02:31:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.5.ebuild,v 1.2 2007/05/02 20:47:54 vapier Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-22.2-gcc2.patch
+	epatch "${FILESDIR}"/${P}-user-header.patch
 }
 
 src_compile() {
@@ -39,4 +40,6 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog NEWS README
 	use X || rm "${D}"/bi/pstree.x11
+	# easier to do this than forcing regen of autotools
+	[[ -e ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/share/man/man1/peekfd.1
 }