gentoo resync : 18.12.2020

3 files changed, 38 insertions, 2 deletions

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index db8d1aa8503a..1b4b6d477a8e 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,7 +1,8 @@
 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.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
-EBUILD git-cola-3.5-r1.ebuild 2528 BLAKE2B 6b1054847474f44db0a2c794c5e8abc795677b6bccb30aff2413f774df7d9889a5134fa4502ac5daf02cb34c35c4c177f6a653a4df906aa0987af0d805143d53 SHA512 099c6027561d80beeca7cffc09fc3196d4561ea0953bce82d953cf37cd0a227069dcc147540325f478c1e00da3012818d1c5b2758aa4a209d3314b683292ef98
+EBUILD git-cola-3.5-r1.ebuild 2732 BLAKE2B 4f3cafb29992e2787a24521efafacd018f747591f3db95a188f25497dac2d28c5b346b6a428c61214e8d8a4c4d955458d78e4b704363d0285a5cebe2d25c48bf SHA512 bef97f174d223b0fb220c22fcf36b9f42a5958e3064671397fd2ea36d2181fb668d8dc3e0201b5e349ba6b5ccaf89d7d8d3aa2caff12b1377ae1a0041af1ef00
 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/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
new file mode 100644
index 000000000000..4938d6a30eca
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
@@ -0,0 +1,29 @@
+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.5-r1.ebuild
index 0c0122bcd5b6..a977e0dd5d29 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
 
 DESCRIPTION="The highly caffeinated git GUI"
@@ -37,6 +38,8 @@ BDEPEND="sys-devel/gettext
 		)
 	")"
 
+PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" )
+
 python_prepare_all() {
 	# make sure that tests also use the system provided QtPy
 	rm -r qtpy || die
@@ -95,6 +98,9 @@ python_install_all() {
 	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"
+
 	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
 
 	distutils-r1_python_install_all