We use pidof from baselayout, bug #21191

3 files changed, 61 insertions, 3 deletions

diff --git a/sys-apps/psmisc/Manifest b/sys-apps/psmisc/Manifest
index 56be9c66eee8..b1766de7f63e 100644
--- a/sys-apps/psmisc/Manifest
+++ b/sys-apps/psmisc/Manifest
@@ -1,8 +1,7 @@
-MD5 37d313885a8711eb9d5cee7e7e455d4f ChangeLog 2558
-MD5 f4746ca0ed86eabd859d387fe46dbec3 psmisc-21.2-r3.ebuild 1421
+MD5 e37a96b66f19e48c9e8cf09cc3914853 ChangeLog 2708
+MD5 0c0201f6db40a417139428ce6d509e0f psmisc-21.2-r3.ebuild 1419
 MD5 8a6cf4a4f609fa3a893e23b2c5a7ce7d psmisc-21.2-r1.ebuild 1224
 MD5 69d21ef2c656cc6b7c9ce57f1538283d psmisc-21.2-r2.ebuild 1332
-MD5 4b8b78a46d8cf0f1ca0fa36fda9712af .psmisc-21.2-r3.ebuild.swp 12288
 MD5 6103f4929ab117827385124493e78c77 files/digest-psmisc-21.2-r1 136
 MD5 b3c372e1b1ef54a8798b8526a2aa92d1 files/psmisc-21.2-gcc33.patch 547
 MD5 6103f4929ab117827385124493e78c77 files/digest-psmisc-21.2-r2 136
diff --git a/sys-apps/psmisc/files/digest-psmisc-21.2-r3 b/sys-apps/psmisc/files/digest-psmisc-21.2-r3
new file mode 100644
index 000000000000..cbf11a229904
--- /dev/null
+++ b/sys-apps/psmisc/files/digest-psmisc-21.2-r3
@@ -0,0 +1,2 @@
+MD5 0749017f500b171f053d7c1fd72df537 psmisc-21.2.tar.gz 258561
+MD5 68f826245b24b3cbb5bf9ac193d00f10 psmisc-21.2-selinux.patch.bz2 84457
diff --git a/sys-apps/psmisc/psmisc-21.2-r3.ebuild b/sys-apps/psmisc/psmisc-21.2-r3.ebuild
new file mode 100644
index 000000000000..afbd7cdf4188
--- /dev/null
+++ b/sys-apps/psmisc/psmisc-21.2-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-21.2-r3.ebuild,v 1.1 2003/08/04 21:15:06 azarah Exp $
+
+IUSE="nls selinux"
+
+DESCRIPTION="A set of tools that use the proc filesystem"
+HOMEPAGE="http://psmisc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz
+    selinux? mirror://gentoo/${P}-selinux.patch.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ppc sparc alpha hppa ~arm mips"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2
+    selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+
+src_unpack() {
+    unpack ${A}
+    cd ${S}
+
+    # Necessary selinux patch 
+    use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2
+
+	# Fix gcc-3.3 compile issues.
+	# <azarah@gentoo.org> (18 May 2003)
+	epatch ${FILESDIR}/${P}-gcc33.patch
+}
+
+src_compile() {
+	local myconf="--with-gnu-ld"
+	use nls || myconf="${myconf} --disable-nls"
+	use selinux && myconf="${myconf} --enable-flask"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dosym killall /usr/bin/pidof
+
+	# Some packages expect these to use /usr, others to use /
+	dodir /bin
+	mv ${D}/usr/bin/* ${D}/bin/
+	cd ${D}/bin
+	for f in * ; do
+		dosym /bin/${f} /usr/bin/${f}
+	done
+
+	# We use pidof from baselayout.
+	rm -f ${D}/bin/pidof
+	dosym ../sbin/pidof /bin/pidof
+
+	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README
+}