From: "Matt Jolly" <kangie@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
Date: Tue, 3 Dec 2024 00:09:17 +0000 (UTC) [thread overview]
Message-ID: <1733184511.1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1.kangie@gentoo> (raw)
commit: 1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 23:58:33 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 00:08:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e52d71b
x11-wm/fvwm3: add 1.1.1-r1; drop 1.1.1
Several unconditionally installed python scripts had `python_doscript`
gated by USE=go. We now fix the shebang unconditionally. Postinst
messages have been tidied up to match the actual behaviour of the
package.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
.../{fvwm3-1.1.1.ebuild => fvwm3-1.1.1-r1.ebuild} | 21 ++++++++++-----------
x11-wm/fvwm3/fvwm3-9999.ebuild | 21 ++++++++++-----------
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.1.1.ebuild b/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild
similarity index 83%
rename from x11-wm/fvwm3/fvwm3-1.1.1.ebuild
rename to x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild
index aa69372aa4c6..748831cac3fd 100644
--- a/x11-wm/fvwm3/fvwm3-1.1.1.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild
@@ -157,22 +157,21 @@ src_install() {
meson_src_install
- if ! use go; then
- python_scriptinto "/usr/bin"
- python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
- fi
+ python_scriptinto "/usr/bin"
+ python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
}
pkg_postinst() {
+
+ einfo "For compatibility with existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
+
if use go; then
- ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
- ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
- ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";"
- ewarn "however FvwmPrompt and FvwmCommand will not be installed."
+ einfo "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+ einfo "If you need FvwmConsole, install ${PN} with USE=\"-go\"; however FvwmPrompt will not be installed."
else
- ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
- ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
- ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
+ einfo "FvwmConsole has been installed, hovever it is a legacy tool."
+ einfo "Consider installing with USE=\"go\" which will have FvwmPrompt replace FvwmConsole to"
+ einfo "provide the same functionality in a more flexible way."
fi
optfeature_header "Useful optional features:"
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 4e208a4d2b14..ba5aca1aeb1f 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -153,22 +153,21 @@ src_install() {
meson_src_install
- if ! use go; then
- python_scriptinto "/usr/bin"
- python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
- fi
+ python_scriptinto "/usr/bin"
+ python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
}
pkg_postinst() {
+
+ einfo "For compatibility with existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
+
if use go; then
- ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
- ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper."
- ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";"
- ewarn "however FvwmPrompt and FvwmCommand will not be installed."
+ einfo "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
+ einfo "If you need FvwmConsole, install ${PN} with USE=\"-go\"; however FvwmPrompt will not be installed."
else
- ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
- ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
- ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
+ einfo "FvwmConsole has been installed, hovever it is a legacy tool."
+ einfo "Consider installing with USE=\"go\" which will have FvwmPrompt replace FvwmConsole to"
+ einfo "provide the same functionality in a more flexible way."
fi
optfeature_header "Useful optional features:"
next reply other threads:[~2024-12-03 0:09 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 0:09 Matt Jolly [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-27 9:16 [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ Matt Jolly
2025-06-04 10:22 Matt Jolly
2025-06-04 10:22 Matt Jolly
2025-05-01 7:34 Arthur Zamarin
2025-04-29 2:01 Sam James
2025-04-29 2:01 Sam James
2025-04-29 0:31 Matt Jolly
2025-03-12 23:24 Sam James
2025-02-20 11:38 Matt Jolly
2025-01-30 9:57 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-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-12-13 2:06 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=1733184511.1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1.kangie@gentoo \
--to=kangie@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