www-client/arcanist: Version bump

Package-Manager: portage-2.2.20

5 files changed, 156 insertions, 10 deletions

diff --git a/www-client/arcanist/ChangeLog b/www-client/arcanist/ChangeLog
index 1471d713..d6cfbc61 100644
--- a/www-client/arcanist/ChangeLog
+++ b/www-client/arcanist/ChangeLog
@@ -1,3 +1,9 @@
+*arcanist-20150724 (08 Aug 2015)
+
+  08 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
+  +arcanist-20150724.ebuild, arcanist-20150414.ebuild, arcanist-9999.ebuild:
+  www-client/arcanist: Version bump
+
 *arcanist-20150414 (19 Apr 2015)
 
   19 Apr 2015; Bertrand Jacquin <bertrand@jacquin.bzh>
diff --git a/www-client/arcanist/Manifest b/www-client/arcanist/Manifest
index a2427993..0c65f837 100644
--- a/www-client/arcanist/Manifest
+++ b/www-client/arcanist/Manifest
@@ -1,4 +1,5 @@
-EBUILD arcanist-20150414.ebuild 3774 SHA256 89e666cfc8f14435c1b8f2766488d4e248f10b8daaeb05193852ad4e015933f8 WHIRLPOOL 148aef2c47d98d4a9818e5da210484f819e16154512b81bb6808947f759455c8964dff7e7134fe685720320691a437b7fdfd84a20e3f27868287db0b383d19b7
-EBUILD arcanist-9999.ebuild 3713 SHA256 c278e9b987f473cc70aba8fe05ed1e476114611043114dee0957377c91faee9b WHIRLPOOL 3d13de7f644ffed0ff207e1e3df172b472abc1f3a25c1f7f758e6fe6d8c2eff790e58cfc8b7c06c12117b4c1a03c81f6e1c452bb33aa54e0a3095ce8a1e707d7
-MISC ChangeLog 2607 SHA256 85c9b5d1fbd86481d6e94e1199df4cd8bd0a438f5550949ce0a66d4ddfdabeac WHIRLPOOL 8b802d7cbe78bd36549eeb69426020c874fbdf64fc56b58c9a7d792c38b0e8aac3742311c4b80377f8c6eaae6601e527083ecb2e9bc9433f82903262fc2f7fb2
+EBUILD arcanist-20150414.ebuild 3831 SHA256 ed19f949968280f161059fbfbb3fec716060d08ca8825b832fb92f1add3f5c6a WHIRLPOOL 41827b62a7948d7dcbaa7e22533c9a62d498ab93746b168aa78c88a11675b747105335f6fcac1746bc4fafc5559b4ea97428989ee7bd73f3c49ae2ad5e2aeba2
+EBUILD arcanist-20150724.ebuild 3777 SHA256 443b8e5697d4becd237466d0a2b70a03ea2c31cb1e803db86c39ec968fdb8757 WHIRLPOOL 308b88c24b0ca0c19e1aba9fc9254ee4deb6dffa85528627669862546ad08380172ab7985fb950f3ae19b927c27982a6e4b14302d4337c7892311c63c3d946ab
+EBUILD arcanist-9999.ebuild 3659 SHA256 a17d930ce6b176e127b04394d6a9b8cd0d302f27fe0284880b411f367edae2b4 WHIRLPOOL aab3132eba8a31e36bbc5ccbd6718de403becdd83bac205eb83bd9fcd0e072e3343297902f64841709c0f870b9d50a9f60a8480a471b4bdd919fe35d7c8ef90f
+MISC ChangeLog 2810 SHA256 2a899b2ddd51e7dcc24233c903cd2cebdd1ab1fc5d937f2f3d3a183f05d3aa6b WHIRLPOOL 8c206491999ad85d0bc7a12c6bfb5cbdad4b2dcf3f1a0aeeb13cd8ee910b372254a8710d1e2b01136bd425e87b556a8764a7266dc69c8ff78d5274bcd9db9975
 MISC metadata.xml 452 SHA256 2e925bb81450c955ffb47c6af0cfccff61d103c2622101ee5fc225eac0407d59 WHIRLPOOL 757211efd5b90e2c231b585b3b06e5399fa5407bddcf80cd457796a09239c88a48313a5d75ea98ad538ed3aa73bfa080676570f42ea92817c2a4183526006045
diff --git a/www-client/arcanist/arcanist-20150414.ebuild b/www-client/arcanist/arcanist-20150414.ebuild
index 597159c7..0c92bf58 100644
--- a/www-client/arcanist/arcanist-20150414.ebuild
+++ b/www-client/arcanist/arcanist-20150414.ebuild
@@ -12,21 +12,22 @@ inherit bash-completion-r1 python-single-r1 git-r3
 DESCRIPTION="Command-line tool for Phabricator"
 HOMEPAGE="http://www.phabricator.org"
 EGIT_REPO_URI="git://github.com/phacility/arcanist.git"
+EGIT_BRANCH="stable"
 EGIT_COMMIT="eb036465dc9b2f83cf302f4cb92c322197b4221b"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="git lint mercurial subversion ssl test"
+IUSE="git lint mercurial subversion ssl test abi_x86_x32"
 REQUIRED_USE="test? ( lint )"
 
 DEPEND="virtual/awk:0
 	test? (
 		>=dev-lang/php-5.2.3[xmlwriter]
-		=dev-php/libphutil-${PV}:0[test]
+		=dev-php/libphutil-20150414:0[test]
 	)"
 RDEPEND=">=dev-lang/php-5.2.3[cli,curl,json,ssl?]
-	=dev-php/libphutil-${PV}:0[ssl?]
+	=dev-php/libphutil-20150414:0[ssl?]
 	git? ( dev-vcs/git:0 )
 	mercurial? ( dev-vcs/mercurial:0 )
 	subversion? ( dev-vcs/subversion:0 )
@@ -38,7 +39,7 @@ RDEPEND=">=dev-lang/php-5.2.3[cli,curl,json,ssl?]
 		dev-python/flake8:0[${PYTHON_USEDEP}]
 		dev-util/cppcheck:0
 		dev-util/cpplint:0
-		net-libs/nodejs:0[npm]
+		!abi_x86_x32? ( net-libs/nodejs:0[npm] )
 	)"
 
 src_test() {
diff --git a/www-client/arcanist/arcanist-20150724.ebuild b/www-client/arcanist/arcanist-20150724.ebuild
new file mode 100644
index 00000000..5ad80354
--- /dev/null
+++ b/www-client/arcanist/arcanist-20150724.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+
+inherit bash-completion-r1 python-single-r1 git-r3
+
+DESCRIPTION="Command-line tool for Phabricator"
+HOMEPAGE="http://www.phabricator.org"
+EGIT_REPO_URI="git://github.com/phacility/arcanist.git"
+EGIT_BRANCH="stable"
+EGIT_COMMIT="5fcf7b5a3b9ebbb42130b25f165283dbe2476f0c"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="git lint mercurial subversion ssl test abi_x86_x32"
+REQUIRED_USE="test? ( lint )"
+
+DEPEND="virtual/awk:0
+	test? (
+		>=dev-lang/php-5.2.3[xmlwriter]
+		=dev-php/libphutil-20150708:0[test]
+	)"
+RDEPEND=">=dev-lang/php-5.2.3[cli,curl,json,ssl?]
+	=dev-php/libphutil-20150708:0[ssl?]
+	git? ( dev-vcs/git:0 )
+	mercurial? ( dev-vcs/mercurial:0 )
+	subversion? ( dev-vcs/subversion:0 )
+	lint? (
+		app-admin/puppet-lint:0
+		dev-haskell/hlint:0
+		dev-php/PEAR-PHP_CodeSniffer:0
+		dev-python/pylint:0[${PYTHON_USEDEP}]
+		dev-python/flake8:0[${PYTHON_USEDEP}]
+		dev-util/cppcheck:0
+		dev-util/cpplint:0
+		!abi_x86_x32? ( net-libs/nodejs:0[npm] )
+	)"
+
+src_test() {
+	einfo "Note that you need to install some Node JS script manually:"
+	einfo "	npm install -g coffeelint"
+	einfo "	npm install -g csslint"
+	einfo "	npm install -g jscs"
+	einfo "	npm install -g jshint"
+	einfo "	npm install -g jsonlint"
+	einfo "	npm install -g less"
+
+	local GIT_NAME="${FUNCNAME} for ${CATEGORY}/${PF}"
+	local GIT_EMAIL="portage@localhost"
+
+	export GIT_AUTHOR_NAME="${GIT_NAME}"
+	export GIT_AUTHOR_EMAIL="${GIT_EMAIL}"
+
+	export GIT_COMMITTER_NAME="${GIT_NAME}"
+	export GIT_COMMITTER_EMAIL="${GIT_EMAIL}"
+
+	# Unable to locate binary "golint" to run linter ArcanistGoLintLinter. You may need to install the binary, or adjust your linter configuration.
+	# TO INSTALL: Install Golint using `go get github.com/golang/lint/golint`.
+
+	# Set config in .git/arc/config for ArcanistPyLintLinter
+	bin/arc set-config --local lint.pylint.codes.advice  '^(C|R).*' > /dev/null
+	bin/arc set-config --local lint.pylint.codes.error   '^(E|F).*' > /dev/null
+	bin/arc set-config --local lint.pylint.codes.warning '^W.*'     > /dev/null
+
+	# + https://secure.phabricator.com/T7170
+
+	bin/arc unit --everything --no-coverage || die "arc unit failed"
+}
+
+src_prepare() {
+	echo "${EGIT_VERSION}" > "${S}/VERSION"
+
+	find "${S}" -type f -name .gitignore -print0 \
+		| xargs -0 --no-run-if-empty -- \
+			rm
+
+	rm bin/*.bat
+
+	# 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 "Replace ${REPLY/#${S}\/} shebang to #!${path} ${args}"
+			sed -i \
+				-e "1 s:^#!.*:#!${path} ${args}:" \
+				"${REPLY}"
+			eend $?
+		done
+}
+
+src_install() {
+	newbashcomp resources/shell/bash-completion "arc"
+
+	insinto "/usr/share/${PN}"
+	doins VERSION
+
+	insinto "/usr/share/php/${PN}"
+	doins -r bin externals resources scripts src
+
+	python_scriptinto "/usr/share/php/${PN}/scripts"
+	python_doscript scripts/breakout.py
+
+	# 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
+
+	dosym "/usr/share/php/${PN}/bin/arc" /usr/bin/arc
+
+	dodoc NOTICE README.md
+}
+
+pkg_postinst() {
+	if use lint; then
+		elog
+		elog "Some linter need external NodeJS script. To install them, use:"
+		elog "	npm install -g csslint"
+	fi
+}
diff --git a/www-client/arcanist/arcanist-9999.ebuild b/www-client/arcanist/arcanist-9999.ebuild
index e0053d36..49bfac9b 100644
--- a/www-client/arcanist/arcanist-9999.ebuild
+++ b/www-client/arcanist/arcanist-9999.ebuild
@@ -78,9 +78,6 @@ src_prepare() {
 		| xargs -0 --no-run-if-empty -- \
 			rm
 
-	# Provided by dev-python/pep8
-	rm -r externals/pep8
-
 	rm bin/*.bat
 
 	# Replace 'env' shebang to files it point to