www-client/arcanist: Version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.1

5 files changed, 41 insertions, 25 deletions

diff --git a/www-client/arcanist/arcanist-20170805.ebuild b/www-client/arcanist/arcanist-20170922.ebuild
index da39022e..984e350c 100644
--- a/www-client/arcanist/arcanist-20170805.ebuild
+++ b/www-client/arcanist/arcanist-20170922.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Command-line tool for Phabricator"
 HOMEPAGE="https://www.phacility.com"
 EGIT_REPO_URI="https://github.com/phacility/arcanist.git"
 EGIT_BRANCH="stable"
-EGIT_COMMIT="4e2363d8b26d2bd8ca169c40603b4fb582dab72f"
+EGIT_COMMIT="e88a8c077b3355af0f4f75fbe95d7a4b1239088b"
 
 LICENSE="Apache-2.0"
 SLOT="stable"
@@ -24,14 +24,14 @@ DEPEND="!${CATEGORY}/${PN}:0
 	virtual/awk:0
 	test? (
 		dev-lang/php[xmlwriter]
-		=dev-php/libphutil-20170811:stable[test]
+		=dev-php/libphutil-20170929:stable[test]
 	)"
 RDEPEND="|| (
 		dev-lang/php:5.6[cli,curl,json,ssl?]
 		dev-lang/php:7.1[cli,curl,json,ssl?]
 	)
 	!!dev-lang/php:7.0
-	=dev-php/libphutil-20170811:stable[ssl?]
+	=dev-php/libphutil-20170929:stable[ssl?]
 	git? ( dev-vcs/git:0 )
 	mercurial? ( dev-vcs/mercurial:0 )
 	subversion? ( dev-vcs/subversion:0 )
diff --git a/www-client/arcanist/files/20170805-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch b/www-client/arcanist/files/20170922-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
index 4852c5a5..22542c00 100644
--- a/www-client/arcanist/files/20170805-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
+++ b/www-client/arcanist/files/20170922-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
@@ -1,18 +1,18 @@
-From eec3932bdd9cbf1aabe16895d05ff5ac9773538f Mon Sep 17 00:00:00 2001
+From 47de8ad702a8dc6797fe20d293bc4f80addda7ea Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 18 Dec 2016 01:59:52 +0000
 Subject: [PATCH 1/2] MEDIUM: Get VERSION for files in
  /usr/share/<PN>/GIT_COMMIT_INFO rather than from git
 
 ---
- src/workflow/ArcanistVersionWorkflow.php | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
+ src/workflow/ArcanistVersionWorkflow.php | 27 ++++++++-------------------
+ 1 file changed, 8 insertions(+), 19 deletions(-)
 
 diff --git a/src/workflow/ArcanistVersionWorkflow.php b/src/workflow/ArcanistVersionWorkflow.php
-index 807c573275bf..fefd972786dc 100644
+index 9c470fc6ea05..fefd972786dc 100644
 --- a/src/workflow/ArcanistVersionWorkflow.php
 +++ b/src/workflow/ArcanistVersionWorkflow.php
-@@ -35,23 +35,18 @@ EOTEXT
+@@ -35,30 +35,19 @@ EOTEXT
      }
  
      $roots = array(
@@ -38,8 +38,16 @@ index 807c573275bf..fefd972786dc 100644
 +          pht('%s has no version registered in %s.', $lib, $commit_info));
        }
  
--      list($stdout) = $repository->execxLocal('log -1 --format=%s', '%H %ct');
+-      // NOTE: Carefully execute these commands in a way that works on Windows
+-      // until T8298 is properly fixed. See PHI52.
+-
+-      list($commit) = $repository->execxLocal('log -1 --format=%%H');
+-      $commit = trim($commit);
+-
+-      list($timestamp) = $repository->execxLocal('log -1 --format=%%ct');
+-      $timestamp = trim($timestamp);
 +      $stdout = file_get_contents($commit_info);
-       list($commit, $timestamp) = explode(' ', $stdout);
++      list($commit, $timestamp) = explode(' ', $stdout);
  
        $console->writeOut(
+         "%s %s (%s)\n",
diff --git a/www-client/arcanist/files/20170805-MINOR-Disable-self-upgrade.patch b/www-client/arcanist/files/20170922-MINOR-Disable-self-upgrade.patch
index 8a265ef1..a405117d 100644
--- a/www-client/arcanist/files/20170805-MINOR-Disable-self-upgrade.patch
+++ b/www-client/arcanist/files/20170922-MINOR-Disable-self-upgrade.patch
@@ -1,4 +1,4 @@
-From d9ff4ac56be8501a1185a119ba75dade2d8f98ab Mon Sep 17 00:00:00 2001
+From debf320769d3b60a6f069f9e62a76697764e5b35 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 18 Dec 2016 02:15:13 +0000
 Subject: [PATCH 2/2] MINOR: Disable self upgrade
@@ -10,10 +10,10 @@ Subject: [PATCH 2/2] MINOR: Disable self upgrade
  delete mode 100644 src/workflow/ArcanistUpgradeWorkflow.php
 
 diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
-index 2a3cfcf817b2..a9327dfe4e4b 100644
+index 7ab5a448936b..22bf6d5c5fd7 100644
 --- a/src/__phutil_library_map__.php
 +++ b/src/__phutil_library_map__.php
-@@ -382,7 +382,6 @@ phutil_register_library_map(array(
+@@ -384,7 +384,6 @@ phutil_register_library_map(array(
      'ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase.php',
      'ArcanistUnsafeDynamicStringXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php',
      'ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase.php',
@@ -21,7 +21,7 @@ index 2a3cfcf817b2..a9327dfe4e4b 100644
      'ArcanistUploadWorkflow' => 'workflow/ArcanistUploadWorkflow.php',
      'ArcanistUsageException' => 'exception/ArcanistUsageException.php',
      'ArcanistUseStatementNamespacePrefixXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUseStatementNamespacePrefixXHPASTLinterRule.php',
-@@ -797,7 +796,6 @@ phutil_register_library_map(array(
+@@ -801,7 +800,6 @@ phutil_register_library_map(array(
      'ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
      'ArcanistUnsafeDynamicStringXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
      'ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
diff --git a/www-client/arcanist/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch b/www-client/arcanist/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
index 0e598b9e..f44d02e7 100644
--- a/www-client/arcanist/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
+++ b/www-client/arcanist/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
@@ -1,18 +1,18 @@
-From 58d7d3d0da7269a45cbb97bf4e8ccf38d2db5c17 Mon Sep 17 00:00:00 2001
+From 8a607d3c5327bb990271a5097335f8851a500b0a Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 18 Dec 2016 01:59:52 +0000
 Subject: [PATCH 1/2] MEDIUM: Get VERSION for files in
  /usr/share/<PN>/GIT_COMMIT_INFO rather than from git
 
 ---
- src/workflow/ArcanistVersionWorkflow.php | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
+ src/workflow/ArcanistVersionWorkflow.php | 27 ++++++++-------------------
+ 1 file changed, 8 insertions(+), 19 deletions(-)
 
 diff --git a/src/workflow/ArcanistVersionWorkflow.php b/src/workflow/ArcanistVersionWorkflow.php
-index 807c573275bf..fefd972786dc 100644
+index 9c470fc6ea05..fefd972786dc 100644
 --- a/src/workflow/ArcanistVersionWorkflow.php
 +++ b/src/workflow/ArcanistVersionWorkflow.php
-@@ -35,23 +35,18 @@ EOTEXT
+@@ -35,30 +35,19 @@ EOTEXT
      }
  
      $roots = array(
@@ -38,8 +38,16 @@ index 807c573275bf..fefd972786dc 100644
 +          pht('%s has no version registered in %s.', $lib, $commit_info));
        }
  
--      list($stdout) = $repository->execxLocal('log -1 --format=%s', '%H %ct');
+-      // NOTE: Carefully execute these commands in a way that works on Windows
+-      // until T8298 is properly fixed. See PHI52.
+-
+-      list($commit) = $repository->execxLocal('log -1 --format=%%H');
+-      $commit = trim($commit);
+-
+-      list($timestamp) = $repository->execxLocal('log -1 --format=%%ct');
+-      $timestamp = trim($timestamp);
 +      $stdout = file_get_contents($commit_info);
-       list($commit, $timestamp) = explode(' ', $stdout);
++      list($commit, $timestamp) = explode(' ', $stdout);
  
        $console->writeOut(
+         "%s %s (%s)\n",
diff --git a/www-client/arcanist/files/9999-MINOR-Disable-self-upgrade.patch b/www-client/arcanist/files/9999-MINOR-Disable-self-upgrade.patch
index bd6ea8ef..bb5c249b 100644
--- a/www-client/arcanist/files/9999-MINOR-Disable-self-upgrade.patch
+++ b/www-client/arcanist/files/9999-MINOR-Disable-self-upgrade.patch
@@ -1,4 +1,4 @@
-From dd605121aa974598de0e34f47660ffc086030340 Mon Sep 17 00:00:00 2001
+From 627d09321ec238324bf305f5f4e1f0ceb2681788 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sun, 18 Dec 2016 02:15:13 +0000
 Subject: [PATCH 2/2] MINOR: Disable self upgrade
@@ -10,10 +10,10 @@ Subject: [PATCH 2/2] MINOR: Disable self upgrade
  delete mode 100644 src/workflow/ArcanistUpgradeWorkflow.php
 
 diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
-index 2a3cfcf817b2..a9327dfe4e4b 100644
+index 7ab5a448936b..22bf6d5c5fd7 100644
 --- a/src/__phutil_library_map__.php
 +++ b/src/__phutil_library_map__.php
-@@ -382,7 +382,6 @@ phutil_register_library_map(array(
+@@ -384,7 +384,6 @@ phutil_register_library_map(array(
      'ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase.php',
      'ArcanistUnsafeDynamicStringXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnsafeDynamicStringXHPASTLinterRule.php',
      'ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase.php',
@@ -21,7 +21,7 @@ index 2a3cfcf817b2..a9327dfe4e4b 100644
      'ArcanistUploadWorkflow' => 'workflow/ArcanistUploadWorkflow.php',
      'ArcanistUsageException' => 'exception/ArcanistUsageException.php',
      'ArcanistUseStatementNamespacePrefixXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUseStatementNamespacePrefixXHPASTLinterRule.php',
-@@ -797,7 +796,6 @@ phutil_register_library_map(array(
+@@ -801,7 +800,6 @@ phutil_register_library_map(array(
      'ArcanistUnnecessarySymbolAliasXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
      'ArcanistUnsafeDynamicStringXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
      'ArcanistUnsafeDynamicStringXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',