gentoo auto-resync : 28:09:2024 - 01:25:57

3 files changed, 103 insertions, 0 deletions

diff --git a/dev-build/muon/Manifest b/dev-build/muon/Manifest
index e43048d6c61b..41f9b1fab738 100644
--- a/dev-build/muon/Manifest
+++ b/dev-build/muon/Manifest
@@ -1,3 +1,7 @@
+AUX muon-0.3.0-fix-summary-call.patch 931 BLAKE2B 6ef7a7447e2149977b0deb9ece79dc41f841402b50612cd84f4359e3fdf2155017c8d90dec1f1c9311d13d57d246eaf4ea427b54e7af9968815d79d28d636c26 SHA512 67e26da93c131cf4b5c26af626bad7a211fe1dc3376f5686c24f92b79d11ecb7c0ff5ffb1aba81ef00d89aa9f4076af4430065b5bb07741aa3e6ca6d88966689
+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-v0.3.0.tar.gz 688544 BLAKE2B 6f5e9f91c1221135d8452b54bd781fb4324586d88503579af243c9889e17330d3d746a0e9fa4480a98d36ec5d55d1c335813bd19da81eaf2ef40dda42d32c418 SHA512 10d8d3d8d5df3898de22ed43fef234766e1884561d797a6462d614fd7be0f22eb7bbf40e096fe44d3e58f72e1fc631ef510f53a1e8ec36d4602ad7d5fe2771b3
 EBUILD muon-0.2.0-r2.ebuild 1055 BLAKE2B f02431d85724eee02653bc7f439717687320a88a4d24fff757fa9140dc06dccb2a42d39931dc56ffc7419e370115807b6502753779e119a8e02e5b0f0e3f073f SHA512 dcb0e044e5899ca63b1d421d4e4874ded32a73c792b2f4861781a9d0a17687d57b6a8663f427526bf378c9b7fd31e365d358cf6d33673fd35a0e39159d76d8f6
+EBUILD muon-0.3.0.ebuild 1536 BLAKE2B d4d31874a139e3ed3a44746bd04f08169e693e9297fde56be7ac35d5d83a128736d4f4f20d711326cbb1434bca921bb1a0212cce6e28bc403eaa860eda498de1 SHA512 329ca2b94832507d91825fba071f7946ab25f9ac512085f547da45e98af4f34e461fe2e3b7bd2e99d4cebbcf8ec215933c1c2e159eec5305e1a29bdf040f096a
 MISC metadata.xml 569 BLAKE2B 8712259e11150e15ad3e4db4291bb9091fab91cfa0901a9457e8538d13ef83fa3da0f0506257f47d4b43b160b1ac9088fe7dab1cd749300cdcd22a27917801ab SHA512 93910e7b6bff19ff5ca1a5987adfcc90eab1b90434c4003622b416a1a035d379ef0561f81f7be4edadcaf07fdbd491dcf0c52952f940d8545e79d4bb3c7c67e0
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..0d59cb98c195
--- /dev/null
+++ b/dev-build/muon/muon-0.3.0.ebuild
@@ -0,0 +1,71 @@
+# 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}/${PN}-v${PV}.tar.gz
+	test? (
+		 https://git.sr.ht/~lattis/meson-tests/archive/${MESON_TESTS_HASH}.tar.gz
+			-> ${MESON_TESTS_DIRNAME}.tar.gz
+	)
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+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
+}