[gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
commit: 31861456ece255e321da220c053e3e42cce5c9e3
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 19 06:03:16 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 19 06:05:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31861456
dev-build/muon: bump the revision for the content change in man pages
Oops.
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
dev-build/muon/{muon-0.2.0-r1.ebuild => muon-0.2.0-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-build/muon/muon-0.2.0-r1.ebuild
b/dev-build/muon/muon-0.2.0-r2.ebuild
similarity index 100%
rename from dev-build/muon/muon-0.2.0-r1.ebuild
rename to dev-build/muon/muon-0.2.0-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
commit: 1c8063fa693bc5f298d9d27eb68ec82144e51701
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 19 05:00:44 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 19 05:48:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8063fa
dev-build/muon: stop building meson-reference(3)
It is shipped directly by dev-build/meson now.
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
dev-build/muon/Manifest | 1 -
dev-build/muon/muon-0.2.0-r1.ebuild | 13 +
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/dev-build/muon/Manifest b/dev-build/muon/Manifest
index e57b5b1130cf..b8f74ef8574e 100644
--- a/dev-build/muon/Manifest
+++ b/dev-build/muon/Manifest
@@ -1,2 +1 @@
-DIST meson-docs-0.64.1-19-g39c6fa4bc.tar.gz 78525 BLAKE2B
19f4768e70f38f744de9bebfcc7416f8ab7f414693dc1f3e379bbbc8370e3d3187e6a9e311a08c054bdfaf1d15efd225558de7d41d688fc4c4a10e3215af85ae
SHA512
59c986c4c4d545a6488cd74a2b6563b867716b74aab95fd19a745ce46a99fe532e132c80c5ed80f3e61d13e74cf2dc13b1b6d4638fd40a69d82d0d74faaa
DIST muon-0.2.0.tar.gz 510533 BLAKE2B
6ec67f8875e84fbc2f23f412825dd47b820cd44e97a16d9ac0ab0ba9db6e755a604b66b79d3dbe13d99440daf21c2f0ccbe69661b1fb3c7df3f636c61a0e4dcb
SHA512
b2e90048756bdc26bdea24fe227a87ad4d0e57176e217e22ea492a55229c62e2a70243f60af1e162e2dde8468fdda9662a32ea5cfadd69fab95a83499efa077b
diff --git a/dev-build/muon/muon-0.2.0-r1.ebuild
b/dev-build/muon/muon-0.2.0-r1.ebuild
index 938872f273f3..6f2e8fcbdd8d 100644
--- a/dev-build/muon/muon-0.2.0-r1.ebuild
+++ b/dev-build/muon/muon-0.2.0-r1.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-any-r1
+inherit meson
COMMIT_HASH="${PV}"
MESON_DOCS_TAR=meson-docs-0.64.1-19-g39c6fa4bc.tar.gz
@@ -13,7 +12,6 @@ DESCRIPTION="A meson-compatible build system"
HOMEPAGE="https://muon.build/";
SRC_URI="
https://git.sr.ht/~lattis/muon/archive/${COMMIT_HASH}.tar.gz ->
${P}.tar.gz
- https://mochiro.moe/wrap/${MESON_DOCS_TAR}
"
# Apache-2.0 for meson-docs
@@ -32,19 +30,10 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="
app-text/scdoc
- $(python_gen_any_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
"
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
src_prepare() {
default
-
- mv "${WORKDIR}/meson-docs" "${S}/subprojects" || die
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
commit: dc2c00b8941313bd52903e903c6e00b4a10d1c8a
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 19 04:51:27 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 19 05:48:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2c00b8
dev-build/muon: remove USE=man
It is against QA policy, see PG0305: Installation of manpages
> Rationale: Manpages are basic documentation for installed software.
> While additional dependencies are inconvenient for users, not building
> manpages is harmful. Including (optionally or unconditionally) prebuilt
> manpages is a good compromise.
In particular, these dependencies are quite trivial to install so it's
no burden to simply always require them, and better than building
muon(1) and shipping it inside of files/, so just add the silly
dependency. :P
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
dev-build/muon/muon-0.2.0-r1.ebuild | 28 +---
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/dev-build/muon/muon-0.2.0-r1.ebuild
b/dev-build/muon/muon-0.2.0-r1.ebuild
index 6137944d18c0..938872f273f3 100644
--- a/dev-build/muon/muon-0.2.0-r1.ebuild
+++ b/dev-build/muon/muon-0.2.0-r1.ebuild
@@ -13,16 +13,14 @@ DESCRIPTION="A meson-compatible build system"
HOMEPAGE="https://muon.build/";
SRC_URI="
https://git.sr.ht/~lattis/muon/archive/${COMMIT_HASH}.tar.gz ->
${P}.tar.gz
- man? (
- https://mochiro.moe/wrap/${MESON_DOCS_TAR}
- )
+ https://mochiro.moe/wrap/${MESON_DOCS_TAR}
"
# Apache-2.0 for meson-docs
-LICENSE="GPL-3 man? ( Apache-2.0 )"
+LICENSE="GPL-3 Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
-IUSE="+archive +curl +libpkgconf +man"
+IUSE="+archive +curl +libpkgconf"
S="${WORKDIR}/${PN}-${COMMIT_HASH}"
@@ -33,28 +31,20 @@ DEPEND="
"
RDEPEND="${DEPEND}"
BDEPEND="
- man? (
- app-text/scdoc
- $(python_gen_any_dep '
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
- )
+ app-text/scdoc
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
"
python_check_deps() {
python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
}
-pkg_setup() {
- use man && python-any-r1_pkg_setup
-}
-
src_prepare() {
default
- if use man; then
- mv "${WORKDIR}/meson-docs" "${S}/subprojects" || die
- fi
+ mv "${WORKDIR}/meson-docs" "${S}/subprojects" || die
}
src_configure() {
@@ -62,7 +52,7 @@ src_configure() {
$(meson_feature curl libcurl)
$(meson_feature archive libarchive)
$(meson_feature libpkgconf)
- $(meson_feature man docs)
+ -Ddocs=enabled
-Dsamurai=disabled # patched version of samurai downloaded via
wraps
-Dbestline=enabled # vendored bestline, an insignificant
addition
)
[gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
commit: 913574fab56ea0ebc5175e11807ad71caaefc760
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 19 04:36:13 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 19 05:48:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913574fa
dev-build/muon: properly depend on scdoc
It is a program that gets run by the build system, so installing it to
the cross compiled system doesn't exactly help.
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
dev-build/muon/muon-0.2.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-build/muon/muon-0.2.0-r1.ebuild
b/dev-build/muon/muon-0.2.0-r1.ebuild
index a6f3e8102624..6137944d18c0 100644
--- a/dev-build/muon/muon-0.2.0-r1.ebuild
+++ b/dev-build/muon/muon-0.2.0-r1.ebuild
@@ -30,11 +30,11 @@ DEPEND="
curl? ( net-misc/curl )
archive? ( app-arch/libarchive:= )
libpkgconf? ( dev-util/pkgconf:= )
- man? ( app-text/scdoc )
"
RDEPEND="${DEPEND}"
BDEPEND="
man? (
+ app-text/scdoc
$(python_gen_any_dep '
dev-python/pyyaml[${PYTHON_USEDEP}]
')
[gentoo-commits] repo/gentoo:master commit in: dev-build/muon/, profiles/updates/, dev-util/muon/
commit: 424977bdc38b8d809830b35c3be6a74b963ab31c
Author: Eli Schwartz gmail com>
AuthorDate: Tue Jan 16 23:05:35 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 17 05:42:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424977bd
Move {dev-util → dev-build}/muon
Signed-off-by: Eli Schwartz gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34846
Signed-off-by: Sam James gentoo.org>
{dev-util => dev-build}/muon/Manifest | 0
{dev-util => dev-build}/muon/metadata.xml | 0
{dev-util => dev-build}/muon/muon-0.2.0-r1.ebuild | 2 +-
profiles/updates/1Q-2024 | 1 +
4 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-util/muon/Manifest b/dev-build/muon/Manifest
similarity index 100%
rename from dev-util/muon/Manifest
rename to dev-build/muon/Manifest
diff --git a/dev-util/muon/metadata.xml b/dev-build/muon/metadata.xml
similarity index 100%
rename from dev-util/muon/metadata.xml
rename to dev-build/muon/metadata.xml
diff --git a/dev-util/muon/muon-0.2.0-r1.ebuild
b/dev-build/muon/muon-0.2.0-r1.ebuild
similarity index 97%
rename from dev-util/muon/muon-0.2.0-r1.ebuild
rename to dev-build/muon/muon-0.2.0-r1.ebuild
index 8ffb688bf9b7..a6f3e8102624 100644
--- a/dev-util/muon/muon-0.2.0-r1.ebuild
+++ b/dev-build/muon/muon-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024
index 7b623bc478bb..b0271fd2ae82 100644
--- a/profiles/updates/1Q-2024
+++ b/profiles/updates/1Q-2024
@@ -36,3 +36,4 @@ move sys-devel/automake dev-build/automake
move sys-devel/slibtool dev-build/slibtool
move sys-devel/libtool dev-build/libtool
move dev-util/mage dev-build/mage
+move dev-util/muon dev-build/muon
