[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2023-12-27 Thread Conrad Kostecki
commit: 74fe80ceb3a33e80e0f586b5a2dfb463efdc940f
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Dec 28 01:49:20 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Dec 28 01:49:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74fe80ce

dev-php/pecl-ssh2: drop php8-0

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild | 2 +-
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
index 26fa81cc22ee..3d39340c1223 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index a4c8e36fc789..3a5b4f3cb3ba 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php8-0 php8-1 php8-2"
+USE_PHP="php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git;
 
 inherit php-ext-source-r3 git-r3



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2023-12-27 Thread Conrad Kostecki
commit: 7d75b40c206d93fd5453af84cd0c7bc96b36db64
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Dec 28 01:48:53 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Dec 28 01:48:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d75b40c

dev-php/pecl-ssh2: drop 1.3.1

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
deleted file mode 100644
index e78e7a80d05a..
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-KEYWORDS="amd64 x86"
-# Upstream notes say there are errors with gcrypt backend
-DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
-RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2023-07-04 Thread Sam James
commit: b5ffb6509717a16e99d02dca96a762cd5e956219
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 10:25:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 10:25:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ffb650

dev-php/pecl-ssh2: Stabilize 1.3.1-r1 amd64, #909616

Signed-off-by: Sam James  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
index 58403c084627..ffd7c7eca7bc 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2023-07-04 Thread Sam James
commit: 190dd89fafd50136308af5771d859b9d919e8f18
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 10:14:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 10:14:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190dd89f

dev-php/pecl-ssh2: Stabilize 1.3.1-r1 x86, #909616

Signed-off-by: Sam James  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
index 405a6b3e9a07..58403c084627 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2023-03-08 Thread Brian Evans
commit: c7f6c7851908d69cb9555704f08334b2afdec5d6
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Mar  8 18:08:12 2023 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Mar  8 18:08:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f6c785

dev-php/pecl-ssh2: Update targets

Closes: https://bugs.gentoo.org/899738
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild | 19 +++
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
new file mode 100644
index ..405a6b3e9a07
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
+RDEPEND="${DEPEND}"

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index b5c9256a3d98..8206375e6835 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git;
 
 inherit php-ext-source-r3 git-r3



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2022-06-30 Thread Brian Evans
commit: fd587747b2356a0faaa40ffa734eb3c84cfacb99
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 30 13:26:40 2022 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Jun 30 14:04:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd587747

dev-php/pecl-ssh2: Update live ebuild and add upstream metadata

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/metadata.xml  | 3 +++
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 8 
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-php/pecl-ssh2/metadata.xml b/dev-php/pecl-ssh2/metadata.xml
index 77793b997e9e..4d08220c3f76 100644
--- a/dev-php/pecl-ssh2/metadata.xml
+++ b/dev-php/pecl-ssh2/metadata.xml
@@ -5,4 +5,7 @@
php-b...@gentoo.org
PHP
 
+
+   php/pecl-networking-ssh2
+
 

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index 3d6ba5b1e14c..b5c9256a3d98 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-3 php7-4 php8-0"
-EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
+USE_PHP="php7-4 php8-0 php8-1"
+EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git;
 
 inherit php-ext-source-r3 git-r3
 



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/, dev-php/pecl-ssh2/files/

2021-09-23 Thread Brian Evans
commit: 41c7e35cc617c5b79089ab4af123f2b5bac1f1b2
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Sep 23 14:41:24 2021 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Sep 23 14:41:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c7e35c

dev-php/pecl-ssh2: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/Manifest |   3 -
 ...1.1.2-fix-php_url-fields-usage-for-php7-3.patch | 302 -
 dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild   |  36 ---
 dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild |  33 ---
 4 files changed, 374 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 4a420e281de..0d800ebf183 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,4 +1 @@
-DIST pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 
23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020
 SHA512 
1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9
-DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 
3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738
 SHA512 
7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
-DIST ssh2-1.1.2.tgz 32057 BLAKE2B 
88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c
 SHA512 
36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
 DIST ssh2-1.3.1.tgz 33838 BLAKE2B 
05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7
 SHA512 
c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76

diff --git 
a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch
 
b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch
deleted file mode 100644
index 1f135256422..000
--- 
a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From a8835aab2c15e794fce13bd927295719e384ad2d Mon Sep 17 00:00:00 2001
-From: Remi Collet 
-Date: Thu, 28 Jun 2018 07:10:35 +0200
-Subject: [PATCH] fix php_url fields usage for PHP 7.3
-

- php_ssh2.h|  8 
- ssh2_fopen_wrappers.c | 55 ---
- ssh2_sftp.c   | 20 +--
- 3 files changed, 53 insertions(+), 30 deletions(-)
-
-diff --git a/php_ssh2.h b/php_ssh2.h
-index 734b795..d010ff9 100644
 a/php_ssh2.h
-+++ b/php_ssh2.h
-@@ -166,6 +166,14 @@ extern php_stream_wrapper php_ssh2_sftp_wrapper;
- extern int le_ssh2_session;
- extern int le_ssh2_sftp;
- 
-+#if PHP_VERSION_ID < 70300
-+#define SSH2_URL_STR(a) (a)
-+#define SSH2_URL_LEN(a) strlen(a)
-+#else
-+#define SSH2_URL_STR(a) ZSTR_VAL(a)
-+#define SSH2_URL_LEN(a) ZSTR_LEN(a)
-+#endif
-+
- #endif/* PHP_SSH2_H */
- 
- /*
-diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
-index 2f96ca4..f2f3475 100644
 a/ssh2_fopen_wrappers.c
-+++ b/ssh2_fopen_wrappers.c
-@@ -215,7 +215,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char 
*path, char *type, php_stre
-   php_url *resource;
-   zval *methods = NULL, *callbacks = NULL, zsession, *tmpzval;
-   zend_long resource_id;
--  char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, 
*privkey_file = NULL;
-+  char *h, *username = NULL, *password = NULL, *pubkey_file = NULL, 
*privkey_file = NULL;
-   int username_len = 0, password_len = 0;
- 
-   h = strstr(path, "Resource id #");
-@@ -233,13 +233,13 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char 
*path, char *type, php_stre
-   return NULL;
-   }
- 
--  if (strncmp(resource->scheme, "ssh2.", sizeof("ssh2.") - 1)) {
-+  if (strncmp(SSH2_URL_STR(resource->scheme), "ssh2.", sizeof("ssh2.") - 
1)) {
-   /* Not an ssh wrapper */
-   php_url_free(resource);
-   return NULL;
-   }
- 
--  if (strcmp(resource->scheme + sizeof("ssh2.") - 1, type)) {
-+  if (strcmp(SSH2_URL_STR(resource->scheme) + sizeof("ssh2.") - 1, type)) 
{
-   /* Wrong ssh2. wrapper type */
-   php_url_free(resource);
-   return NULL;
-@@ -253,13 +253,27 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char 
*path, char *type, php_stre
-   Find resource->path in the path string, then copy the entire 
string from the original path.
-   This includes ?query#fragment in the path string
-   */
-+// TODO 

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2021-09-23 Thread Agostino Sarubbo
commit: 914363db24669d448e2c94ca412df944287f0bae
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep 23 13:57:24 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep 23 13:57:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914363db

dev-php/pecl-ssh2: amd64 stable wrt bug #814386

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
index 9db3c0bbaac..aa0a2f116be 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2021-09-23 Thread Agostino Sarubbo
commit: 513576cceffa4a8e277fb51a67320630394e431f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep 23 06:40:19 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep 23 06:40:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513576cc

dev-php/pecl-ssh2: x86 stable wrt bug #814386

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
index 09caa04b19a..9db3c0bbaac 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2021-04-05 Thread Thomas Deutschmann
commit: d500824d661127a51c2117704c7b797f2c5aa87b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  5 20:29:54 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr  5 20:32:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d500824d

dev-php/pecl-ssh2: bump to v1.3.1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-php/pecl-ssh2/Manifest   |  1 +
 dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild | 21 +
 2 files changed, 22 insertions(+)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 9c1db73d692..4a420e281de 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,3 +1,4 @@
 DIST pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 
23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020
 SHA512 
1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9
 DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 
3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738
 SHA512 
7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 
88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c
 SHA512 
36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
+DIST ssh2-1.3.1.tgz 33838 BLAKE2B 
05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7
 SHA512 
c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
new file mode 100644
index 000..09caa04b19a
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
+RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2021-01-11 Thread Brian Evans
commit: a1b77a43fec21bdfebcd5b126bbe36f3c6acb1ac
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jan 11 16:22:26 2021 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jan 11 16:23:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b77a43

dev-php/pecl-ssh2: Add 8.0 to live ebuild

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index bbaca4c60d0..3d6ba5b1e14 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
 
 inherit php-ext-source-r3 git-r3



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/files/, dev-php/pecl-ssh2/

2020-11-15 Thread Joonas Niilola
commit: 68c431909ba4139a210bf5d75da20815ef4476a5
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Nov 15 14:52:52 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Nov 15 15:31:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c43190

dev-php/pecl-ssh2: fix SizeViolation issue

Closes: https://bugs.gentoo.org/748177
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-php/pecl-ssh2/Manifest |   1 +
 .../files/pecl-ssh2-1.1.2-fix-php7-port.patch  | 746 -
 dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild   |   7 +-
 3 files changed, 5 insertions(+), 749 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index b87e771ebe2..9c1db73d692 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,2 +1,3 @@
+DIST pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 
23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020
 SHA512 
1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9
 DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 
3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738
 SHA512 
7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 
88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c
 SHA512 
36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36

diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch 
b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
deleted file mode 100644
index 9d4f9bd166e..000
--- a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
+++ /dev/null
@@ -1,746 +0,0 @@
-From 073067ba96ac99ed5696d27f13ca6c8124986e74 Mon Sep 17 00:00:00 2001
-From: Jan-E 
-Date: Thu, 28 Jun 2018 08:43:48 +0200
-Subject: [PATCH] @dstogov Fixed PHP7 port. Restored commented reference
- counting.
-

- php_ssh2.h|  14 +++---
- ssh2.c|  26 +-
- ssh2_fopen_wrappers.c | 129 ++
- ssh2_sftp.c   |  59 ++-
- 4 files changed, 102 insertions(+), 126 deletions(-)
-
-diff --git a/php_ssh2.h b/php_ssh2.h
-index d010ff9..2bbaa26 100644
 a/php_ssh2.h
-+++ b/php_ssh2.h
-@@ -73,14 +73,14 @@ typedef struct _php_ssh2_sftp_data {
-   LIBSSH2_SESSION *session;
-   LIBSSH2_SFTP *sftp;
- 
--  int session_rsrcid;
-+  zend_resource *session_rsrc;
- } php_ssh2_sftp_data;
- 
- typedef struct _php_ssh2_listener_data {
-   LIBSSH2_SESSION *session;
-   LIBSSH2_LISTENER *listener;
- 
--  int session_rsrcid;
-+  zend_resource *session_rsrc;
- } php_ssh2_listener_data;
- 
- #include "libssh2_publickey.h"
-@@ -89,7 +89,7 @@ typedef struct _php_ssh2_pkey_subsys_data {
-   LIBSSH2_SESSION *session;
-   LIBSSH2_PUBLICKEY *pkey;
- 
--  int session_rsrcid;
-+  zend_resource *session_rsrc;
- } php_ssh2_pkey_subsys_data;
- 
- #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \
-@@ -118,8 +118,8 @@ typedef struct _php_ssh2_channel_data {
-   char is_blocking;
-   long timeout;
- 
--  /* Resource ID */
--  int session_rsrcid;
-+  /* Resource */
-+  zend_resource *session_rsrc;
- 
-   /* Allow one stream to be closed while the other is kept open */
-   unsigned char *refcount;
-@@ -151,8 +151,8 @@ PHP_FUNCTION(ssh2_sftp_realpath);
- LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval 
*methods, zval *callbacks);
- void php_ssh2_sftp_dtor(zend_resource *rsrc);
- php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, 
php_stream_context *context,
--  
LIBSSH2_SESSION **psession, int *presource_id,
--  
LIBSSH2_SFTP **psftp, int *psftp_rsrcid);
-+  
LIBSSH2_SESSION **psession, zend_resource **presource,
-+  
LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc);
- 
- extern php_stream_ops php_ssh2_channel_stream_ops;
- 
-diff --git a/ssh2.c b/ssh2.c
-index e73867e..849766b 100644
 a/ssh2.c
-+++ b/ssh2.c
-@@ -772,9 +772,8 @@ PHP_FUNCTION(ssh2_forward_listen)
- 
-   data = emalloc(sizeof(php_ssh2_listener_data));
-   data->session = session;
--  data->session_rsrcid = Z_LVAL_P(zsession);
--  //TODO 

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2020-01-23 Thread Brian Evans
commit: faab86a2a5565c6d74f5b5875ac36cfd594b9af6
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jan 23 18:05:12 2020 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Jan 23 18:38:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faab86a2

dev-php/pecl-ssh2: Drop unsupported slots from live build

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 15 ++-
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index 583c2bfcf03..03d40dfe4d2 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -5,27 +5,16 @@ EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
 
 inherit php-ext-source-r3 git-r3
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
 KEYWORDS=""
 DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND}
-   php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+RDEPEND="${DEPEND}"
 HOMEPAGE="https://pecl.php.net/package/ssh2;
-
-src_prepare() {
-   if use php_targets_php7-1 || use php_targets_php7-2 || use 
php_targets_php7-3 || use php_targets_php7-4 ; then
-   php-ext-source-r3_src_prepare
-   else
-   default_src_prepare
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/files/, profiles/, dev-php/pecl-ssh2/

2019-12-30 Thread Brian Evans
commit: 92020f7e6734f711a8e269842798c0730198eea5
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec 30 14:27:15 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Dec 30 15:09:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92020f7e

dev-php/pecl-ssh2: Remove masked version

Bug: https://bugs.gentoo.org/651784
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/Manifest   |  1 -
 dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch | 49 
 dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild   | 32 
 profiles/package.mask|  1 -
 4 files changed, 83 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 55e27af2e95..b87e771ebe2 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,3 +1,2 @@
 DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 
3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738
 SHA512 
7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
-DIST ssh2-0.13.tgz 28984 BLAKE2B 
3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9
 SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 
88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c
 SHA512 
36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36

diff --git a/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch 
b/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch
deleted file mode 100644
index c9c052fd32d..000
--- a/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 093906ec1c065e86ad1cd4dabbc89b1ccae11938 Mon Sep 17 00:00:00 2001
-From: Remi Collet 
-Date: Thu, 10 Nov 2016 09:16:02 +0100
-Subject: [PATCH] fix for PHP 7.0.13 where php_url_parse fails
-

- ssh2_fopen_wrappers.c | 17 -
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
-index 8472ddd..89b34eb 100644
 a/ssh2_fopen_wrappers.c
-+++ b/ssh2_fopen_wrappers.c
-@@ -198,10 +198,20 @@ php_url *php_ssh2_fopen_wraper_parse_path(   char 
*path, char *type, php_stream_co
-   php_url *resource;
-   zval *methods = NULL, *callbacks = NULL, zsession, **tmpzval;
-   long resource_id;
--  char *s, *username = NULL, *password = NULL, *pubkey_file = NULL, 
*privkey_file = NULL;
-+  char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, 
*privkey_file = NULL;
-   int username_len = 0, password_len = 0;
- 
--  resource = php_url_parse(path);
-+  h = strstr(path, "Resource id #");
-+  if (h) {
-+  /* Starting with 5.6.28, 7.0.13 need to be clean, else 
php_url_parse will fail */
-+  char *tmp = estrdup(path);
-+
-+  strncpy(tmp + (h-path), h + sizeof("Resource id #")-1, 
strlen(tmp)-sizeof("Resource id #"));
-+  resource = php_url_parse(tmp);
-+  efree(tmp);
-+  } else {
-+  resource = php_url_parse(path);
-+  }
-   if (!resource || !resource->path) {
-   return NULL;
-   }
-@@ -232,9 +242,6 @@ php_url *php_ssh2_fopen_wraper_parse_path( char *path, 
char *type, php_stream_co
- 
-   /* Look for a resource ID to reuse a session */
-   s = resource->host;
--  if (strncmp(resource->host, "Resource id #", sizeof("Resource id #") - 
1) == 0) {
--  s = resource->host + sizeof("Resource id #") - 1;
--  }
-   if (is_numeric_string(s, strlen(s), _id, NULL, 0) == IS_LONG) {
-   php_ssh2_sftp_data *sftp_data;
- 
--- 
-2.1.4
-

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
deleted file mode 100644
index 25a9a72ff7c..000
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php5-6"
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-# Upstream notes say there are errors with gcrypt backend
-DEPEND="net-libs/libssh2[-gcrypt]"
-RDEPEND="${DEPEND}"
-PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
-   php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"
-
-src_prepare(){
-   if use php_targets_php5-6 ; then
-   local PATCHES=( 

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2019-12-06 Thread Thomas Deutschmann
commit: 626d7045677f274cbbafb7a90b8a39a40e4db636
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  6 14:16:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  6 14:17:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626d7045

dev-php/pecl-ssh2: fix ebuild

When pecl-ssh2-1.2 bump happened, - ebuild was accidentially used
as source which can't be used for non-live ebuild versions.

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-php/pecl-ssh2/Manifest |  1 +
 dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild | 12 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index f87f683fe31..55e27af2e95 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,2 +1,3 @@
+DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 
3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738
 SHA512 
7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
 DIST ssh2-0.13.tgz 28984 BLAKE2B 
3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9
 SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 
88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c
 SHA512 
36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
index 583c2bfcf03..ffc132c9374 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
@@ -6,9 +6,11 @@ EAPI="7"
 PHP_EXT_NAME="ssh2"
 
 USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
 
-inherit php-ext-source-r3 git-r3
+inherit php-ext-pecl-r3
+
+# https://pecl.php.net/get/ssh2-1.2.tgz isn't work for some weeks
+SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz;
 
 USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
@@ -16,11 +18,11 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS=""
-DEPEND=">=net-libs/libssh2-1.2"
+KEYWORDS="~amd64 ~x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}
php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-HOMEPAGE="https://pecl.php.net/package/ssh2;
 
 src_prepare() {
if use php_targets_php7-1 || use php_targets_php7-2 || use 
php_targets_php7-3 || use php_targets_php7-4 ; then



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2019-11-28 Thread Thomas Deutschmann
commit: c69513d912f518d237f7b34aa66b50cedf2384c6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov 28 22:45:17 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov 28 22:47:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69513d9

dev-php/pecl-ssh2: add PHP 7.4 support

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild  | 6 +++---
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
index 72ef46fdff1..583c2bfcf03 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
@@ -5,12 +5,12 @@ EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
 
 inherit php-ext-source-r3 git-r3
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 HOMEPAGE="https://pecl.php.net/package/ssh2;
 
 src_prepare() {
-   if use php_targets_php7-1 || use php_targets_php7-2 || use 
php_targets_php7-3 ; then
+   if use php_targets_php7-1 || use php_targets_php7-2 || use 
php_targets_php7-3 || use php_targets_php7-4 ; then
php-ext-source-r3_src_prepare
else
default_src_prepare

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index 72ef46fdff1..583c2bfcf03 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -5,12 +5,12 @@ EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
 
 inherit php-ext-source-r3 git-r3
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 HOMEPAGE="https://pecl.php.net/package/ssh2;
 
 src_prepare() {
-   if use php_targets_php7-1 || use php_targets_php7-2 || use 
php_targets_php7-3 ; then
+   if use php_targets_php7-1 || use php_targets_php7-2 || use 
php_targets_php7-3 || use php_targets_php7-4 ; then
php-ext-source-r3_src_prepare
else
default_src_prepare



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2019-09-24 Thread Thomas Deutschmann
commit: fe0c9a9616044fc33cc65308fdab4aaee164201c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Sep 24 10:58:36 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Sep 24 13:47:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe0c9a96

dev-php/pecl-ssh2: bump to v1.2

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
new file mode 100644
index 000..72ef46fdff1
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
+EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
+
+inherit php-ext-source-r3 git-r3
+
+USE_PHP="php7-1 php7-2 php7-3"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS=""
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND}
+   php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+HOMEPAGE="https://pecl.php.net/package/ssh2;
+
+src_prepare() {
+   if use php_targets_php7-1 || use php_targets_php7-2 || use 
php_targets_php7-3 ; then
+   php-ext-source-r3_src_prepare
+   else
+   default_src_prepare
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/, dev-php/pecl-ssh2/files/

2019-06-07 Thread Thomas Deutschmann
commit: 99a7b03f4133a1c6f8d5b68fa244762a3c41737a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jun  7 14:07:30 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jun  7 14:13:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a7b03f

dev-php/pecl-ssh2: add PHP 7.3 support

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/pecl-ssh2-1.1.2-fix-php7-port.patch  | 746 +
 ...1.1.2-fix-php_url-fields-usage-for-php7-3.patch | 302 +
 dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild   |  15 +-
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild|  10 +-
 4 files changed, 1063 insertions(+), 10 deletions(-)

diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch 
b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
new file mode 100644
index 000..9d4f9bd166e
--- /dev/null
+++ b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
@@ -0,0 +1,746 @@
+From 073067ba96ac99ed5696d27f13ca6c8124986e74 Mon Sep 17 00:00:00 2001
+From: Jan-E 
+Date: Thu, 28 Jun 2018 08:43:48 +0200
+Subject: [PATCH] @dstogov Fixed PHP7 port. Restored commented reference
+ counting.
+
+---
+ php_ssh2.h|  14 +++---
+ ssh2.c|  26 +-
+ ssh2_fopen_wrappers.c | 129 ++
+ ssh2_sftp.c   |  59 ++-
+ 4 files changed, 102 insertions(+), 126 deletions(-)
+
+diff --git a/php_ssh2.h b/php_ssh2.h
+index d010ff9..2bbaa26 100644
+--- a/php_ssh2.h
 b/php_ssh2.h
+@@ -73,14 +73,14 @@ typedef struct _php_ssh2_sftp_data {
+   LIBSSH2_SESSION *session;
+   LIBSSH2_SFTP *sftp;
+ 
+-  int session_rsrcid;
++  zend_resource *session_rsrc;
+ } php_ssh2_sftp_data;
+ 
+ typedef struct _php_ssh2_listener_data {
+   LIBSSH2_SESSION *session;
+   LIBSSH2_LISTENER *listener;
+ 
+-  int session_rsrcid;
++  zend_resource *session_rsrc;
+ } php_ssh2_listener_data;
+ 
+ #include "libssh2_publickey.h"
+@@ -89,7 +89,7 @@ typedef struct _php_ssh2_pkey_subsys_data {
+   LIBSSH2_SESSION *session;
+   LIBSSH2_PUBLICKEY *pkey;
+ 
+-  int session_rsrcid;
++  zend_resource *session_rsrc;
+ } php_ssh2_pkey_subsys_data;
+ 
+ #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \
+@@ -118,8 +118,8 @@ typedef struct _php_ssh2_channel_data {
+   char is_blocking;
+   long timeout;
+ 
+-  /* Resource ID */
+-  int session_rsrcid;
++  /* Resource */
++  zend_resource *session_rsrc;
+ 
+   /* Allow one stream to be closed while the other is kept open */
+   unsigned char *refcount;
+@@ -151,8 +151,8 @@ PHP_FUNCTION(ssh2_sftp_realpath);
+ LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval 
*methods, zval *callbacks);
+ void php_ssh2_sftp_dtor(zend_resource *rsrc);
+ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, 
php_stream_context *context,
+-  
LIBSSH2_SESSION **psession, int *presource_id,
+-  
LIBSSH2_SFTP **psftp, int *psftp_rsrcid);
++  
LIBSSH2_SESSION **psession, zend_resource **presource,
++  
LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc);
+ 
+ extern php_stream_ops php_ssh2_channel_stream_ops;
+ 
+diff --git a/ssh2.c b/ssh2.c
+index e73867e..849766b 100644
+--- a/ssh2.c
 b/ssh2.c
+@@ -772,9 +772,8 @@ PHP_FUNCTION(ssh2_forward_listen)
+ 
+   data = emalloc(sizeof(php_ssh2_listener_data));
+   data->session = session;
+-  data->session_rsrcid = Z_LVAL_P(zsession);
+-  //TODO Sean-Der
+-  //zend_list_addref(data->session_rsrcid);
++  data->session_rsrc = Z_RES_P(zsession);
++  Z_ADDREF_P(zsession);
+   data->listener = listener;
+ 
+   RETURN_RES(zend_register_resource(data, le_ssh2_listener));
+@@ -810,7 +809,7 @@ PHP_FUNCTION(ssh2_forward_accept)
+   channel_data->channel = channel;
+   channel_data->streamid = 0;
+   channel_data->is_blocking = 0;
+-  channel_data->session_rsrcid = data->session_rsrcid;
++  channel_data->session_rsrc = data->session_rsrc;
+   channel_data->refcount = NULL;
+ 
+   stream = php_stream_alloc(_ssh2_channel_stream_ops, channel_data, 
0, "r+");
+@@ -820,8 +819,12 @@ PHP_FUNCTION(ssh2_forward_accept)
+   libssh2_channel_free(channel);
+   RETURN_FALSE;
+   }
+-  //TODO Sean-Der
+-  //zend_list_addref(channel_data->session_rsrcid);
++
++#if PHP_VERSION_ID < 70300
++  GC_REFCOUNT(channel_data->session_rsrc)++;
++#else
++  GC_ADDREF(channel_data->session_rsrc);
++#endif
+ 
+   

[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2018-10-04 Thread Brian Evans
commit: 81811a06e154455918543bc9e7cbb5478927be07
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Oct  4 14:00:48 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Oct  4 14:02:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81811a06

dev-php/pecl-ssh2: Drop old version

Signed-off-by: Brian Evans  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-php/pecl-ssh2/Manifest   |  1 -
 dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild | 30 --
 2 files changed, 31 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index ce25ae74681..f87f683fe31 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,3 +1,2 @@
 DIST ssh2-0.13.tgz 28984 BLAKE2B 
3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9
 SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
-DIST ssh2-1.1.1.tgz 27551 BLAKE2B 
5e8e32c790a1d8646497ea6c4893694b2cc511a9a4753d66788c618ce7f8cb04d37fcd54a21c59dda918ba6ef27a1abd1b32c2d515d07c0925ab26e9a7e58941
 SHA512 
92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 
88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c
 SHA512 
36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
deleted file mode 100644
index 2c2f92bed94..000
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1"
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-KEYWORDS="amd64 x86"
-# Upstream notes say there are errors with gcrypt backend
-DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
-RDEPEND="${DEPEND}
-   php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-
-src_prepare() {
-   if use php_targets_php7-0 || use php_targets_php7-1; then
-   php-ext-source-r3_src_prepare
-   else
-   default_src_prepare
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2018-10-02 Thread Mikle Kolyada
commit: 9ca5686da5779d7faf0e078169953102c3b044ed
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Oct  2 21:12:56 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Oct  2 21:13:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca5686d

dev-php/pecl-ssh2: amd64 stable wrt bug #667086

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
index 946604614a2..619e242eff1 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2018-10-01 Thread Thomas Deutschmann
commit: 0d11999a9a012d09bb2be0b15500f9b8d7f1af11
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct  1 21:36:20 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct  1 21:46:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d11999a

dev-php/pecl-ssh2: x86 stable (bug #667086)

Signed-off-by: Thomas Deutschmann  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
index 09e08c19122..946604614a2 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
@@ -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
 
 EAPI=6
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2018-04-10 Thread Brian Evans
commit: be3fda8073fd2cfde1799d4708feb93676767c1a
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Apr 10 15:07:11 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Apr 10 15:07:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3fda80

dev-php/pecl-ssh2: Version bump to 1.1.2; update live build

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-php/pecl-ssh2/Manifest|  1 +
 .../{pecl-ssh2-.ebuild => pecl-ssh2-1.1.2.ebuild} | 15 +++
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild   |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index f42040f4135..ce25ae74681 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,2 +1,3 @@
 DIST ssh2-0.13.tgz 28984 BLAKE2B 
3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9
 SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 DIST ssh2-1.1.1.tgz 27551 BLAKE2B 
5e8e32c790a1d8646497ea6c4893694b2cc511a9a4753d66788c618ce7f8cb04d37fcd54a21c59dda918ba6ef27a1abd1b32c2d515d07c0925ab26e9a7e58941
 SHA512 
92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
+DIST ssh2-1.1.2.tgz 32057 BLAKE2B 
88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c
 SHA512 
36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
similarity index 56%
copy from dev-php/pecl-ssh2/pecl-ssh2-.ebuild
copy to dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
index 63cee3d068b..09e08c19122 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
@@ -5,25 +5,24 @@ EAPI=6
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php5-6 php7-0 php7-1"
-EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
-inherit php-ext-source-r3 git-r3
+inherit php-ext-pecl-r3
 
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS=""
-DEPEND=">=net-libs/libssh2-1.2"
+KEYWORDS="~amd64 ~x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}
php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-HOMEPAGE="https://pecl.php.net/package/ssh2;
 
 src_prepare() {
-   if use php_targets_php7-0 || use php_targets_php7-1 ; then
+   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2; then
php-ext-source-r3_src_prepare
else
default_src_prepare

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index 63cee3d068b..e493a7b71a8 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
 
 inherit php-ext-source-r3 git-r3
 
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 HOMEPAGE="https://pecl.php.net/package/ssh2;
 
 src_prepare() {
-   if use php_targets_php7-0 || use php_targets_php7-1 ; then
+   if use php_targets_php7-0 || use php_targets_php7-1 || use 
php_targets_php7-2 ; then
php-ext-source-r3_src_prepare
else
default_src_prepare



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2018-03-21 Thread Brian Evans
commit: 51985ec02e5310de00ee5e56a6f0a6b626110c61
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Mar 13 00:35:05 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Mar 22 01:28:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51985ec0

dev-php/pecl-ssh2: Remove src_unpack as changes to eclass make it obsolete

 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index ee9effc3e76..63cee3d068b 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,11 +22,6 @@ RDEPEND="${DEPEND}
php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
 HOMEPAGE="https://pecl.php.net/package/ssh2;
 
-src_unpack() {
-   git-r3_src_unpack
-   php-ext-source-r3_src_unpack
-}
-
 src_prepare() {
if use php_targets_php7-0 || use php_targets_php7-1 ; then
php-ext-source-r3_src_prepare



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-10-19 Thread Brian Evans
commit: 35a9366462745c6d1c44e32dd7bf8d06d5e84de5
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Oct 19 18:50:40 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Oct 19 18:50:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a93664

dev-php/pecl-ssh2: Drop old

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-php/pecl-ssh2/Manifest |  1 -
 dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild | 20 
 2 files changed, 21 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index f91a6057a04..e80c54df256 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,3 +1,2 @@
-DIST ssh2-0.12.tgz 26223 SHA256 
600c82d2393acf3642f19914f06a7afea57ee05cb8c10e8a5510b32188b97f99 SHA512 
e48f8051f9234841bb0fc10594dcd90badf2d880d75c4bd59f847e3d4276e9fdd3fe71c1c01c07fb9f552cec470f3dbac6ae1db4d33e5793d3988ea5bac1d5bd
 WHIRLPOOL 
ff8e983027281db4fdff6c85d4a98c8987277abe40c82b4306a86459661864e4ca534b48ee22186d01b8166a58980bf5cba374a35d4e477e4dbb41f8c845a601
 DIST ssh2-0.13.tgz 28984 SHA256 
cb2cb8ab840b5b36bcd8a8df06ea4a970a61e4cb3980f3c0ac5c913522e6c1be SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 WHIRLPOOL 
62c36541bd3d7c579fdd4e3c8114e26dbda7206839db75d77b84fe320a87c1b8033b618da31a8d9038d5fb5874fa05a333e3b391a9e33fc1f723138be8e3ac71
 DIST ssh2-1.1.1.tgz 27551 SHA256 
30963a0a4d9f704d594d875665c1ea297730a6efe2af22dff12a78183907ac0c SHA512 
92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
 WHIRLPOOL 
cfbbb940ace42eb41c2852a1fb9514b36f64820cd2e45cd14808614d9b7ca8d347d1c9d5042bb38e215b5c88d113e5cfc2bda531240e2550f9e14798069198ca

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
deleted file mode 100644
index 0165e12936e..000
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-4 php5-5 php5-6"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-10-19 Thread Brian Evans
commit: 04e94a13600feb979b7a8f163f8e338f70bc88f5
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Oct 19 18:49:29 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Oct 19 18:49:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04e94a13

dev-php/pecl-ssh2: Stable on amd64 wrt bug 626484

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild | 2 +-
 dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
index 2c6edfc3567..25a9a72ff7c 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND="net-libs/libssh2[-gcrypt]"
 RDEPEND="${DEPEND}"

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
index f4482472419..2c2f92bed94 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-10-09 Thread Thomas Deutschmann
commit: edc9422f208da29f408b4ece82cc8698f2ca8a97
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct  9 23:20:59 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct  9 23:28:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc9422f

dev-php/pecl-ssh2: x86 stable (bug #626484)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild | 2 +-
 dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
index 1d3d6dcf1f0..2c6edfc3567 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND="net-libs/libssh2[-gcrypt]"
 RDEPEND="${DEPEND}"

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
index 53f184049f8..f4482472419 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-07-27 Thread Brian Evans
commit: 689f0d98e50d62f1186fe0667652097b5daada57
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jul 27 13:49:13 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Thu Jul 27 13:49:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689f0d98

dev-php/pecl-ssh2: Upstream recommends libssh2 have -gcrypt

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild | 3 ++-
 dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
index ad10daaf227..1d3d6dcf1f0 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
@@ -16,7 +16,8 @@ LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
-DEPEND="net-libs/libssh2"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND="net-libs/libssh2[-gcrypt]"
 RDEPEND="${DEPEND}"
 PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
index 28dc40b3371..53f184049f8 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
@@ -16,7 +16,8 @@ LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
-DEPEND=">=net-libs/libssh2-1.2"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}
php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/, dev-php/pecl-ssh2/files/

2017-07-04 Thread Brian Evans
commit: e8e572057cf5e76ae91507d103caf29096eedf52
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jul  5 02:27:36 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Jul  5 02:27:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e57205

dev-php/pecl-ssh2: Revbump to include upstream patch for 5.6; wrt bug 603290

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch | 49 
 dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild   | 31 +++
 2 files changed, 80 insertions(+)

diff --git a/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch 
b/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch
new file mode 100644
index 000..c9c052fd32d
--- /dev/null
+++ b/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch
@@ -0,0 +1,49 @@
+From 093906ec1c065e86ad1cd4dabbc89b1ccae11938 Mon Sep 17 00:00:00 2001
+From: Remi Collet 
+Date: Thu, 10 Nov 2016 09:16:02 +0100
+Subject: [PATCH] fix for PHP 7.0.13 where php_url_parse fails
+
+---
+ ssh2_fopen_wrappers.c | 17 -
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
+index 8472ddd..89b34eb 100644
+--- a/ssh2_fopen_wrappers.c
 b/ssh2_fopen_wrappers.c
+@@ -198,10 +198,20 @@ php_url *php_ssh2_fopen_wraper_parse_path(   char 
*path, char *type, php_stream_co
+   php_url *resource;
+   zval *methods = NULL, *callbacks = NULL, zsession, **tmpzval;
+   long resource_id;
+-  char *s, *username = NULL, *password = NULL, *pubkey_file = NULL, 
*privkey_file = NULL;
++  char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, 
*privkey_file = NULL;
+   int username_len = 0, password_len = 0;
+ 
+-  resource = php_url_parse(path);
++  h = strstr(path, "Resource id #");
++  if (h) {
++  /* Starting with 5.6.28, 7.0.13 need to be clean, else 
php_url_parse will fail */
++  char *tmp = estrdup(path);
++
++  strncpy(tmp + (h-path), h + sizeof("Resource id #")-1, 
strlen(tmp)-sizeof("Resource id #"));
++  resource = php_url_parse(tmp);
++  efree(tmp);
++  } else {
++  resource = php_url_parse(path);
++  }
+   if (!resource || !resource->path) {
+   return NULL;
+   }
+@@ -232,9 +242,6 @@ php_url *php_ssh2_fopen_wraper_parse_path( char *path, 
char *type, php_stream_co
+ 
+   /* Look for a resource ID to reuse a session */
+   s = resource->host;
+-  if (strncmp(resource->host, "Resource id #", sizeof("Resource id #") - 
1) == 0) {
+-  s = resource->host + sizeof("Resource id #") - 1;
+-  }
+   if (is_numeric_string(s, strlen(s), _id, NULL, 0) == IS_LONG) {
+   php_ssh2_sftp_data *sftp_data;
+ 
+-- 
+2.1.4
+

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
new file mode 100644
index 000..ad10daaf227
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND="net-libs/libssh2"
+RDEPEND="${DEPEND}"
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
+   php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"
+
+src_prepare(){
+   if use php_targets_php5-6 ; then
+   local PATCHES=( "${FILESDIR}/0.13-parse_url-fix.patch" )
+   php-ext-source-r3_src_prepare
+   else
+   default_src_prepare
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-07-04 Thread Brian Evans
commit: 521b3b7f26bbb076b43c436642bb2a4a82b9c5dc
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jul  5 02:28:48 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Jul  5 02:28:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521b3b7f

dev-php/pecl-ssh2: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-php/pecl-ssh2/Manifest |  1 -
 dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild | 30 --
 dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild  | 29 -
 3 files changed, 60 deletions(-)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index f637a5da96d..f91a6057a04 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,4 +1,3 @@
 DIST ssh2-0.12.tgz 26223 SHA256 
600c82d2393acf3642f19914f06a7afea57ee05cb8c10e8a5510b32188b97f99 SHA512 
e48f8051f9234841bb0fc10594dcd90badf2d880d75c4bd59f847e3d4276e9fdd3fe71c1c01c07fb9f552cec470f3dbac6ae1db4d33e5793d3988ea5bac1d5bd
 WHIRLPOOL 
ff8e983027281db4fdff6c85d4a98c8987277abe40c82b4306a86459661864e4ca534b48ee22186d01b8166a58980bf5cba374a35d4e477e4dbb41f8c845a601
 DIST ssh2-0.13.tgz 28984 SHA256 
cb2cb8ab840b5b36bcd8a8df06ea4a970a61e4cb3980f3c0ac5c913522e6c1be SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 WHIRLPOOL 
62c36541bd3d7c579fdd4e3c8114e26dbda7206839db75d77b84fe320a87c1b8033b618da31a8d9038d5fb5874fa05a333e3b391a9e33fc1f723138be8e3ac71
-DIST ssh2-1.0.tgz 29013 SHA256 
6a93891878b23904a773eb814fec7aea4ea00b4a412ee779c8535ed9c5e46ced SHA512 
9e21b4d5d640f595ff812c341387cd51917aed2df00bb8c94ff7e494953a3599dc1cbfa6f04248f3145fc1b097fcf6c066710c8f2a41e565a3f57cad999877f9
 WHIRLPOOL 
54cb8d262ac3219443962a8df4147ede8c8e700fba0a5fd5d0422707a392d0feabad86c81cc80bdba5b5d4e840a54337d278263c3d764116f51880fa1f5c07c5
 DIST ssh2-1.1.1.tgz 27551 SHA256 
30963a0a4d9f704d594d875665c1ea297730a6efe2af22dff12a78183907ac0c SHA512 
92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
 WHIRLPOOL 
cfbbb940ace42eb41c2852a1fb9514b36f64820cd2e45cd14808614d9b7ca8d347d1c9d5042bb38e215b5c88d113e5cfc2bda531240e2550f9e14798069198ca

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
deleted file mode 100644
index df76f8cc3b8..000
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php5-6"
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND="net-libs/libssh2"
-RDEPEND="${DEPEND}"
-PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
-   php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"
-
-src_prepare(){
-   if use php_targets_php5-6 ; then
-   php-ext-source-r3_src_prepare
-   else
-   default_src_prepare
-   fi
-}

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
deleted file mode 100644
index 28dc40b3371..000
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1"
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND}
-   php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-
-src_prepare() {
-   if use php_targets_php7-0 || use php_targets_php7-1; then
-   php-ext-source-r3_src_prepare
-   else
-   default_src_prepare
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-07-04 Thread Brian Evans
commit: 169a998be77bd0b5eeaaf1201ba823994ea43116
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jul  5 02:23:16 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Jul  5 02:23:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169a998b

dev-php/pecl-ssh2: Version bump to 1.1.1 fixes bug 603290

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-php/pecl-ssh2/Manifest   |  1 +
 dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild | 29 +
 2 files changed, 30 insertions(+)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index c73698c884d..f637a5da96d 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,3 +1,4 @@
 DIST ssh2-0.12.tgz 26223 SHA256 
600c82d2393acf3642f19914f06a7afea57ee05cb8c10e8a5510b32188b97f99 SHA512 
e48f8051f9234841bb0fc10594dcd90badf2d880d75c4bd59f847e3d4276e9fdd3fe71c1c01c07fb9f552cec470f3dbac6ae1db4d33e5793d3988ea5bac1d5bd
 WHIRLPOOL 
ff8e983027281db4fdff6c85d4a98c8987277abe40c82b4306a86459661864e4ca534b48ee22186d01b8166a58980bf5cba374a35d4e477e4dbb41f8c845a601
 DIST ssh2-0.13.tgz 28984 SHA256 
cb2cb8ab840b5b36bcd8a8df06ea4a970a61e4cb3980f3c0ac5c913522e6c1be SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 WHIRLPOOL 
62c36541bd3d7c579fdd4e3c8114e26dbda7206839db75d77b84fe320a87c1b8033b618da31a8d9038d5fb5874fa05a333e3b391a9e33fc1f723138be8e3ac71
 DIST ssh2-1.0.tgz 29013 SHA256 
6a93891878b23904a773eb814fec7aea4ea00b4a412ee779c8535ed9c5e46ced SHA512 
9e21b4d5d640f595ff812c341387cd51917aed2df00bb8c94ff7e494953a3599dc1cbfa6f04248f3145fc1b097fcf6c066710c8f2a41e565a3f57cad999877f9
 WHIRLPOOL 
54cb8d262ac3219443962a8df4147ede8c8e700fba0a5fd5d0422707a392d0feabad86c81cc80bdba5b5d4e840a54337d278263c3d764116f51880fa1f5c07c5
+DIST ssh2-1.1.1.tgz 27551 SHA256 
30963a0a4d9f704d594d875665c1ea297730a6efe2af22dff12a78183907ac0c SHA512 
92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
 WHIRLPOOL 
cfbbb940ace42eb41c2852a1fb9514b36f64820cd2e45cd14808614d9b7ca8d347d1c9d5042bb38e215b5c88d113e5cfc2bda531240e2550f9e14798069198ca

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
new file mode 100644
index 000..28dc40b3371
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND}
+   php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+
+src_prepare() {
+   if use php_targets_php7-0 || use php_targets_php7-1; then
+   php-ext-source-r3_src_prepare
+   else
+   default_src_prepare
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-04-08 Thread Michael Orlitzky
commit: 06902785bbdd836806ec9fa021fcb078996a5b76
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Apr  8 19:15:21 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Apr  8 19:27:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06902785

dev-php/pecl-ssh2: add php-7.1 support.

Gentoo-Bug: 603508

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{pecl-ssh2-1.0.ebuild => pecl-ssh2-1.0-r1.ebuild}  | 14 ++
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild| 14 ++
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
similarity index 57%
rename from dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
rename to dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
index 43870a60730..28dc40b3371 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.0-r1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-0 php5-6"
+USE_PHP="php5-6 php7-0 php7-1"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-0"
+USE_PHP="php7-0 php7-1"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
@@ -19,11 +17,11 @@ SLOT="7"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
 DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND} php_targets_php5-6? ( 
dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
+RDEPEND="${DEPEND}
+   php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
 
 src_prepare() {
-   if use php_targets_php7-0 ; then
+   if use php_targets_php7-0 || use php_targets_php7-1; then
php-ext-source-r3_src_prepare
else
default_src_prepare

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index 1e571c0de96..ee9effc3e76 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-0 php5-6"
+USE_PHP="php5-6 php7-0 php7-1"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
 
 inherit php-ext-source-r3 git-r3
 
-USE_PHP="php7-0"
+USE_PHP="php7-0 php7-1"
 
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
@@ -20,9 +18,9 @@ SLOT="7"
 IUSE=""
 KEYWORDS=""
 DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND} php_targets_php5-6? ( 
dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+RDEPEND="${DEPEND}
+   php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
 HOMEPAGE="https://pecl.php.net/package/ssh2;
-PHP_EXT_ECONF_ARGS=""
 
 src_unpack() {
git-r3_src_unpack
@@ -30,7 +28,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   if use php_targets_php7-0 ; then
+   if use php_targets_php7-0 || use php_targets_php7-1 ; then
php-ext-source-r3_src_prepare
else
default_src_prepare



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2017-04-08 Thread Michael Orlitzky
commit: 9e356729a0b908d7f622199c469826a9ec1efea1
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Apr  8 19:22:28 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Apr  8 19:27:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e356729

dev-php/pecl-ssh2: new v0.13 revision supporting PHP_TARGETS=php7-1.

The SLOT=0 for this package supports php-5.x, while SLOT=7 supports
php-7.x. To get them both installed at the same time, we use some
weird trickery. Long story short, we need to add a special case to
the SLOT=0 ebuild supporting "php7-1" in PHP_TARGETS.

The previous commit added php-7.1 support to the SLOT=7 ebuilds, and
this commit adds it to the SLOT=0 ebuild.

Gentoo-Bug: 603508

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{pecl-ssh2-0.13-r1.ebuild => pecl-ssh2-0.13-r2.ebuild}   | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
similarity index 64%
rename from dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild
rename to dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
index f41851e9648..df76f8cc3b8 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r2.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-0 php5-6"
+USE_PHP="php5-6 php7-0 php7-1"
 
 inherit php-ext-pecl-r3
 
@@ -18,10 +16,10 @@ LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
-DEPEND=">=net-libs/libssh2-1.2"
+DEPEND="net-libs/libssh2"
 RDEPEND="${DEPEND}"
-PHP_EXT_ECONF_ARGS=""
-PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )"
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
+   php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"
 
 src_prepare(){
if use php_targets_php5-6 ; then



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2016-12-07 Thread Brian Evans
commit: 6dba236c345c962c9b5c136dc4a1cd66a4f85cac
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Dec  7 14:17:54 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Dec  7 15:04:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dba236c

dev-php/pecl-ssh2: Drop 5.5 support on 0.13 and allow easier 7.0 transition

Package-Manager: portage-2.3.2

 dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild | 33 ++
 1 file changed, 33 insertions(+)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild
new file mode 100644
index ..8a1cea7
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-0 php5-6"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=""
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )"
+
+src_prepare(){
+   if use php_targets_php5-6 ; then
+   php-ext-source-r3_src_prepare
+   else
+   default_src_prepare
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2016-12-07 Thread Brian Evans
commit: ecf6cec8448a74772e46d5159e8c1879164b3e47
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Dec  7 14:18:45 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Dec  7 15:04:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf6cec8

dev-php/pecl-ssh2: Drop old

Package-Manager: portage-2.3.2

 dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild | 22 --
 1 file changed, 22 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild
deleted file mode 100644
index b75a266..
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-5 php5-6"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND}"
-PHP_EXT_ECONF_ARGS=""



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2016-11-15 Thread Brian Evans
commit: 35939bb11b896401cfe97729e88d31742d5f0ffe
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 15 14:44:26 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Nov 15 14:44:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35939bb1

dev-php/pecl-ssh2: Add live ebuild wrt bug 599750

Package-Manager: portage-2.3.2

 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 39 +
 1 file changed, 39 insertions(+)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
new file mode 100644
index ..009cd7e
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-0 php5-6"
+EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
+
+inherit php-ext-source-r3 git-r3
+
+USE_PHP="php7-0"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS=""
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND} php_targets_php5-6? ( 
dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+HOMEPAGE="https://pecl.php.net/package/ssh2;
+PHP_EXT_ECONF_ARGS=""
+
+src_unpack() {
+   git-r3_src_unpack
+   php-ext-source-r3_src_unpack
+}
+
+src_prepare() {
+   if use php_targets_php7-0 ; then
+   php-ext-source-r3_src_prepare
+   else
+   default_src_prepare
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2016-08-23 Thread Brian Evans
commit: a3cd1c2763c1afd4663043dd8f3d890bfce18ca6
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Aug 23 20:48:13 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Aug 23 20:58:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cd1c27

dev-php/pecl-ssh2: Fix EAPI6 build error when php7-0 is off

Package-Manager: portage-2.3.0

 dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild | 8 
 1 file changed, 8 insertions(+)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
index cbf9cea..b03c64c 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
@@ -22,3 +22,11 @@ KEYWORDS="~amd64 ~x86"
 DEPEND=">=net-libs/libssh2-1.2"
 RDEPEND="${DEPEND} php_targets_php5-6? ( 
dev-php/pecl-ssh2:0[php_targets_php5-6] )"
 PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+   if use php_targets_php7-0 ; then
+   php-ext-source-r3_src_prepare
+   else
+   default_src_prepare
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2016-07-25 Thread Brian Evans
commit: 2fcba4eaf4e5064821900e062138a9ba5ea07359
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jul 25 14:54:37 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jul 25 14:54:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fcba4ea

dev-php/pecl-ssh2: Version bumps

Package-Manager: portage-2.3.0

 dev-php/pecl-ssh2/Manifest  |  2 ++
 dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild | 22 ++
 dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild  | 24 
 3 files changed, 48 insertions(+)

diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index a5967bf..c73698c 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1 +1,3 @@
 DIST ssh2-0.12.tgz 26223 SHA256 
600c82d2393acf3642f19914f06a7afea57ee05cb8c10e8a5510b32188b97f99 SHA512 
e48f8051f9234841bb0fc10594dcd90badf2d880d75c4bd59f847e3d4276e9fdd3fe71c1c01c07fb9f552cec470f3dbac6ae1db4d33e5793d3988ea5bac1d5bd
 WHIRLPOOL 
ff8e983027281db4fdff6c85d4a98c8987277abe40c82b4306a86459661864e4ca534b48ee22186d01b8166a58980bf5cba374a35d4e477e4dbb41f8c845a601
+DIST ssh2-0.13.tgz 28984 SHA256 
cb2cb8ab840b5b36bcd8a8df06ea4a970a61e4cb3980f3c0ac5c913522e6c1be SHA512 
c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 WHIRLPOOL 
62c36541bd3d7c579fdd4e3c8114e26dbda7206839db75d77b84fe320a87c1b8033b618da31a8d9038d5fb5874fa05a333e3b391a9e33fc1f723138be8e3ac71
+DIST ssh2-1.0.tgz 29013 SHA256 
6a93891878b23904a773eb814fec7aea4ea00b4a412ee779c8535ed9c5e46ced SHA512 
9e21b4d5d640f595ff812c341387cd51917aed2df00bb8c94ff7e494953a3599dc1cbfa6f04248f3145fc1b097fcf6c066710c8f2a41e565a3f57cad999877f9
 WHIRLPOOL 
54cb8d262ac3219443962a8df4147ede8c8e700fba0a5fd5d0422707a392d0feabad86c81cc80bdba5b5d4e840a54337d278263c3d764116f51880fa1f5c07c5

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild
new file mode 100644
index 000..b75a266
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-5 php5-6"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=""

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
new file mode 100644
index 000..cbf9cea
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-0 php5-6"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND} php_targets_php5-6? ( 
dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+PHP_EXT_ECONF_ARGS=""



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2016-01-02 Thread Michael Orlitzky
commit: af16443d57a2325f976505bdb205aa977d5a1eb2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Jan  2 16:09:50 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Jan  2 16:10:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af16443d

dev-php/pecl-ssh2: remove old revisions of v0.12.

The older revisions of this package have incorrect DOCS. This is
another step towards fixing bug 512184.

Gentoo-Bug: 512184

Package-Manager: portage-2.2.24

 dev-php/pecl-ssh2/pecl-ssh2-0.12-r1.ebuild | 22 --
 dev-php/pecl-ssh2/pecl-ssh2-0.12-r2.ebuild | 22 --
 2 files changed, 44 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r1.ebuild
deleted file mode 100644
index b007dbf..000
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README ChangeLog"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Provides bindings to the functions of libssh2 which implements 
the SSH2 protocol"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND}"

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r2.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r2.ebuild
deleted file mode 100644
index 9283077..000
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="ssh2"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README ChangeLog"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="Provides bindings to the functions of libssh2 which implements 
the SSH2 protocol"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND=">=net-libs/libssh2-1.2"
-RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2015-11-03 Thread Agostino Sarubbo
commit: e812ea906c268d9e35083014f7d0d84b219c993f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov  3 15:18:27 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov  3 15:18:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e812ea90

dev-php/pecl-ssh2: amd64 stable wrt bug #561640

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
index 147672f..ff3a161 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
@@ -16,6 +16,6 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 DEPEND=">=net-libs/libssh2-1.2"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2015-11-03 Thread Agostino Sarubbo
commit: 25c4e24734c30121f3d4b86aa064203002fe49e8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov  3 16:17:49 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov  3 16:17:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c4e247

dev-php/pecl-ssh2: x86 stable wrt bug #561640

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
index ff3a161..caebca5 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
@@ -16,6 +16,6 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND=">=net-libs/libssh2-1.2"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-ssh2/

2015-09-27 Thread Michael Orlitzky
commit: 45f99569bde288ada51ba475943218dc7fbec5ec
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Sep 27 13:30:29 2015 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Sep 27 13:30:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f99569

dev-php/pecl-ssh2: revbump to remove incorrect DOCS.

The DOCS array contained two files that didn't exist. Now they're
gone. The LICENSE was also changed to PHP-3.01 per the project
homepage.

Package-Manager: portage-2.2.20.1

 dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild | 21 +
 1 file changed, 21 insertions(+)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
new file mode 100644
index 000..147672f
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.12-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="ssh2"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-4 php5-5 php5-6"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND}"