[gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/

[David Seifert]

commit:     3cbd2df8742ab6563ec8c69932eeedd10023c4ab
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 07:42:03 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 07:42:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cbd2df8

x11-wm/fvwm3: [QA] remove userland_GNU

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../fvwm3/{fvwm3-1.0.4-r1.ebuild => fvwm3-1.0.4-r2.ebuild} | 14 +++-----------
 x11-wm/fvwm3/fvwm3-9999.ebuild                             | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild 
b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
similarity index 96%
rename from x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild
rename to x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
index c835d0b587c9..0a0e5ddfb57a 100644
--- a/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
@@ -20,14 +20,8 @@ else
 fi
 
 LICENSE="GPL-2+ FVWM
-       go? (
-                       Apache-2.0
-                       BSD
-                       MIT
-               )"
-
+       go? ( Apache-2.0 BSD MIT )"
 SLOT="0"
-
 IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla 
lock"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}"
@@ -54,6 +48,7 @@ RDEPEND="${PYTHON_DEPS}
        dev-libs/libevent:=
        media-libs/fontconfig
        media-libs/libpng:=
+       sys-apps/debianutils
        sys-libs/zlib
        x11-libs/libICE
        x11-libs/libSM
@@ -86,8 +81,7 @@ RDEPEND="${PYTHON_DEPS}
        svg? (
                gnome-base/librsvg:2
                x11-libs/cairo
-       )
-       userland_GNU? ( sys-apps/debianutils )"
+       )"
 
 DEPEND="${COMMON_DEPEND}
        x11-base/xorg-proto"
@@ -124,7 +118,6 @@ src_configure() {
        done
 
        local myconf=(
-               --prefix=/usr
                
--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
                --enable-package-subdirs
                $(use_enable bidi)
@@ -137,7 +130,6 @@ src_configure() {
                $(use_enable svg rsvg)
                --enable-png
                --enable-xft
-               --docdir=/usr/share/doc/${P}
        )
 
        use readline && myconf+=( --without-termcap-library )

diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 57341a49d6c0..224ee2abd20a 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -20,14 +20,8 @@ else
 fi
 
 LICENSE="GPL-2+ FVWM
-       go? (
-                       Apache-2.0
-                       BSD
-                       MIT
-               )"
-
+       go? ( Apache-2.0 BSD MIT )"
 SLOT="0"
-
 IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla 
lock"
 REQUIRED_USE="
        ${PYTHON_REQUIRED_USE}"
@@ -54,6 +48,7 @@ RDEPEND="${PYTHON_DEPS}
        dev-libs/libevent:=
        media-libs/fontconfig
        media-libs/libpng:=
+       sys-apps/debianutils
        sys-libs/zlib
        x11-libs/libICE
        x11-libs/libSM
@@ -87,8 +82,7 @@ RDEPEND="${PYTHON_DEPS}
        svg? (
                gnome-base/librsvg:2
                x11-libs/cairo
-       )
-       userland_GNU? ( sys-apps/debianutils )"
+       )"
 
 DEPEND="${COMMON_DEPEND}
        x11-base/xorg-proto"
@@ -125,7 +119,6 @@ src_configure() {
        done
 
        local myconf=(
-               --prefix=/usr
                
--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
                --enable-package-subdirs
                $(use_enable bidi)
@@ -137,7 +130,6 @@ src_configure() {
                $(use_with readline readline-library)
                $(use_enable svg rsvg)
                --enable-png
-               --docdir=/usr/share/doc/${P}
        )
 
        use readline && myconf+=( --without-termcap-library )