gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 242 deletions

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 9592f15d2e2f..5f0ecfe55d12 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,10 +1,5 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
-AUX git-cola-2.10-disable-live-tests.patch 827 BLAKE2B f7778c373b4e7b2c09daeeeab5c15c09870a70f8d490d2bd16d2e1b62f0c96c4bec6517cc99fa8d0a65daeb1551993d4e367f39f60099afdf31597847762ee39 SHA512 86f7410ce711db2dc19d4348047285dbd1a3c078512d13b589ef898dfd870a4f459371319965c697d8654dd4550a358e67e5d6b74c0317820422c3e98b7084a9
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
-DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
-DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
-EBUILD git-cola-2.11-r1.ebuild 2467 BLAKE2B 41c2c8d7b46bb38fd9c0e29aef1a78f2cc9fe572a66661cb8596cc1793516e03afa9033c3c1e82b1c7d894bf26d99ba422b46b07b0588fe0661a3240bd41aef5 SHA512 3186c8fcced9d3264bcd7ae6f1c1d91c024716aafce4533755d223249f4eb3083a43241e3b377fc748353b9802c5e52296b8c205d4372618bb09c4d9d63eac94
-EBUILD git-cola-3.2.ebuild 2365 BLAKE2B 68c608fbfcadd3e5b86eb5ecefbfc472acef065473d02311e72c1796463c853ae0ef99b94b9ce9419f21e8c62a640897bbd94744ae634acd5f0e140703743ee4 SHA512 de423a52b9db9e4eef1729fc1ffcac9ced5c7c9bdcfadc92380f5af83d5e204ffcef6c32c5fa42a8ffe7fe626cf73942bb0e99d7e2f30eac64c346d056883d09
-EBUILD git-cola-3.5-r1.ebuild 2457 BLAKE2B b4a74fe9749529edba8b0309b6e0368193c3b67b4ce0d3117aca4da1a32c60b8646cd7c77e79e13091a85ebea12092b23e8858f585ce1f090532ae9edf5f602b SHA512 6a7ed3a27d87ca61c4e362eb3b5c017e39233c300d1b04d309f2cf0aa26a7305547abe5ebce6a24349840a19699dbf42646b0e41d50f143b50ea02130f1202c4
+EBUILD git-cola-3.5-r1.ebuild 2455 BLAKE2B 9ac9c777e9d95380f63b15b45797da4034546b39d3f4eb0134225a6b2f7fc9d816919c4cc1990358a10cc186300d82baae5a3e204c207c71a737def42ac61059 SHA512 ddaf4bfcfcf0d91bb4449234f54c43c4c13bb5d97760a62b045e37d074e5a3732aba6376efc422e1b743e894afae20ab46574069c6ec50705bf779bf41c9aa48
 MISC metadata.xml 254 BLAKE2B 0ae656bc7a829c95367497cfe1198346a0586bc944809725fc83ff0b92d33ddadb0a82407300d1467cb4ea75073d2ab0a89b8d67d8efcff400a444b06330c77c SHA512 8a5fe25f733f77a4e70a64521dfffbeeb8539dc709f55dd9a941cc920f7a7e6a8918cb5f07d7b57ee5ad63abdaf31067a217afd081164e68562239b584416109
diff --git a/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
deleted file mode 100644
index 1f58ea0eddb6..000000000000
--- a/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/test/git_test.py b/test/git_test.py
-index 9f812b2..ff7da24 100644
---- a/test/git_test.py
-+++ b/test/git_test.py
-@@ -53,19 +53,6 @@ class GitCommandTest(unittest.TestCase):
-         version = self.git.version()[STDOUT]
-         self.failUnless(version.startswith('git version'))
- 
--    def test_tag(self):
--        """Test running 'git tag'"""
--        tags = self.git.tag()[STDOUT].splitlines()
--        if os.getenv('GIT_COLA_NO_HISTORY', False):
--            return
--        self.failUnless('v1.0.0' in tags)
--
--    def test_show(self):
--        """Test running 'git show'"""
--        oid = 'HEAD'
--        content = self.git.show(oid)[STDOUT]
--        self.failUnless(content.startswith('commit '))
--
-     def test_stdout(self):
-         """Test overflowing the stdout buffer"""
-         # Write to stdout only
diff --git a/dev-vcs/git-cola/git-cola-2.11-r1.ebuild b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
deleted file mode 100644
index f0df3414753e..000000000000
--- a/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo-r1 virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-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"
-RESTRICT="!test? ( test )"
-
-# Since PyQt5 is preferred at runtime if installed, depend on that
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[gui,network,widgets,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? (
-			dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
-			)
-		test? ( dev-python/nose[\${PYTHON_MULTI_USEDEP}] ${VIRTUALX_DEPEND} )
-	")
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10-disable-live-tests.patch
-)
-
-python_prepare_all() {
-	# Use system QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# remove broken tests
-	rm test/i18n_test.py || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	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" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-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" "${ED}"/usr/bin/git-cola
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
deleted file mode 100644
index 1d8dcb00b087..000000000000
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo-r1 virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
-		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? (
-			dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
-			)
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
-			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
-			)
-	")"
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	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="en_US.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-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" "${ED}"/usr/bin/git-cola
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 9a1bb3679f78..2626644a02d9 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"