www-apps/phabricator: init scripts can be instancied but this does not mean daemon name is changed, disallow auto install and so remove stupid hacks on webroot/MY_HTDOCSBASE, replace 'env' shebang to files it point to, move source deletion to src_prepare, fix init script to track phd-daemon instead of phd using the ssd --name and --interpreted

Package-Manager: portage-2.2.2

7 files changed, 55 insertions, 24 deletions

diff --git a/metadata/md5-cache/www-apps/phabricator-9999 b/metadata/md5-cache/www-apps/phabricator-9999
index bcdfb0fe..13761236 100644
--- a/metadata/md5-cache/www-apps/phabricator-9999
+++ b/metadata/md5-cache/www-apps/phabricator-9999
@@ -3,10 +3,10 @@ DEPEND=virtual/awk:0 test? ( =www-client/arcanist-9999:0[test] ) dev-vcs/git >=a
 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 vhosts
+IUSE=git highlight mail mercurial subversion ssl test
 LICENSE=Apache-2.0
 RDEPEND=|| ( >=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-db/mysql =dev-php/libphutil-9999:0 dev-php/pecl-apc: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
 REQUIRED_USE=test? ( git mercurial subversion )
 SLOT=9999
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	9d623256bd82ddbcc6783ae996e178fd	git-r3	9f6c6ee6bcbff5923dd8157cf081bf5c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=a91af5b5a7e8d9152ce822e3e54e2a44
+_md5_=bb332914df237a125918a5cb7b0fa68a
diff --git a/www-apps/phabricator/ChangeLog b/www-apps/phabricator/ChangeLog
index e0c65659..c8c1a6f4 100644
--- a/www-apps/phabricator/ChangeLog
+++ b/www-apps/phabricator/ChangeLog
@@ -1,3 +1,13 @@
+  11 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
+  files/0001-Changed-add_user.php-to-create-users-with-unverified.patch,
+  files/0002-Make-wiki-visible-to-all.patch, files/phd.initd,
+  phabricator-9999.ebuild:
+  www-apps/phabricator: init scripts can be instancied but this does not mean
+  daemon name is changed, disallow auto install and so remove stupid hacks on
+  webroot/MY_HTDOCSBASE, replace 'env' shebang to files it point to, move source
+  deletion to src_prepare, fix init script to track phd-daemon instead of phd
+  using the ssd --name and --interpreted
+
   10 Sep 2013; Bertrand Jacquin <beber@meleeweb.net> +files/hook-01-perms,
   +files/hook-02-storage-upgrade,
   files/0001-Changed-add_user.php-to-create-users-with-unverified.patch,
diff --git a/www-apps/phabricator/Manifest b/www-apps/phabricator/Manifest
index 85f05375..b6063aa8 100644
--- a/www-apps/phabricator/Manifest
+++ b/www-apps/phabricator/Manifest
@@ -1,11 +1,11 @@
-AUX 0001-Changed-add_user.php-to-create-users-with-unverified.patch 1250 SHA256 7b6ee57533ec28b8d661bda1cd39a1395c8c1fdc9eb7c09786e208b1a8374e44 WHIRLPOOL 68d2606c25e521e8e4014ba19a9f90f17fd468e79008339e104ef9edc01fb765855c5bb4f6c9495a9b6f41b96e3451bbd51560ba81c6e75fb0b1c972f3d6122e
-AUX 0002-Make-wiki-visible-to-all.patch 911 SHA256 59a838916a123057df5da6a3149a4bdc4fed67c915088ac9f7b2df14262d27db WHIRLPOOL e34120ffd119ab35f4b6ce8fa1ef5113b697bebce04942ff98358ec740561e15ab275f1b88ca61b6ca90a02a850ba253347da664421450b32a8ea8171692705a
+AUX 0001-Changed-add_user.php-to-create-users-with-unverified.patch 1246 SHA256 fe0a9bbdbecf40754e06569e0766781f2a8370c6ac2dd077f013bca98981deed WHIRLPOOL 25b50454516d1bc368c81efaeb3603052cb2524eced0330c7ad81e12588a79f8894edd6ba211508e94c206842e527ae4e86ad2760eb844175980462c479a4f09
+AUX 0002-Make-wiki-visible-to-all.patch 907 SHA256 8f145e199490c559b11865b90b694146bf2d6fa07dcdf50f34f91f44216f24c9 WHIRLPOOL b868cfd98f85eda609ec2c700b42ae1c1ec2724dba8b3bed1cc53dbbda862b294dbad9864cf95f6aab5668b15a17b6f39a25778250c38d602c28a540a7d70ad7
 AUX aphlictd.confd 163 SHA256 553f18f54bcf75eada649e564fea7c4c610fd01ec93708bd246263405e7d5246 WHIRLPOOL 027e41cff147fbf7544ba72575fa21e12a66da7b5cd1bdf53a98b929b7c6127c25a997118e9cfea0e00379a7937eb52b051deb4256abb5bb5d6796a9d16138ad
 AUX aphlictd.initd 1036 SHA256 e0a547d4592955beef3886781d152cd0d48cdd1a547234d6cf7d2cc3e74ee07a WHIRLPOOL d7a8da8395dddaca01e4adaea03200121191cf313d202b5bee6bc9823a6117c0e220dcedc03f30c3022d5b7f6b716b78fe8aedb7ab2cd8d17e3649dcd0f8bd2e
 AUX hook-01-perms 647 SHA256 557ccec2af3003f7d4d1bce8104f0619de1657743a3c453021ed4643db368278 WHIRLPOOL 19f8de21e0d3a5cd754e4ede5c4462112d8c0233efcd07b1ffa360fdc78c0527d74abd84a3713d736fa1ed4b889ed61cd747a1f1b2731549d0315834deeed0c6
 AUX hook-02-storage-upgrade 2179 SHA256 ab053bacb55ab34f8e832abb9b6b7254367ceed9f422955046e2930ac17af6f6 WHIRLPOOL 70a1355254cfbde014d825768f814db41a780014966fb931513d2547e6cbe9413c83e6f37699ba00385735831512e5cc2732f562c05df1425874175640f6250a
 AUX phd.confd 215 SHA256 80ddbf586f38cc600d06e524f7e85c3258bd563696fa2e41e1ea19268da8079b WHIRLPOOL 0f1a587c755994c410b62da6b897ca8684d584b9f01956359e078429fc7ec7642561dc3e3c306bbb24753e3a68ef5f088a5709706143b6154aa085ac2dfa52ad
-AUX phd.initd 1334 SHA256 38059b41841f1d571280c35eebb20759e4f917937650891426edc985d15dc762 WHIRLPOOL 01a7d56b81d0282dcb2c8d5826059f2c9cf941ba8257eed1fbc27d620e205d06e69fe6dc8dafab2874c27f99d4f056f0fe2ea9f8b4a3a2b2e6d9d99e8ca55b4d
-EBUILD phabricator-9999.ebuild 3980 SHA256 83a7f92c609f0761bd858d6e9aff6646699b4d214b65a459512780f74396ac2b WHIRLPOOL b67f5d1335048a1ff9f9d79e7cb83bcb9de1c4b563021c692d33a6920db80cb592a16e2da190f1696903e6d88e4071f20276ddbd52bcf69571b45a2ddfcfbb4c
-MISC ChangeLog 2860 SHA256 05bc75ab1e3ce06c9a75c90c2927c8829d2a3b970042af2b515674a5f2a04b3d WHIRLPOOL 1cd007017eb24cb81b6a1213a16d567fc5fe8198b6919decc1e0f7af1372221c4420d9e4e98adae0cbcefed22cdf0e1499c0f9c24fc82009b6bfe4e1e7a2f13d
+AUX phd.initd 1379 SHA256 894c7072d225f72a33596db63bb2a9b0d34fbd278c1f191d7861ff08e2198c85 WHIRLPOOL 9024c383875347e348e550abb4a506571e4e2693c83278285c56e254f454f69c9155b58ca49532636d3015f235554ca69ef60af92e66854855b25b321feab891
+EBUILD phabricator-9999.ebuild 4363 SHA256 9293b2c6b33e4f0a5f83ba814540393692feacfb4824a48eaeed38a921e35732 WHIRLPOOL 99be1029a16003d0dacaa5c192420978c68dd95c523470939c755ef42c1d419c7cd613888d6484127e4c5efc58ea47a89114c42c38c3e00ee98e381801e725ef
+MISC ChangeLog 3432 SHA256 e906748258f6637879ae3787e2614d91a93e8e19d4197b32c86bfd18a48df366 WHIRLPOOL 0db89e2b630ea35f5932def97cbf92313bea48b0af6131b3eb43efc70979df6bf1e8aeafcc740f709c9bd899d893635a711260a92192a192ddaf128d2e2100a0
 MISC metadata.xml 653 SHA256 744c67bfd3b874f305b08a5b68c5e2213c3cdc1c47b381fe130ebfc2005a964b WHIRLPOOL 5efd225c032e0704862510f166c94327460caf27527b473fe8f35ea6117b2b16862e362aff0b7bdb47b38349dbcf8710fff4040f11d50e07865f983dacc93d99
diff --git a/www-apps/phabricator/files/0001-Changed-add_user.php-to-create-users-with-unverified.patch b/www-apps/phabricator/files/0001-Changed-add_user.php-to-create-users-with-unverified.patch
index 0ff4f2c1..73c7553d 100644
--- a/www-apps/phabricator/files/0001-Changed-add_user.php-to-create-users-with-unverified.patch
+++ b/www-apps/phabricator/files/0001-Changed-add_user.php-to-create-users-with-unverified.patch
@@ -1,7 +1,7 @@
 From fc9e297d124790a337dd6c69b50bd72cbdc0067c Mon Sep 17 00:00:00 2001
 From: Enlightenment <no-reply@enlightenment.org>
 Date: Fri, 25 Jan 2013 06:00:11 -0800
-Subject: [PATCH 1/2] Changed add_user.php to create users with unverified
+Subject: [PATCH] Changed add_user.php to create users with unverified
  emails.
 
 Different error codes for different errors.
diff --git a/www-apps/phabricator/files/0002-Make-wiki-visible-to-all.patch b/www-apps/phabricator/files/0002-Make-wiki-visible-to-all.patch
index d6554388..2a3ecc3c 100644
--- a/www-apps/phabricator/files/0002-Make-wiki-visible-to-all.patch
+++ b/www-apps/phabricator/files/0002-Make-wiki-visible-to-all.patch
@@ -1,7 +1,7 @@
 From 8f7c3736b99b5497620df020381373525b9531bf Mon Sep 17 00:00:00 2001
 From: Enlightenment <no-reply@enlightenment.org>
 Date: Tue, 26 Mar 2013 06:11:16 -0700
-Subject: [PATCH 2/2] Make wiki visible to all.
+Subject: [PATCH] Make wiki visible to all.
 
 ---
  src/applications/phriction/controller/PhrictionDocumentController.php | 4 ++++
diff --git a/www-apps/phabricator/files/phd.initd b/www-apps/phabricator/files/phd.initd
index 5334d623..9b3b71b8 100755
--- a/www-apps/phabricator/files/phd.initd
+++ b/www-apps/phabricator/files/phd.initd
@@ -31,7 +31,7 @@ checkconfig() {
 }
 
 status() {
-	"${PHABRICATOR_ROOT}/bin/${RC_SVCNAME}" status
+	"${PHABRICATOR_ROOT}/bin/phd" status
 }
 
 start() {
@@ -45,7 +45,9 @@ start() {
 		-e PHABRICATOR_ENV="${PHABRICATOR_ENV}" \
 		--quiet \
 		--user "${PHABRICATOR_USER}" \
-		--exec "${PHABRICATOR_ROOT}/bin/${RC_SVCNAME}" \
+		--exec "${PHABRICATOR_ROOT}/bin/phd" \
+		--interpreted \
+		--name "${PHABRICATOR_ROOT}/scripts/daemon/phd-daemon"
 		-- start
 	eend $?
 }
@@ -57,7 +59,7 @@ stop() {
 		-e PHABRICATOR_ENV="${PHABRICATOR_ENV}" \
 		--quiet \
 		--user "${PHABRICATOR_USER}" \
-		--exec "${PHABRICATOR_ROOT}/bin/${RC_SVCNAME}" \
+		--exec "${PHABRICATOR_ROOT}/bin/phd" \
 		-- stop
 	eend $?
 }
diff --git a/www-apps/phabricator/phabricator-9999.ebuild b/www-apps/phabricator/phabricator-9999.ebuild
index aa95a7d5..a7bb57d3 100644
--- a/www-apps/phabricator/phabricator-9999.ebuild
+++ b/www-apps/phabricator/phabricator-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI=5
+WEBAPP_NO_AUTO_INSTALL=yes
 inherit git-2 webapp
 
 DESCRIPTION="Collection of web applications which makes it easier to scale software companies"
@@ -52,6 +53,35 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/0001-Changed-add_user.php-to-create-users-with-unverified.patch"
 	epatch "${FILESDIR}/0002-Make-wiki-visible-to-all.patch"
+
+	find "${S}" -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 "${S}" -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/#${S}\/} shebang to #!${path} ${args}"
+			sed -i \
+				-e "1 s:^#!.*:#!${path} ${args}:" \
+				"${REPLY}"
+		done
 }
 
 src_test() {
@@ -83,13 +113,7 @@ src_test() {
 src_install() {
 	webapp_src_preinst
 
-	find "${S}" -type f -name .gitignore -print0 \
-		| xargs -0 --no-run-if-empty -- \
-			rm
-
-	rm -r scripts/install
-
-	# All directoies must be private (ie accessible in hostroot),
+	# 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
@@ -99,11 +123,6 @@ src_install() {
 	insinto "${MY_HTDOCSDIR}"
 	doins -r webroot/*
 
-	# In any case, hostroot access files in webroot/ directory
-	# so we need to make sure a webroot symlink is present in hostroot
-	# that point to actual htdocs
-	dosym "${MY_HTDOCSBASE}" "${MY_HOSTROOTDIR}/webroot"
-
 	# Make executable all shebanged files
 	find "${ED}" -type f \
 		| xargs -n 1 --no-run-if-empty -- \