www-apps/phabricator: Version bump

Package-Manager: portage-2.2.28

29 files changed, 57 insertions, 1450 deletions

diff --git a/metadata/md5-cache/www-apps/phabricator-20150414 b/metadata/md5-cache/www-apps/phabricator-20150414
deleted file mode 100644
index 6b04cf51..00000000
--- a/metadata/md5-cache/www-apps/phabricator-20150414
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test unpack
-DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20150414:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Collection of web applications which makes it easier to scale software companies
-EAPI=5
-HOMEPAGE=http://phabricator.org
-IUSE=git highlight mail mercurial subversion ssl test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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-20150414:0 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 ) highlight? ( dev-python/pygments:0 ) mail? ( dev-php/pecl-mailparse:0 ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=test? ( git mercurial subversion )
-SLOT=0
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=289d3bcf9493689325798b8c3fcb85b1
diff --git a/metadata/md5-cache/www-apps/phabricator-20150727 b/metadata/md5-cache/www-apps/phabricator-20150727
deleted file mode 100644
index a47cc40c..00000000
--- a/metadata/md5-cache/www-apps/phabricator-20150727
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test unpack
-DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20150724:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Collection of web applications which makes it easier to scale software companies
-EAPI=5
-HOMEPAGE=http://phabricator.org
-IUSE=git highlight mail mercurial subversion ssl test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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 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 ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=test? ( git mercurial subversion )
-SLOT=0
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=980df011bc38dad96c8d6c1fa3d254d8
diff --git a/metadata/md5-cache/www-apps/phabricator-20150815 b/metadata/md5-cache/www-apps/phabricator-20150815
deleted file mode 100644
index 8f242ccf..00000000
--- a/metadata/md5-cache/www-apps/phabricator-20150815
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test unpack
-DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20150815:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Collection of web applications which makes it easier to scale software companies
-EAPI=5
-HOMEPAGE=http://phabricator.org
-IUSE=git highlight mail mercurial subversion ssl test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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-20150815:0 net-libs/nodejs:0 =www-client/arcanist-20150815: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 ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=test? ( git mercurial subversion )
-SLOT=0
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=a38bfa21565945cbba5f96452faf0af2
diff --git a/metadata/md5-cache/www-apps/phabricator-20151005 b/metadata/md5-cache/www-apps/phabricator-20151005
deleted file mode 100644
index 1ce028b1..00000000
--- a/metadata/md5-cache/www-apps/phabricator-20151005
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test unpack
-DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20151003:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Collection of web applications which makes it easier to scale software companies
-EAPI=5
-HOMEPAGE=http://phabricator.org
-IUSE=git highlight mail mercurial subversion ssl test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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 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 ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=test? ( git mercurial subversion )
-SLOT=0
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=a99bc1f26ad8fcf4faee3ef9f843e4df
diff --git a/metadata/md5-cache/www-apps/phabricator-20151024 b/metadata/md5-cache/www-apps/phabricator-20151024
deleted file mode 100644
index a59a67bd..00000000
--- a/metadata/md5-cache/www-apps/phabricator-20151024
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test unpack
-DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20151024:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Collection of web applications which makes it easier to scale software companies
-EAPI=5
-HOMEPAGE=http://phabricator.org
-IUSE=git highlight mail mercurial subversion ssl test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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-20151024:0 net-libs/nodejs:0 =www-client/arcanist-20151024: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 ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=test? ( git mercurial subversion )
-SLOT=0
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=f25a11d27a5dc74b1ffd7fb14cfaf341
diff --git a/metadata/md5-cache/www-apps/phabricator-20160212 b/metadata/md5-cache/www-apps/phabricator-20160212
deleted file mode 100644
index 00be38e2..00000000
--- a/metadata/md5-cache/www-apps/phabricator-20160212
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test unpack
-DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20160212:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Collection of web applications which makes it easier to scale software companies
-EAPI=5
-HOMEPAGE=http://phabricator.org
-IUSE=git highlight mail mercurial subversion ssl test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-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 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 ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=test? ( git mercurial subversion )
-SLOT=0
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=5dc623a93cb21e889db284a04a6cf00e
diff --git a/metadata/md5-cache/www-apps/phabricator-20160409 b/metadata/md5-cache/www-apps/phabricator-20160529
index c3d2240c..e5dd3377 100644
--- a/metadata/md5-cache/www-apps/phabricator-20160409
+++ b/metadata/md5-cache/www-apps/phabricator-20160529
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prepare prerm setup test unpack
-DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20160408:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
+DEPEND=virtual/awk:0 test? ( =www-client/arcanist-20160520:0[test] ) >=dev-vcs/git-1.8.2.1 >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Collection of web applications which makes it easier to scale software companies
 EAPI=5
 HOMEPAGE=http://phabricator.org
@@ -7,8 +7,8 @@ IUSE=extension-sprint git highlight mail mercurial subversion ssl test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 PDEPEND=extension-sprint? ( www-apps/phabricator-extensions-Sprint )
-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 ) >=app-admin/webapp-config-1.50.15
+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-20160529:0 net-libs/nodejs:0 =www-client/arcanist-20160520:0[git?,mercurial?,subversion?] git? ( dev-vcs/git:0 ) mercurial? ( >dev-vcs/mercurial-2.2:0 ) subversion? ( >dev-vcs/subversion-1.7.1:0 ) highlight? ( dev-python/pygments:0 ) mail? ( dev-php/pecl-mailparse:0 ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=test? ( git mercurial subversion )
 SLOT=0
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=24ceb0a0f75a5c0cf44a7fb1b2e4db49
+_md5_=4b373712f4c98c06c18e756d815bd931
diff --git a/metadata/md5-cache/www-apps/phabricator-9999 b/metadata/md5-cache/www-apps/phabricator-9999
index 0baad145..0c4ec850 100644
--- a/metadata/md5-cache/www-apps/phabricator-9999
+++ b/metadata/md5-cache/www-apps/phabricator-9999
@@ -6,8 +6,8 @@ HOMEPAGE=http://phabricator.org
 IUSE=extension-sprint git highlight mail mercurial subversion ssl test
 LICENSE=Apache-2.0
 PDEPEND=extension-sprint? ( =www-apps/phabricator-extensions-Sprint-9999 )
-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-9999:0 net-libs/nodejs:0 =www-client/arcanist-9999: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 ) >=app-admin/webapp-config-1.50.15
+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-9999:0 net-libs/nodejs:0 =www-client/arcanist-9999:0[git?,mercurial?,subversion?] git? ( dev-vcs/git:0 ) mercurial? ( >dev-vcs/mercurial-2.2:0 ) subversion? ( >dev-vcs/subversion-1.7.1:0 ) highlight? ( dev-python/pygments:0 ) mail? ( dev-php/pecl-mailparse:0 ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=test? ( git mercurial subversion )
 SLOT=0
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	d513d423d449877e49d99af3f7af7acb	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=f4353e4d0719482c71c1fcb67d09ece9
+_md5_=904ad00e5b22925296275270dc0e0e5d
diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index 4465abf9..838564b8 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -5,20 +5,15 @@ AUX 20151005-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch 1671 SHA
 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 20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1382 SHA256 73ff10bf53c24275cbcfaee712d6e5c4acca69184cdf17eb80bee2752c9ac112 WHIRLPOOL 2f5a396c203c131cc5a9fb35f03e472f2c4ba2c9a8c70d527d788cb796427ba65e2af2805dc9cb7c8ff121b5eeceee53ea81dfb3ab702269c621fa9e835248c1
-AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1382 SHA256 602f35e88e9e4d23f9d7d54bb8872714d6fd5675d074879182eb8d349380906c WHIRLPOOL c49090ac959105402261d33985018759b7a015f9af162aec62842fb351fb7acab9b56e1dc9e6e61f247e7b3461bd1432870295f4cc638215e14d870879e99c04
-AUX aphlictd.confd 220 SHA256 da99929f9aab168889e4a6d871b61947a3dcad4e12e1ca206967ff09cd20d558 WHIRLPOOL 51db9a92af0acbf2b3ca9ce2b5e64edf625011805312bec5a3cf38d3a491d1dfc8215828b8981eca7b3c8dc6d0297f7b06df365dac9914bdac196f72dc78df53
-AUX aphlictd.initd 1618 SHA256 1d02bad1035b511969ffd4ea27b1b4929e87995a773575555e26adbf14d4f877 WHIRLPOOL 2dca73e8986b3ce19902e43f29f0dc86c18764c37afb06d1d85fbff7a60d6e02dad6d784397c80843b7f5f6c0f394fb1337cf358496f68f39498c190e6f51775
+AUX 20160529-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1382 SHA256 f6f797f6e1a4887b66e670eda478dc60f3a11c072156990a1fae32e08ba80ad7 WHIRLPOOL 058d54836573c7a521a255d7d5b3a8da070e13a0b132ffbf434220f8ef3be8863fc52b891f879b075fbaddd6ff657cb20676c2e0179fa8c24904de25a2912a5b
+AUX 9999-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch 1382 SHA256 17f760ff40bb2002e875e4314886a05c585ab2c9b88d2e7eb31b370c4fa49017 WHIRLPOOL 4d8e3474977412c8ddf7de9f189c333779a55d2c406bc6412d1497470f11f4646f7c6ef0d15bd93868076e54c8d3dab19f2e784f18120411071b1f32c1a73a7a
+AUX aphlict.confd 269 SHA256 c40eb50ecebecb4a4b5ff641d098a7a8fc65ef3c64b899499c2a768e5b7e47a1 WHIRLPOOL e03498542aeaf10846ba0fecae285b9ccf9bebc39faaa2f675cac1cd2948132a242e34b70031b14e09a1e2ef99523e657fc95fb391541d42872766245d5dbb93
+AUX aphlict.initd 1662 SHA256 15c7321e15726b25bec16780cbdcd403cb76e596a111b56922288a450fee3574 WHIRLPOOL 512e4363b32c1e39bde7f948fe6440cf973f44e023318c2cbe34be2540634e566ed05d891d42cec1d3cf8f4c8465c8d999ea3a855a65e994e4f7302198f0e58c
 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 2434 SHA256 1c9e506e805ce4a04e3a5467c590eef5c84b909fa0bee530d9d9b71b538db039 WHIRLPOOL d4f5a2db62416c3a952c76af0cd8aace7de8984c425bf441522835a156387846a3ca265fe512b5fdd785500b5a6b3b9c982bea5b183d9f772c485f9edbe32742
-AUX webapp-hook 3556 SHA256 939c375c72ce53968c8da35ac7b045a37f1d7c790d15ab5ae25393752cd2ba4b WHIRLPOOL bf0f04786aeee8ead5df8d2ce31418581a3e8046dee1f1c18e4a3485a768dbb25d2bb7902559dc6b1b2340c0f2571c38114a448936d741a520a7c09e19801fe0
-EBUILD phabricator-20150414.ebuild 4651 SHA256 22eafd9a942ea6fdb0b59257055d11a896c41a7298183e4dcc00b0f343eced79 WHIRLPOOL 689ea9714d0895637e66b265e10902128b392581331e387c0c216517bf2feeecc5022aa00dddb7436b5dc45b958d0690e9cd6fd465b3ffff2adc8d94b2eb9b39
-EBUILD phabricator-20150727.ebuild 4651 SHA256 d3c88b64ece8f0dea890cefd64082d08edae16145ecb0be91af8b51fa3538084 WHIRLPOOL 1637c90012c91786bfe70f0672bed4b94c1d1555b2b5ced64f088c60db1033cdf63150e1c81548f72d86ee882c37639960024bda2940c9baa0377fe0bb673f13
-EBUILD phabricator-20150815.ebuild 4651 SHA256 950aeb5d4b3b552a18c66e105ccb545cf94c50324e8444dd2f681df54632a28c WHIRLPOOL 148e630db21684a1676590a969e6ea217860890229f2eb85fdfe837e63e1a4b7cad50d403a8cd27279812695a5f339b83a6381a39c96a625653c8457f7b7ba52
-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-20160409.ebuild 4792 SHA256 f9bb965ed4798ebeba72388d51a62dea77e6d75ba35c21c13695401595d9321f WHIRLPOOL 764e6e5dc0a435f6ecd210f8383d30d5c8f6bb06537d8beddbeb56b13af504ce38a4b24860bb2d7298c319779c8b3cd0c3676a56f2c89a30e42c9455d334e415
-EBUILD phabricator-9999.ebuild 4708 SHA256 fa6927ab09e9996ea53bc0e37a441af56a9389115578931a0dd05c4ed5889f32 WHIRLPOOL d6757879b57e2e6a924e1ace9f36e6b20f0ae70e04bc3e6bd2348beaa695a9cc9e40ce4ae8264a043e4aaad7b18ed910f4168bf1ca0819a714c63b3dbc6e6724
+AUX webapp-hook 3544 SHA256 9d5858a801b13d3bb9b45a05eb2ba055e2967b03238aa8901262369de4cf8d65 WHIRLPOOL 6bfb35e7960015029f7fb9c73350aed34de483ae632fb0f6e08087cea65158c821cb3ef65bd1d367103b3939061ac39e8ad962e9d2152f0c635c14cb60560383
+EBUILD phabricator-20160529.ebuild 4800 SHA256 05b76b22731af113f6e429f1d2e056c70ab77789cc30f760be7835174e806589 WHIRLPOOL 006fd6d2ecfd82f388d13bdb7ad279237d643b5de2d5e6dac3c52dad5313fd169742dd0b00b25089aba5081923c5448c0cc19704fd26f2173778c7fcf1536561
+EBUILD phabricator-9999.ebuild 4716 SHA256 4ece284203b45cc11a8a2e13dd6eab91e6e57696e1007e6917182bf0876b0e48 WHIRLPOOL 0fbd3fdc814e214662b5502a42074db0554027b5eb11e903ae42a69ab3cdfce76ea32af1b39d743c2c3b53128fb830d520cea5dc4c4874a01011d624ff999ff0
 MISC metadata.xml 800 SHA256 a63701cf7c4e937230fcfbc8fbc2b43172b4e73694e6001920efaf755c15f9ff WHIRLPOOL 402172c03581cbf104519bc0c74b35e49fe6e2430e840e09bb1c156e85e17acd8d5e76dc6013359fccc9efb5b339ded1b478d8a1b3dba41c47e1ac4080dadd71
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
deleted file mode 100644
index a95a3cae..00000000
--- a/www-apps/phabricator/files/20150414-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 05deb76445852ee8fbcd804d7cca43c3a2971a5b 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 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');
-       }
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
deleted file mode 100644
index a95a3cae..00000000
--- a/www-apps/phabricator/files/20150727-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 05deb76445852ee8fbcd804d7cca43c3a2971a5b 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 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');
-       }
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
deleted file mode 100644
index a95a3cae..00000000
--- a/www-apps/phabricator/files/20150815-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 05deb76445852ee8fbcd804d7cca43c3a2971a5b 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 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');
-       }
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
deleted file mode 100644
index c12e04d6..00000000
--- a/www-apps/phabricator/files/20151005-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/20151024-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch b/www-apps/phabricator/files/20151024-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
deleted file mode 100644
index 53b13f51..00000000
--- a/www-apps/phabricator/files/20151024-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 09494055660adef6427a8b0a94f0f179d0dd435b 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/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
deleted file mode 100644
index a16c11d8..00000000
--- a/www-apps/phabricator/files/20160212-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-VERSION.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch b/www-apps/phabricator/files/20160529-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
index 56a23606..75e82151 100644
--- a/www-apps/phabricator/files/20160409-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
+++ b/www-apps/phabricator/files/20160529-MEDIUM-Get-VERSION-for-files-in-usr-share-PN-GIT_COM.patch
@@ -1,4 +1,4 @@
-From 269173a923016d074b351632b9fc610b62fdc02e Mon Sep 17 00:00:00 2001
+From bac1817963bf8b3ee42295d804aa2eef30c09627 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
index 3f38055b..98ce122b 100644
--- 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
@@ -1,4 +1,4 @@
-From 38cac5f960c8d21bdf31b83665352aa6a553ad52 Mon Sep 17 00:00:00 2001
+From 917a1c53613c3ac4e0b7cd46c984116e1cf1747b 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/aphlict.confd b/www-apps/phabricator/files/aphlict.confd
new file mode 100644
index 00000000..2ba7d682
--- /dev/null
+++ b/www-apps/phabricator/files/aphlict.confd
@@ -0,0 +1,10 @@
+# Config file for /etc/init.d/aphlict
+
+# Where to serve the files from
+PHABRICATOR_ROOT="/var/www/localhost"
+
+# Config filename, relative to ${PHABRICATOR_ROOT}/conf
+APHLICT_CONFIG="aphlict/aphlict.default.json"
+
+# User/Group of this instance
+PHABRICATOR_USER="apache"
diff --git a/www-apps/phabricator/files/aphlictd.initd b/www-apps/phabricator/files/aphlict.initd
index c712f6de..c49f842f 100755
--- a/www-apps/phabricator/files/aphlictd.initd
+++ b/www-apps/phabricator/files/aphlict.initd
@@ -4,11 +4,9 @@
 # $Header: $
 
 : ${PHABRICATOR_ROOT:=/var/www/localhost}
-: ${PHABRICATOR_ENV:=default}
+: ${APHLICT_CONFIG:=aphlict/aphlict.default.json}
 : ${PHABRICATOR_USER:=apache}
 
-export PHABRICATOR_ENV
-
 depend() {
 	need phd
 }
@@ -16,8 +14,9 @@ depend() {
 get_config() {
 	local key="${1}"
 
-	"${PHABRICATOR_ROOT}/bin/config" get "$@" \
-		| jq -M --raw-output '.config[0].value'
+	jq -M --raw-output \
+		"${key}" \
+		"${PHABRICATOR_ROOT}/conf/${APHLICT_CONFIG}"
 }
 
 checkrootdir() {
@@ -29,20 +28,20 @@ checkrootdir() {
 }
 
 checkconfig() {
-	pid_file="$(get_config notification.pidfile)" \
-		|| return 1
-
-	if [[ -z "${pid_file/null}" ]] ; then
-		pid_file="/run/phabricator/${RC_SVCNAME}.pid"
-		"${PHABRICATOR_ROOT}/bin/config" \
-			set notification.pidfile "${pid_file}"
+	if [[ ! -e "${PHABRICATOR_ROOT}/conf/${APHLICT_CONFIG}" ]] ; then
+		eerror "Config file ${PHABRICATOR_ROOT}/conf/${APHLICT_CONFIG} does not exist"
+		return 1
 	fi
+
+	pid_file="$(get_config .pidfile)" \
+		|| return 1
 }
 
 status() {
 	checkrootdir || return 1
 
-	"${PHABRICATOR_ROOT}/bin/aphlict" status
+	"${PHABRICATOR_ROOT}/bin/aphlict" status \
+		--config "${PHABRICATOR_ROOT}/conf/${APHLICT_CONFIG}"
 }
 
 start() {
@@ -57,12 +56,12 @@ start() {
 
 	ebegin "Starting ${RC_SVCNAME} (${PHABRICATOR_ROOT})"
 	start-stop-daemon --start \
-		-e PHABRICATOR_ENV="${PHABRICATOR_ENV}" \
 		--quiet \
 		--user "${PHABRICATOR_USER}" \
 		--exec "${PHABRICATOR_ROOT}/bin/aphlict" \
 		--pidfile "${pid_file}" \
-		-- start
+		-- start \
+		--config "${PHABRICATOR_ROOT}/conf/${APHLICT_CONFIG}"
 	eend $?
 }
 
diff --git a/www-apps/phabricator/files/aphlictd.confd b/www-apps/phabricator/files/aphlictd.confd
deleted file mode 100644
index 8ff161b7..00000000
--- a/www-apps/phabricator/files/aphlictd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/aphlictd
-
-# Where to serve the files from
-PHABRICATOR_ROOT="/var/www/localhost"
-
-# Environnement to enable
-PHABRICATOR_ENV="default"
-
-# User/Group of this instance
-PHABRICATOR_USER="apache"
diff --git a/www-apps/phabricator/files/webapp-hook b/www-apps/phabricator/files/webapp-hook
index b8751e07..b5d9a3a5 100755
--- a/www-apps/phabricator/files/webapp-hook
+++ b/www-apps/phabricator/files/webapp-hook
@@ -78,7 +78,7 @@ function fix-webroot () {
 function storage-upgrade () {
 	local _date="$(date +'%F-%T')"
 
-	local _has_aphlictd=no
+	local _has_aphlict=no
 	local _has_phd=no
 	local _has_server=no
 
@@ -93,12 +93,12 @@ function storage-upgrade () {
 	fi
 
 	# Save service status
-	rc_status aphlictd && _has_aphlictd=yes
-	rc_status phd      && _has_phd=yes
+	rc_status aphlict && _has_aphlict=yes
+	rc_status phd     && _has_phd=yes
 
 	# Only stop started services
-	[[ "${_has_aphlictd:-no}" == "yes" ]] && /etc/init.d/aphlictd stop
-	[[ "${_has_phd:-no}"      == "yes" ]] && /etc/init.d/phd      stop
+	[[ "${_has_aphlict:-no}" == "yes" ]] && /etc/init.d/aphlict stop
+	[[ "${_has_phd:-no}"     == "yes" ]] && /etc/init.d/phd     stop
 
 	einfo "Backing up database to ${VHOST_ROOT}/backup/dump-${_date}.sql.xz"
 	[[ ! -d "${VHOST_ROOT}/backup" ]] \
@@ -116,8 +116,8 @@ function storage-upgrade () {
 	eend $?
 
 	# Only start services that was previously started
-	[[ "${_has_phd:-no}"      == "yes" ]] && /etc/init.d/phd      start
-	[[ "${_has_aphlictd:-no}" == "yes" ]] && /etc/init.d/aphlictd start
+	[[ "${_has_phd:-no}"     == "yes" ]] && /etc/init.d/phd     start
+	[[ "${_has_aphlict:-no}" == "yes" ]] && /etc/init.d/aphlict start
 
 	einfo "You may have to restart daemon hosting phabricator to update cache"
 
diff --git a/www-apps/phabricator/phabricator-20150414.ebuild b/www-apps/phabricator/phabricator-20150414.ebuild
deleted file mode 100644
index 17faee29..00000000
--- a/www-apps/phabricator/phabricator-20150414.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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="7c7a42f6c8b44d4f372ebac3a17bee6301f74512"
-
-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-20150414: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-20150414:0
-	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 )
-	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-20150727.ebuild b/www-apps/phabricator/phabricator-20150727.ebuild
deleted file mode 100644
index 461aaad8..00000000
--- a/www-apps/phabricator/phabricator-20150727.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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="535c1a5f255e0da69ea5fbfb230b699eb5a152b1"
-
-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-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
-	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"
-}
diff --git a/www-apps/phabricator/phabricator-20150815.ebuild b/www-apps/phabricator/phabricator-20150815.ebuild
deleted file mode 100644
index 5232405f..00000000
--- a/www-apps/phabricator/phabricator-20150815.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# 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="de2aa64acfda85fa8dc014bdeed0fb47298d42cf"
-
-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-20150815: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-20150815:0
-	net-libs/nodejs:0
-	=www-client/arcanist-20150815: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-20151005.ebuild b/www-apps/phabricator/phabricator-20151005.ebuild
deleted file mode 100644
index 9a8a2038..00000000
--- a/www-apps/phabricator/phabricator-20151005.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# 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"
-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
-	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-20151024.ebuild b/www-apps/phabricator/phabricator-20151024.ebuild
deleted file mode 100644
index 7d5ed8ae..00000000
--- a/www-apps/phabricator/phabricator-20151024.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# 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="9520a6b0ed2ee110d517a3b33df8fc5d90cbc2d8"
-
-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-20151024: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-20151024:0
-	net-libs/nodejs:0
-	=www-client/arcanist-20151024: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-20160212.ebuild b/www-apps/phabricator/phabricator-20160212.ebuild
deleted file mode 100644
index 39790dc7..00000000
--- a/www-apps/phabricator/phabricator-20160212.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# 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"
-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
-	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-20160409.ebuild b/www-apps/phabricator/phabricator-20160529.ebuild
index e2c5d777..5ada3464 100644
--- a/www-apps/phabricator/phabricator-20160409.ebuild
+++ b/www-apps/phabricator/phabricator-20160529.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Collection of web applications which makes it easier to scale softw
 HOMEPAGE="http://phabricator.org"
 EGIT_REPO_URI="git://github.com/phacility/phabricator.git"
 EGIT_BRANCH="stable"
-EGIT_COMMIT="908c29cb974dcb39a0e931508e55ae017385b7cf"
+EGIT_COMMIT="4c03f617fce8a498c1dcdc6e9b2d635a6eb713e9"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,7 +21,7 @@ REQUIRED_USE="test? ( git mercurial subversion )"
 
 DEPEND="virtual/awk:0
 	test? (
-		=www-client/arcanist-20160408:0[test]
+		=www-client/arcanist-20160520:0[test]
 	)"
 RDEPEND=">=app-admin/webapp-config-1.51-r1:0
 	sys-apps/gentoo-functions
@@ -34,12 +34,12 @@ RDEPEND=">=app-admin/webapp-config-1.51-r1: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
+	=dev-php/libphutil-20160529:0
 	net-libs/nodejs:0
-	=www-client/arcanist-20160408:0[git?,mercurial?,subversion?]
+	=www-client/arcanist-20160520:0[git?,mercurial?,subversion?]
 	git? ( dev-vcs/git:0 )
-	mercurial? ( dev-vcs/mercurial:0 )
-	subversion? ( dev-vcs/subversion:0 )
+	mercurial? ( >dev-vcs/mercurial-2.2:0 )
+	subversion? ( >dev-vcs/subversion-1.7.1:0 )
 	highlight? ( dev-python/pygments:0 )
 	mail? ( dev-php/pecl-mailparse:0 )"
 PDEPEND="extension-sprint? ( www-apps/phabricator-extensions-Sprint )"
@@ -158,8 +158,8 @@ src_install() {
 	newinitd "${FILESDIR}/phd.initd" phd
 	newconfd "${FILESDIR}/phd.confd" phd
 
-	newinitd "${FILESDIR}/aphlictd.initd" aphlictd
-	newconfd "${FILESDIR}/aphlictd.confd" aphlictd
+	newinitd "${FILESDIR}/aphlict.initd" aphlict
+	newconfd "${FILESDIR}/aphlict.confd" aphlict
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
diff --git a/www-apps/phabricator/phabricator-9999.ebuild b/www-apps/phabricator/phabricator-9999.ebuild
index 0b5f8838..3fc7dae1 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -36,8 +36,8 @@ RDEPEND=">=app-admin/webapp-config-1.51-r1:0
 	net-libs/nodejs:0
 	=www-client/arcanist-${PV}:0[git?,mercurial?,subversion?]
 	git? ( dev-vcs/git:0 )
-	mercurial? ( dev-vcs/mercurial:0 )
-	subversion? ( dev-vcs/subversion:0 )
+	mercurial? ( >dev-vcs/mercurial-2.2:0 )
+	subversion? ( >dev-vcs/subversion-1.7.1:0 )
 	highlight? ( dev-python/pygments:0 )
 	mail? ( dev-php/pecl-mailparse:0 )"
 PDEPEND="extension-sprint? ( =www-apps/phabricator-extensions-Sprint-${PV} )"
@@ -156,8 +156,8 @@ src_install() {
 	newinitd "${FILESDIR}/phd.initd" phd
 	newconfd "${FILESDIR}/phd.confd" phd
 
-	newinitd "${FILESDIR}/aphlictd.initd" aphlictd
-	newconfd "${FILESDIR}/aphlictd.confd" aphlictd
+	newinitd "${FILESDIR}/aphlict.initd" aphlicd
+	newconfd "${FILESDIR}/aphlict.confd" aphlict
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" "${PN}"