From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
Date: Wed, 13 Dec 2023 02:06:06 +0000 (UTC) [thread overview]
Message-ID: <1702433107.7f70474f00e0250861d24f0230144feb317c4938.sam@gentoo> (raw)
commit: 7f70474f00e0250861d24f0230144feb317c4938
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Sat Dec 9 19:05:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 02:05:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f70474f
x11-wm/fvwm3: add 1.0.9
Fix man installation which was unintentionally disabled
alongside htmldoc.
Add pregenerated docs to avoid pulling in
ruby as a bdep.
Closes: https://bugs.gentoo.org/919240
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/34200
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/Manifest | 2 +
.../{fvwm3-9999.ebuild => fvwm3-1.0.9.ebuild} | 51 ++++++++++++++++++----
x11-wm/fvwm3/fvwm3-9999.ebuild | 51 ++++++++++++++++++----
3 files changed, 88 insertions(+), 16 deletions(-)
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index f7b692de43b2..047a3f4779c0 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1 +1,3 @@
DIST fvwm3-1.0.8.tar.gz 5644021 BLAKE2B c2a0a4953f556f86128452c8b42d8f86e2a02c9314cca17688987a51ed91bb3ecccf29e77f2b01c7ed444b54f45e402859ed1cce39714ad6d47860f639509b80 SHA512 fef69b6d97b3533e6722b48336aa8904b399c42437c4adcab756edf55cf839126002255dfa268bf7159d3bb9caf4d44c43a9217c9df5dc6224cef8461ecf2c34
+DIST fvwm3-1.0.9-docs.tar.xz 234884 BLAKE2B f52da9eb2486f7a212ead77ccc190c57076e1d3c73a3997c3a94edcf60dbc72ec5d410a8df1d621ff18b346741b1c94b3f87170db68c3067caa3295782a9bb61 SHA512 e6c33b09b7bac32bd61f1bd2c0216e2c99fef3f0b51b52b229093c25a437828e4bece382284d0c1f0bbbaf5b7459f2c391dfc1d2fa4ba80be22f09094e976b03
+DIST fvwm3-1.0.9.tar.gz 4525552 BLAKE2B cb58181adb42f5b8d491c6413277eb1f4a5d89637d9c6bb323223925c719d808e84ed0f72a1d0ffc822ddb8295ebf2bb89c2351ebd591916b50ebc69728e59fa SHA512 de71d74b76da8e0cf1560d51ef916857e3f825b272d786d9b6b93aef9a82c399f580b9b941a47aff1f327b097d12e1ce05860924e792206e4150ff19a5c39ee3
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
similarity index 79%
copy from x11-wm/fvwm3/fvwm3-9999.ebuild
copy to x11-wm/fvwm3/fvwm3-1.0.9.ebuild
index 8bc78a359bc5..343a8c61635c 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
@@ -3,6 +3,11 @@
EAPI=8
+# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
+# for release ebuilds.
+# Scripting for this is in sam-gentoo-scripts.
+: ${FVWM3_DOCS_PREBUILT:=1}
+
PYTHON_COMPAT=( python3_{10..12} )
GO_OPTIONAL=1
inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
@@ -16,13 +21,16 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH="main"
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz"
+ fi
KEYWORDS="~amd64 ~riscv"
fi
LICENSE="GPL-2+ FVWM
go? ( Apache-2.0 BSD MIT )"
SLOT="0"
-IUSE="bidi debug doc +go netpbm nls perl readline stroke svg tk lock"
+IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -41,12 +49,17 @@ fi
BDEPEND="
virtual/pkgconfig
- doc? ( dev-libs/libxslt
- dev-ruby/asciidoctor )
app-arch/unzip
go? ( >=dev-lang/go-1.14 )
"
+if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
+ BDEPEND+="
+ dev-libs/libxslt
+ dev-ruby/asciidoctor
+ "
+fi
+
RDEPEND="${PYTHON_DEPS}
${COMMON_DEPEND}
!x11-wm/fvwm
@@ -116,7 +129,6 @@ src_configure() {
--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
--enable-package-subdirs
$(use_enable bidi)
- $(use_enable doc mandoc)
$(use_enable go golang)
$(use_enable nls)
$(use_enable nls iconv)
@@ -126,6 +138,19 @@ src_configure() {
--enable-png
)
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ myconf+=(
+ --enable-mandoc
+ --enable-htmldoc
+ )
+ else
+ # Probably not required, but let's be safe
+ myconf+=(
+ --disable-mandoc
+ --disable-htmldoc
+ )
+ fi
+
use readline && myconf+=( --without-termcap-library )
econf "${myconf[@]}"
@@ -133,12 +158,22 @@ src_configure() {
src_compile() {
PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
- if [[ ${PV} == *9999 ]]; then
- use doc && emake -C doc
- fi
}
src_install() {
+ # Since we're manually handling docs installation, let's do that first
+ # and then install the rest of the files via emake
+ local HTML_DOCS
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
+ HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
+ else
+ HTML_DOCS="${S}"/doc/*.html
+ doman "${S}"/doc/*.[0-8]
+ fi
+
+ einstalldocs
+
emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
exeinto /etc/X11/Sessions
@@ -149,9 +184,9 @@ src_install() {
python_scriptinto "/usr/bin"
python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
- einstalldocs
make_session_desktop fvwm3 /usr/bin/fvwm3
+
}
pkg_postinst() {
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 8bc78a359bc5..343a8c61635c 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -3,6 +3,11 @@
EAPI=8
+# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
+# for release ebuilds.
+# Scripting for this is in sam-gentoo-scripts.
+: ${FVWM3_DOCS_PREBUILT:=1}
+
PYTHON_COMPAT=( python3_{10..12} )
GO_OPTIONAL=1
inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
@@ -16,13 +21,16 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH="main"
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz"
+ fi
KEYWORDS="~amd64 ~riscv"
fi
LICENSE="GPL-2+ FVWM
go? ( Apache-2.0 BSD MIT )"
SLOT="0"
-IUSE="bidi debug doc +go netpbm nls perl readline stroke svg tk lock"
+IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -41,12 +49,17 @@ fi
BDEPEND="
virtual/pkgconfig
- doc? ( dev-libs/libxslt
- dev-ruby/asciidoctor )
app-arch/unzip
go? ( >=dev-lang/go-1.14 )
"
+if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
+ BDEPEND+="
+ dev-libs/libxslt
+ dev-ruby/asciidoctor
+ "
+fi
+
RDEPEND="${PYTHON_DEPS}
${COMMON_DEPEND}
!x11-wm/fvwm
@@ -116,7 +129,6 @@ src_configure() {
--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
--enable-package-subdirs
$(use_enable bidi)
- $(use_enable doc mandoc)
$(use_enable go golang)
$(use_enable nls)
$(use_enable nls iconv)
@@ -126,6 +138,19 @@ src_configure() {
--enable-png
)
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ myconf+=(
+ --enable-mandoc
+ --enable-htmldoc
+ )
+ else
+ # Probably not required, but let's be safe
+ myconf+=(
+ --disable-mandoc
+ --disable-htmldoc
+ )
+ fi
+
use readline && myconf+=( --without-termcap-library )
econf "${myconf[@]}"
@@ -133,12 +158,22 @@ src_configure() {
src_compile() {
PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
- if [[ ${PV} == *9999 ]]; then
- use doc && emake -C doc
- fi
}
src_install() {
+ # Since we're manually handling docs installation, let's do that first
+ # and then install the rest of the files via emake
+ local HTML_DOCS
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
+ HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
+ else
+ HTML_DOCS="${S}"/doc/*.html
+ doman "${S}"/doc/*.[0-8]
+ fi
+
+ einstalldocs
+
emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
exeinto /etc/X11/Sessions
@@ -149,9 +184,9 @@ src_install() {
python_scriptinto "/usr/bin"
python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
- einstalldocs
make_session_desktop fvwm3 /usr/bin/fvwm3
+
}
pkg_postinst() {
next reply other threads:[~2023-12-13 2:06 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 2:06 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-30 9:57 [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ Arthur Zamarin
2025-01-30 0:10 Sam James
2025-01-30 0:10 Sam James
2025-01-30 0:10 Sam James
2024-12-15 5:18 Matt Jolly
2024-12-03 0:09 Matt Jolly
2024-12-03 0:09 Matt Jolly
2024-12-02 22:34 Matt Jolly
2024-11-08 8:29 Matt Jolly
2024-10-20 22:06 Matt Jolly
2024-03-22 3:14 Matt Jolly
2024-03-22 3:14 Matt Jolly
2024-03-22 3:06 Matt Jolly
2024-01-20 12:04 Sam James
2023-12-13 2:11 Sam James
2023-10-17 6:37 Joonas Niilola
2023-10-17 6:37 Joonas Niilola
2023-08-05 22:29 Sam James
2023-07-26 2:53 Sam James
2023-07-26 2:53 Sam James
2022-12-03 7:50 Sam James
2022-11-24 6:37 Jakov Smolić
2022-06-18 14:44 David Seifert
2022-06-18 7:42 David Seifert
2022-06-06 13:33 Yixun Lan
2022-06-06 13:33 Yixun Lan
2022-06-04 21:14 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1702433107.7f70474f00e0250861d24f0230144feb317c4938.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox