summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-03-14 12:02:00 +0000
committerMike Frysinger <vapier@gentoo.org>2009-03-14 12:02:00 +0000
commitf2cbf3ee630bdbc91b019b3034ff5b280883fc9a (patch)
tree8450d51360c0bd414f584b6614bff88d7770a3b4 /sys-process/procps
parentVersion bump (diff)
downloadgentoo-2-f2cbf3ee630bdbc91b019b3034ff5b280883fc9a.tar.gz
gentoo-2-f2cbf3ee630bdbc91b019b3034ff5b280883fc9a.tar.bz2
gentoo-2-f2cbf3ee630bdbc91b019b3034ff5b280883fc9a.zip
old
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'sys-process/procps')
-rw-r--r--sys-process/procps/files/3.2.4-64bit-display.patch34
-rw-r--r--sys-process/procps/files/3.2.4-linux26-slab.patch17
-rw-r--r--sys-process/procps/files/procps-3.2.5-proc-mount.patch17
-rw-r--r--sys-process/procps/files/procps-3.2.6-links.patch25
-rw-r--r--sys-process/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch12
-rw-r--r--sys-process/procps/procps-3.2.4-r3.ebuild79
-rw-r--r--sys-process/procps/procps-3.2.5-r1.ebuild77
-rw-r--r--sys-process/procps/procps-3.2.6.ebuild74
8 files changed, 0 insertions, 335 deletions
diff --git a/sys-process/procps/files/3.2.4-64bit-display.patch b/sys-process/procps/files/3.2.4-64bit-display.patch
deleted file mode 100644
index aca21f6de8f5..000000000000
--- a/sys-process/procps/files/3.2.4-64bit-display.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: proc/escape.c
-===================================================================
-RCS file: /cvsroot/procps/procps/proc/escape.c,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- proc/escape.c 4 Nov 2004 20:50:59 -0000 1.5
-+++ proc/escape.c 5 Jan 2005 21:11:21 -0000 1.6
-@@ -159,7 +159,7 @@
- // escape an argv or environment string array
- //
- // bytes arg means sizeof(buf)
--int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t bytes, size_t *cells){
-+int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t bytes, int *cells){
- size_t i = 0;
-
- for(;;){
-Index: proc/escape.h
-===================================================================
-RCS file: /cvsroot/procps/procps/proc/escape.h,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- proc/escape.h 4 Nov 2004 20:50:59 -0000 1.4
-+++ proc/escape.h 5 Jan 2005 21:11:21 -0000 1.5
-@@ -12,7 +12,7 @@
- #define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it
- #define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>"
-
--extern int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t n, size_t *cells);
-+extern int escape_strlist(char *restrict dst, const char *restrict const *restrict src, size_t n, int *cells);
- extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells);
- extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags);
-
diff --git a/sys-process/procps/files/3.2.4-linux26-slab.patch b/sys-process/procps/files/3.2.4-linux26-slab.patch
deleted file mode 100644
index d2d0ab0ceaae..000000000000
--- a/sys-process/procps/files/3.2.4-linux26-slab.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: proc/slab.c
-===================================================================
-RCS file: /cvsroot/procps/procps/proc/slab.c,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- proc/slab.c 5 Jan 2005 21:46:22 -0000 1.4
-+++ proc/slab.c 10 Jan 2005 05:59:41 -0000 1.5
-@@ -293,7 +294,7 @@
- return 1;
- }
-
-- if (major == 2 && minor == 0)
-+ if (major == 2)
- ret = parse_slabinfo20(list, stats, slabfile);
- else if (major == 1 && minor == 1)
- ret = parse_slabinfo11(list, stats, slabfile);
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
deleted file mode 100644
index a1a1464ebba3..000000000000
--- a/sys-process/procps/files/procps-3.2.5-proc-mount.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Slightly prettier error message
-
---- proc/readproc.c
-+++ proc/readproc.c
-@@ -858,2 +858,2 @@
- 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/files/procps-3.2.6-links.patch b/sys-process/procps/files/procps-3.2.6-links.patch
deleted file mode 100644
index 8f3f6b09800b..000000000000
--- a/sys-process/procps/files/procps-3.2.6-links.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch b/sys-process/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch
deleted file mode 100644
index 472e9c0acf89..000000000000
--- a/sys-process/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp procps-3.2.4.orig/proc/procps.h procps-3.2.4/proc/procps.h
---- procps-3.2.4.orig/proc/procps.h 2004-08-20 18:40:13 -0400
-+++ procps-3.2.4/proc/procps.h 2005-02-28 10:38:05 -0500
-@@ -31,7 +31,7 @@
- //
- // Unknown: PA-RISC and zSeries
- //
--#if defined(k64test) || defined(_ABIN32)
-+#if defined(k64test)
- #define KLONG long long // not typedef; want "unsigned KLONG" to work
- #define KLF "L"
- #define STRTOUKL strtoull
diff --git a/sys-process/procps/procps-3.2.4-r3.ebuild b/sys-process/procps/procps-3.2.4-r3.ebuild
deleted file mode 100644
index 13bb2be4bff6..000000000000
--- a/sys-process/procps/procps-3.2.4-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.4-r3.ebuild,v 1.1 2005/03/03 16:53:14 ciaranm Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps.sourceforge.net/"
-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"
-IUSE="n32"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # Upstream patch to support newer linux #77301
- epatch "${FILESDIR}"/${PV}-linux26-slab.patch
- # Upstream patch to fix display on 64bit systems
- epatch "${FILESDIR}"/${PV}-64bit-display.patch
- # Pretty up the /proc mount error message
- epatch "${FILESDIR}"/procps-3.2.5-proc-mount.patch
-
- # Clean up the makefile
- # firstly we want to control stripping
- # and secondly these gcc flags have changed
- 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,,' \
- Makefile || die "sed Makefile"
- use ppc && sed -i -e 's:-m64::g' Makefile
-
- # mips patches
- 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
-
- # 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
- fi
- fi
-}
-
-src_compile() {
- replace-flags -O3 -O2
- emake \
- lib64="$(get_libdir)" \
- CC="$(tc-getCC)" \
- CPPFLAGS="${CPPFLAGS}" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- || die "make failed"
-}
-
-src_install() {
- make install ldconfig="true" DESTDIR="${D}" || 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"
-}
diff --git a/sys-process/procps/procps-3.2.5-r1.ebuild b/sys-process/procps/procps-3.2.5-r1.ebuild
deleted file mode 100644
index 3d7db6648ea1..000000000000
--- a/sys-process/procps/procps-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.8 2005/08/23 01:43:01 vapier Exp $
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Standard informational utilities and process-handling tools"
-HOMEPAGE="http://procps.sourceforge.net/"
-SRC_URI="http://procps.sf.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}"
-
- # Fix terminal breakage when sorting first column in top #80296
- epatch "${FILESDIR}"/${PV}-top-sort.patch
- # Pretty up the /proc mount error message
- epatch "${FILESDIR}"/procps-3.2.5-proc-mount.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):" \
- Makefile || die "sed Makefile"
- use ppc && sed -i -e 's:-m64::g' Makefile
-
- # mips patches
- 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
-
- # 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
- fi
- fi
-}
-
-src_compile() {
- replace-flags -O3 -O2
- emake \
- CC="$(tc-getCC)" \
- CPPFLAGS="${CPPFLAGS}" \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- || die "make failed"
-}
-
-src_install() {
- make install ldconfig="true" DESTDIR="${D}" || 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"
-}
diff --git a/sys-process/procps/procps-3.2.6.ebuild b/sys-process/procps/procps-3.2.6.ebuild
deleted file mode 100644
index 2aa334fa3c21..000000000000
--- a/sys-process/procps/procps-3.2.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.10 2006/04/21 22:23:32 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.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
- # - 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}"/${P}-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 install ldconfig="true" DESTDIR="${D}" || 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"
-}