dev-php/libphutil: Replace 'env' shebang to files it point to, move source deletion to src_prepare

Package-Manager: portage-2.2.2

4 files changed, 41 insertions, 8 deletions

diff --git a/dev-php/libphutil/ChangeLog b/dev-php/libphutil/ChangeLog
index 4a214b40..627fac76 100644
--- a/dev-php/libphutil/ChangeLog
+++ b/dev-php/libphutil/ChangeLog
@@ -1,3 +1,9 @@
+  11 Sep 2013; Bertrand Jacquin <beber@meleeweb.net>
+  files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch,
+  libphutil-9999.ebuild:
+  dev-php/libphutil: Replace 'env' shebang to files it point to, move source
+  deletion to src_prepare
+
   09 Sep 2013; Bertrand Jacquin <beber@meleeweb.net> libphutil-9999.ebuild:
   dev-php/libphutil: phabricator/diffusion need
   src/parser/xhpast/bin/xhpast_parse.php
diff --git a/dev-php/libphutil/Manifest b/dev-php/libphutil/Manifest
index 9281501d..82fbd935 100644
--- a/dev-php/libphutil/Manifest
+++ b/dev-php/libphutil/Manifest
@@ -1,4 +1,4 @@
-AUX 0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2166 SHA256 b4043eaf30612f01879c19083ff261b6f9949e3f94389e29cab2ab8635290bb8 WHIRLPOOL 5b8a10f9abb54a1d1253c94f7991ea9c958f9ac1a2988c56c0d951fadf8138df7ac689844d5c6278a27f3d469514de12dbd4dc68e3881715b7349b9bc9ba0096
-EBUILD libphutil-9999.ebuild 2502 SHA256 5a64d5662680e12b6bbcabc4590639d9b90bfa044ce062a8b10bf684135813ed WHIRLPOOL a2af777022a96c65c6682c8f5e2bdd1c57a568bb0c5ecefbbb733625962fc97afd00b31e446a0bc5dc0cb44797ca27272ffebd337210a3a55ea4886e44e4866c
-MISC ChangeLog 1436 SHA256 ff6b057edeca3ae024fff5651a81bfb951730fa58343005c86264d40b4961ca6 WHIRLPOOL 4f9052f17ba458d0d13ffdc369f43d08265ff7857707b0ebd86f5559d295a95cfa99ad934da897b440def2bb22547cbd46c1b1206633bd6e9fc9452da95c2fc1
+AUX 0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch 2166 SHA256 6d85a72631dfd13598e21ef09365bdfa8ad4b039f834657c0153b536a7e52716 WHIRLPOOL 8242f71438c9620aab5f08fc57472b25a1d1bf59656c81e5e2f9d4184a9ac6537b6bf9e375b5ef9766ad0278f0ff7e99f680134d801be07440333275b6ac7da0
+EBUILD libphutil-9999.ebuild 3162 SHA256 b2910f454602981ad6e4fcb293a69e741b29f8eef92e2ccd9b52c277aedb6b17 WHIRLPOOL 39e3f3f96928c49d9f8ac57f30416a07eddcc2e099015ae597409d3b5f2fb0ccdc7e253d6623ff768357f90d9e085716d119056eec29c9e8a43c8874ebbd9c0a
+MISC ChangeLog 1691 SHA256 3d11470fb618ac9679f7e2766c5bb3f6dc6cb0630513cf1b865b5436be71bc88 WHIRLPOOL b415b14dac40c918a450553a5072276b9330c31071d5ec9734324a93b1afd071d4e609d4796bdfff1fa18b8e709ba8ccaee608eb7ff491e62c4977976f7c715b
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/dev-php/libphutil/files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch b/dev-php/libphutil/files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
index 33376113..e8581205 100644
--- a/dev-php/libphutil/files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
+++ b/dev-php/libphutil/files/0001-Remove-the-usage-of-local-SSL-certificates-and-use-s.patch
@@ -1,5 +1,5 @@
 From d1f7d4c12b30ee990315e8a9bfbeb7c775846bed Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bjacquin@exosec.fr>
+From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Tue, 13 Aug 2013 16:07:58 +0200
 Subject: [PATCH] Remove the usage of local SSL certificates and use system
  provided by ca-certificates.
diff --git a/dev-php/libphutil/libphutil-9999.ebuild b/dev-php/libphutil/libphutil-9999.ebuild
index ff258f8f..d72e2331 100644
--- a/dev-php/libphutil/libphutil-9999.ebuild
+++ b/dev-php/libphutil/libphutil-9999.ebuild
@@ -30,6 +30,37 @@ src_prepare() {
 	if use test ; then
 		tc-export AR CXX
 	fi
+
+	find "${S}" -type f -name .gitignore -print0 \
+		| xargs -0 --no-run-if-empty -- \
+			rm
+
+	rm -r scripts/daemon/torture
+	rm scripts/build_xhpast.sh
+	rm src/parser/xhpast/bin/xhpast.exe
+
+	# 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_compile() {
@@ -67,10 +98,6 @@ src_test() {
 }
 
 src_install() {
-	rm -r scripts/daemon/torture
-	rm scripts/build_xhpast.sh
-	rm src/parser/xhpast/bin/xhpast.exe
-
 	insinto "/usr/share/php/${PN}"
 	doins -r scripts src