commit:     1e0b17527951df6a9661a44b245d118fe7a2d144
Author:     Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Tue Oct 17 05:44:49 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 06:37:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0b1752

x11-wm/fvwm3: drop 1.0.4-r2, 1.0.6a, 1.0.7

Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-wm/fvwm3/Manifest              |   2 -
 x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild | 177 -------------------------------------
 x11-wm/fvwm3/fvwm3-1.0.6a.ebuild   | 167 ----------------------------------
 x11-wm/fvwm3/fvwm3-1.0.7.ebuild    | 166 ----------------------------------
 4 files changed, 512 deletions(-)

diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index 390ad34b2b72..a7170599e5f2 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1,3 +1 @@
-DIST fvwm3-1.0.4.tar.gz 4691719 BLAKE2B 
4ce93b1a2d110b570b5fc8b253f9ff8ea1f44e5470c6e1bc136a53ebe53a23abe3d075bf351fca54ac110ea5731f9b44c59c83186d320e7509bf26e5144436ca
 SHA512 
b72a1ebeba7c55214603fd43ea439f7283b3c79e39d2671a67b9512c67dcea111377eab2131ed0b18a72f6b772b0d048abe08f52565708367465ed9bb14e85f6
-DIST fvwm3-1.0.6a.tar.gz 4538100 BLAKE2B 
c71087eb09a17760ff5754060c4639228f268a0f3640ce0d92d7d8f807aa0df36eac998da0ed943787f1bb369ac90b7b2ca65d922120d41ed81a940be7756f4f
 SHA512 
7577e0dde1f7c5c54024207cf48ab5b816c87fc163735e44eb72e66561c67c08f6a06e7fbf5c89fa6180b692ce25e5121845476d0d1dcfb8273b0aa7321d28f9
 DIST fvwm3-1.0.7.tar.gz 4512128 BLAKE2B 
9e7363355f3d3221dc72175c6ff449a476a32020248dc580c4b73687759c49b255bab8b7e29440fa1473153459ef984369e88d331a0b55154114e3c901867003
 SHA512 
91973abb7b3f79cec4fba28d9aa071923aa975eae3f3e00257e8633e2d376732cd5db7e42a4330bc849f807fc149abfbeef6100fe2ca6c05c847b61ee48236ed

diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild 
b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
deleted file mode 100644
index 6a3f6cabc32f..000000000000
--- a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-GO_OPTIONAL=1
-inherit autotools desktop flag-o-matic go-module python-single-r1 
toolchain-funcs
-
-DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
-HOMEPAGE="https://www.fvwm.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git";
-       EGIT_BRANCH="master"
-else
-       
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~riscv"
-fi
-
-LICENSE="GPL-2+ FVWM
-       go? ( Apache-2.0 BSD MIT )"
-SLOT="0"
-IUSE="bidi debug doc go netpbm nls perl readline stroke svg tk vanilla lock"
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}"
-
-DOCS=( NEWS )
-
-if [[ ${PV} == 9999 ]]; then
-       DOCS+=( dev-docs/COMMANDS dev-docs/DEVELOPERS.md dev-docs/INSTALL.md 
dev-docs/PARSING.md dev-docs/TODO.md dev-docs/NEW-COMMANDS.md )
-fi
-
-BDEPEND="
-       virtual/pkgconfig
-       doc? ( dev-libs/libxslt
-               dev-ruby/asciidoctor )
-       app-arch/unzip
-       go? ( >=dev-lang/go-1.14 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-       ${COMMON_DEPEND}
-       !x11-wm/fvwm
-       dev-lang/perl
-       dev-libs/glib:2
-       dev-libs/libevent:=
-       media-libs/fontconfig
-       media-libs/libpng:=
-       sys-apps/debianutils
-       sys-libs/zlib
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libxcb
-       x11-libs/libXcursor
-       x11-libs/libXdmcp
-       x11-libs/libXext
-       x11-libs/libXfixes
-       x11-libs/libXft
-       x11-libs/libXpm
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       bidi? ( dev-libs/fribidi )
-       lock? ( x11-misc/xlockmore )
-       netpbm? ( media-libs/netpbm )
-       perl? ( tk? (
-                       dev-lang/tk
-                       dev-perl/Tk
-                       >=dev-perl/X11-Protocol-0.56
-               )
-       )
-       readline? (
-               sys-libs/ncurses:=
-               sys-libs/readline:=
-       )
-       stroke? ( dev-libs/libstroke )
-       svg? (
-               gnome-base/librsvg:2
-               x11-libs/cairo
-       )"
-
-DEPEND="${COMMON_DEPEND}
-       x11-base/xorg-proto"
-
-PATCHES=(
-       "${FILESDIR}/${P}-translucent-menus.patch"
-)
-
-if [[ ${PV} == 9999 ]]; then
-       PATCHES+=(
-               "${FILESDIR}/${P}-goflags.patch"
-       )
-fi
-
-src_prepare() {
-       default
-       if use doc; then
-               eapply "${FILESDIR}/${P}-htmldoc.patch"
-       fi
-
-       eautoreconf
-}
-
-src_configure() {
-       # Non-upstream email where bugs should be sent; used in fvwm-bug.
-       export FVWM_BUGADDR="[email protected]"
-
-       # Recommended by upstream for release. Doesn't really matter for live 
ebuilds.
-       append-flags -fno-strict-aliasing
-
-       # Signed chars are required.
-       for arch in arm arm64 ppc ppc64; do
-               use $arch && append-flags -fsigned-chars
-       done
-
-       local myconf=(
-               
--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
-               --enable-package-subdirs
-               $(use_enable bidi)
-               $(use_enable doc mandoc)
-               $(use_enable go golang)
-               $(use_enable nls)
-               $(use_enable nls iconv)
-               $(use_enable perl perllib)
-               $(use_with readline readline-library)
-               $(use_enable svg rsvg)
-               --enable-png
-               --enable-xft
-       )
-
-       use readline && myconf+=( --without-termcap-library )
-
-       econf ${myconf[@]}
-}
-
-src_compile() {
-       PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
-       if [[ ${PV} == *9999 ]]; then
-               use doc && emake -C doc html
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" 
datarootdir="/usr/share" install
-
-       dodir /etc/X11/Sessions
-       echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
-       fperms a+x /etc/X11/Sessions/${PN} || die
-
-       python_scriptinto "/usr/bin"
-       python_doscript "${ED}/usr/bin/FvwmCommand" 
"${ED}/usr/bin/fvwm-menu-desktop"
-       if use doc; then
-               if [[ ${PV} == *9999 ]]; then
-                       HTML_DOCS=( doc/*.html )
-               else
-                       HTML_DOCS=( doc/html/*.html )
-               fi
-       fi
-       einstalldocs
-
-       make_session_desktop fvwm3 /usr/bin/fvwm3
-}
-
-pkg_postinst() {
-       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 script."
-               ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\", 
but FvwmPrompt and FvwmCommnd 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."
-       fi
-}

diff --git a/x11-wm/fvwm3/fvwm3-1.0.6a.ebuild b/x11-wm/fvwm3/fvwm3-1.0.6a.ebuild
deleted file mode 100644
index cc412650d214..000000000000
--- a/x11-wm/fvwm3/fvwm3-1.0.6a.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-GO_OPTIONAL=1
-inherit autotools desktop flag-o-matic go-module python-single-r1 
toolchain-funcs
-
-DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
-HOMEPAGE="https://www.fvwm.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git";
-       EGIT_BRANCH="master"
-else
-       
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~riscv"
-fi
-
-LICENSE="GPL-2+ FVWM
-       go? ( Apache-2.0 BSD MIT )"
-SLOT="0"
-IUSE="bidi debug doc +go netpbm nls perl readline stroke svg tk lock"
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}"
-
-DOCS=( NEWS )
-
-if [[ ${PV} == 9999 ]]; then
-       DOCS+=(
-               dev-docs/COMMANDS
-               dev-docs/DEVELOPERS.md
-               dev-docs/INSTALL.md
-               dev-docs/PARSING.md
-               dev-docs/TODO.md
-               dev-docs/NEW-COMMANDS.md
-       )
-fi
-
-BDEPEND="
-       virtual/pkgconfig
-       doc? ( dev-libs/libxslt
-               dev-ruby/asciidoctor )
-       app-arch/unzip
-       go? ( >=dev-lang/go-1.14 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-       ${COMMON_DEPEND}
-       !x11-wm/fvwm
-       dev-lang/perl
-       dev-libs/glib:2
-       dev-libs/libevent:=
-       media-libs/fontconfig
-       media-libs/libpng:=
-       sys-apps/debianutils
-       sys-libs/zlib
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libxcb
-       x11-libs/libXcursor
-       x11-libs/libXdmcp
-       x11-libs/libXext
-       x11-libs/libXfixes
-       x11-libs/libXft
-       x11-libs/libXpm
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       bidi? ( dev-libs/fribidi )
-       lock? ( x11-misc/xlockmore )
-       netpbm? ( media-libs/netpbm )
-       perl? ( tk? (
-                       dev-lang/tk
-                       dev-perl/Tk
-                       >=dev-perl/X11-Protocol-0.56
-               )
-       )
-       readline? (
-               sys-libs/ncurses:=
-               sys-libs/readline:=
-       )
-       stroke? ( dev-libs/libstroke )
-       svg? (
-               gnome-base/librsvg:2
-               x11-libs/cairo
-       )"
-
-DEPEND="${COMMON_DEPEND}
-       x11-base/xorg-proto"
-
-src_prepare() {
-       default
-       use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \
-               -i bin/FvwmPrompt/Makefile.am || die )
-       # Patch configure to allow later go versions
-       sed -e 's/1.19\*)$/1.19*|1.20*|1.21*)/' -i configure.ac || die
-
-       eautoreconf
-}
-
-src_configure() {
-       # Non-upstream email where bugs should be sent; used in fvwm-bug.
-       export FVWM_BUGADDR="[email protected]"
-
-       # Recommended by upstream for release. Doesn't really matter for live 
ebuilds.
-       append-flags -fno-strict-aliasing
-
-       # Signed chars are required.
-       for arch in arm arm64 ppc ppc64; do
-               use $arch && append-flags -fsigned-chars
-       done
-
-       local myconf=(
-               
--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
-               --enable-package-subdirs
-               $(use_enable bidi)
-               $(use_enable doc mandoc)
-               $(use_enable go golang)
-               $(use_enable nls)
-               $(use_enable nls iconv)
-               $(use_enable perl perllib)
-               $(use_with readline readline-library)
-               $(use_enable svg rsvg)
-               --enable-png
-       )
-
-       use readline && myconf+=( --without-termcap-library )
-
-       econf "${myconf[@]}"
-}
-
-src_compile() {
-       PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
-       if [[ ${PV} == *9999 ]]; then
-               use doc && emake -C doc
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" 
datarootdir="/usr/share" install
-
-       dodir /etc/X11/Sessions
-       echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
-       fperms a+x "/etc/X11/Sessions/${PN}" || die
-
-       python_scriptinto "/usr/bin"
-       python_doscript "${ED}/usr/bin/FvwmCommand" 
"${ED}/usr/bin/fvwm-menu-desktop"
-       einstalldocs
-
-       make_session_desktop fvwm3 /usr/bin/fvwm3
-}
-
-pkg_postinst() {
-       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 script."
-               ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\", 
but FvwmPrompt and FvwmCommand 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."
-       fi
-}

diff --git a/x11-wm/fvwm3/fvwm3-1.0.7.ebuild b/x11-wm/fvwm3/fvwm3-1.0.7.ebuild
deleted file mode 100644
index 46cdabe5b388..000000000000
--- a/x11-wm/fvwm3/fvwm3-1.0.7.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-GO_OPTIONAL=1
-inherit autotools desktop flag-o-matic go-module python-single-r1 
toolchain-funcs
-
-DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
-HOMEPAGE="https://www.fvwm.org/";
-
-if [[ ${PV} == 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git";
-       EGIT_BRANCH="main"
-else
-       
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz";
-       KEYWORDS="~amd64 ~riscv"
-fi
-
-LICENSE="GPL-2+ FVWM
-       go? ( Apache-2.0 BSD MIT )"
-SLOT="0"
-IUSE="bidi debug doc +go netpbm nls perl readline stroke svg tk lock"
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}"
-
-DOCS=( NEWS )
-
-if [[ ${PV} == 9999 ]]; then
-       DOCS+=(
-               dev-docs/COMMANDS
-               dev-docs/DEVELOPERS.md
-               dev-docs/INSTALL.md
-               dev-docs/PARSING.md
-               dev-docs/TODO.md
-               dev-docs/NEW-COMMANDS.md
-       )
-fi
-
-BDEPEND="
-       virtual/pkgconfig
-       doc? ( dev-libs/libxslt
-               dev-ruby/asciidoctor )
-       app-arch/unzip
-       go? ( >=dev-lang/go-1.14 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-       ${COMMON_DEPEND}
-       !x11-wm/fvwm
-       dev-lang/perl
-       dev-libs/glib:2
-       dev-libs/libevent:=
-       media-libs/fontconfig
-       media-libs/libpng:=
-       sys-apps/debianutils
-       sys-libs/zlib
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libxcb
-       x11-libs/libXcursor
-       x11-libs/libXdmcp
-       x11-libs/libXext
-       x11-libs/libXfixes
-       x11-libs/libXft
-       x11-libs/libXpm
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       bidi? ( dev-libs/fribidi )
-       lock? ( x11-misc/xlockmore )
-       netpbm? ( media-libs/netpbm )
-       perl? ( tk? (
-                       dev-lang/tk
-                       dev-perl/Tk
-                       >=dev-perl/X11-Protocol-0.56
-               )
-       )
-       readline? (
-               sys-libs/ncurses:=
-               sys-libs/readline:=
-       )
-       stroke? ( dev-libs/libstroke )
-       svg? (
-               gnome-base/librsvg:2
-               x11-libs/cairo
-       )"
-
-DEPEND="${COMMON_DEPEND}
-       x11-base/xorg-proto"
-
-src_prepare() {
-       default
-       use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \
-               -i bin/FvwmPrompt/Makefile.am || die )
-
-       eautoreconf
-}
-
-src_configure() {
-       # Non-upstream email where bugs should be sent; used in fvwm-bug.
-       export FVWM_BUGADDR="[email protected]"
-
-       # Recommended by upstream for release. Doesn't really matter for live 
ebuilds.
-       append-flags -fno-strict-aliasing
-
-       # Signed chars are required.
-       for arch in arm arm64 ppc ppc64; do
-               use $arch && append-flags -fsigned-chars
-       done
-
-       local myconf=(
-               
--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
-               --enable-package-subdirs
-               $(use_enable bidi)
-               $(use_enable doc mandoc)
-               $(use_enable go golang)
-               $(use_enable nls)
-               $(use_enable nls iconv)
-               $(use_enable perl perllib)
-               $(use_with readline readline-library)
-               $(use_enable svg rsvg)
-               --enable-png
-       )
-
-       use readline && myconf+=( --without-termcap-library )
-
-       econf "${myconf[@]}"
-}
-
-src_compile() {
-       PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
-       if [[ ${PV} == *9999 ]]; then
-               use doc && emake -C doc
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" 
datarootdir="/usr/share" install
-
-       dodir /etc/X11/Sessions
-       echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
-       fperms a+x "/etc/X11/Sessions/${PN}" || die
-
-       python_scriptinto "/usr/bin"
-       python_doscript "${ED}/usr/bin/FvwmCommand" 
"${ED}/usr/bin/fvwm-menu-desktop"
-       einstalldocs
-
-       make_session_desktop fvwm3 /usr/bin/fvwm3
-}
-
-pkg_postinst() {
-       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."
-       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."
-       fi
-}

Reply via email to