| 1 |
commit: 45c0e9cd021cb7079fc62a057e8c1402b6be2fbd |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 31 18:24:34 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 31 18:24:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c0e9cd |
| 7 |
|
| 8 |
sys-libs/uclibc-ng: bump 9999 to EAPI=7 |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
sys-libs/uclibc-ng/uclibc-ng-9999.ebuild | 18 ++++++++++-------- |
| 14 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild |
| 17 |
index 9e216067cb3..46dcc44af01 100644 |
| 18 |
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild |
| 19 |
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
# Copyright 1999-2018 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="6" |
| 25 |
+EAPI="7" |
| 26 |
|
| 27 |
-inherit flag-o-matic multilib savedconfig toolchain-funcs versionator |
| 28 |
+inherit flag-o-matic multilib savedconfig toolchain-funcs |
| 29 |
|
| 30 |
if [[ ${PV} == "9999" ]] ; then |
| 31 |
EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng" |
| 32 |
@@ -257,22 +257,24 @@ src_prepare() { |
| 33 |
# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking. |
| 34 |
# If we really want the ABI bump, we'll have to hack the gcc |
| 35 |
# spec file and change the '*link:' rule. |
| 36 |
- version=( $(get_version_components) ) |
| 37 |
- if [[ -z ${version[1]} ]]; then |
| 38 |
+ version_0=$(ver_cut 1) |
| 39 |
+ version_1=$(ver_cut 2) |
| 40 |
+ version_2=$(ver_cut 3) |
| 41 |
+ if [[ -z ${version_1} ]]; then |
| 42 |
subversion=0 |
| 43 |
extraversion=0 |
| 44 |
else |
| 45 |
- subversion=${version[1]} |
| 46 |
- if [[ -z ${version[2]} ]]; then |
| 47 |
+ subversion=${version_1} |
| 48 |
+ if [[ -z ${version_2} ]]; then |
| 49 |
extraversion=0 |
| 50 |
else |
| 51 |
- extraversion=.${version[2]} |
| 52 |
+ extraversion=.${version_2} |
| 53 |
fi |
| 54 |
fi |
| 55 |
|
| 56 |
sed -i \ |
| 57 |
-e "/^MAJOR_VERSION/s|:=.*|:= 0|" \ |
| 58 |
- -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \ |
| 59 |
+ -e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \ |
| 60 |
-e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \ |
| 61 |
-e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \ |
| 62 |
Rules.mak || die |
Archives