gentoo auto-resync : 11:10:2022 - 19:38:57

4 files changed, 81 insertions, 226 deletions

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 9dd857284153..a2a78f4860e0 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,11 +1,9 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
-DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
-DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541
 DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
-EBUILD git-cola-3.10.1.ebuild 2486 BLAKE2B 8ec3e8f3737b1955a6169a2d6997d4ee9d9565fad0223955a5df1763d1e6ffb0fe839129d4eb4ea2e2986dd96e3f6a770bd472ba833234d3ca25d115643871c7 SHA512 458fe11168fcd3d839029220a5ec13731238bf24e8ae7120df3476e015d740de615e6d90c2e9cfbd22d70310a0fc6eb07bf92b96fd8301e30c84dfbb9b8659e3
-EBUILD git-cola-3.11.0.ebuild 2457 BLAKE2B dec9f6f5643428efd6eec292e86dc20f510c650f189e7ead68c0644cd91cb5b4564cf87cb2c7350d11a2972eca8b55f39b3b133e9dd3510771bb97d7dd05d3d5 SHA512 6fb7b1422d5a2dbdfad15650da60b81aea9911e47f42d11ae1da6ee6230547e7f1d7b615544f8214cf904d056e1122cf34d6b16843f65b9f18d601b89b413ac3
+DIST git-cola-4.0.2.tar.gz 1022362 BLAKE2B 6f1d6aa6fa6c308f28150018eea8a110c2ceb35ac5e904844568a503e1ebfdb07d9d79b7fa6542aa734c62ae5e5b2e41bb26c99b23a7a84067c102598354cec1 SHA512 01a68caf12bff400b243a57a9b5a5f07c2c1bd1b90d50acc75806ffdd9377409a56dd591311667afab7508f1ff0d88e31744c1990db3f5f6ce9d977f3fa4068e
 EBUILD git-cola-3.12.0.ebuild 2455 BLAKE2B 9fdd4a558d45b96685efad001c2cf7c29daa9a6adf6844d7cea18a85e0a8eb28621986ba8c15f0d3e1ed0051b79faa4644284742f8eeb82bdae58a6252549609 SHA512 8ab1918ceacd575b3664b9f45aefdbdd80ac411af112ca24421ecaa1e7f72dc90251cb7373f477aba85d675e782036776862129731980ab76ee5f2be6b959662
 EBUILD git-cola-4.0.1.ebuild 1715 BLAKE2B 1fa06f56d179953376216bab2c7306b76a0a02ac13b00c3fca8d7709041b25d7359868eabec50a57166d625a3c60c72faa814a1d183e2cdc9be6611b6eed5ebf SHA512 06fba38c07b02309487434ebcfbd115f8422b0e31200e1e54674ff3240c99295563cb18f816eeaf76a43983272ff318fcc061fa07326715dc2550448167a7ca5
+EBUILD git-cola-4.0.2.ebuild 1717 BLAKE2B 483f0f60851defae0106d7f10f8919ad3997938f677bb72edd5fca3af822d50e834faa234437853702bbb94fceb43a660f26e098784318d32b71e79d1544998a SHA512 79e05dc8f7f772c9dac6a879a867a9f691af53fefd565b3c31d7cfc67e14d3448c7a8355d4fa2ceda1bfd9eaa99dd3a41267c35eaa2ec5bd3663b637d14fe338
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/git-cola-3.10.1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
deleted file mode 100644
index 4bc81af9e798..000000000000
--- a/dev-vcs/git-cola/git-cola-3.10.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[network,${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/nose[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-			dev-python/pytest[\${PYTHON_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() {
-	DISTUTILS_ARGS=( --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="C.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-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 || die
-
-	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/git-cola-3.11.0.ebuild b/dev-vcs/git-cola/git-cola-3.11.0.ebuild
deleted file mode 100644
index ebab708004f6..000000000000
--- a/dev-vcs/git-cola/git-cola-3.11.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
-		dev-python/send2trash[${PYTHON_USEDEP}]
-	')
-	dev-vcs/git
-"
-BDEPEND="sys-devel/gettext
-	$(python_gen_cond_dep "
-		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
-		test? (
-			${VIRTUALX_DEPEND}
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
-		)
-	")
-"
-
-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
-
-	# disable flake8 testing, it's not useful for ebuilds
-	sed -i -e 's:--flake8::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=( --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="C.utf8" \
-	virtx epytest cola test
-}
-
-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 || die
-
-	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/git-cola-4.0.2.ebuild b/dev-vcs/git-cola/git-cola-4.0.2.ebuild
new file mode 100644
index 000000000000..68d4675e79db
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-4.0.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_PEP517=setuptools
+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="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/QtPy[gui,network,${PYTHON_USEDEP}]
+		dev-python/send2trash[${PYTHON_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+		)
+	")
+"
+
+# right now, dev-python/jaraco-packaging is mask, so we cannot generate docs
+#distutils_enable_sphinx docs \
+#	'>=dev-python/jaraco-packaging-9' \
+#	'dev-python/rst-linker'
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die
+	sed -i -e 's:--flake8::' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	cd "${T}" || die
+	GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \
+	epytest "${S}"/test
+}
+
+src_compile() {
+	SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}