stabilize

Package-Manager: portage-2.0.51.22-r1

3 files changed, 27 insertions, 28 deletions

diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 8d41ceee9e2c..9aaad59ddfcd 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,28 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b4c0071255f4d33e7d87742f10426d4c procps-3.2.4-r3.ebuild 2364
-MD5 de36ba695b3d4de6ac4ff35df181b872 procps-3.2.3-r1.ebuild 1494
-MD5 814bb8cdaee78c5e87244c92220f85c4 procps-3.2.5.ebuild 1856
-MD5 b634dee52a3696de89de82a4eb20098c procps-3.2.4-r2.ebuild 1961
 MD5 da5128fcb5b1db097f851715436b818e ChangeLog 17241
-MD5 b59fa99641f04e3a5c692a8cfa7facb5 procps-3.2.5-r1.ebuild 2264
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 5fdac6b265f6ff3866056fb2d97d2a0c files/procps-mips-n32_isnt_usable_on_mips64_yet.patch 431
-MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028
-MD5 eb892816cc3a56418f4157eb67e18fa6 files/3.2.5-top-sort.patch 1384
-MD5 7e94d86add2921b1262479b92f51da27 files/3.2.4-linux26-slab.patch 521
+MD5 de36ba695b3d4de6ac4ff35df181b872 procps-3.2.3-r1.ebuild 1494
+MD5 b634dee52a3696de89de82a4eb20098c procps-3.2.4-r2.ebuild 1961
+MD5 b4c0071255f4d33e7d87742f10426d4c procps-3.2.4-r3.ebuild 2364
+MD5 eeb035af4fb473a42b7b7ee924159e99 procps-3.2.5-r1.ebuild 2269
+MD5 814bb8cdaee78c5e87244c92220f85c4 procps-3.2.5.ebuild 1856
 MD5 5557c7fb6275f031e3770c70993baf69 files/3.2.4-64bit-display.patch 1566
-MD5 f4e5ac4b1eaf4acdbf0dc9573cdf5438 files/digest-procps-3.2.5 64
+MD5 7e94d86add2921b1262479b92f51da27 files/3.2.4-linux26-slab.patch 521
+MD5 eb892816cc3a56418f4157eb67e18fa6 files/3.2.5-top-sort.patch 1384
 MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3-r1 64
 MD5 a26e86ab1efcb58809f0f46aa735ef07 files/digest-procps-3.2.4-r2 64
 MD5 a26e86ab1efcb58809f0f46aa735ef07 files/digest-procps-3.2.4-r3 64
+MD5 f4e5ac4b1eaf4acdbf0dc9573cdf5438 files/digest-procps-3.2.5 64
 MD5 f4e5ac4b1eaf4acdbf0dc9573cdf5438 files/digest-procps-3.2.5-r1 64
-MD5 191c6f4fbc82aa4aab187014367e8015 files/procps-3.2.5-proc-mount.patch 270
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCJ2nxI1lqEGTUzyQRAriOAJ9cL3YCVuHGaNGYU4Nztx7w7UcsRQCgw0p7
-SRgPO/P8NM4ZLOJzJVfdNtw=
-=/1u1
------END PGP SIGNATURE-----
+MD5 f9e1b99ab8000432b594c2a22c7d6ca4 files/procps-3.2.5-proc-mount.patch 588
+MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028
+MD5 5fdac6b265f6ff3866056fb2d97d2a0c files/procps-mips-n32_isnt_usable_on_mips64_yet.patch 431
diff --git a/sys-process/procps/files/procps-3.2.5-proc-mount.patch b/sys-process/procps/files/procps-3.2.5-proc-mount.patch
index 958ade4d6162..057221a6843b 100644
--- a/sys-process/procps/files/procps-3.2.5-proc-mount.patch
+++ b/sys-process/procps/files/procps-3.2.5-proc-mount.patch
@@ -4,3 +4,12 @@
      if(file2str("/proc/self", "stat", sbuf, sizeof sbuf) == -1){
 -        fprintf(stderr, "Error, do this: mount -t proc none /proc\n");
 +        fprintf(stderr, "Error, do this: mount -t proc proc /proc\n");
+--- proc/sysinfo.c
++++ proc/sysinfo.c
+@@ -31,4 +31,4 @@
+ "  To mount /proc at boot you need an /etc/fstab line like:\n"	\
+-"      /proc   /proc   proc    defaults\n"			\
+-"  In the meantime, mount /proc /proc -t proc\n"
++"      proc   /proc   proc    defaults\n"			\
++"  In the meantime, mount proc /proc -t proc\n"
+ 
diff --git a/sys-process/procps/procps-3.2.5-r1.ebuild b/sys-process/procps/procps-3.2.5-r1.ebuild
index 2062ea912874..d671443966fb 100644
--- a/sys-process/procps/procps-3.2.5-r1.ebuild
+++ b/sys-process/procps/procps-3.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.5-r1.ebuild,v 1.1 2005/03/03 16:53:14 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.5-r1.ebuild,v 1.2 2005/05/19 22:17:29 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -10,14 +10,14 @@ SRC_URI="http://procps.sf.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fix terminal breakage when sorting first column in top #80296
 	epatch "${FILESDIR}"/${PV}-top-sort.patch
@@ -35,17 +35,17 @@ src_unpack() {
 	use ppc && sed -i -e 's:-m64::g' Makefile
 
 	# mips patches
-	if use mips; then
+	if use mips ; then
 		# mips 2.4.23 headers (and 2.6.x) don't allow PAGE_SIZE to be defined in
 		# userspace anymore, so this patch instructs procps to get the
 		# value from sysconf().
-		epatch ${FILESDIR}/${PN}-mips-define-pagesize.patch
+		epatch "${FILESDIR}"/${PN}-mips-define-pagesize.patch
 
 		# n32 isn't completly reliable of an ABI on mips64 at the current
 		# time.  Eventually, it will be, but for now, we need to make sure
 		# procps doesn't try to force it on us.
-		if ! use n32; then
-			epatch ${FILESDIR}/${PN}-mips-n32_isnt_usable_on_mips64_yet.patch
+		if ! use n32 ; then
+			epatch "${FILESDIR}"/${PN}-mips-n32_isnt_usable_on_mips64_yet.patch
 		fi
 	fi
 }