summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-15 20:04:44 +0000
committerMike Frysinger <vapier@gentoo.org>2012-04-15 20:04:44 +0000
commitda4caa2ba476881db7cd01b096e3418f5f23f604 (patch)
tree6669c4746869906fd52eb5fcfb973cd20cb85f5e /sys-libs
parentadd makeopts_jobs for extracting the -j# from MAKEOPTS (diff)
downloadhistorical-da4caa2ba476881db7cd01b096e3418f5f23f604.tar.gz
historical-da4caa2ba476881db7cd01b096e3418f5f23f604.tar.bz2
historical-da4caa2ba476881db7cd01b096e3418f5f23f604.zip
Use new makeopts_jobs helper from eutils.eclass.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog6
-rw-r--r--sys-libs/glibc/Manifest30
-rw-r--r--sys-libs/glibc/files/eblits/pkg_postinst.eblit8
3 files changed, 23 insertions, 21 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 9262b8222146..f9d78f16a105 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.831 2012/04/14 21:59:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.832 2012/04/15 20:04:44 vapier Exp $
+
+ 15 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+ files/eblits/pkg_postinst.eblit:
+ Use new makeopts_jobs helper from eutils.eclass.
14 Apr 2012; Mike Frysinger <vapier@gentoo.org>
files/eblits/src_compile.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0543408766ae..f63dabbb7919 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -16,7 +16,7 @@ AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50
AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
AUX eblits/common.eblit 9187 RMD160 cdfe1c09712ce768db308d0afea50fc47dde1c93 SHA1 cd7ca828dd5080280370dca12dc31ce952e44c49 SHA256 01cc70baa55965738eeca9054f5b54a635f05fa9b733e27592990840b31a1cd6
-AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
+AUX eblits/pkg_postinst.eblit 1081 RMD160 fd49b7dcb451c853ea0132daac49825b74221cf1 SHA1 986d3ccf545f7a066a0cfae30728cd397ef62893 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180
AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730
AUX eblits/pkg_setup.eblit 3886 RMD160 d2f86a2f404941bc7b6f6dabc29dd293dc2e9972 SHA1 b931c6dbc784f94f80f8ced2d2d0e1f0da4711af SHA256 be9c3dcef8315e52163b98631ea2c170c805f9accbaf5268df292574978c8e71
AUX eblits/src_compile.eblit 6197 RMD160 0ab223836d3f0d8d3dbdc4c1d5780380ad463933 SHA1 0a47f40b6a7a97d172429d41bc010a3f0bb17577 SHA256 52c1cd64e7a685b076b7e368938c1f101717d875ad1ef8127350677c14ddce0a
@@ -66,23 +66,23 @@ EBUILD glibc-2.14.ebuild 8752 RMD160 c3482206a91b6584a53fcff6cee56bad61a4fa12 SH
EBUILD glibc-2.15.ebuild 8527 RMD160 94c5f8e3b9410333e4c805349be94aee83e49dce SHA1 8b20c7ed8aafed829b1534de953adbcd5670da8f SHA256 db8dc4a7df484256f09121f6cd5809715624b093d8ceda3a6e89ac3dcc501827
EBUILD glibc-2.9_p20081201-r3.ebuild 7693 RMD160 d29e97a48c7d73ad524b00ee84ace31482d6cefa SHA1 1d2bc39eab289370c28036e578eb8b1e08558a31 SHA256 48f8eb185d511128b482a84be56d4d3e7bd655ee01d408b09600efd1be5f8397
EBUILD glibc-9999.ebuild 8352 RMD160 6b856a7d19ecce635402e7a19377c3c773b2ea60 SHA1 50c96ba402f80d6dc7655acf825d393f0839f5cf SHA256 a3dec3020bde78dff2315a72c6557491f2abf26698083b5d1c36c1d85e467905
-MISC ChangeLog 40337 RMD160 5cf6739340772ef7923b56469c3773c82d8f40bc SHA1 9e1dc8b5b0d251ee85c238bc2d6bbcc278914f5b SHA256 bf9522c651870c5636a6e587a1dca4747dcfcaa8bbac02bc608a82c5b7079c0b
+MISC ChangeLog 40474 RMD160 68bc939dca2b72e3ec69a52531ae04b8a722194c SHA1 7a5e65bccf22931bd4515a2027570952d73251bb SHA256 22db97520b90c6517edc143b62e7283cc690e97aef3af44b3d98b46331e51ed4
MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBAgAGBQJPifNuAAoJELEHsLL7fEFWEWwQAMeSi7Yai2SIlf6xSRgCLchR
-oHTLoNdeK/1idUcqCwX8F/vjlpfF2qGxwr2dW9V6S7lwkB4Ev2Gol3D7SXmT0QFF
-hKbwLszGxsYMsu9pTEyOylAVLTTQuiHVIfxYxjrEFEm5SuecrX2b1LxKEdquBp1a
-+J0bIVePZdiyqw8ThyPjvbdiGLl41QWIoKgwabQePshdjntnYdRGBbBezpqWShqs
-kpwhmS8t0d2IFBv8/pHFaLChfPYLkusxUsjg4JyR45JCyIJ7DK7h2Vttbg2Fvkkb
-JLW6jib2ybWD1yKqv8r3bimDSWcn7VMGKulenDUJRSIwtjcEA/Be6TF68Y/H5m4H
-Y3iP8va6T2HYyItfM9gd8E8T4NpNDZ8fyeXbt0m1qRw25/PT9/N+2/VgIffC3bKV
-qUoh2vRos3HzOMGzE3tS87b0tqjoLC+zhk9ZX88kpNI5YZk+eH1NgTvjeoRdzb9c
-wfWlpEfLxfaYCB3HkEplPMsiESfa9cvaZYHPbHKrV5bftWAkVAGj3TOP8VOxRvdu
-Ihw0+DvbUJQKPVrE8AbTQzyiiKF3cA4OjoY58BFXUXxLDn2hNUin8oqeabUZvuxa
-uhQdjxoaheCXokMniZnzfM/H4cwXR5CkaQKKiS/vQJVY45KsLEPlf6n2IFrZNeZJ
-ouywzJCNKC33k9u/cKgj
-=FrCk
+iQIcBAEBAgAGBQJPiyn+AAoJELEHsLL7fEFWIGwQAMNWPl14/EOLwY9VXQUG0fU5
+IvkSnHKcb2jN/1UGQpk+Mvxv1ZfEwVKZCeJTR9J6zXgVvl0nP1xIEpqSQEmRIA1v
+B8FvSgBfvtQhyk6d9XzEu3dTyjLzCiuFo+KpS9Ls85wFGkWZI/fx5ikg8y0QUchi
+aoKLOYarw989L8AsWZsKJyCgM57RajGBDY8SF00LTLnsPd9YvdZDi0KgEp38NC5k
+BJvdf2gMa92zT84C2bbLnOS+rtfDO+Nb9/yoYN9eCmReNxP9K8vPrwKrHe2/YhCp
+DlVfaiHugkIfeosIJx5WobN+2lg0ZKPfJQvqa/uj1D61PULOS/blD7YKvLX81GiG
+0cWtSMrOzbvJOxL0AnWeUcGOZnEBZTt1U+XSUVhdvpHAGTdoL9kLpwI4+rYGc7Vc
+Qp9gB+0jFmid6ycprtt/XwCAc4RIAaCYS5Xlbk+0D4Sr0ckgo072KBBmy6VIw5yo
+9XBTW5J0GGlqgPBdurue+JzUSxPjqcHai9wsSSzKi68j90QSrUX1F0ZhPcFQEJlR
+Xh0CGGregljkO1QWkroY3eSuZkUInhGTQLHPjI2BZNpuQAQ1Vy7p5MKnMirGK0nI
+clu3kjms07cga8OsRFn51A8vZlmq3nc2fxbwh6D4/1BRjTxvtumegW7YhrXO21NT
+DGTQI9PJE+wXtXAtYgJ3
+=AeBP
-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/pkg_postinst.eblit b/sys-libs/glibc/files/eblits/pkg_postinst.eblit
index 2566eed35522..9e5447d26754 100644
--- a/sys-libs/glibc/files/eblits/pkg_postinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_postinst.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_postinst.eblit,v 1.1 2009/03/01 21:06:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_postinst.eblit,v 1.2 2012/04/15 20:04:44 vapier Exp $
eblit-glibc-pkg_postinst() {
# nothing to do if just installing headers
@@ -22,8 +22,6 @@ eblit-glibc-pkg_postinst() {
ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
locale_list="${ROOT}usr/share/i18n/SUPPORTED"
fi
- local x jobs
- for x in ${MAKEOPTS} ; do [[ ${x} == -j* ]] && jobs=${x#-j} ; done
- locale-gen -j ${jobs:-1} --config "${locale_list}"
+ locale-gen -j $(makeopts_jobs) --config "${locale_list}"
fi
}