Remove ABI cruft, use softlinks instead of hardlinks, and grab patch from Fedora for top bugs when /proc isnt mounted.

(Portage version: 2.1_pre9-r1)

6 files changed, 61 insertions, 12 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index ab98eec7af90..4b469b260e6c 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.15 2006/03/25 12:52:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.16 2006/04/21 22:23:32 vapier Exp $
 
-  25 Mar 2006; Simon Stelling <blubb@gentoo.org> procps-3.2.6.ebuild:
-  always use KERNEL_ABI; bug 124772
+  21 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/procps-3.2.3-noproc.patch, +files/procps-3.2.6-links.patch,
+  procps-3.2.6.ebuild:
+  Remove ABI cruft, use softlinks instead of hardlinks, and grab patch from
+  Fedora for top bugs when /proc isnt mounted.
 
   10 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> procps-3.2.6.ebuild:
   Stable on alpha wrt bug #125546
diff --git a/sys-process/procps/files/digest-procps-3.2.5-r1 b/sys-process/procps/files/digest-procps-3.2.5-r1
index 0f9fb90c8e34..21c634243df5 100644
--- a/sys-process/procps/files/digest-procps-3.2.5-r1
+++ b/sys-process/procps/files/digest-procps-3.2.5-r1
@@ -1 +1,3 @@
 MD5 cde0e3612d1d7c68f404d46f01c44fb4 procps-3.2.5.tar.gz 277365
+RMD160 2deb6bc8f2af19f965aebe4aa87337a44a86e2e1 procps-3.2.5.tar.gz 277365
+SHA256 6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5 procps-3.2.5.tar.gz 277365
diff --git a/sys-process/procps/files/digest-procps-3.2.6 b/sys-process/procps/files/digest-procps-3.2.6
index 02981df289b4..d1ceb677dde7 100644
--- a/sys-process/procps/files/digest-procps-3.2.6
+++ b/sys-process/procps/files/digest-procps-3.2.6
@@ -1 +1,3 @@
 MD5 7ce39ea27d7b3da0e8ad74dd41d06783 procps-3.2.6.tar.gz 279084
+RMD160 f0b09701ce48d9f6db1cbb209b02ba026ee58d09 procps-3.2.6.tar.gz 279084
+SHA256 f98c7d065168a13f981e815f2472fe5eec7f4efdae6844b21a573ebada56727e procps-3.2.6.tar.gz 279084
diff --git a/sys-process/procps/files/procps-3.2.3-noproc.patch b/sys-process/procps/files/procps-3.2.3-noproc.patch
new file mode 100644
index 000000000000..f581cf459c82
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.3-noproc.patch
@@ -0,0 +1,22 @@
+Ripped from Fedora
+
+If /proc isnt mounted, `top` will cause screen corruption ...
+
+--- procps-3.2.3/top.c
++++ procps-3.2.3/top.c
+@@ -3201,12 +3201,15 @@
+ 
+ int main (int dont_care_argc, char *argv[])
+ {
++   struct stat isproc;
+    (void)dont_care_argc;
+    before(*argv);
+                                         //                 +-------------+
+    windows_stage1();                    //                 top (sic) slice
+    configs_read();                      //                 > spread etc, <
+    parse_args(&argv[1]);                //                 > lean stuff, <
++   if (stat("/proc/self", &isproc)==-1)
++      std_err("/proc is not mounted, required for output data");
+    whack_terminal();                    //                 > onions etc. <
+    windows_stage2();                    //                 as bottom slice
+                                         //                 +-------------+
diff --git a/sys-process/procps/files/procps-3.2.6-links.patch b/sys-process/procps/files/procps-3.2.6-links.patch
new file mode 100644
index 000000000000..8f3f6b09800b
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.6-links.patch
@@ -0,0 +1,25 @@
+Generate soft links, not hard links
+
+--- procps-3.2.6/Makefile
++++ procps-3.2.6/Makefile
+@@ -227,8 +227,8 @@
+ 	$(install) --mode a=r $(notdir $@) $@
+ 
+ install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
+-	cd $(usr/bin) && $(ln_f) skill snice
+-	cd $(usr/proc/bin) && $(ln_f) pgrep pkill
++	cd $(usr/bin) && $(ln_sf) skill snice
++	cd $(usr/proc/bin) && $(ln_sf) pgrep pkill
+ 
+ ############ prog.c --> prog.o
+ 
+@@ -254,7 +254,7 @@
+ ############ progX --> progY
+ 
+ snice kill: skill
+-	ln -f skill $@
++	$(ln_sf) skill $@
+ 
+ pkill: pgrep
+-	ln -f pgrep pkill
++	$(ln_sf) pgrep pkill
diff --git a/sys-process/procps/procps-3.2.6.ebuild b/sys-process/procps/procps-3.2.6.ebuild
index bb69ab785105..2aa334fa3c21 100644
--- a/sys-process/procps/procps-3.2.6.ebuild
+++ b/sys-process/procps/procps-3.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.6.ebuild,v 1.9 2006/03/25 12:52:28 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.6.ebuild,v 1.10 2006/04/21 22:23:32 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -10,24 +10,19 @@ SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="n32"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 
-pkg_setup() {
-	#124772
-	ABI=${KERNEL_ABI}
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Fix terminal breakage when sorting first column in top #80296
 	epatch "${FILESDIR}"/3.2.5-top-sort.patch
-	# Pretty up the /proc mount error message
 	epatch "${FILESDIR}"/procps-3.2.5-proc-mount.patch
+	epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
+	epatch "${FILESDIR}"/procps-3.2.6-links.patch
 
 	# Clean up the makefile
 	#  - we do stripping ourselves