dev-vcs/git-cola: Version BUmp

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 116 insertions, 2 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index fe0b4542b8f6..e9833751a149 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.3 2012/05/24 21:19:51 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.4 2012/08/26 08:48:25 jlec Exp $
+
+*git-cola-1.8.0 (26 Aug 2012)
+
+  26 Aug 2012; Justin Lecher <jlec@gentoo.org> +git-cola-1.8.0.ebuild:
+  Version BUmp
 
 *git-cola-1.7.7-r1 (24 May 2012)
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 58f8f2769e4f..aa1675bb5366 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,12 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 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
 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
-MISC ChangeLog 4174 SHA256 0ae3e40d1466114f38458c51326ff94a2b9ec956e906963a831bdce63729b64a SHA512 22bbb82784714d59efdbbf2401254530d91a273cce3c44521eb3f4e9bff57e4d9938ccb653460d06364c025d4a491bd7fe5d85013bc35dbcd431693ff733914c WHIRLPOOL e34119520960a6bf4b5f6c48b8b35f2de5264e6e7c1339781df3c4c13a32c4af18024a46000c9145aa9d46287bb6065df0d5aa4a350f92e4391770e5ddb962f3
+EBUILD git-cola-1.8.0.ebuild 2108 SHA256 c38e6817243e1d2c4efd4cebbeb3c7b785eb7f05da26b4bb99dea98656e1966b SHA512 628bfe1dc0619954f9572e858dc28024930042a25a35c176efdecbc6f8c44231bc0def480dd1c1dcfedda997a20c2392113b2f8225bff90eac9ce153949b1d31 WHIRLPOOL 6c71726947d9908e5e4a0e0f9b4ea8457e8434933d648bff5020c2f12fe7a7405321332b0f696246eaf6e87aa33a3ea310f7282e766532cc0b21a4022fa166c9
+MISC ChangeLog 4288 SHA256 1a4a19ca5f442801a22ef5a287adb4f57ba0687dd351f07c16deeb6e2de6a370 SHA512 477c4496a77025ff7dd30889b517d8deab01252616643b97aa8d87a6d1a054bc88e0fed824bf3bd49241ffb5e170effbbedcd3e96c1a60257eeb18e0e103e7de WHIRLPOOL 34aa5ad758ad18f2d7a0f084c33b26c4631908fadadfa51a1849f90d6b2f18951449513d3fe18545f228be96f879c7732dda6659509c9c4662ec80d955acd17f
 MISC metadata.xml 327 SHA256 58d6d26898968598d329ec34fc35da837fb8f6dab1271581091ba2c8b9b6fe21 SHA512 94604cb457e222628adca98d54616ad4ecca1b16e96d0bdb8faaccc480c41ae24088fb01b8218e2da745454f79d03a137ed661461124f3b6b0d50134e125502a WHIRLPOOL ee7eaf64cfd16605c73d12daa621ca9022ae2dd44a67236f61476e476155ad13cce7ccdff8c783ada1bd270af50a9e8032c93536addee842304168189650e0ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlA54vEACgkQgAnW8HDreRabnACgxh4ViGe4r5x8n1RrcQPOxDm0
+eLsAn37W+rr+bR0vBNqKt0XQ3IydTgCe
+=2HxJ
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-1.8.0.ebuild b/dev-vcs/git-cola/git-cola-1.8.0.ebuild
new file mode 100644
index 000000000000..47f7c4ae5202
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-1.8.0.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.0.ebuild,v 1.1 2012/08/26 08:48:25 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.7.7-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 _build/html/*
+		doman *.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
+}