gentoo resync : 02.02.2022

4 files changed, 42 insertions, 44 deletions

diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index 8eec03855850..d327e5b17e6c 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,6 +1,6 @@
-AUX zutty-0.9-freetype-2.11.0.patch 1072 BLAKE2B 91b443535e432304c80df2fa91995eccac32bdc2e1c6bb95f55450b57b72789cc50f485c0c4376db32425481d17793985b4ebdeeb4093dd68d4323f9cc2dc04b SHA512 df7a4da6367a05d15dfd8dbe03ee59d01d385600b96798761202016e014e881271dce6e596a2fae2e155793e25b4743bda43ceb1a52d08eb6c327886b02b8180
+AUX zutty-0.11-cxxflags.patch 784 BLAKE2B 06dcb5309326ff43337d32b52d9ea03dc2673020492640a37bf91a8d709bf19afa51850fabc5f6a08fedcf91dbff5fc28ffdf7719aaa98dd475e4527321d391f SHA512 7c8e425375d513c2591b3ef153054811a2c3f88134aa27f9bc3aa2b8328a5c10d1938a606d0ef11f168671537bc6d5773570c9947f7c99871f668540d76fc8c3
 DIST zutty-0.10.tar.gz 336599 BLAKE2B 0041bbbc268ff042bac6bea1984ebf05d958f622b4c2e736bfe3d18e3a224238f27a7ef9920b8f7bc820705ce7560f20819650ec27fb3e5fc13dbef76fc6d0af SHA512 f499fb499779f8b5936a03c48e3c042f5fa0f0c99d3b24a4c9b963c2df8151561ac82456625d768e65f75aea641539a036300f1f99404eecfd15a0a25aeb6779
-DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0
+DIST zutty-0.11.tar.gz 343469 BLAKE2B 9cd040e72d0ea76a526d099265b3a0974d40b1b8b679ff3baafc47f827b140943ac8bc13676831245e219ca1335ded7aca1e7826baf175fc63e88012791785e1 SHA512 84e8402a310adc80c698ded38fa3eb8ba44034f391e2538bccbdbc4082e239dc0d6ceb20504eeab4e5d2499ded55ef0941ae2e5d07eeb809d1059e5449cdb708
 EBUILD zutty-0.10.ebuild 682 BLAKE2B 48c4ca8530d0eb51a88c2e8494987e59d89e11a53379be7a704c889e128f17d07a71f607862d025c6388013ba1c6b6558680640c4b19f79932a4d4ea80f14815 SHA512 efe82d8d68e47cfa54bc37dbea6b87abeeb5db55fc560594f001dae40fe60139562858f07d300dd4333303681f9878a016e6fd2e374f18775b26bd597cf7d01d
-EBUILD zutty-0.9-r1.ebuild 758 BLAKE2B 5aff0a097a3c6c0fe046033b1a4af0a9168b68dff979a78b244588c47e4a9e59911677f31729edfa6232804acf91942dc176512daceb41afee74d840b8f78dbd SHA512 6a7c06d5a0923c8fdfa38bbd2bedab753ff5e1f1d0d73d88aff8f2e2f3113f7f0731217fe2c3f3c6716a267e425ccef8806d9b84fb9bdd0a45fc840596054f40
+EBUILD zutty-0.11.ebuild 970 BLAKE2B 24eeaedd8c9119ac5242342e376fcf93cac9552d680f6a41eecdf0db5aaec7e95457b0dbbbe7487e260507d2aa3e62ad09f51d84d164df7fc5ce6da09a0c6071 SHA512 472f41e18cc08f375d234212146166523947b43fbccfad250b1e2c9be2f6003e9c027c26c349d669080e3677a278bf57ee59da1a574284d7824c8368e8706347
 MISC metadata.xml 1157 BLAKE2B 883ce392103af3b9f9be08766807134f21136c3e40d622b6e29b9da3ba3e08ac461856ea64c32110ac6d169a92260ebaffc9398ed1fa9ad44f2eaaae18336faf SHA512 f2eb0fc8e9ef6c505759c3721ca65636c3d76fede249675a57f23f1a3498a5eb2290fd1ba0c51c97d726483a0b6d2ce1e3310c621ce67401509c21010ceb75d5
diff --git a/x11-terms/zutty/files/zutty-0.11-cxxflags.patch b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
new file mode 100644
index 000000000000..19b6649bb561
--- /dev/null
+++ b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch
@@ -0,0 +1,27 @@
+From 06927a1f2f88bd9d5f4bb8056661ffbc4a0aeb77 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matt@offtopica.uk>
+Date: Wed, 19 Jan 2022 18:07:55 +0000
+Subject: [PATCH] Remove default CXXFLAGS and LINKFLAGS
+
+---
+ wscript | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/wscript b/wscript
+index d2bfbc8..b38b50b 100644
+--- a/wscript
++++ b/wscript
+@@ -69,10 +69,6 @@ def configure(cfg):
+            ['-DDEBUG', '-Og', '-g', '-ggdb'])
+     else:
+         cfg.env.target = 'zutty'
+-        cfg.env.append_value('CXXFLAGS',
+-           ['-Werror', '-O3', '-march=native', '-mtune=native', '-flto'])
+-        cfg.env.append_value('LINKFLAGS',
+-           ['-flto'])
+ 
+     cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'],
+                   uselib_store='FT')
+-- 
+2.34.1
+
diff --git a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
deleted file mode 100644
index b5d62204e6be..000000000000
--- a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c73c99d6b024047d9f9e53e263be56093b6bf986 Mon Sep 17 00:00:00 2001
-From: Matt Smith <matt@offtopica.uk>
-Date: Sun, 29 Aug 2021 19:15:01 +0100
-Subject: [PATCH] Prevent rendering glyphs twice
-
-Characters are loaded with FT_LOAD_RENDER.  Calling FT_Render_Glyph
-again causes an error in Freetype 2.11.0 and later.
-
-Thanks to Stephan Hartmann <sultan@gentoo.org> for debugging and creating initial patch.
-
-Bug: https://bugs.gentoo.org/809611
----
- src/font.cc | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/font.cc b/src/font.cc
-index f8da582..350a1a6 100644
---- a/src/font.cc
-+++ b/src/font.cc
-@@ -255,12 +255,6 @@ namespace zutty
-             std::to_string (c));
-       }
- 
--      if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL))
--         throw std::runtime_error (
--            std::string ("FreeType: Failed to render glyph for char ") +
--            std::to_string (c));
--
--
-       // destination pixel offset
-       const unsigned int dx = face->glyph->bitmap_left > 0
-                             ? face->glyph->bitmap_left : 0;
--- 
-2.33.0
-
diff --git a/x11-terms/zutty/zutty-0.9-r1.ebuild b/x11-terms/zutty/zutty-0.11.ebuild
index cdf1da5f9cd0..9363c3151d1b 100644
--- a/x11-terms/zutty/zutty-0.9-r1.ebuild
+++ b/x11-terms/zutty/zutty-0.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit python-any-r1 waf-utils
@@ -14,11 +14,17 @@ SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
+
+# It is possible to run the tests using virtualx, but it seems to take
+# screenshots of the terminal window, and compares checksums that never
+# seem to match.
+RESTRICT="test"
 
 RDEPEND="
 	media-libs/freetype:2
-	media-libs/libglvnd[X]
+	virtual/opengl
+	x11-libs/libX11
 	x11-libs/libXmu
 "
 DEPEND="${RDEPEND}"
@@ -28,8 +34,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Bug 809611
-	"${FILESDIR}"/${PN}-0.9-freetype-2.11.0.patch
+	# Remove default CXX/LDFLAGS, bug #830405.
+	"${FILESDIR}"/${PN}-0.11-cxxflags.patch
 )
 
 DOCS=( doc/KEYS.org doc/USAGE.org )