www-apps/phabricator: Version bump

Package-Manager: portage-2.2.20

5 files changed, 241 insertions, 7 deletions

diff --git a/www-apps/phabricator/ChangeLog b/www-apps/phabricator/ChangeLog
index 62b9274d..15d64558 100644
--- a/www-apps/phabricator/ChangeLog
+++ b/www-apps/phabricator/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*phabricator-20150727 (08 Aug 2015)
+
+  08 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +files/20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch,
+  +phabricator-20150727.ebuild, phabricator-20150414.ebuild,
+  phabricator-9999.ebuild:
+  www-apps/phabricator: Version bump
+
   20 Apr 2015; Bertrand Jacquin <bertrand@jacquin.bzh> files/aphlictd.confd,
   files/aphlictd.initd, files/phd.initd, files/webapp-hook:
   www-apps/phabricator: Implement USER handling for aphlictd, review pid default
diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index 4dbf0208..3d245a58 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -1,4 +1,5 @@
 AUX 20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1680 SHA256 7d9daf6c1b84c54ed99167b1d2efd2a60472c5e8cb74cf7439f74c48cd9d24bc WHIRLPOOL bfcc2152b974afe2ac879aab48456318107c1a069838dfa7003d45748721e8a5ea61d4c9f17fc4fed49589ccd04e71999966e4b09d741b354281ad444b7b4449
+AUX 20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1680 SHA256 7d9daf6c1b84c54ed99167b1d2efd2a60472c5e8cb74cf7439f74c48cd9d24bc WHIRLPOOL bfcc2152b974afe2ac879aab48456318107c1a069838dfa7003d45748721e8a5ea61d4c9f17fc4fed49589ccd04e71999966e4b09d741b354281ad444b7b4449
 AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1680 SHA256 7d9daf6c1b84c54ed99167b1d2efd2a60472c5e8cb74cf7439f74c48cd9d24bc WHIRLPOOL bfcc2152b974afe2ac879aab48456318107c1a069838dfa7003d45748721e8a5ea61d4c9f17fc4fed49589ccd04e71999966e4b09d741b354281ad444b7b4449
 AUX aphlictd.confd 220 SHA256 da99929f9aab168889e4a6d871b61947a3dcad4e12e1ca206967ff09cd20d558 WHIRLPOOL 51db9a92af0acbf2b3ca9ce2b5e64edf625011805312bec5a3cf38d3a491d1dfc8215828b8981eca7b3c8dc6d0297f7b06df365dac9914bdac196f72dc78df53
 AUX aphlictd.initd 1618 SHA256 1d02bad1035b511969ffd4ea27b1b4929e87995a773575555e26adbf14d4f877 WHIRLPOOL 2dca73e8986b3ce19902e43f29f0dc86c18764c37afb06d1d85fbff7a60d6e02dad6d784397c80843b7f5f6c0f394fb1337cf358496f68f39498c190e6f51775
@@ -7,7 +8,8 @@ AUX phabricator.logrotate 56 SHA256 e63141278776888c1a3f8e841b0d263efe2beb6c9dbe
 AUX phd.confd 215 SHA256 80ddbf586f38cc600d06e524f7e85c3258bd563696fa2e41e1ea19268da8079b WHIRLPOOL 0f1a587c755994c410b62da6b897ca8684d584b9f01956359e078429fc7ec7642561dc3e3c306bbb24753e3a68ef5f088a5709706143b6154aa085ac2dfa52ad
 AUX phd.initd 2434 SHA256 1c9e506e805ce4a04e3a5467c590eef5c84b909fa0bee530d9d9b71b538db039 WHIRLPOOL d4f5a2db62416c3a952c76af0cd8aace7de8984c425bf441522835a156387846a3ca265fe512b5fdd785500b5a6b3b9c982bea5b183d9f772c485f9edbe32742
 AUX webapp-hook 3806 SHA256 59b4bf2543fa35da457476c60ba8c52db0a81de28077ba47e1bef1cf3b12115e WHIRLPOOL cffc4f46504f29cc994447526d5eeb6fd993f999317b7640e931915434894ade2cd70c7a71681e5bed7124410fe8d9fa04eb7a8eb517c29e4aafdc2d5a296ca9
-EBUILD phabricator-20150414.ebuild 4627 SHA256 0735c0ff75cd0a64b39c9f609d56ee2967ad0ad8d4d1d0a1d99ceaa79d10cdc8 WHIRLPOOL 1da5c3da30c7ae9d32f480ebd2ec0ca915bb42e75b6d2664b803e4b937a5c52f3871942511faa2a119cdc1a5a25ff6483c650a8474803e438265f0eb6daa3cf7
+EBUILD phabricator-20150414.ebuild 4687 SHA256 c88888f3c6c8ee829ec5037a78e4f7d252308983e34288764d71aea15308469a WHIRLPOOL cd8d855951cb4f18dea947fb7729070580b1790834485bf34f6158fc6c62cbb75465a6abdc2e12bfb57ed26ece85682a4e4663f0406544dde2ea7b0505da1757
+EBUILD phabricator-20150727.ebuild 4687 SHA256 5cbc34460a79f55a60b668c728f97b0b3e0e6cd59b870e6a02355109e6bcc52f WHIRLPOOL 0bf0192947e5479f8a4eba9afea216912a08bd3be50f90e5fd5129a63b52e9c0d48b0ec8e6bfdbe67269d07409d50ea7c1ac3001019e7590ea4b758f34e0d419
 EBUILD phabricator-9999.ebuild 4566 SHA256 c60d1a1a65aedc9c9360e5970cc85aea525dae2ff89a1cf4abeb4b62b07e337e WHIRLPOOL ec68a83a51f8ef418a66d8a5b11b9d2438e1896e60d4e79e5860fb3db4b9971a82f89ff0c3d94bd9a8967f46c47c86b473821f43864baa1da130e177bf14e016
-MISC ChangeLog 8135 SHA256 88e6c94a234733d3e638efb28b6556f69d0fa1df428fce8fb66f39ddd0ed5ad0 WHIRLPOOL 3f83dc47c74d5c8ef3969893f463ac556939a6e6176d2fe2576bd78414ffd3c04229d8d4665f7e20b2c9f4bac788338f26507101261c77a03d6c3b3e5932c4b3
+MISC ChangeLog 8431 SHA256 220fcaaddc4a622e1c65df4bad9232197c0f8d04f34e66b556f77ac5c17f325e WHIRLPOOL 131ec9731e3402db7ff5bb3f7474c09bdb42a585fc653b8f928b96f38c8257b0a9b3c95b3d0428e6fb9789df43d626e1d9ae8d3a2df4c97071d775c327a0ba4b
 MISC metadata.xml 655 SHA256 0a90f5e0e963495bd177d96a2c5b04a940a2bab969b6921e02655eb9d959493c WHIRLPOOL e817700577f9691c696b0d4b18df79be591a4fc2318af0ebd0add1fbe323de169b8ff03384883734ac7c2d6c93414e1b6edcadf69ea25a35225945b8bdf118c1
diff --git a/www-apps/phabricator/files/20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
new file mode 100644
index 00000000..ba5f2aff
--- /dev/null
+++ b/www-apps/phabricator/files/20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
@@ -0,0 +1,49 @@
+From 05deb76445852ee8fbcd804d7cca43c3a2971a5b Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <beber@meleeweb.net>
+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
+
+---
+ .../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 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',
+       ),
+     );
+ 
+     $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');
+       }
+-- 
+2.0.5
+
diff --git a/www-apps/phabricator/phabricator-20150414.ebuild b/www-apps/phabricator/phabricator-20150414.ebuild
index 8dc6c6e4..0d826e4a 100644
--- a/www-apps/phabricator/phabricator-20150414.ebuild
+++ b/www-apps/phabricator/phabricator-20150414.ebuild
@@ -10,17 +10,18 @@ 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="7c7a42f6c8b44d4f372ebac3a17bee6301f74512"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="git highlight mail mercurial subversion ssl test"
+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-${PV}:0[test]
+		=www-client/arcanist-20150414:0[test]
 	)"
 RDEPEND=">=app-admin/webapp-config-1.51-r1:0
 	sys-apps/gentoo-functions
@@ -32,9 +33,9 @@ RDEPEND=">=app-admin/webapp-config-1.51-r1:0
 	app-misc/jq:0
 	>=dev-lang/php-5.2.3[cli,curl,gd,iconv,json,mysql,mysqli,pcntl,ssl?,unicode]
 	virtual/mysql
-	=dev-php/libphutil-${PV}:0
-	net-libs/nodejs:0
-	=www-client/arcanist-${PV}:0[git?,mercurial?,subversion?]
+	=dev-php/libphutil-20150414:0
+	!abi_x86_x32? ( net-libs/nodejs:0 )
+	=www-client/arcanist-20150414:0[git?,mercurial?,subversion?]
 	git? ( dev-vcs/git:0 )
 	mercurial? ( dev-vcs/mercurial:0 )
 	subversion? ( dev-vcs/subversion:0 )
diff --git a/www-apps/phabricator/phabricator-20150727.ebuild b/www-apps/phabricator/phabricator-20150727.ebuild
new file mode 100644
index 00000000..083090a8
--- /dev/null
+++ b/www-apps/phabricator/phabricator-20150727.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="535c1a5f255e0da69ea5fbfb230b699eb5a152b1"
+
+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-20150724: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]
+	virtual/mysql
+	=dev-php/libphutil-20150708:0
+	!abi_x86_x32? ( net-libs/nodejs:0 )
+	=www-client/arcanist-20150724: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() {
+	epatch "${FILESDIR}/${PV}-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch"
+
+	echo "${EGIT_VERSION}" > "${S}/VERSION"
+
+	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 VERSION
+
+	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"
+}