commit:     2f41f39f5eb7cf91e9d9771797fce5444b7871f9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 12:19:25 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 12:23:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f41f39f

x11-themes/fvwm-crystal: use https in HOMEPAGE, more skel.ebuild style

Sort RDEPENDS
optfeature: media-sound/jack-audio-connection-kit -> virtual/jack

Bug: https://bugs.gentoo.org/895406
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild | 27 ++++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild 
b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
index d5a1fbfa9776..8162d9f4dd42 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
@@ -7,11 +7,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit readme.gentoo-r1 python-single-r1 optfeature
 
 DESCRIPTION="Configurable FVWM theme with transparency and freedesktop 
compatible menu"
-HOMEPAGE="http://fvwm-crystal.sourceforge.net/";
-
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+HOMEPAGE="https://fvwm-crystal.sourceforge.net/";
 
 if [[ ${PV} = *9999 ]]; then
        inherit git-r3
@@ -21,17 +17,22 @@ else
        KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="${PYTHON_DEPS}
        acct-group/fvwm-crystal
-       || ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] )
-       virtual/imagemagick-tools
-       || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
-       || ( x11-misc/hsetroot media-gfx/feh )
+       app-alternatives/awk
+       media-sound/alsa-utils
        sys-apps/sed
        sys-devel/bc
-       app-alternatives/awk
+       virtual/imagemagick-tools
        x11-apps/xwd
-       media-sound/alsa-utils"
+       || ( x11-misc/hsetroot media-gfx/feh )
+       || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+       || ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] )
+"
 
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="After a first time installation, execute the following commands:
@@ -55,7 +56,7 @@ src_install() {
                prefix="${EPREFIX}/usr" \
                install
        # GNU License is globally in the portage tree
-       rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE
+       rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE || die
 
        python_doscript "${ED}/usr/bin/${PN}".{apps,wallpaper}
        python_scriptinto "/usr/share/${PN}"/fvwm/scripts/FvwmMPD
@@ -67,5 +68,5 @@ pkg_postinst() {
        readme.gentoo_print_elog
        optfeature "localized XDG user directories support" 
"x11-misc/xdg-user-dirs"
        optfeature "hibernate/resume support" "sys-apps/systemd"
-       optfeature "professional sound server" 
"media-sound/jack-audio-connection-kit"
+       optfeature "professional sound server" "virtual/jack"
 }

Reply via email to