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.9e356729a0b908d7f622199c469826a9ec1efea1.mjo@gentoo
1 commit: 9e356729a0b908d7f622199c469826a9ec1efea1
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 8 19:22:28 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=9e356729
7
8 dev-php/pecl-ssh2: new v0.13 revision supporting PHP_TARGETS=php7-1.
9
10 The SLOT=0 for this package supports php-5.x, while SLOT=7 supports
11 php-7.x. To get them both installed at the same time, we use some
12 weird trickery. Long story short, we need to add a special case to
13 the SLOT=0 ebuild supporting "php7-1" in PHP_TARGETS.
14
15 The previous commit added php-7.1 support to the SLOT=7 ebuilds, and
16 this commit adds it to the SLOT=0 ebuild.
17
18 Gentoo-Bug: 603508
19
20 Package-Manager: Portage-2.3.3, Repoman-2.3.1
21
22 .../{pecl-ssh2-0.13-r1.ebuild => pecl-ssh2-0.13-r2.ebuild} | 12 +++++-------
23 1 file changed, 5 insertions(+), 7 deletions(-)
24
25 diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
26 similarity index 64%
27 rename from dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild
28 rename to dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
29 index f41851e9648..df76f8cc3b8 100644
30 --- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild
31 +++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
32 @@ -1,13 +1,11 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 +# Copyright 1999-2017 Gentoo Foundation
35 # Distributed under the terms of the GNU General Public License v2
36
37 EAPI=6
38
39 PHP_EXT_NAME="ssh2"
40 -PHP_EXT_INI="yes"
41 -PHP_EXT_ZENDEXT="no"
42
43 -USE_PHP="php7-0 php5-6"
44 +USE_PHP="php5-6 php7-0 php7-1"
45
46 inherit php-ext-pecl-r3
47
48 @@ -18,10 +16,10 @@ LICENSE="PHP-3.01"
49 SLOT="0"
50 IUSE=""
51 KEYWORDS="~amd64 ~x86"
52 -DEPEND=">=net-libs/libssh2-1.2"
53 +DEPEND="net-libs/libssh2"
54 RDEPEND="${DEPEND}"
55 -PHP_EXT_ECONF_ARGS=""
56 -PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )"
57 +PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
58 + php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"
59
60 src_prepare(){
61 if use php_targets_php5-6 ; then