diff options
| author |   Matt Jolly <kangie@gentoo.org> | 2024-12-03 09:58:33 +1000 |
|---|---|---|
| committer | Matt Jolly <kangie@gentoo.org> | 2024-12-03 10:08:31 +1000 |
| commit | 1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1 (patch) | |
| tree | c87635bef7c5fe262fdd7e7e30431fb91400ac36 /x11-wm | |
| parent | x11-wm/fvwm3: remove duplicated `x11-libs/libXfixes` dependency (diff) | |
| download | gentoo-1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1.tar.gz gentoo-1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1.tar.bz2 gentoo-1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1.zip | |
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@gentoo.org>
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild (renamed from x11-wm/fvwm3/fvwm3-1.1.1.ebuild) | 21 | ||||
| -rw-r--r-- | 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 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:" |