commit:     4d92f97cf68a420fa8dd795ac86ed2df05adab35
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 03:34:17 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 03:34:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d92f97c

dev-lang/php: Drop versionator for eapi7-ver

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 dev-lang/php/php-5.6.36.ebuild | 6 +++---
 dev-lang/php/php-5.6.37.ebuild | 6 +++---
 dev-lang/php/php-7.0.29.ebuild | 6 +++---
 dev-lang/php/php-7.0.30.ebuild | 6 +++---
 dev-lang/php/php-7.0.31.ebuild | 6 +++---
 dev-lang/php/php-7.1.16.ebuild | 6 +++---
 dev-lang/php/php-7.1.18.ebuild | 6 +++---
 dev-lang/php/php-7.1.20.ebuild | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
index fe5b563b7ea..4721afbce53 100644
--- a/dev-lang/php/php-5.6.36.ebuild
+++ b/dev-lang/php/php-5.6.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic versionator systemd
+inherit autotools flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -174,7 +174,7 @@ REQUIRED_USE="
        sharedmem? ( !threads )
 "
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

diff --git a/dev-lang/php/php-5.6.37.ebuild b/dev-lang/php/php-5.6.37.ebuild
index deec25b7c9a..56adfd72855 100644
--- a/dev-lang/php/php-5.6.37.ebuild
+++ b/dev-lang/php/php-5.6.37.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic versionator systemd
+inherit autotools flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -174,7 +174,7 @@ REQUIRED_USE="
        sharedmem? ( !threads )
 "
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index 08da09b6482..94a37d5d002 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic versionator systemd
+inherit flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -171,7 +171,7 @@ PATCHES=(
        "${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
index 08da09b6482..94a37d5d002 100644
--- a/dev-lang/php/php-7.0.30.ebuild
+++ b/dev-lang/php/php-7.0.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic versionator systemd
+inherit flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -171,7 +171,7 @@ PATCHES=(
        "${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

diff --git a/dev-lang/php/php-7.0.31.ebuild b/dev-lang/php/php-7.0.31.ebuild
index b88f71d861d..aeaedb772a1 100644
--- a/dev-lang/php/php-7.0.31.ebuild
+++ b/dev-lang/php/php-7.0.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic versionator systemd
+inherit flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -171,7 +171,7 @@ PATCHES=(
        "${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index da637b55abb..4acba555659 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic versionator systemd
+inherit flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -153,7 +153,7 @@ PATCHES=(
        "${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild
index 9a6345b2fbb..a9061a4a930 100644
--- a/dev-lang/php/php-7.1.18.ebuild
+++ b/dev-lang/php/php-7.1.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic versionator systemd
+inherit flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -151,7 +151,7 @@ PATCHES=(
        "${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

diff --git a/dev-lang/php/php-7.1.20.ebuild b/dev-lang/php/php-7.1.20.ebuild
index d649e1715b3..46badcaed5f 100644
--- a/dev-lang/php/php-7.1.20.ebuild
+++ b/dev-lang/php/php-7.1.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic versionator systemd
+inherit flag-o-matic eapi7-ver systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://secure.php.net/";
@@ -17,7 +17,7 @@ LICENSE="PHP-3.01
        gd? ( gd )
        unicode? ( BSD-2 LGPL-2.1 )"
 
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 
 # We can build the following SAPIs in the given order
@@ -148,7 +148,7 @@ PATCHES=(
        "${FILESDIR}/php-freetype-2.9.1.patch"
 )
 
-PHP_MV="$(get_major_version)"
+PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
        local phpsapi="${1}"

Reply via email to