gentoo auto-resync : 17:07:2022 - 14:31:38

6 files changed, 154 insertions, 2 deletions

diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index 82f430ec69a3..a1099dd7b82a 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1,4 +1,9 @@
 AUX appmenu-gtk-module 239 BLAKE2B c5f055154136c6ba862ce9f74edf898fd9baa5b699fe149fd29b125bd42cee94174e7f8f8bf7a40ee63e880f38a161a652e45c171dae399e8cd2b76e4a94e2f5 SHA512 daf70376ebcd1b67eec093c8b905b6d085d4206958573ce7aa8709c053928a78a7b8d06b6fdba9a221731d89e3fe6720394d1e8cee208adfaaf298825a9cc04e
+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
 DIST appmenu-gtk-module-0.7.3.tar.xz 48460 BLAKE2B b7008aa618e643a95445aad25bc19eed5b887810891318a891f088284f8f128e6392671226742a8b0c70699a9455739ee61ed56aec32129532ba53dc69809913 SHA512 d7df7e3cea3ccb66d013b23ae8796b8cbb0e0787f37f54078715c4863797c28d44ff38d7ac965b6eb0fd5cb327c1a4b891c74c66ba95b9b9a06e2c06ba5b2ad8
+DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5
 EBUILD appmenu-gtk-module-0.7.3-r2.ebuild 1074 BLAKE2B a7fd1ab2a33821a93feb0549636c3a2811b919eec34739ee92de29ba11fee82d531c8fd5345d5eb92f0b5116bb856ec4338636aa6461861ac879fcbbd4a0a7ad SHA512 3f5037160d95fb49c361719134279bcc409dd755c9ffee333d6287c3285b4fbe508690992fc311d0cdd9a5c398511555548144c84685786964fe2ff0e2495366
-MISC metadata.xml 331 BLAKE2B 7f59ec698ab53fd473b6b86beda723e6eee1ff024f29b16495102e7367091b6a38e1bcbb29a8b608480ec2230bf7a05dcd90a72982bd86daee7db531a97fe0db SHA512 bc0358ff8ff0a28a2a16f861df6d2f122396c655b07e7f61bf7b64dcf71f65c02f412fd4d24d14fc267b03f7065fcc6eb549147cdb99388f59f3d61c2290d924
+EBUILD appmenu-gtk-module-0.7.6.ebuild 1172 BLAKE2B 163c68207a77856a8f12dc035caf1c3d93f85c5ec847da70bc4e1ab3145ca2efcef5e93558efaee0d7e01b46e8fc41919f77f02ef21a989bcd52e217c1c893e5 SHA512 6ab7537c24c9155be85dfef7d43c51d7e27a0959c207a88b49f901dfa7974b4fbfc655c10526c9119596e8adf4e975e662eff397b1febf03b55e8a8f962f98c3
+MISC metadata.xml 417 BLAKE2B 6c9ebfbe4b02203037d8e79618f6423b842a4cd8906db9b6378b1588554f1c8bcf10b5e8d809b9e59abddae4727d5e28523630484fe528b2294f685ec3c8434f SHA512 bac77b5251306f7538a406105a7abca2c98ec9021a578d40c7cb2788f66af627c01c88b79576675a9a5adf5de5d634b5f5f28c033b4c9bab9d08936976692eff
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild
new file mode 100644
index 000000000000..8cfa793babbc
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson systemd
+
+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/e0b6a32a340922cd05060292b0757162/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gtk2 wayland"
+
+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}/${P}-no-automagic-gtk.patch"
+	"${FILESDIR}/${P}-no-automagic-unitdir.patch"
+	"${FILESDIR}/${P}-fix-pkgconfig.patch"
+)
+
+src_configure() {
+	# outputs [ '2', '3' ] OR [ '3' ]
+	local gtks="[$(usex gtk2 " '2'," '') '3' ]"
+
+	meson_src_configure -Dgtk="${gtks}" -Duserunitdir="$(systemd_get_userunitdir)"
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/${PN} 85-${PN}
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch
new file mode 100644
index 000000000000..f8b5439b28cb
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/meson.build	2020-10-28 22:05:23.000000000 +0100
++++ b/meson.build	2022-07-17 09:53:55.047880112 +0200
+@@ -1,6 +1,6 @@
+ project('appmenu-gtk-module', 'c',
+ 	meson_version: '>=0.49.0',
+-	version: '0.7',
++	version: '0.7.6',
+ 	license: ['LGPL-3.0-or-later'],
+     default_options: [
+         'c_std=gnu11',
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch
new file mode 100644
index 000000000000..716aefa37612
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch
@@ -0,0 +1,28 @@
+From 59994f8b0a431f61786de5715c45c24b0dd76cd1 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 4 Jan 2022 18:33:12 -0800
+Subject: [PATCH] appmenu-gtk-module/meson.build: only build gtk if requested
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ subprojects/appmenu-gtk-module/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/subprojects/appmenu-gtk-module/meson.build b/subprojects/appmenu-gtk-module/meson.build
+index 06ab76d..7279f97 100644
+--- a/meson.build
++++ b/meson.build
+@@ -41,8 +41,8 @@ gtk3_ver = '>=3.22.0'
+ gtk2 = dependency('gtk+-2.0', version: gtk2_ver, required: gtk2_requested)
+ gtk3 = dependency('gtk+-3.0', version: gtk3_ver, required: gtk3_requested)
+ 
+-build_gtk2 = gtk2.found()
+-build_gtk3 = gtk3.found()
++build_gtk2 = gtk2_requested and gtk2.found()
++build_gtk3 = gtk3_requested and gtk3.found()
+ 
+ #################
+ # Configuration #
+-- 
+2.34.1
+
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch
new file mode 100644
index 000000000000..e46fe74c0734
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-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_pkgconfig_variable('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/metadata.xml b/x11-misc/appmenu-gtk-module/metadata.xml
index c73224cc9ad9..5d2727e6e6bf 100644
--- a/x11-misc/appmenu-gtk-module/metadata.xml
+++ b/x11-misc/appmenu-gtk-module/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">derat/xsettingsd</remote-id>
+		<remote-id type="gitlab">vala-panel-project/vala-panel-appmenu</remote-id>
 	</upstream>
+	<use>
+		<flag name="gtk2">Build module for GTK+2</flag>
+	</use>
 </pkgmetadata>