dev-vcs/git-cola: Drop old

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

8 files changed, 7 insertions, 623 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/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
-}