Keep all binaries in /usr/bin except for fuser #184969 by spiritus.

Package-Manager: portage-2.1.3_rc7

4 files changed, 77 insertions, 5 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 70bd6a2bc9f2..65cd2d29cce0 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.60 2007/07/04 21:27:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.61 2007/07/11 21:49:26 vapier Exp $
+
+*psmisc-22.5-r1 (11 Jul 2007)
+
+  11 Jul 2007; Mike Frysinger <vapier@gentoo.org> +psmisc-22.5-r1.ebuild:
+  Keep all binaries in /usr/bin except for fuser #184969 by spiritus.
 
   04 Jul 2007; Roy Marples <uberlord@gentoo.org> psmisc-22.5.ebuild:
   Don't install pstree.x11 unless USE X, #184226 thanks to Patrick van Staveren.
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 382044483ce5..76044b98e8d3 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX psmisc-22.2-gcc2.patch 1625 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 SHA1 bb779b02988837bff2dbaec5aa7909d5e84a050f SHA256 6a710d66db02902db9b99d57abde991ab172b7a41b29b33eb3e552422e0843b5
 MD5 4b14fe14a62770a45a7e3bc5cd54ea26 files/psmisc-22.2-gcc2.patch 1625
 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 files/psmisc-22.2-gcc2.patch 1625
@@ -17,14 +20,18 @@ 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-r1.ebuild 1272 RMD160 7a6e42b601e41c17bd3fb51c68f1c0030452ef52 SHA1 0d77192031e8bd93769a7f4f1e93960fa2c6162f SHA256 e8c8652ca19a67fac45153feca25ac1d3d3d28c3f7e5d9fa6b71a16ed9cab39f
+MD5 add0f9441bd0d9c20f5988d31ab4234b psmisc-22.5-r1.ebuild 1272
+RMD160 7a6e42b601e41c17bd3fb51c68f1c0030452ef52 psmisc-22.5-r1.ebuild 1272
+SHA256 e8c8652ca19a67fac45153feca25ac1d3d3d28c3f7e5d9fa6b71a16ed9cab39f psmisc-22.5-r1.ebuild 1272
 EBUILD psmisc-22.5.ebuild 1189 RMD160 7d65c99982ca6b08e3eac8ee5a6f1f3422e06503 SHA1 f854bc7b1fc295041c4eb0da3fc181876054bc53 SHA256 2c70f270c58bdf583990a1f5452095f7c4615fe15b6ad008e09171f72d60cd62
 MD5 fd5beec17603de16b187399595a5778b psmisc-22.5.ebuild 1189
 RMD160 7d65c99982ca6b08e3eac8ee5a6f1f3422e06503 psmisc-22.5.ebuild 1189
 SHA256 2c70f270c58bdf583990a1f5452095f7c4615fe15b6ad008e09171f72d60cd62 psmisc-22.5.ebuild 1189
-MISC ChangeLog 12889 RMD160 58146d75c1532eef59d88da42712dcc7a82ff0e2 SHA1 25ae0fc40c4d535bca00f3a9d0ffd27f16cf81c2 SHA256 b59d69edf2454354ba1e8914cddccf6511a79f5c7649ea4044b1dcf087321f7a
-MD5 1cdafae6f793698e5e54ae3e866f8b22 ChangeLog 12889
-RMD160 58146d75c1532eef59d88da42712dcc7a82ff0e2 ChangeLog 12889
-SHA256 b59d69edf2454354ba1e8914cddccf6511a79f5c7649ea4044b1dcf087321f7a ChangeLog 12889
+MISC ChangeLog 13063 RMD160 dfdfadf42a867313c045f1525ca801e07d823834 SHA1 2cc6c22e7add9c5fb90ade4a0e81522def77aace SHA256 bac98173fd9bf82e7625caae1e5f041f4bec28c029797e88979b485862bedfb5
+MD5 8c7577ade3e170c85412203b17bf1956 ChangeLog 13063
+RMD160 dfdfadf42a867313c045f1525ca801e07d823834 ChangeLog 13063
+SHA256 bac98173fd9bf82e7625caae1e5f041f4bec28c029797e88979b485862bedfb5 ChangeLog 13063
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -38,3 +45,13 @@ SHA256 d2a3a616119fa55a6f80a24748fb1fe34d7f07dfc6b355f388928aeb47f0d1fb files/di
 MD5 1590aaf049b785f84112230dc6a79a89 files/digest-psmisc-22.5 235
 RMD160 3c30c02a0697f859d3d2cd831249dc1584a8553f files/digest-psmisc-22.5 235
 SHA256 731c1dbe435888285f4ad568ed5587e849cdbeb2757a20b270e4da3ade756472 files/digest-psmisc-22.5 235
+MD5 1590aaf049b785f84112230dc6a79a89 files/digest-psmisc-22.5-r1 235
+RMD160 3c30c02a0697f859d3d2cd831249dc1584a8553f files/digest-psmisc-22.5-r1 235
+SHA256 731c1dbe435888285f4ad568ed5587e849cdbeb2757a20b270e4da3ade756472 files/digest-psmisc-22.5-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGlVCIp/wUKkr7RBoRAsByAKDEzMNXHP2jEXjYxLd/jcPGWn7mVQCgwRgD
+1W5zTVy+IIg426bT4AcCvXs=
+=OFj+
+-----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/digest-psmisc-22.5-r1 b/sys-process/psmisc/files/digest-psmisc-22.5-r1
new file mode 100644
index 000000000000..43c6bd8484d3
--- /dev/null
+++ b/sys-process/psmisc/files/digest-psmisc-22.5-r1
@@ -0,0 +1,3 @@
+MD5 09c20fd899c2c1bd2dce02a510f99fab psmisc-22.5.tar.gz 277404
+RMD160 315e02a601b8729696244379038885365978ebbe psmisc-22.5.tar.gz 277404
+SHA256 f1cfe0b3b85cf06ef67d4648b59b896abce1a3f2a810d694567aff7e33273c02 psmisc-22.5.tar.gz 277404
diff --git a/sys-process/psmisc/psmisc-22.5-r1.ebuild b/sys-process/psmisc/psmisc-22.5-r1.ebuild
new file mode 100644
index 000000000000..e958db8c5910
--- /dev/null
+++ b/sys-process/psmisc/psmisc-22.5-r1.ebuild
@@ -0,0 +1,47 @@
+# 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-r1.ebuild,v 1.1 2007/07/11 21:49:26 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 nls selinux X"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-22.2-gcc2.patch
+	epatch "${FILESDIR}"/${P}-user-header.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable selinux) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README
+	use X || rm "${D}"/usr/bin/pstree.x11
+	# fuser is needed by init.d scripts
+	dodir /bin
+	mv "${D}"/usr/bin/fuser "${D}"/bin/ || die
+	# easier to do this than forcing regen of autotools
+	[[ -e ${D}/usr/bin/peekfd ]] || rm -f "${D}"/usr/share/man/man1/peekfd.1
+}