Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/
Date: Sat, 08 Apr 2017 19:27:50
Message-Id: 1491679644.06902785bbdd836806ec9fa021fcb078996a5b76.mjo@gentoo
1 commit: 06902785bbdd836806ec9fa021fcb078996a5b76
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 8 19:15:21 2017 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 8 19:27:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06902785
7
8 dev-php/pecl-ssh2: add php-7.1 support.
9
10 Gentoo-Bug: 603508
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13
14 .../{pecl-ssh2-1.0.ebuild => pecl-ssh2-1.0-r1.ebuild} | 14 ++++++--------
15 dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild | 14 ++++++--------
16 2 files changed, 12 insertions(+), 16 deletions(-)
17
18 diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
19 similarity index 57%
20 rename from dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
21 rename to dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
22 index 43870a60730..28dc40b3371 100644
23 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
24 +++ b/dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
25 @@ -1,17 +1,15 @@
26 -# Copyright 1999-2016 Gentoo Foundation
27 +# Copyright 1999-2017 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=6
31
32 PHP_EXT_NAME="ssh2"
33 -PHP_EXT_INI="yes"
34 -PHP_EXT_ZENDEXT="no"
35
36 -USE_PHP="php7-0 php5-6"
37 +USE_PHP="php5-6 php7-0 php7-1"
38
39 inherit php-ext-pecl-r3
40
41 -USE_PHP="php7-0"
42 +USE_PHP="php7-0 php7-1"
43
44 DESCRIPTION="PHP bindings for the libssh2 library"
45 LICENSE="PHP-3.01"
46 @@ -19,11 +17,11 @@ SLOT="7"
47 IUSE=""
48 KEYWORDS="~amd64 ~x86"
49 DEPEND=">=net-libs/libssh2-1.2"
50 -RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
51 -PHP_EXT_ECONF_ARGS=""
52 +RDEPEND="${DEPEND}
53 + php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
54
55 src_prepare() {
56 - if use php_targets_php7-0 ; then
57 + if use php_targets_php7-0 || use php_targets_php7-1; then
58 php-ext-source-r3_src_prepare
59 else
60 default_src_prepare
61
62 diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
63 index 1e571c0de96..ee9effc3e76 100644
64 --- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
65 +++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
66 @@ -1,18 +1,16 @@
67 -# Copyright 1999-2016 Gentoo Foundation
68 +# Copyright 1999-2017 Gentoo Foundation
69 # Distributed under the terms of the GNU General Public License v2
70
71 EAPI=6
72
73 PHP_EXT_NAME="ssh2"
74 -PHP_EXT_INI="yes"
75 -PHP_EXT_ZENDEXT="no"
76
77 -USE_PHP="php7-0 php5-6"
78 +USE_PHP="php5-6 php7-0 php7-1"
79 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"
80
81 inherit php-ext-source-r3 git-r3
82
83 -USE_PHP="php7-0"
84 +USE_PHP="php7-0 php7-1"
85
86 DESCRIPTION="PHP bindings for the libssh2 library"
87 LICENSE="PHP-3.01"
88 @@ -20,9 +18,9 @@ SLOT="7"
89 IUSE=""
90 KEYWORDS=""
91 DEPEND=">=net-libs/libssh2-1.2"
92 -RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
93 +RDEPEND="${DEPEND}
94 + php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
95 HOMEPAGE="https://pecl.php.net/package/ssh2"
96 -PHP_EXT_ECONF_ARGS=""
97
98 src_unpack() {
99 git-r3_src_unpack
100 @@ -30,7 +28,7 @@ src_unpack() {
101 }
102
103 src_prepare() {
104 - if use php_targets_php7-0 ; then
105 + if use php_targets_php7-0 || use php_targets_php7-1 ; then
106 php-ext-source-r3_src_prepare
107 else
108 default_src_prepare