summaryrefslogtreecommitdiff
path: root/dev-build
diff options
context:
space:
mode:
Diffstat (limited to 'dev-build')
-rw-r--r--dev-build/corrosion/corrosion-0.5.2.ebuild2
-rw-r--r--dev-build/guildmaster/Manifest2
-rw-r--r--dev-build/guildmaster/files/0001-meson-add-build-system.patch55
-rw-r--r--dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch139
-rw-r--r--dev-build/guildmaster/guildmaster-0_pre20250712.ebuild (renamed from dev-build/guildmaster/guildmaster-0_pre20251122.ebuild)13
-rw-r--r--dev-build/guildmaster/guildmaster-9999.ebuild13
-rw-r--r--dev-build/ninja/ninja-9999.ebuild1
-rw-r--r--dev-build/steve/Manifest2
-rw-r--r--dev-build/steve/steve-1.0.0.ebuild63
-rw-r--r--dev-build/steve/steve-1.0.1.ebuild63
-rw-r--r--dev-build/steve/steve-1.0.2.ebuild18
-rw-r--r--dev-build/steve/steve-9999.ebuild18
12 files changed, 46 insertions, 343 deletions
diff --git a/dev-build/corrosion/corrosion-0.5.2.ebuild b/dev-build/corrosion/corrosion-0.5.2.ebuild
index 7d9613d83073..05842f0dace9 100644
--- a/dev-build/corrosion/corrosion-0.5.2.ebuild
+++ b/dev-build/corrosion/corrosion-0.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
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.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-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.sam@gentoo.org>
-In-Reply-To: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git.sam@gentoo.org>
-References: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-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
index 4eb4cf3fcb4d..1fee1ce2c30d 100644
--- a/dev-build/guildmaster/guildmaster-0_pre20251122.ebuild
+++ b/dev-build/guildmaster/guildmaster-0_pre20250712.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson systemd udev
+inherit linux-info meson systemd udev
DESCRIPTION="FIFO-like jobserver node via CUSE"
HOMEPAGE="https://codeberg.org/amonakov/guildmaster"
@@ -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,13 +25,12 @@ 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
-)
+pkg_pretend() {
+ local CONFIG_CHECK="~CUSE"
+ check_extra_config
+}
src_configure() {
local emesonargs=(
diff --git a/dev-build/guildmaster/guildmaster-9999.ebuild b/dev-build/guildmaster/guildmaster-9999.ebuild
index 4eb4cf3fcb4d..1fee1ce2c30d 100644
--- a/dev-build/guildmaster/guildmaster-9999.ebuild
+++ b/dev-build/guildmaster/guildmaster-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson systemd udev
+inherit linux-info meson systemd udev
DESCRIPTION="FIFO-like jobserver node via CUSE"
HOMEPAGE="https://codeberg.org/amonakov/guildmaster"
@@ -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,13 +25,12 @@ 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
-)
+pkg_pretend() {
+ local CONFIG_CHECK="~CUSE"
+ check_extra_config
+}
src_configure() {
local emesonargs=(
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 0ce81c709cd1..06ee36ddd779 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -42,7 +42,6 @@ PDEPEND="
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
- "${FILESDIR}"/${PN}-1.13.2-allow-psuedo-fifo.patch
)
pkg_setup() {
diff --git a/dev-build/steve/Manifest b/dev-build/steve/Manifest
index 621de6a670bf..7d81206c7267 100644
--- a/dev-build/steve/Manifest
+++ b/dev-build/steve/Manifest
@@ -1,3 +1 @@
-DIST steve-1.0.0.tar.bz2 11910 BLAKE2B c8ac3afaeb2d33a206dc4a234d71a516e0e66d4722bc4c422bd8fb64af8e4881cefbcb2733bd361433984dc5fd10bcf2758aa032f30b51c7b3f8486316e2f736 SHA512 9c35a0d90325d41362fa4ec0b45af744ee75a2c3f10ad72e31454d5a9867acc3d5f2bb817616d9cc017896b1c7ec4e83b6d8e667ad3f2afaa5b997c9007cac62
-DIST steve-1.0.1.tar.bz2 11977 BLAKE2B 119bc4900c9141a6616151a4d9f0a4ab32e22bf65c965cf19d3e8ca5a99e201d55a181649dd3bc678cb0fc44be251945695d3a4ecdcff6bda8d12c0b8366fb21 SHA512 5c20b0d1be7cec91a8b1ad84a16664c7a3bcc1df792b3efb96301f09e765b8d3553f0287a8a18a1ed43422734dcf291cbbbae5591b6a54659de472347b4a4f20
DIST steve-1.0.2.tar.bz2 12338 BLAKE2B e271557045be0d57a5a69da5bfb6a78e84ff0f53ecdb69f61d678cdda47564f1bc405c0d25d82df81d6ecff33168714afc3721787d8b04323df42c1f7efb6c0b SHA512 c93f8920bb80893224eb77dadfd40f3b86961e711dcf1a639bbe26bb28a0bf86afeda8e12d237ad5474d9461b6d50ecd05d250cbffecc57aa0075f023b49c7eb
diff --git a/dev-build/steve/steve-1.0.0.ebuild b/dev-build/steve/steve-1.0.0.ebuild
deleted file mode 100644
index 15a7a663ac92..000000000000
--- a/dev-build/steve/steve-1.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="A simple jobserver for Gentoo"
-HOMEPAGE="https://gitweb.gentoo.org/proj/steve.git/"
-SRC_URI="
- https://gitweb.gentoo.org/proj/steve.git/snapshot/${P}.tar.bz2
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- dev-libs/libevent:=
- sys-fs/fuse:3=
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-src_install() {
- meson_src_install
-
- # TODO: move these to meson
- systemd_dounit data/steve.service
- newconfd data/steve.confd steve
- newinitd data/steve.initd steve
- insinto /etc/sandbox.d
- newins data/sandbox.conf 90steve
- udev_newrules data/steve.udev 90-steve.rules
-}
-
-pkg_postinst() {
- udev_reload
-
- if ! grep -q -s -R -- '--jobserver-auth=fifo:/dev/steve' "${EROOT}"/etc/portage/make.conf
- then
- elog "In order to use system-wide steve instance, enable the service:"
- elog
- elog " systemctl enable steve"
- elog " systemctl start steve"
- elog
- elog "Then add to your make.conf:"
- elog
- elog ' MAKEFLAGS="--jobserver-auth=fifo:/dev/steve"'
- elog ' NINJAOPTS=""'
- elog
- elog "You can use -l in NINJAOPTS but *do not* use -j, as it disables"
- elog "job server support."
- fi
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/dev-build/steve/steve-1.0.1.ebuild b/dev-build/steve/steve-1.0.1.ebuild
deleted file mode 100644
index 2e414baad643..000000000000
--- a/dev-build/steve/steve-1.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd udev
-
-DESCRIPTION="A simple jobserver for Gentoo"
-HOMEPAGE="https://gitweb.gentoo.org/proj/steve.git/"
-SRC_URI="
- https://gitweb.gentoo.org/proj/steve.git/snapshot/${P}.tar.bz2
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64"
-
-DEPEND="
- dev-libs/libevent:=
- sys-fs/fuse:3=
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-src_install() {
- meson_src_install
-
- # TODO: move these to meson
- systemd_dounit data/steve.service
- newconfd data/steve.confd steve
- newinitd data/steve.initd steve
- insinto /etc/sandbox.d
- newins data/sandbox.conf 90steve
- udev_newrules data/steve.udev 90-steve.rules
-}
-
-pkg_postinst() {
- udev_reload
-
- if ! grep -q -s -R -- '--jobserver-auth=fifo:/dev/steve' "${EROOT}"/etc/portage/make.conf
- then
- elog "In order to use system-wide steve instance, enable the service:"
- elog
- elog " systemctl enable steve"
- elog " systemctl start steve"
- elog
- elog "Then add to your make.conf:"
- elog
- elog ' MAKEFLAGS="--jobserver-auth=fifo:/dev/steve"'
- elog ' NINJAOPTS=""'
- elog
- elog "You can use -l in NINJAOPTS but *do not* use -j, as it disables"
- elog "job server support."
- fi
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/dev-build/steve/steve-1.0.2.ebuild b/dev-build/steve/steve-1.0.2.ebuild
index 8518f29e4ee1..37287fd81579 100644
--- a/dev-build/steve/steve-1.0.2.ebuild
+++ b/dev-build/steve/steve-1.0.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson systemd udev
+inherit linux-info meson systemd udev
DESCRIPTION="A simple jobserver for Gentoo"
HOMEPAGE="https://gitweb.gentoo.org/proj/steve.git/"
@@ -13,7 +13,8 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug"
DEPEND="
dev-libs/libevent:=
@@ -26,6 +27,19 @@ BDEPEND="
virtual/pkgconfig
"
+pkg_pretend() {
+ local CONFIG_CHECK="~CUSE"
+ check_extra_config
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use !debug b_ndebug)
+ )
+
+ meson_src_configure
+}
+
src_install() {
meson_src_install
diff --git a/dev-build/steve/steve-9999.ebuild b/dev-build/steve/steve-9999.ebuild
index 6008c8a50c19..3b91fc9a19a5 100644
--- a/dev-build/steve/steve-9999.ebuild
+++ b/dev-build/steve/steve-9999.ebuild
@@ -3,14 +3,15 @@
EAPI=8
-inherit git-r3 meson systemd udev
+inherit git-r3 linux-info meson systemd udev
-DESCRIPTION="A simple jobserver for Gentoo"
+DESCRIPTION="A load-balancing jobserver for Gentoo"
HOMEPAGE="https://gitweb.gentoo.org/proj/steve.git/"
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/steve.git"
LICENSE="GPL-2+"
SLOT="0"
+IUSE="debug"
DEPEND="
dev-libs/libevent:=
@@ -23,6 +24,19 @@ BDEPEND="
virtual/pkgconfig
"
+pkg_pretend() {
+ local CONFIG_CHECK="~CUSE"
+ check_extra_config
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use !debug b_ndebug)
+ )
+
+ meson_src_configure
+}
+
src_install() {
meson_src_install