dev-vcs/git-cola: Version Bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 125 insertions, 16 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 4e05d1c3f659..5e211399c3ea 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.25 2014/03/16 10:35:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.26 2014/04/24 12:15:55 jlec Exp $
+
+*git-cola-2.0.2 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> +git-cola-2.0.2.ebuild:
+  Version Bump
 
 *git-cola-2.0.1 (16 Mar 2014)
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 241631ee0107..d7ce832bb3e3 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -11,28 +11,30 @@ DIST git-cola-1.8.2.tar.gz 397346 SHA256 386b29cd70b3c6a14b23790567d2e93168e1eea
 DIST git-cola-1.9.4.tar.gz 434458 SHA256 c7f065bf5557ceba424ee26e5af94d01b37537ef426fffe581efe33526733525 SHA512 aabf1887da1aee2b1ae2c004c8ab29317796c4e21bda7b9937fdf3ad8aa6721e8833b56f143e4cda72bcd631ede3f176592335862e456f69729494332b33264b WHIRLPOOL 2ee639402b2bdab9bc49b11d0bf29696e3607e9218662af72fd6aeafd73da37955ce5dc40ddb03f9664fd15c3ec213681a2ab58b6451ac121a8abaafbb4bc32d
 DIST git-cola-2.0.0.tar.gz 434500 SHA256 a4aeed521f2d5b2a5345656028dacf96e93e4df52a1e7a46dfec8be82d95cb64 SHA512 356c157f2e19f166beb7273555a65e8132aad2c588cc4f89eeb83df2462a417068a3ba33b3b958e465e921b0a79d9e6912447ff630af2ff34aea87634fc3065a WHIRLPOOL 47b583d00cf64fb7cba95aded77a251f101944baac8df6c264cc00d11fbaa55d4dabac0132d5dc5e0c2d8e78f92c382d30f6133f1896ceb7e476d1e95950d3fe
 DIST git-cola-2.0.1.tar.gz 434970 SHA256 e228bf4931e02d18eea4d01ee031f080aa356407419149d4ef76124f308ac1a6 SHA512 dfbc0e0646afd7982c7b4ee05fde92a358d25b0e7824b9fa8fb1353b776876dd3338188fc29694650a9a45aff03a7b89749a3909ada937c3fc808f53b686f1cc WHIRLPOOL c0ba17878f6670a2c8edcad1d8eeba2b859c2a1764b95a0ddcd458d34f79eb2f67e025daefc4dd30f3c153ddf1034efd4ee0da846dd5f3d1cb88a8378d2def02
+DIST git-cola-2.0.2.tar.gz 607589 SHA256 412f53e0032c448d1cb8c4a715296b9daec96fe38b53c8b8e8d4a5679ac8070a SHA512 9f78e476b8bacdebd006bc5753e0c4d8f9b3111f395641ec4bef0c662e2f3e3f999e9010c66d662c832d62b75677c788b702c98adfec54ed5d091634d7d0b096 WHIRLPOOL a370c591cdb07461dee7fddfc6b4ba9fe00e1990cbe34ba682a0611782ef16a90c90270eabf3a6ae63ff367edb8463a37ff74c0e790875d8f3e7ae6f4080e295
 EBUILD git-cola-1.8.2.ebuild 2198 SHA256 ad11298dfad2ed771e138db229315b7e1e9fbc5c3ef47e5fb44f6f1d741da28c SHA512 c8edde9f4c6ed8eece606ac2106a1bc61812a3aba742763e6174fba90bdac611a00c85df30602b7fe52ea4cc07f57eed9d4cd19502e21fc50a7b6a6c3a135dda WHIRLPOOL c6679a20d7c2c99d5f58fd2dd30b2803ae5bdaf0e43224ea7f14c5ae605b7179fad4b22a3f0ec43b6b847474306ab582b2b79d73d8233b7108ec3b055394aaf2
 EBUILD git-cola-1.9.4.ebuild 2421 SHA256 0511ef7e83d8adbcd997a4f6bacdfe0e5580b63581a5e7feea5a6dbdeb258553 SHA512 95255897347c3817dae5d2da5a7e1d23bfb5f1a317cad3764782d4a808bacc83be2e504577a916ff2d1f3d6b448a741d662d37f32e7da2ccdff9018d1d702a28 WHIRLPOOL 4ea73c41178d97cb4b85939430fed8d1b800f3a1200f25d5e5323942a6bf3f0f45386ef23d3fd9544524c053438dec3f3fcc85d3b8b7b871f12d187c0384bf97
 EBUILD git-cola-2.0.0.ebuild 2425 SHA256 cc832e78b25c29613de75afa4595846bc20445673c95927a346a70f64b00dff9 SHA512 e9629dfbd7b2a2e14dc7dfc80993fe668a038f8859401a607bcc63f189358d395111e2e04d0a115e14c9600b39acccf0d62692788684769ff7555a7d61e38155 WHIRLPOOL 22d4f71ea3ec4be400201295f762e7dfbaefca6b4894a3ee4e3bc24fe052c4815c10860ab792f613a2aa35a1ad029d47fbef1fde82a8a418bb7c994cac57fd3e
 EBUILD git-cola-2.0.1.ebuild 2425 SHA256 4184267883675713a6881efc0a94111e2e59e475054518f2040d525116d7b9a6 SHA512 525aefeb7937d679b8234b16c093501af269ea1eb8215f0237f0eaed8b805207e3b4f412a293be8c73e0e8cf6a5d99a5838460fb7789ab692f224fe36eaa63a2 WHIRLPOOL 784c4127cad57996755a69422b3d6364cb99b870b6fe61c90545e4bc5f466f699a5c381a1c503f2dd580dab99659b7b3454da419b2b0b0afa6567d9fedb65cd0
-MISC ChangeLog 7249 SHA256 0d6099c3a0bfe07065aad9cda5c2ed0ef6022fc4b72972c17363abf1055f6abe SHA512 57a2b6c35a6279c941abfe0461299358df01d14a7d24434d24262a64d65cb405141d73aa5b3f91d1cbfd5fdf6e5de51ea7d7a774958fee4ee89195d2fdeb7a0c WHIRLPOOL abfda8f734daacd2aa91e4592a92e23a61d835919300c7bdf08557719f308390bdcac853fe0867da492fcb6eb9575ac1d4d55418d1780f31dd706929707e506d
+EBUILD git-cola-2.0.2.ebuild 2425 SHA256 e2f1362b16ae5966e659c386a1732eaecb231f60de4fd2d6bc09eba0f3848ff9 SHA512 82148a1aa0369597e2da7d50644e91744e50cbd6ea77ad4c03a4f357d1554d495ac8439c17a0464b713ef350039228978c768c31b2219220482ad9cb749ea43e WHIRLPOOL 5aaa5001cc9443bd8e71d0124c5d974e1251ca625cf75e799c410570bdaf498ee7781501e62880de3b720cab6d8718a82cc2dca097244055ea74f84477388cef
+MISC ChangeLog 7367 SHA256 04c2f82c4d7d8ba899e36787e241629959535ab386ea470e291b132f93af0b6e SHA512 8202b530c644864a21170a01da26550a47f34c3b312e4819773538240115d7a348bd46e0579a71049e6fc323c3f5d1ab1bbaebc1afe2507c956be967f49b4bd6 WHIRLPOOL 1c71b0a0ede98238ec9f536e98754ec509cd804edabae6161945b1effb1d9a7551a1f980ac3527f16771851f082822f0bef0780c93a5b2c01fc252b3a4d07825
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTJX6eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTWQB/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirvzYP/jRRsb/6/p6gH4co8MVzXba3
-9A76fUZL95BS2ksPI0Bj5qhATvC8G2eBC2EVj/RR4F+goFeL1dgj61pERvmFJYlP
-hEn73rRpuM9rsrXHcv/fj3h7elfbHoshGioYuzkdnmAW1TcXD1pZwD8fD2vwcUH6
-bWMZ1IXb+EVAqKI78lQQmtHjWnXIMYHlgAYqHNWw8BF02r/ksrZ2m+JSGf63vbYC
-LzDP1D+uC0LseHLAKfZW8UUaooKvFD8FZB/j/Y7NEolc3z+tIZ1zT5SrSeukJXVN
-61MHLHnpLm5Q5wnTwvn96XrBigOdOARjjx8fgrM118AcgEDyWJbixMTc2aNxXQ1I
-z+PLIqZNfGa3Y7CuwU9zLKjYprT0kwd6eXccs6TXTDr9KdD4s8f3gE5OYlPof2SR
-Y/oCZEwFoeMNJZR86fkzDBZKUhLKQBXE7FMOOe4lr5WvyqQylJ9E56OQkiz3p9HS
-C52vcwzdss56U5JFjR8avy1P36ns7g9lImZVlqhNz8k4lUg9pH0AgUxjJK/PA444
-MeE0Vr9TPg7PBOW0L0Xn2Aht3EDI/n3gJV7YOlsUyQGrQvoPsPaQxPNVC5yHaY+b
-c0Z9RcgO5B7opZ5Pscz5wZTN7w4YCulQyKASvTDlyQrel3WiAtNZyKLTKWCwkTE3
-3s6kEtWa3r6h6P+piRyc
-=61qv
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5g8QAIzTk484cYi+f2G1JQiPwGK/
+2LLNvQjr37+LMBM9ybUs4GsweEyKA73K5YEy232hagr+Prpx1bPvv0ea7+LPH6Ha
+YbrbO/nX/V26mCuptfihjbhfpxyXwzzrxvDnU/9S8br8ORg1nGKlAIZ5z4CFF2jn
+SMp/uefVBRrAMpdUCL3/0GbW12bg3pMl6VrC3QnO4FOzMv/dPpg61FALvvtJC76a
+fkmwQ3N+UUqZXSWHLlErHHX+aU6X3A/gQi5bfPsHLtZK/bhCDCzhxlbWcP9co5DE
+JI/y+HgqbhYVAh/z9odBaLDgNpaL+NETp++tPEnpJDtz2Ra3NIfiRFTvoNTb2RHg
+eW5bzrV2eFmZQp/+oefEYNBqv6qGhdkAqI9wzjmqqcA+GGZijG+jcDyagMZkNrbH
+EVqECmIycoJ/pg0/PsYWbAIcfFsAbBfzNFaiIqwrJ015D8ch2PnW+fTEJTxLk5qj
+VSw9At2vk/Sr0ZjPko4K3XAOKbRdW7gcsjeyyvF13pB8rmw481yt1Z4vHC0uOUv+
+wmQfGUlfTMK2pkqkhMf4+Zs+hVW99+HeuyyWKZ1qYe3vc7Y9p5FhRkXZhklp8G9l
+KcJrTtgxWPUlwinq67G55xXv3w0dg7yWWmcg67HNkEmtJXGMpK1ofaF/NyBiX1L1
+4eupU9H7WKnpb/1qoSFW
+=HFvh
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-2.0.2.ebuild b/dev-vcs/git-cola/git-cola-2.0.2.ebuild
new file mode 100644
index 000000000000..b3aa4354c51d
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.0.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.2.ebuild,v 1.1 2014/04/24 12:15:55 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="http://git-cola.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jsonpickle[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	sys-devel/gettext
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		sys-apps/net-tools
+		)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.3-disable-tests.patch
+	"${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch
+	)
+
+pkg_pretend() {
+	if use test && [[ -z "$(hostname -d)" ]] ; then
+		die "Test will fail if no domain is set"
+	fi
+}
+
+python_prepare_all() {
+	rm share/git-cola/bin/*askpass* || die
+
+	# unfinished translate framework
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i \
+		-e '/doc/d' \
+		setup.py || die "sed failed"
+
+	sed -i \
+		-e  "s|'doc', 'git-cola'|'doc', '${PF}'|" \
+		cola/resources.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-i Makefile || die
+	fi
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	if ! use doc ; then
+		HTML_DOCS=( "${FILESDIR}"/index.html )
+	fi
+
+	distutils-r1_python_install_all
+	docompress /usr/share/doc/${PF}/git-cola.txt
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \
+		--verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
+		|| die "running nosetests failed"
+}
+
+pkg_postinst() {
+	elog "Please make sure you have either a SSH key management installed and activated or"
+	elog "installed a SSH askpass app like net-misc/x11-ssh-askpass."
+	elog "Otherwise ${PN} may hang when pushing/pulling from remote git repositories via SSH. "
+}