Move to official ports addon, and move into ~arch.

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

4 files changed, 19 insertions, 14 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 593ee8c7651a..5e235007f9e7 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.796 2011/11/19 21:14:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.797 2011/11/22 16:38:46 vapier Exp $
+
+  22 Nov 2011; Mike Frysinger <vapier@gentoo.org> glibc-2.14.ebuild,
+  glibc-2.14.1.ebuild:
+  Move to official ports addon, and move into ~arch.
 
   19 Nov 2011; Mike Frysinger <vapier@gentoo.org> glibc-2.12.2.ebuild:
   Mark s390 stable to match latest ibm dev stream.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2377b4db698a..2f2b3c02f2cf 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -48,23 +48,24 @@ DIST glibc-ports-2.10.1.tar.bz2 584860 RMD160 1f094d4df18306ccb01037d07f0a0e3014
 DIST glibc-ports-2.11.tar.bz2 599606 RMD160 e7262cb903b42d27bd0666fb170d2abb4c8b478f SHA1 76a0513c74b80e34f81abcaabbc538fa0f33b6a4 SHA256 38d212b1a22ed121c97f2827e7357e3e077084635ebc197246993d328b1b6589
 DIST glibc-ports-2.12.1.tar.bz2 621800 RMD160 98b5d5f544336f16bfc8af193e5c447ee6c197ed SHA1 396c1e3958a7563ebdffc8ada8e142e0d6c0b225 SHA256 3986c166d08c30b83c9cc7d972651550b548386d5a02e4e4c985d9832de83110
 DIST glibc-ports-2.13.tar.bz2 625945 RMD160 676406e35c8e4fdceb4fcfa83bfbdb1ef3a3aa6a SHA1 1cc771b4bf80f4b0872a342763f4aa4a9a9292cd SHA256 b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a
-DIST glibc-ports-6cc02c7.tar.bz2 630607 RMD160 070c9c0ef196e7f3f79ab920a98219b222cd125e SHA1 e178203449b5d882f7b89dd6d507a1d50d7d686b SHA256 23921bf3040c12b78fd3f99e564b301f141cc14fceee65e1ee431afea5f38583
+DIST glibc-ports-2.14.1.tar.bz2 630641 RMD160 aebb9e53aaa98cd6a76b2a278685cda03049c7d3 SHA1 f649bd5c0191315c92f6a4f46aaf7aa1bf82445d SHA256 1c830afb6d4aa166edaa09ec539580377ecbb16ba655d0aad6f5cb5a9a269aa9
+DIST glibc-ports-2.14.tar.bz2 631253 RMD160 e15f35b9e3bd6acb1a0608be15056bfe7a94c207 SHA1 47da0ab038ea7cc28bc82ff558ad2f6779c79995 SHA256 580a656a55a17ba3db80ab0a9321332cd1f0aaddd7fad76004b524303fb6632d
 EBUILD glibc-2.10.1-r1.ebuild 8107 RMD160 798b89a63ee0451e7075949b02db941f9e4ff634 SHA1 22bcd755c8598136ad04773b6a072abb5c0563af SHA256 044780395e2b461a15625ecd51586655abcc38b8cb72f2fa81cb11ca70d3fe20
 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 8594 RMD160 660ba079f4decffe2feb22eaeb73d9228b742d43 SHA1 1780662824d4085c0401f26e474c65b95e749d19 SHA256 85ba4eb371b21de87aad3aeb2b0c28479146b9b401955bde4bcf65d245b218d0
-EBUILD glibc-2.14.1.ebuild 8791 RMD160 1a8102b2ab8f4b090a72e27b599b3006c2e87b00 SHA1 64ed0fc235e05d6764cd2bc36934b76791890342 SHA256 3c69d38435fd63827f0c21fde35372a2b4da35c238278184d145a9708a75fd3e
-EBUILD glibc-2.14.ebuild 8790 RMD160 c808dcea9320f1f8a870b54ca50c023d10b034f1 SHA1 51f3046ddfe9f53224dc77f8b8e8881dfb6bd021 SHA256 b7f9c2a47dd0d5a6e1927db3cab51a8b7cb52d827df8213df0827e83754d901b
+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.9_p20081201-r3.ebuild 7753 RMD160 8d14a32be1c680e21128552fff3e7299710b0255 SHA1 92f5182dce11c5a77e91ebd9129c2c6ff6938974 SHA256 b90aa298fd49569090f711b2bd9368a66c73cb6c37e85525d1d929ef70e09a5b
 EBUILD glibc-9999.ebuild 8789 RMD160 cb7c0aa7866c031533846c94dd632d26cde8b064 SHA1 e3619da20d49aa6b358b6c95b83c94bf34e5bfe4 SHA256 9e7a7444b0aeb1cd27e5689a94a029c637627971f4fd1fb2e4361a0e7b3d6fc9
-MISC ChangeLog 142409 RMD160 19117132e1fa79970d0b4e666f062fd7277a2b7b SHA1 2d4829b118ab4ff3128c4c73b6f4cac95d6e16f0 SHA256 2b4170c29a2e209af90f7959a7c32dbcf1d791131f1ec267fa505b163d538697
+MISC ChangeLog 142555 RMD160 0ee5f269ea60af54eff378534a7cc84b5edfed76 SHA1 6b29c82bd03a9181488dee58850939f2b6c66a9d SHA256 d6152a09ac9f81b42f00be643758cd24db85a03b2c62ab6f2ba5f1c01397e8c3
 MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7IHD8ACgkQaC/OocHi7Jbi9QD+Ifp1yCaZYKSb5WjQcE/dhbH9
-XPUzYVHuJrRZgmi1p/sA+wTnx1IFMsYfUzaM0JtWFOZigfS67Zru0xBSUDJG2yP5
-=DoJs
+iF4EAREIAAYFAk7L0CAACgkQaC/OocHi7JaxMAD8C2WYJwTLcq30YbRIIVzrB1jM
+z5uAn7HwbXEmK+ceY5MA/0oRX0X9aS2fTTSCwfQRJZp0KEWRJXeJXaArMUoFUVDU
+=iVjT
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.14.1.ebuild b/sys-libs/glibc/glibc-2.14.1.ebuild
index 9804e5e4ec32..2493ea94980a 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
 # 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.2 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1.ebuild,v 1.3 2011/11/22 16:38:46 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2"
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -34,7 +34,7 @@ MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
 PATCH_VER="1"                                  # Gentoo patchset
-PORTS_VER="6cc02c7"                            # version of glibc ports addon
+PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 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
diff --git a/sys-libs/glibc/glibc-2.14.ebuild b/sys-libs/glibc/glibc-2.14.ebuild
index 6a36da827ad3..9ea57d7f33b2 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
 # 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.11 2011/11/16 16:07:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.12 2011/11/22 16:38:46 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2"
-#KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -34,7 +34,7 @@ MANPAGE_VER=""                                 # pregenerated manpages
 INFOPAGE_VER=""                                # pregenerated infopages
 LIBIDN_VER=""                                  # it's integrated into the main tarball now
 PATCH_VER="7"                                  # Gentoo patchset
-PORTS_VER="6cc02c7"                            # version of glibc ports addon
+PORTS_VER=${RELEASE_VER}                       # version of glibc ports addon
 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