dev-vcs/git-cola: Fix broken documentation paths, #499658

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

3 files changed, 125 insertions, 15 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 9cb3259aae17..839cd8ae131a 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.19 2014/01/19 19:04:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.20 2014/01/29 11:55:12 jlec Exp $
+
+*git-cola-1.9.3-r1 (29 Jan 2014)
+
+  29 Jan 2014; Justin Lecher <jlec@gentoo.org> +git-cola-1.9.3-r1.ebuild:
+  Fix broken documentation paths, #499658
 
   19 Jan 2014; Justin Lecher <jlec@gentoo.org> git-cola-1.9.1.ebuild,
   git-cola-1.9.3.ebuild:
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 4b6e7f69b9e3..3d372bf785db 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -16,23 +16,24 @@ EBUILD git-cola-1.8.2.ebuild 2198 SHA256 ad11298dfad2ed771e138db229315b7e1e9fbc5
 EBUILD git-cola-1.8.3.ebuild 2201 SHA256 a5c2744d4b8c368a1fe13034e6280ff86b55d6cffb36cceec008702d9c84ffad SHA512 8a2e166e8c2069d3110955b4c7064bad72280392bcc032aaf7a3f7871537fe3d61746b9734ac23d2bd27064adbe5e9335756c9af0bbff5ab64977c1a3a99401d WHIRLPOOL 1436b87c29057066c3812932d3a23172b853e4d828a1940e2f5f7fc848bd0b178eb85ffb73d010d5c35e48f94a0aed7b80fd296abcd8ae92e0fefc8fe562abff
 EBUILD git-cola-1.8.5.ebuild 2247 SHA256 952a9e2d7a101410b75e14405503bbe84da1662f933d8b577d2d43ff49a0e63e SHA512 635d833bc4fd06d76108dd382683a0ff11b04f1fc17f18c8ef379eb47eb135c9b043df321219d14e266fec68ce9b0540e7ae0aeaaf1836bd7e87014fe362f848 WHIRLPOOL 1146720c543e29a03be3e4ed3cbe43c58f34a4f74e2778fdbfe5341409a857c159de502b903e133bbbb020775e5dea56644e2822dba8f4df3195d414ff93dbd0
 EBUILD git-cola-1.9.1.ebuild 2424 SHA256 9d6b15f099047bc093305b3bf9aee8cb8eb2cbb3655da613e5d58a9658b47480 SHA512 e2ed343d10e44dab9cd6b3ec6dd3879fc42af748e2b75ffb114f4ff33d8db76eb4460846522bd5f8fa4221ff749f809aa0704f8c2683eacc61a564814f8af3cf WHIRLPOOL 9cda07fb5540cc341de3c89cf5b76341751d83c7f42af33ec5e6afffcedc044b6ddef8e6fd6decfc82447d44f64307e1ef448abdb163637fc0333e5f0107a6be
+EBUILD git-cola-1.9.3-r1.ebuild 2467 SHA256 e11e1dbee968a095168c270ce613346f536da1b75ce443cf6d4a62eaf12ba3c3 SHA512 4112622b646ebaec8c51cbd670b34e8fc4055d9fffa4f51b1df076ceec5cc7406821fe19e1e12f8e2392420a8baa50487d05b264892e45232c5375ed14cb53c9 WHIRLPOOL 4a615f0f9483b794965daaa2151094273dae4f09fafe23d4c55104d81234e0f1f004f9ed685698a820d648b1cb8ad0ff426f0ca171c1417253aea775f92d06d2
 EBUILD git-cola-1.9.3.ebuild 2426 SHA256 88210656f2cbfd39a181e3de43bf1d0a44238c08b9a9b6f2fc61bbc594499d76 SHA512 916a82a2c7ec354589d80ef7a418efae6e702ea3c881a39edb6a8ba8f82b7d188bda295b294e5810e30792cb83e2e560ed7b91c5fc034e24f4a7484b164cdd30 WHIRLPOOL 1841250c33dd151f01e8b317dd7e59a791e88b170fd13e523237971821891a00c59c1c31d12ffccc8f5849adb8c64c22ec6beb3e8ab4cb845211def081a2b78c
-MISC ChangeLog 6401 SHA256 2428538128dfdb28fbb696c3d4e546a63bdf43a31f3c2e657b6651224dbddf5a SHA512 e7dd85f3c5f91a5b9c3e1ed2b3d99d084bd73948c22d68afe398c313b6643b9d39c52ca1c043539a4d2f4c5f91b86e684dc90be5230ea83bb7081187221f2b34 WHIRLPOOL 4fee55cd0ad21f39162bd6e8eedb978bba8dde80635126141fd76418a3bd07df9b2809fafa904c81f854948de69b26be27a568471c7b79d8721ac5b9e489fe74
+MISC ChangeLog 6552 SHA256 7939ae53cab303d593a57a0e4a476612fe1d2641fda5142fa0e495a76c1ae9b4 SHA512 0a80aba907a545f7ee1f1568f5330c0fd2f708e2157101b287cdd243bad430cd207f1880ba453d6c96daeb573097fe9f02b79abc0389a97cad9bbb72cb956c84 WHIRLPOOL 456d105878eb4915fd3ac4bd8ed7eaeb605e1b7e09b34865c479ce843e132244504a8dd5b7b7decbc4f81b373277bb7d2160891d257c796419b7ebb2ce436743
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS3CG/AAoJELnU8jG9FVirM+kQAJkzsn30Q9ToJ3fKwBkANp2S
-OzZRbvp9BBgIeOOhZbYOgF7sAV8iBDZDwVm9wAiL+LRmA18meWUu6JbbdxxELiu1
-l1NdRkNpM93xgLyMlF2T6V1cY4nOdxuaFMDErfhqVwkcAETnHQCV7fpXVcsH7c3P
-V11V3R60vK5vH6avRleayI9mYRHnOFaLav0mf8hSDSzkewyrCcN37pSg3fkkm+b0
-nW3CrtmCablLpaphUo9z7VFgQ2D1MznFFbqoQuY0Ah7p0T9z/iw4hNnk5fHcZmBg
-xMku4/TO8Kh0ZA0K09yk9jWb/axiuQLS5d4UAPZMlX1T8oc8+qNRTKoNQ5AqvkIW
-hQl4MXbp8Huu/0zwl3iqf2MUL+EE+au+fFkgGeZa4VKuK+/Pv/EguV26mniQh9gi
-YI4QHbsPH/QLtLxYnkH9TGJUUCvyF24UB3s+tfTiEfP9NNmVZcsElcpbkPDcwEKx
-Oy6If0eAKK28YfVHo9mr8S+B3MU81p2jFf5Pgr6vKQUQgfSTkOjHoojZkBYFbKc5
-qo1FYyyp1tYD3GJsiscNGk6ip8KFTA/h/I/Iycpj8LWNnay9CEd619AwtUn3Wv5r
-HoApmQQ/fzEFicEUIqMCFc57zVYynYVQKBm6d8X2hUcYM1amMZ2ahayvO1154VYP
-zADIt2vkD1mSxDzSDeka
-=R7Oi
+iQIcBAEBCgAGBQJS6OwhAAoJELnU8jG9FVirtssP/RSFL2zQ1+/EFID7JMhClqMl
+IqLCSOLgGer3k2DoUlanIhYgArc7T2NYaZfCviSFBmkW0VFLUN1+GFR7m0DFLCiN
+NWEqX5UDLbXsanMWF9Mz6fi2k8afNKDPC/Vnkrw732Xq4bC5sNRSA2K9k4Ld+oYM
+2pYD8a0L4yJlM76zubVlTE+Vef1WHGosZvwqsOeH9pDRYvupbHqCfekLrI5nanUu
+YZPSXps5jN0txcxvpYA6V9jagR/Ss/uISX5xQAVeev+NB6cgUsbal+x0eq081OGG
+3zJcRZ+O79oOY19FcOxdik0svcxf3erAa3ej4JuA3NZlcnuxTEUG4uBPTH21fkMb
+L5gLgO9A4jt0NM9gd4xPxvCOQMvfBsFzirG/inPhydNdY/nAV+B6W/tK92YXDpbG
+lS+IpLWQGAC83cvwcC9wrXLlynebPzVYRQcCsu5WEDg5QbRXyNjzwWzI85OLso12
+ImhC8o8R6slJgHYMjVwgRe26uwGOcLpohswnwbjE+s/N2JUYCG39w72fcfRjdlUF
+fkbSQjTH0kkM+2QOjCmWKUW/J16TS282fWWGEYqWFGQ0gVxORkn83jF0wA95j22p
+Uz64nrVOaHa95ARPtM/lpHkvpSPFrQZe7yBw0gJ3quQZNEUUPqhZbqTpoddZwny1
+7KU3k8+0DXzjay38Yx5W
+=ksrU
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-1.9.3-r1.ebuild b/dev-vcs/git-cola/git-cola-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..9b0c5fef08fa
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-1.9.3-r1.ebuild
@@ -0,0 +1,104 @@
+# 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-1.9.3-r1.ebuild,v 1.1 2014/01/29 11:55:12 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+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}"/${P}-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=( share/doc/${PN}/_build/html/. )
+	else
+		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. "
+}