commit: 07ce0ec4f6054d327cc75711f45b835e5344f866
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 18 00:45:09 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov 18 01:43:03 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ce0ec4
dev-util/maturin: adjust for mdbook-0.5
Font licenses vary depending on which version of mdbook docs were
generated with so, to avoid ambiguity and keep it simple, set bounds.
No need for revbumps given the old licenses remain correct until it
is rebuilt (not that removal of CC-BY-4.0 would really be worth a
revbump either way).
`-d html` now creates files in the current directory rather than
the book's (guide/html) and, rather than use that, may as well
change it to "${T}"/html. Haven't tested if using an absolute path
works with the old version, but won't have to worry about this thanks
to the lower bound either way.
maturin's book has a different look with 0.5 which may or may not be
right/desirable, but it is entirely usable so not going to worry too
much about this. I'd assume upstream will update their usage later
which may hard-require >=0.5 either way.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-util/maturin/maturin-1.10.1.ebuild | 8 ++++----
dev-util/maturin/maturin-1.9.6.ebuild | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-util/maturin/maturin-1.10.1.ebuild
b/dev-util/maturin/maturin-1.10.1.ebuild
index 286d2fd8990f..e2cdbfbd3d0c 100644
--- a/dev-util/maturin/maturin-1.10.1.ebuild
+++ b/dev-util/maturin/maturin-1.10.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
"
# ^ tarball also includes test-crates' Cargo.lock(s) crates for tests
-LICENSE="|| ( Apache-2.0 MIT ) doc? ( CC-BY-4.0 OFL-1.1 )"
+LICENSE="|| ( Apache-2.0 MIT ) doc? ( OFL-1.1 )"
LICENSE+="
0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT MPL-2.0
Unicode-3.0 ZLIB BZIP2
@@ -36,7 +36,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? ( app-text/mdbook )
+ doc? ( >=app-text/mdbook-0.5 )
test? (
$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
dev-python/boltons[${PYTHON_USEDEP}]
@@ -102,7 +102,7 @@ src_configure() {
python_compile_all() {
cargo_src_compile
- use !doc || mdbook build -d html guide || die
+ use !doc || mdbook build -d "${T}"/html guide || die
if ! tc-is-cross-compiler; then
local maturin=$(cargo_target_dir)/maturin
@@ -147,7 +147,7 @@ python_install_all() {
dobin "$(cargo_target_dir)"/maturin
dodoc Changelog.md README.md
- use doc && dodoc -r guide/html
+ use doc && dodoc -r "${T}"/html
if ! tc-is-cross-compiler; then
dobashcomp "${T}"/${PN}
diff --git a/dev-util/maturin/maturin-1.9.6.ebuild
b/dev-util/maturin/maturin-1.9.6.ebuild
index 0db7bd358c87..dee4edfea6f1 100644
--- a/dev-util/maturin/maturin-1.9.6.ebuild
+++ b/dev-util/maturin/maturin-1.9.6.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? ( app-text/mdbook )
+ doc? ( <app-text/mdbook-0.5 )
test? (
$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]'
'python*')
dev-python/boltons[${PYTHON_USEDEP}]