Version Bump, bug #554456; thanks Coacher for all the work

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 162 insertions, 17 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index ec2db4121739..333ba5ca07d1 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.49 2015/05/27 17:00:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.50 2015/07/29 07:45:09 jlec Exp $
+
+*git-cola-2.2.1 (29 Jul 2015)
+
+  29 Jul 2015; Justin Lecher <jlec@gentoo.org>
+  +files/git-cola-2.2.1-disable-live-tests.patch,
+  +files/git-cola-2.2.1-update-git-config-in-tests.patch,
+  +git-cola-2.2.1.ebuild:
+  Version Bump, bug #554456; thanks Coacher for all the work
 
   27 May 2015; Justin Lecher <jlec@gentoo.org> -files/1.3.8-disable-tests.patch,
   -files/1.8.1-system-ssh-askpass.patch, -files/1.9.1-disable-tests.patch:
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index cfeef4d9a4bb..54d9ac797a2c 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -4,27 +4,31 @@ Hash: SHA512
 AUX README.gentoo 227 SHA256 c95560b961a37e9c7b731599c9eb85fff9f9a45262747a498ae5034dca2c49cb SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d WHIRLPOOL a1ea204d2353fee42dfdc3880dd2689a7f7b4f12ba2d5d048b86ca29ecf29f34f970b84e5fde30110dfb6f029a8ffd41dc84cff80f1bf652a18ad5db4820958b
 AUX git-cola-1.9.1-system-ssh-askpass.patch 581 SHA256 77afe1bc2c2dac04cc7e4a1a904dff198d7c0c4807b775a6dd84c4a76cf0cdca SHA512 ca342ab6b00580708fce8f33e8c628d743e8b18ae6b1a568540fbef076377e6c94ae577edf8e1888da44692b72f1d59429344dd9b62106b7481369a735c84ca4 WHIRLPOOL 9e519bf2f7c789efed07721fcfc301ba5ec18e867a848380eb43a6b04f6428034cdebdad57c894839e712802dd3686ec374fe12863c09b3fb39c4223e44bde69
 AUX git-cola-1.9.3-disable-tests.patch 859 SHA256 cf6e9410e0b3ddef9b40ce00906fc49dbf667b3f2eb72929c7320decac676c2a SHA512 ca5b44a5a3ebaaf2c0518293554d3edc1d395dc82ad7f908096315083089c9c509ed24c9d1a1d6f266626a32b264d5826df645d6e65b4977f307973e304f8006 WHIRLPOOL 89b3b127a75db955d5a03f71c5c49701f6a9b913e276f6e4cf241c6cf158ab2e493ef477af4a5764826587b93d5aa6ba9aea5f361216c5d1df33577c5ffdf872
+AUX git-cola-2.2.1-disable-live-tests.patch 800 SHA256 99762efaf3001ac247bca85e09f4641801898ba8f5a838ea36d8f1394a2c174b SHA512 36b84490d371dbeff3a206603c4ff3d64d6e4b60338c48c83864d66058c95371e3e3621390cb9541a8d955e2a8f1a6187539ee0a966c5b8beaa48a3e417c4803 WHIRLPOOL d1b56be64ce49eb7c7832116f95b6aed36ec58f2a55fc17d037f030ff6ce06d5662a57ef700462566e765f4d5b611526627588bc21c9c234b9996190cddad5ba
+AUX git-cola-2.2.1-update-git-config-in-tests.patch 445 SHA256 d1d2ac758a34d8bca28fc21b002203587dbb4a187ffdbc23f6d2323b57962ea4 SHA512 abb8fadcb851c11e896dbbcd247ea03bb9a6a109302fef0dfa847b6a4702334a16b97508c1e000763ef81af805d46cc28dcf25669d2e51cf79c0e1aadbe43fae WHIRLPOOL 238afaac178f608ce7b33f7dbab65e353f2f4f60d75c2604ec8ceb16d3a484b01dbab648580921c4e9a9461614e296017d0a9a507bc0820de01509c8787e71f9
 AUX index.html 355 SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac WHIRLPOOL fd3d058f2d57dd9664bc498d6b8bfa749d219d44bef7cbf64624abe16e019062108f52f8cc18ebf580e70d2eb20cdb89f760d380a83b932712a689e921201f7f
 DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756
+DIST git-cola-2.2.1.tar.gz 996484 SHA256 df0a3e1d3c49629926f2e30f55d635eca3c8da12e96232196b307613fa4b3aec SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109 WHIRLPOOL ac68a558775bc5fdf3a168416132dedbeffe554f6f60f50b7e33f0d17d67aa829318b7a0df2607b47e41b8823d60e206e0544e03382eae7651b9ca1c3b9dfc09
 EBUILD git-cola-2.1.2.ebuild 2509 SHA256 c32b98d98b6935f82f4907da7ad41b91d6fb832d241c17e31782f90b0b38c50a SHA512 1f8fb9aa7ae0b1a7d3a4c57786842fd4d4af1a994ee950c451ce0fafd137a3b3ead39ed791cb1ea93c783c6bb09845ce6d6b3262084b10d9747734ea85281e56 WHIRLPOOL 241ae40c1e7ffa737aa13f041e47a00f3286f23b172769d6ae1ea279161f2a7d50b85c65e2c528caaf2d9666e00b568702cca3d46dbec6f1e11c5a690a0280e3
-MISC ChangeLog 10351 SHA256 0a6397fedfde72d113463402a3f1acf310ba4f653182eaf2916266de9ddc82fa SHA512 e2f88e7291553fdd2d5e437fccb914a086203382c7e35e7d589a6ba1e1d24b07737f3535ce215cafda62cd421868894074d6273400469cfb7c4c3193fc8a009d WHIRLPOOL 15989a863e2785ff0ec54175b75c0eb03a64844345603a15bd651dd346d2530b6638cc1a8656597adedd4db6130f7392d83101d3e4c93e4d1b993c41896b4098
+EBUILD git-cola-2.2.1.ebuild 2354 SHA256 51c294748c97f0652c721b5e575267a98c46d6ded98f5ad10fa7acca6f23ef41 SHA512 d7e57e1fd6c2fc7ff4822244a9339c251345742b9bbdde3d665e3d337b8d62c164540195d2612c96f3a9e34757af97bfd688af7c3c55b60df6c21e5d65fded44 WHIRLPOOL 98f1e68f8641abae6f0f980528dd76d99f0718db16738e5d18840f5b7b9207536c68d54dbc2080c110a865f50d1a5c023b0526fec034cba9ce47a4a5032a0613
+MISC ChangeLog 10625 SHA256 92eca8529f9e81271cbcd284e1c9efd34c569b085c091cf01f69dea79cd373fa SHA512 4c0ba0315dc5abcc446d19357d5c7b964fcd6f31d13b666403823bfcad3db4f1e8a3b56263d3a5b8f40140cc10838290ba027461b12b46de7ba0427d6ec34b49 WHIRLPOOL 4d9f910d6e3a1b64826a944e57954fb7943dc9442466740d037b1026bb38c2d8b9c9bc7aa76f79d14c4053cae7f4da4fc5558146188322f04909944e1e95a167
 MISC metadata.xml 425 SHA256 446e75f079f4b04245385003dfc201ebe5c40bbf42e4dea7f117c800ada3c7e8 SHA512 8dd6ce75370e754af286d825f7c4c114377bd6184d3624b865cc27c64c7b6363c2eb98b48834f7c24c24b37fcf09c2a82b5826f0bfb8bddd269645751f8f29b9 WHIRLPOOL 63ac828d0c867f8538906a7ab4cfd82927d8037ce299954c4bbc143627e20649a66720554b88a44eb7ca380790d4fc7fc549748ec2253495c5d4680fb98ba7a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfsGyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVuISDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqz8P/0etZ1GSEwxBEkSit24lk6bs
-N2m9sU1RH6UvdH5VSb9CfBg0qpHANgGOYaVm1nMs18Jn7BRTmsiQQz2K4oasJN21
-nEpZPkXoL/h40GnQ74P5oXEQJn57cNMHDEfZHdersYgBEn/HcE/5rkZMT4FUR/OQ
-GaqePraDPZ+aZ8dPaXO42CNcqA1iJJn590oUTPHLgxvUXotKmKa7LXS4j0g9K3RJ
-7U9yBVtXFIHb+AAJ87jDjQzxbzQcJABV91MWIe8vG568ce4Ist75mIFH4zrrjAov
-nZQFc8iuFJoLmdi9xqK0q0a65xIoS4tmnjK+RIHlldqeoMxjh4QsTSeJtToHk+SC
-slIeYKt/RHSzDKGFm0Mj9+gmZtPyuquXzO7Z9gFiqWyZLDFd8U/hDeaVAcIHeXal
-2xo94PL44UmVw5Glcwwsav02IJs6slaNgVnMjnwCVn67uH6m5sG4OtAerM4JloQn
-6oXpcHaMIJHOqGW5ZBNei709JJm3nmVC6sGQDuxXPfygsp8XQgtKWghoDgyHBASH
-Bumrcq7fzFgu9QfexJf8KLVW8kM20NcFACaj6JhrhV1BGontip0k1GcPEncf4wVA
-Eb8fKvoJHZrcM04HK+pZdlpn+3yRqf+RTSeGVt1d6JSJE/A68zK+V4XHJmq7r9jj
-kPnhGbwZ4Wq+TdW3lXqq
-=0MHs
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGQUQAKTwUj1d0eEiZae+s0aT8PTB
+WJdqxppmndaaLzlFjghO7mdxZkumqYgvy+3YgIfWxlqd9S0StAmHCCMJp2vqJuwf
+wuQc59fanDv32+1jVNkEeun6RK1j3CayXKLj2FiyFkSXmHalNHnhqhpdZOG6B6+/
+jjHOO/mO4W30yzyoEV+060MDSo42XIEJocAODD80WL40LtPnP+hq8RozTF1Xpzby
+e7ySnsuR1EYlIOD/EB/tV9fL2OusijXxV3iTbRV+4G5fVh7uOi72yfIkX6JR76sW
+FS2vqhdpjF8H14rYM6pQ4ahP/oCl1A/IHV8p84fWAwnECKjN/BtpRIzv8C4ECD5s
+V3KJAOuPvMtp9Pkq2tdwmv2M9qL1JLN4vGqbwqrsIANTjWPbJtqOwqnwDUDs5r3T
+iFfcsM0J3oVq8pvlzzUoGYPv9XVjWX8tzmz9vdeLmSix6kEq3M3QBZZ6aWRmVhKY
+55yMCy2WB8LTJTJ9cRCzsljOuiislWQrkhXyoVneGf+tyorSaTKZAgvWR6IMmito
+sxhihCGZARrrSsW8k3Sol9IhHiNZVDmA+gKhfwehfEsb8q0ZNdcjOVDxoOnT9w25
+yjsk5ftE4zXbZsO8L8EaghYAggJtnxgtHLeDE0BCOsemMkHzM4/irbwAXQcVVaoK
+6ftzqoG8QexbUxh46KsC
+=Wt9d
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch
new file mode 100644
index 000000000000..2ebdc9880d1e
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/test/git_test.py b/test/git_test.py
+index 9f812b2..ff7da24 100644
+--- a/test/git_test.py
++++ b/test/git_test.py
+@@ -53,17 +53,6 @@ class GitCommandTest(unittest.TestCase):
+         version = self.git.version()[STDOUT]
+         self.failUnless(version.startswith('git version'))
+ 
+-    def test_tag(self):
+-        """Test running 'git tag'"""
+-        tags = self.git.tag()[STDOUT].splitlines()
+-        self.failUnless( 'v1.0.0' in tags )
+-
+-    def test_show(self):
+-        """Test running 'git show'"""
+-        sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
+-        contents = self.git.show(sha)[STDOUT].splitlines()
+-        self.failUnless(contents[0] == '/build')
+-
+     def test_stdout(self):
+         """Test overflowing the stdout buffer"""
+         # Write to stdout only
diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch
new file mode 100644
index 000000000000..96271d05548c
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/test/helper.py b/test/helper.py
+index 006a5b1..64d0dfc 100644
+--- a/test/helper.py
++++ b/test/helper.py
+@@ -87,6 +87,8 @@ class GitRepositoryTestCase(TmpPathTestCase):
+ 
+     def initialize_repo(self):
+         self.git('init')
++        self.git('config', '--local', 'user.name', 'Your Name')
++        self.git('config', '--local', 'user.email', 'you@example.com')
+         self.touch('A', 'B')
+         self.git('add', 'A', 'B')
+ 
diff --git a/dev-vcs/git-cola/git-cola-2.2.1.ebuild b/dev-vcs/git-cola/git-cola-2.2.1.ebuild
new file mode 100644
index 000000000000..f1b7c316bfcc
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.2.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 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.2.1.ebuild,v 1.1 2015/07/29 07:45:09 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo virtualx
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+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/pyinotify[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-disable-live-tests.patch
+	"${FILESDIR}"/${P}-update-git-config-in-tests.patch
+)
+
+python_prepare_all() {
+	rm share/git-cola/bin/*askpass* || die
+
+	# remove broken tests
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+	VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub" \
+	virtualmake
+}
+
+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"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}