commit: 621ef8ab87d3bc72e9baf8b36c392872492e9afd
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 22:58:15 2018 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 22:58:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621ef8ab
sys-libs/glibc: Port to eapi7-ver. 2.28 patchlevel bump.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-libs/glibc/Manifest | 1 +
.../{glibc-9999.ebuild => glibc-2.28-r3.ebuild} | 28 +++++++++++-----------
sys-libs/glibc/glibc-9999.ebuild | 24 +++++++++----------
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 42c459898d3..ea1782dc999 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -17,5 +17,6 @@ DIST glibc-2.26.tar.xz 14682748 BLAKE2B
c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebf
DIST glibc-2.27-patches-3.tar.bz2 166511 BLAKE2B
1dc54bef6e82112935c7411f7a5cd07c1edb24c3edaa1e0243b846b3832a40af1ba3a7b77aef04c54a173388156b464ea442fa8310a02e6f44e2ed5b78994286
SHA512
12496e9b0c60630dbec4c2febdd6d20df1f3d7a2c243cc55b595202b27f682b9208e16cd8c387687c0cc9e18b36c3caeef8d1b1148eb3ee8081431997270db5e
DIST glibc-2.27.tar.xz 15395316 BLAKE2B
ea206d304c8c9aa86d69db981a14bea008602cea06a6c151c4971a8df059949ffe5632b42a67ab0ffcd7c4d7ce1ec02ac48815dac4dade1c4dd41eaee8a6ed33
SHA512
7c5581154487d38d173ce1feb944e60207139cca148bccf066eaae322c0c2d219423bdcfa15c7f9be1b5e45dfc43c641cc5d80d3c3c65837d08a83cdb4e2a147
DIST glibc-2.28-patches-3.tar.xz 46172 BLAKE2B
b2dc4de76ab4b4e31a6a043a133f89ede736cf3f21fb3d3091dabf282b2d70f6d017a4aec37319febb2a43c89176887a0920f2aa174fa98c66ad59cbe19ba493
SHA512
4a40a15f0e8d9ad9d33ea07addc3f07fb952bc9c110549815fb0e78cab818bc64bc8d9150874a80c249bf5765a7a2bb9b6ccfb8bc7b12f30e3807e528506cd71
+DIST glibc-2.28-patches-4.tar.xz 76356 BLAKE2B
b9bc6f89d2917f6a2247208ff470c33fa9010838332d9e3229ab7d912a55cb6c2ba6f8c344ed0a2df24924bab68af6b305914adda0b61301f4fc7b2e9ce76cb0
SHA512
5a088cd6b659d605c7445dfd952724533c91d59a05e1c24e505cdcdd3807b00c82ee72cc28b5b3c0a31e55e1c13c48e63779a528dd77b0ffafec62edc829a6cd
DIST glibc-2.28.tar.xz 16484344 BLAKE2B
9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8
SHA512
521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3
DIST glibc-9999-patches-8.tar.xz 14708 BLAKE2B
6c468f11f5b85460219f56ac694e1d3dc3de9a2a23daf7d4f2c715e1b9189bd7a5383093fd8076c2456f9ac0874cb0e2daad8fb360a62038e763a87234f95d95
SHA512
172ab4bc2e716900224b699c9ef89629ffc12756cb72fb7d9628e0ea8fc840cfb2da20ca69fa6c6e1a709f7e2a990bb0f85c32b6ace6fd2d57e2242471900e30
diff --git a/sys-libs/glibc/glibc-9999.ebuild
b/sys-libs/glibc/glibc-2.28-r3.ebuild
similarity index 98%
copy from sys-libs/glibc/glibc-9999.ebuild
copy to sys-libs/glibc/glibc-2.28-r3.ebuild
index 9284afea866..40b8b2271af 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \
+inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \
multilib systemd multiprocessing
DESCRIPTION="GNU libc C library"
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://sourceware.org/git/glibc.git";
inherit git-r3
else
- # 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"
KEYWORDS=""
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
@@ -28,7 +28,7 @@ RELEASE_VER=${PV}
GCC_BOOTSTRAP_VER=20180511
# Gentoo patchset
-PATCH_VER=8
+PATCH_VER=4
SRC_URI+="
https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz";
SRC_URI+=" multilib? (
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
)"
@@ -259,18 +259,18 @@ setup_target_flags() {
sparc64-*)
case $(get-flag mcpu) in
niagara[234])
- if version_is_at_least 2.8 ; then
+ if ver_test -ge 2.8 ; then
cpu="sparc64v2"
- elif version_is_at_least 2.4 ; then
+ elif ver_test -ge 2.4 ; then
cpu="sparc64v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparc64b"
fi
;;
niagara)
- if version_is_at_least 2.4 ; then
+ if ver_test -ge 2.4 ; then
cpu="sparc64v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparc64b"
fi
;;
@@ -288,20 +288,20 @@ setup_target_flags() {
sparc-*)
case $(get-flag mcpu) in
niagara[234])
- if version_is_at_least 2.8 ; then
+ if ver_test -ge 2.8 ; then
cpu="sparcv9v2"
- elif version_is_at_least 2.4 ; then
+ elif ver_test -ge 2.4 ; then
cpu="sparcv9v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparcv9b"
else
cpu="sparcv9"
fi
;;
niagara)
- if version_is_at_least 2.4 ; then
+ if ver_test -ge 2.4 ; then
cpu="sparcv9v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparcv9b"
else
cpu="sparcv9"
@@ -433,7 +433,7 @@ use_multiarch() {
sparc) nver="2.21" ;;
*) return 1 ;;
esac
- version_is_at_least ${nver} ${bver}
+ ver_test ${bver} -ge ${nver}
}
# Setup toolchain variables that had historically been defined in the
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 9284afea866..61685dd31e1 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig \
+inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \
multilib systemd multiprocessing
DESCRIPTION="GNU libc C library"
@@ -259,18 +259,18 @@ setup_target_flags() {
sparc64-*)
case $(get-flag mcpu) in
niagara[234])
- if version_is_at_least 2.8 ; then
+ if ver_test -ge 2.8 ; then
cpu="sparc64v2"
- elif version_is_at_least 2.4 ; then
+ elif ver_test -ge 2.4 ; then
cpu="sparc64v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparc64b"
fi
;;
niagara)
- if version_is_at_least 2.4 ; then
+ if ver_test -ge 2.4 ; then
cpu="sparc64v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparc64b"
fi
;;
@@ -288,20 +288,20 @@ setup_target_flags() {
sparc-*)
case $(get-flag mcpu) in
niagara[234])
- if version_is_at_least 2.8 ; then
+ if ver_test -ge 2.8 ; then
cpu="sparcv9v2"
- elif version_is_at_least 2.4 ; then
+ elif ver_test -ge 2.4 ; then
cpu="sparcv9v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparcv9b"
else
cpu="sparcv9"
fi
;;
niagara)
- if version_is_at_least 2.4 ; then
+ if ver_test -ge 2.4 ; then
cpu="sparcv9v"
- elif version_is_at_least 2.2.3 ; then
+ elif ver_test -ge 2.2.3 ; then
cpu="sparcv9b"
else
cpu="sparcv9"
@@ -433,7 +433,7 @@ use_multiarch() {
sparc) nver="2.21" ;;
*) return 1 ;;
esac
- version_is_at_least ${nver} ${bver}
+ ver_test ${bver} -ge ${nver}
}
# Setup toolchain variables that had historically been defined in the
