gentoo resync : 25.09.2021

3 files changed, 15 insertions, 50 deletions

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index c727d165387a..9f183ed0b608 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,10 +1,9 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
-AUX git-cola-3.5-py3.8-line-buffering.patch 1342 BLAKE2B e13e576a8e4d88975b59e3f9b58f3a0b1f7cb903a0469729005e04f8dc43b5d4459d4dc85436713519cce72a408cedf9784b6fa69bd9a0cbb0fdc1e49b66588e SHA512 445106e675df96386e1b995c9bd8ea496bf029f7bde6c81390b657034769580a7ef448bcb2f5c9c79ade19f2d490f4bef19b7a0e0d51e43c01cdc6e2594e7535
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
-DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
+DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4
 DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
 DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31efa78ad27f3e1e57e22c4222d70914f059dffb0b05b2b366d3208e127ad123ccfeb1b4c1b648daae0bf53352 SHA512 91f4bb40c166669e05136985920113d7482a396a46adf45fcf05e8ee56677fee7ebfb6a793face79737a17be42aa5e32b216a30847e8e4a5b8dc5b3b4eba5395
-EBUILD git-cola-3.5-r1.ebuild 2660 BLAKE2B a050b4ab593d2e50044162069c3fc993839490417c525aee6883b3ea8e39ca8803ce952610a53dc7aae43c9698ed2b2c9707a17ad667e6a3d975bf32ea548463 SHA512 1ca2ffb28b7bd31459e4ab26683cf12601723a562b8296fedc1568d556e9ad0b4387ec15ddf215e1c66cde798a3b365fa0ebca9fa6b55dec1cc0c48561e9a939
+EBUILD git-cola-3.10.1.ebuild 2488 BLAKE2B c866ce1934780c48e19a1d6bcb796048ba7fd4af5b54d0567f4e8194d640b852e9c24f0f16705dc839514342ad4fcb5062176a5bef87a61f7e4646db04d6ae3c SHA512 df5b1e44cc3200b2e0080fd39b1d3e7a753f61e9e812f05fa864020724624bd07495f8c1618a0ffa58147d2177cbdac4357cab63112987ce735a1654a50eb1c6
 EBUILD git-cola-3.8.ebuild 2477 BLAKE2B 6cc1a0d6f61526d6f145adfbce03ce98d117ebef4de0153e18220c2dc216f3fc046ce36f11751bba07d5a6e0e86298ddfa7203c22a7f94fe8721dc9d0aedc4ca SHA512 ce381d9f2dc31ccbf09930ad1dea21ab20cbe83080a1f86add25be93f38d117cfeed36d878693d20fb9d7e71f398e16caab2a4cf458add1312dddb49003c9012
 EBUILD git-cola-3.9.ebuild 2437 BLAKE2B d645c01f2291a0e0edaa25fd42f3e40e58ca7a0e366ae69cf229abee74d72c936f21377590e4090eaf33cdee46bb0f27f32be883b05d77fd78250a5283225721 SHA512 751c5e2aea3ebe73614a07d30bdf42ff395329ab5c63697df4659244e114f269ac43c526bb9a981e55111f3df43f1535cfe1aa76653019bfff6c3f31ae2a805c
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
deleted file mode 100644
index 4938d6a30eca..000000000000
--- a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001
-From: Simon Peeters <peeters.simon@gmail.com>
-Date: Mon, 18 Nov 2019 21:15:32 +0100
-Subject: [PATCH] Only use line buffering in text mode when calling Popen
-
-Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled.
-So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode.
-
-see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize
----
- cola/core.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/cola/core.py b/cola/core.py
-index 0fabfcf3d..5ad719f05 100644
---- a/cola/core.py
-+++ b/cola/core.py
-@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None,
-             CREATE_NO_WINDOW = 0x08000000
-             extra['creationflags'] = CREATE_NO_WINDOW
- 
--    return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout,
-+    # Use line buffering when in text/universal_newlines mode,
-+    # otherwise use the system default buffer size.
-+    bufsize = 1 if universal_newlines else -1
-+    return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout,
-                             stderr=stderr, cwd=cwd, env=env,
-                             universal_newlines=universal_newlines, **extra)
- 
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
index 4dae0de9e541..0d5c7bc503d4 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.10.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=true
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
@@ -27,7 +27,8 @@ RDEPEND="
 		dev-python/QtPy[gui,${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
 	')
-	dev-vcs/git"
+	dev-vcs/git
+"
 BDEPEND="sys-devel/gettext
 	$(python_gen_cond_dep "
 		doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] )
@@ -35,10 +36,11 @@ BDEPEND="sys-devel/gettext
 			${VIRTUALX_DEPEND}
 			dev-python/mock[\${PYTHON_USEDEP}]
 			dev-python/nose[\${PYTHON_USEDEP}]
+			dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets]
+			dev-python/pytest[\${PYTHON_USEDEP}]
 		)
-	")"
-
-PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" )
+	")
+"
 
 python_prepare_all() {
 	# make sure that tests also use the system provided QtPy
@@ -61,7 +63,7 @@ python_prepare_all() {
 }
 
 python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs )
+	DISTUTILS_ARGS=( --no-vendor-libs --no-private-libs )
 }
 
 python_compile_all() {
@@ -78,15 +80,11 @@ python_compile_all() {
 
 python_test() {
 	GIT_CONFIG_NOSYSTEM=true \
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.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 \
@@ -95,11 +93,8 @@ python_install_all() {
 		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"
-
-	# fix appdata installation
-	mv "${D}"/usr/share/appdata "${D}"/usr/share/metainfo || die "moving appdata failed"
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin || die
 
 	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )