www-apps/phabricator: Sync with upstream, drop unneeded patches, fix init script if no instances is installed, DEPEND on sys-apps/gentoo-functions

Package-Manager: portage-2.2.14

8 files changed, 54 insertions, 240 deletions

diff --git a/www-apps/phabricator/ChangeLog b/www-apps/phabricator/ChangeLog
index 6f748c71..cb7a7e2d 100644
--- a/www-apps/phabricator/ChangeLog
+++ b/www-apps/phabricator/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Feb 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  -files/9999-E-Make-wiki-visible-to-all.patch,
+  -files/9999-E-public-wiki-now.patch, files/aphlictd.initd, files/phd.initd,
+  files/webapp-hook, phabricator-9999.ebuild:
+  www-apps/phabricator: Sync with upstream, drop unneeded patches, fix init
+  script if no instances is installed, DEPEND on sys-apps/gentoo-functions
+
   25 Jan 2015; Bertrand Jacquin <bertrand@jacquin.bzh> metadata.xml:
   Update email address
 
diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index 8c07add0..b90b2c49 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -1,13 +1,11 @@
-AUX 9999-E-Make-wiki-visible-to-all.patch 901 SHA256 0b1166531cf6ad4a559b2f6e9e7caacbf08157ed34d96c73988aa8143dfc3b44 WHIRLPOOL d72c2c7dabf6b1ff858f00ce2eb9424838d130484eb5bbedf2a7d42057d9a20868bcec47a77e04c35f5a73481b3a1768ba8192b768125d309ab9ed13d925d3f4
-AUX 9999-E-public-wiki-now.patch 8047 SHA256 30bd4a9c9b4bd2167aff39b7affce96800249a8e84c736e28204c6c1c52ef4c6 WHIRLPOOL ddb10f86f26efea16f6036cf5115e16bee46a84c76be24ea830d7aa10f3b0ece1e15e656243ad7f9a5b0d33c7f245a1270c839c6ae6621319d559d6b90dc7c30
 AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1673 SHA256 fdf315f569e49164ebf9a2a6c9ff5b9ab4cbacc4f2cc9401a7ac631e92a9336e WHIRLPOOL 1128567534957ffb2fe831c3973446eaf76e4de7fd8e865e7ed32fbbc20eb307c0117fdb41e27bfdcf5bbabcd613d12c357dcfdf070829eb85a8a7879d55cab9
 AUX aphlictd.confd 163 SHA256 553f18f54bcf75eada649e564fea7c4c610fd01ec93708bd246263405e7d5246 WHIRLPOOL 027e41cff147fbf7544ba72575fa21e12a66da7b5cd1bdf53a98b929b7c6127c25a997118e9cfea0e00379a7937eb52b051deb4256abb5bb5d6796a9d16138ad
-AUX aphlictd.initd 1118 SHA256 d820a064a0b62f1a62adf1364b4e96b29a9b2bf523a3ff3823e3011a458d1df8 WHIRLPOOL 5aeb3524e4693889a81edbaeaadfaa32a830425241b3c1de542e87bf1e7092115f2778663a980725f4372c3cc8edf5bce13043a1165237dad80e6d11acf9c3af
+AUX aphlictd.initd 1394 SHA256 ed0bd721969e62a4e82c8089ac899260636e879d55f53221754b549c7ce8c2aa WHIRLPOOL 51adebbcde85f8578148e6c4c8d9695273cc2f3867cd4151a75db951a8a3ced1290db0dfa264af63b8f405b1ddbb6398a8cf13cc688a075f01424d35d276d7bc
 AUX htaccess 475 SHA256 90b7245b7518f5b3e56bae9d574a530e3cd47808ef937bdc78ea4288eaff0c6a WHIRLPOOL fc9123f3d40affe53314a25c2649a5b2f47640131c9bc5a6dd0c55ac36e0a205f392b403fcbce93daffceaf427c7146b7a091115a8260c7551a3bfe8069ad88e
 AUX phabricator.logrotate 56 SHA256 e63141278776888c1a3f8e841b0d263efe2beb6c9dbefa3d700fbd8912f4fe58 WHIRLPOOL 8fa63b4218f8757221cd4780e16c70d16e9849e6a89b9eecd327688bff9195bb1c0604c8e80e496cd659ef0a6fc9cfa79774a825d79be58c03e4f1a592ad07b9
 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 4644 SHA256 034587251d5e582368070dbbf5534e9736c4d3b3d52291072b13a0d59a94f5e4 WHIRLPOOL 9ee06d0e82e2251bef914ca00ea740b7c035ebaa46584b67040e0b8336c89bda7fd6188c17c4639bb72de656a02782471f1f4b730784a9dd1507454ee10b428c
-MISC ChangeLog 7261 SHA256 c26bc1a57a4f3fa76076db3e5af02617016b6422afe132e1a7e39e37ad2684b4 WHIRLPOOL b8d88147f5d4c5cc9da53580a48f0f99a1886bfb9b9f861f10f781a2f942a60765f15e1c2e58e35be75b7012fb829cbef42aea96c78e18aab254701218d42f68
+AUX phd.initd 2410 SHA256 f2de188c8b4ad98271b36711821b7743b3fb096bcfa4dafed9c3aee79ccbb1fc WHIRLPOOL e521540242ce598eb98fda8040b9fdfa202539cf8a82537ff6e1cdbeee555a9f277277d9902fa7080b6bb4b186e04184030fcd3ce85b278daf5d3a1a953b9d1e
+AUX webapp-hook 3806 SHA256 a28585797c766d49dc571483b779b57f8187f6c8caed541e36181796179db661 WHIRLPOOL 652133732134583f169b7118fcd847848b17f74a07c50af5690f713f1c12b1c56a0b2d29ba95bb3b9547cdd74c7ec4801f2e0edb6c510e23d7c2a22350696ae1
+EBUILD phabricator-9999.ebuild 4533 SHA256 9189bba1defe8814c3f0471c2968d52e4b05dc5e3599201ff08d1b15db0dd785 WHIRLPOOL 52b96276a07b8204e97c3fd17196c05d8af0c1d2d8a08c57364608d26acda54101369c0eaad4d61959cef1bec407f03f62cc6cb9b13ef8f395605331ce73b990
+MISC ChangeLog 7640 SHA256 1911261e2db91c0f6e23677a94ed77458aadbdf00dca01dc3779dce52e3d7765 WHIRLPOOL 7bba8c1863e0e862294539ff3932d23d4325b2055f6938adafe451b0e04ce23832bffc4bf596a497794a1e8ae581be06790cf69d2363aa817727fba6bc3beec5
 MISC metadata.xml 655 SHA256 0a90f5e0e963495bd177d96a2c5b04a940a2bab969b6921e02655eb9d959493c WHIRLPOOL e817700577f9691c696b0d4b18df79be591a4fc2318af0ebd0add1fbe323de169b8ff03384883734ac7c2d6c93414e1b6edcadf69ea25a35225945b8bdf118c1
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
deleted file mode 100644
index edd28c24..00000000
--- a/www-apps/phabricator/files/9999-E-Make-wiki-visible-to-all.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3312eee098ef29a3aae02b9235fb3cd737cd0827 Mon Sep 17 00:00:00 2001
-From: Enlightenment <no-reply@enlightenment.org>
-Date: Tue, 26 Mar 2013 06:11:16 -0700
-Subject: [PATCH 2/3] E: Make wiki visible to all.
-
----
- src/applications/phriction/controller/PhrictionDocumentController.php | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
-index 99543e6..9943250 100644
---- a/src/applications/phriction/controller/PhrictionDocumentController.php
-+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
-@@ -5,6 +5,10 @@ final class PhrictionDocumentController
- 
-   private $slug;
- 
-+  public function shouldAllowPublic() {
-+    return true;
-+  }
-+
-   public function willProcessRequest(array $data) {
-     $this->slug = $data['slug'];
-   }
diff --git a/www-apps/phabricator/files/9999-E-public-wiki-now.patch b/www-apps/phabricator/files/9999-E-public-wiki-now.patch
deleted file mode 100644
index 40eb58b3..00000000
--- a/www-apps/phabricator/files/9999-E-public-wiki-now.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 9781d0aa1d4a6cd692e0faa9c1c463d4aa8a6617 Mon Sep 17 00:00:00 2001
-From: Carsten Haitzler <raster@rasterman.com>
-Date: Mon, 10 Feb 2014 19:32:45 +0900
-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
-track changes due to the install not being a git tree.
----
- .../base/controller/PhabricatorController.php         |  2 +-
- .../countdown/storage/PhabricatorCountdown.php        |  2 +-
- src/applications/files/storage/PhabricatorFile.php    |  2 +-
- .../maniphest/query/ManiphestTaskSearchEngine.php     |  3 ++-
- .../phriction/controller/PhrictionController.php      | 19 ++++++++++++-------
- .../controller/PhrictionDocumentController.php        | 15 +++++++++++----
- .../phriction/storage/PhrictionDocument.php           |  6 ++++--
- 7 files changed, 32 insertions(+), 17 deletions(-)
-
-diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
-index d821bd6..425abb6 100644
---- a/src/applications/base/controller/PhabricatorController.php
-+++ b/src/applications/base/controller/PhabricatorController.php
-@@ -5,7 +5,7 @@ abstract class PhabricatorController extends AphrontController {
-   private $handles;
- 
-   public function shouldRequireLogin() {
--    return true;
-+    return false;
-   }
- 
-   public function shouldRequireAdmin() {
-diff --git a/src/applications/countdown/storage/PhabricatorCountdown.php b/src/applications/countdown/storage/PhabricatorCountdown.php
-index b69a9d5..dc19ec5 100644
---- a/src/applications/countdown/storage/PhabricatorCountdown.php
-+++ b/src/applications/countdown/storage/PhabricatorCountdown.php
-@@ -49,7 +49,7 @@ final class PhabricatorCountdown
-   public function getPolicy($capability) {
-     switch ($capability) {
-       case PhabricatorPolicyCapability::CAN_VIEW:
--        return $this->getViewPolicy();
-+        return PhabricatorPolicies::POLICY_PUBLIC;
-       case PhabricatorPolicyCapability::CAN_EDIT:
-         return PhabricatorPolicies::POLICY_NOONE;
-     }
-diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
-index df8b005..0dc241e 100644
---- a/src/applications/files/storage/PhabricatorFile.php
-+++ b/src/applications/files/storage/PhabricatorFile.php
-@@ -887,7 +887,7 @@ final class PhabricatorFile extends PhabricatorFileDAO
-   public function getPolicy($capability) {
-     switch ($capability) {
-       case PhabricatorPolicyCapability::CAN_VIEW:
--        return $this->getViewPolicy();
-+        return PhabricatorPolicies::POLICY_PUBLIC;
-       case PhabricatorPolicyCapability::CAN_EDIT:
-         return PhabricatorPolicies::POLICY_NOONE;
-     }
-diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
-index 501e095..7ffe03e 100644
---- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
-+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
-@@ -438,13 +438,14 @@ final class ManiphestTaskSearchEngine
-   public function getBuiltinQueryNames() {
-     $names = array();
- 
-+    $names['open'] = pht('Open Tasks');
-+
-     if ($this->requireViewer()->isLoggedIn()) {
-       $names['assigned'] = pht('Assigned');
-       $names['authored'] = pht('Authored');
-       $names['subscribed'] = pht('Subscribed');
-     }
- 
--    $names['open'] = pht('Open Tasks');
-     $names['all'] = pht('All Tasks');
- 
-     return $names;
-diff --git a/src/applications/phriction/controller/PhrictionController.php b/src/applications/phriction/controller/PhrictionController.php
-index 2c4ab17..c5b2f7e 100644
---- a/src/applications/phriction/controller/PhrictionController.php
-+++ b/src/applications/phriction/controller/PhrictionController.php
-@@ -12,7 +12,9 @@ abstract class PhrictionController extends PhabricatorController {
-     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
- 
-     if ($for_app) {
--      $nav->addFilter('create', pht('New Document'));
-+      if ($user->isLoggedIn()) {
-+        $nav->addFilter('create', pht('New Document'));
-+      }
-       $nav->addFilter('/phriction/', pht('Index'));
-     }
- 
-@@ -31,6 +33,7 @@ abstract class PhrictionController extends PhabricatorController {
- 
-   public function buildApplicationCrumbs() {
-     $crumbs = parent::buildApplicationCrumbs();
-+    $user = $this->getRequest()->getUser();
- 
-     if (get_class($this) != 'PhrictionListController') {
-       $crumbs->addAction(
-@@ -40,12 +43,14 @@ abstract class PhrictionController extends PhabricatorController {
-           ->setIcon('fa-home'));
-     }
- 
--    $crumbs->addAction(
--      id(new PHUIListItemView())
--        ->setName(pht('New Document'))
--        ->setHref('/phriction/new/?slug='.$this->getDocumentSlug())
--        ->setWorkflow(true)
--        ->setIcon('fa-plus-square'));
-+    if ($user->isLoggedIn()) {
-+      $crumbs->addAction(
-+        id(new PHUIListItemView())
-+          ->setName(pht('New Document'))
-+          ->setHref('/phriction/new/?slug='.$this->getDocumentSlug())
-+          ->setWorkflow(true)
-+          ->setIcon('create'));
-+    }
- 
-     return $crumbs;
-   }
-diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
-index 9943250..a7ea5af 100644
---- a/src/applications/phriction/controller/PhrictionDocumentController.php
-+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
-@@ -313,20 +313,25 @@ final class PhrictionDocumentController
-       ->setUser($user)
-       ->setObjectURI($this->getRequest()->getRequestURI())
-       ->setObject($document);
-+    if (!$user->isLoggedIn()) {
-+      return $action_view;
-+    }
- 
-     if (!$document->getID()) {
-       return $action_view->addAction(
-         id(new PhabricatorActionView())
-           ->setName(pht('Create This Document'))
-           ->setIcon('fa-plus-square')
--          ->setHref('/phriction/edit/?slug='.$slug));
-+          ->setHref('/phriction/edit/?slug='.$slug)
-+          ->setDisabled(!$can_edit));
-     }
- 
-     $action_view->addAction(
-       id(new PhabricatorActionView())
-         ->setName(pht('Edit Document'))
-         ->setIcon('fa-pencil')
--        ->setHref('/phriction/edit/'.$document->getID().'/'));
-+        ->setHref('/phriction/edit/'.$document->getID().'/')
-+        ->setDisabled(!$can_edit));
- 
-     if ($document->getStatus() == PhrictionDocumentStatus::STATUS_EXISTS) {
-       $action_view->addAction(
-@@ -334,14 +339,16 @@ final class PhrictionDocumentController
-           ->setName(pht('Move Document'))
-           ->setIcon('fa-arrows')
-           ->setHref('/phriction/move/'.$document->getID().'/')
--          ->setWorkflow(true));
-+          ->setWorkflow(true)
-+          ->setDisabled(!$can_edit));
- 
-       $action_view->addAction(
-         id(new PhabricatorActionView())
-           ->setName(pht('Delete Document'))
-           ->setIcon('fa-times')
-           ->setHref('/phriction/delete/'.$document->getID().'/')
--          ->setWorkflow(true));
-+          ->setWorkflow(true)
-+          ->setDisabled(!$can_edit));
-     }
- 
-     return
-diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
-index 8c5b5d5..4f5313b 100644
---- a/src/applications/phriction/storage/PhrictionDocument.php
-+++ b/src/applications/phriction/storage/PhrictionDocument.php
-@@ -127,11 +127,13 @@ final class PhrictionDocument extends PhrictionDAO
-   }
- 
-   public function getPolicy($capability) {
-+    switch ($capability) {
-+     case PhabricatorPolicyCapability::CAN_VIEW:
-+       return PhabricatorPolicies::POLICY_PUBLIC;
-+    }
-     if ($this->hasProject()) {
-       return $this->getProject()->getPolicy($capability);
-     }
--
--    return PhabricatorPolicies::POLICY_USER;
-   }
- 
-   public function hasAutomaticCapability($capability, PhabricatorUser $user) {
diff --git a/www-apps/phabricator/files/aphlictd.initd b/www-apps/phabricator/files/aphlictd.initd
index 588bd1ec..36a8cd93 100755
--- a/www-apps/phabricator/files/aphlictd.initd
+++ b/www-apps/phabricator/files/aphlictd.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -13,12 +13,20 @@ depend() {
 }
 
 get_config() {
-	local key="$1"
+	local key="${1}"
 
 	"${PHABRICATOR_ROOT}/bin/config" get "$@" \
 		| jq -M --raw-output '.config[0].value'
 }
 
+checkrootdir() {
+	if [[ ! -d "${PHABRICATOR_ROOT}" ]] ; then
+		eerror "PHABRICATOR_ROOT ${PHABRICATOR_ROOT} does not exist"
+		eerror "Please follow pkg_postinst() instructions"
+		return 1
+	fi
+}
+
 checkconfig() {
 	pid_file="$(get_config notification.pidfile)" \
 		|| return 1
@@ -31,10 +39,13 @@ checkconfig() {
 }
 
 status() {
+	checkrootdir || return 1
+
 	"${PHABRICATOR_ROOT}/bin/aphlict" status
 }
 
 start() {
+	checkrootdir || return 1
 	checkconfig || return 1
 
 	ebegin "Starting ${RC_SVCNAME} (${PHABRICATOR_ROOT})"
@@ -48,6 +59,7 @@ start() {
 }
 
 stop() {
+	checkrootdir || return 1
 	checkconfig || return 1
 
 	ebegin "Stopping ${RC_SVCNAME} (${PHABRICATOR_ROOT})"
diff --git a/www-apps/phabricator/files/phd.initd b/www-apps/phabricator/files/phd.initd
index d41bad7a..c6f6c312 100755
--- a/www-apps/phabricator/files/phd.initd
+++ b/www-apps/phabricator/files/phd.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,12 +14,20 @@ depend() {
 }
 
 get_config() {
-	local key="$1"
+	local key="${1}"
 
 	"${PHABRICATOR_ROOT}/bin/config" get "$@" \
 		| jq -M --raw-output '.config[0].value'
 }
 
+checkrootdir() {
+	if [[ ! -d "${PHABRICATOR_ROOT}" ]] ; then
+		eerror "PHABRICATOR_ROOT ${PHABRICATOR_ROOT} does not exist"
+		eerror "Please follow pkg_postinst() instructions"
+		return 1
+	fi
+}
+
 checkconfig() {
 	pid_dir="$(get_config phd.pid-directory)" \
 		|| return 1
@@ -32,10 +40,13 @@ checkconfig() {
 }
 
 status() {
+	checkrootdir || return 1
+
 	"${PHABRICATOR_ROOT}/bin/phd" status
 }
 
 start() {
+	checkrootdir || return 1
 	checkconfig || return 1
 	checkpath -d \
 		-o "${PHABRICATOR_USER}" \
@@ -76,6 +87,9 @@ start() {
 }
 
 stop() {
+	checkrootdir || return 1
+	checkconfig || return 1
+
 	ebegin "Stopping ${RC_SVCNAME} (${PHABRICATOR_ROOT})"
 	# Yep, a start, phd play with many pid files as explain above
 	start-stop-daemon --start \
diff --git a/www-apps/phabricator/files/webapp-hook b/www-apps/phabricator/files/webapp-hook
index e0096999..fdac0359 100755
--- a/www-apps/phabricator/files/webapp-hook
+++ b/www-apps/phabricator/files/webapp-hook
@@ -1,15 +1,14 @@
 #!/bin/bash
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-export PATH="$PATH:/usr/lib/portage/bin/ebuild-helpers"
-source /usr/lib/portage/bin/isolated-functions.sh
+source /lib/gentoo/functions.sh || exit 1
 
 function rc_status () {
 	[[ $# -ne 1 ]] && return 1
 
-	local _svc="$1"
+	local _svc="${1}"
 
 	"/etc/init.d/${_svc}" -sCq status > /dev/null 2>&1
 }
@@ -136,7 +135,7 @@ einfo
 einfo "$0 $@"
 einfo
 
-case "$1" in
+case "${1}" in
 	install)
 		chk-htdocs
 		fix-perms
diff --git a/www-apps/phabricator/phabricator-9999.ebuild b/www-apps/phabricator/phabricator-9999.ebuild
index 95a42db4..7b848736 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -20,6 +20,7 @@ DEPEND="virtual/awk:0
 		=www-client/arcanist-${PV}:0[test]
 	)"
 RDEPEND=">=app-admin/webapp-config-1.51-r1:0
+	sys-apps/gentoo-functions
 	|| (
 		>=www-servers/apache-2.2.7:2[apache2_modules_rewrite]
 		www-servers/nginx:0
@@ -52,8 +53,6 @@ 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"
 
 	echo "${EGIT_VERSION}" > "${S}/VERSION"
 
@@ -90,24 +89,26 @@ src_prepare() {
 
 src_test() {
 	local BASE_URI="http://localhost.localdomain"
+
 	einfo "Setting phabricator.base-uri='${BASE_URI}'"
-	bin/config set phabricator.base-uri "${BASE_URI}"
+	bin/config set phabricator.base-uri "${BASE_URI}" > /dev/null
+	eend $?
 
 	if [[ -n "${PHABRICATOR_MYSQL_HOST}" ]] ; then
 		einfo "Setting mysql.host='${PHABRICATOR_MYSQL_HOST}'"
-		bin/config set mysql.host "${PHABRICATOR_MYSQL_HOST}"
+		bin/config set mysql.host "${PHABRICATOR_MYSQL_HOST}" > /dev/null
 		eend $?
 	fi
 
 	if [[ -n "${PHABRICATOR_MYSQL_USER}" ]] ; then
 		einfo "Setting mysql.user='${PHABRICATOR_MYSQL_USER}'"
-		bin/config set mysql.user "${PHABRICATOR_MYSQL_USER}"
+		bin/config set mysql.user "${PHABRICATOR_MYSQL_USER}" > /dev/null
 		eend $?
 	fi
 
 	if [[ -n "${PHABRICATOR_MYSQL_PASS}" ]] ; then
 		einfo "Setting mysql.pass='${PHABRICATOR_MYSQL_PASS}'"
-		bin/config set mysql.pass "${PHABRICATOR_MYSQL_PASS}"
+		bin/config set mysql.pass "${PHABRICATOR_MYSQL_PASS}" > /dev/null
 		eend $?
 	fi
 
@@ -143,7 +144,6 @@ src_install() {
 		| xargs --no-run-if-empty -- \
 			fperms 755
 
-	webapp_configfile "${MY_HOSTROOTDIR}"/conf/{default,development,production}.conf.php
 	webapp_configfile "${MY_HTDOCSDIR}/.htaccess"
 	webapp_hook_script "${FILESDIR}/webapp-hook"
 
@@ -158,7 +158,7 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
 
-	dodoc NOTICE README
+	dodoc NOTICE README.md
 }
 
 pkg_postinst() {