www-apps/phabricator: Update VERSION patch to include original libname in /config/module/versions instead of portage one, handle phabricator-extensions-Sprint as well

Package-Manager: portage-2.2.28

3 files changed, 28 insertions, 18 deletions

diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index cccc9482..fd520347 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -4,8 +4,8 @@ AUX 20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA
 AUX 20151005-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA256 4900969a7718ec252bdbf9de49c8cacf47ffcc26b611649b7d523303a2b8e0d3 WHIRLPOOL 04e302e04a9f048e7aa2938fc6bb58beeb739ebf15be24b6633f81390360d567fef773be2658e27e08a8063f33fada3a06544b82b6014b77b775f2ae134fcaa9
 AUX 20151024-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA256 61647aafcd53dbb9b259fea0cb55160701b0f6bacb7444b1aa9306a22166c0f2 WHIRLPOOL 85c15de0f58b6c049452719f571b7adca59cbac48cc8d808c30194f982cdc993a020d44477f2c0d21d57e97259e2a496db5cdb3939d8cde42a983c255e2df961
 AUX 20160212-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1228 SHA256 f65573e0f6ca9685bd9d7ae80dbbfc39e5a18b175ae0aadf1fc5240cdfaa2752 WHIRLPOOL 522fafe8a373bc1e4904c559d45e40bfafa973bfcf9b7c0501a00cd3907aa38ec1cf9172c1f7e129ca7844d4d33150a0fff53b5fc7012df4dd41eb5705857f68
-AUX 20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1228 SHA256 4dbe208f341df70a60d30f0fc1b0da190a6296b1d7a3f08b333dc17514e9731e WHIRLPOOL 53cee2da9b0cb3dcc256434b89913cfc93254c5fcbdbfee69f8319fbaef66ee04fbe8fad6338467ba49c1c46e268de1a5f90db0aef4a201228191bcfc35913e9
-AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1228 SHA256 8901c43fd5bd88890c2b53d8130389f40120df449c329b179250b8441ea0fbb7 WHIRLPOOL 5195d0ea350b3633aa8a055dcdaee752837fc63b5376c033c04f48838573995530cb5a3ca8f3dd3f77e269a635c6203b163c53549846c7bb21a5f71045e7b611
+AUX 20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1382 SHA256 73ff10bf53c24275cbcfaee712d6e5c4acca69184cdf17eb80bee2752c9ac112 WHIRLPOOL 2f5a396c203c131cc5a9fb35f03e472f2c4ba2c9a8c70d527d788cb796427ba65e2af2805dc9cb7c8ff121b5eeceee53ea81dfb3ab702269c621fa9e835248c1
+AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1382 SHA256 602f35e88e9e4d23f9d7d54bb8872714d6fd5675d074879182eb8d349380906c WHIRLPOOL c49090ac959105402261d33985018759b7a015f9af162aec62842fb351fb7acab9b56e1dc9e6e61f247e7b3461bd1432870295f4cc638215e14d870879e99c04
 AUX aphlictd.confd 220 SHA256 da99929f9aab168889e4a6d871b61947a3dcad4e12e1ca206967ff09cd20d558 WHIRLPOOL 51db9a92af0acbf2b3ca9ce2b5e64edf625011805312bec5a3cf38d3a491d1dfc8215828b8981eca7b3c8dc6d0297f7b06df365dac9914bdac196f72dc78df53
 AUX aphlictd.initd 1618 SHA256 1d02bad1035b511969ffd4ea27b1b4929e87995a773575555e26adbf14d4f877 WHIRLPOOL 2dca73e8986b3ce19902e43f29f0dc86c18764c37afb06d1d85fbff7a60d6e02dad6d784397c80843b7f5f6c0f394fb1337cf358496f68f39498c190e6f51775
 AUX htaccess 475 SHA256 90b7245b7518f5b3e56bae9d574a530e3cd47808ef937bdc78ea4288eaff0c6a WHIRLPOOL fc9123f3d40affe53314a25c2649a5b2f47640131c9bc5a6dd0c55ac36e0a205f392b403fcbce93daffceaf427c7146b7a091115a8260c7551a3bfe8069ad88e
diff --git a/www-apps/phabricator/files/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch b/www-apps/phabricator/files/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
index 84ebe761..56a23606 100644
--- a/www-apps/phabricator/files/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
+++ b/www-apps/phabricator/files/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
@@ -1,32 +1,37 @@
-From 3911226aeb782453bf58b291bd28859952784009 Mon Sep 17 00:00:00 2001
+From 269173a923016d074b351632b9fc610b62fdc02e Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 22 Feb 2014 18:31:14 +0100
 Subject: [PATCH] MEDIUM: Get VERSION for files in
  /usr/share/<PN>/GIT_COMMIT_INFO rather than from git
 
 ---
- .../config/module/PhabricatorConfigVersionsModule.php          | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ .../config/module/PhabricatorConfigVersionsModule.php     | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/src/applications/config/module/PhabricatorConfigVersionsModule.php b/src/applications/config/module/PhabricatorConfigVersionsModule.php
-index 9a6292a..46b681d 100644
+index 9a6292a..8278881 100644
 --- a/src/applications/config/module/PhabricatorConfigVersionsModule.php
 +++ b/src/applications/config/module/PhabricatorConfigVersionsModule.php
-@@ -51,10 +51,14 @@ final class PhabricatorConfigVersionsModule
+@@ -51,10 +51,19 @@ final class PhabricatorConfigVersionsModule
  
      $futures = array();
      foreach ($specs as $lib) {
 -      $root = dirname(phutil_get_library_root($lib));
 +      switch ($lib) {
 +        case "phutil":
-+	  $lib = "libphutil";
-+	  break;
++          $_dir = "libphutil";
++          break;
++        case "sprint":
++          $_dir = "phabricator-extensions-Sprint";
++          break;
++        default:
++          $_dir = $lib;
 +      }
 +
        $futures[$lib] =
 -        id(new ExecFuture('git log --format=%s -n 1 --', '%H %ct'))
 -        ->setCWD($root);
-+        id(new ExecFuture('cat -- %s', "/usr/share/" . $lib . "/GIT_COMMIT_INFO"));
++        id(new ExecFuture('cat -- %s', "/usr/share/" . $_dir . "/GIT_COMMIT_INFO"));
      }
  
      $results = array();
diff --git a/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch b/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
index ec527d28..3f38055b 100644
--- a/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
+++ b/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
@@ -1,32 +1,37 @@
-From 1282dbc03c5a98faaadfc61a386aa4a6a5cd499a Mon Sep 17 00:00:00 2001
+From 38cac5f960c8d21bdf31b83665352aa6a553ad52 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <bertrand@jacquin.bzh>
 Date: Sat, 22 Feb 2014 18:31:14 +0100
 Subject: [PATCH] MEDIUM: Get VERSION for files in
  /usr/share/<PN>/GIT_COMMIT_INFO rather than from git
 
 ---
- .../config/module/PhabricatorConfigVersionsModule.php          | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ .../config/module/PhabricatorConfigVersionsModule.php     | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/src/applications/config/module/PhabricatorConfigVersionsModule.php b/src/applications/config/module/PhabricatorConfigVersionsModule.php
-index 9a6292a..46b681d 100644
+index 9a6292a..8278881 100644
 --- a/src/applications/config/module/PhabricatorConfigVersionsModule.php
 +++ b/src/applications/config/module/PhabricatorConfigVersionsModule.php
-@@ -51,10 +51,14 @@ final class PhabricatorConfigVersionsModule
+@@ -51,10 +51,19 @@ final class PhabricatorConfigVersionsModule
  
      $futures = array();
      foreach ($specs as $lib) {
 -      $root = dirname(phutil_get_library_root($lib));
 +      switch ($lib) {
 +        case "phutil":
-+	  $lib = "libphutil";
-+	  break;
++          $_dir = "libphutil";
++          break;
++        case "sprint":
++          $_dir = "phabricator-extensions-Sprint";
++          break;
++        default:
++          $_dir = $lib;
 +      }
 +
        $futures[$lib] =
 -        id(new ExecFuture('git log --format=%s -n 1 --', '%H %ct'))
 -        ->setCWD($root);
-+        id(new ExecFuture('cat -- %s', "/usr/share/" . $lib . "/GIT_COMMIT_INFO"));
++        id(new ExecFuture('cat -- %s', "/usr/share/" . $_dir . "/GIT_COMMIT_INFO"));
      }
  
      $results = array();