commit: eb6ca0a1e0ff8679c7615b61e465fc72544749d1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 7 21:00:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 7 21:00:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6ca0a1
dev-build/guildmaster: add 0_pre20250712, drop 0_pre20251122 gm has been renamed upstream to guildmaster to avoid a conflict w/ graphicsmagick. Closes: https://bugs.gentoo.org/966745 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-build/guildmaster/Manifest | 2 +- .../files/0001-meson-add-build-system.patch | 55 -------- .../0002-Add-OpenRC-systemd-service-files.patch | 139 --------------------- ...122.ebuild => guildmaster-0_pre20250712.ebuild} | 8 +- dev-build/guildmaster/guildmaster-9999.ebuild | 8 +- 5 files changed, 3 insertions(+), 209 deletions(-) diff --git a/dev-build/guildmaster/Manifest b/dev-build/guildmaster/Manifest index 748704dd1ed1..433145277a80 100644 --- a/dev-build/guildmaster/Manifest +++ b/dev-build/guildmaster/Manifest @@ -1 +1 @@ -DIST guildmaster-1237d0d0158c3a6a1ffce2f5d98a9bdda5c23f2a.cb.tar.gz 3922 BLAKE2B fbe22b7c91de9eb1ee1e2bff3d7a1cf400909f897c0bb6814aa25d7968e3ed6ce6651eb7bb7e43f8ce35e6483049272d306dd8ecbcf8717cf2495dab4cd65a0e SHA512 3ab8e31d65d34eb20c1495b861bb4c74bb52df900cb839db6fe1156b306f46f2d1118d39413b07ac3e385539491f48227dccd737ffc0474bc1154d9314606438 +DIST guildmaster-463382ba5b47625a9355832cd792a164c54237f9.cb.tar.gz 4774 BLAKE2B 7291f09ce380d0e1a6e4ea8a3370310ac8a7b89f373082eb7bd4b705fba5ffd80d6edb5689fd0b5ca945c58119644b2bec3bd3bcb63e83abb964b9d66dbbf1f3 SHA512 799b2fb0645a0dc0e541cf73b60f779db74308c60922298af43122d3fb3acef0e4021d62c07fbd7c70f99aa8ae033f9fcd87bc71f8be3bba5441953dec367d7d diff --git a/dev-build/guildmaster/files/0001-meson-add-build-system.patch b/dev-build/guildmaster/files/0001-meson-add-build-system.patch deleted file mode 100644 index de6862ef6adc..000000000000 --- a/dev-build/guildmaster/files/0001-meson-add-build-system.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://codeberg.org/amonakov/guildmaster/pulls/1 - -From 418bfa323cf91c63fbc468568c274388fdf0c383 Mon Sep 17 00:00:00 2001 -Message-ID: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git....@gentoo.org> -From: Sam James <[email protected]> -Date: Thu, 27 Nov 2025 23:50:10 +0000 -Subject: [PATCH 1/2] meson: add build system - -For ease of packaging. ---- - meson.build | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - create mode 100644 meson.build - -diff --git a/meson.build b/meson.build -new file mode 100644 -index 0000000..83d2123 ---- /dev/null -+++ b/meson.build -@@ -0,0 +1,32 @@ -+project( -+ 'guildmaster', -+ 'c', -+ license: 'ISC', -+ meson_version: '>= 1.3.0', -+ version: '0.1', -+ default_options: ['warning_level=3'], -+) -+ -+fuse_dep = dependency('fuse3') -+udev_dep = dependency('udev', required: false) -+ -+dependencies = [fuse_dep] -+ -+gm_run_exe = executable( -+ 'gm-run', -+ ['gm-run.c'], -+ dependencies: dependencies, -+ install: true, -+) -+ -+gm_exe = executable( -+ 'gm', -+ ['gm.c'], -+ dependencies: dependencies, -+ install: true, -+) -+ -+install_data( -+ ['cuse-guild.rules'], -+ install_dir: join_paths(udev_dep.get_variable('udevdir'), 'rules.d'), -+) --- -2.52.0 - diff --git a/dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch b/dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch deleted file mode 100644 index 84e69fae679a..000000000000 --- a/dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch +++ /dev/null @@ -1,139 +0,0 @@ -https://codeberg.org/amonakov/guildmaster/pulls/1 - -From 22a4fc1504f547b1f685e43bf36b85abdb3b2b8d Mon Sep 17 00:00:00 2001 -Message-ID: <22a4fc1504f547b1f685e43bf36b85abdb3b2b8d.1764304322.git....@gentoo.org> -In-Reply-To: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git....@gentoo.org> -References: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git....@gentoo.org> -From: Sam James <[email protected]> -Date: Fri, 28 Nov 2025 02:05:02 +0000 -Subject: [PATCH 2/2] Add OpenRC, systemd service files - ---- - guildmaster.confd | 1 + - guildmaster.initd | 5 ++++ - guildmaster.service | 7 ++++++ - meson.build | 57 +++++++++++++++++++++++++++++++++++++++++---- - meson.options | 5 ++++ - 5 files changed, 70 insertions(+), 5 deletions(-) - create mode 100644 guildmaster.confd - create mode 100644 guildmaster.initd - create mode 100644 guildmaster.service - create mode 100644 meson.options - -diff --git a/guildmaster.confd b/guildmaster.confd -new file mode 100644 -index 0000000..3192f17 ---- /dev/null -+++ b/guildmaster.confd -@@ -0,0 +1 @@ -+#GUILDMASTER_OPTS="" -diff --git a/guildmaster.initd b/guildmaster.initd -new file mode 100644 -index 0000000..b2bf171 ---- /dev/null -+++ b/guildmaster.initd -@@ -0,0 +1,5 @@ -+#!/sbin/openrc-run -+command="/usr/bin/gm" -+command_args="${GUILDMASTER_OPTS}" -+command_background=true -+pidfile="/run/${RC_SVCNAME}.pid" -diff --git a/guildmaster.service b/guildmaster.service -new file mode 100644 -index 0000000..d76a6bb ---- /dev/null -+++ b/guildmaster.service -@@ -0,0 +1,7 @@ -+[Service] -+Type=exec -+ExecStart=/usr/bin/gm -+ -+[Install] -+WantedBy=multi-user.target -+ -diff --git a/meson.build b/meson.build -index 83d2123..c1ade60 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,7 +8,14 @@ project( - ) - - fuse_dep = dependency('fuse3') --udev_dep = dependency('udev', required: false) -+ -+if get_option('udev') -+ udev_dep = dependency('udev', required: false) -+endif -+ -+if get_option('systemd') -+ systemd_dep = dependency('systemd', required: false) -+endif - - dependencies = [fuse_dep] - -@@ -26,7 +33,47 @@ gm_exe = executable( - install: true, - ) - --install_data( -- ['cuse-guild.rules'], -- install_dir: join_paths(udev_dep.get_variable('udevdir'), 'rules.d'), --) -+if get_option('udev') -+ if udev_dep.found() -+ udevrulesdir = join_paths(udev_dep.get_variable('udevdir'), 'rules.d') -+ else -+ udevrulesdir = get_option('udevrulesdir') -+ if udevrulesdir = '' -+ udevrulesdir = '/usr/lib/udev/rules.d' -+ endif -+ endif -+ -+ install_data( -+ ['cuse-guild.rules'], -+ install_dir: udevrulesdir, -+ ) -+endif -+ -+if get_option('openrc') -+ install_data( -+ ['guildmaster.confd'], -+ rename: ['guildmaster'], -+ install_dir: '/etc/conf.d', -+ ) -+ install_data( -+ ['guildmaster.initd'], -+ rename: ['guildmaster'], -+ install_dir: '/etc/init.d', -+ ) -+endif -+ -+if get_option('systemd') -+ if systemd_dep.found() -+ systemdunitdir = systemd_dep.get_variable('systemdsystemunitdir') -+ else -+ systemdunitdir = get_option('systemdunitdir') -+ if systemdunitdir = '' -+ systemdunitdirdir = '/usr/lib/systemd/system' -+ endif -+ endif -+ -+ install_data( -+ ['guildmaster.service'], -+ install_dir: systemdunitdir, -+ ) -+endif -diff --git a/meson.options b/meson.options -new file mode 100644 -index 0000000..4b5dd5d ---- /dev/null -+++ b/meson.options -@@ -0,0 +1,5 @@ -+option('openrc', type : 'boolean', value : true, description : 'Install OpenRC service files') -+option('systemd', type : 'boolean', value : true, description : 'Install systemd service files') -+option('systemdunitdir', type: 'string', description: 'systemd services directory (defaults to /usr/lib/systemd/system') -+option('udev', type : 'boolean', value : true, description : 'Install udev rules') -+option('udevrulesdir', type : 'string', description : 'udev rules directory (defaults to /usr/lib/udev/rules.d)') --- -2.52.0 - diff --git a/dev-build/guildmaster/guildmaster-0_pre20251122.ebuild b/dev-build/guildmaster/guildmaster-0_pre20250712.ebuild similarity index 87% rename from dev-build/guildmaster/guildmaster-0_pre20251122.ebuild rename to dev-build/guildmaster/guildmaster-0_pre20250712.ebuild index 4eb4cf3fcb4d..15b29560683f 100644 --- a/dev-build/guildmaster/guildmaster-0_pre20251122.ebuild +++ b/dev-build/guildmaster/guildmaster-0_pre20250712.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://codeberg.org/amonakov/guildmaster.git"; inherit git-r3 else - GUILDMASTER_COMMIT="1237d0d0158c3a6a1ffce2f5d98a9bdda5c23f2a" + GUILDMASTER_COMMIT="463382ba5b47625a9355832cd792a164c54237f9" SRC_URI="https://codeberg.org/amonakov/guildmaster/archive/${GUILDMASTER_COMMIT}.tar.gz -> ${PN}-${GUILDMASTER_COMMIT}.cb.tar.gz" S="${WORKDIR}"/${PN} @@ -25,14 +25,8 @@ SLOT="0" DEPEND="sys-fs/fuse:3=" RDEPEND=" ${DEPEND} - !media-gfx/graphicsmagick " -PATCHES=( - "${FILESDIR}"/0001-meson-add-build-system.patch - "${FILESDIR}"/0002-Add-OpenRC-systemd-service-files.patch -) - src_configure() { local emesonargs=( -Dopenrc=true diff --git a/dev-build/guildmaster/guildmaster-9999.ebuild b/dev-build/guildmaster/guildmaster-9999.ebuild index 4eb4cf3fcb4d..15b29560683f 100644 --- a/dev-build/guildmaster/guildmaster-9999.ebuild +++ b/dev-build/guildmaster/guildmaster-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://codeberg.org/amonakov/guildmaster.git"; inherit git-r3 else - GUILDMASTER_COMMIT="1237d0d0158c3a6a1ffce2f5d98a9bdda5c23f2a" + GUILDMASTER_COMMIT="463382ba5b47625a9355832cd792a164c54237f9" SRC_URI="https://codeberg.org/amonakov/guildmaster/archive/${GUILDMASTER_COMMIT}.tar.gz -> ${PN}-${GUILDMASTER_COMMIT}.cb.tar.gz" S="${WORKDIR}"/${PN} @@ -25,14 +25,8 @@ SLOT="0" DEPEND="sys-fs/fuse:3=" RDEPEND=" ${DEPEND} - !media-gfx/graphicsmagick " -PATCHES=( - "${FILESDIR}"/0001-meson-add-build-system.patch - "${FILESDIR}"/0002-Add-OpenRC-systemd-service-files.patch -) - src_configure() { local emesonargs=( -Dopenrc=true
