dev-vcs/git-cola: Version BUmp

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

3 files changed, 115 insertions, 16 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index a045bb1e2967..fda5aa4eeb09 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.14 2013/06/25 15:03:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.15 2013/10/11 08:38:32 jlec Exp $
+
+*git-cola-1.8.5 (11 Oct 2013)
+
+  11 Oct 2013; Justin Lecher <jlec@gentoo.org> +git-cola-1.8.5.ebuild:
+  Version BUmp
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> git-cola-1.8.2.ebuild:
   Stable for x86, wrt bug #472286
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 20f4bd20b49b..eabf1f31d36d 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -6,24 +6,26 @@ AUX 1.8.1-system-ssh-askpass.patch 1152 SHA256 b686e77bc3ddd67747d6bd8738d8b787a
 AUX index.html 355 SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac WHIRLPOOL fd3d058f2d57dd9664bc498d6b8bfa749d219d44bef7cbf64624abe16e019062108f52f8cc18ebf580e70d2eb20cdb89f760d380a83b932712a689e921201f7f
 DIST git-cola-1.8.2.tar.gz 397346 SHA256 386b29cd70b3c6a14b23790567d2e93168e1eeaaec5d85be37e4f5ce4fd9a977 SHA512 5136749a12d262dd28db4058efd3892a437e5dea18d4fe888248fd7a3891409091e7d36565536fa7d4538354a01f11f8a02e0fd31c2c86ea7159f4e6004b75cc WHIRLPOOL 861af22ba39d6e5a3899fe569c6cfa3651daab6d4d57a4daf07acad133cd2cc1a375da403a94deb943d3a5ddee4e364d5a50b3f7996dbb3310495b57c67a7369
 DIST git-cola-1.8.3.tar.gz 404234 SHA256 21b0aaec3d6b1e0edbe3a6bd3f085078ffe15feb812cc0ce87eec023d35705ff SHA512 e9a44036fe947c0125f7e135b19bf1726f99431ca7b190acf3aa992181bea374d2c0999f592d0ae41b4d0db9ba1847e60dbb01e8bd8e0de0aca8aebcd3bd98d9 WHIRLPOOL 69fe66ce951503f04942d746faa677cb2b9b634e804819d5c7a9b2565ffef4dbb7c803491ef567e8e4822a6cfa961d982e3c82293e283155548291a38b50d9c8
+DIST git-cola-1.8.5.tar.gz 416920 SHA256 fcefb0e82b8c59b5d063f55edc58d2a1210c4ebab76bef71f01caf91d30b2005 SHA512 5a5042dd00fbf9d342429823e5f89ff413a60dabfb5f2d46cfd203f65b2ec4e8d7cbba8c5f940a3e83b5474a1b050bdbbe3f75ad682535536cb65480b729fbd2 WHIRLPOOL 20530e7f6564a1d6a6c138a0684fd544fa74aa12d5cc87316850b18f602543bd34032a6c8d3333a61a647583c6dcfc5cb44de296bfba32ada0c58314e22f5482
 EBUILD git-cola-1.8.2.ebuild 2198 SHA256 ad11298dfad2ed771e138db229315b7e1e9fbc5c3ef47e5fb44f6f1d741da28c SHA512 c8edde9f4c6ed8eece606ac2106a1bc61812a3aba742763e6174fba90bdac611a00c85df30602b7fe52ea4cc07f57eed9d4cd19502e21fc50a7b6a6c3a135dda WHIRLPOOL c6679a20d7c2c99d5f58fd2dd30b2803ae5bdaf0e43224ea7f14c5ae605b7179fad4b22a3f0ec43b6b847474306ab582b2b79d73d8233b7108ec3b055394aaf2
 EBUILD git-cola-1.8.3.ebuild 2201 SHA256 a5c2744d4b8c368a1fe13034e6280ff86b55d6cffb36cceec008702d9c84ffad SHA512 8a2e166e8c2069d3110955b4c7064bad72280392bcc032aaf7a3f7871537fe3d61746b9734ac23d2bd27064adbe5e9335756c9af0bbff5ab64977c1a3a99401d WHIRLPOOL 1436b87c29057066c3812932d3a23172b853e4d828a1940e2f5f7fc848bd0b178eb85ffb73d010d5c35e48f94a0aed7b80fd296abcd8ae92e0fefc8fe562abff
-MISC ChangeLog 5686 SHA256 9e97e116f631ce923be00e858a4b192d89fbca87e67efe441d1d91d8ce135b53 SHA512 fb2c38da9dc65e9e1f1b6041502b8b0d1ddac93f397ab9716b05f98a28367c053adc6c76277c86e0c0e4bf622eb0817a4cc4b20f7c99aff376657da7b9a0a7e9 WHIRLPOOL 56bd32203b2695b76b1edc162bdc056900af159739ce58419ec903f167d0373bfd7d46c21416501fee8c3f78b14ec0171631f755a45404c18cedc196602743ea
+EBUILD git-cola-1.8.5.ebuild 2245 SHA256 8443db7b8240b78ff9fcf06aac9bc111352670a68a759dae689b586ada0f29be SHA512 f481b9e71bba095a2903b4a2922760007c0fbf0ff4ebb44d85c77fcc921fe0c96808848bae11798f12d18e99f77f4fdbec2131ad08dc15ec43b26c60106b7e99 WHIRLPOOL 01062bfeb032015cc31e284e371582f7263f03bd04324b2466739f11e44e6a8f7815e50f2a818ac0f1a127fd63977554cb8722ad1c24ef03ee22cd48130f94a9
+MISC ChangeLog 5805 SHA256 2b977a4663d945645209af8f6ea8b725650d5d27cb64f90d4322d4f68f90935e SHA512 7bbbb8e5ea89d27efd26ee7f3888a2b9cf06194bc5bd5206029191263321191e45ab3e3ec7cad43c65051dd2bec1887ca2e38e5f6cbbdd155a01be4dee6fab74 WHIRLPOOL f528ee45377b02fd6c51a7b6093ed037848b1a72ed93539de1506f6d7451c45214ae3c69d977fd25a5e55a16668f8a7419b2171de1d7069faa538a3ffe921489
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRybFSAAoJELp701BxlEWfRpIP/2epaypvu0ARZHzZuvWcwVE7
-Q/pGGWT7s4OvTKLzP80DwzxmcbYmWUTHvs5Ww0btRlqg1Wei0EWuP+ykExMxntQh
-ZHCm6D0n+l0YH/H8BTRPGpj+Pj7QIJ78hvj6OZXl2ZHqw62LlbVKqf6FPEZEgjvc
-EEJ/z2xf8svltaQQArDz7fHlWyz0nBf+RE0mO/rVZNkH3RTv3/KtehOWKlU+xdLV
-LoOAo92a7fo4Y40JHq607daRxvb7ZRfQb/w+PvCemUD45WNIN4+GqYKDID1CxWLp
-STkFBpDjoI5+L8reY0/DmcNq38PCfHAIFkYuzMiwFl9MpwiDD+FvEf6H951ncgmr
-fE44QM+db6Ugiew+qgADnT+HDoPIOqnWe5KR5vfP3xLE/3IVxLkAwa9LF15gr3Dg
-B33AwpZPVDM1uPakiDGzwqkhcTngzh41a801yfgx2vCI4eLW166Esex9V3riq3Xu
-FlHanKIm8kae9n1URK+qneWnMFwPIzB2JsTzEx/ECp5n1PtEqHwS7ZbNIhQYO5mL
-npykheSJSrGlRaUflSNlotkKb7AVQ+Ikq4kDzhvno4pBQSMOh7zzWXOkksIFcu8d
-HhOONoJxl+DBIqhshb5c39b/TUUEvYI5DHxESjSb+gE2pF7APAvk6E1lOKoOotqM
-1SqeWw2ffxkFMNeXXCtC
-=liDw
+iQIcBAEBCgAGBQJSV7kJAAoJELnU8jG9FVirLlgP/1aybtUBo+B1AhtlTGby5Mhw
+xmSjpZbtuRfif/jbZh76VJdtVeAOdUkNOyXopFtLeCZclNyYREKtZ6sJmPPRJiuw
+nzGdEHDqWmLnZae200XwUez1WpJlmPChNaXV5eF9MdSSRuhwYw1GDAwzQmTAM5KJ
+b42mObcx3I86LnJT0F4zjQSAXY/991zGsDjDrOH0J+GQqjUG+0yHUEe4Om1uzq6T
+F1i08XbKHQgfGM30bhNmdTr7d2y7i5YsHWK9ajlpnY0LX8Hx2wmu2kRwGqqLVySX
+W9c9P5fJTbFQrt134vwFm0k/A7LJUqS5z5vEGHXv7R41XLxYJRWhXI5K4FDa04an
+t9z1czXY8+z7XQ+G4uzx+vRNfiFXZnVJnHqba0yukeaCQDhL1irgrCmI+1HzJgL6
+A64D1FNsS5ixbpVqp8xPywVPXBfB6wm9N0Cb3ePCamE24Pg7mT4NUGt+hEHuTyJt
+5c4p4VyOM9oC4P8qGE0q4bKM08GgNFjAVsCW664u7AlMp+WSA7VS6BDLLLIHPFyd
+ImtkSxx7hsBZAcH7w9EAspEnGouOOPCsGk5Tc13PoEqlpI6ych+MZUtczfbstjae
+Qb8H4ZuIsnk3z71eKkgZfYewMWtTK+dYVQFN3gtqjcSTPMp9V114Tt1cpGZU0UIx
+BqjwKuxpmnWxT7G0NEgF
+=LRsg
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-1.8.5.ebuild b/dev-vcs/git-cola/git-cola-1.8.5.ebuild
new file mode 100644
index 000000000000..e920c6ff0c91
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-1.8.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 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.8.5.ebuild,v 1.1 2013/10/11 08:38:32 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
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	sys-devel/gettext
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+
+PATCHES=(
+	"${FILESDIR}"/1.3.8-disable-tests.patch
+	"${FILESDIR}"/1.8.1-system-ssh-askpass.patch
+	)
+
+python_prepare_all() {
+	# unfinished translate framework
+	rm test/test_cola_i18n.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}', 'html'|" \
+		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
+}
+
+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. "
+}