www-apps/phabricator: Version bump

Package-Manager: portage-2.2.26

5 files changed, 235 insertions, 40 deletions

diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index c3d44fb1..67191020 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -3,7 +3,8 @@ AUX 20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA
 AUX 20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA256 38f283fb57b7c148f232d8d2c3c8aff021e287efe28e5317bf793ceb350cd32c WHIRLPOOL 3bd3a1c19314dbecd1d9c1e94140437c7e712a79c72868ea636bbae13024bb99215669fd88efd69c57116ee3e6df46ebfce43ba40a7240081d4e0e318fabd62e
 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 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA256 38f283fb57b7c148f232d8d2c3c8aff021e287efe28e5317bf793ceb350cd32c WHIRLPOOL 3bd3a1c19314dbecd1d9c1e94140437c7e712a79c72868ea636bbae13024bb99215669fd88efd69c57116ee3e6df46ebfce43ba40a7240081d4e0e318fabd62e
+AUX 20160212-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1228 SHA256 f65573e0f6ca9685bd9d7ae80dbbfc39e5a18b175ae0aadf1fc5240cdfaa2752 WHIRLPOOL 522fafe8a373bc1e4904c559d45e40bfafa973bfcf9b7c0501a00cd3907aa38ec1cf9172c1f7e129ca7844d4d33150a0fff53b5fc7012df4dd41eb5705857f68
+AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1228 SHA256 8186b7f203f476af148f0b7938ed23594e7288de1db9ccb7b3eb251f969d6495 WHIRLPOOL 64cd27c4115666cb11cae06265465e4cf6ea2d57063de3819939c8cbbd6f98777941c37b19cc8be708a46bd97f0ed55e005f5ad4046bafba1a11a1a280383d2d
 AUX aphlictd.confd 220 SHA256 da99929f9aab168889e4a6d871b61947a3dcad4e12e1ca206967ff09cd20d558 WHIRLPOOL 51db9a92af0acbf2b3ca9ce2b5e64edf625011805312bec5a3cf38d3a491d1dfc8215828b8981eca7b3c8dc6d0297f7b06df365dac9914bdac196f72dc78df53
 AUX aphlictd.initd 1618 SHA256 1d02bad1035b511969ffd4ea27b1b4929e87995a773575555e26adbf14d4f877 WHIRLPOOL 2dca73e8986b3ce19902e43f29f0dc86c18764c37afb06d1d85fbff7a60d6e02dad6d784397c80843b7f5f6c0f394fb1337cf358496f68f39498c190e6f51775
 AUX htaccess 475 SHA256 90b7245b7518f5b3e56bae9d574a530e3cd47808ef937bdc78ea4288eaff0c6a WHIRLPOOL fc9123f3d40affe53314a25c2649a5b2f47640131c9bc5a6dd0c55ac36e0a205f392b403fcbce93daffceaf427c7146b7a091115a8260c7551a3bfe8069ad88e
@@ -16,5 +17,6 @@ EBUILD phabricator-20150727.ebuild 4681 SHA256 d1b7cc3d883f147e141842f09a7ef5584
 EBUILD phabricator-20150815.ebuild 4681 SHA256 9c1da4fe9a55c5d01e4a8d0aaf8a3aebf65ebeab6297696505229ce9d8172708 WHIRLPOOL a7cc4cb87475e19ad91534e1b79cec997a240056e491b84a9a98e1ceca1afc2d87e4febbaf8be11291f4d6f46c7c8d7b0a21f7afa46cee94697162a6602c20ed
 EBUILD phabricator-20151005.ebuild 4700 SHA256 a3b882ba8b137a43b0f6b7f270cedea5e835d659460b905bbaf9bf0a08f614d1 WHIRLPOOL 4064a6cb8d553a7731dcfcab4adfc3f19f70e1765fe3f5ef2a5158f4f2fba58bca5679406231d1aee6f4ceda2eb68e97cb2355e8c31e792706315c9c5e0abbcf
 EBUILD phabricator-20151024.ebuild 4700 SHA256 d9d2ca64b6452da39dd7431f2c458dee83170bbfc9be109c1f7921a361d47101 WHIRLPOOL f1beacdc0f8f0e44bf3370067ec88b01dc3dea4c0ea213c291ee9936fbfa46c055f65596328014aac743bd6552c9b1b26df64d66b02298ac30212559e5b580db
-EBUILD phabricator-9999.ebuild 4579 SHA256 b79fbc9bc79ea393e59d52ed24ce92fe518de31b573c31dd87fdbaed44950de8 WHIRLPOOL 8e23dd67e2b6f5c10863cc352fbd7962bb0e2933f5c27335995e2e43223d1217ee6d52a40f192e28c751ebf82b0d39217201cea9d3c414c4d6af9cdfbfba811d
+EBUILD phabricator-20160212.ebuild 4724 SHA256 f1384c557621558b088e8b330b79fa15a537bb6448df04d97d0a0e72d0881141 WHIRLPOOL a3cadbcba47d3c016669306c7c82a1b21b67d91c6d66df621d936fb66335827690b40b20c6bcb2faa6c577d1ef57622e92f508402faf982bd0f124f7f34cfc3c
+EBUILD phabricator-9999.ebuild 4603 SHA256 23931fc04f34f15223970902ca20109c9b2614582ef94c2eed9ee65104d9065f WHIRLPOOL 762cc13eb79da9e2d37a405bc52b269b0e3e3ebe54b01e3a9a92f5eeb5c273d82751ebc0f25775caa3d56ea6864cfb03637de7e0aecf1272597b2b9775438b2b
 MISC metadata.xml 655 SHA256 0a90f5e0e963495bd177d96a2c5b04a940a2bab969b6921e02655eb9d959493c WHIRLPOOL e817700577f9691c696b0d4b18df79be591a4fc2318af0ebd0add1fbe323de169b8ff03384883734ac7c2d6c93414e1b6edcadf69ea25a35225945b8bdf118c1
diff --git a/www-apps/phabricator/files/20160212-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/20160212-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
new file mode 100644
index 00000000..a16c11d8
--- /dev/null
+++ b/www-apps/phabricator/files/20160212-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
@@ -0,0 +1,32 @@
+From 70fe968838b0476d48e36d8f0326606e7505bdf7 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(-)
+
+diff --git a/src/applications/config/module/PhabricatorConfigVersionsModule.php b/src/applications/config/module/PhabricatorConfigVersionsModule.php
+index 9a6292a..46b681d 100644
+--- a/src/applications/config/module/PhabricatorConfigVersionsModule.php
++++ b/src/applications/config/module/PhabricatorConfigVersionsModule.php
+@@ -51,10 +51,14 @@ final class PhabricatorConfigVersionsModule
+ 
+     $futures = array();
+     foreach ($specs as $lib) {
+-      $root = dirname(phutil_get_library_root($lib));
++      switch ($lib) {
++        case "phutil":
++	  $lib = "libphutil";
++	  break;
++      }
++
+       $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"));
+     }
+ 
+     $results = array();
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
index a95a3cae..8112f7d7 100644
--- 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
@@ -1,46 +1,32 @@
-From 05deb76445852ee8fbcd804d7cca43c3a2971a5b Mon Sep 17 00:00:00 2001
+From db67387ffc7dacdfaa99e448272972deb83bfd67 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>/VERSION
- rather than from git
+Subject: [PATCH] MEDIUM: Get VERSION for files in
+ /usr/share/<PN>/GIT_COMMIT_INFO rather than from git
 
 ---
- .../config/controller/PhabricatorConfigAllController.php | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
+ .../config/module/PhabricatorConfigVersionsModule.php          | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php
-index d4dd4fe..5233fd1 100644
---- a/src/applications/config/controller/PhabricatorConfigAllController.php
-+++ b/src/applications/config/controller/PhabricatorConfigAllController.php
-@@ -106,22 +106,24 @@ final class PhabricatorConfigAllController
-       ),
-       array(
-         'name' => pht('libphutil Version'),
--        'root' => 'phutil',
-+        'root' => 'libphutil',
-       ),
-     );
+diff --git a/src/applications/config/module/PhabricatorConfigVersionsModule.php b/src/applications/config/module/PhabricatorConfigVersionsModule.php
+index 9a6292a..46b681d 100644
+--- a/src/applications/config/module/PhabricatorConfigVersionsModule.php
++++ b/src/applications/config/module/PhabricatorConfigVersionsModule.php
+@@ -51,10 +51,14 @@ final class PhabricatorConfigVersionsModule
  
      $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] = '';
+     foreach ($specs as $lib) {
+-      $root = dirname(phutil_get_library_root($lib));
++      switch ($lib) {
++        case "phutil":
++	  $lib = "libphutil";
++	  break;
 +      }
++
+       $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"));
      }
  
      $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-20160212.ebuild b/www-apps/phabricator/phabricator-20160212.ebuild
new file mode 100644
index 00000000..e0b958eb
--- /dev/null
+++ b/www-apps/phabricator/phabricator-20160212.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WEBAPP_NO_AUTO_INSTALL=yes
+WEBAPP_MANUAL_SLOT=yes
+inherit git-r3 webapp
+
+DESCRIPTION="Collection of web applications which makes it easier to scale software companies"
+HOMEPAGE="http://phabricator.org"
+EGIT_REPO_URI="git://github.com/phacility/phabricator.git"
+EGIT_BRANCH="stable"
+EGIT_COMMIT="70c679110e1d4632d19ca160379f83f6f20d79d1"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="git highlight mail mercurial subversion ssl test abi_x86_x32"
+REQUIRED_USE="test? ( git mercurial subversion )"
+
+DEPEND="virtual/awk:0
+	test? (
+		=www-client/arcanist-20160212: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
+		www-servers/lighttpd:0
+	)
+	app-misc/jq:0
+	>=dev-lang/php-5.2.3[cli,curl,gd,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
+	dev-php/pecl-apcu
+	virtual/mysql
+	=dev-php/libphutil-20160123:0
+	!abi_x86_x32? ( net-libs/nodejs:0 )
+	=www-client/arcanist-20160212:0[git?,mercurial?,subversion?]
+	git? ( dev-vcs/git:0 )
+	mercurial? ( dev-vcs/mercurial:0 )
+	subversion? ( dev-vcs/subversion:0 )
+	highlight? ( dev-python/pygments:0 )
+	mail? ( dev-php/pecl-mailparse:0 )"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use test ; then
+		einfo "Environnement variables you can tweak for database tests"
+		einfo "  PHABRICATOR_MYSQL_HOST (default my.cnf[client].host || my.cnf[client].socket)"
+		einfo "  PHABRICATOR_MYSQL_USER (default my.cnf[client].user || current user)"
+		einfo "  PHABRICATOR_MYSQL_PASS (default my.cnf[client].password || empty)"
+		einfo
+		einfo "src_test() may fail if such variable are not defined"
+	fi
+}
+
+src_prepare() {
+	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
+
+	epatch "${FILESDIR}/${PV}-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch"
+
+	find -type f -name .gitignore -print0 \
+		| xargs -0 --no-run-if-empty -- \
+			rm
+
+	rm -r scripts/install
+
+	# Replace 'env' shebang to files it point to
+	find -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 "Changing ${REPLY} shebang to #!${path} ${args}"
+			sed -i \
+				-e "1 s:^#!.*:#!${path} ${args}:" \
+				"${REPLY}"
+			eend $?
+		done
+}
+
+src_test() {
+	local BASE_URI="http://localhost.localdomain"
+
+	einfo "Setting 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}" > /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}" > /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}" > /dev/null
+		eend $?
+	fi
+
+	arc unit --everything --no-coverage || die "arc unit failed"
+
+	# Cleanup tests only config files
+	rm conf/local/local.json
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins GIT_COMMIT_INFO
+
+	webapp_src_preinst
+
+	# All directories must be private (ie accessible in hostroot),
+	# expect webroot that will become htdocs
+	insinto "${MY_HOSTROOTDIR}"
+	doins -r bin conf externals resources scripts src support
+
+	# All files and directories present in webroot/ will be
+	# installed in htdocs
+	insinto "${MY_HTDOCSDIR}"
+	doins -r webroot/*
+
+	newins "${FILESDIR}/htaccess" .htaccess
+
+	# 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
+
+	webapp_configfile "${MY_HTDOCSDIR}/.htaccess"
+	webapp_hook_script "${FILESDIR}/webapp-hook"
+
+	webapp_src_install
+
+	newinitd "${FILESDIR}/phd.initd" phd
+	newconfd "${FILESDIR}/phd.confd" phd
+
+	newinitd "${FILESDIR}/aphlictd.initd" aphlictd
+	newconfd "${FILESDIR}/aphlictd.confd" aphlictd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+	dodoc NOTICE README.md
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	elog
+	elog "For more info about how to configure, see"
+	elog "	http://www.phabricator.com/docs/phabricator/article/Configuration_Guide.html"
+}
diff --git a/www-apps/phabricator/phabricator-9999.ebuild b/www-apps/phabricator/phabricator-9999.ebuild
index 21b6b285..defeda18 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -55,9 +55,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch"
+	git log --format='%H %ct' -n 1 > "${S}/GIT_COMMIT_INFO"
 
-	echo "${EGIT_VERSION}" > "${S}/VERSION"
+	epatch "${FILESDIR}/${PV}-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch"
 
 	find -type f -name .gitignore -print0 \
 		| xargs -0 --no-run-if-empty -- \
@@ -123,7 +123,7 @@ src_test() {
 
 src_install() {
 	insinto "/usr/share/${PN}"
-	doins VERSION
+	doins GIT_COMMIT_INFO
 
 	webapp_src_preinst