Gentoo Archives: gentoo-dev

From: "Marty E. Plummer" <hanetzer@×××××××××.com>
To: gentoo-dev@l.g.o
Cc: "Marty E. Plummer" <hanetzer@×××××××××.com>
Subject: [gentoo-dev] [PATCH] twisted-r1.eclass: switch to eapi7-ver
Date: Fri, 21 Dec 2018 03:28:45
Message-Id: 20181221032808.8878-1-hanetzer@startmail.com
Signed-off-by: Marty E. Plummer <hanetzer@×××××××××.com>
---
 eclass/twisted-r1.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/twisted-r1.eclass b/eclass/twisted-r1.eclass
index 7f0f796ec96..a57470bb2f3 100644
--- a/eclass/twisted-r1.eclass
+++ b/eclass/twisted-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: twisted-r1.eclass
@@ -25,7 +25,9 @@ esac
 
 if [[ ! ${_TWISTED_R1} ]]; then
 
-inherit distutils-r1 versionator
+inherit distutils-r1
+
+[[ ${EAPI} == [456] ]] && inherit eapi7-ver
 
 fi # ! ${_TWISTED_R1}
 
@@ -96,7 +98,7 @@ _twisted-r1_camelcase() {
 # in dependencies against other Twisted packages.
 #
 # Example: 1.2
-: ${TWISTED_RELEASE:=$(get_version_component_range 1-2 ${PV})}
+: ${TWISTED_RELEASE:=$(ver_cut 1-2 ${PV})}
 
 HOMEPAGE="https://www.twistedmatrix.com/trac/"
 SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN#Twisted}"
-- 
2.20.0