www-apps/phabricator: Version bump

Package-Manager: portage-2.2.26

5 files changed, 214 insertions, 5 deletions

diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index 7f30f357..cccc9482 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -4,7 +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 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1228 SHA256 8186b7f203f476af148f0b7938ed23594e7288de1db9ccb7b3eb251f969d6495 WHIRLPOOL 64cd27c4115666cb11cae06265465e4cf6ea2d57063de3819939c8cbbd6f98777941c37b19cc8be708a46bd97f0ed55e005f5ad4046bafba1a11a1a280383d2d
+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 aphlictd.confd 220 SHA256 da99929f9aab168889e4a6d871b61947a3dcad4e12e1ca206967ff09cd20d558 WHIRLPOOL 51db9a92af0acbf2b3ca9ce2b5e64edf625011805312bec5a3cf38d3a491d1dfc8215828b8981eca7b3c8dc6d0297f7b06df365dac9914bdac196f72dc78df53
 AUX aphlictd.initd 1618 SHA256 1d02bad1035b511969ffd4ea27b1b4929e87995a773575555e26adbf14d4f877 WHIRLPOOL 2dca73e8986b3ce19902e43f29f0dc86c18764c37afb06d1d85fbff7a60d6e02dad6d784397c80843b7f5f6c0f394fb1337cf358496f68f39498c190e6f51775
 AUX htaccess 475 SHA256 90b7245b7518f5b3e56bae9d574a530e3cd47808ef937bdc78ea4288eaff0c6a WHIRLPOOL fc9123f3d40affe53314a25c2649a5b2f47640131c9bc5a6dd0c55ac36e0a205f392b403fcbce93daffceaf427c7146b7a091115a8260c7551a3bfe8069ad88e
@@ -18,5 +19,6 @@ EBUILD phabricator-20150815.ebuild 4651 SHA256 950aeb5d4b3b552a18c66e105ccb545cf
 EBUILD phabricator-20151005.ebuild 4670 SHA256 0eabf426e8e1779a557d87d88e95888dd0822f21c17ddf869361cd5126cccf14 WHIRLPOOL aa58e74a8c7c00c9714451d89af5e30a69d0b9fbda7c5f797d0266b6765aab5b41bceb418999d59a4b91500ed76b56ebab7b3b7b6726cbae52656c191f57c05b
 EBUILD phabricator-20151024.ebuild 4670 SHA256 3b6536f6f0c6ea5a40c73bd140d3d0d926f72ea6298aaaabae173679e194b8e7 WHIRLPOOL f7fc52b97c47a5c7e7c4840e1f003d4b49b365ba5b5a16466a8debaf17c6572ede9957b455e490da36ce92225ef8c2ab919e42e9fb372e4823e52ee267639893
 EBUILD phabricator-20160212.ebuild 4694 SHA256 e18fdb214fea82da415ece8494a3833fb76b76613ea7ad1da0ac0eba9445511e WHIRLPOOL f78599380a87e1f572df396da05c809c1c05adc4727aa7ff1dc5039c7ddfca66c5d9342930f1e2c114d6f11d605dd59c7eb0eda67ce8bbaa428bb2b0eb54ce18
-EBUILD phabricator-9999.ebuild 4603 SHA256 23931fc04f34f15223970902ca20109c9b2614582ef94c2eed9ee65104d9065f WHIRLPOOL 762cc13eb79da9e2d37a405bc52b269b0e3e3ebe54b01e3a9a92f5eeb5c273d82751ebc0f25775caa3d56ea6864cfb03637de7e0aecf1272597b2b9775438b2b
+EBUILD phabricator-20160409.ebuild 4704 SHA256 c8d2e63bc4b245888c7c98bc883b5337ccc812b4a841fb40dfcc75808b41361d WHIRLPOOL 77a73fa158c7e07f1f0130a356e6e4e728ae9fe968b284438d3381c8a95c1091479f365f0aba980dcb84ab28823173f788dcffcdb7e8985ca20dadcca54300b1
+EBUILD phabricator-9999.ebuild 4613 SHA256 d8ea2fecfeb7e9908d43f7ac91c2e21002c1cb295d98274d97b90f1a09c226bd WHIRLPOOL 7f384dbfe03e9fac9321827ac73021633af1340ddbdb2ae8ab508ee78c1160f27b0827310fdeede9f757b214a1820e98e1b27a5a5c8fdb25d5771ccb5753f435
 MISC metadata.xml 655 SHA256 0a90f5e0e963495bd177d96a2c5b04a940a2bab969b6921e02655eb9d959493c WHIRLPOOL e817700577f9691c696b0d4b18df79be591a4fc2318af0ebd0add1fbe323de169b8ff03384883734ac7c2d6c93414e1b6edcadf69ea25a35225945b8bdf118c1
diff --git a/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
index 8112f7d7..84ebe761 100644
--- a/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ b/www-apps/phabricator/files/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
@@ -1,4 +1,4 @@
-From db67387ffc7dacdfaa99e448272972deb83bfd67 Mon Sep 17 00:00:00 2001
+From 3911226aeb782453bf58b291bd28859952784009 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
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
new file mode 100644
index 00000000..ec527d28
--- /dev/null
+++ b/www-apps/phabricator/files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
@@ -0,0 +1,32 @@
+From 1282dbc03c5a98faaadfc61a386aa4a6a5cd499a 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/phabricator-20160409.ebuild b/www-apps/phabricator/phabricator-20160409.ebuild
new file mode 100644
index 00000000..50a559b4
--- /dev/null
+++ b/www-apps/phabricator/phabricator-20160409.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="908c29cb974dcb39a0e931508e55ae017385b7cf"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="git highlight mail mercurial subversion ssl test"
+REQUIRED_USE="test? ( git mercurial subversion )"
+
+DEPEND="virtual/awk:0
+	test? (
+		=www-client/arcanist-20160408: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,simplexml,ssl?,unicode]
+	dev-php/pecl-apcu
+	virtual/mysql
+	=dev-php/libphutil-20160408:0
+	net-libs/nodejs:0
+	=www-client/arcanist-20160408: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-GIT_COM.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 defeda18..a3186343 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND=">=app-admin/webapp-config-1.51-r1: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-lang/php-5.2.3[cli,curl,gd,iconv,json,mysql,mysqli,pcntl,simplexml,ssl?,unicode]
 	dev-php/pecl-apcu
 	virtual/mysql
 	=dev-php/libphutil-${PV}:0
@@ -57,7 +57,7 @@ pkg_setup() {
 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"
+	epatch "${FILESDIR}/${PV}-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch"
 
 	find -type f -name .gitignore -print0 \
 		| xargs -0 --no-run-if-empty -- \