From: Kacper Kowalik <xarthisius@gentoo.org>
Date: Fri, 19 Aug 2011 16:52:19 +0000 (+0000)
Subject: Workaround TOC issue wrt #130943, fix typo, ppc/ppc64 stable wrt #379857
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9a0bc9925d7bc3aed2790b9f9b8092ccd2d67bbd;p=gentoo.git

Workaround TOC issue wrt #130943, fix typo, ppc/ppc64 stable wrt #379857

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 71d09e688dc8..84f8fb37bf8e 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.278 2011/08/19 14:11:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.279 2011/08/19 16:52:19 xarthisius Exp $
+
+  19 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> busybox-1.19.0.ebuild:
+  Workaround TOC issue wrt #130943, fix typo, ppc/ppc64 stable wrt #379857
 
 *busybox-1.19.0 (19 Aug 2011)
 
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 1288bd12e0b2..680e36b4720d 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX busybox-1.17.0-bb.patch 1039 RMD160 abd095949a1a5797a770dd84fbdd247490a7420f SHA1 4f3399421c00961f066b65f4f1955363dc9ed746 SHA256 be449a26d5e87431e2192f79f945e3bf0c999873306d40bf9c0d6cc61da08d48
 AUX busybox-1.18.0-bb.patch 918 RMD160 e6a7be911deb07510ddf46b8a4b8b24ef5b1b29a SHA1 f4815f4cd948c300d65e553486c949c780f05752 SHA256 9e713de11f26a07e5a17d7e62eed7a10b163de91331d50541dcc2c037acbcb67
@@ -32,13 +32,16 @@ DIST busybox-1.19.0.tar.bz2 2168657 RMD160 07c8c313d8ed7edcf8f12fe805389c96bda3d
 EBUILD busybox-1.17.4.ebuild 7921 RMD160 2b3306d4c4b21f4fa246e4963f15ad75707d6fe1 SHA1 7808c464cb6e0d2efd4bd24f3aecaef4ce3c40c4 SHA256 31ee8f50c3123db62879b2209e96e020ae143a5e5f960138924a467eef8f7c8a
 EBUILD busybox-1.18.4.ebuild 8228 RMD160 e56dfe2383ba8507b37c15332b87c5800cd007f7 SHA1 4897ba0aaaf03177760b66545c326d3a032aba82 SHA256 f5345e2a1c4f325ac2b36c32b850cd394187ca6c644a03ef0463b8dd06e0729b
 EBUILD busybox-1.18.5.ebuild 8223 RMD160 a4e3e6cf07d7736d47b21499c1ad30d66ba394df SHA1 c2df0c81bc43746575458e1bf087fcc45a4baa53 SHA256 17517a9d9bfa7fb32375e457fadbb5a31f775001be3624fabce887703edff270
-EBUILD busybox-1.19.0.ebuild 8223 RMD160 485c2e179fdabb4752ef926975e6cf33251b8325 SHA1 7212d94fa93631ba540768d183ae5c453a0d47b6 SHA256 7ec15e6e752548a3d1324b8237cedc2348cf13fe278d357dd13f5989729a30d4
-MISC ChangeLog 41550 RMD160 ba0350d37f94e64f5180e72209f593fd804bc93b SHA1 68d35ff6479d56e7228b0377488604290847c2f7 SHA256 17159caa638479c28f7b4e18db59bf1d023fd6d0fa844db180c85ff5292590bc
+EBUILD busybox-1.19.0.ebuild 8275 RMD160 9fcaa8951c8b44caea9963c37a6c8de90d65a625 SHA1 d920ab6cd1fd5da806f89f06bd249de08597d305 SHA256 fc26ce0c346043098145dc43e5b40fe70533e79bb7bd90a65944f6b53f7fa4ee
+MISC ChangeLog 41707 RMD160 955e47f2cf3872cfa95add6a0a016fed1293c544 SHA1 70c931d06267fbb2c90ff15dc7b0c2d8c0f467ce SHA256 8dfbca546a4db40d68ae786f98c0db3641b8fe767fe86a2329d11319e961ed9d
+MISC busybox-1.19.0.ebuild.bak 8223 RMD160 485c2e179fdabb4752ef926975e6cf33251b8325 SHA1 7212d94fa93631ba540768d183ae5c453a0d47b6 SHA256 7ec15e6e752548a3d1324b8237cedc2348cf13fe278d357dd13f5989729a30d4
 MISC metadata.xml 420 RMD160 a3d9cd7689418647525460862b05d3adfb9cd4f4 SHA1 c67d73ae61fb0180060ff7d3d13b1b5e9ef2c56c SHA256 1d2b931bd8b4026d665b485a21263438fe5892bf81af7139e409bfd61a68d55c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5ObzEACgkQaC/OocHi7JYVQAD9FuRWlObQW+FozfO2dMK9Fx2f
-utSKr1pepnin8irm1mYA/36gukSlVvXZOoPLR0RJWzVKByGbqJ2dRWPfY9TToHPP
-=Bgmt
+iJwEAQECAAYFAk5OlMwACgkQIiMqcbOVdxTmswP+JmCpZFNEgF3dFaP70zZA7quQ
+ZthfhEH0+XDD+XbTl9WkjkJWcAutyXSLcfMlmoomrAuZCL0SLZpPrKqm4yGNiUVM
+ZxVMWU0tM7XS1BW9W6YQfNPoQK3GMVqbn49ZT1UIruNDFpWeU+N/46yhUQsOP8WV
+XkvENPtxUAE1m8ik928=
+=xvRV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.19.0.ebuild b/sys-apps/busybox/busybox-1.19.0.ebuild
index f23e290a1eb4..76629d114557 100644
--- a/sys-apps/busybox/busybox-1.19.0.ebuild
+++ b/sys-apps/busybox/busybox-1.19.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.19.0.ebuild,v 1.1 2011/08/19 14:11:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.19.0.ebuild,v 1.2 2011/08/19 16:52:19 xarthisius Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic savedconfig toolchain-funcs
@@ -57,7 +57,7 @@ else
 fi
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="debug ipv6 make-symlinks +mdev nfs -pam selinux static elibc_glibc"
 RESTRICT="test"
 
@@ -84,6 +84,7 @@ busybox_config_option() {
 src_prepare() {
 	unset KBUILD_OUTPUT #88088
 	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
 	append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags)
 
 	# patches go here!
@@ -252,7 +253,7 @@ pkg_preinst() {
 		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
 		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
 		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is realy what you want."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
 		die "silly options will destroy your system"
 	fi