public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/, dev-build/muon/files/
@ 2024-09-27 14:21 Arsen Arsenović
  0 siblings, 0 replies; only message in thread
From: Arsen Arsenović @ 2024-09-27 14:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4371535d3f3b35ba75546a27d3f8fa505c5f194e
Author:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 14:10:16 2024 +0000
Commit:     Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 14:20:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4371535d

dev-build/muon: add 0.3.0

Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>

 dev-build/muon/Manifest                            |  2 +
 .../muon/files/muon-0.3.0-fix-summary-call.patch   | 28 +++++++++
 dev-build/muon/muon-0.3.0.ebuild                   | 70 ++++++++++++++++++++++
 3 files changed, 100 insertions(+)

diff --git a/dev-build/muon/Manifest b/dev-build/muon/Manifest
index b8f74ef8574e..b49a2a87e073 100644
--- a/dev-build/muon/Manifest
+++ b/dev-build/muon/Manifest
@@ -1 +1,3 @@
+DIST meson-tests-1e565931348f15f3f9b654f46ab4bf5fa009ca4f.tar.gz 229885 BLAKE2B d53bbc854da00c1a91189f6c4539da782f4ff49d2a57d86c56b9512b8b832f32d094d750055bb0602fe60aff58821e10c5f00663be9479420e29f75fbfba01c9 SHA512 25fdb657a17a33140029600d84cb3182e635749b99af85c432da611349c10576e15d2f79d1f9eaa21e3359b65dd057ef388925c54ebdc9c072e4b24bec3be8f8
 DIST muon-0.2.0.tar.gz 510533 BLAKE2B 6ec67f8875e84fbc2f23f412825dd47b820cd44e97a16d9ac0ab0ba9db6e755a604b66b79d3dbe13d99440daf21c2f0ccbe69661b1fb3c7df3f636c61a0e4dcb SHA512 b2e90048756bdc26bdea24fe227a87ad4d0e57176e217e22ea492a55229c62e2a70243f60af1e162e2dde8468fdda9662a32ea5cfadd69fab95a83499efa077b
+DIST muon-0.3.0.tar.gz 445990 BLAKE2B d3b072a14a4d2a2c71a242ee05e6874f345582041be49a68bad3648919dc321456e99f966cc4a0e69ee69e86401b6c976a8b4fa3632280cd3b19582d175858a2 SHA512 32a0275845bcd6b3fba710d4820c9d88c74f02f9ed50b55118a9df10432ad169d67c713b071a2feeac7f1389fd4010486dcf3e631c33bf7a9af9f485bfad3772

diff --git a/dev-build/muon/files/muon-0.3.0-fix-summary-call.patch b/dev-build/muon/files/muon-0.3.0-fix-summary-call.patch
new file mode 100644
index 000000000000..fabc9edcdd82
--- /dev/null
+++ b/dev-build/muon/files/muon-0.3.0-fix-summary-call.patch
@@ -0,0 +1,28 @@
+From c7128efaabf82c1503e2ae30fed7c3c3dbe91f2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org>
+Date: Fri, 27 Sep 2024 15:08:01 +0200
+Subject: [PATCH] build: fix summary call for bestline in src/external
+
+Fixes the following error:
+
+  src/external/meson.build:74:4: ERROR: Summary section '' already have key 'libpkgconf'
+---
+ src/external/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/external/meson.build b/src/external/meson.build
+index 421dea76..853bf91e 100644
+--- a/src/external/meson.build
++++ b/src/external/meson.build
+@@ -71,7 +71,7 @@ readline_opt = get_option('readline')
+ dep_sources += files(f'readline_@readline_opt@.c')
+ if readline_opt != 'builtin'
+     dep = dependency(readline_opt)
+-    summary(name, dep.found())
++    summary(readline_opt, dep.found())
+     dep_dict += {name: dep.found()}
+     external_deps += [dep]
+ endif
+-- 
+2.46.1
+

diff --git a/dev-build/muon/muon-0.3.0.ebuild b/dev-build/muon/muon-0.3.0.ebuild
new file mode 100644
index 000000000000..6c54c3b64197
--- /dev/null
+++ b/dev-build/muon/muon-0.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo meson
+
+MESON_TESTS_HASH=1e565931348f15f3f9b654f46ab4bf5fa009ca4f
+MESON_TESTS_DIRNAME="meson-tests-${MESON_TESTS_HASH}"
+
+DESCRIPTION="A meson-compatible build system"
+HOMEPAGE="https://muon.build/"
+SRC_URI="
+	https://muon.build/releases/v${PV}/${P}.tar.gz
+	test? (
+		 https://git.sr.ht/~lattis/meson-tests/archive/${MESON_TESTS_HASH}.tar.gz
+			-> ${MESON_TESTS_DIRNAME}.tar.gz
+	)
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="+archive +curl +libpkgconf test"
+
+DEPEND="
+	curl? ( net-misc/curl )
+	archive? ( app-arch/libarchive:= )
+	libpkgconf? ( dev-util/pkgconf:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-text/scdoc
+"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-0.3.0-fix-summary-call.patch
+)
+
+src_unpack() {
+	default
+
+	if use test; then
+		edo mv "${WORKDIR}/${MESON_TESTS_DIRNAME}" \
+			"${S}"/tests/project/meson-tests
+	fi
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	cat >"${T}/program-file.ini" <<-EOF
+	[binaries]
+	git = 'if this exists youre a bad person'
+	EOF
+	local emesonargs=(
+		--native-file="${T}/program-file.ini"
+		$(meson_feature curl libcurl)
+		$(meson_feature archive libarchive)
+		$(meson_feature libpkgconf)
+		-Ddocs=enabled
+		-Dtracy=disabled    # not in repos
+		-Dsamurai=disabled  # patched version of samurai downloaded via wraps
+		-Dreadline=bestline # small vendored dependency
+	)
+	meson_src_configure
+}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2024-09-27 14:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-27 14:21 [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/, dev-build/muon/files/ Arsen Arsenović

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox