summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-06-27 03:07:09 +0000
committerMike Frysinger <vapier@gentoo.org>2006-06-27 03:07:09 +0000
commit0449240d91974594f23545121e7fc4a2b774d10c (patch)
tree7ddca289a991cbf6c9ea1024dcd006ccf380794c /sys-process
parentremoving ivtv mask (diff)
downloadgentoo-2-0449240d91974594f23545121e7fc4a2b774d10c.tar.gz
gentoo-2-0449240d91974594f23545121e7fc4a2b774d10c.tar.bz2
gentoo-2-0449240d91974594f23545121e7fc4a2b774d10c.zip
Version bump #138029 by Armin van Buuren.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/procps/ChangeLog8
-rw-r--r--sys-process/procps/files/digest-procps-3.2.73
-rw-r--r--sys-process/procps/files/procps-3.2.7-proc-mount.patch18
-rw-r--r--sys-process/procps/procps-3.2.7.ebuild78
4 files changed, 106 insertions, 1 deletions
diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 4b469b260e6c..96a7bd2c39fa 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +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.16 2006/04/21 22:23:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.17 2006/06/27 03:07:09 vapier Exp $
+
+*procps-3.2.7 (27 Jun 2006)
+
+ 27 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/procps-3.2.7-proc-mount.patch, +procps-3.2.7.ebuild:
+ Version bump #138029 by Armin van Buuren.
21 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+files/procps-3.2.3-noproc.patch, +files/procps-3.2.6-links.patch,
diff --git a/sys-process/procps/files/digest-procps-3.2.7 b/sys-process/procps/files/digest-procps-3.2.7
new file mode 100644
index 000000000000..180a732fa2f7
--- /dev/null
+++ b/sys-process/procps/files/digest-procps-3.2.7
@@ -0,0 +1,3 @@
+MD5 f490bca772b16472962c7b9f23b1e97d procps-3.2.7.tar.gz 281965
+RMD160 380d9f1b1bf505666e925ce82cd19276a186f97a procps-3.2.7.tar.gz 281965
+SHA256 b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc procps-3.2.7.tar.gz 281965
diff --git a/sys-process/procps/files/procps-3.2.7-proc-mount.patch b/sys-process/procps/files/procps-3.2.7-proc-mount.patch
new file mode 100644
index 000000000000..386dada4f95f
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.7-proc-mount.patch
@@ -0,0 +1,18 @@
+Slightly prettier error message
+
+--- proc/readproc.c
++++ proc/readproc.c
+@@ -907,3 +907,3 @@
+ 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");
+ _exit(47);
+--- 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, run \"mount /proc /proc -t proc\"\n"
++" proc /proc proc defaults\n" \
++" In the meantime, run \"mount proc /proc -t proc\"\n"
+
diff --git a/sys-process/procps/procps-3.2.7.ebuild b/sys-process/procps/procps-3.2.7.ebuild
new file mode 100644
index 000000000000..f638bddf637c
--- /dev/null
+++ b/sys-process/procps/procps-3.2.7.ebuild
@@ -0,0 +1,78 @@
+# 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.7.ebuild,v 1.1 2006/06/27 03:07:09 vapier Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps.sourceforge.net/"
+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"
+IUSE="n32"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/3.2.5-top-sort.patch
+ epatch "${FILESDIR}"/procps-3.2.7-proc-mount.patch
+ epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
+
+ # Clean up the makefile
+ # - we do stripping ourselves
+ # - punt fugly gcc flags
+ sed -i \
+ -e '/install/s: --strip : :' \
+ -e '/ALL_CFLAGS += $(call check_gcc,-fweb,)/d' \
+ -e '/ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing=2,)/s,=2,,' \
+ -e "/^lib64/s:=.*:=$(get_libdir):" \
+ -e 's:-m64::g' \
+ Makefile || die "sed Makefile"
+
+ # 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
+
+ # 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}-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch
+ fi
+}
+
+src_compile() {
+ replace-flags -O3 -O2
+ emake \
+ CC="$(tc-getCC)" \
+ CPPFLAGS="${CPPFLAGS}" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ || die "make failed"
+}
+
+src_install() {
+ make \
+ ln_f="ln -sf" \
+ ldconfig="true" \
+ DESTDIR="${D}" \
+ install \
+ || die "install failed"
+
+ insinto /usr/include/proc
+ doins proc/*.h || die "doins include"
+
+ dodoc sysctl.conf BUGS NEWS TODO ps/HACKING
+}
+
+pkg_postinst() {
+ einfo "NOTE: With NPTL \"ps\" and \"top\" no longer"
+ einfo "show threads. You can use any of: -m m -L -T H"
+ einfo "in ps or the H key in top to show them"
+}