Drop extraneous glibc-compat20 #198657.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

8 files changed, 34 insertions, 28 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 54396b9b501e..d88343d8d490 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.614 2009/03/07 11:22:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.615 2009/03/08 20:32:10 vapier Exp $
+
+  08 Mar 2009; Mike Frysinger <vapier@gentoo.org> glibc-2.7-r2.ebuild,
+  glibc-2.8_p20080602.ebuild, glibc-2.8_p20080602-r1.ebuild,
+  glibc-2.9_p20081201.ebuild, glibc-2.9_p20081201-r1.ebuild,
+  glibc-2.9_p20081201-r2.ebuild:
+  Drop extraneous glibc-compat20 #198657.
 
   07 Mar 2009; Markus Meier <maekke@gentoo.org>
   glibc-2.8_p20080602-r1.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b1f214c610b6..d92c855a5f6c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -196,18 +196,18 @@ EBUILD glibc-2.5-r4.ebuild 38644 RMD160 9e28bfbd18b6350b7f7de0ca286b71a7f44dcd2b
 EBUILD glibc-2.5.1.ebuild 38720 RMD160 a560a9a161ee43e97ee7e287888defc236be0034 SHA1 9c7be28380d126686f57fd7da7283eae7c66c0ab SHA256 9825d37c815fd7dfba2ce220aa827008aedaa5732f173cf2cbac1eacd596dc11
 EBUILD glibc-2.6.1.ebuild 12396 RMD160 6e71cb6773c96e650c166589d962487cec7856f2 SHA1 6fcf8e4d8f94854e0be99ff5d4fb938ca382f2f5 SHA256 51ffcb3255af4bc023ad4eba79426d5627e0fd1d1393840c19528b1f9eee3f27
 EBUILD glibc-2.6.ebuild 39471 RMD160 34e74c13546882daaf4d0c2e0b404913f813d59f SHA1 30d2ba6a747852b0c3dab2808bfd36c6b26d51df SHA256 869e4d62f2e9853c1027be0bbf0b8beee37a8394c12c1d6a37254c05fefe572e
-EBUILD glibc-2.7-r2.ebuild 12474 RMD160 d886de1314f1524d3f3b36394d10f3c280c11882 SHA1 d7941db98fe12bff938fc26b7c42a6ae59096dee SHA256 39ba9d30d3f7f80e3dfab20b251cf03b4ffc29be71cbf419f30f6facf9fe26ce
-EBUILD glibc-2.8_p20080602-r1.ebuild 13014 RMD160 02d972d239fe26abd439d2d7c01a3a924af6dedb SHA1 c834aadcc5144422a1877d456c9a77033674f3e7 SHA256 6adf0218ae9b512f3b926dc13eab222fee7734bee0678ea3810266e22fef0907
-EBUILD glibc-2.8_p20080602.ebuild 13122 RMD160 24e7c63d244c59932fcd666d2113288fa4c3f8f6 SHA1 4727d39df371b840aef55b59ec4543f86c7d8557 SHA256 69e5f4eba4dcd81de1af44c4806ddbafa9f00e333a4a84639958430fa78dfc68
-EBUILD glibc-2.9_p20081201-r1.ebuild 13207 RMD160 dd9fc5c71514924d278fbc0f55fc1bf7eefbe0b5 SHA1 2cca5235cc1b11034efad9365bc460ac42cb2e5a SHA256 2f1ff2bbae284c4b682b1dfd32be0c23c63cae942589cce50f43c22e6fae9256
-EBUILD glibc-2.9_p20081201-r2.ebuild 7757 RMD160 e697e0acf63f4336ab5e4591a90d6692bba6986a SHA1 f81af4879d2dc8f5282acbec1aaaf9147aed4b23 SHA256 6062864200dc409751cab5df6f74d4690f8f65962681204d8b595c1e2632e23f
-EBUILD glibc-2.9_p20081201.ebuild 13018 RMD160 fd40079b29ba5981ca48339cd0d87c83044785fc SHA1 b08d8dee985457f5a1842d607595ee699a3e686d SHA256 b27fa3b409df01d9bc1b63b472ceb3a1dcbd1309fd8c607684ad6f6303415b36
-MISC ChangeLog 115459 RMD160 c4562f4d901c56337e85a3c8afb527383709abab SHA1 62315a0d0d331be4c83fa01a5fa47b0472fef86b SHA256 20caccaa50e85751d0b0039dda6d94b780834ddc9bd237f885f55a1b0cc010bc
+EBUILD glibc-2.7-r2.ebuild 12459 RMD160 748a24403e6cae1bf55de490daadae0ef43a94d0 SHA1 0b8b26f27ab996eed8a4dc13ad6ef0db4f31b0dd SHA256 e9b7d4f6c6961ca7ed857f93766b2b5e0babf04811613c6fb131fb0e958d5627
+EBUILD glibc-2.8_p20080602-r1.ebuild 13000 RMD160 c2134fea84d4034c77afac74a5a0cbe161a938dd SHA1 511cf0322c22d999ca9b437e573087eed6c4a0c1 SHA256 be19fd0f379a4826c12cda932a04c95e530b0814712d6a7054a23af5b45de944
+EBUILD glibc-2.8_p20080602.ebuild 13107 RMD160 dc1492a56c08ba31c0bc2b899fecda024c877195 SHA1 34417db8b72e7763c94aa10257fb75df61ecd962 SHA256 d398f90bed64866e8b84dce3cb98340cc565358dd303852b66f4daf07c69937e
+EBUILD glibc-2.9_p20081201-r1.ebuild 13192 RMD160 765fc0bf477c95805288214ef5dfcc0b28b14af5 SHA1 a2e582063c4a33c01355c618c1aef9bfe67c178c SHA256 979a7fc58efede1eb0ce359d05cb033deabf653261b95156bb6b07093fca2c67
+EBUILD glibc-2.9_p20081201-r2.ebuild 7742 RMD160 9a87e2371911621fbefa851a0210757cbe305f62 SHA1 2facd3e2ff8b88525575b7fc1f72f43c61677b5e SHA256 3141403bb651f207125770e3500fe0cc063525b384d94be05ffce4a780ae7334
+EBUILD glibc-2.9_p20081201.ebuild 13003 RMD160 cfb87393c9d5a5553a08e7c89b0860c6ed5bcb8d SHA1 826f088e7f0d9517c845f898628cd69a0ce9e143 SHA256 cff1c2e9af5475c0e4274586fb6ac66950d6c18bee8205a9e489afda3e288f74
+MISC ChangeLog 115728 RMD160 30715ed5d5adf7d2c68ac780b504513052b9bf9a SHA1 516c0910c0f587bdeffee9cd65dcf3507573db95 SHA256 afcd84ef879b7c2aad583a567f61010130ae9c721cd57762e118593f309754f4
 MISC metadata.xml 1112 RMD160 1aa9770356149948593ebe35a1bd3940dd72fca2 SHA1 40514cc45c26bab671d78aa1567441bf72b0c6cc SHA256 4acea698dc4f66c17f4f3f81b28cd6b32f5425fd49f380df4a016489f786b1f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmyWQsACgkQkKaRLQcq0GJDCwCcD4Sdwde3m9UTZzxe8oQ4x5bz
-2uUAoINnDJ+9m0//xY12RhqlN4H1w6e3
-=db28
+iEYEARECAAYFAkm0K1EACgkQn/5bYzqsSmFbIwCfRQjm8qVjpn63AXLokF15KUPi
+hjwAniIEZ7cP96cXkA4qUlZmdUSf59Oo
+=J26O
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.7-r2.ebuild b/sys-libs/glibc/glibc-2.7-r2.ebuild
index 41003b00e227..4f6603f4a45f 100644
--- a/sys-libs/glibc/glibc-2.7-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r2.ebuild,v 1.13 2008/12/29 21:49:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7-r2.ebuild,v 1.14 2009/03/08 20:32:10 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -25,7 +25,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}
 
 # Here's how the cross-compile logic breaks down ...
diff --git a/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild b/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild
index f785c2e5cf89..916ca1d25aaa 100644
--- a/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild,v 1.9 2009/03/07 11:22:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602-r1.ebuild,v 1.10 2009/03/08 20:32:10 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
diff --git a/sys-libs/glibc/glibc-2.8_p20080602.ebuild b/sys-libs/glibc/glibc-2.8_p20080602.ebuild
index 83251e2b60b9..b410d150ef17 100644
--- a/sys-libs/glibc/glibc-2.8_p20080602.ebuild
+++ b/sys-libs/glibc/glibc-2.8_p20080602.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602.ebuild,v 1.12 2008/12/29 21:49:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.8_p20080602.ebuild,v 1.13 2009/03/08 20:32:10 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild
index cf881303d69b..bd45fcb28a9d 100644
--- a/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild,v 1.4 2009/01/09 07:08:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r1.ebuild,v 1.5 2009/03/08 20:32:10 vapier Exp $
 
 GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 1060_all_glibc-nss-deepbind.patch" #252302
 
@@ -33,7 +33,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild
index 2c61b24c548f..6b58c66c50f2 100644
--- a/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild,v 1.5 2009/03/02 08:58:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r2.ebuild,v 1.6 2009/03/08 20:32:10 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...
diff --git a/sys-libs/glibc/glibc-2.9_p20081201.ebuild b/sys-libs/glibc/glibc-2.9_p20081201.ebuild
index 4c8a9567e830..9aa9f14e76f7 100644
--- a/sys-libs/glibc/glibc-2.9_p20081201.ebuild
+++ b/sys-libs/glibc/glibc-2.9_p20081201.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201.ebuild,v 1.2 2008/12/29 21:49:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201.ebuild,v 1.3 2009/03/08 20:32:10 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -31,7 +31,7 @@ LT_VER=""                                      # version of linuxthreads addon
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"}        # min kernel version nptl requires
 #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"}           # min kernel version linuxthreads requires
 
-IUSE="debug gd glibc-omitfp glibc-compat20 hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
+IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}"
 S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}}
 
 # Here's how the cross-compile logic breaks down ...