gentoo resync : 14.12.2020

4 files changed, 135 insertions, 6 deletions

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 5f0ecfe55d12..db8d1aa8503a 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,5 +1,7 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
-EBUILD git-cola-3.5-r1.ebuild 2455 BLAKE2B 9ac9c777e9d95380f63b15b45797da4034546b39d3f4eb0134225a6b2f7fc9d816919c4cc1990358a10cc186300d82baae5a3e204c207c71a737def42ac61059 SHA512 ddaf4bfcfcf0d91bb4449234f54c43c4c13bb5d97760a62b045e37d074e5a3732aba6376efc422e1b743e894afae20ab46574069c6ec50705bf779bf41c9aa48
-MISC metadata.xml 254 BLAKE2B 0ae656bc7a829c95367497cfe1198346a0586bc944809725fc83ff0b92d33ddadb0a82407300d1467cb4ea75073d2ab0a89b8d67d8efcff400a444b06330c77c SHA512 8a5fe25f733f77a4e70a64521dfffbeeb8539dc709f55dd9a941cc920f7a7e6a8918cb5f07d7b57ee5ad63abdaf31067a217afd081164e68562239b584416109
+DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
+EBUILD git-cola-3.5-r1.ebuild 2528 BLAKE2B 6b1054847474f44db0a2c794c5e8abc795677b6bccb30aff2413f774df7d9889a5134fa4502ac5daf02cb34c35c4c177f6a653a4df906aa0987af0d805143d53 SHA512 099c6027561d80beeca7cffc09fc3196d4561ea0953bce82d953cf37cd0a227069dcc147540325f478c1e00da3012818d1c5b2758aa4a209d3314b683292ef98
+EBUILD git-cola-3.8.ebuild 2527 BLAKE2B cdc2bfb801db6cdca9a47fb9d62fa6aa2b6facfa92b6a6eb2dab2866b852ea8d36e1c976e9f1b1106550024d092cca31a6c08ffd3e4e442d887c5e2be508007f SHA512 1ee2043174cc1bf055de8c160e3b9665deac31553512ba2410e7cb616604e852a9a4ccbab4d5f7cca9bc1ce3ca4f2740a5ff51a7a08c832f3c00f2a4765493e0
+MISC metadata.xml 550 BLAKE2B 65feeb544a556d9202adda4f760b622c21bc03e04ae40428a49f3c53f253065cb923bbdf70c10187935895d5afc47ed9e49d8789d616503963689fdac06e860c SHA512 92a636e729d3d000e04773b2debb015b399f0b87f32a14c259c915975864e1d40114e68c7434fbe055913fbdc9f73c3f1d400807c25e83cf0b49f354b302e657
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 2626644a02d9..0c0122bcd5b6 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
 		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
 		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
 	')
@@ -73,6 +74,7 @@ python_compile_all() {
 }
 
 python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
 	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
 	virtx nosetests --verbose --with-id --with-doctest \
 		--exclude=sphinxtogithub
diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
new file mode 100644
index 000000000000..7180c6fb6684
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+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"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[\${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 --no-private-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() {
+	GIT_CONFIG_NOSYSTEM=true \
+	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
+
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 3ae0e4fb1473..4f507e2ec3d4 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">git-cola/git-cola</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>me@bearsh.org</email>
+		<name>Martin Gysel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">git-cola/git-cola</remote-id>
+	</upstream>
 </pkgmetadata>