gentoo resync : 25.09.2021

5 files changed, 89 insertions, 8 deletions

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
+}