Block older versions of patch so we don't have to test against them #397489 by Brian Harring.

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

8 files changed, 44 insertions, 32 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 34f9c84f8e21..56d7289e0f7a 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.813 2012/01/03 00:35:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.814 2012/01/03 20:09:54 vapier Exp $
+
+  03 Jan 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.13-r2.ebuild,
+  glibc-2.13-r4.ebuild, glibc-2.14.ebuild, glibc-2.14.1.ebuild,
+  glibc-2.14.1-r1.ebuild, glibc-2.14.1-r2.ebuild:
+  Block older versions of patch so we don't have to test against them #397489
+  by Brian Harring.
 
   03 Jan 2012; Mike Frysinger <vapier@gentoo.org>
   glibc-2.9_p20081201-r3.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4c55f89e7df8..9c4b4d96ea09 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -56,31 +56,31 @@ EBUILD glibc-2.10.1-r1.ebuild 8107 RMD160 798b89a63ee0451e7075949b02db941f9e4ff6
 EBUILD glibc-2.11.3.ebuild 8321 RMD160 55d034a3be88ad8eea4b8608d425f23fedf17bce SHA1 c88d57842cafa2163e3118152f46b3b85f25669d SHA256 24c1127c9d2b9897ffe6bcf9d2c813c0670aea4b4d53e816e04f7abc85fac615
 EBUILD glibc-2.12.1-r3.ebuild 8692 RMD160 12a681950b6c34f65078129af40aa77e9fd74b35 SHA1 9990a8020060daba3c2d28b03371cf56c489e1e7 SHA256 05f0722404f9985d0a991e5bec6cb8ae9d9c43fc26216b610284d00de88b60f0
 EBUILD glibc-2.12.2.ebuild 8692 RMD160 6099f8b65eaf802096f420df970f4f7df894c3a3 SHA1 66990cad67f4e6fdc54174e697b9edc416606cdd SHA256 a76ce36eecfec9e87dc5f744d7424f9a8e9a4fc8b7a60b2cc13caf41686b5d41
-EBUILD glibc-2.13-r2.ebuild 8594 RMD160 e255ba39aa10c0703b03d5a5d41f18b28f8dcdb9 SHA1 ae5be41f5102483d774438f24bacd4f63a72f9fc SHA256 42000c8046d3325ade13b6c1a34a9497d04801212002b571f303e9ccf1807ec6
-EBUILD glibc-2.13-r4.ebuild 8586 RMD160 62de91745d8186b4a977d1856ba9e3ddbafb2e49 SHA1 de75397e0180c0b8e786b73604f86675c4411664 SHA256 61bf013f27edd7605f025402f4f5cd8ae7cf8dc5bb24de3e2363b247919718c2
-EBUILD glibc-2.14.1-r1.ebuild 8945 RMD160 c146dc6fca79104b62a3b8ddc031223e55105417 SHA1 8602f451b6eb1985aa7c3e66da0992873f346018 SHA256 167ce97583cdd7d03f23443b218eab8e02a3191ced5cc2ce737c45d36c886ce2
-EBUILD glibc-2.14.1-r2.ebuild 8945 RMD160 4631000744921a37ddf1bbbe6d389bb697277197 SHA1 4cb93187057fc7ff7a571400500322c4422aabc7 SHA256 8a739ec599c59b0a23b21e0b8f218178e90260c850b995a9f63dbb6406f8f17a
-EBUILD glibc-2.14.1.ebuild 8790 RMD160 f1e9c7f95d2486e79303e7d94a259c224344c171 SHA1 01eccd5f190527e884f5708e72a1cf7581e2070b SHA256 c2c602e5e034e0c5093539c15e70a056445d78434ea309d804069b378cd0cc36
-EBUILD glibc-2.14.ebuild 8789 RMD160 2526d5682ba5214e88ac1daa1afa46607f53093a SHA1 3cb67afb2d3606f78047ce96c014fd4a7286018a SHA256 1df3c918ad3a947b54bbd8e6b6e6eb441705d4cb9c561228096820dadc045503
+EBUILD glibc-2.13-r2.ebuild 8617 RMD160 b7a9a67930251ac40f4a4bde21ef2849397574f0 SHA1 3e3912f60e5f6db7221b7b55012bd511ed1757d4 SHA256 e89bfaf6c3c8ae8c145c2cb621e8fd080c059b66ddedae7414295fa6f8a00175
+EBUILD glibc-2.13-r4.ebuild 8609 RMD160 b7b7e9241f9edffe13a7642e8dbdd755745c98a4 SHA1 1c6e1464be0218eb545e1453155770286d846029 SHA256 a9229692b6e171e512c7747baf039b1527402cb9733a938de871d8d743cd8808
+EBUILD glibc-2.14.1-r1.ebuild 8968 RMD160 10b3c60e52a60d05e0330b08d1eb513f86e278bf SHA1 59826344053f1fe2991138cb1ff41389780bf1dd SHA256 09ba619fcbdbcb0bd0f27c19639871b85b60362324a626f8f674aec30946f5ac
+EBUILD glibc-2.14.1-r2.ebuild 8968 RMD160 5b2ded8b7e0e3647b57e4cdc17d59aa10b2d746b SHA1 f1539189460666a9b2f469a9937f95eb951067fd SHA256 e9521dc92f0dbf83b959cd21a1c42899be7275ee11a5034b4814a11dcf73f253
+EBUILD glibc-2.14.1.ebuild 8813 RMD160 aed9592045c2842511497c277c4c79a0043adef2 SHA1 759d2eda7ade9dd34d1e1cdfbb85b890b3d3d909 SHA256 c0a547a759ce09f3754b4cf40a8c5fdb85fcad28577d11c1a8c35d6f4a0e73af
+EBUILD glibc-2.14.ebuild 8812 RMD160 f756180e46e9a36d18728384398daa41b4a67fda SHA1 f8904de5b46867d45225215a40a9934aaa0e3929 SHA256 cdd85a673de42bfee3caf2b94f005899ed50e630b034d6447fb38ee390c3d9ea
 EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 7acecefa5c624837429358db505df5e863eaee90 SHA1 5494a83a774beb78d44e4e010e7c2e9af4c68dab SHA256 742005812b5a42b80a3ca4562b9b6b02661bcda6d77b5068a6e64bb6d20054bd
 EBUILD glibc-9999.ebuild 8789 RMD160 cb7c0aa7866c031533846c94dd632d26cde8b064 SHA1 e3619da20d49aa6b358b6c95b83c94bf34e5bfe4 SHA256 9e7a7444b0aeb1cd27e5689a94a029c637627971f4fd1fb2e4361a0e7b3d6fc9
-MISC ChangeLog 36690 RMD160 0331e3838dae7983e8a4177ac24c16a73d0969a0 SHA1 b0801bc19cfa27e9289c8b8100e6dfed1d6849d7 SHA256 3019f634898f31a7a74db4d5279a80944621ae6902812dc871f1943fbe9aacc0
+MISC ChangeLog 36975 RMD160 5c353d1174662ce9e194c13555ed3707163b7deb SHA1 d7cd531ffc0d1bb29aea6f5d98a01f35aa41ad9d SHA256 609c7c9ff0bf9e29921c95e9f3fe3ac585aff1d786554a4bd597e5b122360a28
 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.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPAk1OAAoJELEHsLL7fEFW1GcQAIaUQcS3ny45D6sXxtMa+ijD
-dnkmuddRSEhPkLShvgQd/Rl4EZxGJYrJEwnlgxwW1OtcA5maYQwDk3UJD6DW2MXz
-1Z5Y301dvdIut/b7zWFWOXka3KxoxPnkRNzNqcX45a6i4A4/iNyCQX35qQfRoUYi
-AaSbR9pA7sG4Q7XNowJkjymOWKLf3w3c9zdN2mDZXIhqeMEwbeBjpG1rSY11K+2D
-wBIbBz+9DKKWTm4cw+l5a1dKAn5wA+mFMk5ZFYNhxqd0Z+o8GOg8rtiqSeJKFQ/+
-sXNbKI0ZwkCjg9uFFqRYvhKpKrykj/gdFS2JlbOV9jiuDtyQ/JeaKj+tGNS1x/EP
-0GGD2Bqv8fq3Dn/DsGPlLBeb9IQPy3UyQCis5HlJ4rTr8gkfrEU+grKZXU1YFgYv
-flJ3R6Y0tSQwKZNo2NajtV/oUhV298wdmLtHJa+R89zm6TZiPLcVn1cIJxn7yJEQ
-J0lr1VC0dtHreuwt39nEgowwNJgTgVuSKgVpZj/bruPSxRCf/sO3wco91FPpiTel
-BEPtw9c/2qi1xen63zSX0C9pI05vhH1qAfD3XqgoGeAvQxVTTKeeZw9G5vxVcUPu
-7lq4UKoKMDOEC/n5Fc44ny0RXd2EaXsnC7ig9B5HNuYXfL+Sgidj6XZCp2mmskmP
-YJhn/WUZ6lrdouNVgEr7
-=SXDj
+iQIcBAEBAgAGBQJPA2CoAAoJELEHsLL7fEFWukUP/2SpvBToDjEjHyFizVRsKKuu
+MWsDct2a80/AcoWczjNFhiau9J5oSxZXeqU8Rb4mKFicIDfMTRU2aKp+IEoa+ptZ
+Y1lI4Nd11AGbfS53pcBHKK7+mDf+y1MG3/phPDM5gXM553sQn0AX+Hn+4q2mu2h8
+vZRIBOSaEXanX8elsT2L4A2Dv9BMMmgDBwbCiCz7w7hZqt6RrBpcN5an6gG4SA9K
+LzCdsaPTB+aZrpIgCXojNpOT1clodzouie77/4ml4r5eTdFH7v3Um4ww3/6l2bY0
+RmAfIa18BJXt6VZ0+ncdAwUzDTjRflZuzKx7QjsRkpTgau/XYoBVNOuUE9ANsBww
+it8wr/k+XgmkLW70EdK8Ys2BkE++xg7uC1s2qGwIelKOYFwblgm1Zs5SXJ8wtmL6
+ts3NohxySesNoy3bq9l0VLbuVxYNM2eu3uIhr26kyFPa83v5o05IAvkif/ond4ui
+Jb491joBnqwxFoBWbHyvJPHlzkB8rdKMTZI09RBv6SK4FcBKh24om8bm992dfbM9
+Fx165bfa1wwwbymmypEXTI2aTIctrkPRv1+3l/bvMZc4PbufOfrigstjtLTpJf8D
+a476A6E3SzgU4iQ41PY8CTddC3LcFksNRXCqT++MFREr6X6y2S4zvcq7NVqFnFtE
+d1mf3gxFnCAcqF107E/g
+=dSaa
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.13-r2.ebuild b/sys-libs/glibc/glibc-2.13-r2.ebuild
index 94446f22728a..55625ec30dfb 100644
--- a/sys-libs/glibc/glibc-2.13-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 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/glibc-2.13-r2.ebuild,v 1.8 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r2.ebuild,v 1.9 2012/01/03 20:09:54 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -92,6 +92,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
+	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
 	nls? ( sys-devel/gettext )
diff --git a/sys-libs/glibc/glibc-2.13-r4.ebuild b/sys-libs/glibc/glibc-2.13-r4.ebuild
index bf755b682882..f76bf2ccb134 100644
--- a/sys-libs/glibc/glibc-2.13-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 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/glibc-2.13-r4.ebuild,v 1.9 2011/12/30 15:06:47 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.10 2012/01/03 20:09:54 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -92,6 +92,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
+	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
 	nls? ( sys-devel/gettext )
diff --git a/sys-libs/glibc/glibc-2.14.1-r1.ebuild b/sys-libs/glibc/glibc-2.14.1-r1.ebuild
index ab9f7c6363c5..ec7e255aba9b 100644
--- a/sys-libs/glibc/glibc-2.14.1-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 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/glibc-2.14.1-r1.ebuild,v 1.1 2011/11/29 16:35:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r1.ebuild,v 1.2 2012/01/03 20:09:54 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -100,6 +100,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
+	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
 	nls? ( sys-devel/gettext )
diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
index 48c5ef6cad92..451ef3eabf0e 100644
--- a/sys-libs/glibc/glibc-2.14.1-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.1 2012/01/01 09:47:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.2 2012/01/03 20:09:54 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -100,6 +100,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
+	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
 	nls? ( sys-devel/gettext )
diff --git a/sys-libs/glibc/glibc-2.14.1.ebuild b/sys-libs/glibc/glibc-2.14.1.ebuild
index 2493ea94980a..aca49b3c047c 100644
--- a/sys-libs/glibc/glibc-2.14.1.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 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/glibc-2.14.1.ebuild,v 1.3 2011/11/22 16:38:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1.ebuild,v 1.4 2012/01/03 20:09:54 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -100,6 +100,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
+	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
 	nls? ( sys-devel/gettext )
diff --git a/sys-libs/glibc/glibc-2.14.ebuild b/sys-libs/glibc/glibc-2.14.ebuild
index 9ea57d7f33b2..f13a07fcdfc8 100644
--- a/sys-libs/glibc/glibc-2.14.ebuild
+++ b/sys-libs/glibc/glibc-2.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 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/glibc-2.14.ebuild,v 1.12 2011/11/22 16:38:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.13 2012/01/03 20:09:54 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -100,6 +100,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	nls? ( sys-devel/gettext )
 	!<sys-apps/sandbox-1.2.18.1-r2
 	!<sys-apps/portage-2.1.2
+	!<sys-devel/patch-2.6
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="!sys-kernel/ps3-sources
 	nls? ( sys-devel/gettext )