* [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
@ 2024-03-19 5:50 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-19 5:50 UTC (permalink / raw
To: gentoo-commits
commit: dc2c00b8941313bd52903e903c6e00b4a10d1c8a
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 19 04:51:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 05:48:27 2024 +0000
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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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
)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
@ 2024-03-19 5:50 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-19 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 913574fab56ea0ebc5175e11807ad71caaefc760
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 19 04:36:13 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 05:48:27 2024 +0000
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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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}]
')
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
@ 2024-03-19 5:50 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-19 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 1c8063fa693bc5f298d9d27eb68ec82144e51701
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 19 05:00:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 05:48:28 2024 +0000
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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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 59c986c4c4d545a6488cd74a2b6563b867716b74aab95fd19a745ce46a99fe5222232e132c80c5ed80f3e61d13e74cf2dc13b1b6d4638fd40a69d82d0d74faaa
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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
@ 2024-03-19 6:09 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-19 6:09 UTC (permalink / raw
To: gentoo-commits
commit: 31861456ece255e321da220c053e3e42cce5c9e3
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 19 06:03:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 06:05:49 2024 +0000
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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/
@ 2024-09-27 18:05 Arsen Arsenović
0 siblings, 0 replies; 5+ messages in thread
From: Arsen Arsenović @ 2024-09-27 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 7245155aea2209ec826378337ea14f02c0c27dfa
Author: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 18:02:13 2024 +0000
Commit: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 18:03:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7245155a
dev-build/muon: update SRC_URI
Closes: https://bugs.gentoo.org/940348
Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
dev-build/muon/Manifest | 2 +-
dev-build/muon/muon-0.3.0.ebuild | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-build/muon/Manifest b/dev-build/muon/Manifest
index b49a2a87e073..57ee3c39d2cc 100644
--- a/dev-build/muon/Manifest
+++ b/dev-build/muon/Manifest
@@ -1,3 +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
+DIST muon-v0.3.0.tar.gz 688544 BLAKE2B 6f5e9f91c1221135d8452b54bd781fb4324586d88503579af243c9889e17330d3d746a0e9fa4480a98d36ec5d55d1c335813bd19da81eaf2ef40dda42d32c418 SHA512 10d8d3d8d5df3898de22ed43fef234766e1884561d797a6462d614fd7be0f22eb7bbf40e096fe44d3e58f72e1fc631ef510f53a1e8ec36d4602ad7d5fe2771b3
diff --git a/dev-build/muon/muon-0.3.0.ebuild b/dev-build/muon/muon-0.3.0.ebuild
index 6c54c3b64197..0d59cb98c195 100644
--- a/dev-build/muon/muon-0.3.0.ebuild
+++ b/dev-build/muon/muon-0.3.0.ebuild
@@ -11,12 +11,13 @@ 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
+ 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"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-27 18:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-19 5:50 [gentoo-commits] repo/gentoo:master commit in: dev-build/muon/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-27 18:05 Arsen Arsenović
2024-03-19 6:09 Sam James
2024-03-19 5:50 Sam James
2024-03-19 5:50 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox