Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/
Date: Fri, 17 Aug 2018 03:34:55
Message-Id: 1534476883.4d92f97cf68a420fa8dd795ac86ed2df05adab35.grknight@gentoo
1 commit: 4d92f97cf68a420fa8dd795ac86ed2df05adab35
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 17 03:34:17 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 17 03:34:43 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d92f97c
7
8 dev-lang/php: Drop versionator for eapi7-ver
9
10 Package-Manager: Portage-2.3.46, Repoman-2.3.10
11
12 dev-lang/php/php-5.6.36.ebuild | 6 +++---
13 dev-lang/php/php-5.6.37.ebuild | 6 +++---
14 dev-lang/php/php-7.0.29.ebuild | 6 +++---
15 dev-lang/php/php-7.0.30.ebuild | 6 +++---
16 dev-lang/php/php-7.0.31.ebuild | 6 +++---
17 dev-lang/php/php-7.1.16.ebuild | 6 +++---
18 dev-lang/php/php-7.1.18.ebuild | 6 +++---
19 dev-lang/php/php-7.1.20.ebuild | 6 +++---
20 8 files changed, 24 insertions(+), 24 deletions(-)
21
22 diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
23 index fe5b563b7ea..4721afbce53 100644
24 --- a/dev-lang/php/php-5.6.36.ebuild
25 +++ b/dev-lang/php/php-5.6.36.ebuild
26 @@ -3,7 +3,7 @@
27
28 EAPI=6
29
30 -inherit autotools flag-o-matic versionator systemd
31 +inherit autotools flag-o-matic eapi7-ver systemd
32
33 DESCRIPTION="The PHP language runtime engine"
34 HOMEPAGE="https://secure.php.net/"
35 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
36 gd? ( gd )
37 unicode? ( BSD-2 LGPL-2.1 )"
38
39 -SLOT="$(get_version_component_range 1-2)"
40 +SLOT="$(ver_cut 1-2)"
41 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"
42
43 # We can build the following SAPIs in the given order
44 @@ -174,7 +174,7 @@ REQUIRED_USE="
45 sharedmem? ( !threads )
46 "
47
48 -PHP_MV="$(get_major_version)"
49 +PHP_MV="$(ver_cut 1)"
50
51 php_install_ini() {
52 local phpsapi="${1}"
53
54 diff --git a/dev-lang/php/php-5.6.37.ebuild b/dev-lang/php/php-5.6.37.ebuild
55 index deec25b7c9a..56adfd72855 100644
56 --- a/dev-lang/php/php-5.6.37.ebuild
57 +++ b/dev-lang/php/php-5.6.37.ebuild
58 @@ -3,7 +3,7 @@
59
60 EAPI=6
61
62 -inherit autotools flag-o-matic versionator systemd
63 +inherit autotools flag-o-matic eapi7-ver systemd
64
65 DESCRIPTION="The PHP language runtime engine"
66 HOMEPAGE="https://secure.php.net/"
67 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
68 gd? ( gd )
69 unicode? ( BSD-2 LGPL-2.1 )"
70
71 -SLOT="$(get_version_component_range 1-2)"
72 +SLOT="$(ver_cut 1-2)"
73 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"
74
75 # We can build the following SAPIs in the given order
76 @@ -174,7 +174,7 @@ REQUIRED_USE="
77 sharedmem? ( !threads )
78 "
79
80 -PHP_MV="$(get_major_version)"
81 +PHP_MV="$(ver_cut 1)"
82
83 php_install_ini() {
84 local phpsapi="${1}"
85
86 diff --git a/dev-lang/php/php-7.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
87 index 08da09b6482..94a37d5d002 100644
88 --- a/dev-lang/php/php-7.0.29.ebuild
89 +++ b/dev-lang/php/php-7.0.29.ebuild
90 @@ -3,7 +3,7 @@
91
92 EAPI=6
93
94 -inherit flag-o-matic versionator systemd
95 +inherit flag-o-matic eapi7-ver systemd
96
97 DESCRIPTION="The PHP language runtime engine"
98 HOMEPAGE="https://secure.php.net/"
99 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
100 gd? ( gd )
101 unicode? ( BSD-2 LGPL-2.1 )"
102
103 -SLOT="$(get_version_component_range 1-2)"
104 +SLOT="$(ver_cut 1-2)"
105 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"
106
107 # We can build the following SAPIs in the given order
108 @@ -171,7 +171,7 @@ PATCHES=(
109 "${FILESDIR}/php-freetype-2.9.1.patch"
110 )
111
112 -PHP_MV="$(get_major_version)"
113 +PHP_MV="$(ver_cut 1)"
114
115 php_install_ini() {
116 local phpsapi="${1}"
117
118 diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
119 index 08da09b6482..94a37d5d002 100644
120 --- a/dev-lang/php/php-7.0.30.ebuild
121 +++ b/dev-lang/php/php-7.0.30.ebuild
122 @@ -3,7 +3,7 @@
123
124 EAPI=6
125
126 -inherit flag-o-matic versionator systemd
127 +inherit flag-o-matic eapi7-ver systemd
128
129 DESCRIPTION="The PHP language runtime engine"
130 HOMEPAGE="https://secure.php.net/"
131 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
132 gd? ( gd )
133 unicode? ( BSD-2 LGPL-2.1 )"
134
135 -SLOT="$(get_version_component_range 1-2)"
136 +SLOT="$(ver_cut 1-2)"
137 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"
138
139 # We can build the following SAPIs in the given order
140 @@ -171,7 +171,7 @@ PATCHES=(
141 "${FILESDIR}/php-freetype-2.9.1.patch"
142 )
143
144 -PHP_MV="$(get_major_version)"
145 +PHP_MV="$(ver_cut 1)"
146
147 php_install_ini() {
148 local phpsapi="${1}"
149
150 diff --git a/dev-lang/php/php-7.0.31.ebuild b/dev-lang/php/php-7.0.31.ebuild
151 index b88f71d861d..aeaedb772a1 100644
152 --- a/dev-lang/php/php-7.0.31.ebuild
153 +++ b/dev-lang/php/php-7.0.31.ebuild
154 @@ -3,7 +3,7 @@
155
156 EAPI=6
157
158 -inherit flag-o-matic versionator systemd
159 +inherit flag-o-matic eapi7-ver systemd
160
161 DESCRIPTION="The PHP language runtime engine"
162 HOMEPAGE="https://secure.php.net/"
163 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
164 gd? ( gd )
165 unicode? ( BSD-2 LGPL-2.1 )"
166
167 -SLOT="$(get_version_component_range 1-2)"
168 +SLOT="$(ver_cut 1-2)"
169 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"
170
171 # We can build the following SAPIs in the given order
172 @@ -171,7 +171,7 @@ PATCHES=(
173 "${FILESDIR}/php-freetype-2.9.1.patch"
174 )
175
176 -PHP_MV="$(get_major_version)"
177 +PHP_MV="$(ver_cut 1)"
178
179 php_install_ini() {
180 local phpsapi="${1}"
181
182 diff --git a/dev-lang/php/php-7.1.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
183 index da637b55abb..4acba555659 100644
184 --- a/dev-lang/php/php-7.1.16.ebuild
185 +++ b/dev-lang/php/php-7.1.16.ebuild
186 @@ -3,7 +3,7 @@
187
188 EAPI=6
189
190 -inherit flag-o-matic versionator systemd
191 +inherit flag-o-matic eapi7-ver systemd
192
193 DESCRIPTION="The PHP language runtime engine"
194 HOMEPAGE="https://secure.php.net/"
195 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
196 gd? ( gd )
197 unicode? ( BSD-2 LGPL-2.1 )"
198
199 -SLOT="$(get_version_component_range 1-2)"
200 +SLOT="$(ver_cut 1-2)"
201 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"
202
203 # We can build the following SAPIs in the given order
204 @@ -153,7 +153,7 @@ PATCHES=(
205 "${FILESDIR}/php-freetype-2.9.1.patch"
206 )
207
208 -PHP_MV="$(get_major_version)"
209 +PHP_MV="$(ver_cut 1)"
210
211 php_install_ini() {
212 local phpsapi="${1}"
213
214 diff --git a/dev-lang/php/php-7.1.18.ebuild b/dev-lang/php/php-7.1.18.ebuild
215 index 9a6345b2fbb..a9061a4a930 100644
216 --- a/dev-lang/php/php-7.1.18.ebuild
217 +++ b/dev-lang/php/php-7.1.18.ebuild
218 @@ -3,7 +3,7 @@
219
220 EAPI=6
221
222 -inherit flag-o-matic versionator systemd
223 +inherit flag-o-matic eapi7-ver systemd
224
225 DESCRIPTION="The PHP language runtime engine"
226 HOMEPAGE="https://secure.php.net/"
227 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
228 gd? ( gd )
229 unicode? ( BSD-2 LGPL-2.1 )"
230
231 -SLOT="$(get_version_component_range 1-2)"
232 +SLOT="$(ver_cut 1-2)"
233 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"
234
235 # We can build the following SAPIs in the given order
236 @@ -151,7 +151,7 @@ PATCHES=(
237 "${FILESDIR}/php-freetype-2.9.1.patch"
238 )
239
240 -PHP_MV="$(get_major_version)"
241 +PHP_MV="$(ver_cut 1)"
242
243 php_install_ini() {
244 local phpsapi="${1}"
245
246 diff --git a/dev-lang/php/php-7.1.20.ebuild b/dev-lang/php/php-7.1.20.ebuild
247 index d649e1715b3..46badcaed5f 100644
248 --- a/dev-lang/php/php-7.1.20.ebuild
249 +++ b/dev-lang/php/php-7.1.20.ebuild
250 @@ -3,7 +3,7 @@
251
252 EAPI=6
253
254 -inherit flag-o-matic versionator systemd
255 +inherit flag-o-matic eapi7-ver systemd
256
257 DESCRIPTION="The PHP language runtime engine"
258 HOMEPAGE="https://secure.php.net/"
259 @@ -17,7 +17,7 @@ LICENSE="PHP-3.01
260 gd? ( gd )
261 unicode? ( BSD-2 LGPL-2.1 )"
262
263 -SLOT="$(get_version_component_range 1-2)"
264 +SLOT="$(ver_cut 1-2)"
265 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"
266
267 # We can build the following SAPIs in the given order
268 @@ -148,7 +148,7 @@ PATCHES=(
269 "${FILESDIR}/php-freetype-2.9.1.patch"
270 )
271
272 -PHP_MV="$(get_major_version)"
273 +PHP_MV="$(ver_cut 1)"
274
275 php_install_ini() {
276 local phpsapi="${1}"
Report Message
Find on MARC Find on Google Groups