dev-vcs/git-cola: Version BUmp

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

3 files changed, 129 insertions, 16 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 124a52a99664..6d4001f58ce9 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.33 2014/09/16 08:46:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.34 2014/10/01 12:38:40 jlec Exp $
+
+*git-cola-2.0.7 (01 Oct 2014)
+
+  01 Oct 2014; Justin Lecher <jlec@gentoo.org> +git-cola-2.0.7.ebuild:
+  Version BUmp
 
   16 Sep 2014; Justin Lecher <jlec@gentoo.org> git-cola-2.0.6.ebuild:
   Some prefix love
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 741b4614dfed..076d334449e8 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -12,28 +12,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.5.tar.gz 665336 SHA256 a3fc3dc5b1010e4c85b75b01346f94823b1b8eb35dd23ef1d9703b7a4c8959ef SHA512 275f66c32792f6c50fa46512aa998ab5b7bcbc51d5c01bd97f864264961f68f71a24c74e2788f7598a91b35087eb7c93c142c2ebd03fe969a66a84752b3f03a2 WHIRLPOOL dfcc01c4a9a629cb32303be02a46787bd0da95eddaf2e7c36c1060ef12af9b9dea34c5aa20067e1c81ce9acefd79a302d967b207d17306862b633cc3c25d3bd8
 DIST git-cola-2.0.6.tar.gz 679597 SHA256 5522fbfc2537488ba7d36a79842af33bdbe89a053809f3c90008aff76b8aa3b3 SHA512 e370255cf919ffb1311e32a8d7ef219063d03593d5243dd85a3a6c776c31b9b9fd02da4c5661f98e8b8e6e5190cfeccb726e655575561e096576dec86656f7a5 WHIRLPOOL 374d02e2e2c857f7e4b45c3bcb4a26e05caad67066f0a2b586b1d6ff5be1338335e94b74ef906a18e62178605cd9da819b282ad25e61f0ef405ce8babbe04d71
+DIST git-cola-2.0.7.tar.gz 679608 SHA256 bf87f6dacb2e524a4bbae8d8f33ac1be3e0b6cc4c41ac1c3819eacfd784c2d2a SHA512 0f26207145c337c3298962fff32695b753b4b5096bd028085e804e7e70589d0e68feeb3cb96403aa3b15dab401ef89d336115d68e7c40bb3d99cee2727a443b7 WHIRLPOOL 75042b712282a689a3f46fb7dc65696001f5c193da01ee65df7e5a525702f3bdee5c5e28f58ee3deafdb8b3d4a4e03a5e55ba74a34d3b18a66fa85ecb69c600f
 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.5-r1.ebuild 2405 SHA256 345a0f2eb69f3e1a439c27dc6b2cc3c40c5cede0f6d2ae547d40b1d97405923e SHA512 71db5e67e411e8f158f4c71db16a90119f01ac6d19a9a265db344e7ccfa26e923811152ccad25a00d67a50578561de0dc0ed05a2187d924f91f06496377722ea WHIRLPOOL ea656ccb1545511e8dba80e75d53e735ea0a3e59ca99b083978aef06742bfa561ccd099fe0487d93702fe795ef65ef62ecdfd1cf9c0475a1bcb6a2e621e7a4bc
 EBUILD git-cola-2.0.6.ebuild 2400 SHA256 59c95228898a3074b0df03a2d78cc56f842486ee6d5aea5a232bd04838ccc3e7 SHA512 702f38a7f268740101f20e010e6e67c2a2a3e08ea0dc5d443909094bca8816377d1505805aeb1d1ac6f722af95cfdf875dcb83d75fdeb817b4d3e05633803242 WHIRLPOOL 916d50886bf91b4803a84dcc3e26278c9b6f4d1b213d14c4b526e6673d87dc6e107dacf870ad3daaddc556137e6ef61e8f7a82e4cd0619b7fe5589ce4435c42e
-MISC ChangeLog 8444 SHA256 f0f9f3feb1eca65afc1c7cea9c9452c4a50dad2b947f78dcd55af65e071267b8 SHA512 f19fd20fc3e8dbc82f4ca7806b8c581b2af30c01feaddf8c7b490d4cdb54bf27be2e9bb8f913adde46676a012a3fd216f58834b497e6a4b1c0be52da319e3240 WHIRLPOOL e4e6dd0dba85e15e997c5e0acff942031bfabbc0c26502fc157c50c7e6fbad24fe666d967db6ef6c41b050ef92d0e17f5313048206c90ee73fbe6a3d9a42a517
+EBUILD git-cola-2.0.7.ebuild 2400 SHA256 c6d4d96a920425968a0783fb7bbb12716544bde958d111e4f5930204c6bf3057 SHA512 fce723be4b3d9465cdbd6a1661ea96a4da424935536f5c433ec9b8cb0fe6ec835fbd84e8409638ee05caf826134dbeb7d73bfdf710d6f9c45d1d8a972a6a8c3c WHIRLPOOL fd004f53936f8f05abfb2da5790c2c6c74cc3d4aa58bfb57e1c3a5e40587430eb797c4929956fb5279c976a7f1682563c3a7cf62dfeb1f90e2729abc70cfa029
+MISC ChangeLog 8562 SHA256 4d82f286946545431157ee0ad8520a270daf5bb25733b91428f2b6becaad4545 SHA512 b32986538ce1b17f5826a3614a42b1ffd7a0c24439b1605a51ef334825a98cab9e1d393532c5b1fb2afd2350854c2f2cbb07819b8a0b3a7dd0f37d0dffd664ae WHIRLPOOL f40483bb3fc9a4994a5f16d9d84bf72e9a5ca2e72a5814dfc289292fed9352f806c73e93f21b6abc2987d54c9d85d0d6fdbda665660a3f81111a760acd521b6f
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUF/jFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUK/XRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirN7YQAJq7xO2TWxZXYT2D0ofaGUmk
-jpyz83gxQ9/WN5PhNY2i0OlI/6IrHTa51b2kUJXuDZuwdBP/m8q5qKfZW26EwokH
-pimNm9JeR3yDF/s26Ma+AIJ13k4RjbtQnmSljlaQni4SlrnChmmXyH9MVDlMANu4
-Q5Ch5ylt9YTQ+6rPO/nBzg6+PWSspZCvtOd9sadKExa3FytpnnCNOKJ8Aw/o+r6U
-OVWmOV71Bub7HGQ4r+YnICjjImP8KFQbtD/yWSLSqh0hSsfNYkOaEselL+WIxU/B
-DY3V1WYyEMAc4GMdCqgoiU9z35wEnwWTxFPpoLKHliQIJbdNZzONgnnP7BZTxv86
-TPFRYtiAu0e2rCg6FkLs8Enj0vpPKu5qXLEAatb1u9qK0PtFCTVaHtG+JXlE5uVy
-1ESzalxpc81lAzszKKeTsjvRAwBV9egoi69vgdeFzFEOef36ycfI2oLAsN/o/2xn
-NdYS1rEnK8vm5cFOdHy3ffeverHaIEyYcfUvK+WHtjQOIlBApGqtxjZ96aN+O+5u
-bt/FtY4MPgm0hjsrkd7q6R+OL7rhkjkLbSIeDvGMrNONXTjqUcvFRCHdb2Yf7WsZ
-ftwoo/uhoKco2J3An/sQI1NNtkeAlKYroFnTc3bLyR12psBjvn/IhXCznk6CW9J6
-0ZSNGBp/644wBUN6door
-=VbTw
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirzssQAI6H22pTAwo+c3CfWtMPHW0J
+O6JuAfzSOIMsdi436B6YhFJLmX/+sSb26EHshSRkQBoilUuxJxivLBa8pcWGs5mx
+5VDeE6dyLJwh/4n+vYcFLKL3KzAhNmSUcfkcWMKTRTf+pVq5+P/p9Zl3HmLB5O0R
+6wYTnWjekzkYP7Tjhjnp8EJNuPgckyB3UQMsaRr26du6CvL3O68pbWw4Njnyj93G
+BjlOID3CTOwYYXV981itRZ4mxxR3MF2lMRYDk5eYHmh1acpPwahAqBsZh2gjF1GA
+BtE/wdjvw1GlZTz8iratGjSQh28VK3WcB4TAb9Fa4DGqNwC9lWqs6SdrPNB79PjV
+aNRjoFV5Z/LbwHexmTEERQYsIvuUz4IFuqcAxnirC3NND+X2Qjp+u3NRL+bUq5bl
+vm8pk3kWtHKhlGjhs+qLx/i8yb7ck55VFuo4XenJkW+DU7DgFN7WPnQmvmx6pU0C
+4bZARZ+/Jk9q1COpaxkdj9unxFa/dQxFs1YImHMod9RQyuY7oHdoNkYUbC8pPtFZ
+PoLRBWeZinFhzmHLg22sUlXmseXwKySHHWVd6V1XgrbHWPcJ4YkLeJrgnCygtO3J
+ZQkpwH/AKJq0ojQiWeOcxp7ilhptDgPREoh1JawcSlW3sd0w5jknB5K7CPeJbuGR
+k+ESRkwOGvYAFMTCqVqk
+=m6ya
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-2.0.7.ebuild b/dev-vcs/git-cola/git-cola-2.0.7.ebuild
new file mode 100644
index 000000000000..b0c2debd7716
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.0.7.ebuild
@@ -0,0 +1,106 @@
+# 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.7.ebuild,v 1.1 2014/10/01 12:38:40 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo virtualx
+
+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' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase"
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	if ! use doc ; then
+		HTML_DOCS=( "${FILESDIR}"/index.html )
+	fi
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+	docompress /usr/share/doc/${PF}/git-cola.txt
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
+		--with-id --exclude=jsonpickle --exclude=json" \
+		virtualmake
+}