www-apps/phabricator: Patch to get version from VERSION files

Package-Manager: portage-2.2.8-r1

6 files changed, 62 insertions, 8 deletions

diff --git a/www-apps/phabricator/ChangeLog b/www-apps/phabricator/ChangeLog
index 6a5d7c3d..0326ea4f 100644
--- a/www-apps/phabricator/ChangeLog
+++ b/www-apps/phabricator/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch,
+  files/9999-E-Make-wiki-visible-to-all.patch,
+  files/9999-E-public-wiki-now.patch, phabricator-9999.ebuild:
+  www-apps/phabricator: Patch to get version from VERSION files
+
   22 Feb 2014; Bertrand Jacquin <beber@meleeweb.net> phabricator-9999.ebuild:
   www-apps/phabricator: Create VERSION that contain last git commit id
 
diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index 3e334dc3..3f8fd175 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -1,11 +1,12 @@
-AUX 9999-E-Make-wiki-visible-to-all.patch 901 SHA256 cdf6d494f7cd95e86aa070e2b7b5625e7c6e690269aea279ac56cf8920ee86ff WHIRLPOOL a08112dcd23b3295cc9ff97f54af7834198699db21115a8da11aee4fcc8f8652bec8fa265220cba65d4192b0cf932024c9bc7c3a6c0fd032e7516ada12b6542a
-AUX 9999-E-public-wiki-now.patch 8019 SHA256 00dc9b3ca8772c94348f13252f1755c8e56696782d7714e27134d18a4791a493 WHIRLPOOL 977a923c7fc568fa17c1f01dc81dccec163e25dfd42bc8746a07c0ef4f441796e6894731cbfa22dca25fe48584fe989f31cc8350516ff59fb9721512691db16d
+AUX 9999-E-Make-wiki-visible-to-all.patch 901 SHA256 cd2a36e0680368ada9f8b65adbf90306d4d3cfa9f8adc6d3edbd2aa671f11165 WHIRLPOOL dcffee070445c012a302dab822db88aa9b3fe0cc00ccf9bc89dfd5eed6e0628b1f004a08d518baf79062ec644ad35236610d47d582e8da3b7174cd0674aae418
+AUX 9999-E-public-wiki-now.patch 8019 SHA256 91b3d2e73d0d1405b2b6eb2adeb50da0d1053c7fcaebb9eeb73b59aa7879b6b4 WHIRLPOOL 458dc0266d9afc0bc1d393e1be86bd6966474c6b76917aedad057f8e8be601ec717c2c684078fac513527dc3158307dac7b0750cbbbe4dd457337f0dc6bf9e45
+AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1673 SHA256 b6409e90db03efde5e4fe77316b95fe1945e72ff0ad8c0ef6c924843397d0c96 WHIRLPOOL 0afd396e8d5a976f2162374f24d4e1fed37794ea8905ab31c71998674829c8862993b1d1da571897484ee4fb529cc66118d9db74a47147d35719dc2bb24d19a1
 AUX aphlictd.confd 163 SHA256 553f18f54bcf75eada649e564fea7c4c610fd01ec93708bd246263405e7d5246 WHIRLPOOL 027e41cff147fbf7544ba72575fa21e12a66da7b5cd1bdf53a98b929b7c6127c25a997118e9cfea0e00379a7937eb52b051deb4256abb5bb5d6796a9d16138ad
 AUX aphlictd.initd 1049 SHA256 6f45d4e4d2d55b50b35b84c11c73628c067f5b7e4d6d88e148ebd00a1a1208cd WHIRLPOOL 2dcf7c230891e660f6dd3655ef0f04be74798f7fc98cc6191088d90ceeb7b6fe51d36ea016d625c18325f4b724a89f07b8e6c2bfd0aa6779946fe72b1702f95d
 AUX htaccess 475 SHA256 90b7245b7518f5b3e56bae9d574a530e3cd47808ef937bdc78ea4288eaff0c6a WHIRLPOOL fc9123f3d40affe53314a25c2649a5b2f47640131c9bc5a6dd0c55ac36e0a205f392b403fcbce93daffceaf427c7146b7a091115a8260c7551a3bfe8069ad88e
 AUX phd.confd 215 SHA256 80ddbf586f38cc600d06e524f7e85c3258bd563696fa2e41e1ea19268da8079b WHIRLPOOL 0f1a587c755994c410b62da6b897ca8684d584b9f01956359e078429fc7ec7642561dc3e3c306bbb24753e3a68ef5f088a5709706143b6154aa085ac2dfa52ad
 AUX phd.initd 2108 SHA256 8475c308320ce4d51d35cbea46df61628c9c1d64eb724955a38ed49e51690cda WHIRLPOOL 4c91fcce779d423fa0fa24e744675a7dfaa57d0fe2dd86792a2c27215fc014ca85b38695909f8f6c063308a10d53c499620d909ee29382aec8097c437857988e
 AUX webapp-hook 3866 SHA256 429b0dd02a50b61c71b340037687fbacd41fabaf399e6b078cdc80b7b035357e WHIRLPOOL 38395b7ba5d6ee06ccb724b12f0c2dd1192e3cc517e30eed1efbb9b4d4dcb06ab411aad0a004aa833e05f2552525f48e98e58d6915be2be4e633b7900705d831
-EBUILD phabricator-9999.ebuild 4503 SHA256 5321c82ffe8a00a9f5733c04616a665790d1c45c5b3ac6357ab656335856106d WHIRLPOOL 87220a2929b856211e910fec13c9736b59bf4973d51f82c0abc067089b15093f16c2ce1975ea410d472b5aefb9779222db526b16c70b0af7a86089d8e287ad96
-MISC ChangeLog 6065 SHA256 3e411938232e84b66609d4e941e4867c5a511e4987d6101729b1e60284e7c7b5 WHIRLPOOL 7586763ffd0cb17525065866deb01bdec505b4bb194e0b612aec4c214c40c91f56fd26e5620c063e23f5429699c201392074b78937921ec61d6761268152c8ea
+EBUILD phabricator-9999.ebuild 4590 SHA256 a90101a4cf22b83d36478b4f93f62d59f2d93924d473f7f6b678e0e6162a68e8 WHIRLPOOL 82302d26d51defe5d03341c87c0f6a51a6b93470acec02681447e5db7b3c26d4cfc3451e202b4715170457666374ed3c6570b631fa257b7af1b57b44fb2d937d
+MISC ChangeLog 6367 SHA256 dce04ed2f7cf9692ff45a5af7bdc9b4e9e4534a8c1cccdfb6a18a68ba167c60c WHIRLPOOL f37452fae8ea36e2019dbd9d4663be856b483e6304964544446b26147e6c8af28955ac7367979cfbfc0fb844c79a781927bed77d8798c5740a2c54870f475fb3
 MISC metadata.xml 653 SHA256 744c67bfd3b874f305b08a5b68c5e2213c3cdc1c47b381fe130ebfc2005a964b WHIRLPOOL 5efd225c032e0704862510f166c94327460caf27527b473fe8f35ea6117b2b16862e362aff0b7bdb47b38349dbcf8710fff4040f11d50e07865f983dacc93d99
diff --git a/www-apps/phabricator/files/9999-E-Make-wiki-visible-to-all.patch b/www-apps/phabricator/files/9999-E-Make-wiki-visible-to-all.patch
index 6623d8ef..897fb840 100644
--- a/www-apps/phabricator/files/9999-E-Make-wiki-visible-to-all.patch
+++ b/www-apps/phabricator/files/9999-E-Make-wiki-visible-to-all.patch
@@ -1,7 +1,7 @@
-From b6fedc42966b317f980d568359ee2c9e80bc528b Mon Sep 17 00:00:00 2001
+From b4233c7f2a61ca05b4d43b89403f5e7aee42eebd Mon Sep 17 00:00:00 2001
 From: Enlightenment <no-reply@enlightenment.org>
 Date: Tue, 26 Mar 2013 06:11:16 -0700
-Subject: [PATCH 1/2] E: Make wiki visible to all.
+Subject: [PATCH 2/3] E: Make wiki visible to all.
 
 ---
  src/applications/phriction/controller/PhrictionDocumentController.php | 4 ++++
diff --git a/www-apps/phabricator/files/9999-E-public-wiki-now.patch b/www-apps/phabricator/files/9999-E-public-wiki-now.patch
index e957bdbc..5347adcf 100644
--- a/www-apps/phabricator/files/9999-E-public-wiki-now.patch
+++ b/www-apps/phabricator/files/9999-E-public-wiki-now.patch
@@ -1,7 +1,7 @@
-From c06f365d35bd4fe1887db6b0bed6af2816e04446 Mon Sep 17 00:00:00 2001
+From ef37da6f842b21b2d2825e01034785e245c32975 Mon Sep 17 00:00:00 2001
 From: Carsten Haitzler <raster@rasterman.com>
 Date: Mon, 10 Feb 2014 19:32:45 +0900
-Subject: [PATCH 2/2] E: public wiki now
+Subject: [PATCH 3/3] E: public wiki now
 
 after many hours of futzing about in phab.. i've gotten itback to where it once
 was... with a publicly readable wiki! yay! problem is - not really possible to
diff --git a/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
new file mode 100644
index 00000000..a3e2ebc6
--- /dev/null
+++ b/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
@@ -0,0 +1,46 @@
+From a66549498ee0826104ee562c9d88953fd1e9db50 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <beber@meleeweb.net>
+Date: Sat, 22 Feb 2014 18:31:14 +0100
+Subject: [PATCH 1/3] MEDIUM: Get VERSION for files in /usr/share/<PN>/VERSION
+ rather than from git
+
+---
+ .../config/controller/PhabricatorConfigAllController.php | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php
+index d122277..9167156 100644
+--- a/src/applications/config/controller/PhabricatorConfigAllController.php
++++ b/src/applications/config/controller/PhabricatorConfigAllController.php
+@@ -110,22 +110,24 @@ final class PhabricatorConfigAllController
+       ),
+       array(
+         'name' => pht('libphutil Version'),
+-        'root' => 'phutil',
++        'root' => 'libphutil',
+       ),
+     );
+ 
+     $futures = array();
+     foreach ($specs as $key => $spec) {
+-      $root = dirname(phutil_get_library_root($spec['root']));
+-      $futures[$key] = id(new ExecFuture('git log --format=%%H -n 1 --'))
+-        ->setCWD($root);
++      $vfile = "/usr/share/" . $spec['root'] . "/VERSION";
++      if (file_exists($vfile)) {
++        $futures[$key] = file_get_contents($vfile);
++      } else {
++        $futures[$key] = '';
++      }
+     }
+ 
+     $results = array();
+     foreach ($futures as $key => $future) {
+-      list($err, $stdout) = $future->resolve();
+-      if (!$err) {
+-        $name = trim($stdout);
++      if (!empty($future)) {
++        $name = trim($future);
+       } else {
+         $name = pht('Unknown');
+       }
diff --git a/www-apps/phabricator/phabricator-9999.ebuild b/www-apps/phabricator/phabricator-9999.ebuild
index 56c6331c..7a005860 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -52,6 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${PV}-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch"
 	epatch "${FILESDIR}/${PV}-E-Make-wiki-visible-to-all.patch"
 	epatch "${FILESDIR}/${PV}-E-public-wiki-now.patch"