dev-vcs/git-cola: Version Bump

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 146 insertions, 6 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index b126ec1d1ec8..c77a691e4ce9 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.5 2012/11/12 19:13:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.6 2012/12/10 07:41:36 jlec Exp $
+
+*git-cola-1.8.1 (10 Dec 2012)
+
+  10 Dec 2012; Justin Lecher <jlec@gentoo.org>
+  +files/1.8.1-system-ssh-askpass.patch, +git-cola-1.8.1.ebuild:
+  Version Bump
 
   12 Nov 2012; Justin Lecher <jlec@gentoo.org> git-cola-1.8.0.ebuild:
   Fix doc installation, #442892
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 95a87d1c53d3..5582d1d667fe 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.3.8-disable-tests.patch 855 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465 SHA512 dca674aeaa4a69fe0fe5cbdc119e796ab346365748a72c09c505bd27f0d1be6355da47a4a3e5ff70d5bbba6d9a28a8ec4b0437e562e0ad6b741c0890d74526bb WHIRLPOOL 92b42085e4a17cf50dd5368c4d96a1858edaf325576208a58f4482c0926a36025baaafb87ec70acebde069ceee9e05840c042e46974e6e2895ce1dc93d5a0b98
 AUX 1.7.7-system-ssh-askpass.patch 1231 SHA256 2714fc6b0b5a5ed13b0c24a9c04d928c4aa2ac6f35f792fa5708c90e339e5f89 SHA512 83f3b3fa9f20a01fc05202e38f52c3d46d52da6fe0c123040339739bb39b2de0e7ed69aa2d9e1b04355d97be5dacc4adbc2802ea4c180a20b40c8b2d513e9b96 WHIRLPOOL ed7e3d697c0a1eb3663eae45ec6568fd3782c55f12a67aa18b4125a508bab2a7252b6114398360477f5c7ee75281a6d96d6a98ec8c59037a7bfe22c2218c38ed
+AUX 1.8.1-system-ssh-askpass.patch 1152 SHA256 b686e77bc3ddd67747d6bd8738d8b787a4677db4e15491a2d5698da1cb74f9b9 SHA512 9c71224090df518d9643405a7dafc4dbe730385c0d104472394a620e270cf51669403cd47a6ee1bab27627b63b467654c6200f058971e5059dd4c2b5a3ca2cdc WHIRLPOOL 8c83c9ecab7a646c57c538f1e36531eb7c87b901758b0340869dd5b8ef1dc46f0be40690ef2f6ae07f069eb74cd4de2455585367b3581b032c87c4bbb8695858
 AUX index.html 355 SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac WHIRLPOOL fd3d058f2d57dd9664bc498d6b8bfa749d219d44bef7cbf64624abe16e019062108f52f8cc18ebf580e70d2eb20cdb89f760d380a83b932712a689e921201f7f
 DIST cola-1.4.3.4.tar.gz 517209 SHA256 36e6a1870378a213a5f36a91ac3d38b612cf578822b72e3d97dadc65c79c935b SHA512 548dc1150de4338baaf57c15121d9f0d661add32e4b94fb94ffe228c67da9d7f14aa1bdec1450ca28a5f353f94f53ee62a6bb66f1d1a6a8eb07ec5126a61afa0 WHIRLPOOL 7f6d81a438484a2e159cd3933a2755205c387b118ce83fb382e3ef836e199f3eb5a854bc4a9b6bf023700eaa074e11a97a7eedef4d98636cc2ed60a0f545e7b1
 DIST cola-1.4.3.5.tar.gz 518482 SHA256 16651f8d17193cb69ae1dd71e455331817876875f84bb76176505ccd8d1b59ed SHA512 b4aa961373f388d99661aefdf1cb544c8824c86e842f35566e7a608795fff312f93399f2f9ef59d4ffb6811cca0a50b9e73c842a296397f978a6b06fe205be3a WHIRLPOOL 9a46c4a33de57453b07aca8115147bb2e4086a0bd626ea6301c1e3eab0a6dc029c887f1d3d33e7cde392e8a351acdf68df5f2108220d1d2e6abcbca73ffae2bf
 DIST git-cola-1.7.7.tar.gz 340187 SHA256 6e1db7ea6e3de90a612607bb598225fb4a09bfc75fd8d0d3f164f4e162823008 SHA512 fc86d8e0a1979ded2b8b9671132a3516bef3248f10dc661f67a375842ab51f22fa6b346b9bfa29eb78e93356a6da27b14c13df63bc89e87ec72f72c7a2fc8ae5 WHIRLPOOL c44938ea8749dd30d7f0b47330560cfbc01e14ecf96301e1e344b37fda56eb56b9a3d5cfce8a217d10f64ef0cee28bb6d44a0efde7834d557a56e7c677664bac
 DIST git-cola-1.8.0.tar.gz 347339 SHA256 6701ac131e0a5b0fcb5213904c538527aa643ef5eb8e33651a8a282b4785cb3f SHA512 8ce896fb1ef3135d7ba2f4b82e2eb7c8e3fd00a064be1995ea897125e2349fd023a0404f67f812ddcfce31bfb345b576e5c911255d6178a512578ccaa7dfc413 WHIRLPOOL 7baa2089c276be62609559d6ee062f77de1142715a4f42dbc076ec8e9d9cff60bedf927ba09f265bb966b750a0800fee1b7006b91ef599f735d0af5026234e54
+DIST git-cola-1.8.1.tar.gz 349477 SHA256 397d2c16f07e799849ce62665ea18a0c4ec99acc92fdd187527b9b4397f9aeca SHA512 1919a60780c758cefbc09d24292cb1dbefbbe6d629962080d87462627872fe4f21c310c2cd8530b0c16428a76596e1ac6c3f9ccf760446b748a1a94bafa3d6a5 WHIRLPOOL d4a0f022d5fce8fffa93c491e767eed54f9fd5505aaa79d984784581be670a7dbeeef22ba10591367306240b4ad4d1395bbedd138c036c99e8d99eba812d2f64
 EBUILD git-cola-1.4.3.4.ebuild 2232 SHA256 e697e1f748c4ebf123f16c475d1e8cb9965bd60f8d8d532968ec8832188e9e0d SHA512 c307988e29a3f95f09ac40e8e19855acd19a59945f4f90f215efb6fffb64c8830cc69cc305bb24cfa60153d6f3764cc99fbd274f482f42aeebc249424cb613e4 WHIRLPOOL 76b6d443f582322694ff1a0966b484ab6e6ecec8ef65a764833d5c932fadf3e6c0c2c34a94b916b200b997ca1cbe23df8d95f4b3f704dec2632e4ee4a1cdd789
 EBUILD git-cola-1.4.3.5.ebuild 2232 SHA256 960e0cf6f9660164bdd7677ed6f3cac006201a019c22c6b7c3f6a0d4feca8ec9 SHA512 51f3f90a23d959fcb6ccbf2ce23dee67277e71cbd083b350961c44b284d1cc4c4ae86f8e0e4374c6f4c1af71f3084b3b34ab392584898f3fa3771610b5e721be WHIRLPOOL 791307eebc4a28b6da0ee6282d0ab9615d74626a62ba2abdd7fa1122e5d4b4683fa257ef0557051da9effa5d84f6094b73bbddf1c1a6f8dc944ca8f8a00ab4e6
 EBUILD git-cola-1.7.7-r1.ebuild 2115 SHA256 2a45993c64a560c333b62714104507d1ff76f3c065f8ffd86acef60d99328384 SHA512 9c0f18afd9e25f3603293a2171df647cdf05772f6b35c23af325cefe950fb90ce8b00392ac6400357ba1d37241fcdec02e29431f7eca8aaec4f32b4c990bc55c WHIRLPOOL f4ddae8a58c35c05bd28883b2bb7259d77188d209613ebec00e9fe5c136f213ab6e00b02c8c117dc9124b82e845416bfaf179967baeff02de40cde42cc23478f
 EBUILD git-cola-1.7.7.ebuild 1833 SHA256 d33a16c01fc5ef6743c7f0a64b32c5071a908df962fc29ddcb5e422b19bb98c3 SHA512 7af5baa370205f03e6a81627d32c416693d8fd30aaecf6639b8d5dbfab5cd4f1859df5789468a0c925d7c3c461b997b16bf9b24c8809ba2b66d77835c6568062 WHIRLPOOL 8109b31a4b3dcde8e53f2692819215113ebd9d6f122efd362785e02d21da9cc48fb37314f1430d99b4d3b2730364968d9c9e24a8c3090be772adda06e5c0e918
 EBUILD git-cola-1.8.0.ebuild 2146 SHA256 5a6a948845f349ff7334e3955cca8ade2ec32993192640de42c7af14091ac275 SHA512 14c9bc554e1ca996cac9334679cf768bdcc000d33aebce91085b5cec9ba0ac844a92d0dc112e0a5764ad1bee0fe16db30e2821f4f5cbdc185ed260948f6929fd WHIRLPOOL e2c918ff29ccdd48ab788f4c868b7f9438855b4125a59a5f09cd3f061ba1280eb9a2962e4d033a7b4e75d79ae304c2968baa05c4f962ff5c30b094e0f20dd4d5
-MISC ChangeLog 4391 SHA256 a8912abed4dd6e2a878a5c1c366937f736dc72ba7c2f038708e1b69e5aab8c80 SHA512 013f8b5f6e6fb783a165f7f870fe46d3ce130f9f704c5481c8c4eb8022889b3798ccf1ed250697c1da3fed8f4fea2c1a021d2f992501a1441282030360918d7d WHIRLPOOL b595847db51c1724e275c6f808dd8ba481ca2ddcc968219c549a7c91f20cd018f5689ba5b0205cc0a54323fea5d4ec939f73f4808f3ccf2bbb1e78568659e970
+EBUILD git-cola-1.8.1.ebuild 2146 SHA256 fba30657d45aa36582dbe2208de7e0bcd34b07b51d356cff39531b0ac00c6507 SHA512 5b64a44a2b58af07a3bba6b2ef96196b45bb49e94d6b995ba8e5e841ad330436ae83f2e2f4c34612ae3660ef026625c0a413917188568b45d319c475db271c6f WHIRLPOOL 6862542507af53aa160eba632a07faeca389f1754892e8e3e2cc362e585e92c6a18a0b193d798bc2d6824c32265fa73720ea35b2063a7055a423b81b28494001
+MISC ChangeLog 4550 SHA256 0de4835575da09969ce30933af04573e4007cfb80fcd8f58d37cdb00361fd31e SHA512 feaa43630e846238b222d66a69c831007521f871f7c1b79394376610ab1fbfe78c49b3a90877462bd5412d5782246f521ca00b166fead5e33ce5b14e4de724be WHIRLPOOL 04f0436e29997c67767495a24a3128cbcaad0bea7dc909ef752b6c77ee17a10a5624a8f7ebcaee856ffa5f69eba632b0652f22f476b5b6f7c0ca05c6aec54796
 MISC metadata.xml 327 SHA256 58d6d26898968598d329ec34fc35da837fb8f6dab1271581091ba2c8b9b6fe21 SHA512 94604cb457e222628adca98d54616ad4ecca1b16e96d0bdb8faaccc480c41ae24088fb01b8218e2da745454f79d03a137ed661461124f3b6b0d50134e125502a WHIRLPOOL ee7eaf64cfd16605c73d12daa621ca9022ae2dd44a67236f61476e476155ad13cce7ccdff8c783ada1bd270af50a9e8032c93536addee842304168189650e0ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlChSkgACgkQgAnW8HDreRZJnACfc9ptZSNT8rsj6+k5IDdL8c+8
-j9IAn0CZI7on64bH+Mu9lJpAxjgg6yv1
-=CAx8
+iEYEAREIAAYFAlDFkjEACgkQgAnW8HDreRZfOACfeZ65ByreNSk+u1UtN3jvR6sy
+odoAnREZfbEn0yhR8JsTIrrmQ5eok8dC
+=Cz6k
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch b/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch
new file mode 100644
index 000000000000..8b9923245742
--- /dev/null
+++ b/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch
@@ -0,0 +1,35 @@
+ cola/app.py | 4 ++--
+ setup.py    | 4 ----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/cola/app.py b/cola/app.py
+index bc7906a..972eaa7 100644
+--- a/cola/app.py
++++ b/cola/app.py
+@@ -65,9 +65,9 @@ def setup_environment():
+     elif ssh_askpass:
+         askpass = ssh_askpass
+     elif sys.platform == 'darwin':
+-        askpass = resources.share('bin', 'ssh-askpass-darwin')
++        askpass = resources.prefix('bin', 'ssh-askpass-darwin')
+     else:
+-        askpass = resources.share('bin', 'ssh-askpass')
++        askpass = resources.prefix('bin', 'ssh-askpass')
+ 
+     compat.putenv('GIT_ASKPASS', askpass)
+     compat.putenv('SSH_ASKPASS', askpass)
+diff --git a/setup.py b/setup.py
+index e202edc..81765a1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -101,10 +101,6 @@ def cola_data_files():
+     data.extend([_app_path(localedir, 'git-cola.mo')
+                  for localedir in glob('share/locale/*/LC_MESSAGES')])
+ 
+-    if sys.platform == 'darwin':
+-        data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
+-    else:
+-        data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
+     return data
+ 
+ 
diff --git a/dev-vcs/git-cola/git-cola-1.8.1.ebuild b/dev-vcs/git-cola/git-cola-1.8.1.ebuild
new file mode 100644
index 000000000000..5e92c709fae0
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-1.8.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 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.1.ebuild,v 1.1 2012/12/10 07:41:36 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit distutils eutils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="http://git-cola.github.com/"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jsonpickle
+	dev-python/pyinotify
+	dev-python/PyQt4
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		dev-python/sphinx
+		app-text/xmlto )
+	sys-devel/gettext
+	test? ( dev-python/nose )"
+
+# tests currently broken due to unfinished translation framework
+RESTRICT="test"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# 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"
+
+	epatch \
+		"${FILESDIR}"/1.3.8-disable-tests.patch \
+		"${FILESDIR}"/1.8.1-system-ssh-askpass.patch
+
+	python_convert_shebangs 2 bin/git-cola bin/git-dag
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		cd share/doc/git-cola/
+		emake all
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	dodoc share/doc/git-cola/*.txt
+
+	if use doc ; then
+		dohtml -r share/doc/git-cola/_build/html/*
+		doman share/doc/git-cola/*.1
+	else
+		dohtml "${FILESDIR}/index.html"
+	fi
+}
+
+src_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() {
+	python_mod_optimize /usr/share/git-cola/lib/cola
+
+	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 git-cola may hang when pushing/pulling from remote git repositories via SSH. "
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/git-cola/lib/cola
+}