dev-php/libphutil: Version bump

Block PHP7 as per phabricator-extensions-Sprint-20160709.ebuild

Package-Manager: portage-2.2.28

19 files changed, 20 insertions, 1229 deletions

diff --git a/dev-php/libphutil/Manifest b/dev-php/libphutil/Manifest
index 1222dc43..abf37591 100644
--- a/dev-php/libphutil/Manifest
+++ b/dev-php/libphutil/Manifest
@@ -1,19 +1,5 @@
-AUX 20150414-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 2a4d36afcfe32309f1c86bbb9e88869709a3658fec260c488d52b7afe47a15b3 WHIRLPOOL a105e836b486155c2a9a2832e90fcd7a0a27dfdfea0b250ddcd38bcc0957f5a96a553f1bf853ff596621343182ffa4c170935132f64aeb05120882d3b2743f31
-AUX 20150708-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 2a4d36afcfe32309f1c86bbb9e88869709a3658fec260c488d52b7afe47a15b3 WHIRLPOOL a105e836b486155c2a9a2832e90fcd7a0a27dfdfea0b250ddcd38bcc0957f5a96a553f1bf853ff596621343182ffa4c170935132f64aeb05120882d3b2743f31
-AUX 20150815-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 2a4d36afcfe32309f1c86bbb9e88869709a3658fec260c488d52b7afe47a15b3 WHIRLPOOL a105e836b486155c2a9a2832e90fcd7a0a27dfdfea0b250ddcd38bcc0957f5a96a553f1bf853ff596621343182ffa4c170935132f64aeb05120882d3b2743f31
-AUX 20151003-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 8aa0141f3434dbb8e91d3a713b238cc9e5294aaeba525b25c45b3cee888e8ae8 WHIRLPOOL 5a897a5a4368ce4aa4bd183663f76b12847eab5287466862ea3f9763d3a2bb0d4401faa1e5aa8da2425430030c2ed36ebd18b3d853d8f52dee5fc6545831b153
-AUX 20151024-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 30b983985ce2610e643a2e8fccca366a1880ae2b92b19d26c5f36ee7c6edf664 WHIRLPOOL b563c86b3ec3daa4448b6a649d848da59c13ab34a5717d01e56821e3e2589f7f152fded097c09c23b77edcc92ef0d6a315ef6f7ec5318654e3e7069c2189763c
-AUX 20160123-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 308ea683a410785dcad092de36bebd10ca25d8da2e4251ba317c993881a6a25a WHIRLPOOL 9834a1c0e73d2f4e7c689a991fb8fecf2c1f036e8800aaa85c1bd20eaa58365945823f1fc605cc8fb43dcd174de4a2c8f6cd8fdbfbf42725ae486d6043a2b0d4
-AUX 20160408-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 59c712b9e6d94f9d3df82bc99dd67ea3cc268aae814ae6e0ec2c5d1316df2a9e WHIRLPOOL ac5a0ccbcb0768e9cdf822c88816dd50960f2e04458eca26fc9b7ef554425ea79c3b616bc5e6892a048ff873f0a20f23735a8d8da4299c147ba1a8c52f08e847
-AUX 20160529-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 b20e3da6806b398d9f2aba1df6c41d511a876f1758dc3a9d3dca0f1593bb0d61 WHIRLPOOL 468490a3a8f1a7a9ce07eec6730f3b051ae20fc1cf0f0339231bb2701b7188085f978c515bfd8715289ab1baf541c59ae4ffd6492ef4d5412a256ff0d3a8822c
-AUX 9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 1daf38683438db917333abfb1b2ab7576d65e9058e6135264c639050a25d3e08 WHIRLPOOL cb4e2e92b897783f392a1db46001aeddce67c24eaf2244679361bcbd8d9f42173d44ed4a7e3e6bec6876513fd3296d45d513a2c3ac4134ea4a84e547dec5c189
-EBUILD libphutil-20150414.ebuild 3364 SHA256 1795640e3ce2da51f6d198a1d7501254d464cd97a2aebeae3b69ed79ffa318c5 WHIRLPOOL 6836e91db6f8a861c691559784093b65e48c73d33a14ed04941019c54f85d214644c361ca52854c7a6a5a686a91ed1aa6fe9ea0916300785797ca8d7993003a4
-EBUILD libphutil-20150708.ebuild 3364 SHA256 2b66ee4555826cdd253bb1a4d7f64db363b8025402921b095ca90b04c4e7018a WHIRLPOOL bdc43d3b7f2cd94c63256e501b5ff6bf4a3cf38280a04fca4f0dc8fc2db9c6bda97d18689460db43ce6eeae7dfac073732e60c9dd4d9ac9cff515b56deef2e5c
-EBUILD libphutil-20150815.ebuild 3364 SHA256 a57823aabbadc9b5572da3f04bf5ddf5c6461166d29ebd7cbafa0866f1e367b9 WHIRLPOOL e36320a84188dfb75c7dce6d733bf5e17c020a0e344a60214e538c1b9862685a067142b8c56a53b61484ad90e58e83f243f36f76f59b07646cd5da5bf46ff6ae
-EBUILD libphutil-20151003.ebuild 3364 SHA256 7d249db39a9b8db052208146d977a19bd116568ead6309a5c2e37b39a14a272e WHIRLPOOL 6355f09b306eed92cacc1222afe1fcd31403148d78746676d544a657b247f265a509f65575304b99d402cbd7e3e5f88085d6e8478e72ac257fcea33b4dbc4d39
-EBUILD libphutil-20151024.ebuild 3365 SHA256 8238c3992d7090b9abc4d6bdb676e178a55a5a5d03abc45bfdcfbffd6f0e023a WHIRLPOOL 1be19cd325c99ed03c1d0ea15ddd75fc5971bc2470ad863690e0e103bcf74cd475ec1429fffab1eed8b47dac28350a9b8aa76cb0d2b967362b0a35f2c92366d2
-EBUILD libphutil-20160123.ebuild 3389 SHA256 a73a68a59449c87b68299c2c68f6f544b385c562e4ab7881e70be24ae093e892 WHIRLPOOL edecedd34fef1dc85e296f1ff64be9d85c39f401fb0b5f0a9e9288d1bf7f30a8ded215cb9cec567e3987d7b2d29041c47f0e98456a62e716a4bde437f380cd88
-EBUILD libphutil-20160408.ebuild 3389 SHA256 cb05840cb6fe4492039f4457ba804fbe987b29586118d37f7d371fcb16c7e25e WHIRLPOOL 872c6e364ce767e4f8aeb55da8873af5e0c3316d53bf8a23c419dcab2affabf1fab7016badaaa3f056f69becdf108cca91bff1d7e9f0f8b892e02bac3e213654
-EBUILD libphutil-20160529.ebuild 3389 SHA256 0be0cd13a37bf6a80c5f3a1176526415ee88ce3d5c9b22ae47bac2292ccfa874 WHIRLPOOL 253cade4cb9bf7d1a812b8f198eb8bf55f4f14115cdee864c78c7d4589b18ab3fce452324401a8b1ff8ee71e9a8a6ac1529b04592f195edfcb3bc13b5a0c85c0
-EBUILD libphutil-9999.ebuild 3303 SHA256 ecf70e639b84d85ea776cfc2897af9492a4106cd715805d93eaf3fb53105ff96 WHIRLPOOL c6f608c0656ea422a92c8f2d9a475c26417b828c835301f17ca7af45a65e3cfe1e8ffa91d47794486869187483dd23d3c0ff7d8e7884779203a4751584bdf7a3
+AUX 20160709-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 ed7e0c81f1cca4d6b2e14d8229e521302e0f656f9a1b742e478d2c2d036b6962 WHIRLPOOL bf0008faee1cf53a9a729ce9df486eadd40c16258c0ef0faf010c6cee14460bc253f2956dc75c8bc5a796727d9b0f877fa56ebcf0ef161649966d99fa14740b0
+AUX 9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2155 SHA256 2c0f08539c617ac9bfcd91a5f91acd9c184e47273155f936084e837ebf8e6d31 WHIRLPOOL df831a1942dc5270ab4998352dc2386aa497b9910b39075df806adbf65b75c1c24c605a3b2494d08f7f4a223a2b7232bfe089cd334b47fe1155ec6a020ea255c
+EBUILD libphutil-20160709.ebuild 3405 SHA256 c153853ad138a7c635f39ba71491c9cafd64c1d84d8006a522ce21f5699222e6 WHIRLPOOL 7783785814050bbd6661fbd4d84493c814e551ab1a7a521dd8fbfdb9a96c66073a163302c03b447a9fe98148654a26253d9c2846bc0273a2ac0a3c02a43b5dd7
+EBUILD libphutil-9999.ebuild 3319 SHA256 9289172eb40a64b64d3be2ee6831e992662600f3085e4dcf31898c52707f505e WHIRLPOOL 6ed35dda61752b5b1ff861b6a73fda329d994180232036e266e347ed713e84d9a322a4f6d5c28d3af349bad8a719f5e23595615e692d14fc60978012f5eb6571
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/dev-php/libphutil/files/20150708-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20150708-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
deleted file mode 100644
index 172e65a3..00000000
--- a/dev-php/libphutil/files/20150708-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 76355d70f7b0418c12db64bc1407cc49f34618e7 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 13 Aug 2013 16:07:58 +0200
-Subject: [PATCH] Remove the usage of local SSL certificates and use system
- provided by ca-certificates.
-
----
- src/future/http/HTTPSFuture.php | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 250a7e7..e8ea804 100644
---- a/src/future/http/HTTPSFuture.php
-+++ b/src/future/http/HTTPSFuture.php
-@@ -317,28 +317,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
-       //   `setCABundle()` or similar.
-       // - Then, check if a global bundle is set explicitly for all requests,
-       //   via `setGlobalCABundle()` or similar.
--      // - Then, if a local custom.pem exists, use that, because it probably
--      //   means that the user wants to override everything (also because the
--      //   user might not have access to change the box's php.ini to add
--      //   curl.cainfo).
-       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
-       //   probably reasonable to try using it before we fall back to what
-       //   libphutil ships with.
--      // - Lastly, try the default that libphutil ships with. If it doesn't
-+      // - Lastly, try the default from ca-certificates. If it doesn't
-       //   work, give up and yell at the user.
- 
-       if (!$this->getCABundle()) {
--        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
-         $ini_val = ini_get('curl.cainfo');
-         if (self::getGlobalCABundle()) {
-           $this->setCABundleFromPath(self::getGlobalCABundle());
--        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
--          $this->setCABundleFromPath($caroot.'custom.pem');
-         } else if ($ini_val) {
-           // TODO: We can probably do a pathExists() here, even.
-           $this->setCABundleFromPath($ini_val);
-         } else {
--          $this->setCABundleFromPath($caroot.'default.pem');
-+          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
-         }
-       }
- 
diff --git a/dev-php/libphutil/files/20150815-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20150815-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
deleted file mode 100644
index 172e65a3..00000000
--- a/dev-php/libphutil/files/20150815-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 76355d70f7b0418c12db64bc1407cc49f34618e7 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 13 Aug 2013 16:07:58 +0200
-Subject: [PATCH] Remove the usage of local SSL certificates and use system
- provided by ca-certificates.
-
----
- src/future/http/HTTPSFuture.php | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 250a7e7..e8ea804 100644
---- a/src/future/http/HTTPSFuture.php
-+++ b/src/future/http/HTTPSFuture.php
-@@ -317,28 +317,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
-       //   `setCABundle()` or similar.
-       // - Then, check if a global bundle is set explicitly for all requests,
-       //   via `setGlobalCABundle()` or similar.
--      // - Then, if a local custom.pem exists, use that, because it probably
--      //   means that the user wants to override everything (also because the
--      //   user might not have access to change the box's php.ini to add
--      //   curl.cainfo).
-       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
-       //   probably reasonable to try using it before we fall back to what
-       //   libphutil ships with.
--      // - Lastly, try the default that libphutil ships with. If it doesn't
-+      // - Lastly, try the default from ca-certificates. If it doesn't
-       //   work, give up and yell at the user.
- 
-       if (!$this->getCABundle()) {
--        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
-         $ini_val = ini_get('curl.cainfo');
-         if (self::getGlobalCABundle()) {
-           $this->setCABundleFromPath(self::getGlobalCABundle());
--        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
--          $this->setCABundleFromPath($caroot.'custom.pem');
-         } else if ($ini_val) {
-           // TODO: We can probably do a pathExists() here, even.
-           $this->setCABundleFromPath($ini_val);
-         } else {
--          $this->setCABundleFromPath($caroot.'default.pem');
-+          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
-         }
-       }
- 
diff --git a/dev-php/libphutil/files/20151003-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20151003-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
deleted file mode 100644
index 154c43b1..00000000
--- a/dev-php/libphutil/files/20151003-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d5439d62f42de7b61e6300e4b6ec2226fea3c435 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 13 Aug 2013 16:07:58 +0200
-Subject: [PATCH] Remove the usage of local SSL certificates and use system
- provided by ca-certificates.
-
----
- src/future/http/HTTPSFuture.php | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 289f412..849caef 100644
---- a/src/future/http/HTTPSFuture.php
-+++ b/src/future/http/HTTPSFuture.php
-@@ -318,28 +318,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
-       //   `setCABundle()` or similar.
-       // - Then, check if a global bundle is set explicitly for all requests,
-       //   via `setGlobalCABundle()` or similar.
--      // - Then, if a local custom.pem exists, use that, because it probably
--      //   means that the user wants to override everything (also because the
--      //   user might not have access to change the box's php.ini to add
--      //   curl.cainfo).
-       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
-       //   probably reasonable to try using it before we fall back to what
-       //   libphutil ships with.
--      // - Lastly, try the default that libphutil ships with. If it doesn't
-+      // - Lastly, try the default from ca-certificates. If it doesn't
-       //   work, give up and yell at the user.
- 
-       if (!$this->getCABundle()) {
--        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
-         $ini_val = ini_get('curl.cainfo');
-         if (self::getGlobalCABundle()) {
-           $this->setCABundleFromPath(self::getGlobalCABundle());
--        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
--          $this->setCABundleFromPath($caroot.'custom.pem');
-         } else if ($ini_val) {
-           // TODO: We can probably do a pathExists() here, even.
-           $this->setCABundleFromPath($ini_val);
-         } else {
--          $this->setCABundleFromPath($caroot.'default.pem');
-+          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
-         }
-       }
- 
diff --git a/dev-php/libphutil/files/20151024-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20151024-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
deleted file mode 100644
index 58280eff..00000000
--- a/dev-php/libphutil/files/20151024-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2d86c30d505242f958c33d5421fb709392b23ea9 Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 13 Aug 2013 16:07:58 +0200
-Subject: [PATCH] Remove the usage of local SSL certificates and use system
- provided by ca-certificates.
-
----
- src/future/http/HTTPSFuture.php | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 289f412..849caef 100644
---- a/src/future/http/HTTPSFuture.php
-+++ b/src/future/http/HTTPSFuture.php
-@@ -318,28 +318,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
-       //   `setCABundle()` or similar.
-       // - Then, check if a global bundle is set explicitly for all requests,
-       //   via `setGlobalCABundle()` or similar.
--      // - Then, if a local custom.pem exists, use that, because it probably
--      //   means that the user wants to override everything (also because the
--      //   user might not have access to change the box's php.ini to add
--      //   curl.cainfo).
-       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
-       //   probably reasonable to try using it before we fall back to what
-       //   libphutil ships with.
--      // - Lastly, try the default that libphutil ships with. If it doesn't
-+      // - Lastly, try the default from ca-certificates. If it doesn't
-       //   work, give up and yell at the user.
- 
-       if (!$this->getCABundle()) {
--        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
-         $ini_val = ini_get('curl.cainfo');
-         if (self::getGlobalCABundle()) {
-           $this->setCABundleFromPath(self::getGlobalCABundle());
--        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
--          $this->setCABundleFromPath($caroot.'custom.pem');
-         } else if ($ini_val) {
-           // TODO: We can probably do a pathExists() here, even.
-           $this->setCABundleFromPath($ini_val);
-         } else {
--          $this->setCABundleFromPath($caroot.'default.pem');
-+          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
-         }
-       }
- 
diff --git a/dev-php/libphutil/files/20160123-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20160123-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
deleted file mode 100644
index af058db2..00000000
--- a/dev-php/libphutil/files/20160123-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 407f56b966d1908d8c5f705792f9d2bc32199e0f Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 13 Aug 2013 16:07:58 +0200
-Subject: [PATCH] Remove the usage of local SSL certificates and use system
- provided by ca-certificates.
-
----
- src/future/http/HTTPSFuture.php | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 289f412..849caef 100644
---- a/src/future/http/HTTPSFuture.php
-+++ b/src/future/http/HTTPSFuture.php
-@@ -318,28 +318,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
-       //   `setCABundle()` or similar.
-       // - Then, check if a global bundle is set explicitly for all requests,
-       //   via `setGlobalCABundle()` or similar.
--      // - Then, if a local custom.pem exists, use that, because it probably
--      //   means that the user wants to override everything (also because the
--      //   user might not have access to change the box's php.ini to add
--      //   curl.cainfo).
-       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
-       //   probably reasonable to try using it before we fall back to what
-       //   libphutil ships with.
--      // - Lastly, try the default that libphutil ships with. If it doesn't
-+      // - Lastly, try the default from ca-certificates. If it doesn't
-       //   work, give up and yell at the user.
- 
-       if (!$this->getCABundle()) {
--        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
-         $ini_val = ini_get('curl.cainfo');
-         if (self::getGlobalCABundle()) {
-           $this->setCABundleFromPath(self::getGlobalCABundle());
--        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
--          $this->setCABundleFromPath($caroot.'custom.pem');
-         } else if ($ini_val) {
-           // TODO: We can probably do a pathExists() here, even.
-           $this->setCABundleFromPath($ini_val);
-         } else {
--          $this->setCABundleFromPath($caroot.'default.pem');
-+          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
-         }
-       }
- 
diff --git a/dev-php/libphutil/files/20160408-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20160408-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
deleted file mode 100644
index 69a2cc91..00000000
--- a/dev-php/libphutil/files/20160408-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b8d977f02e7cb2223434fc84d3fcf30fd07e41fb Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 13 Aug 2013 16:07:58 +0200
-Subject: [PATCH] Remove the usage of local SSL certificates and use system
- provided by ca-certificates.
-
----
- src/future/http/HTTPSFuture.php | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 289f412..849caef 100644
---- a/src/future/http/HTTPSFuture.php
-+++ b/src/future/http/HTTPSFuture.php
-@@ -318,28 +318,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
-       //   `setCABundle()` or similar.
-       // - Then, check if a global bundle is set explicitly for all requests,
-       //   via `setGlobalCABundle()` or similar.
--      // - Then, if a local custom.pem exists, use that, because it probably
--      //   means that the user wants to override everything (also because the
--      //   user might not have access to change the box's php.ini to add
--      //   curl.cainfo).
-       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
-       //   probably reasonable to try using it before we fall back to what
-       //   libphutil ships with.
--      // - Lastly, try the default that libphutil ships with. If it doesn't
-+      // - Lastly, try the default from ca-certificates. If it doesn't
-       //   work, give up and yell at the user.
- 
-       if (!$this->getCABundle()) {
--        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
-         $ini_val = ini_get('curl.cainfo');
-         if (self::getGlobalCABundle()) {
-           $this->setCABundleFromPath(self::getGlobalCABundle());
--        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
--          $this->setCABundleFromPath($caroot.'custom.pem');
-         } else if ($ini_val) {
-           // TODO: We can probably do a pathExists() here, even.
-           $this->setCABundleFromPath($ini_val);
-         } else {
--          $this->setCABundleFromPath($caroot.'default.pem');
-+          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
-         }
-       }
- 
diff --git a/dev-php/libphutil/files/20160529-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20160529-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
deleted file mode 100644
index 785df37c..00000000
--- a/dev-php/libphutil/files/20160529-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1e3cc69fc88d5a44430af9f78d15b512d15dbcec Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Tue, 13 Aug 2013 16:07:58 +0200
-Subject: [PATCH] Remove the usage of local SSL certificates and use system
- provided by ca-certificates.
-
----
- src/future/http/HTTPSFuture.php | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 289f412..849caef 100644
---- a/src/future/http/HTTPSFuture.php
-+++ b/src/future/http/HTTPSFuture.php
-@@ -318,28 +318,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
-       //   `setCABundle()` or similar.
-       // - Then, check if a global bundle is set explicitly for all requests,
-       //   via `setGlobalCABundle()` or similar.
--      // - Then, if a local custom.pem exists, use that, because it probably
--      //   means that the user wants to override everything (also because the
--      //   user might not have access to change the box's php.ini to add
--      //   curl.cainfo).
-       // - Otherwise, try using curl.cainfo. If it's set explicitly, it's
-       //   probably reasonable to try using it before we fall back to what
-       //   libphutil ships with.
--      // - Lastly, try the default that libphutil ships with. If it doesn't
-+      // - Lastly, try the default from ca-certificates. If it doesn't
-       //   work, give up and yell at the user.
- 
-       if (!$this->getCABundle()) {
--        $caroot = dirname(phutil_get_library_root('phutil')).'/resources/ssl/';
-         $ini_val = ini_get('curl.cainfo');
-         if (self::getGlobalCABundle()) {
-           $this->setCABundleFromPath(self::getGlobalCABundle());
--        } else if (Filesystem::pathExists($caroot.'custom.pem')) {
--          $this->setCABundleFromPath($caroot.'custom.pem');
-         } else if ($ini_val) {
-           // TODO: We can probably do a pathExists() here, even.
-           $this->setCABundleFromPath($ini_val);
-         } else {
--          $this->setCABundleFromPath($caroot.'default.pem');
-+          $this->setCABundleFromPath('/etc/ssl/certs/ca-certificates.crt');
-         }
-       }
- 
diff --git a/dev-php/libphutil/files/20150414-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/20160709-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
index 172e65a3..27ba8eb0 100644
--- a/dev-php/libphutil/files/20150414-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ b/dev-php/libphutil/files/20160709-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
@@ -1,4 +1,4 @@
-From 76355d70f7b0418c12db64bc1407cc49f34618e7 Mon Sep 17 00:00:00 2001
+From 4a8034d134696ebbc0c900f6817ac41b76b4c03f Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Tue, 13 Aug 2013 16:07:58 +0200
 Subject: [PATCH] Remove the usage of local SSL certificates and use system
@@ -9,10 +9,10 @@ Subject: [PATCH] Remove the usage of local SSL certificates and use system
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 250a7e7..e8ea804 100644
+index 255e7f6..7870de4 100644
 --- a/src/future/http/HTTPSFuture.php
 +++ b/src/future/http/HTTPSFuture.php
-@@ -317,28 +317,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
+@@ -310,28 +310,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
        //   `setCABundle()` or similar.
        // - Then, check if a global bundle is set explicitly for all requests,
        //   via `setGlobalCABundle()` or similar.
diff --git a/dev-php/libphutil/files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
index 3b38b683..fc441cb4 100644
--- a/dev-php/libphutil/files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ b/dev-php/libphutil/files/9999-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
@@ -1,4 +1,4 @@
-From a06d463b760f299223abafb033e7e6bd079504a0 Mon Sep 17 00:00:00 2001
+From f219a2c55f3e18b2812614ab9ba382af496d2426 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Tue, 13 Aug 2013 16:07:58 +0200
 Subject: [PATCH] Remove the usage of local SSL certificates and use system
@@ -9,10 +9,10 @@ Subject: [PATCH] Remove the usage of local SSL certificates and use system
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/src/future/http/HTTPSFuture.php b/src/future/http/HTTPSFuture.php
-index 289f412..849caef 100644
+index 255e7f6..7870de4 100644
 --- a/src/future/http/HTTPSFuture.php
 +++ b/src/future/http/HTTPSFuture.php
-@@ -318,28 +318,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
+@@ -310,28 +310,21 @@ final class HTTPSFuture extends BaseHTTPFuture {
        //   `setCABundle()` or similar.
        // - Then, check if a global bundle is set explicitly for all requests,
        //   via `setGlobalCABundle()` or similar.
diff --git a/dev-php/libphutil/libphutil-20150414.ebuild b/dev-php/libphutil/libphutil-20150414.ebuild
deleted file mode 100644
index e7192e23..00000000
--- a/dev-php/libphutil/libphutil-20150414.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs git-r3
-
-DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
-EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
-EGIT_BRANCH="stable"
-EGIT_COMMIT="aaee4009e20db8eea94591117788be57c133eae5"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl test"
-
-DEPEND="virtual/awk:0
-	test? (
-		sys-devel/bison:0
-		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20150414:0
-		dev-lang/php[cli]
-	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
-
-	echo "${EGIT_VERSION}" > "${S}/VERSION"
-
-	if use test ; then
-		tc-export AR CXX
-	fi
-
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r resources/ssl
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.sh
-	rm src/parser/xhpast/bin/xhpast.exe
-
-	# Replace 'env' shebang to files it point to
-	find "${S}" -type f \
-		| sort \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
-		| while read ; do
-			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
-			cmd="$1" ; shift ; args="$@"
-
-			case "${cmd}" in
-				bash|php)	;;
-				*)			continue ;;
-			esac
-
-			path="$(type -p ${cmd})" || continue
-			[[ -z "${path}" ]] && continue
-
-			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
-			sed -i \
-				-e "1 s:^#!.*:#!${path} ${args}:" \
-				"${REPLY}"
-			eend $?
-		done
-}
-
-src_compile() {
-	if use test ; then
-		cd support/xhpast
-
-		# Avoid sandbox violation for dev-lang/php[snmp]
-		# php -f generate_nodes.php'
-		#
-		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
-		#  abs_path: /var/lib/net-snmp/mib_indexes/0
-		#  res_path: /var/lib/net-snmp/mib_indexes/0
-		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
-		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
-		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
-		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
-		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
-		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
-		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
-		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
-		#  /proc/15834/cmdline: php -f generate_nodes.php
-		#
-		# See snmp_config(5)
-		export SNMP_PERSISTENT_DIR="${T}"
-
-		emake
-		emake install
-	fi
-}
-
-src_test() {
-	arc unit --everything --no-coverage || die "arc unit failed"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins VERSION
-
-	insinto "/usr/share/php/${PN}"
-	doins -r externals resources scripts src
-
-	if use test ; then
-		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
-		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
-	fi
-
-	# Make executable all shebanged files
-	find "${ED}" -type f \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!/ {print FILENAME}' \
-		| sed -e "s:${ED}:/:" \
-		| xargs --no-run-if-empty -- \
-			fperms 755
-
-	dodoc NOTICE README.md
-}
diff --git a/dev-php/libphutil/libphutil-20150708.ebuild b/dev-php/libphutil/libphutil-20150708.ebuild
deleted file mode 100644
index aca52b32..00000000
--- a/dev-php/libphutil/libphutil-20150708.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs git-r3
-
-DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
-EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
-EGIT_BRANCH="stable"
-EGIT_COMMIT="aa6cd8f7e5e5e637dcfcb8417fbc343b45820c93"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl test"
-
-DEPEND="virtual/awk:0
-	test? (
-		sys-devel/bison:0
-		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20150724:0
-		dev-lang/php[cli]
-	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
-
-	echo "${EGIT_VERSION}" > "${S}/VERSION"
-
-	if use test ; then
-		tc-export AR CXX
-	fi
-
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r resources/ssl
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.sh
-	rm src/parser/xhpast/bin/xhpast.exe
-
-	# Replace 'env' shebang to files it point to
-	find "${S}" -type f \
-		| sort \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
-		| while read ; do
-			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
-			cmd="$1" ; shift ; args="$@"
-
-			case "${cmd}" in
-				bash|php)	;;
-				*)			continue ;;
-			esac
-
-			path="$(type -p ${cmd})" || continue
-			[[ -z "${path}" ]] && continue
-
-			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
-			sed -i \
-				-e "1 s:^#!.*:#!${path} ${args}:" \
-				"${REPLY}"
-			eend $?
-		done
-}
-
-src_compile() {
-	if use test ; then
-		cd support/xhpast
-
-		# Avoid sandbox violation for dev-lang/php[snmp]
-		# php -f generate_nodes.php'
-		#
-		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
-		#  abs_path: /var/lib/net-snmp/mib_indexes/0
-		#  res_path: /var/lib/net-snmp/mib_indexes/0
-		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
-		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
-		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
-		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
-		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
-		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
-		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
-		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
-		#  /proc/15834/cmdline: php -f generate_nodes.php
-		#
-		# See snmp_config(5)
-		export SNMP_PERSISTENT_DIR="${T}"
-
-		emake
-		emake install
-	fi
-}
-
-src_test() {
-	arc unit --everything --no-coverage || die "arc unit failed"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins VERSION
-
-	insinto "/usr/share/php/${PN}"
-	doins -r externals resources scripts src
-
-	if use test ; then
-		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
-		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
-	fi
-
-	# Make executable all shebanged files
-	find "${ED}" -type f \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!/ {print FILENAME}' \
-		| sed -e "s:${ED}:/:" \
-		| xargs --no-run-if-empty -- \
-			fperms 755
-
-	dodoc NOTICE README.md
-}
diff --git a/dev-php/libphutil/libphutil-20150815.ebuild b/dev-php/libphutil/libphutil-20150815.ebuild
deleted file mode 100644
index 12b7ea84..00000000
--- a/dev-php/libphutil/libphutil-20150815.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs git-r3
-
-DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
-EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
-EGIT_BRANCH="stable"
-EGIT_COMMIT="d266f8554c45dd670a16245a401da283bd6b3499"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl test"
-
-DEPEND="virtual/awk:0
-	test? (
-		sys-devel/bison:0
-		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20150815:0
-		dev-lang/php[cli]
-	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
-
-	echo "${EGIT_VERSION}" > "${S}/VERSION"
-
-	if use test ; then
-		tc-export AR CXX
-	fi
-
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r resources/ssl
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.sh
-	rm src/parser/xhpast/bin/xhpast.exe
-
-	# Replace 'env' shebang to files it point to
-	find "${S}" -type f \
-		| sort \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
-		| while read ; do
-			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
-			cmd="$1" ; shift ; args="$@"
-
-			case "${cmd}" in
-				bash|php)	;;
-				*)			continue ;;
-			esac
-
-			path="$(type -p ${cmd})" || continue
-			[[ -z "${path}" ]] && continue
-
-			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
-			sed -i \
-				-e "1 s:^#!.*:#!${path} ${args}:" \
-				"${REPLY}"
-			eend $?
-		done
-}
-
-src_compile() {
-	if use test ; then
-		cd support/xhpast
-
-		# Avoid sandbox violation for dev-lang/php[snmp]
-		# php -f generate_nodes.php'
-		#
-		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
-		#  abs_path: /var/lib/net-snmp/mib_indexes/0
-		#  res_path: /var/lib/net-snmp/mib_indexes/0
-		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
-		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
-		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
-		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
-		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
-		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
-		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
-		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
-		#  /proc/15834/cmdline: php -f generate_nodes.php
-		#
-		# See snmp_config(5)
-		export SNMP_PERSISTENT_DIR="${T}"
-
-		emake
-		emake install
-	fi
-}
-
-src_test() {
-	arc unit --everything --no-coverage || die "arc unit failed"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins VERSION
-
-	insinto "/usr/share/php/${PN}"
-	doins -r externals resources scripts src
-
-	if use test ; then
-		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
-		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
-	fi
-
-	# Make executable all shebanged files
-	find "${ED}" -type f \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!/ {print FILENAME}' \
-		| sed -e "s:${ED}:/:" \
-		| xargs --no-run-if-empty -- \
-			fperms 755
-
-	dodoc NOTICE README.md
-}
diff --git a/dev-php/libphutil/libphutil-20151003.ebuild b/dev-php/libphutil/libphutil-20151003.ebuild
deleted file mode 100644
index 46a39a05..00000000
--- a/dev-php/libphutil/libphutil-20151003.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs git-r3
-
-DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
-EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
-EGIT_BRANCH="stable"
-EGIT_COMMIT="367fadac24f24b826820e2fadced34b21cfff9ef"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl test"
-
-DEPEND="virtual/awk:0
-	test? (
-		sys-devel/bison:0
-		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20151003:0
-		dev-lang/php[cli]
-	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
-
-	echo "${EGIT_VERSION}" > "${S}/VERSION"
-
-	if use test ; then
-		tc-export AR CXX
-	fi
-
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r resources/ssl
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.sh
-	rm src/parser/xhpast/bin/xhpast.exe
-
-	# Replace 'env' shebang to files it point to
-	find "${S}" -type f \
-		| sort \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
-		| while read ; do
-			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
-			cmd="$1" ; shift ; args="$@"
-
-			case "${cmd}" in
-				bash|php)	;;
-				*)			continue ;;
-			esac
-
-			path="$(type -p ${cmd})" || continue
-			[[ -z "${path}" ]] && continue
-
-			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
-			sed -i \
-				-e "1 s:^#!.*:#!${path} ${args}:" \
-				"${REPLY}"
-			eend $?
-		done
-}
-
-src_compile() {
-	if use test ; then
-		cd support/xhpast
-
-		# Avoid sandbox violation for dev-lang/php[snmp]
-		# php -f generate_nodes.php'
-		#
-		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
-		#  abs_path: /var/lib/net-snmp/mib_indexes/0
-		#  res_path: /var/lib/net-snmp/mib_indexes/0
-		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
-		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
-		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
-		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
-		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
-		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
-		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
-		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
-		#  /proc/15834/cmdline: php -f generate_nodes.php
-		#
-		# See snmp_config(5)
-		export SNMP_PERSISTENT_DIR="${T}"
-
-		emake
-		emake install
-	fi
-}
-
-src_test() {
-	arc unit --everything --no-coverage || die "arc unit failed"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins VERSION
-
-	insinto "/usr/share/php/${PN}"
-	doins -r externals resources scripts src
-
-	if use test ; then
-		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
-		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
-	fi
-
-	# Make executable all shebanged files
-	find "${ED}" -type f \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!/ {print FILENAME}' \
-		| sed -e "s:${ED}:/:" \
-		| xargs --no-run-if-empty -- \
-			fperms 755
-
-	dodoc NOTICE README.md
-}
diff --git a/dev-php/libphutil/libphutil-20151024.ebuild b/dev-php/libphutil/libphutil-20151024.ebuild
deleted file mode 100644
index e683572f..00000000
--- a/dev-php/libphutil/libphutil-20151024.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs git-r3
-
-DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
-EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
-EGIT_BRANCH="stable"
-EGIT_COMMIT="5e2297f1588069dd3fd071e7977a2be6cf296aee"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl test"
-
-DEPEND="virtual/awk:0
-	test? (
-		sys-devel/bison:0
-		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20151024:0
-		dev-lang/php[cli]
-	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
-
-	echo "${EGIT_VERSION}" > "${S}/VERSION"
-
-	if use test ; then
-		tc-export AR CXX
-	fi
-
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r resources/ssl
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.php
-	rm src/parser/xhpast/bin/xhpast.exe
-
-	# Replace 'env' shebang to files it point to
-	find "${S}" -type f \
-		| sort \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
-		| while read ; do
-			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
-			cmd="$1" ; shift ; args="$@"
-
-			case "${cmd}" in
-				bash|php)	;;
-				*)			continue ;;
-			esac
-
-			path="$(type -p ${cmd})" || continue
-			[[ -z "${path}" ]] && continue
-
-			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
-			sed -i \
-				-e "1 s:^#!.*:#!${path} ${args}:" \
-				"${REPLY}"
-			eend $?
-		done
-}
-
-src_compile() {
-	if use test ; then
-		cd support/xhpast
-
-		# Avoid sandbox violation for dev-lang/php[snmp]
-		# php -f generate_nodes.php'
-		#
-		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
-		#  abs_path: /var/lib/net-snmp/mib_indexes/0
-		#  res_path: /var/lib/net-snmp/mib_indexes/0
-		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
-		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
-		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
-		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
-		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
-		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
-		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
-		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
-		#  /proc/15834/cmdline: php -f generate_nodes.php
-		#
-		# See snmp_config(5)
-		export SNMP_PERSISTENT_DIR="${T}"
-
-		emake
-		emake install
-	fi
-}
-
-src_test() {
-	arc unit --everything --no-coverage || die "arc unit failed"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins VERSION
-
-	insinto "/usr/share/php/${PN}"
-	doins -r externals resources scripts src
-
-	if use test ; then
-		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
-		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
-	fi
-
-	# Make executable all shebanged files
-	find "${ED}" -type f \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!/ {print FILENAME}' \
-		| sed -e "s:${ED}:/:" \
-		| xargs --no-run-if-empty -- \
-			fperms 755
-
-	dodoc NOTICE README.md
-}
diff --git a/dev-php/libphutil/libphutil-20160408.ebuild b/dev-php/libphutil/libphutil-20160408.ebuild
deleted file mode 100644
index e97513d6..00000000
--- a/dev-php/libphutil/libphutil-20160408.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs git-r3
-
-DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
-EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
-EGIT_BRANCH="stable"
-EGIT_COMMIT="a6d22b5cc662079dc991be306565871f1d50afb1"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl test"
-
-DEPEND="virtual/awk:0
-	test? (
-		sys-devel/bison:0
-		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20160408:0
-		dev-lang/php[cli]
-	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
-
-src_prepare() {
-	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
-
-	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
-
-	if use test ; then
-		tc-export AR CXX
-	fi
-
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r resources/ssl
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.php
-	rm src/parser/xhpast/bin/xhpast.exe
-
-	# Replace 'env' shebang to files it point to
-	find "${S}" -type f \
-		| sort \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
-		| while read ; do
-			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
-			cmd="$1" ; shift ; args="$@"
-
-			case "${cmd}" in
-				bash|php)	;;
-				*)			continue ;;
-			esac
-
-			path="$(type -p ${cmd})" || continue
-			[[ -z "${path}" ]] && continue
-
-			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
-			sed -i \
-				-e "1 s:^#!.*:#!${path} ${args}:" \
-				"${REPLY}"
-			eend $?
-		done
-}
-
-src_compile() {
-	if use test ; then
-		cd support/xhpast
-
-		# Avoid sandbox violation for dev-lang/php[snmp]
-		# php -f generate_nodes.php'
-		#
-		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
-		#  abs_path: /var/lib/net-snmp/mib_indexes/0
-		#  res_path: /var/lib/net-snmp/mib_indexes/0
-		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
-		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
-		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
-		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
-		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
-		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
-		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
-		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
-		#  /proc/15834/cmdline: php -f generate_nodes.php
-		#
-		# See snmp_config(5)
-		export SNMP_PERSISTENT_DIR="${T}"
-
-		emake
-		emake install
-	fi
-}
-
-src_test() {
-	arc unit --everything --no-coverage || die "arc unit failed"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins GIT_COMMIT_INFO
-
-	insinto "/usr/share/php/${PN}"
-	doins -r externals resources scripts src
-
-	if use test ; then
-		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
-		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
-	fi
-
-	# Make executable all shebanged files
-	find "${ED}" -type f \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!/ {print FILENAME}' \
-		| sed -e "s:${ED}:/:" \
-		| xargs --no-run-if-empty -- \
-			fperms 755
-
-	dodoc NOTICE README.md
-}
diff --git a/dev-php/libphutil/libphutil-20160529.ebuild b/dev-php/libphutil/libphutil-20160529.ebuild
deleted file mode 100644
index de1064a0..00000000
--- a/dev-php/libphutil/libphutil-20160529.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs git-r3
-
-DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
-EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
-EGIT_BRANCH="stable"
-EGIT_COMMIT="ffdfa49b4f4ab16a85a22b2a55da753617a2aef1"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ssl test"
-
-DEPEND="virtual/awk:0
-	test? (
-		sys-devel/bison:0
-		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20160520:0
-		dev-lang/php[cli]
-	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
-
-src_prepare() {
-	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
-
-	epatch "${FILESDIR}/${PV}-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch"
-
-	if use test ; then
-		tc-export AR CXX
-	fi
-
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r resources/ssl
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.php
-	rm src/parser/xhpast/bin/xhpast.exe
-
-	# Replace 'env' shebang to files it point to
-	find "${S}" -type f \
-		| sort \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!\/usr\/bin\/env/ {print FILENAME}' \
-		| while read ; do
-			set -- $(sed -ne '1 s:^#!\([^ ]*\) ::p;q' ${REPLY})
-			cmd="$1" ; shift ; args="$@"
-
-			case "${cmd}" in
-				bash|php)	;;
-				*)			continue ;;
-			esac
-
-			path="$(type -p ${cmd})" || continue
-			[[ -z "${path}" ]] && continue
-
-			einfo "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
-			sed -i \
-				-e "1 s:^#!.*:#!${path} ${args}:" \
-				"${REPLY}"
-			eend $?
-		done
-}
-
-src_compile() {
-	if use test ; then
-		cd support/xhpast
-
-		# Avoid sandbox violation for dev-lang/php[snmp]
-		# php -f generate_nodes.php'
-		#
-		#  * ACCESS DENIED:  open_wr:      /var/lib/net-snmp/mib_indexes/0
-		#  abs_path: /var/lib/net-snmp/mib_indexes/0
-		#  res_path: /var/lib/net-snmp/mib_indexes/0
-		#  /usr/lib64/libsandbox.so(+0xd9d1)[0x7f226c8899d1]
-		#  /usr/lib64/libsandbox.so(+0xdaf8)[0x7f226c889af8]
-		#  /usr/lib64/libsandbox.so(+0x59cf)[0x7f226c8819cf]
-		#  /usr/lib64/libsandbox.so(fopen+0x7c)[0x7f226c8843ec]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_mibindex_new+0x48)[0x7f22695f55e8]
-		#  /usr/lib64/libnetsnmp.so.30(add_mibdir+0x9c)[0x7f226960a00c]
-		#  /usr/lib64/libnetsnmp.so.30(netsnmp_init_mib+0xca)[0x7f22695f4bea]
-		#  /usr/lib64/libnetsnmp.so.30(init_snmp+0x32d)[0x7f226961c2dd]
-		#  php(zm_startup_snmp+0x51)[0x7f226cf81e11]
-		#  php(zend_startup_module_ex+0x11a)[0x7f226d0bccea]
-		#  /proc/15834/cmdline: php -f generate_nodes.php
-		#
-		# See snmp_config(5)
-		export SNMP_PERSISTENT_DIR="${T}"
-
-		emake
-		emake install
-	fi
-}
-
-src_test() {
-	arc unit --everything --no-coverage || die "arc unit failed"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins GIT_COMMIT_INFO
-
-	insinto "/usr/share/php/${PN}"
-	doins -r externals resources scripts src
-
-	if use test ; then
-		fperms 755 "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast"
-		dosym "/usr/share/php/${PN}/src/parser/xhpast/bin/xhpast" /usr/bin/xhpast
-	fi
-
-	# Make executable all shebanged files
-	find "${ED}" -type f \
-		| xargs -n 1 --no-run-if-empty -- \
-			awk 'NR == 1 && /^#!/ {print FILENAME}' \
-		| sed -e "s:${ED}:/:" \
-		| xargs --no-run-if-empty -- \
-			fperms 755
-
-	dodoc NOTICE README.md
-}
diff --git a/dev-php/libphutil/libphutil-20160123.ebuild b/dev-php/libphutil/libphutil-20160709.ebuild
index a0cbf21b..92d9d82a 100644
--- a/dev-php/libphutil/libphutil-20160123.ebuild
+++ b/dev-php/libphutil/libphutil-20160709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,10 +6,10 @@ EAPI=5
 inherit eutils toolchain-funcs git-r3
 
 DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
+HOMEPAGE="https://www.phacility.com"
 EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
 EGIT_BRANCH="stable"
-EGIT_COMMIT="9c472e7c9b64395424c6cd25734bf239cb3c113d"
+EGIT_COMMIT="5fd2cf9d5ddd38424a54a8fba02398d527639970"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -20,10 +20,11 @@ DEPEND="virtual/awk:0
 	test? (
 		sys-devel/bison:0
 		>=sys-devel/flex-2.5.35:0
-		=www-client/arcanist-20160212:0
+		=www-client/arcanist-20160701:0
 		dev-lang/php[cli]
 	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
+RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
+	<dev-lang/php-7"
 
 src_prepare() {
 	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
diff --git a/dev-php/libphutil/libphutil-9999.ebuild b/dev-php/libphutil/libphutil-9999.ebuild
index 06994c3a..1d6a45f0 100644
--- a/dev-php/libphutil/libphutil-9999.ebuild
+++ b/dev-php/libphutil/libphutil-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs git-r3
 
 DESCRIPTION="Collection of utility classes and functions for PHP used by phabricator"
-HOMEPAGE="http://www.phabricator.org"
+HOMEPAGE="https://www.phacility.com"
 EGIT_REPO_URI="git://github.com/phacility/libphutil.git"
 
 LICENSE="Apache-2.0"
@@ -21,7 +21,8 @@ DEPEND="virtual/awk:0
 		=www-client/arcanist-${PV}:0
 		dev-lang/php[cli]
 	)"
-RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]"
+RDEPEND=">=dev-lang/php-5.2.3[curl,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
+	<dev-lang/php-7"
 
 src_prepare() {
 	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"