dev-vcs/git-cola: Drop old

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

9 files changed, 11 insertions, 639 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index c935570c9afe..ac828024db11 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.10 2013/06/04 13:56:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.11 2013/06/04 13:57:49 jlec Exp $
+
+  04 Jun 2013; Justin Lecher <jlec@gentoo.org> -git-cola-1.4.3.4.ebuild,
+  -git-cola-1.4.3.5.ebuild, -git-cola-1.7.7.ebuild, -git-cola-1.7.7-r1.ebuild,
+  -git-cola-1.8.0.ebuild, -git-cola-1.8.1.ebuild,
+  -files/1.7.7-system-ssh-askpass.patch:
+  Drop old
 
   04 Jun 2013; Justin Lecher <jlec@gentoo.org> git-cola-1.8.2.ebuild:
   Fix installation of html docs, #472048
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index e74efb9cb317..2ad858d17756 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -2,28 +2,16 @@
 Hash: SHA512
 
 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 1.8.1-system-ssh-askpass.patch 1152 SHA256 b686e77bc3ddd67747d6bd8738d8b787a4677db4e15491a2d5698da1cb74f9b9 SHA512 9c71224090df518d9643405a7dafc4dbe730385c0d104472394a620e270cf51669403cd47a6ee1bab27627b63b467654c6200f058971e5059dd4c2b5a3ca2cdc WHIRLPOOL 8c83c9ecab7a646c57c538f1e36531eb7c87b901758b0340869dd5b8ef1dc46f0be40690ef2f6ae07f069eb74cd4de2455585367b3581b032c87c4bbb8695858
 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
-DIST git-cola-1.8.1.tar.gz 349477 SHA256 397d2c16f07e799849ce62665ea18a0c4ec99acc92fdd187527b9b4397f9aeca SHA512 1919a60780c758cefbc09d24292cb1dbefbbe6d629962080d87462627872fe4f21c310c2cd8530b0c16428a76596e1ac6c3f9ccf760446b748a1a94bafa3d6a5 WHIRLPOOL d4a0f022d5fce8fffa93c491e767eed54f9fd5505aaa79d984784581be670a7dbeeef22ba10591367306240b4ad4d1395bbedd138c036c99e8d99eba812d2f64
 DIST git-cola-1.8.2.tar.gz 397346 SHA256 386b29cd70b3c6a14b23790567d2e93168e1eeaaec5d85be37e4f5ce4fd9a977 SHA512 5136749a12d262dd28db4058efd3892a437e5dea18d4fe888248fd7a3891409091e7d36565536fa7d4538354a01f11f8a02e0fd31c2c86ea7159f4e6004b75cc WHIRLPOOL 861af22ba39d6e5a3899fe569c6cfa3651daab6d4d57a4daf07acad133cd2cc1a375da403a94deb943d3a5ddee4e364d5a50b3f7996dbb3310495b57c67a7369
-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
-EBUILD git-cola-1.8.0.ebuild 2146 SHA256 5a6a948845f349ff7334e3955cca8ade2ec32993192640de42c7af14091ac275 SHA512 14c9bc554e1ca996cac9334679cf768bdcc000d33aebce91085b5cec9ba0ac844a92d0dc112e0a5764ad1bee0fe16db30e2821f4f5cbdc185ed260948f6929fd WHIRLPOOL e2c918ff29ccdd48ab788f4c868b7f9438855b4125a59a5f09cd3f061ba1280eb9a2962e4d033a7b4e75d79ae304c2968baa05c4f962ff5c30b094e0f20dd4d5
-EBUILD git-cola-1.8.1.ebuild 2146 SHA256 fba30657d45aa36582dbe2208de7e0bcd34b07b51d356cff39531b0ac00c6507 SHA512 5b64a44a2b58af07a3bba6b2ef96196b45bb49e94d6b995ba8e5e841ad330436ae83f2e2f4c34612ae3660ef026625c0a413917188568b45d319c475db271c6f WHIRLPOOL 6862542507af53aa160eba632a07faeca389f1754892e8e3e2cc362e585e92c6a18a0b193d798bc2d6824c32265fa73720ea35b2063a7055a423b81b28494001
 EBUILD git-cola-1.8.2.ebuild 2201 SHA256 f7436a6e65897ab52797aec5d5fb7ef61ca9a874ded54ee096cf5949cfe10722 SHA512 dee96cea9c6515ddd3f3c78c4783f553982113cb60cb46c0b7227a1ace28978b7ba018298b1db9be4fd3c3465f7306aed7d0946696e54e7513547d7b1344d9dc WHIRLPOOL c509ef1e38a05e089bb38e4e6f7dc0fa7f30c6fd95291ddb614c98878d2be50fc9c7e45c2221b0e3f0732a28df7b06b122f9e91814708826e59e53826311a1b4
-MISC ChangeLog 5090 SHA256 9eb4d95782aafcd03632b25c498e0dc181eecfe231dd25770e87e06fce9f3097 SHA512 858baa46e57399d8676e18d68247bb19f4e8982c6258b9d3a20514b5611ef721c700e9c984fb64ac7b178c769be1992811875da6feff2f30ec67d274fc8aa3a8 WHIRLPOOL 9c2fb918654bd9d0dfc097e552a70c08e4b731ea18fd270571fc688d531dddd8d4a5dc6f7b8e6d26cb08c96add23d8b1981b83f35a24c314f091a86682d9bff1
+MISC ChangeLog 5345 SHA256 2d39933cdf1e154c8eefdfd964f830e714aafd045edbba5c11c93afc9fd86810 SHA512 fa1fa021f4ad239655dffdb51e75354cb5391c80f9c1ed903ab6d2426571fc13b3adfa554c5883531c57fd0ff52c7296f798ec79ea23d798732dada7c4f09582 WHIRLPOOL a8bba8683d8fa77f30baca65cf18665bb4451e353c066831483bb47bcf0456f5c233f9b2608ca773accc7a6681b05cc64df8cd5e83478849c827e9fe2b60bbb9
 MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGt8hUACgkQgAnW8HDreRaqOACfeHzZSjwdmHnhgeqxNitNsB5Q
-tJ4An2Tvfn7oQvxGK2gNmqDKusoAkzoX
-=x+D0
+iEYEAREKAAYFAlGt8l4ACgkQgAnW8HDreRax1ACgzgrQ1h7A9BkbreNzRAAhIb8w
++NQAnArHGpHye3ueo3EB15A3rY5iicAN
+=5iQh
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/files/1.7.7-system-ssh-askpass.patch b/dev-vcs/git-cola/files/1.7.7-system-ssh-askpass.patch
deleted file mode 100644
index 665070d7acd1..000000000000
--- a/dev-vcs/git-cola/files/1.7.7-system-ssh-askpass.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/cola/app.py b/cola/app.py
-index a689fdb..9618c3e 100644
---- a/cola/app.py
-+++ b/cola/app.py
-@@ -52,10 +52,10 @@ def setup_environment():
-     # Provide an SSH_ASKPASS fallback
-     if sys.platform == 'darwin':
-         os.environ.setdefault('SSH_ASKPASS',
--                              resources.share('bin', 'ssh-askpass-darwin'))
-+                              resources.prefix('bin', 'ssh-askpass-darwin'))
-     else:
-         os.environ.setdefault('SSH_ASKPASS',
--                              resources.share('bin', 'ssh-askpass'))
-+                              resources.prefix('bin', 'x11-ssh-askpass'))
- 
-     # Setup the path so that git finds us when we run 'git cola'
-     path_entries = os.environ.get('PATH').split(os.pathsep)
-diff --git a/setup.py b/setup.py
-index d639eda..90d5fd0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -101,10 +101,6 @@ def cola_data_files():
-     data.extend([_app_path(localedir, 'git-cola.mo')
-                  for localedir in glob('share/locale/*/LC_MESSAGES')])
- 
--    if sys.platform == 'darwin':
--        data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
--    else:
--        data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
-     return data
- 
- 
diff --git a/dev-vcs/git-cola/git-cola-1.4.3.4.ebuild b/dev-vcs/git-cola/git-cola-1.4.3.4.ebuild
deleted file mode 100644
index 17d2631d0146..000000000000
--- a/dev-vcs/git-cola/git-cola-1.4.3.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.4.3.4.ebuild,v 1.1 2012/05/11 08:29:04 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-MY_PN="cola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features"
-HOMEPAGE="http://cola.tuxfamily.org/"
-SRC_URI="http://cola.tuxfamily.org/releases/${MY_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"
-
-	# don't prefix install path with homedir
-	rm setup.cfg
-
-	epatch "${FILESDIR}"/1.3.8-disable-tests.patch
-
-	python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		cd share/doc/git-cola/
-		emake all || die "building docs failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	# remove bundled libraries
-	rm -rf "${ED}"/usr/share/git-cola/lib/{jsonpickle,simplejson}
-
-	# remove wrong translation file
-	rm -rf "${ED}/usr/share/locale/"
-
-	insinto /usr/share/locale
-	doins -r share/locale/*
-
-	cd share/doc/git-cola/
-	dodoc *.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
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/git-cola/lib/cola
-}
diff --git a/dev-vcs/git-cola/git-cola-1.4.3.5.ebuild b/dev-vcs/git-cola/git-cola-1.4.3.5.ebuild
deleted file mode 100644
index faafa0a8f7b2..000000000000
--- a/dev-vcs/git-cola/git-cola-1.4.3.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.4.3.5.ebuild,v 1.1 2012/05/11 08:29:04 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-MY_PN="cola"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features"
-HOMEPAGE="http://cola.tuxfamily.org/"
-SRC_URI="http://cola.tuxfamily.org/releases/${MY_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"
-
-	# don't prefix install path with homedir
-	rm setup.cfg
-
-	epatch "${FILESDIR}"/1.3.8-disable-tests.patch
-
-	python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		cd share/doc/git-cola/
-		emake all || die "building docs failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	# remove bundled libraries
-	rm -rf "${ED}"/usr/share/git-cola/lib/{jsonpickle,simplejson}
-
-	# remove wrong translation file
-	rm -rf "${ED}/usr/share/locale/"
-
-	insinto /usr/share/locale
-	doins -r share/locale/*
-
-	cd share/doc/git-cola/
-	dodoc *.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
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/git-cola/lib/cola
-}
diff --git a/dev-vcs/git-cola/git-cola-1.7.7-r1.ebuild b/dev-vcs/git-cola/git-cola-1.7.7-r1.ebuild
deleted file mode 100644
index 54a4751f773e..000000000000
--- a/dev-vcs/git-cola/git-cola-1.7.7-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.7.7-r1.ebuild,v 1.1 2012/05/24 21:19:51 dev-zero 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
-}
diff --git a/dev-vcs/git-cola/git-cola-1.7.7.ebuild b/dev-vcs/git-cola/git-cola-1.7.7.ebuild
deleted file mode 100644
index 8013604b220a..000000000000
--- a/dev-vcs/git-cola/git-cola-1.7.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.7.7.ebuild,v 1.1 2012/05/11 09:42:03 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
-
-	python_convert_shebangs 2 bin/git-cola bin/git-dag share/git-cola/bin/ssh-askpass
-}
-
-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
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/git-cola/lib/cola
-}
diff --git a/dev-vcs/git-cola/git-cola-1.8.0.ebuild b/dev-vcs/git-cola/git-cola-1.8.0.ebuild
deleted file mode 100644
index 1f7bfaae07dc..000000000000
--- a/dev-vcs/git-cola/git-cola-1.8.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.2 2012/11/12 19:13:11 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 share/doc/git-cola/_build/html/*
-		doman share/doc/git-cola/*.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
-}
diff --git a/dev-vcs/git-cola/git-cola-1.8.1.ebuild b/dev-vcs/git-cola/git-cola-1.8.1.ebuild
deleted file mode 100644
index 5e92c709fae0..000000000000
--- a/dev-vcs/git-cola/git-cola-1.8.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.1.ebuild,v 1.1 2012/12/10 07:41:36 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.8.1-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 share/doc/git-cola/_build/html/*
-		doman share/doc/git-cola/*.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
-}