gentoo auto-resync : 25:01:2023 - 19:53:08

3 files changed, 5 insertions, 120 deletions

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 018ec280a288..a17dc8b0a0db 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.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9
 DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0dae98566f5a8b5d51b115d222c8aa6daab838ba67fa4c697391c8f58d4b05ddb7920bf65913d217f562aabd352f SHA512 c02150997982c1f8ce65a5f021364fc4c346339f5be4104f82ba6f7688cc05bad3d764e2cf920a22c5f209dc4b857c789907ff58c0d2809bc7ca7c3481b045fd
-DIST git-cola-4.0.2.tar.gz 1022362 BLAKE2B 6f1d6aa6fa6c308f28150018eea8a110c2ceb35ac5e904844568a503e1ebfdb07d9d79b7fa6542aa734c62ae5e5b2e41bb26c99b23a7a84067c102598354cec1 SHA512 01a68caf12bff400b243a57a9b5a5f07c2c1bd1b90d50acc75806ffdd9377409a56dd591311667afab7508f1ff0d88e31744c1990db3f5f6ce9d977f3fa4068e
 DIST git-cola-4.0.3.tar.gz 1131525 BLAKE2B 042ec4e0db5f9a9f947de3dcedc13c6dd2464ee29a9363f48b50622e88fbb878ed1034ff915e7a87b4a835f71dc11051e4649837e5f6de3ffe6bd84fea055d23 SHA512 06c032a9522dfefe4e95f64b00c79169da0bb68a4fc9966ac442da62cefc26a89155690b4b7bbe1fe79f8225d36e2459333bedb0cc0ef7e23521725607d9bc3b
-EBUILD git-cola-3.12.0.ebuild 2455 BLAKE2B 41c4b1ce842dd68f90fdb85b38c0851a0d1450df8b4b678cc0d620eccd5099ef41cfa87a7fb91164b38761d2495774c5f6ea2d3aef2b55e36944abfbfb0145e0 SHA512 0aca86715674f0124e0c7dbe36c4de9fbc50a5f12f8551cad383ed350b38ff1efe0009053df9649a182c726a3e69938e359f02d561bc44eb0bc1e2503e15b376
+DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 EBUILD git-cola-4.0.1.ebuild 1715 BLAKE2B 955821e26cb59cf6188372ef1ae48c09a1a6202f4d250182f31572e60f8d41d09933ee4a453aad771a4ff5cd6d467ea55301101f868aee8539284ee60bf20a14 SHA512 67e3a0b58632d4ba326b5218cef3083ad2ad5c9894edcce87b1f55ed4026d7aa0b795ca90afedc914ce1b6788871af725b11f57042ed8f2e2dbca2ec7e19eea5
-EBUILD git-cola-4.0.2.ebuild 1717 BLAKE2B 3ce42aa68cd60c96d1df8d02ca053928c38542dd4c651ffde91113387c4ac94f28834d9a0b5f52d8011aed3b4cdd12bd406e71a539f374c51d083f3f652c27a4 SHA512 d2488d54f7ce9f118fec43b0bf698b91c943bc0412d44c043bcf566dc81379605f7c2a8f5c385c9a55ffa193ff875a97d48362fa876c9243b99f3da5c22c4bb5
 EBUILD git-cola-4.0.3.ebuild 1717 BLAKE2B 3ce42aa68cd60c96d1df8d02ca053928c38542dd4c651ffde91113387c4ac94f28834d9a0b5f52d8011aed3b4cdd12bd406e71a539f374c51d083f3f652c27a4 SHA512 d2488d54f7ce9f118fec43b0bf698b91c943bc0412d44c043bcf566dc81379605f7c2a8f5c385c9a55ffa193ff875a97d48362fa876c9243b99f3da5c22c4bb5
+EBUILD git-cola-4.1.0.ebuild 1600 BLAKE2B 116008d3d9bf6306dd0211c0b8421feae6e5e6dfb96324a989dfdae435d4c319ced4063803de876fd4beb06a0b9033c1ead3401f9d4e798f1b0b593968a52f74 SHA512 4d534fcc7c67a0d7a711d38c2d5253d057448ec41faf69441a92b9a50742b304d7315846481260a9ca2201db33266d295edc766403df27d740a103438656ec55
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild
deleted file mode 100644
index 29c89753a8ec..000000000000
--- a/dev-vcs/git-cola/git-cola-3.12.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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.1.0.ebuild
index 4042b1f292ad..1238acfabdb8 100644
--- a/dev-vcs/git-cola/git-cola-4.0.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -39,10 +39,8 @@ BDEPEND="sys-devel/gettext
 	")
 "
 
-# 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_sphinx docs \
+	'dev-python/rst-linker'
 distutils_enable_tests pytest
 
 src_prepare() {