www-apps/phabricator: Version bump

Package-Manager: portage-2.2.20.1

9 files changed, 241 insertions, 18 deletions

diff --git a/www-apps/phabricator/ChangeLog b/www-apps/phabricator/ChangeLog
index 3873fe00..ab2a95da 100644
--- a/www-apps/phabricator/ChangeLog
+++ b/www-apps/phabricator/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*phabricator-20151005 (08 Oct 2015)
+
+  08 Oct 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +files/20151005-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch,
+  +phabricator-20151005.ebuild, phabricator-9999.ebuild,
+  files/20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch,
+  files/20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch,
+  files/20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch,
+  files/9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch:
+  www-apps/phabricator: Version bump
+
   15 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
   phabricator-20150414.ebuild, phabricator-20150727.ebuild,
   phabricator-20150815.ebuild, phabricator-9999.ebuild:
diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index eb03bf14..2cc199f1 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -1,7 +1,8 @@
-AUX 20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1682 SHA256 90edc73917ef8eec74499b60856a2701df7ee88e985693689043d84c24cc1cb5 WHIRLPOOL cf9f913261f5fbbd2bc5734dd0eb35a45c78459c3a9818cf9a642a3607506535bbf8ef60b63de7559aa0ceefbbdce10748bb224d35469f316696ff9d837355b8
-AUX 20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1682 SHA256 90edc73917ef8eec74499b60856a2701df7ee88e985693689043d84c24cc1cb5 WHIRLPOOL cf9f913261f5fbbd2bc5734dd0eb35a45c78459c3a9818cf9a642a3607506535bbf8ef60b63de7559aa0ceefbbdce10748bb224d35469f316696ff9d837355b8
-AUX 20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1682 SHA256 90edc73917ef8eec74499b60856a2701df7ee88e985693689043d84c24cc1cb5 WHIRLPOOL cf9f913261f5fbbd2bc5734dd0eb35a45c78459c3a9818cf9a642a3607506535bbf8ef60b63de7559aa0ceefbbdce10748bb224d35469f316696ff9d837355b8
-AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1682 SHA256 90edc73917ef8eec74499b60856a2701df7ee88e985693689043d84c24cc1cb5 WHIRLPOOL cf9f913261f5fbbd2bc5734dd0eb35a45c78459c3a9818cf9a642a3607506535bbf8ef60b63de7559aa0ceefbbdce10748bb224d35469f316696ff9d837355b8
+AUX 20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA256 38f283fb57b7c148f232d8d2c3c8aff021e287efe28e5317bf793ceb350cd32c WHIRLPOOL 3bd3a1c19314dbecd1d9c1e94140437c7e712a79c72868ea636bbae13024bb99215669fd88efd69c57116ee3e6df46ebfce43ba40a7240081d4e0e318fabd62e
+AUX 20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA256 38f283fb57b7c148f232d8d2c3c8aff021e287efe28e5317bf793ceb350cd32c WHIRLPOOL 3bd3a1c19314dbecd1d9c1e94140437c7e712a79c72868ea636bbae13024bb99215669fd88efd69c57116ee3e6df46ebfce43ba40a7240081d4e0e318fabd62e
+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 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA256 38f283fb57b7c148f232d8d2c3c8aff021e287efe28e5317bf793ceb350cd32c WHIRLPOOL 3bd3a1c19314dbecd1d9c1e94140437c7e712a79c72868ea636bbae13024bb99215669fd88efd69c57116ee3e6df46ebfce43ba40a7240081d4e0e318fabd62e
 AUX aphlictd.confd 220 SHA256 da99929f9aab168889e4a6d871b61947a3dcad4e12e1ca206967ff09cd20d558 WHIRLPOOL 51db9a92af0acbf2b3ca9ce2b5e64edf625011805312bec5a3cf38d3a491d1dfc8215828b8981eca7b3c8dc6d0297f7b06df365dac9914bdac196f72dc78df53
 AUX aphlictd.initd 1618 SHA256 1d02bad1035b511969ffd4ea27b1b4929e87995a773575555e26adbf14d4f877 WHIRLPOOL 2dca73e8986b3ce19902e43f29f0dc86c18764c37afb06d1d85fbff7a60d6e02dad6d784397c80843b7f5f6c0f394fb1337cf358496f68f39498c190e6f51775
 AUX htaccess 475 SHA256 90b7245b7518f5b3e56bae9d574a530e3cd47808ef937bdc78ea4288eaff0c6a WHIRLPOOL fc9123f3d40affe53314a25c2649a5b2f47640131c9bc5a6dd0c55ac36e0a205f392b403fcbce93daffceaf427c7146b7a091115a8260c7551a3bfe8069ad88e
@@ -12,6 +13,7 @@ AUX webapp-hook 3806 SHA256 59b4bf2543fa35da457476c60ba8c52db0a81de28077ba47e1be
 EBUILD phabricator-20150414.ebuild 4681 SHA256 622e6533f7edecba06190089218c6245f72b4d38e32523f25dc8dc65e6d1318d WHIRLPOOL b0922f709091ff88c31601b40fa833675c009cf3b7f0d0400d28da1f7628ed153ac031c9ddc6eb312c529e3e6ff3d97915fe4f4111caa9bd1badd2d5bb70396f
 EBUILD phabricator-20150727.ebuild 4681 SHA256 d1b7cc3d883f147e141842f09a7ef55846f0fab2a9749c9585a79be47ecfaa4e WHIRLPOOL 26605826bc523b8d593ccba998e9cc2674e2f50e6d9154dc16efe84c849615b29c56ae97453e89b1aef5c1dc9e9edc8d9be80fd2ba443a25817b615fd6151ec5
 EBUILD phabricator-20150815.ebuild 4681 SHA256 9c1da4fe9a55c5d01e4a8d0aaf8a3aebf65ebeab6297696505229ce9d8172708 WHIRLPOOL a7cc4cb87475e19ad91534e1b79cec997a240056e491b84a9a98e1ceca1afc2d87e4febbaf8be11291f4d6f46c7c8d7b0a21f7afa46cee94697162a6602c20ed
-EBUILD phabricator-9999.ebuild 4560 SHA256 cf454776b486de7b334cbfe4a6ef5b18d7413dc4bdb4278d88970187a1b70a78 WHIRLPOOL 4c2024e757093a658729e6148af96f2887f07511e3fb86559729c76b22b274d24a0cf4e4b2a5115b7505273b2dd57465e18480817af08db1f1ac483421254e68
-MISC ChangeLog 8935 SHA256 ec3701524fd52a634b25dc9520fe2a77939dc324be113f60813f9c7088ad4dca WHIRLPOOL 2d33d34ebab3e3a9563b83c14c3cbabeeaa46a0e29952d4a0219e56c3a5e3787957390fdaa5d5476b41049e09f15bc27fcb92b5841d67dd0cc2ae6927069d5dc
+EBUILD phabricator-20151005.ebuild 4700 SHA256 a3b882ba8b137a43b0f6b7f270cedea5e835d659460b905bbaf9bf0a08f614d1 WHIRLPOOL 4064a6cb8d553a7731dcfcab4adfc3f19f70e1765fe3f5ef2a5158f4f2fba58bca5679406231d1aee6f4ceda2eb68e97cb2355e8c31e792706315c9c5e0abbcf
+EBUILD phabricator-9999.ebuild 4579 SHA256 b79fbc9bc79ea393e59d52ed24ce92fe518de31b573c31dd87fdbaed44950de8 WHIRLPOOL 8e23dd67e2b6f5c10863cc352fbd7962bb0e2933f5c27335995e2e43223d1217ee6d52a40f192e28c751ebf82b0d39217201cea9d3c414c4d6af9cdfbfba811d
+MISC ChangeLog 9504 SHA256 6daeec1f078c21e150d5ca6c7035549a2f1a39414619620c9db790d80bdc86e8 WHIRLPOOL 920e0dbb9f919cb54022b1ea04a248b6c5fb50cb014077f220a2d0116902bdb309f1eb4bb3e49aa525a69011cb3d98503a0fd38d7bc56a84e3aa3bdd24bfbef8
 MISC metadata.xml 655 SHA256 0a90f5e0e963495bd177d96a2c5b04a940a2bab969b6921e02655eb9d959493c WHIRLPOOL e817700577f9691c696b0d4b18df79be591a4fc2318af0ebd0add1fbe323de169b8ff03384883734ac7c2d6c93414e1b6edcadf69ea25a35225945b8bdf118c1
diff --git a/www-apps/phabricator/files/20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
index 616bc905..a95a3cae 100644
--- a/www-apps/phabricator/files/20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ b/www-apps/phabricator/files/20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
@@ -44,6 +44,3 @@ index d4dd4fe..5233fd1 100644
        } else {
          $name = pht('Unknown');
        }
--- 
-2.0.5
-
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
index 616bc905..a95a3cae 100644
--- 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
@@ -44,6 +44,3 @@ index d4dd4fe..5233fd1 100644
        } else {
          $name = pht('Unknown');
        }
--- 
-2.0.5
-
diff --git a/www-apps/phabricator/files/20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
index 616bc905..a95a3cae 100644
--- a/www-apps/phabricator/files/20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ b/www-apps/phabricator/files/20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
@@ -44,6 +44,3 @@ index d4dd4fe..5233fd1 100644
        } else {
          $name = pht('Unknown');
        }
--- 
-2.0.5
-
diff --git a/www-apps/phabricator/files/20151005-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/20151005-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
new file mode 100644
index 00000000..c12e04d6
--- /dev/null
+++ b/www-apps/phabricator/files/20151005-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
@@ -0,0 +1,46 @@
+From ea3f7b4eb141c1075cc6ed8acc15610f29309b6c 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
+
+---
+ .../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 17bf65f..5f6b6c7 100644
+--- a/src/applications/config/controller/PhabricatorConfigAllController.php
++++ b/src/applications/config/controller/PhabricatorConfigAllController.php
+@@ -105,22 +105,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/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 616bc905..a95a3cae 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
@@ -44,6 +44,3 @@ index d4dd4fe..5233fd1 100644
        } else {
          $name = pht('Unknown');
        }
--- 
-2.0.5
-
diff --git a/www-apps/phabricator/phabricator-20151005.ebuild b/www-apps/phabricator/phabricator-20151005.ebuild
new file mode 100644
index 00000000..4b1da0d9
--- /dev/null
+++ b/www-apps/phabricator/phabricator-20151005.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="f760b3ec98cd1ecc3d41c9c51394bc17b7df4ce5"
+
+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-20151003: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-20151003:0
+	!abi_x86_x32? ( net-libs/nodejs:0 )
+	=www-client/arcanist-20151003: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"
+}
diff --git a/www-apps/phabricator/phabricator-9999.ebuild b/www-apps/phabricator/phabricator-9999.ebuild
index b70d4a5a..21b6b285 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -30,6 +30,7 @@ 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]
+	dev-php/pecl-apcu
 	virtual/mysql
 	=dev-php/libphutil-${PV}:0
 	net-libs/nodejs:0