dev-vcs/git-cola: Version BUmp; drop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 33 insertions, 128 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 3a0ee250c643..a6b12845e4fe 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.36 2014/10/21 06:57:33 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.37 2015/01/16 09:38:51 jlec Exp $
+
+*git-cola-2.1.0 (16 Jan 2015)
+
+  16 Jan 2015; Justin Lecher <jlec@gentoo.org> -git-cola-2.0.5-r1.ebuild,
+  -git-cola-2.0.6.ebuild, git-cola-2.0.7.ebuild, +git-cola-2.1.0.ebuild:
+  Version BUmp; drop old
 
   21 Oct 2014; Justin Lecher <jlec@gentoo.org> files/README.gentoo:
   Fix typo, #526096; thanks Coacher spotting this
diff --git a/dev-vcs/git-cola/git-cola-2.0.5-r1.ebuild b/dev-vcs/git-cola/git-cola-2.0.5-r1.ebuild
deleted file mode 100644
index e65dce1cba0e..000000000000
--- a/dev-vcs/git-cola/git-cola-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 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.5-r1.ebuild,v 1.1 2014/08/10 07:13:51 dev-zero Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-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"
-
-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}] )
-	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
-}
-
-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 "${D}/usr/share/git-cola/bin/git-xbase"
-	python_optimize "${D}/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
-}
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-		--with-id --exclude=jsonpickle --exclude=json" \
-		virtualmake
-}
diff --git a/dev-vcs/git-cola/git-cola-2.0.7.ebuild b/dev-vcs/git-cola/git-cola-2.0.7.ebuild
index b0c2debd7716..42e7b9896830 100644
--- a/dev-vcs/git-cola/git-cola-2.0.7.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1 2014/10/01 12:38:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.0.7.ebuild,v 1.2 2015/01/16 09:38:51 jlec Exp $
 
 EAPI=5
 
@@ -74,6 +74,13 @@ python_compile_all() {
 	fi
 }
 
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
+		--with-id --exclude=jsonpickle --exclude=json" \
+		virtualmake
+}
+
 src_install() {
 	distutils-r1_src_install
 }
@@ -97,10 +104,3 @@ python_install_all() {
 	readme.gentoo_create_doc
 	docompress /usr/share/doc/${PF}/git-cola.txt
 }
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-		--with-id --exclude=jsonpickle --exclude=json" \
-		virtualmake
-}
diff --git a/dev-vcs/git-cola/git-cola-2.0.6.ebuild b/dev-vcs/git-cola/git-cola-2.1.0.ebuild
index e6661d454e4e..d731af066520 100644
--- a/dev-vcs/git-cola/git-cola-2.0.6.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.1.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.6.ebuild,v 1.2 2014/09/16 08:46:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.1.0.ebuild,v 1.1 2015/01/16 09:38:51 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo virtualx
@@ -27,9 +28,13 @@ DEPEND="${RDEPEND}
 	app-text/asciidoc
 	app-text/xmlto
 	sys-devel/gettext
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxtogithub[${PYTHON_USEDEP}]
+		)
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/sphinxtogithub[${PYTHON_USEDEP}]
 		sys-apps/net-tools
 		)"
 
@@ -74,6 +79,13 @@ python_compile_all() {
 	fi
 }
 
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
+		--with-id --exclude=jsonpickle --exclude=json" \
+		virtualmake
+}
+
 src_install() {
 	distutils-r1_src_install
 }
@@ -97,10 +109,3 @@ python_install_all() {
 	readme.gentoo_create_doc
 	docompress /usr/share/doc/${PF}/git-cola.txt
 }
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-		VIRTUALX_COMMAND="nosetests --verbose --with-doctest \
-		--with-id --exclude=jsonpickle --exclude=json" \
-		virtualmake
-}