move dev-vcs/cola dev-vcs/git-cola

7 files changed, 0 insertions, 375 deletions

diff --git a/dev-vcs/cola/ChangeLog b/dev-vcs/cola/ChangeLog
deleted file mode 100644
index 365a5b7c382f..000000000000
--- a/dev-vcs/cola/ChangeLog
+++ /dev/null
@@ -1,103 +0,0 @@
-# ChangeLog for dev-vcs/cola
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.13 2011/10/18 08:32:46 dev-zero Exp $
-
-*cola-1.4.3.5 (18 Oct 2011)
-
-  18 Oct 2011; Tiziano Müller <dev-zero@gentoo.org>
-  -files/1.4.3.2-backport.patch, -cola-1.4.3.1.ebuild, -cola-1.4.3.2.ebuild,
-  -cola-1.4.3.2-r1.ebuild, -cola-1.4.3.3.ebuild, +cola-1.4.3.5.ebuild:
-  Version bump. Dropped old.
-
-  09 Sep 2011; Justin Lecher <jlec@gentoo.org> cola-1.4.3.4.ebuild:
-  keyworded *-linux, tested by me
-
-*cola-1.4.3.4 (26 May 2011)
-
-  26 May 2011; Justin Lecher <jlec@gentoo.org> +cola-1.4.3.4.ebuild:
-  Version Bump
-
-*cola-1.4.3.3 (23 Apr 2011)
-
-  23 Apr 2011; Justin Lecher <jlec@gentoo.org> cola-1.4.3.1.ebuild,
-  cola-1.4.3.2.ebuild, cola-1.4.3.2-r1.ebuild, +cola-1.4.3.3.ebuild:
-  Version Bump, Reordering the ebuild layout
-
-*cola-1.4.3.2-r1 (16 Apr 2011)
-
-  16 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/1.4.3.2-backport.patch,
-  +cola-1.4.3.2-r1.ebuild, metadata.xml:
-  Added myself as maintainer, included backport patch from HEAD, fixing issues
-  with HOME being git repo and general repo cloning, including unicode support
-
-*cola-1.4.3.2 (13 Apr 2011)
-
-  13 Apr 2011; Justin Lecher <jlec@gentoo.org> +cola-1.4.3.2.ebuild:
-  Non-Maintainer Version Bump
-
-*cola-1.4.3.1 (30 Mar 2011)
-
-  30 Mar 2011; Justin Lecher <jlec@gentoo.org> +cola-1.4.3.1.ebuild:
-  Non maintainer Version Bump
-
-  25 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-  cola-1.4.3.ebuild:
-  Use Python 2 (bug #329473).
-
-*cola-1.4.3 (25 Jan 2011)
-
-  25 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> +cola-1.4.3.ebuild:
-  Version bump (bug #351580). Also solved: the installation of localization
-  files (bug #348130), adaption to python eclass changes (bug #329473).
-
-  09 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> cola-1.4.2.1.ebuild:
-  Version bump.
-
-*cola-1.4.2.1 (08 Jun 2010)
-
-  08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> -cola-1.3.9.14.ebuild,
-  +cola-1.4.2.1.ebuild:
-  Version bump, dropped old.
-
-  08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
-  Moved from dev-util to dev-vcs.
-
-  17 Mar 2010; Sebastian Pipping <sping@gentoo.org> cola-1.3.9.14.ebuild,
-  cola-1.4.1.2.ebuild:
-  Propagate move of dev-util/git to dev-vcs/git
-
-*cola-1.4.1.2 (18 Jan 2010)
-
-  18 Jan 2010; Tiziano Müller <dev-zero@gentoo.org> -cola-1.3.8.ebuild,
-  -cola-1.4.0.1.ebuild, -cola-1.4.1.1.ebuild, +cola-1.4.1.2.ebuild:
-  Version bump. Removed old.
-
-*cola-1.4.1.1 (16 Dec 2009)
-
-  16 Dec 2009; Tiziano Müller <dev-zero@gentoo.org> +cola-1.4.1.1.ebuild:
-  Version bump.
-
-*cola-1.4.0.1 (03 Nov 2009)
-
-  03 Nov 2009; Tiziano Müller <dev-zero@gentoo.org> +cola-1.4.0.1.ebuild,
-  +files/index.html:
-  Version bump, fixed doc deps and doc installation ^Cug #291439, thanks to
-  Man Shankar).
-
-*cola-1.3.9.14 (26 Aug 2009)
-
-  26 Aug 2009; Tiziano Müller <dev-zero@gentoo.org> +cola-1.3.9.14.ebuild:
-  Version bump.
-
-  30 Jun 2009; Christian Faulhammer <fauli@gentoo.org> cola-1.3.8.ebuild:
-  keyworded ~arch for x86, bug 275353
-
-  19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> cola-1.3.8.ebuild:
-  Require pyinotify >=0.7.1 (thanks to a.peyser).
-
-*cola-1.3.8 (19 Jun 2009)
-
-  19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org>
-  +files/1.3.8-disable-tests.patch, +cola-1.3.8.ebuild, +metadata.xml:
-  Initial commit, moved over from my overlay (as requested in bug #274621).
-
diff --git a/dev-vcs/cola/Manifest b/dev-vcs/cola/Manifest
deleted file mode 100644
index 37eef3b29afc..000000000000
--- a/dev-vcs/cola/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 1.3.8-disable-tests.patch 855 RMD160 0c356e7f28ad1436a1d7d58af1de6b0071e3636d SHA1 49daeb7442f7a859d9c37b58e525d6c3498760f4 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465
-AUX index.html 355 RMD160 f01c51559321acd610cfa38e6ebdaa80a96be8fa SHA1 f08daa85670af655ad92e41026008cb2c1f2d0ef SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60
-DIST cola-1.4.3.4.tar.gz 517209 RMD160 3e51ded13148b09f3c7a8145ec95ae569c1af4ac SHA1 15866ae4fbe21791d9291c51f302a9a1fd276393 SHA256 36e6a1870378a213a5f36a91ac3d38b612cf578822b72e3d97dadc65c79c935b
-DIST cola-1.4.3.5.tar.gz 518482 RMD160 af6e374ee6e17340951490aef514a11454e44ce3 SHA1 cc1258bce1d958a25283d91335b49964371fc008 SHA256 16651f8d17193cb69ae1dd71e455331817876875f84bb76176505ccd8d1b59ed
-EBUILD cola-1.4.3.4.ebuild 2186 RMD160 197bb39d8f4a92dd8b5b6468d8964bb446ee6461 SHA1 df4ffec06a700ff619b2b1969a7104f74940fdfb SHA256 8c68239cca7336f4940657b69c4f4c2b45b52d9517b9fabff1b57f68b4a2bd44
-EBUILD cola-1.4.3.5.ebuild 2190 RMD160 5f1171307fb0765e3b191d94dec671f58e926177 SHA1 835d7b1aea5a3a57a36a5421a7516af1de15894a SHA256 204ee4e90c7b878a58b0910bb6765d297d53d174b3bff0f084811534ad1a9964
-MISC ChangeLog 3452 RMD160 f9aa29ec421eb627b76e31ff0b4ea692b465dccc SHA1 1383160c6e1b4c56a81f92a262aad14dfa2b4703 SHA256 77ef2a7abe78c8b249da39daf06d2a36dbaaab132646bf990aa8383fe4e5eee5
-MISC metadata.xml 327 RMD160 bbcc6c45cde41ee3e186fb09024c487df2cf2aa0 SHA1 1aedaad61ffd291249e17d81b95ac2c3577a5b4e SHA256 58d6d26898968598d329ec34fc35da837fb8f6dab1271581091ba2c8b9b6fe21
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk6dOSAACgkQGwVqY66cHjAbrgCeLagXI/D4mHYVfQarHXLPQgXW
-xwUAnjoyO00IXlO1ZSZbEURRPThjCEXi
-=zl0Z
------END PGP SIGNATURE-----
diff --git a/dev-vcs/cola/cola-1.4.3.4.ebuild b/dev-vcs/cola/cola-1.4.3.4.ebuild
deleted file mode 100644
index d0a325640c4f..000000000000
--- a/dev-vcs/cola/cola-1.4.3.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.4.ebuild,v 1.2 2011/09/09 10:57:29 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-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/${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/cola/cola-1.4.3.5.ebuild b/dev-vcs/cola/cola-1.4.3.5.ebuild
deleted file mode 100644
index cd0db88d5f11..000000000000
--- a/dev-vcs/cola/cola-1.4.3.5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.5.ebuild,v 1.1 2011/10/18 08:32:46 dev-zero Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-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/${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/cola/files/1.3.8-disable-tests.patch b/dev-vcs/cola/files/1.3.8-disable-tests.patch
deleted file mode 100644
index 25462c2a37d7..000000000000
--- a/dev-vcs/cola/files/1.3.8-disable-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py
---- cola-1.3.7.21.orig/test/test_cola_git.py	2009-04-30 13:56:22.352319047 +0200
-+++ cola-1.3.7.21/test/test_cola_git.py	2009-04-30 13:56:53.123149963 +0200
-@@ -24,17 +24,6 @@
-         version = self.git.version()
-         self.failUnless(version.startswith('git version'))
- 
--    def test_tag(self):
--        """Test running 'git tag'"""
--        tags = self.git.tag().splitlines()
--        self.failUnless( 'v1.0.0' in tags )
--
--    def test_show(self):
--        """Test running 'git show'"""
--        sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
--        contents = self.git.show(sha).splitlines()
--        self.failUnless(contents[0] == '/build')
--
-     def test_stdout(self):
-         """Test overflowing the stdout buffer"""
-         # Write to stdout only
diff --git a/dev-vcs/cola/files/index.html b/dev-vcs/cola/files/index.html
deleted file mode 100644
index 7f1e814a0b51..000000000000
--- a/dev-vcs/cola/files/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-	<title>Missing documentation</title>
-</head>
-<body>
-<div style="border: 4px double red; padding: 2em; margin: 4em; top: 4em; width: 20em;">
-	This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled.
-
-	<p style="text-align: right;">
-	Sincerely,<br/>
-	your package maintainer.
-	</p>
-</div>
-</body>
-</html>
diff --git a/dev-vcs/cola/metadata.xml b/dev-vcs/cola/metadata.xml
deleted file mode 100644
index 8e67c9e7a8af..000000000000
--- a/dev-vcs/cola/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
-	</maintainer>
-</pkgmetadata>