Version Bump

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

3 files changed, 137 insertions, 7 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 2919882765de..f3bb55defac6 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.42 2015/04/26 16:25:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.43 2015/05/05 13:30:26 jlec Exp $
+
+*git-cola-2.1.2 (05 May 2015)
+
+  05 May 2015; Justin Lecher <jlec@gentoo.org> +git-cola-2.1.2.ebuild:
+  Version Bump
 
   26 Apr 2015; Pacho Ramos <pacho@gentoo.org> git-cola-2.0.7.ebuild:
   x86 stable wrt bug #518306
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index f279214c31c6..f07af9fc6be3 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.3.8-disable-tests.patch 855 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465 SHA512 dca674aeaa4a69fe0fe5cbdc119e796ab346365748a72c09c505bd27f0d1be6355da47a4a3e5ff70d5bbba6d9a28a8ec4b0437e562e0ad6b741c0890d74526bb WHIRLPOOL 92b42085e4a17cf50dd5368c4d96a1858edaf325576208a58f4482c0926a36025baaafb87ec70acebde069ceee9e05840c042e46974e6e2895ce1dc93d5a0b98
 AUX 1.8.1-system-ssh-askpass.patch 1152 SHA256 b686e77bc3ddd67747d6bd8738d8b787a4677db4e15491a2d5698da1cb74f9b9 SHA512 9c71224090df518d9643405a7dafc4dbe730385c0d104472394a620e270cf51669403cd47a6ee1bab27627b63b467654c6200f058971e5059dd4c2b5a3ca2cdc WHIRLPOOL 8c83c9ecab7a646c57c538f1e36531eb7c87b901758b0340869dd5b8ef1dc46f0be40690ef2f6ae07f069eb74cd4de2455585367b3581b032c87c4bbb8695858
@@ -13,17 +13,31 @@ DIST git-cola-1.9.4.tar.gz 434458 SHA256 c7f065bf5557ceba424ee26e5af94d01b37537e
 DIST git-cola-2.0.7.tar.gz 679608 SHA256 bf87f6dacb2e524a4bbae8d8f33ac1be3e0b6cc4c41ac1c3819eacfd784c2d2a SHA512 0f26207145c337c3298962fff32695b753b4b5096bd028085e804e7e70589d0e68feeb3cb96403aa3b15dab401ef89d336115d68e7c40bb3d99cee2727a443b7 WHIRLPOOL 75042b712282a689a3f46fb7dc65696001f5c193da01ee65df7e5a525702f3bdee5c5e28f58ee3deafdb8b3d4a4e03a5e55ba74a34d3b18a66fa85ecb69c600f
 DIST git-cola-2.1.0.tar.gz 682387 SHA256 1a443b270d5a710c60d00b51ccdef7e324a587e0e5e2b5ac9856a1a3d1ec878b SHA512 c8b5279c2ef6e7f147152cdfd746515f01501dc962dec6f8f98762b6eacda9c299551bf35a7ac31510f2f68b711a598a2db2ec5d2e865a7db7ef1f4c518e9fd3 WHIRLPOOL 01ae936b093a052735fe119ea5d26d174948f30c9b00ecfbf88425da226e5d5d22ffac855eea84503480d1c8a7d06a021d55884ab09e92698ecc4cf3fc5fa00a
 DIST git-cola-2.1.1.tar.gz 953528 SHA256 41ce9fcbdd408afd626202b64d714ba10eb6fabbccdd32d5317d620fb72df13a SHA512 de1e8acc8f407dd33b69937ae17a862ba4b1bbb41844c731d60a047e45dbe4c2693a0e6a0a5a9be226a01a84b3c2c5b4825aeaba9baab8e6c35b7d4e0112bad9 WHIRLPOOL bdee8f56f899133a22a7afab01dbef88ea8273194f0dd405f894fe56e5e8a0d2577375e1baeaa03d9d49394fe0e11607a869cc542e66f0721e37fde079b2467d
+DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756
 EBUILD git-cola-1.8.2.ebuild 2195 SHA256 91efd0a64e75ca3f6f1fd8ae4e18a0df008dc0bb09fec7ff322cb1d2ea48e992 SHA512 14ece10cf8f28755a577a354f19c4ffc369bcfa7af5a577f9c8aa6c07b47a432cd8c73df0c72a5ca0166059018ae0228fe0f6c50d60d80a67a8abc95b62ef299 WHIRLPOOL 2b8d43efe43561df0f596a856763b59b261fcd67ec80e8f1d2f5e6e5eaaf12c7f854244c441f49f92229be211b3644ce644a5525f501f7a7b6babd55dccbaf54
 EBUILD git-cola-1.9.4.ebuild 2416 SHA256 7baa1cf2a1b86ad1442a7723aee804a0049c6f8b9bf4c3363130fd1f09012afd SHA512 bcd65d47bfe26dbf498ad7e17b15e0be72b561bf01df194fe19d61e9350b657639d5d52ac7faa14e76852d1669ab469753be04e5be3457c66d4ca93d42f10eb1 WHIRLPOOL 40653869f8758105322d1d4791ee88b9d921553da03158ff4db177946f96aae2a1921f262a9c3b9e467a3e3330c7e164f2a653f0cc074c0a08cda1560d5c348b
 EBUILD git-cola-2.0.7.ebuild 2512 SHA256 18ba1a285e0e0a27ca8cca89ffea64fec9c9c71cd57255ea98a72f57e40a892d SHA512 4b1e3e622061d699edeac959ab5df0be6eca34eb2bf3ae81a6de1b6bbb4659791494366e0506123a271b7d7837d800c27e22155b9a6dc9185e255de09574a5cd WHIRLPOOL 8ae40c78e59ed957b20a87b89920dfc7690afde783f1d581e853da0e7d6252ec1fa831329cd4fcd0e9022c1037604e904541369358d4c65105293bf20ba41eab
 EBUILD git-cola-2.1.0.ebuild 2512 SHA256 94b91aa3c4a05b55a80c1677b4d0abdd687f5b63f868225762364101f0aeec8a SHA512 30ce23cb624e8a50414ab182ead3cc029fb57916dd22d30c0212b4f6cbbc7e7bd6ac88536da77afff88532e7244abaf9a37b39e2ad3a70071972752021d48ba1 WHIRLPOOL 254ebb0eb08fe0dae2c1d2072bcf4a135a32605dd2f5c884312b79437c63bd7c01f70e8c707b81413a55241c78b161d5afb3f011c774909e4c6debb73d2ac207
 EBUILD git-cola-2.1.1.ebuild 2512 SHA256 d124c531bcbce6a72d56f7db54376b2d3158c1fd8bf44c6bba9c117589f1009a SHA512 0f63c76c0d5ac4ff4ee08bca67f09005f731f7696077ccf80580d2886c800dac17d0995f191eb892fad6b00a2db1a887f381cc63ec46f438ccf238af4ec0d6f9 WHIRLPOOL 2fb404cafe1577cabfb71429bead357d65804b64cd3a82ca1b30564106d318a795e39b63c35a85f79ddf98e6e0a073b5833a0edd568687d0914a7856a5c71411
-MISC ChangeLog 9451 SHA256 4f91a17a82b7477389f415b99d9a7a0ce11e97e8d3478fbe84b0de6ecfd78376 SHA512 d32a3a519a4e2a22bcdc1359291f3914cd04f9e44d5bb6e658a72bd657a664449722a0d627e8b9e9c56ae09b4b652abdb4120a6d4c5a5dccf3a1a995ae67dc4e WHIRLPOOL fc8fe6af557af9100a47752045129dc5b534c25e4ea0ee91163679dc4b01773d2646feb03dac4cbeede3b4f2601bee396db8f77e083dadfdd351aef87632e780
+EBUILD git-cola-2.1.2.ebuild 2512 SHA256 f46b8a061a5cf79058c7b6d3529eaa33505346693382a6ce424a0d4de2f7600d SHA512 cbcdc9bdbeb1fad048807cf0ad1c04bab71f1415c2c053592050cf0b025cd9395636cf557ad998961b603d453ec760a2e5d762dc00a9b8b419af1572686c886f WHIRLPOOL 0c5e8652a5c00d5f812dec5e59edd1228107071889c69b9188b6ff6cb765977a8db622c077f405f21356eaeedacea374a16743e8bfe984202a6c35880f0dced4
+MISC ChangeLog 9568 SHA256 91e67c2647c042cafb6aa75ce698ffd9a4b2281b3d5736967e046ab4b282d0bf SHA512 4bcf2f6f300170d3e61759f488120a741a0c59427ee9ba7b0cb5131e23ad6af20405884aba7e810f395b3633bfdbdf19e40cd91c0f0311609db01bb90643c4a2 WHIRLPOOL ba7cf5fd24fabd8da820eb1e062554a444b8a1144b744526c8b91d3137316a1c5705045d04ac64f22a94f9e2c9ff10e39de7cfaa26220dc588cee5641ddde672
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlU9EXMACgkQCaWpQKGI+9RTigCeP0e4WC1oRRGkU3+TjDRIlDJ3
-QC4Ani58CmmTG9YG/FX3t9DbRLroq6xc
-=ZQbi
+iQJ8BAEBCgBmBQJVSMXzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViruhAP/i8M7gWDy+ER6vKvg/xjkEVc
+0Mj3TG0dALdrP2NjDaUxI1p62bDoJ99idHQBDj8xsODc5Lu9mXWLMYu4Krk+7DL0
+tOYZiGO59/xNkDAAXZVD5+2DHNo1iwqKv2WQ3cmPvhnqR1cYWatWbi63ROizQZOy
+SmiE9mkZaoyMEwftpK9W3SO01ZocAmF3Auz5GFoDqzT+VX7UH8STBLBDI1FOTyFK
+bfRhRTh09W9kWn01VQzDwYMkg2IpU/vFkYiDDWSETojKCHvU8R7Vobtwz4li9P84
+NJO6sVDQZowh46W0grZP5MgONZEv7LQvxJbYL7UwQnvC16sNQuMBjUNqmUNoNe7U
+knZb32tI/uZlaP0tS2CUlE5e4KiSktKGU2KndpL3NPsiHBRoDagdqRDo5KUiS0U/
+oNkXbNlkv7CPuksyAeynsTk22bmTosYWciL8NC5J0rLWWgFHg7FA4iaLT06kS3lH
+sc8w4B+wKtqo6GLBnfkapE+Iltjc9zdXaOihpzCv8E29c/vx9C/yAXhlaDigxfr2
+FCfMeO9K4WqmyngsfB/0HJvoB4b0ee0FOp6OyplaXVteGy84LtTkDVdkMDXxR19a
+a5TNB6c2/Du9OeLeEtHR1I9EBkb/GdKPHnjY3olv19T5Pn5VEOhAaB2JVUVFxzks
+R/jOdCibQePAX6VBlpbT
+=2CD1
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/git-cola-2.1.2.ebuild b/dev-vcs/git-cola/git-cola-2.1.2.ebuild
new file mode 100644
index 000000000000..d234d90e1b21
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.1.2.ebuild
@@ -0,0 +1,111 @@
+# 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.1.2.ebuild,v 1.1 2015/05/05 13:30:26 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="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"
+
+REQUIRED_USE="doc? ( python_targets_python2_7 )"
+
+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}]
+		dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
+		)
+	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
+}
+
+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"
+
+	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
+}