From 9a7a86b976629fee68067ccef2335387092fc7f7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 19 Dec 2006 22:46:51 +0000 Subject: [PATCH] Backport parallel-build disable change from upstream #156980. Package-Manager: portage-2.1.2_rc3-r5 --- sys-power/apcupsd/ChangeLog | 6 ++++- sys-power/apcupsd/Manifest | 26 +++++++++++-------- sys-power/apcupsd/apcupsd-3.12.4.ebuild | 3 ++- .../apcupsd/files/3.12.4/no-parallel.patch | 13 ++++++++++ 4 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 sys-power/apcupsd/files/3.12.4/no-parallel.patch diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog index 0743de242b84..dc4dba79d60e 100644 --- a/sys-power/apcupsd/ChangeLog +++ b/sys-power/apcupsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/apcupsd # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.23 2006/12/19 22:19:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.24 2006/12/19 22:46:51 vapier Exp $ + + 19 Dec 2006; Mike Frysinger + +files/3.12.4/no-parallel.patch, apcupsd-3.12.4.ebuild: + Backport parallel-build disable change from upstream #156980. 19 Dec 2006; Mike Frysinger files/3.12.4/apcupsd.in.patch, files/3.12.4/etc.patch, diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest index b052b1b6f2f6..34f56b586c04 100644 --- a/sys-power/apcupsd/Manifest +++ b/sys-power/apcupsd/Manifest @@ -89,6 +89,10 @@ AUX 3.12.4/exit-status-build.patch 356 RMD160 6f50bd1b8dc3a1cfc3739beea21a2ff2ca MD5 455eb7bf5aec1780794aca89643f4069 files/3.12.4/exit-status-build.patch 356 RMD160 6f50bd1b8dc3a1cfc3739beea21a2ff2caafb6b3 files/3.12.4/exit-status-build.patch 356 SHA256 a1d03e2ef099e8bb89be6edf0f5370460cc12aa732b609528a4851b50d93357e files/3.12.4/exit-status-build.patch 356 +AUX 3.12.4/no-parallel.patch 339 RMD160 c6e50aa5b22438e02e17df4fda41c7cae371217f SHA1 4d20db0882272b9c472b1ea994d115310bcab6d3 SHA256 3bcd10a6f7c623496a75d8cc321becbc24162372936dab4e696b0322c46e4c62 +MD5 1f8ffc6c5b825f0b2d4a7be5743cd44a files/3.12.4/no-parallel.patch 339 +RMD160 c6e50aa5b22438e02e17df4fda41c7cae371217f files/3.12.4/no-parallel.patch 339 +SHA256 3bcd10a6f7c623496a75d8cc321becbc24162372936dab4e696b0322c46e4c62 files/3.12.4/no-parallel.patch 339 AUX 3.12.4/no-strip.patch 2181 RMD160 aa2d852fa223e2c5b18426a5334a1e3ee05b9cdc SHA1 b7952c4102fd810cb325c3cd6ab58592aa3cf527 SHA256 d45668c87581c1f5dd3a235578b291af157678480536d501c7f60b1cdfb0edab MD5 c5bc045a431ba29cf985dd90d9555d27 files/3.12.4/no-strip.patch 2181 RMD160 aa2d852fa223e2c5b18426a5334a1e3ee05b9cdc files/3.12.4/no-strip.patch 2181 @@ -132,14 +136,14 @@ EBUILD apcupsd-3.12.3.ebuild 3031 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313 MD5 762856dea9f3da3eb8c78da2c6cd2725 apcupsd-3.12.3.ebuild 3031 RMD160 c18145b871006ee73b4681ea4ad63a11e1f2313c apcupsd-3.12.3.ebuild 3031 SHA256 df9c5dbe920a0a4be9e4f1385990096d970941af4424ac3c6b235eccbf3a65fc apcupsd-3.12.3.ebuild 3031 -EBUILD apcupsd-3.12.4.ebuild 2929 RMD160 29416b5652ebd09fde41532c793a528f82685cb3 SHA1 3520e480cf67b36543655d13028a57f2407986ac SHA256 4f4da31db365c1e7d4cb97f4e6751f6a40c7255d818feb8e2dc283e0011625c6 -MD5 d94624455d62709b5b2c10a29711d418 apcupsd-3.12.4.ebuild 2929 -RMD160 29416b5652ebd09fde41532c793a528f82685cb3 apcupsd-3.12.4.ebuild 2929 -SHA256 4f4da31db365c1e7d4cb97f4e6751f6a40c7255d818feb8e2dc283e0011625c6 apcupsd-3.12.4.ebuild 2929 -MISC ChangeLog 14641 RMD160 a73914dc203ecedb87d293114e7a1a8caf704368 SHA1 ed8cdf5174efaf7bac069e56f8a99152a7a5a883 SHA256 e7801121a62140c8f306e680594daf90d3d10ad8dfa22405f7028e38e604ddc2 -MD5 c95662e2b42b32bc8bd20fce2830dbff ChangeLog 14641 -RMD160 a73914dc203ecedb87d293114e7a1a8caf704368 ChangeLog 14641 -SHA256 e7801121a62140c8f306e680594daf90d3d10ad8dfa22405f7028e38e604ddc2 ChangeLog 14641 +EBUILD apcupsd-3.12.4.ebuild 2975 RMD160 b308b2d900db14a1b635d072aef345d14485e477 SHA1 b4ce8e79783311f0aa335a2156c05e1e6d1b7242 SHA256 d032ec08b84c0e14317ed8338c61aafdb694314a9088c02b5b03e76a339c41ac +MD5 a1d95410992eb6fe452a862240eb0de7 apcupsd-3.12.4.ebuild 2975 +RMD160 b308b2d900db14a1b635d072aef345d14485e477 apcupsd-3.12.4.ebuild 2975 +SHA256 d032ec08b84c0e14317ed8338c61aafdb694314a9088c02b5b03e76a339c41ac apcupsd-3.12.4.ebuild 2975 +MISC ChangeLog 14814 RMD160 ec08c65a092cad58b1190a3c404883688dabadbb SHA1 d9ae76c1e623c18ae475bed9eccc718aa8ebeda3 SHA256 ff22459c701502d1c142ef3fd75f72fabcef79c2de9ac58300d599562cc0e389 +MD5 07b1d9009e23e4327bf1da852db0e9ab ChangeLog 14814 +RMD160 ec08c65a092cad58b1190a3c404883688dabadbb ChangeLog 14814 +SHA256 ff22459c701502d1c142ef3fd75f72fabcef79c2de9ac58300d599562cc0e389 ChangeLog 14814 MISC metadata.xml 226 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 SHA1 360c056f345a7b50026e93de38b0167f4193904f SHA256 ab1d24920d852e21a852c10c1ec15d5d0cfe91752a67e9eca902177081d6e1c2 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226 RMD160 e0ca1098a8ced8b212c797e8d3343fed766ba485 metadata.xml 226 @@ -174,7 +178,7 @@ SHA256 d5ada22441893d49204b66ed425a7b2b9081e985824ebb9a55b67b3001e98a42 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFiGWIK9sYciBdMQMRArtLAJ4gFVYWOgPkpx/ABsN6sWs5R69cVQCeMXMl -28OTmhvkybRbcrXUDwAZUG8= -=pqWM +iD8DBQFFiGvuK9sYciBdMQMRAkcqAJ9GmURtD9MWdsOL9rmqfN0rF1JclwCeJCC2 +7OR/PxN1ZOdvVZiAGUXdW8E= +=hKcb -----END PGP SIGNATURE----- diff --git a/sys-power/apcupsd/apcupsd-3.12.4.ebuild b/sys-power/apcupsd/apcupsd-3.12.4.ebuild index 8bad2ca506ee..d02bb4bde6c4 100644 --- a/sys-power/apcupsd/apcupsd-3.12.4.ebuild +++ b/sys-power/apcupsd/apcupsd-3.12.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.4 2006/12/19 22:19:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.5 2006/12/19 22:46:51 vapier Exp $ WEBAPP_MANUAL_SLOT="yes" inherit eutils webapp @@ -33,6 +33,7 @@ src_unpack() { epatch "${FILESDIR}"/${PV}/etc.patch epatch "${FILESDIR}"/${PV}/exit-status-build.patch epatch "${FILESDIR}"/${PV}/no-strip.patch + epatch "${FILESDIR}"/${PV}/no-parallel.patch } src_compile() { diff --git a/sys-power/apcupsd/files/3.12.4/no-parallel.patch b/sys-power/apcupsd/files/3.12.4/no-parallel.patch new file mode 100644 index 000000000000..a2aa4c398d1c --- /dev/null +++ b/sys-power/apcupsd/files/3.12.4/no-parallel.patch @@ -0,0 +1,13 @@ +upstream forces this cruft + +--- autoconf/targets.mak ++++ autoconf/targets.mak +@@ -5,6 +5,8 @@ + # + # Copyright (C) 1999-2002 Riccardo Facchetti + ++.NOTPARALLEL: ++ + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: -- 2.26.2