Add patch that should fix bug #333299 (procps failing to build with gmake 3.82).

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 29 insertions, 8 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index 21443ec7d61d..b5d02fe6d124 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.39 2010/01/25 03:06:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.40 2010/09/22 15:24:08 flameeyes Exp $
+
+  22 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  procps-3.2.8-r1.ebuild, +files/procps-3.2.8+gmake-3.82.patch:
+  Add patch that should fix bug #333299 (procps failing to build with gmake
+  3.82).
 
 *procps-3.2.8-r1 (25 Jan 2010)
 
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 0c9e1ab69d5e..9520e319d59c 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -5,17 +5,18 @@ AUX 3.2.5-top-sort.patch 1384 RMD160 7ab964b4dd310d5032826abe64a46b8b6e968a80 SH
 AUX procps-3.2.3-noproc.patch 911 RMD160 0c6714c16424a31cde28f8e667f05a46e71402d1 SHA1 6cc1c4fc8f7e39347619f4c9f1432dfc6d0164a1 SHA256 e3897fe3e8df43750f514e8fc84a82f5e00c0bc2245bbd21ad2d8ff9789087f1
 AUX procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch 380 RMD160 1f0796a5e1745d32ac12786e712823ae0359c986 SHA1 145e81079f980913327f3a2680e87d1ebba87f4f SHA256 7fa2c0891f8c96072e0cd6578228b122ca69602e89416e7a73c370895d93a267
 AUX procps-3.2.7-proc-mount.patch 657 RMD160 90d0dae26d4a514ef0dbcb3c90ba167d0890d14e SHA1 07bdfb5484189daad7beb18fd5e2f280e3de3cad SHA256 17194621e6f5307c1712fab15a13a7da0e10315cf8b45b34403b54c70013b2ba
+AUX procps-3.2.8+gmake-3.82.patch 383 RMD160 d72a3a6cc861b9fa69086235fbffeb60c2eaee06 SHA1 3a4908ed8dbc936e39cb9094af8098ef9e656581 SHA256 1ab2174eeeeda64db81dfd9e422663cf9fbe2c3ee6e1f6e0e922e2d7648c05f0
 AUX procps-3.2.8-toprc-fixup.patch 647 RMD160 68ced4f43bcf86f61f4e66baecd60832fbcd8693 SHA1 e81c7dd3f836078bcb9b1d25ef2a161a48c5dce4 SHA256 da07ed67e5d1405ca673075459070f2fee985692ff930124ed484dacfe4db588
 AUX procps-mips-define-pagesize.patch 1028 RMD160 aa0cb4fdf76d50bae983683e0de0a06daba52361 SHA1 7658c35e40c4c565bd4f4124b09c43ec474da0bd SHA256 9000966beaa7ae9e8261dfc691b7b7bec08857e8404de60f30b10bbe6e702d8e
 DIST procps-3.2.8.tar.gz 285758 RMD160 ad63601fb6bf4692108484d9ed362f510cbcf505 SHA1 a0c86790569dec26b5d9037e8868ca907acc9829 SHA256 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
-EBUILD procps-3.2.8-r1.ebuild 2526 RMD160 271a4a5ebac316f88851e0de50e4e09f81eb05cb SHA1 fa1c38f21f21a44b9536f24f3f54af1153baa782 SHA256 7e8e590f20154ae31d721d4a84daea73b50a3089afba89aa50cdcd4e97be7caa
+EBUILD procps-3.2.8-r1.ebuild 2580 RMD160 560c99b7653f566d53972df36521e00b79d97006 SHA1 580ce76f41c5c6cb829308ac76e3ed9386df2529 SHA256 f3e68ba0ef0f9926d0dbd0ccb9cb7d3abc8253f2b831dcab6eb70e8337e7f3f6
 EBUILD procps-3.2.8.ebuild 2457 RMD160 967038956d5cfff8fa4a8890092e94275a932b35 SHA1 42d0731ae16c97c917605b27c8c384e5ea0c5e00 SHA256 13692c647d833b8e122abb8bae7670ee9beb301d0b13e4c2ad1bf296ece4e40e
-MISC ChangeLog 21282 RMD160 1bc9e3e8cc2f8044ea5bb2ebf12311db98079393 SHA1 1d4f63c1621339fe660266a63c140d371d171343 SHA256 e35a15e43afa316d0517be03d16eab3c9e679539158a12b980919e8b60ec1a22
+MISC ChangeLog 21490 RMD160 56ef98df50ff1287ca35c6212c608e2803271aad SHA1 6d12d8067a0442504e43bb84f05a406b6b076584 SHA256 6d091ba62e1d0df9a86ebab26cee69db23bcf4c863e0d28e4410c6bcb2299fd7
 MISC metadata.xml 233 RMD160 eb1f965766a567d9532906b72a415ac9f26568cf SHA1 0d2f3cf7a995f93a571490b449e326f955f49f4f SHA256 3b65bcd57075074266dba6e86dbe969592d58f69469e31072736cd1a42a76932
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkumIaAACgkQV3J2n04EauxXsQCgqWgPw+OkDgZvjb2x9nlhEPxi
-KckAoIVUOhjyhiDQ6+loKvPzDrEVm52J
-=JOc8
+iEYEARECAAYFAkyaH9sACgkQAiZjviIA2XgtCgCfe+G/HuLtQXy6RW3A7WQMdOXJ
+pboAn2drpxrD3qCvaMzxj50ByKqeBuUS
+=B4k+
 -----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch b/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch
new file mode 100644
index 000000000000..87ab13ea4461
--- /dev/null
+++ b/sys-process/procps/files/procps-3.2.8+gmake-3.82.patch
@@ -0,0 +1,14 @@
+Index: procps-3.2.8/Makefile
+===================================================================
+--- procps-3.2.8.orig/Makefile
++++ procps-3.2.8/Makefile
+@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES)
+ # want this rule first, use := on ALL, and ALL not filled in yet
+ all: do_all
+ 
+--include */module.mk
++-include proc/module.mk
++-include ps/module.mk
+ 
+ do_all:    $(ALL)
+ 
diff --git a/sys-process/procps/procps-3.2.8-r1.ebuild b/sys-process/procps/procps-3.2.8-r1.ebuild
index a8f02945953e..2cb94e3ed0c7 100644
--- a/sys-process/procps/procps-3.2.8-r1.ebuild
+++ b/sys-process/procps/procps-3.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.1 2010/01/25 03:06:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.2 2010/09/22 15:24:08 flameeyes Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -23,6 +23,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/procps-3.2.7-proc-mount.patch
 	epatch "${FILESDIR}"/procps-3.2.3-noproc.patch
 	epatch "${FILESDIR}"/procps-3.2.8-toprc-fixup.patch
+	epatch "${FILESDIR}"/procps-3.2.8+gmake-3.82.patch
 
 	# Clean up the makefile
 	#  - we do stripping ourselves