5 files changed, 74 insertions, 1 deletions
diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index 15752fcb02cd..fab92d233d2b 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/procps
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.71 2004/06/24 22:22:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.72 2004/07/20 21:50:30 lostlogic Exp $
+
+*procps-3.2.2 (20 Jul 2004)
+
+  20 Jul 2004; Brandon Low <lostlogic@gentoo.org>
+  +files/procps-3.2.2-selinux-E.diff, +procps-3.2.2.ebuild:
+  Bump, and I had to change the SELinux -Z option to -E for ps because -Z was
+  taken. Hopefully this works for you SELinux people, otherwise mask it out or
+  something
 
   05 Jun 2004; Travis Tilley <lv@gentoo.org> procps-3.2.1.ebuild:
   stable on amd64
diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index 6a3276eb2ba5..e6ad5cedce83 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -6,11 +6,13 @@ MD5 d9a8450ad971e60a33b45788f89a0718 procps-3.2.0.ebuild 1149
 MD5 9fa7e0863ba8482b309e5b01f2e4da2c ChangeLog 10963
 MD5 5dbeadf75302e75297ff2fd9605cd50e procps-3.1.12-r1.ebuild 1342
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 427aca1085d5550210fc03c19d89b486 procps-3.2.2.ebuild 1155
 MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515
 MD5 8f0e3a7050a05437d2872c94ea348a87 files/digest-procps-3.1.15 65
 MD5 7d8e6a0530e7ebd56a0445da8dcefb9b files/digest-procps-2.0.16-r1 65
 MD5 e442fb89cb9b1f265f5198dfb3859434 files/digest-procps-3.2.0 64
 MD5 c1bbc74ed021ce8b4f496b391f20ab76 files/digest-procps-3.2.1 64
+MD5 5a46a0ddb09b5c217ae8d97f16da74a7 files/digest-procps-3.2.2 64
 MD5 81ead3c972547f9348f2aebd43af32e4 files/procps-3.2.0-selinux-Z.diff 683
 MD5 3dfa108ba0c53240d5bfe044fa8be931 files/procps-3.1.12-selinux.diff.bz2 8800
 MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12-r1 65
diff --git a/sys-apps/procps/files/digest-procps-3.2.2 b/sys-apps/procps/files/digest-procps-3.2.2
new file mode 100644
index 000000000000..0c65f92d3e18
--- /dev/null
+++ b/sys-apps/procps/files/digest-procps-3.2.2
@@ -0,0 +1 @@
+MD5 ef88b94da3f181f2be1f6963820b00ab procps-3.2.2.tar.gz 262329
diff --git a/sys-apps/procps/files/procps-3.2.2-selinux-E.diff b/sys-apps/procps/files/procps-3.2.2-selinux-E.diff
new file mode 100644
index 000000000000..5ecd98d2579f
--- /dev/null
+++ b/sys-apps/procps/files/procps-3.2.2-selinux-E.diff
@@ -0,0 +1,14 @@
+diff -urN procps-3.1.15/ps/parser.c procps-3.1.15.new/ps/parser.c
+--- procps-3.1.15/ps/parser.c	2003-12-23 17:58:06.000000000 -0600
++++ procps-3.1.15.new/ps/parser.c	2003-12-24 13:45:08.000000000 -0600
+@@ -315,6 +315,10 @@
+       trace("-Z shows full MAC info\n");
+       format_modifiers |= FM_M;
+       break;
++    case 'E':
++      trace("-E shows SELinux contexts\n");
++      format_flags |= FF_Fc;
++      break;
+     case 'a':
+       trace("-a select all with a tty, but omit session leaders.\n");
+       simple_select |= SS_U_a;
diff --git a/sys-apps/procps/procps-3.2.2.ebuild b/sys-apps/procps/procps-3.2.2.ebuild
new file mode 100644
index 000000000000..9e90ba83ba37
--- /dev/null
+++ b/sys-apps/procps/procps-3.2.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.2.ebuild,v 1.1 2004/07/20 21:50:30 lostlogic Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps.sourceforge.net/"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="selinux"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# add -Z short option to ps for SELinux
+	use selinux && epatch ${FILESDIR}/${P}-selinux-E.diff
+
+	# Use the CFLAGS from /etc/make.conf.
+	replace-flags -O3 -O2
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "/^LDFLAGS/s:$: ${LDFLAGS}:" \
+		-e "/install/s: --strip : :" \
+		Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	einstall DESTDIR="${D}"|| die
+	dodoc BUGS NEWS TODO pc/HACKING
+}
+
+pkg_postinst() {
+	einfo "NOTE: By default \"ps\" and \"top\" no longer"
+	einfo "show threads. You can use the '-m' flag"
+	einfo "in ps or the 'H' key in top to show them"
+	use selinux && ewarn "SELinux users: ps -Z has changed to ps -E to show SELinux contexts"
+}