Turns out that the new -Z option is the same as the old -Z patch option, so removing the new -E option.

5 files changed, 11 insertions, 25 deletions

diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index fab92d233d2b..430ff9bff47e 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,11 @@
 # 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.72 2004/07/20 21:50:30 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.73 2004/07/21 13:59:06 lostlogic Exp $
+
+  21 Jul 2004; Brandon Low <lostlogic@gentoo.org>
+  -files/procps-3.2.2-selinux-E.diff, -procps-3.2.2.ebuild:
+  Turns out that the new -Z option is the same as the old -Z patch option, so
+  removing the new -E option.
 
 *procps-3.2.2 (20 Jul 2004)
 
diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index 7d815c32fa41..d5ad8b6142bd 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -2,20 +2,19 @@ MD5 1a12a945ea2a7fdb7103644d22d4cb82 procps-3.1.15.ebuild 1236
 MD5 8eae8fbe8949b39d3853f794f920e348 procps-3.2.1.ebuild 1149
 MD5 e3b3f57a3f6f7e586cd3a23a5689cc30 procps-2.0.16-r1.ebuild 2002
 MD5 416c9134bb5282ee2d9e86b81826f55d procps-3.1.13-r1.ebuild 1185
+MD5 83faec0e015c1a0876a225e8a50a0ae0 procps-3.2.2-r1.ebuild 1069
 MD5 d9a8450ad971e60a33b45788f89a0718 procps-3.2.0.ebuild 1149
-MD5 22dc7d73ff55aacdfda5fbc5d1adf7d0 ChangeLog 11273
+MD5 b5c4854a41155eceba980ab6ed84d107 ChangeLog 11492
 MD5 5dbeadf75302e75297ff2fd9605cd50e procps-3.1.12-r1.ebuild 1342
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 5895146b3c94928339365f899dce387f procps-3.2.2.ebuild 1261
 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 5a46a0ddb09b5c217ae8d97f16da74a7 files/digest-procps-3.2.2-r1 64
 MD5 81ead3c972547f9348f2aebd43af32e4 files/procps-3.2.0-selinux-Z.diff 683
 MD5 3dfa108ba0c53240d5bfe044fa8be931 files/procps-3.1.12-selinux.diff.bz2 8800
-MD5 c82074571a17b805cf0eb598eaa42eda files/procps-3.2.2-selinux-E.diff 534
 MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12-r1 65
 MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13-r1 65
 MD5 01027f00be8fdd5ca08f0d15f1ed1512 files/procps-3.1.15-fix_attr.diff 1270
diff --git a/sys-apps/procps/files/digest-procps-3.2.2 b/sys-apps/procps/files/digest-procps-3.2.2-r1
index 0c65f92d3e18..0c65f92d3e18 100644
--- a/sys-apps/procps/files/digest-procps-3.2.2
+++ b/sys-apps/procps/files/digest-procps-3.2.2-r1
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
deleted file mode 100644
index 5ecd98d2579f..000000000000
--- a/sys-apps/procps/files/procps-3.2.2-selinux-E.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-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-r1.ebuild
index 9e90ba83ba37..049e4c5e350c 100644
--- a/sys-apps/procps/procps-3.2.2.ebuild
+++ b/sys-apps/procps/procps-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.2-r1.ebuild,v 1.1 2004/07/21 13:59:06 lostlogic Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ 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"
+IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 
@@ -19,9 +19,6 @@ 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 \
@@ -44,5 +41,4 @@ 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"
 }