From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BCC371581F3 for ; Tue, 3 Dec 2024 00:09:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4487E07A9; Tue, 3 Dec 2024 00:09:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFBFDE07A9 for ; Tue, 3 Dec 2024 00:09:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4891341939 for ; Tue, 3 Dec 2024 00:09:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D38BA159E for ; Tue, 3 Dec 2024 00:09:17 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1733184511.1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1.kangie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild x11-wm/fvwm3/fvwm3-1.1.1.ebuild x11-wm/fvwm3/fvwm3-9999.ebuild X-VCS-Directories: x11-wm/fvwm3/ X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1 X-VCS-Branch: master Date: Tue, 3 Dec 2024 00:09:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a1d03d74-7e62-4ec5-be05-dd10edfb3839 X-Archives-Hash: c8e60c95c3a8790b3418947435f4455f commit: 1e52d71b0c3a14a754fb5b6d09a585ab39dd25a1 Author: Matt Jolly gentoo org> AuthorDate: Mon Dec 2 23:58:33 2024 +0000 Commit: Matt Jolly gentoo 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 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:"