3 files changed, 22 insertions, 130 deletions
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index c1517daf9193..f9eefd4e85bf 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,9 @@
 # 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.47 2015/05/27 11:10:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.48 2015/05/27 16:44:01 jlec Exp $
+
+  27 May 2015; Justin Lecher <jlec@gentoo.org> -git-cola-2.0.7.ebuild:
+  Drop old; obsoletes bug #526088
 
   27 May 2015; Agostino Sarubbo <ago@gentoo.org> git-cola-2.1.2.ebuild:
   Stable for x86, wrt bug #549628
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index d44c141760c6..97e83b508e4d 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
@@ -8,26 +8,26 @@ AUX README.gentoo 227 SHA256 c95560b961a37e9c7b731599c9eb85fff9f9a45262747a498ae
 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 index.html 355 SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac WHIRLPOOL fd3d058f2d57dd9664bc498d6b8bfa749d219d44bef7cbf64624abe16e019062108f52f8cc18ebf580e70d2eb20cdb89f760d380a83b932712a689e921201f7f
-DIST git-cola-2.0.7.tar.gz 679608 SHA256 bf87f6dacb2e524a4bbae8d8f33ac1be3e0b6cc4c41ac1c3819eacfd784c2d2a SHA512 0f26207145c337c3298962fff32695b753b4b5096bd028085e804e7e70589d0e68feeb3cb96403aa3b15dab401ef89d336115d68e7c40bb3d99cee2727a443b7 WHIRLPOOL 75042b712282a689a3f46fb7dc65696001f5c193da01ee65df7e5a525702f3bdee5c5e28f58ee3deafdb8b3d4a4e03a5e55ba74a34d3b18a66fa85ecb69c600f
 DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756
-EBUILD git-cola-2.0.7.ebuild 2513 SHA256 1d9a923d7b7fd1bf63dde4ff44b9835921ef22b903399b51578b6fc450b76b87 SHA512 06b57be7e0aadb72dd7d1353afafde713d213849b89f4b0240ad5b7cbf87631696cd8ca0d56949e80aa0465407cfe7074988b540deeb60506782bd3e5963badd WHIRLPOOL 9d87f84e3eaf6ccc69edc6ea48a337fa2c46fdc7e15c8c00a3973dbb667802b43879e65ffa864b175c8eb1b64db074a93dd83c35b125bb814eade87b91e409cf
 EBUILD git-cola-2.1.2.ebuild 2509 SHA256 c32b98d98b6935f82f4907da7ad41b91d6fb832d241c17e31782f90b0b38c50a SHA512 1f8fb9aa7ae0b1a7d3a4c57786842fd4d4af1a994ee950c451ce0fafd137a3b3ead39ed791cb1ea93c783c6bb09845ce6d6b3262084b10d9747734ea85281e56 WHIRLPOOL 241ae40c1e7ffa737aa13f041e47a00f3286f23b172769d6ae1ea279161f2a7d50b85c65e2c528caaf2d9666e00b568702cca3d46dbec6f1e11c5a690a0280e3
-MISC ChangeLog 10068 SHA256 8bc555c30d67eb1ae23a9b914ec198fdeac61c70485b520a0c83192f68b6445c SHA512 4a6ab15c2c39c3601ceea7dfd8475bcfde908ab318a79c927399ef08560896e1450b970a054015111606acc5f158e72660f9fc539fa84bc41904ac56de88e1b0 WHIRLPOOL 678c1ea581392aca78e73a99c1cb01b0f0fefa8ca0bbe4ccd62ffbbc705a96140536185bcf21dcaafaf2444d502335b2d520736d4e2bf9ab0ee55958b6722ca7
+MISC ChangeLog 10175 SHA256 0eca85623051bfc18daa168eadf7279348eb25c8668e5e7982ebefec43860561 SHA512 502afe8da159fe6ad9ff94f338fcb964d4e1c42b5375404374361168fd1af8b9d02d54394f22327c7da2479b1762ef535321368074fbd0ab62c06d9cef322432 WHIRLPOOL 478cbea86f5627ee68e8d557de064eb495d02a9787d90afc7102eef6db00adfed828b8964c6452da2b7b1fd60a8302ec934777500a9bd1a00b016ec526faae18
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVZaYpAAoJELp701BxlEWfeacP/jQ7+wflAVGzx4X0w2bCMwfQ
-snA9CN14k+ZmgzwIBl26JTl1pXdOEbZKwuwsNqA9TMiNIcBVPAmRmBnmjEUCTM/e
-QmrFIDuCrvVP8GavNE/IctaysgCVVCUc4pI9ox+igbB7lF/eVFPf9drf91TmyEyf
-l2jTZHOEL/99BoDgdu6cdeFmomeqnXeNjUxSlWvWvDS7Nfd6oDLQmUAHuzJfZth0
-y1D3NefbEHefuIuY8QBvndijX+ojWlvNMWAjXVnEGKZm0stTsIH9ggV/Xeexmj7a
-NTLDE3VRWdybH/zjcYiUKL5ZBc584xkWaGMg83JtKhyoF9Io7FmHV9mv0vFhqfdT
-/cGqx8ZuwhJ06s0c2WR3rE/BbPuECbr98G37Fp6aK4z0NYnvzOVhy+QVdukFaZ+k
-IsKmD+CC9m2rA7Z53+AHL/YNeNPKnnfjAj9mq9KD/KGX4XCgQ88hhHzmEyGwcH4C
-QWpnexUnNQ5adev+jpOLKTSdfldbwWUoMRIBZA5awdE46bwzCa6x4HITc3vTBsdI
-Tc+ZWd05MPdikh9ZeGV32rvN5agFJUh1YQzhRPfKsPmxCaaAA49fXCnrCuoNazuK
-yVckiOqSKVEtu1u21OOfWrcbb9/wG5WuK8HFNgp9BjdaBBHp5dtysyooKvgufIUD
-UZIg6Jmk3gyCLtueVaUT
-=deXA
+iQJ8BAEBCgBmBQJVZfRSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivQYP/2pUlvCjmtL5hPrjhKiuAUyF
+Ko+ocsxRIjAkYTNNN2nmRCd7qlPH5F4sPab7Qp7BqGkjbChWTMxcAiN6pf7ipa59
++cl6dBdo9osYR51J+LPI6OxGNuz6pN2WZSYj1C86PlP5hmgkb319/9pHQIJc1M0J
+pgs5FuEEdN1sE8AjQkxfPz6JjDlwAJ0Ugp2w0INYqefiz4DuyqowO7e73c2HaxPB
+NDyy+3t+AsbowDrizpmoNsZcEh4mth/C3kxjcEAaiFlU1ATPkIgmMQU8aLWCLkvu
+YjEE7c4YS0BG1BuRHsOcTaDy9LIxNbVPDgN8Gi5Sq8ASmofCNMajPWzsknkaDS87
+9EmiGNA0bz5whN20J+ovCxCObA5cagXr4HAELqQO8FL5jaTn2dRTwiKMo5Hpg0AI
+KvhPDx9wD61QYNedLiA+Y1mDXoEdPFdX/UJjR8ETjZaEqNSolQRp3k3S0Ea9LCZl
+nwFDR5P1BTxSzgV1UGYdK/vYNrohhCn9QkrQN15+Xh/rjhx/idGQv2d2doQQCUHS
+3cGzv9DeaElZc/Vg6Puxds/BFmFK2NQkPBHK4kqBh2RZn6NAB1gk+tgkzvwZmkeh
+S6ZGKBo3boG3vzVh+eZvhAA6dOQu+X+1RaEnZxv5ManNtHns/hwT478toXFGcsXC
+XmSYEmOLbSqmOSk3/Qm8
+=nrqm
 -----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
deleted file mode 100644
index f18b21e9bc4c..000000000000
--- a/dev-vcs/git-cola/git-cola-2.0.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.0.7.ebuild,v 1.5 2015/05/15 18:48:43 zlogene 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
-}