Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc-ng/
Date: Mon, 31 Dec 2018 18:25:02
Message-Id: 1546280674.45c0e9cd021cb7079fc62a057e8c1402b6be2fbd.blueness@gentoo
commit:     45c0e9cd021cb7079fc62a057e8c1402b6be2fbd
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 18:24:34 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 18:24:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c0e9cd

sys-libs/uclibc-ng: bump 9999 to EAPI=7

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-libs/uclibc-ng/uclibc-ng-9999.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index 9e216067cb3..46dcc44af01 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+inherit flag-o-matic multilib savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
@@ -257,22 +257,24 @@ src_prepare() {
 	# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
 	# If we really want the ABI bump, we'll have to hack the gcc
 	# spec file and change the '*link:' rule.
-	version=( $(get_version_components) )
-	if [[ -z ${version[1]} ]]; then
+	version_0=$(ver_cut 1)
+	version_1=$(ver_cut 2)
+	version_2=$(ver_cut 3)
+	if [[ -z ${version_1} ]]; then
 		subversion=0
 		extraversion=0
 	else
-		subversion=${version[1]}
-		if [[ -z ${version[2]} ]]; then
+		subversion=${version_1}
+		if [[ -z ${version_2} ]]; then
 			extraversion=0
 		else
-			extraversion=.${version[2]}
+			extraversion=.${version_2}
 		fi
 	fi
 
 	sed -i \
 		-e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
-		-e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+		-e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \
 		-e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
 		-e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
 		Rules.mak || die