sys-libs/glibc: move 2.22 into ~arch

diff --git a/sys-libs/glibc/glibc-2.22.ebuild b/sys-libs/glibc/glibc-2.22-r1.ebuild
similarity index 92%
rename from sys-libs/glibc/glibc-2.22.ebuild
rename to sys-libs/glibc/glibc-2.22-r1.ebuild
index 7fba9943c6da80b7c811d2ef5ba37c69178c3b4b..d6f6033f0d081c36a0c4647d82840ae3f6955272 100644 (file)
--- a/sys-libs/glibc/glibc-2.22.ebuild
+++ b/sys-libs/glibc/glibc-2.22-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
@@ -155,7 +155,7 @@ done
 
 eblit-src_unpack-pre() {
        [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-       # Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
+       # Bug 558636 we don't apply the pie works around for 2.22. It shoud have the support. #558636
        GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
        GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
 }
@@ -164,11 +164,6 @@ eblit-src_prepare-post() {
        cd "${S}"
 
        if use hardened ; then
-               # Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
-               # einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
-               # gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
-               # epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
-
                # We don't enable these for non-hardened as the output is very terse --
                # it only states that a crash happened.  The default upstream behavior
                # includes backtraces and symbols.