From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1007764-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A5821382C5 for <garchives@archives.gentoo.org>; Tue, 6 Mar 2018 21:18:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A12DE09E5; Tue, 6 Mar 2018 21:18:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25802E09E5 for <gentoo-commits@lists.gentoo.org>; Tue, 6 Mar 2018 21:18:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A28A5335C0A for <gentoo-commits@lists.gentoo.org>; Tue, 6 Mar 2018 21:18:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E95CF1D5 for <gentoo-commits@lists.gentoo.org>; Tue, 6 Mar 2018 21:18:32 +0000 (UTC) From: "Davide Pesavento" <pesa@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" <pesa@gentoo.org> Message-ID: <1520370946.212eddb0eb1b59d05c6dd45dbd47bdf6a50d8ab3.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 212eddb0eb1b59d05c6dd45dbd47bdf6a50d8ab3 X-VCS-Branch: master Date: Tue, 6 Mar 2018 21:18:32 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c3f6d000-7fdf-4ddf-941b-f18bee2ebedd X-Archives-Hash: 91c832d9c54cb54b96e44e073c0febc4 commit: 212eddb0eb1b59d05c6dd45dbd47bdf6a50d8ab3 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Tue Mar 6 21:15:46 2018 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Tue Mar 6 21:15:46 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=212eddb0 qt5-build.eclass: switch to eapi7-ver.eclass eclass/qt5-build.eclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index b381c284..e3c50178 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -13,7 +13,7 @@ # Requires EAPI 6. if [[ ${CATEGORY} != dev-qt ]]; then - die "qt5-build.eclass is only to be used for building Qt 5." + die "qt5-build.eclass is only to be used for building Qt 5" fi case ${EAPI} in @@ -57,15 +57,14 @@ esac # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} -inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx +inherit eapi7-ver estack flag-o-matic ltprune toolchain-funcs virtualx HOMEPAGE="https://www.qt.io/" LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -SLOT=5/$(get_version_component_range 1-2) +SLOT=5/$(ver_cut 1-2) -QT5_MINOR_VERSION=$(get_version_component_range 2) -QT5_PATCH_VERSION=$(get_version_component_range 3) -readonly QT5_MINOR_VERSION QT5_PATCH_VERSION +QT5_MINOR_VERSION=$(ver_cut 2) +readonly QT5_MINOR_VERSION case ${PV} in 5.9999)