* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2022-11-24 6:37 Jakov Smolić
0 siblings, 0 replies; 20+ messages in thread
From: Jakov Smolić @ 2022-11-24 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 0f9f65d4484e059e4440217a4851c62f99bff895
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 06:25:00 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 06:36:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9f65d4
x11-wm/fvwm3: Remove USE=rplay
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild | 3 +--
x11-wm/fvwm3/fvwm3-9999.ebuild | 3 +--
x11-wm/fvwm3/metadata.xml | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
index afd245eccd27..c146c72a9702 100644
--- a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="GPL-2+ FVWM
go? ( Apache-2.0 BSD MIT )"
SLOT="0"
-IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock"
+IUSE="bidi debug doc go netpbm nls perl readline stroke svg tk vanilla lock"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -76,7 +76,6 @@ RDEPEND="${PYTHON_DEPS}
sys-libs/ncurses:=
sys-libs/readline:=
)
- rplay? ( media-sound/rplay )
stroke? ( dev-libs/libstroke )
svg? (
gnome-base/librsvg:2
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 65fdb8f91459..7b19febbe739 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="GPL-2+ FVWM
go? ( Apache-2.0 BSD MIT )"
SLOT="0"
-IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock"
+IUSE="bidi debug doc go netpbm nls perl readline stroke svg tk vanilla lock"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -77,7 +77,6 @@ RDEPEND="${PYTHON_DEPS}
sys-libs/ncurses:=
sys-libs/readline:=
)
- rplay? ( media-sound/rplay )
stroke? ( dev-libs/libstroke )
svg? (
gnome-base/librsvg:2
diff --git a/x11-wm/fvwm3/metadata.xml b/x11-wm/fvwm3/metadata.xml
index 3711144d46ea..ec64f9815806 100644
--- a/x11-wm/fvwm3/metadata.xml
+++ b/x11-wm/fvwm3/metadata.xml
@@ -17,7 +17,6 @@
<flag name="go">Enable building <pkg>dev-lang/go</pkg> code (FvwmPrompt)</flag>
<flag name="lock">Enable screen locking</flag>
<flag name="netpbm">Enable NetPBM support (used by FvwmScript-ScreenDump)</flag>
- <flag name="rplay">Enable rplay support</flag>
<flag name="stroke">Mouse Gesture support</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2024-11-08 8:29 Matt Jolly
0 siblings, 0 replies; 20+ messages in thread
From: Matt Jolly @ 2024-11-08 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 301c335f78d6ea32822a4ddd24b01937de749353
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 05:59:02 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 08:29:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301c335f
x11-wm/fvwm3: drop xkbcommon from meson configuration
This is now mandatory and has been removed upstream.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index f4eabc6cad94..b1eb858ae80b 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -112,7 +112,6 @@ src_configure() {
"-Dpng=enabled"
"-Dsm=enabled"
"-Dxcursor=enabled"
- "-Dxkbcommon=enabled"
"-Dxpm=enabled"
"-Dxrender=enabled"
$(meson_feature bidi)
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2024-10-20 22:06 Matt Jolly
0 siblings, 0 replies; 20+ messages in thread
From: Matt Jolly @ 2024-10-20 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 22ef345f27fadc516cd27cbeb7271e9cd76d3455
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 22:05:38 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 22:06:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ef345f
x11-wm/fvwm3: update live
- Meson Build
- enable py3.13
- sanity check deps
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-9999.ebuild | 101 ++++++++++++++++-------------------------
1 file changed, 38 insertions(+), 63 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 9a9eba17220d..f4eabc6cad94 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -8,9 +8,9 @@ EAPI=8
# Scripting for this is in sam-gentoo-scripts.
: ${FVWM3_DOCS_PREBUILT:=1}
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
GO_OPTIONAL=1
-inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
+inherit flag-o-matic go-module meson python-single-r1
DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm"
HOMEPAGE="https://www.fvwm.org/"
@@ -31,9 +31,8 @@ fi
LICENSE="GPL-2+ FVWM
go? ( Apache-2.0 BSD MIT )"
SLOT="0"
-IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}"
+IUSE="bidi +go netpbm nls perl readline svg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DOCS=( NEWS )
@@ -83,20 +82,15 @@ RDEPEND="${PYTHON_DEPS}
x11-libs/libXpm
x11-libs/libXrandr
x11-libs/libXrender
+ x11-misc/xlockmore
+ dev-lang/tk
+ dev-perl/Tk
+ >=dev-perl/X11-Protocol-0.56
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
@@ -105,14 +99,6 @@ RDEPEND="${PYTHON_DEPS}
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() {
# Recommended by upstream for release. Doesn't really matter for live ebuilds.
append-flags -fno-strict-aliasing
@@ -122,68 +108,57 @@ src_configure() {
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 go golang)
- $(use_enable nls)
- $(use_enable nls iconv)
- $(use_enable perl perllib)
- $(use_with readline readline-library)
- $(use_enable svg rsvg)
- --enable-png
+ local emesonargs=(
+ "-Dpng=enabled"
+ "-Dsm=enabled"
+ "-Dxcursor=enabled"
+ "-Dxkbcommon=enabled"
+ "-Dxpm=enabled"
+ "-Dxrender=enabled"
+ $(meson_feature bidi)
+ $(meson_feature go golang)
+ $(meson_feature nls iconv)
+ $(meson_feature nls)
+ $(meson_feature readline) # not required for go but it won't hurt to enable it
+ $(meson_feature svg cairo) # Pick 1 of 'cairo', 'cairo-svg', or 'libsvg-cairo'; add the appropriate dependency
+ $(meson_feature svg)
+ "-Dcairo-svg=disabled"
+ "-Dlibsvg-cairo=disabled"
+ "-Ddocdir=${EPREFIX}/usr/share/doc/${PF}"
)
if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
- myconf+=(
- --enable-mandoc
- --enable-htmldoc
+ emesonargs+=(
+ "-Dhtmldoc=true"
+ "-Dmandoc=true"
)
else
# Probably not required, but let's be safe
- myconf+=(
- --disable-mandoc
- --disable-htmldoc
+ emesonargs+=(
+ "-Dhtmldoc=false"
+ "-Dmandoc=false"
)
fi
- use readline && myconf+=( --without-termcap-library )
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
+ meson_src_configure
}
src_install() {
# Since we're manually handling docs installation, let's do that first
- # and then install the rest of the files via emake
+ # and then install the rest of the files "normally".
local HTML_DOCS
if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
- else
- HTML_DOCS="${S}"/doc/*.html
- doman "${S}"/doc/*.[0-8]
fi
-
einstalldocs
- emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
-
- exeinto /etc/X11/Sessions
- newexe - ${PN} <<-EOF
- #!/bin/sh
- ${PN}
- EOF
-
- python_scriptinto "/usr/bin"
- python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
-
- make_session_desktop fvwm3 /usr/bin/fvwm3
+ meson_src_install
+ if ! use go; then
+ python_scriptinto "/usr/bin"
+ python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
+ fi
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2024-03-22 3:14 Matt Jolly
0 siblings, 0 replies; 20+ messages in thread
From: Matt Jolly @ 2024-03-22 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 360c3dd8617c708bfa62d1466cffb012c49919b8
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 03:10:23 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 03:10:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=360c3dd8
x11-wm/fvwm3: drop 1.0.8
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
x11-wm/fvwm3/Manifest | 1 -
x11-wm/fvwm3/fvwm3-1.0.8.ebuild | 172 ----------------------------------------
2 files changed, 173 deletions(-)
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index 047a3f4779c0..f716c6704b63 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1,3 +1,2 @@
-DIST fvwm3-1.0.8.tar.gz 5644021 BLAKE2B c2a0a4953f556f86128452c8b42d8f86e2a02c9314cca17688987a51ed91bb3ecccf29e77f2b01c7ed444b54f45e402859ed1cce39714ad6d47860f639509b80 SHA512 fef69b6d97b3533e6722b48336aa8904b399c42437c4adcab756edf55cf839126002255dfa268bf7159d3bb9caf4d44c43a9217c9df5dc6224cef8461ecf2c34
DIST fvwm3-1.0.9-docs.tar.xz 234884 BLAKE2B f52da9eb2486f7a212ead77ccc190c57076e1d3c73a3997c3a94edcf60dbc72ec5d410a8df1d621ff18b346741b1c94b3f87170db68c3067caa3295782a9bb61 SHA512 e6c33b09b7bac32bd61f1bd2c0216e2c99fef3f0b51b52b229093c25a437828e4bece382284d0c1f0bbbaf5b7459f2c391dfc1d2fa4ba80be22f09094e976b03
DIST fvwm3-1.0.9.tar.gz 4525552 BLAKE2B cb58181adb42f5b8d491c6413277eb1f4a5d89637d9c6bb323223925c719d808e84ed0f72a1d0ffc822ddb8295ebf2bb89c2351ebd591916b50ebc69728e59fa SHA512 de71d74b76da8e0cf1560d51ef916857e3f825b272d786d9b6b93aef9a82c399f580b9b941a47aff1f327b097d12e1ce05860924e792206e4150ff19a5c39ee3
diff --git a/x11-wm/fvwm3/fvwm3-1.0.8.ebuild b/x11-wm/fvwm3/fvwm3-1.0.8.ebuild
deleted file mode 100644
index 3cbbc80a0860..000000000000
--- a/x11-wm/fvwm3/fvwm3-1.0.8.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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"
-
-PATCHES=(
- "${FILESDIR}/${P}-implicit-function-decl-configure.patch"
-)
-
-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="desktop-wm@nogentoo.org"
-
- # 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
-
- exeinto /etc/X11/Sessions
- newexe - ${PN} <<-EOF
- #!/bin/sh
- ${PN}
- EOF
-
- 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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2024-03-22 3:14 Matt Jolly
0 siblings, 0 replies; 20+ messages in thread
From: Matt Jolly @ 2024-03-22 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 05ab0b1801d63810193f241759fd0f07f819d23a
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 03:09:27 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 03:09:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ab0b18
x11-wm/fvwm3: update live ebuild
Bring it into line with 1.0.9-r1;
debianutils has not been required since 2007!
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index fac3fd55cbca..d076b13c7a75 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -69,7 +69,6 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/libevent:=
media-libs/fontconfig
media-libs/libpng:=
- sys-apps/debianutils
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2024-03-22 3:06 Matt Jolly
0 siblings, 0 replies; 20+ messages in thread
From: Matt Jolly @ 2024-03-22 3:06 UTC (permalink / raw
To: gentoo-commits
commit: be3566884a741891ce2e56f80cd3c8a515713f53
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 22 01:25:23 2024 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 03:05:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be356688
x11-wm/fvwm3: remove pointless dependency on debianutils
This was originally added back in 2004, to fvwm and not fvwm3, to
support a patch called fvwm-2.5.8-fvwm-bug-security.diff. It modified
the fvwm-bug program with the following diff as a backport from
upstream:
```
-TEMP=/tmp/fvwm-bug.$$
+TEMP=`mktemp -q "/tmp/fvwm-bug.XXXXXX"`
```
Of course, in 2004 the mktemp program was not yet part of coreutils.
That came later on, in 2007. But back when this change was first
introduced, debianutils was the canonical source of this program.
17 years later, no one has ever noticed the reason for this dependency,
so here it sits, haunting us.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
x11-wm/fvwm3/{fvwm3-1.0.9.ebuild => fvwm3-1.0.9-r1.ebuild} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.9.ebuild b/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild
similarity index 98%
rename from x11-wm/fvwm3/fvwm3-1.0.9.ebuild
rename to x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild
index e6dec376c0e9..104d32825e4e 100644
--- a/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -68,7 +68,6 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/libevent:=
media-libs/fontconfig
media-libs/libpng:=
- sys-apps/debianutils
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2024-01-20 12:04 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2024-01-20 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 32c59d67d468e112dde2019774e4c23b0d3b9377
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Wed Dec 20 22:26:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 12:02:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c59d67
x11-wm/fvwm3: force prebuilt docs off for 9999
Closes: https://bugs.gentoo.org/920420
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/34385
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index e6dec376c0e9..fac3fd55cbca 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -19,6 +19,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git"
EGIT_BRANCH="main"
+ FVWM3_DOCS_PREBUILT=0
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2023-12-13 2:11 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-12-13 2:11 UTC (permalink / raw
To: gentoo-commits
commit: 7081c15e2807254afc94e74b596c54ebf2fde45c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 02:11:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 02:11:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7081c15e
x11-wm/fvwm3: fix logic error
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-1.0.9.ebuild | 2 +-
x11-wm/fvwm3/fvwm3-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.9.ebuild b/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
index 343a8c61635c..e6dec376c0e9 100644
--- a/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
@@ -138,7 +138,7 @@ src_configure() {
--enable-png
)
- if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
myconf+=(
--enable-mandoc
--enable-htmldoc
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 343a8c61635c..e6dec376c0e9 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -138,7 +138,7 @@ src_configure() {
--enable-png
)
- if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
myconf+=(
--enable-mandoc
--enable-htmldoc
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2023-12-13 2:06 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-12-13 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 7f70474f00e0250861d24f0230144feb317c4938
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Sat Dec 9 19:05:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 02:05:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f70474f
x11-wm/fvwm3: add 1.0.9
Fix man installation which was unintentionally disabled
alongside htmldoc.
Add pregenerated docs to avoid pulling in
ruby as a bdep.
Closes: https://bugs.gentoo.org/919240
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/34200
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/Manifest | 2 +
.../{fvwm3-9999.ebuild => fvwm3-1.0.9.ebuild} | 51 ++++++++++++++++++----
x11-wm/fvwm3/fvwm3-9999.ebuild | 51 ++++++++++++++++++----
3 files changed, 88 insertions(+), 16 deletions(-)
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index f7b692de43b2..047a3f4779c0 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1 +1,3 @@
DIST fvwm3-1.0.8.tar.gz 5644021 BLAKE2B c2a0a4953f556f86128452c8b42d8f86e2a02c9314cca17688987a51ed91bb3ecccf29e77f2b01c7ed444b54f45e402859ed1cce39714ad6d47860f639509b80 SHA512 fef69b6d97b3533e6722b48336aa8904b399c42437c4adcab756edf55cf839126002255dfa268bf7159d3bb9caf4d44c43a9217c9df5dc6224cef8461ecf2c34
+DIST fvwm3-1.0.9-docs.tar.xz 234884 BLAKE2B f52da9eb2486f7a212ead77ccc190c57076e1d3c73a3997c3a94edcf60dbc72ec5d410a8df1d621ff18b346741b1c94b3f87170db68c3067caa3295782a9bb61 SHA512 e6c33b09b7bac32bd61f1bd2c0216e2c99fef3f0b51b52b229093c25a437828e4bece382284d0c1f0bbbaf5b7459f2c391dfc1d2fa4ba80be22f09094e976b03
+DIST fvwm3-1.0.9.tar.gz 4525552 BLAKE2B cb58181adb42f5b8d491c6413277eb1f4a5d89637d9c6bb323223925c719d808e84ed0f72a1d0ffc822ddb8295ebf2bb89c2351ebd591916b50ebc69728e59fa SHA512 de71d74b76da8e0cf1560d51ef916857e3f825b272d786d9b6b93aef9a82c399f580b9b941a47aff1f327b097d12e1ce05860924e792206e4150ff19a5c39ee3
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
similarity index 79%
copy from x11-wm/fvwm3/fvwm3-9999.ebuild
copy to x11-wm/fvwm3/fvwm3-1.0.9.ebuild
index 8bc78a359bc5..343a8c61635c 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.9.ebuild
@@ -3,6 +3,11 @@
EAPI=8
+# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
+# for release ebuilds.
+# Scripting for this is in sam-gentoo-scripts.
+: ${FVWM3_DOCS_PREBUILT:=1}
+
PYTHON_COMPAT=( python3_{10..12} )
GO_OPTIONAL=1
inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
@@ -16,13 +21,16 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH="main"
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz"
+ fi
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"
+IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -41,12 +49,17 @@ fi
BDEPEND="
virtual/pkgconfig
- doc? ( dev-libs/libxslt
- dev-ruby/asciidoctor )
app-arch/unzip
go? ( >=dev-lang/go-1.14 )
"
+if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
+ BDEPEND+="
+ dev-libs/libxslt
+ dev-ruby/asciidoctor
+ "
+fi
+
RDEPEND="${PYTHON_DEPS}
${COMMON_DEPEND}
!x11-wm/fvwm
@@ -116,7 +129,6 @@ src_configure() {
--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)
@@ -126,6 +138,19 @@ src_configure() {
--enable-png
)
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ myconf+=(
+ --enable-mandoc
+ --enable-htmldoc
+ )
+ else
+ # Probably not required, but let's be safe
+ myconf+=(
+ --disable-mandoc
+ --disable-htmldoc
+ )
+ fi
+
use readline && myconf+=( --without-termcap-library )
econf "${myconf[@]}"
@@ -133,12 +158,22 @@ src_configure() {
src_compile() {
PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
- if [[ ${PV} == *9999 ]]; then
- use doc && emake -C doc
- fi
}
src_install() {
+ # Since we're manually handling docs installation, let's do that first
+ # and then install the rest of the files via emake
+ local HTML_DOCS
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
+ HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
+ else
+ HTML_DOCS="${S}"/doc/*.html
+ doman "${S}"/doc/*.[0-8]
+ fi
+
+ einstalldocs
+
emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
exeinto /etc/X11/Sessions
@@ -149,9 +184,9 @@ src_install() {
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() {
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 8bc78a359bc5..343a8c61635c 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -3,6 +3,11 @@
EAPI=8
+# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs
+# for release ebuilds.
+# Scripting for this is in sam-gentoo-scripts.
+: ${FVWM3_DOCS_PREBUILT:=1}
+
PYTHON_COMPAT=( python3_{10..12} )
GO_OPTIONAL=1
inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs
@@ -16,13 +21,16 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH="main"
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz"
+ fi
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"
+IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -41,12 +49,17 @@ fi
BDEPEND="
virtual/pkgconfig
- doc? ( dev-libs/libxslt
- dev-ruby/asciidoctor )
app-arch/unzip
go? ( >=dev-lang/go-1.14 )
"
+if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then
+ BDEPEND+="
+ dev-libs/libxslt
+ dev-ruby/asciidoctor
+ "
+fi
+
RDEPEND="${PYTHON_DEPS}
${COMMON_DEPEND}
!x11-wm/fvwm
@@ -116,7 +129,6 @@ src_configure() {
--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)
@@ -126,6 +138,19 @@ src_configure() {
--enable-png
)
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then
+ myconf+=(
+ --enable-mandoc
+ --enable-htmldoc
+ )
+ else
+ # Probably not required, but let's be safe
+ myconf+=(
+ --disable-mandoc
+ --disable-htmldoc
+ )
+ fi
+
use readline && myconf+=( --without-termcap-library )
econf "${myconf[@]}"
@@ -133,12 +158,22 @@ src_configure() {
src_compile() {
PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
- if [[ ${PV} == *9999 ]]; then
- use doc && emake -C doc
- fi
}
src_install() {
+ # Since we're manually handling docs installation, let's do that first
+ # and then install the rest of the files via emake
+ local HTML_DOCS
+ if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then
+ doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8]
+ HTML_DOCS="${WORKDIR}"/${P}-docs/html/*
+ else
+ HTML_DOCS="${S}"/doc/*.html
+ doman "${S}"/doc/*.[0-8]
+ fi
+
+ einstalldocs
+
emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install
exeinto /etc/X11/Sessions
@@ -149,9 +184,9 @@ src_install() {
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() {
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2023-10-17 6:37 Joonas Niilola
0 siblings, 0 replies; 20+ messages in thread
From: Joonas Niilola @ 2023-10-17 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 37f573a1bef76b79894855a60fba7053ba40ae5f
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Tue Oct 17 06:11:08 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=37f573a1
x11-wm/fvwm3: drop 1.0.7-r1
Closes: https://bugs.gentoo.org/901275
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-wm/fvwm3/Manifest | 1 -
x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild | 168 -------------------------------------
2 files changed, 169 deletions(-)
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index 86b92f252746..f7b692de43b2 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1,2 +1 @@
-DIST fvwm3-1.0.7.tar.gz 4512128 BLAKE2B 9e7363355f3d3221dc72175c6ff449a476a32020248dc580c4b73687759c49b255bab8b7e29440fa1473153459ef984369e88d331a0b55154114e3c901867003 SHA512 91973abb7b3f79cec4fba28d9aa071923aa975eae3f3e00257e8633e2d376732cd5db7e42a4330bc849f807fc149abfbeef6100fe2ca6c05c847b61ee48236ed
DIST fvwm3-1.0.8.tar.gz 5644021 BLAKE2B c2a0a4953f556f86128452c8b42d8f86e2a02c9314cca17688987a51ed91bb3ecccf29e77f2b01c7ed444b54f45e402859ed1cce39714ad6d47860f639509b80 SHA512 fef69b6d97b3533e6722b48336aa8904b399c42437c4adcab756edf55cf839126002255dfa268bf7159d3bb9caf4d44c43a9217c9df5dc6224cef8461ecf2c34
diff --git a/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild b/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
deleted file mode 100644
index 897728504f51..000000000000
--- a/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,168 +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="desktop-wm@nogentoo.org"
-
- # 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
-
- exeinto /etc/X11/Sessions
- newexe - ${PN} <<-EOF
- #!/bin/sh
- ${PN}
- EOF
-
- 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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2023-10-17 6:37 Joonas Niilola
0 siblings, 0 replies; 20+ messages in thread
From: Joonas Niilola @ 2023-10-17 6:37 UTC (permalink / raw
To: gentoo-commits
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="desktop-wm@nogentoo.org"
-
- # 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="desktop-wm@nogentoo.org"
-
- # 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="desktop-wm@nogentoo.org"
-
- # 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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2023-08-05 22:29 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-08-05 22:29 UTC (permalink / raw
To: gentoo-commits
commit: 98cb41a01f37e5161de5c6ae159d3dfe80c29376
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 22:26:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 22:28:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98cb41a0
x11-wm/fvwm3: fix shebang in /etc/X11/Sessions file
A file in /etc/X11/Sessions with just the path that's *not* executable is fine,
but if it's executable, it's reasonably treated as a script. Oops.
Bug: https://bugs.gentoo.org/911787
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/{fvwm3-9999.ebuild => fvwm3-1.0.7-r1.ebuild} | 8 +++++---
x11-wm/fvwm3/fvwm3-9999.ebuild | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
similarity index 96%
copy from x11-wm/fvwm3/fvwm3-9999.ebuild
copy to x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
index 46cdabe5b388..897728504f51 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.7-r1.ebuild
@@ -141,9 +141,11 @@ src_compile() {
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
+ exeinto /etc/X11/Sessions
+ newexe - ${PN} <<-EOF
+ #!/bin/sh
+ ${PN}
+ EOF
python_scriptinto "/usr/bin"
python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 46cdabe5b388..897728504f51 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -141,9 +141,11 @@ src_compile() {
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
+ exeinto /etc/X11/Sessions
+ newexe - ${PN} <<-EOF
+ #!/bin/sh
+ ${PN}
+ EOF
python_scriptinto "/usr/bin"
python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2023-07-26 2:53 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-07-26 2:53 UTC (permalink / raw
To: gentoo-commits
commit: 1d4b792599f26e90c3570f0a707eb90884b6059c
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Mon Jul 24 21:33:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 02:47:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4b7925
x11-wm/fvwm3: add 1.0.7
Closes: https://bugs.gentoo.org/910192
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Closes: https://github.com/gentoo/gentoo/pull/32026
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-1.0.7.ebuild | 166 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 166 insertions(+)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.7.ebuild b/x11-wm/fvwm3/fvwm3-1.0.7.ebuild
new file mode 100644
index 000000000000..46cdabe5b388
--- /dev/null
+++ b/x11-wm/fvwm3/fvwm3-1.0.7.ebuild
@@ -0,0 +1,166 @@
+# 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="desktop-wm@nogentoo.org"
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2023-07-26 2:53 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2023-07-26 2:53 UTC (permalink / raw
To: gentoo-commits
commit: 23247bc35aa12177c3d254adbdf38c353f2a6aa6
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Mon Jul 24 21:25:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 02:47:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23247bc3
x11-wm/fvwm3: Update live ebuild
master -> main
Closes: https://bugs.gentoo.org/910600
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/Manifest | 1 +
x11-wm/fvwm3/fvwm3-9999.ebuild | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index 3469d010d753..390ad34b2b72 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -1,2 +1,3 @@
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-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 958bb6e0c085..46cdabe5b388 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.fvwm.org/"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git"
- EGIT_BRANCH="master"
+ EGIT_BRANCH="main"
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~riscv"
@@ -155,8 +155,9 @@ src_install() {
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."
+ 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\"."
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2022-12-03 7:50 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-12-03 7:50 UTC (permalink / raw
To: gentoo-commits
commit: c2ad6974286ce29bae310d0ff67c773cfe123acc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 07:49:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 07:49:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ad6974
x11-wm/fvwm3: HTTPSify HOMEPAGE
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild | 2 +-
x11-wm/fvwm3/fvwm3-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
index c146c72a9702..ebebce30aa2f 100644
--- a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
@@ -8,7 +8,7 @@ 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="http://www.fvwm.org/"
+HOMEPAGE="https://www.fvwm.org/"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 7b19febbe739..be3acc65d26a 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -8,7 +8,7 @@ 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="http://www.fvwm.org/"
+HOMEPAGE="https://www.fvwm.org/"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2022-06-18 14:44 David Seifert
0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2022-06-18 14:44 UTC (permalink / raw
To: gentoo-commits
commit: a7487d6657d5da05f029d6734ebe024d5eb34af7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 14:44:32 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:44:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7487d66
x11-wm/fvwm3: [QA] pass AR to make
Closes: https://bugs.gentoo.org/849761
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild | 4 ++--
x11-wm/fvwm3/fvwm3-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
index 0a0e5ddfb57a..afd245eccd27 100644
--- a/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
GO_OPTIONAL=1
-inherit autotools desktop flag-o-matic go-module python-single-r1
+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="http://www.fvwm.org/"
@@ -138,7 +138,7 @@ src_configure() {
}
src_compile() {
- PREFIX="/usr" emake
+ PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
if [[ ${PV} == *9999 ]]; then
use doc && emake -C doc html
fi
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 224ee2abd20a..65fdb8f91459 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
GO_OPTIONAL=1
-inherit autotools desktop flag-o-matic go-module python-single-r1
+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="http://www.fvwm.org/"
@@ -138,7 +138,7 @@ src_configure() {
}
src_compile() {
- PREFIX="/usr" emake
+ PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
if [[ ${PV} == *9999 ]]; then
use doc && emake -C doc html
fi
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2022-06-18 7:42 David Seifert
0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2022-06-18 7:42 UTC (permalink / raw
To: gentoo-commits
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 )
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2022-06-06 13:33 Yixun Lan
0 siblings, 0 replies; 20+ messages in thread
From: Yixun Lan @ 2022-06-06 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 6da839932d79cf6981cd6e4fea935327e62845f9
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 12:03:15 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 13:32:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da83993
x11-wm/fvwm3: forward keyword to live ebuild
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild
index 368e25548404..57341a49d6c0 100644
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH="master"
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~riscv"
fi
LICENSE="GPL-2+ FVWM
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2022-06-06 13:33 Yixun Lan
0 siblings, 0 replies; 20+ messages in thread
From: Yixun Lan @ 2022-06-06 13:33 UTC (permalink / raw
To: gentoo-commits
commit: a91eec1b27ce7d819b775e3724c9180eaa1e2297
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 12:01:49 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 13:32:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a91eec1b
x11-wm/fvwm3: keyword 1.0.4-r1 for ~riscv
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild
index b8246aa3ce60..c835d0b587c9 100644
--- a/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild
+++ b/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_BRANCH="master"
else
SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~riscv"
fi
LICENSE="GPL-2+ FVWM
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/
@ 2022-06-04 21:14 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-06-04 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 8dc554b95001ba36c4eb94bc2b8323f2e713c258
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 21:14:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 21:14:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc554b9
x11-wm/fvwm3: revbump for fixed RDEPEND
Bug: https://bugs.gentoo.org/849596
Bug: https://bugs.gentoo.org/849668
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/fvwm3/{fvwm3-1.0.4.ebuild => fvwm3-1.0.4-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/x11-wm/fvwm3/fvwm3-1.0.4.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild
similarity index 100%
rename from x11-wm/fvwm3/fvwm3-1.0.4.ebuild
rename to x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2024-11-08 8:29 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-24 6:37 [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ Jakov Smolić
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 8:29 Matt Jolly
2024-10-20 22:06 Matt Jolly
2024-03-22 3:14 Matt Jolly
2024-03-22 3:14 Matt Jolly
2024-03-22 3:06 Matt Jolly
2024-01-20 12:04 Sam James
2023-12-13 2:11 Sam James
2023-12-13 2:06 Sam James
2023-10-17 6:37 Joonas Niilola
2023-10-17 6:37 Joonas Niilola
2023-08-05 22:29 Sam James
2023-07-26 2:53 Sam James
2023-07-26 2:53 Sam James
2022-12-03 7:50 Sam James
2022-06-18 14:44 David Seifert
2022-06-18 7:42 David Seifert
2022-06-06 13:33 Yixun Lan
2022-06-06 13:33 Yixun Lan
2022-06-04 21:14 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox