gentoo auto-resync : 22:12:2023 - 19:52:05

4 files changed, 2 insertions, 138 deletions

diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index 213fc4e48285..1e4486814275 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -1,6 +1,3 @@
-AUX xfce4-terminal-1.1.0-menu-accel.patch 2663 BLAKE2B 0b2aa19dfb9ae17b53f57cef27f856d3df556fee96398dbcae50a6157c8a5a5d555685a910ae6ceb32d39144b31ab3c9b8d5b33468c01386109df43ce6cd8f78 SHA512 0e33df68f8b510fa88af8e6a423e12e3f99db6dad35ea1dacc139935fefd4832eb4b589c158d2e65306dca6b09158995bd4145c6db04bff6efe218ebf2486b4d
-DIST xfce4-terminal-1.1.0.tar.bz2 1021840 BLAKE2B 981d73362dd7e1122b893c0761ca8f758e9382bc49a5ad985d11a953aa17e65b0c372b8a6350ed2671665508e625fbfbf4532dadc88211c14b6848c195d247dc SHA512 c01f0e7a293c4e55b4ee151eb8beb5ff9634a8134b545452c87ee9fa9928507e73bda1a63634900f669a58353877c2cb3f48e7b95cf236bdc857ca311c73c86f
 DIST xfce4-terminal-1.1.1.tar.bz2 1033180 BLAKE2B e33bf7f0ff56200154a7195b6aaf09a7b67c7577c78190fd110b1dc035914295735925bf82f0cd3b6809646315236a32fc835acbb8d97b73b57025205faef9e8 SHA512 0f2631cc9790b467495cf17a506c33b9c6a037b94a353cb870554b1dd9da0b4795ed965ca2e9beb5dec1b344304e4dc9f71130862f6b45d63f66c603757991cd
-EBUILD xfce4-terminal-1.1.0-r1.ebuild 1118 BLAKE2B 3e7b5004dca2153f27d4da11ebdb34ed1e20e498abf85d6a9976b8819c857aa8414c2cda6e2475d7ae620704d0405886886abdccec44993398b71dd8c73f3615 SHA512 9077bdf03706ffbe2333aea4c7b34808002fafa5ec32a19cf812a703450b02bc1c8ba11e2907e9803062554ab25fbe5a43a7d20ecef913cef85a55a54b058909
-EBUILD xfce4-terminal-1.1.1.ebuild 1271 BLAKE2B c0df3b658a53791c7e8b9e050a16ec6b2327d07e0d90ba7e065ae7027ef9c895d6ddfe3a7a2abb2f7687b9357a3b04d56bd855fd4428f8912275ebf4bb0b2189 SHA512 b01dd65cdb79edc2e0a531da6bebb3092870b70954cbd41e651b700c18ecce4e577669c85e8981e00dd976430d803bf8368894af84f1cdef05a41b53ea414a54
+EBUILD xfce4-terminal-1.1.1.ebuild 1270 BLAKE2B 841b73ed606a031e1440ff09f4f614b3d36662b4d74794dd6cb1e8994b27fa4a302b44947a8aa5eb4fa0e1e7ab7cd1a97c62807fd48beac503f922b5571b501b SHA512 79fd979e264bdbc8fe5c4db5880de50730084cebe480f6f058671918142ce183e35ad6efb6ec6c0226cc8f37f20b4e1b8aaad6b04f916593cee6137842231ca1
 MISC metadata.xml 372 BLAKE2B bb4bcd3652bb3bbaee272af26e6b07b5279167c165574cfcbaa1c23d8b9786cc79972325893fc563aac5ae1eef257ebe4807199497a02c147515af68b80e27a2 SHA512 722c99f01658541a9d1df513ffa218ac36897644e771d8b439bf6b2c38e241304c0a43c94115ed95f367ba6e3a8606bee2c63ef8c1ef9841f08b9f06977751c7
diff --git a/x11-terms/xfce4-terminal/files/xfce4-terminal-1.1.0-menu-accel.patch b/x11-terms/xfce4-terminal/files/xfce4-terminal-1.1.0-menu-accel.patch
deleted file mode 100644
index e40b9be6eae2..000000000000
--- a/x11-terms/xfce4-terminal/files/xfce4-terminal-1.1.0-menu-accel.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From c576281a780884f9ba1f6abe3d543a3a00f0b48d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
-Date: Thu, 24 Aug 2023 12:50:38 +0200
-Subject: [PATCH] app: Put GtkSettings:gtk-menu-bar-accel overwrite back in
- place
-
-Fixes: 86abcfefec1c994e1fe7bb94fb615945507ba41c
-Closes: #259
----
- terminal/terminal-app.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
-index 46b4c300..f3aeeeac 100644
---- a/terminal/terminal-app.c
-+++ b/terminal/terminal-app.c
-@@ -56,6 +56,7 @@
- 
- 
- static void     terminal_app_finalize                 (GObject            *object);
-+static void     terminal_app_update_accels            (TerminalApp        *app);
- static void     terminal_app_update_windows_accels    (gpointer            user_data);
- static gboolean terminal_app_accel_map_load           (gpointer            user_data);
- static gboolean terminal_app_accel_map_save           (gpointer            user_data);
-@@ -129,12 +130,16 @@ static void
- terminal_app_init (TerminalApp *app)
- {
-   app->preferences = terminal_preferences_get ();
-+  g_signal_connect_swapped (G_OBJECT (app->preferences), "notify::shortcuts-no-menukey",
-+                            G_CALLBACK (terminal_app_update_accels), app);
- 
-   /* remember the original menu bar accel */
-   g_object_get (G_OBJECT (gtk_settings_get_default ()),
-                 "gtk-menu-bar-accel", &app->initial_menu_bar_accel,
-                 NULL);
- 
-+  terminal_app_update_accels (app);
-+
-   /* schedule accel map load and update windows when finished */
-   app->accel_map_load_id = gdk_threads_add_idle_full (G_PRIORITY_LOW, terminal_app_accel_map_load, app,
-                                                       terminal_app_update_windows_accels);
-@@ -169,6 +174,7 @@ terminal_app_finalize (GObject *object)
-     }
-   g_slist_free (app->windows);
- 
-+  g_signal_handlers_disconnect_by_func (G_OBJECT (app->preferences), G_CALLBACK (terminal_app_update_accels), app);
-   g_object_unref (G_OBJECT (app->preferences));
- 
-   if (app->initial_menu_bar_accel != NULL)
-@@ -182,6 +188,22 @@ terminal_app_finalize (GObject *object)
- 
- 
- 
-+static void
-+terminal_app_update_accels (TerminalApp *app)
-+{
-+  gboolean no_key;
-+
-+  g_object_get (G_OBJECT (app->preferences),
-+                "shortcuts-no-menukey", &no_key,
-+                NULL);
-+  g_object_set (G_OBJECT (gtk_settings_get_default ()),
-+                "gtk-menu-bar-accel",
-+                no_key ? NULL : app->initial_menu_bar_accel,
-+                NULL);
-+}
-+
-+
-+
- static void
- terminal_app_update_windows_accels (gpointer user_data)
- {
--- 
-GitLab
-
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild
deleted file mode 100644
index 844c01d9c37c..000000000000
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A terminal emulator for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/apps/terminal/start
-	https://gitlab.xfce.org/apps/xfce4-terminal/
-"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="utempter"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libpcre2-10.00:=
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/libX11
-	>=x11-libs/vte-0.51.3:2.91
-	>=xfce-base/libxfce4ui-4.17.5:=[gtk3(+)]
-	>=xfce-base/xfconf-4.16.0:=
-	utempter? ( sys-libs/libutempter:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-libs/libxml2
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-menu-accel.patch"
-)
-
-src_configure() {
-	local myconf=(
-		$(use_with utempter)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.1.ebuild
index 6e720d70a403..e0d3a83dedd2 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.1.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter wayland X"
 REQUIRED_USE="|| ( wayland X )"