(QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true"

Package-Manager: portage-2.1.3_rc6

9 files changed, 63 insertions, 51 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a1f425a51df6..ab59cbd162ab 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.532 2007/06/25 05:42:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.533 2007/07/01 22:36:43 peper Exp $
+
+  01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> glibc-2.3.5-r3.ebuild,
+  glibc-2.3.6-r4.ebuild, glibc-2.3.6-r5.ebuild, glibc-2.4-r4.ebuild,
+  glibc-2.5-r2.ebuild, glibc-2.5-r3.ebuild, glibc-2.6.ebuild:
+  (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true"
 
   25 Jun 2007; Joshua Kinard <kumba@gentoo.org> glibc-2.5-r3.ebuild:
   Stable on mips, per #176712.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ca921d30f0c2..2488f1019481 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -492,38 +492,38 @@ EBUILD glibc-2.3.2-r12.ebuild 22518 RMD160 e6f2d11d4145ac5422ca9ad418b8c0e354462
 MD5 abc628dae12f8a0550e160728c6732e5 glibc-2.3.2-r12.ebuild 22518
 RMD160 e6f2d11d4145ac5422ca9ad418b8c0e35446284e glibc-2.3.2-r12.ebuild 22518
 SHA256 29aadde38d6d7a9fd01ec9fc0814de074ca48b8117d0b1cc3c3f5ee2a6597f32 glibc-2.3.2-r12.ebuild 22518
-EBUILD glibc-2.3.5-r3.ebuild 39524 RMD160 159aa554f5c26b3c7dcde21fe8998e8687d3629e SHA1 812139f89ea5e5dc5db329f1bd9df1347fd30458 SHA256 bda49b1b9203dc92ff64d0a943d8ad0ac1330b4c20d079acc6a2f70dca2cd889
-MD5 16052126ce1f09b87b7279456ced7a09 glibc-2.3.5-r3.ebuild 39524
-RMD160 159aa554f5c26b3c7dcde21fe8998e8687d3629e glibc-2.3.5-r3.ebuild 39524
-SHA256 bda49b1b9203dc92ff64d0a943d8ad0ac1330b4c20d079acc6a2f70dca2cd889 glibc-2.3.5-r3.ebuild 39524
-EBUILD glibc-2.3.6-r4.ebuild 37423 RMD160 049c195f11a598295a6b338eb53a6ab10d4b1499 SHA1 37c56f63a7b60ece95a2dd0c063f4f931281c10c SHA256 a1370ba5f7fb30cdf06acd227e070fbffda093cdbf36d76c7a13adede377c0e8
-MD5 c14a35742a2e47cbb80d91338f05d7bd glibc-2.3.6-r4.ebuild 37423
-RMD160 049c195f11a598295a6b338eb53a6ab10d4b1499 glibc-2.3.6-r4.ebuild 37423
-SHA256 a1370ba5f7fb30cdf06acd227e070fbffda093cdbf36d76c7a13adede377c0e8 glibc-2.3.6-r4.ebuild 37423
-EBUILD glibc-2.3.6-r5.ebuild 37752 RMD160 6091d5eb8f4b55db5b9fd7f16a95ea375600b77d SHA1 66fec24bc948d8618c4b777ec844d1583e385cfc SHA256 f59145bb63a3f7105c22eb469675be122b04c495ba77bf4df8e8883bfde0f602
-MD5 c36417cefc0169d76da0f51d5e353ed5 glibc-2.3.6-r5.ebuild 37752
-RMD160 6091d5eb8f4b55db5b9fd7f16a95ea375600b77d glibc-2.3.6-r5.ebuild 37752
-SHA256 f59145bb63a3f7105c22eb469675be122b04c495ba77bf4df8e8883bfde0f602 glibc-2.3.6-r5.ebuild 37752
-EBUILD glibc-2.4-r4.ebuild 39211 RMD160 dfe18e009ba135229ce8bcef18c59ec5792f8f35 SHA1 459bdb8fb9d1463ac1e0ade6a9058d2b506cbef1 SHA256 b2f4b5e0fa315d6c8c36519d1954b79a1d25e6a4e045a567545b993b52b07661
-MD5 a6df1af971d31e959ee736dcc09a34c6 glibc-2.4-r4.ebuild 39211
-RMD160 dfe18e009ba135229ce8bcef18c59ec5792f8f35 glibc-2.4-r4.ebuild 39211
-SHA256 b2f4b5e0fa315d6c8c36519d1954b79a1d25e6a4e045a567545b993b52b07661 glibc-2.4-r4.ebuild 39211
-EBUILD glibc-2.5-r2.ebuild 38678 RMD160 78926527597f48be31b97b7009eb03eb9510c924 SHA1 a20a63f2e991f499fd871944d6526b9cd2db08bf SHA256 d6ace8ba4075875eb0c7ad330a014130af431f611763ac20daa41ffc0334e634
-MD5 570bc2ee7037348dce766832ef5ad170 glibc-2.5-r2.ebuild 38678
-RMD160 78926527597f48be31b97b7009eb03eb9510c924 glibc-2.5-r2.ebuild 38678
-SHA256 d6ace8ba4075875eb0c7ad330a014130af431f611763ac20daa41ffc0334e634 glibc-2.5-r2.ebuild 38678
-EBUILD glibc-2.5-r3.ebuild 38678 RMD160 85b68117d335058a7077046b3a48371f56114ce5 SHA1 a622560f8397b28e24ad0962f77071b759f3e600 SHA256 0a58af163cc1ac73987ea96d46f40d8a7050c9c3216a7856d9355f9a910516a8
-MD5 407193b971c2beeb58e24f267e5d26c0 glibc-2.5-r3.ebuild 38678
-RMD160 85b68117d335058a7077046b3a48371f56114ce5 glibc-2.5-r3.ebuild 38678
-SHA256 0a58af163cc1ac73987ea96d46f40d8a7050c9c3216a7856d9355f9a910516a8 glibc-2.5-r3.ebuild 38678
-EBUILD glibc-2.6.ebuild 38969 RMD160 4d71e00de4eb6365f764489bca7d8d461ecc364f SHA1 f5b3a765fe733e661b62f72e80c6609740ff1044 SHA256 cb84f67870164c4fc1aa49b9b4d7ac1d6621748ff0bf4c9b2be7654f0fc708c0
-MD5 8200afa988d6e773cf6cc94eea2bf374 glibc-2.6.ebuild 38969
-RMD160 4d71e00de4eb6365f764489bca7d8d461ecc364f glibc-2.6.ebuild 38969
-SHA256 cb84f67870164c4fc1aa49b9b4d7ac1d6621748ff0bf4c9b2be7654f0fc708c0 glibc-2.6.ebuild 38969
-MISC ChangeLog 102654 RMD160 adf9ae8a8aa76f1565c0f04bcb8290c27dd06c64 SHA1 b151c55c532e4ab186147689ccfdf36798935dec SHA256 f04f6dba39648a076934ccaffedd6a3c1608d7aef08749a92eb378873acb2fd0
-MD5 405e3aea8a870b797b0ed299f1469b85 ChangeLog 102654
-RMD160 adf9ae8a8aa76f1565c0f04bcb8290c27dd06c64 ChangeLog 102654
-SHA256 f04f6dba39648a076934ccaffedd6a3c1608d7aef08749a92eb378873acb2fd0 ChangeLog 102654
+EBUILD glibc-2.3.5-r3.ebuild 39522 RMD160 73ba7a00f73ec89f2a13863ae3bff1bd1954a12b SHA1 b1a2004af8fbf9ce5b762c24f932e26eab1ddd54 SHA256 e976082de00c3b5bebc78c95b3c00cb75c876b4c2c944a8b786780165da654ed
+MD5 d3b77205f8e0f4347ed3c4383cfeadc1 glibc-2.3.5-r3.ebuild 39522
+RMD160 73ba7a00f73ec89f2a13863ae3bff1bd1954a12b glibc-2.3.5-r3.ebuild 39522
+SHA256 e976082de00c3b5bebc78c95b3c00cb75c876b4c2c944a8b786780165da654ed glibc-2.3.5-r3.ebuild 39522
+EBUILD glibc-2.3.6-r4.ebuild 37421 RMD160 5e58c4dc66dbb34bbaffa8631aa3c87a405a3841 SHA1 be2d62294d9d88b5e278b14ddbebdd936efedc23 SHA256 81aaee24ae068190578d8bbe380841e8a0aa43c3e9acc7407f08cb711d40688d
+MD5 da0fc350d87f3e70826ec5a0467fab2f glibc-2.3.6-r4.ebuild 37421
+RMD160 5e58c4dc66dbb34bbaffa8631aa3c87a405a3841 glibc-2.3.6-r4.ebuild 37421
+SHA256 81aaee24ae068190578d8bbe380841e8a0aa43c3e9acc7407f08cb711d40688d glibc-2.3.6-r4.ebuild 37421
+EBUILD glibc-2.3.6-r5.ebuild 37750 RMD160 9dad478d1191d646e746d0105fce97346aff3f81 SHA1 ff0746dec46644f1a3dde424be01a38954afb496 SHA256 6b8f24101b9b489427f1c7cc41ce3fb7a7c27602451239eba61aa049b7102475
+MD5 a001c501880c66e81ca4fffe627cd576 glibc-2.3.6-r5.ebuild 37750
+RMD160 9dad478d1191d646e746d0105fce97346aff3f81 glibc-2.3.6-r5.ebuild 37750
+SHA256 6b8f24101b9b489427f1c7cc41ce3fb7a7c27602451239eba61aa049b7102475 glibc-2.3.6-r5.ebuild 37750
+EBUILD glibc-2.4-r4.ebuild 39209 RMD160 b01ab01962c409d8df543bcf68d6613a28bb82e1 SHA1 4aed9d00c60cebc756ff859e19b5f935749ca590 SHA256 74bc249040055f32e81995f73e5c6d1ae759088b3f1cc1802a60bb5c248a27de
+MD5 9dfae094c17ce146b59d0a994d568bd7 glibc-2.4-r4.ebuild 39209
+RMD160 b01ab01962c409d8df543bcf68d6613a28bb82e1 glibc-2.4-r4.ebuild 39209
+SHA256 74bc249040055f32e81995f73e5c6d1ae759088b3f1cc1802a60bb5c248a27de glibc-2.4-r4.ebuild 39209
+EBUILD glibc-2.5-r2.ebuild 38679 RMD160 749a6b56e45a4779fab99ad15035a82b1bfb7100 SHA1 63fb242574748d476562d61e35a449672d2f4e01 SHA256 03ca6e6d1552f1a594fad3983a4ccd823acf3646a059ef152d9fd031321311b6
+MD5 8e2edb148931f7a29d40a89d29955438 glibc-2.5-r2.ebuild 38679
+RMD160 749a6b56e45a4779fab99ad15035a82b1bfb7100 glibc-2.5-r2.ebuild 38679
+SHA256 03ca6e6d1552f1a594fad3983a4ccd823acf3646a059ef152d9fd031321311b6 glibc-2.5-r2.ebuild 38679
+EBUILD glibc-2.5-r3.ebuild 38680 RMD160 508703dfd085992222f27d3f8a93c675a4eb6723 SHA1 909aac4bda42805bca17761a1b0900d4b3b9428c SHA256 2d396f4d0ac7961822ab9c3df9fac1f80cf9303d6c4f825751ddd488aba49837
+MD5 67a7ed13f7097a140537fe6075356df5 glibc-2.5-r3.ebuild 38680
+RMD160 508703dfd085992222f27d3f8a93c675a4eb6723 glibc-2.5-r3.ebuild 38680
+SHA256 2d396f4d0ac7961822ab9c3df9fac1f80cf9303d6c4f825751ddd488aba49837 glibc-2.5-r3.ebuild 38680
+EBUILD glibc-2.6.ebuild 38970 RMD160 99a601403094a926853f18d3a68ac0e2079703e8 SHA1 4b04fefbcc50c7355d9ee75b4656acc4daa71187 SHA256 17c969961f6176a43dfe1e6a62aecf13bc96a24c1597f52364e51597a5785002
+MD5 c1a0e5c602c9822a00fb19c45c6c5d2f glibc-2.6.ebuild 38970
+RMD160 99a601403094a926853f18d3a68ac0e2079703e8 glibc-2.6.ebuild 38970
+SHA256 17c969961f6176a43dfe1e6a62aecf13bc96a24c1597f52364e51597a5785002 glibc-2.6.ebuild 38970
+MISC ChangeLog 102923 RMD160 1643843eb9fb3c151833178896872921d5c080d8 SHA1 abd8ae7486527253c0ec446c648f84aa4e323e9c SHA256 89aa2f003953e5f6d90710347714b4f6cc728175b7e7dc6aaa51d72a1c57ccad
+MD5 e6f27730dc94c39bca23cd4fef302e0c ChangeLog 102923
+RMD160 1643843eb9fb3c151833178896872921d5c080d8 ChangeLog 102923
+SHA256 89aa2f003953e5f6d90710347714b4f6cc728175b7e7dc6aaa51d72a1c57ccad ChangeLog 102923
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -558,7 +558,7 @@ SHA256 02577152bb66278912dc8040d65a126d65d5bf870c957926e64ded22b8dcce4b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGhkyGp/wUKkr7RBoRAhwoAJ4/HSAixftyvX4cbUv9zmbiiVD4BQCeLIJF
-3lw4kdM4SxIryoNDpk3fQ+8=
-=83Hx
+iD8DBQFGiCyEppoStNGKGywRAjzxAJ0SJ9WrVDsy2ud70HRoEfRoxDy55QCgpFzT
+lvq93EdmHqwBt2lLQ4vAYFc=
+=ctTO
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild
index ab8dc036d6a3..98d353c831ff 100644
--- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.31 2007/06/26 02:55:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.32 2007/07/01 22:36:43 peper Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -991,7 +991,8 @@ else
 fi
 
 # we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip"
+EMULTILIB_PKG="true"
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
 # We also need linux26-headers if using NPTL. Including kernel headers is
diff --git a/sys-libs/glibc/glibc-2.3.6-r4.ebuild b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
index 6e760b121fef..42c49d1b8588 100644
--- a/sys-libs/glibc/glibc-2.3.6-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.36 2007/06/26 02:55:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.37 2007/07/01 22:36:43 peper Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -993,7 +993,8 @@ else
 fi
 
 # we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip"
+EMULTILIB_PKG="true"
 
 # We need a new-enough binutils for as-needed
 DEPEND="!ia64? ( >=sys-devel/gcc-3.4 )
diff --git a/sys-libs/glibc/glibc-2.3.6-r5.ebuild b/sys-libs/glibc/glibc-2.3.6-r5.ebuild
index b0192a2a9fae..c251d0bfd1a3 100644
--- a/sys-libs/glibc/glibc-2.3.6-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r5.ebuild,v 1.22 2007/06/26 02:55:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r5.ebuild,v 1.23 2007/07/01 22:36:43 peper Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -998,7 +998,8 @@ else
 fi
 
 # we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip"
+EMULTILIB_PKG="true"
 
 # We need a new-enough binutils for as-needed
 DEPEND="!ia64? ( >=sys-devel/gcc-3.4 )
diff --git a/sys-libs/glibc/glibc-2.4-r4.ebuild b/sys-libs/glibc/glibc-2.4-r4.ebuild
index f0d969e8fe0f..eadd231a1d1d 100644
--- a/sys-libs/glibc/glibc-2.4-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r4.ebuild,v 1.17 2007/06/26 02:55:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r4.ebuild,v 1.18 2007/07/01 22:36:43 peper Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1013,7 +1013,8 @@ else
 fi
 
 # we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip"
+EMULTILIB_PKG="true"
 
 # General: We need a new-enough binutils for as-needed
 # arch: we need to make sure our binutils/gcc supports TLS
diff --git a/sys-libs/glibc/glibc-2.5-r2.ebuild b/sys-libs/glibc/glibc-2.5-r2.ebuild
index fb0bc7408bd3..dd9197b9549a 100644
--- a/sys-libs/glibc/glibc-2.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r2.ebuild,v 1.15 2007/05/19 05:02:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r2.ebuild,v 1.16 2007/07/01 22:36:43 peper Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1032,7 +1032,8 @@ else
 fi
 
 # we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip"
+EMULTILIB_PKG="true"
 
 # General: We need a new-enough binutils for as-needed
 # arch: we need to make sure our binutils/gcc supports TLS
diff --git a/sys-libs/glibc/glibc-2.5-r3.ebuild b/sys-libs/glibc/glibc-2.5-r3.ebuild
index 5585efdaa718..9040de51e70f 100644
--- a/sys-libs/glibc/glibc-2.5-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r3.ebuild,v 1.10 2007/06/25 05:42:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r3.ebuild,v 1.11 2007/07/01 22:36:43 peper Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1032,7 +1032,8 @@ else
 fi
 
 # we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip"
+EMULTILIB_PKG="true"
 
 # General: We need a new-enough binutils for as-needed
 # arch: we need to make sure our binutils/gcc supports TLS
diff --git a/sys-libs/glibc/glibc-2.6.ebuild b/sys-libs/glibc/glibc-2.6.ebuild
index 2eb6d18c4011..2e236ae7c2e7 100644
--- a/sys-libs/glibc/glibc-2.6.ebuild
+++ b/sys-libs/glibc/glibc-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.5 2007/06/30 12:27:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.6 2007/07/01 22:36:43 peper Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1038,7 +1038,8 @@ else
 fi
 
 # we'll handle stripping ourself #46186
-RESTRICT="nostrip multilib-pkg-force"
+RESTRICT="nostrip"
+EMULTILIB_PKG="true"
 
 # General: We need a new-enough binutils for as-needed
 # arch: we need to make sure our binutils/gcc supports TLS