Added a patch to disable a check in proc/procps.h for n32 ABI on mips64 systems. This check set KLONG=8, and broke several mips64 systems running o32 userland. This is needed until n32 userland becomes a fully-functional userland replacement for o32. Those on the n32 profile won't have this patch applied. Revbumped to force an upgrade on affected mips systems.

(Portage version: 2.0.51.16)

9 files changed, 195 insertions, 12 deletions

diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index 7ca550b6648f..390612452a67 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/procps
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.100 2005/02/01 23:27:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.101 2005/02/27 17:42:59 kumba Exp $
+
+*procps-3.2.4-r3 (27 Feb 2005)
+
+  27 Feb 2005; Joshua Kinard <kumba@gentoo.org>
+  +files/procps-mips-n32_isnt_usable_on_mips64_yet.patch,
+  procps-3.2.4-r2.ebuild, +procps-3.2.4-r3.ebuild, +procps-3.2.5-r1.ebuild,
+  procps-3.2.5.ebuild:
+  Added a patch to disable a check in proc/procps.h for n32 ABI on mips64
+  systems. This check set KLONG=8, and broke several mips64 systems running o32
+  userland. This is needed until n32 userland becomes a fully-functional
+  userland replacement for o32. Those on the n32 profile won't have this patch
+  applied. Revbumped to force an upgrade on affected mips systems.
 
 *procps-3.2.5 (01 Feb 2005)
 
diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index d9a5f9fa2ce3..ffd9e1847682 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -1,12 +1,17 @@
-MD5 8c083639f469f386f9f3ed441999fe9d ChangeLog 16106
+MD5 eaa82b58cd17c4cc0e6633fd13711de0 ChangeLog 16717
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 687bb08f11338030eabaca147372217f procps-3.2.3-r1.ebuild 1492
-MD5 0de5e07cfd2761c009a1b67f0c43eb8f procps-3.2.5.ebuild 1852
-MD5 d6bd93d3c45968e5ec2016cdf9239559 procps-3.2.4-r2.ebuild 1956
-MD5 7455bab26f4331ffc66d62113bc973db files/digest-procps-3.2.3-r1 64
-MD5 f4e5ac4b1eaf4acdbf0dc9573cdf5438 files/digest-procps-3.2.5 64
-MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028
+MD5 1da9b39a515a99c1e72c8070410c28c3 procps-3.2.4-r2.ebuild 1957
+MD5 1fb6fd2e7f1e8c8a8aee5fc4d2f71c2f procps-3.2.5.ebuild 1852
+MD5 13814c0b2a05790b1c54f808ed56cfbf procps-3.2.4-r3.ebuild 2210
+MD5 7c3cafb6928df064f96aa2b8eb9ca81f procps-3.2.5-r1.ebuild 2096
+MD5 5557c7fb6275f031e3770c70993baf69 files/3.2.4-64bit-display.patch 1566
 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 5557c7fb6275f031e3770c70993baf69 files/3.2.4-64bit-display.patch 1566
+MD5 f4e5ac4b1eaf4acdbf0dc9573cdf5438 files/digest-procps-3.2.5 64
+MD5 7ba1d9bd2f1c46766282250643ab9ebd files/procps-mips-define-pagesize.patch 1028
+MD5 5fdac6b265f6ff3866056fb2d97d2a0c files/procps-mips-n32_isnt_usable_on_mips64_yet.patch 431
+MD5 a26e86ab1efcb58809f0f46aa735ef07 files/digest-procps-3.2.4-r3 64
+MD5 f4e5ac4b1eaf4acdbf0dc9573cdf5438 files/digest-procps-3.2.5-r1 64
diff --git a/sys-apps/procps/files/digest-procps-3.2.4-r3 b/sys-apps/procps/files/digest-procps-3.2.4-r3
new file mode 100644
index 000000000000..2bf5f1226db4
--- /dev/null
+++ b/sys-apps/procps/files/digest-procps-3.2.4-r3
@@ -0,0 +1 @@
+MD5 1bec6740b385b3f73800827437f14f85 procps-3.2.4.tar.gz 275861
diff --git a/sys-apps/procps/files/digest-procps-3.2.5-r1 b/sys-apps/procps/files/digest-procps-3.2.5-r1
new file mode 100644
index 000000000000..0f9fb90c8e34
--- /dev/null
+++ b/sys-apps/procps/files/digest-procps-3.2.5-r1
@@ -0,0 +1 @@
+MD5 cde0e3612d1d7c68f404d46f01c44fb4 procps-3.2.5.tar.gz 277365
diff --git a/sys-apps/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch b/sys-apps/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch
new file mode 100644
index 000000000000..472e9c0acf89
--- /dev/null
+++ b/sys-apps/procps/files/procps-mips-n32_isnt_usable_on_mips64_yet.patch
@@ -0,0 +1,12 @@
+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-apps/procps/procps-3.2.4-r2.ebuild b/sys-apps/procps/procps-3.2.4-r2.ebuild
index f4707305e560..4595fad27d31 100644
--- a/sys-apps/procps/procps-3.2.4-r2.ebuild
+++ b/sys-apps/procps/procps-3.2.4-r2.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-apps/procps/procps-3.2.4-r2.ebuild,v 1.2 2005/02/01 23:26:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.4-r2.ebuild,v 1.3 2005/02/27 17:42:59 kumba Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.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 -mips ppc ~ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
diff --git a/sys-apps/procps/procps-3.2.4-r3.ebuild b/sys-apps/procps/procps-3.2.4-r3.ebuild
new file mode 100644
index 000000000000..75f17c64d5f9
--- /dev/null
+++ b/sys-apps/procps/procps-3.2.4-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.4-r3.ebuild,v 1.1 2005/02/27 17:42:59 kumba Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps.sourceforge.net/"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="mips"
+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
+
+	# 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-apps/procps/procps-3.2.5-r1.ebuild b/sys-apps/procps/procps-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..bd335c172dce
--- /dev/null
+++ b/sys-apps/procps/procps-3.2.5-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.5-r1.ebuild,v 1.1 2005/02/27 17:42:59 kumba Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="Standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps.sourceforge.net/"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~mips"
+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
+
+	# 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,,' \
+		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-apps/procps/procps-3.2.5.ebuild b/sys-apps/procps/procps-3.2.5.ebuild
index 7ea0408c31ef..da5382f462fb 100644
--- a/sys-apps/procps/procps-3.2.5.ebuild
+++ b/sys-apps/procps/procps-3.2.5.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-apps/procps/procps-3.2.5.ebuild,v 1.1 2005/02/01 23:27:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.2.5.ebuild,v 1.2 2005/02/27 17:42:59 kumba Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.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 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"