gentoo auto-resync : 27:08:2024 - 12:00:02

8 files changed, 166 insertions, 34 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 401e7f4c18f1..0d0cf9e1242e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index 20ad692fb615..73e0fe82ad99 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -2,6 +2,11 @@ AUX appmenu-gtk-module 239 BLAKE2B c5f055154136c6ba862ce9f74edf898fd9baa5b699fe1
 AUX appmenu-gtk-module-0.7.6-fix-pkgconfig.patch 309 BLAKE2B 960371a9722ebd715fa16a72cab960225f99d5a68d6b1e4ae6cf8113530769497b218708c990221aa558544778315c43968819ea968ba1f29d07a97257eef07e SHA512 8a08bccf369b87f261a4edfbeb1f942c3ea9c6efda19ca0a6490f91405b920516f0d8d8fd28172b2abf4d1d9ee2e16fab4c490653545239c82f8ee1e1cb7fee9
 AUX appmenu-gtk-module-0.7.6-no-automagic-gtk.patch 951 BLAKE2B 5dd2dbfe6464bf323b4b66d9a1f87ffc8b417991991529631d03ebb9253b999718e90a28c85b6e3573c4a7e0597f05cfdfbda6c6900197266253dad86452adb5 SHA512 5d2a8bf395d8151f06f9b42d0197d3c7b606161343ae166430fefa73f5170b7a61b15d34ff7bf7d8aa6602609cb612c98eba11067aac29ce06830f9e05970e94
 AUX appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch 2164 BLAKE2B f89af2da72c5f41eec2eeba1d2ea7a59e4f0b7e2aaf17c3dca07b8cd24e9a56ef8ba156abdd888a8051fc72e7369f9104389db4243132b510de0e6aaf412ef90 SHA512 63beeef3e2677a013aa46486baae8692bdc34c31ccd24f8eb2c5a18610025da5e77b50bdbbee6d8a6a34f3ee8e8595fbcc0df9ced417cd2a281b08f3947eb038
+AUX appmenu-gtk-module-24.05-fix-pkgconfig.patch 239 BLAKE2B db889c5cbf14a4bfec7a4b9f277df17c5fa852059610bb1880e94117f506787c7bba0b967c340abd545e31f99bce6d85e006c342d026af0026eb34b3f6cae754 SHA512 3fc9c9b1ea58e06c3f480daedef3e3973c660ca4a58f2ef9834851aa70161b4b0d41ab857b04b945f76d330810694458bd38fddb686a7e4a8cd19d676a2a42f6
+AUX appmenu-gtk-module-24.05-no-automagic-unitdir.patch 2164 BLAKE2B 921be10a8453a3e6ad16fd805946355c958c936ebe842b28a14086fe3368acab10e20409129bf0add083431a9c48433b21bf47894aec08409c748ba8ac242ef6 SHA512 3f95865802e7ad631c4742a2bd056c9c4202171b75a3ee0f169629f77d03a2d43e769df4a976c02aa4b174c3f3b6c48e689f1e55b31f6bf2015cae67f40dfb55
+AUX appmenu-gtk-module-r1 233 BLAKE2B b9298dae1a4e517ec50d558bbb368729e5343719333223592fd57bee810205a035c421f549ba5471b95e06b88328c7cbdb2a4dce852fd220f58f24b6a1f9a357 SHA512 b618046b2e0a5d4d806bdb9772fd486370bde2611c5810eb8f37481112566df084cf7a1e28e960ff9dcdfe098aa3834e48f93cf39584d2932c66c1577674fbcf
 DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5
+DIST appmenu-gtk-module-24.05.tar.xz 41364 BLAKE2B 45593cad5431f1b12fd7bc710399f7be7ff381d5757672c90db42187197de67b80f4436fc402e59abfa164d6d659557fb5a57737020d4cda361a2904154e9878 SHA512 0b233e56663f1e46f35b8edda5ea551f9569f6ffc20730fc62fcc090cf14a4032d58c7b8f03f14b29e9433f8ccd9fc89e3de7be50141fba5f85f5bf219517fa7
 EBUILD appmenu-gtk-module-0.7.6.ebuild 1169 BLAKE2B c5a71fd8d5ddd40121ab65538bb20d4634aa0438ecb155e91b59184018f6486ae00ee4665a86e44559711259fbef488a275e1fd6188b06a0c8d1a76d9172add9 SHA512 32ce7a2770a393e8f5d35588db4d7721849f8c544b6a7a65c331e516e889b28e8c2c342bfe261b44ef4a58c4492d51c80dc02f55324a57faecaf98a51ab49a9f
+EBUILD appmenu-gtk-module-24.05-r2.ebuild 1949 BLAKE2B 76189ef037e864314a3c5984f2d4b383a018a1cbf0d35492693212bb0d37d76540e5b90950f8e9fecc42597bce02257349455d5a52526a42e58d938c01b97ce8 SHA512 775c27bc856cf1ef4613249a79aa45de8e6429a81941a7485d11c334e03af8cd54a00f637e430abc05ba3f4f2f8fca91d095afae93ec0760010291c42dd3c5da
 MISC metadata.xml 417 BLAKE2B 6c9ebfbe4b02203037d8e79618f6423b842a4cd8906db9b6378b1588554f1c8bcf10b5e8d809b9e59abddae4727d5e28523630484fe528b2294f685ec3c8434f SHA512 bac77b5251306f7538a406105a7abca2c98ec9021a578d40c7cb2788f66af627c01c88b79576675a9a5adf5de5d634b5f5f28c033b4c9bab9d08936976692eff
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild
new file mode 100644
index 000000000000..274718de5ba0
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo gnome2-utils flag-o-matic meson systemd virtualx
+
+DESCRIPTION="Application menu module for GTK"
+HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
+SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/b5ace7bf5bd6e3ec3b20e98befb5da39/${P}.tar.xz"
+# 24.05 really is a different release to 24.02 (diffed tarballs to check),
+# but it has the wrong version in the directory name.
+S="${WORKDIR}"/${PN}-24.02
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gtk2 test wayland"
+# Tests are manual and hang in the ebuild
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/glib[dbus]
+	>=x11-libs/gtk+-3.22.0:3[wayland?]
+	gtk2? ( >=x11-libs/gtk+-2.24.0:2 )
+"
+DEPEND="
+	${RDEPEND}
+	wayland? ( dev-libs/wayland )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.6-no-automagic-gtk.patch"
+	"${FILESDIR}/${PN}-24.05-no-automagic-unitdir.patch"
+	"${FILESDIR}/${PN}-24.05-fix-pkgconfig.patch"
+)
+
+src_configure() {
+	# defang automagic dependencies, bug #785619
+	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
+	# outputs [ '2', '3' ] OR [ '3' ]
+	local gtks="[$(usex gtk2 " '2'," '') '3' ]"
+
+	local emesonargs=(
+		-Dgtk="${gtks}"
+		-Duserunitdir="$(systemd_get_userunitdir)"
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+my_test() {
+	cd "${BUILD_DIR}"/tests || die
+
+	local name
+	for name in hello radio tester ; do
+		edo ./${name}
+	done
+}
+
+src_test() {
+	virtx my_test
+}
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/doc/appmenu-gtk-module/* "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/appmenu-gtk-module || die
+
+	rm "${ED}"/usr/share/licenses/appmenu-gtk-module/LICENSE || die
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/${PN}-r1 85-${PN}
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch
new file mode 100644
index 000000000000..76455dd55655
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project('appmenu-gtk-module', 'c',
+ 	meson_version: '>=0.61.0',
+-	version: '24.02',
++	version: '24.05',
+ 	license: ['LGPL-3.0-or-later'],
+     default_options: [
+         'c_std=gnu11',
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch
new file mode 100644
index 000000000000..007462e767d8
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch
@@ -0,0 +1,56 @@
+From c60d530583a8bd07aea22c4f3f3aa8b0aaf271c1 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 4 Jan 2022 19:06:37 -0800
+Subject: [PATCH] appmenu-gtk-module: add userunitdir option
+
+allows setting systemd unit on systemd-less systems
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ .../appmenu-gtk-module/data/meson.build       | 19 ++++++++++++-------
+ .../appmenu-gtk-module/meson_options.txt      |  1 +
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/subprojects/appmenu-gtk-module/data/meson.build b/subprojects/appmenu-gtk-module/data/meson.build
+index 8378965..d0d1717 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,14 +2,19 @@ install_data([
+     'org.appmenu.gtk-module.gschema.xml'
+ ], install_dir: schema_dir)
+ 
++userunitdir = get_option('userunitdir')
+ systemd = dependency('systemd', required: false)
+ 
+-if systemd.found()
++if userunitdir == ''
++  if systemd.found()
+     userunitdir = systemd.get_variable(pkgconfig:'systemduserunitdir')
+-    configure_file(
+-        input: 'appmenu-gtk-module.service.in',
+-        output: 'appmenu-gtk-module.service',
+-        install_dir: userunitdir,
+-        configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
+-    )
++  else
++    userunitdir = '/usr/lib/systemd/user'
++  endif
+ endif
++configure_file(
++  input: 'appmenu-gtk-module.service.in',
++  output: 'appmenu-gtk-module.service',
++  install_dir: userunitdir,
++  configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
++)
+diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt
+index f93877a..ec0b3a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('gtk', type: 'array', choices : ['2','3'],  value: ['2','3'], description: 'Supported GTK versions')
+ option('tests', type : 'boolean', value : false, description: 'Parser tests')
+ option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference')
++option('userunitdir', type: 'string', description: 'Installation path for user unit file (optional)')
+-- 
+2.34.1
+
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1 b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1
new file mode 100644
index 000000000000..328f390af48b
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1
@@ -0,0 +1,13 @@
+case :$GTK_MODULES: in
+	*:appmenu-gtk-module:*)
+		;;
+	*)
+		GTK_MODULES=${GTK_MODULES}${GTK_MODULES:+:}appmenu-gtk-module
+esac
+
+if [ -z "$UBUNTU_MENUPROXY" ]; then
+    UBUNTU_MENUPROXY=1
+fi
+
+export GTK_MODULES
+export UBUNTU_MENUPROXY
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index ece47fbb4439..dda0de8cd4e4 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,5 +1,3 @@
-DIST i3lock-2.14.1.tar.xz 28756 BLAKE2B b38a3fafeebb5f8cebb643baeb875922659b556a5f919c2a837923e45e8f91a5f3ce297a424414ec9f05255e5888b91723617d837e5ffdbdf81aded42edc34cb SHA512 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb
 DIST i3lock-2.15.tar.xz 29100 BLAKE2B e84622e34a54681e162a3012c21fea4cc8b93a66e466647d65cc85f1a874d2be4d9988d54db74165b3dd1eccca1ca257a74b64ddbce08d681c9fc1c78701ee88 SHA512 6079f5233c0820c6e38f3cd8f3732d585e95e7d670408e4fb18ab580a2e1face8f3d6ea13eaaeedc8671f74def917183667e736b35306bf7c630d40625b41ac2
-EBUILD i3lock-2.14.1-r2.ebuild 622 BLAKE2B a389f2359009e3fd74fa4e7e27e8d8255453d42a4aebcd55f3d35e7c86f6d56553d2efd0037e3f7081118d041bc52bb2dc624860d7788c6b3d62f05d55e41943 SHA512 03e26fbf2f86c43c497fb8c9d086d9309c0e39fd0a5140125bbe9f7d6d9ea0cb0848f19667f5345ca33d108f3e6db29ca8805c2d1244ad61b0ca61681fc1ccac
 EBUILD i3lock-2.15.ebuild 622 BLAKE2B 272bafb02f695de9b0552b33cafb8ff75abbe68c9f0e96de884d4d9fbb8d589bdd2093a71803c016ea8ec5b9edc02a9e9fb88cffb92cee0ec8b56b3785500287 SHA512 2cc03b95416973c1ced27d642f7354e11c1945960f0412e0bb9786f94428b513936b5499421fffaa35f09c797f0a63ae27ac366e2328f42e5ab58c11291101fa
 MISC metadata.xml 322 BLAKE2B 7e8f44f7030d7a62fe02239f9ee4c125c16d2a4bd7b5c5c98070f4eb726ee1009e18bd178d116bf4410f7e4fb554f08f62605632c2c8a0a6222de231bb589054 SHA512 b6e6a89127471ce1bf0f8a6c9ab2fe11eb23d4d291fb403a86057cbf4b0fed7806ee45e58a5b7d06b20ecee3431792553d16cbf789aa81001d54deb428a6cbc1
diff --git a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
deleted file mode 100644
index ce0e41df1a3b..000000000000
--- a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/libev
-	sys-libs/pam
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb
-	x11-libs/libxkbcommon[X]
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-xrm"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:login:system-auth:g' pam/${PN} || die
-}