gentoo resync : 25.09.2021

10 files changed, 91 insertions, 41 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index b53da2118bad..7212ffc7d736 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest
index 001d14ba616d..6c38e6a53aa3 100644
--- a/x11-terms/sakura/Manifest
+++ b/x11-terms/sakura/Manifest
@@ -1,4 +1,8 @@
 AUX sakura-3.7.0-gentoo.patch 866 BLAKE2B a75ff98fc9b13c2d73e1f03930beae00e6260ffdb9b3e91b62386bbd90b2379c88fd00dd45ec1956eac9e08134c428b6c5616b50af7c83a3a1856d9fc46be96b SHA512 a7c9c49218180a5ce59ea4e1e27b662cf1897a15079e642d8c9cc97accfc9cb3cf03926edb91684f87e25e44542fcfbabeeb336dde8a869721f8364111a87532
+AUX sakura-3.8.3-gentoo.patch 479 BLAKE2B b17b1a39e46db6f8f14d59b2bb2f353229c9bfe63461e9447091f1650deb5849276581ff70f9d2646e86cc3efa43b5c21eca7ca8e02ef480d73920187cfa0f74 SHA512 8a7354df38e9968ebc366ef3835f117256bc364ea99ca99541ca6e0d63c0fb2f5768a6e628f3cffceaba8d4a6a1a903683718690e5a315597d3d8989892b95f2
+AUX sakura-3.8.3-opacity.patch 571 BLAKE2B 0641cde4fabdc7d6b39ab82116e7999e03224d7bcd2375487146f9574187758a37113ecfbabb82398a1e4afa89a5e61b54fe7c286af61404006390916617d73c SHA512 0907cc2d9caa2b9e0f42f3e0644d44dcea603584080753db6dd78f4814920ef8a1ad45593d7a4b485392c11e0b7855fd78b7a3134072de2d7bc926e27edda2c6
 DIST sakura-3.7.1.tar.bz2 56315 BLAKE2B 3de45b19f76f765bc611cc7514238c942ea2212d64332aab9befbea4b5fe0cdb29a555017276bd6394c1313ba64ce2bfca6e83c6ff19d6aa676409b51589a838 SHA512 69d3b14f455480e4515337b4a28daafc807f41653ed8d6b6f934a908305fcc28745796b0f290b3ec6e97f6572132664017f943e556cca69df7007e17fcd9b9df
+DIST sakura-3.8.3.tar.bz2 57773 BLAKE2B 20a7b2823d8e2a494c11b15eac4900b935a7a7c99d5cd67a8470e3441b2e8ff7924dd92c35d188863c9c420dcefbfca8d1dcd9dcff06a77d3cd95f855230c23b SHA512 82e77940b4b4c90948235459a0135e74c5778c3bc1df4e803571b316e6ec6298493468a0c8c2517ca6b1680fcdbba6d0e36c8bad696205e3aa3e5b4f402c2a8e
 EBUILD sakura-3.7.1.ebuild 1311 BLAKE2B 1eb93b0859ff54d1fae7fd017d4ff0a88e8cccaf65c1292cb7eb27b2223619954828705c0a62ef0c902aecaced3fcda8e9e4c0dfc06e44b06f5f51e8292a8fd9 SHA512 0d92b1ea14ddb4a441d3ce89309d01b0cdd262cf3e22a8df2e0590064ca1fc0bf48f2ab599ede7ccb27bab3482194788547b1b3f712c17872c72d9741b0463b0
-MISC metadata.xml 780 BLAKE2B cfc91e18334fe9c2471b345cd26c47ae6f8fa7dfab8792087d21b8d15de1aea00ad53d8ff8063a8e9a0666283b609a58b0d471e0260dd5fc11a275ea5b3233bd SHA512 e53a9f6b510d5a21237a466da1df0594e68e7aed16b63b4fcabd3e0f62267f347c0d01c524e2d3c7b0974570e5a099716cf856c43c28498e7f40ac936e77ec30
+EBUILD sakura-3.8.3.ebuild 867 BLAKE2B 8e3fc8086754b10a9519aaf8b6b6b01f714ab28d6dca0f7ebb451653c7bd960277dc88c96c700b237421aea5af1c3b459fc1495d3159be3ef12ca807c6ec470a SHA512 5754ab69546cbec8bc6eec7435045ea546b9521e48b2dca856e434d88c2b53ff05a469158a6e3cf01b924d1f20c3a116a4ad963321acd9d6b1ed156969a64f75
+MISC metadata.xml 851 BLAKE2B 823d08b0bc994ef9732b69188f2d6f55bd58709104517313093ee1f5d39fcb40e01a54fe47ab0e80f9b42b523f38129ac2ac0f1fdfb8d08338c3d4bb893914ec SHA512 99c6563360d9326835c2b49d8e77c28c07573c3dc14303f6ed4e1699ddc9ed199cad03ba841556903845a43d245c692ca0909f825c9cbd4a198a56a6b9dee0ae
diff --git a/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch b/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch
new file mode 100644
index 000000000000..c9f2c5a85f44
--- /dev/null
+++ b/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,8 +40,2 @@
+ 
+-IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations")
+-ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+-
+ INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
+@@ -59,3 +53,2 @@
+ ENDIF (POD2MAN)
+-INSTALL (FILES README.md DESTINATION share/doc/sakura)	
+ 
diff --git a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch b/x11-terms/sakura/files/sakura-3.8.3-opacity.patch
new file mode 100644
index 000000000000..4bb4ba88f189
--- /dev/null
+++ b/x11-terms/sakura/files/sakura-3.8.3-opacity.patch
@@ -0,0 +1,14 @@
+Fix regression with opacity not being applied on startup.
+https://bugs.launchpad.net/sakura/+bug/1942665
+https://github.com/dabisu/sakura/pull/5
+--- a/src/sakura.c
++++ b/src/sakura.c
+@@ -2180,4 +2180,8 @@
+ 	gtk_widget_add_events(sakura.notebook, GDK_SCROLL_MASK);
+ 
++	screen = gtk_widget_get_screen (GTK_WIDGET (sakura.main_window));
++	GdkVisual *visual = gdk_screen_get_rgba_visual (screen);
++	if (visual != NULL && gdk_screen_is_composited (screen))
++		gtk_widget_set_visual (GTK_WIDGET (sakura.main_window), visual);
+ 	
+ 	/*** Command line options initialization ***/
diff --git a/x11-terms/sakura/metadata.xml b/x11-terms/sakura/metadata.xml
index 68f65e0bc5f9..b6657d18ce15 100644
--- a/x11-terms/sakura/metadata.xml
+++ b/x11-terms/sakura/metadata.xml
@@ -3,15 +3,18 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator
-with few dependencies, so you don't need a full GNOME desktop installed to
-have a decent terminal emulator. Current terminal emulators based on VTE are
-gnome-terminal, XFCE Terminal, TermIt and a small sample program included
-in the vte sources. Sakura differences from the last one is that it uses a
-notebook to provide several terminals in one window and adds a contextual
-menu with some basic options. No more no less.
+		Sakura is a terminal emulator based on GTK and VTE. It's a
+		terminal emulator with few dependencies, so you don't need
+		a full GNOME desktop installed to have a decent terminal
+		emulator. Current terminal emulators based on VTE are
+		gnome-terminal, XFCE Terminal, TermIt and a small sample
+		program included in the vte sources. Sakura differences from
+		the last one is that it uses a notebook to provide several
+		terminals in one window and adds a contextual menu with some
+		basic options. No more no less.
 	</longdescription>
 	<upstream>
 		<remote-id type="launchpad">sakura</remote-id>
+		<remote-id type="github">dabisu/sakura</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/sakura/sakura-3.8.3.ebuild b/x11-terms/sakura/sakura-3.8.3.ebuild
new file mode 100644
index 000000000000..bb84f11c518d
--- /dev/null
+++ b/x11-terms/sakura/sakura-3.8.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="GTK/VTE based terminal emulator"
+HOMEPAGE="https://www.pleyades.net/david/projects/sakura"
+SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3[X]
+	x11-libs/pango
+	x11-libs/vte:2.91"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libX11"
+BDEPEND="
+	sys-devel/gettext
+	virtual/perl-podlators"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-opacity.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ -v LINGUAS ]]; then
+		local lingua
+		for lingua in po/*.po; do
+			lingua=${lingua#*/}
+			lingua=${lingua%.*}
+			has ${lingua} ${LINGUAS} || rm po/${lingua}.po || die
+		done
+	fi
+}
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
index 8d585d02d06b..4fa70d49d76d 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,4 +1,4 @@
 DIST st-0.8.4.tar.gz 47330 BLAKE2B 709278a669414d7d44beba02ebb606853dbaa9cfe71650e40a11d3691d6bee2c0b2e8db57ca2df52776ca564a20f64f3ef7acec8dbad6d66408d314fe26fb794 SHA512 f6f95081f9d09d442228bac1149d75d36a9f4f049b5504cf5ce00b353563ff92c62a2628ce728663fec107a14bea0eeb22b7a72804c37090de33819243d7512a
-EBUILD st-0.8.4.ebuild 1394 BLAKE2B 9b4588d2fe831ac959a352d9afb936132b288eabecfded91bc7f4a2fc604c49d45c45f2bd474e6c888cb86f7a558b1fec96b3bf56eed174d8afc542ce5371e17 SHA512 5924267b6baa857959cf181ccbfd37fbe684424f07bbd80bf5162bd7be61d1d39eb4755b8aeac0413cbf42f99279b73ea26b250289608bb5e18837d833c64b7d
+EBUILD st-0.8.4.ebuild 1401 BLAKE2B 6400f8c79f9f20ea5c129aa2088dde5c7c554598eeedbec0beaa56ff31251723a7943974374cd70ba0dbe8c78f797f83ffb4283d1193b5c9f24c41798337a261 SHA512 870cbb53c3eef4f634d028750dee56262725d42e7f9c7902f2ae3e7c87ca40fa0626dbec7c58d86a9a8f5fba5703cd8c01c0da8624310180fd8bf36efd43419e
 EBUILD st-9999.ebuild 1367 BLAKE2B 17a55761d49fe1ae3c88a730ccae177895e4174b8755680d53836045bfeab38e2eae9cba338d8fbd4d66184b840f46035c9960972108d9d8239ee8c4c7107e5e SHA512 f30b676ff15da80725d672c35bf3581d7424c431dcede7c2412dfe2390fc31e4982de33c7cb2edd0a26d29de29a48a4a264ad9e86ca0518d36bca2f078f7cc4c
 MISC metadata.xml 254 BLAKE2B aabbd5365abdb36c7ee6418a30169bc87cdd6cf8175a1f3c5d4e27f84b4309f34a42342887ea5e73eeef602a69582854266900794cc81d8e951d2e5f0480b650 SHA512 030e3a92db3cdca585debc6b26403cc6679a4b5f87bdc188a9dfaf4779adca1b4e8445a755618abe5a43157300292a596c5a6850ebe6f6f7f400d3f46ef2e0f9
diff --git a/x11-terms/st/st-0.8.4.ebuild b/x11-terms/st/st-0.8.4.ebuild
index f1b402b16ebf..6bab6cc56eb3 100644
--- a/x11-terms/st/st-0.8.4.ebuild
+++ b/x11-terms/st/st-0.8.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/st/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv x86"
 IUSE="savedconfig"
 
 RDEPEND="
diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest
index b722ba807ed3..a63e6f2fda91 100644
--- a/x11-terms/zutty/Manifest
+++ b/x11-terms/zutty/Manifest
@@ -1,5 +1,4 @@
 AUX zutty-0.9-freetype-2.11.0.patch 1072 BLAKE2B 91b443535e432304c80df2fa91995eccac32bdc2e1c6bb95f55450b57b72789cc50f485c0c4376db32425481d17793985b4ebdeeb4093dd68d4323f9cc2dc04b SHA512 df7a4da6367a05d15dfd8dbe03ee59d01d385600b96798761202016e014e881271dce6e596a2fae2e155793e25b4743bda43ceb1a52d08eb6c327886b02b8180
 DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0
 EBUILD zutty-0.9-r1.ebuild 758 BLAKE2B 5aff0a097a3c6c0fe046033b1a4af0a9168b68dff979a78b244588c47e4a9e59911677f31729edfa6232804acf91942dc176512daceb41afee74d840b8f78dbd SHA512 6a7c06d5a0923c8fdfa38bbd2bedab753ff5e1f1d0d73d88aff8f2e2f3113f7f0731217fe2c3f3c6716a267e425ccef8806d9b84fb9bdd0a45fc840596054f40
-EBUILD zutty-0.9.ebuild 684 BLAKE2B ebc469725ac2ed634719b3346d533341fc81f71a7435903f1339f73bc84b54e22c702153af170ffb77d42a6b2bf19bef5b18743dbaa8ea0a4969b0736d48d915 SHA512 20f0d3cdb20e309dd39b621a9142444a05c63534b53f2dc03a0d6ae85752449d3383e87d5b34db86b3458dbd4fab28dd80c1456f33dcac55cbf7c3e954c342e8
 MISC metadata.xml 1157 BLAKE2B 883ce392103af3b9f9be08766807134f21136c3e40d622b6e29b9da3ba3e08ac461856ea64c32110ac6d169a92260ebaffc9398ed1fa9ad44f2eaaae18336faf SHA512 f2eb0fc8e9ef6c505759c3721ca65636c3d76fede249675a57f23f1a3498a5eb2290fd1ba0c51c97d726483a0b6d2ce1e3310c621ce67401509c21010ceb75d5
diff --git a/x11-terms/zutty/zutty-0.9.ebuild b/x11-terms/zutty/zutty-0.9.ebuild
deleted file mode 100644
index c8112ba12e48..000000000000
--- a/x11-terms/zutty/zutty-0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="X terminal emulator rendering through OpenGL ES Compute Shaders"
-HOMEPAGE="https://tomscii.sig7.se/zutty/ https://github.com/tomszilagyi/zutty"
-SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	media-libs/freetype:2
-	media-libs/libglvnd[X]
-	x11-libs/libXmu
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-DOCS=( doc/KEYS.org doc/USAGE.org )