gentoo auto-resync : 26:07:2023 - 04:30:05

6 files changed, 173 insertions, 18 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 701e5755e255..38f6c3b8351f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest
index a7f8e5fad2ee..2d6c6c22cd09 100644
--- a/x11-wm/fvwm3/Manifest
+++ b/x11-wm/fvwm3/Manifest
@@ -3,7 +3,9 @@ AUX fvwm3-1.0.4-htmldoc.patch 2024 BLAKE2B 247d05e606e55515b800143a103e5521cf6cc
 AUX fvwm3-1.0.4-translucent-menus.patch 14629 BLAKE2B d9aa8b8f2fbde6bf37d39d9fa78f959405dff6518cf1819bbffc70b3d7583618638a3df77beb96925dcf4540b834ba63c2ff1e2cefce49743d73154b9fe58d74 SHA512 4519fba0386b3d1b207540c4916fd18e989189d50b3e1aaa1a02d34774c406fcd8dfa53592882694fdc2e1bb6e3d1e3cd0ada2656222df037bbcdeccf1f04fbe
 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
 EBUILD fvwm3-1.0.4-r2.ebuild 4319 BLAKE2B d9b573097a3b1c37c57ac223e0c659942a17c4e3a326e31292e16a3f9a0bb950949dfcb83402fad01650f89f984d55df09c8f1f88a05a1d952c7cc0275c62dc0 SHA512 5e912a106b192b0e550a22ebaa43229a5637d2d5a89fa4e10f16ad4963e31484b63f663465395aaae07f27aea6cea048c869d5cf13104568b9e7d18d7671c563
 EBUILD fvwm3-1.0.6a.ebuild 4191 BLAKE2B 52523d243ba77d83afb5bacfb1900da1cc5061f2de320821eb7b475666a3fc312c871ea9e6e5156a74f6623df6612a46eb6afd4be42cffdd69d964886e442754 SHA512 b922f6cc11fbcf2d99682a22cf255a1cee075d44d6f2b9fe1210472a8227faadfd0c723b1eb23639b255f27be878e520b81ad3b0a30ee037c453130c4a243464
-EBUILD fvwm3-9999.ebuild 4081 BLAKE2B b1ed17b144ae1b4524f483b7c444a676e32bd0fd85d004a3623365d8c78b8dcc61683b42b612777ec897f03eaf7ecbde0d79c98214378fc3382716eb2c6d6e15 SHA512 8107c40171edf4ccdc27a9e76bf52a936e52cf27930261c89d56c953e6c6e966b30cc7e6cddf83ecbef2298ff460a564ffe5a19d8b5879ef3fa1d3169075b814
+EBUILD fvwm3-1.0.7.ebuild 4086 BLAKE2B 7ce04ec9790868aab796ae10cb98e210ebec99645b6619dd11a8895b032fb9999aa62c056e327124e1c462c36e668bc3f7916e25aa5e9a38a2b5a52f98bc0c17 SHA512 8b094daa7873630b0b674553b4cda292aa06f99db9ea66d6e57cc082bb4a87a46ddafa23c5d85ed066565a7f9084a890390bd8c72a3d61782bea0f323b8f579e
+EBUILD fvwm3-9999.ebuild 4086 BLAKE2B 7ce04ec9790868aab796ae10cb98e210ebec99645b6619dd11a8895b032fb9999aa62c056e327124e1c462c36e668bc3f7916e25aa5e9a38a2b5a52f98bc0c17 SHA512 8b094daa7873630b0b674553b4cda292aa06f99db9ea66d6e57cc082bb4a87a46ddafa23c5d85ed066565a7f9084a890390bd8c72a3d61782bea0f323b8f579e
 MISC metadata.xml 1167 BLAKE2B 9298a152a101f678f0aac744cd1348302dae392e2fa6d37aaf4616f368d6bb96e09a01aa50700bc59672fa5710ebcf5f49911e6bf2205bd6f157d50fb831741d SHA512 90bde9731cc4b0147dbe9072c634bafce51ec5b33e636e16ab19b81538863ab9c103ed40b0b97042a9c11a01e68c3c81ffb1be542909bf145a16a52ce8c6f396
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
+}
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\"."
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 501aba790059..cde6ead8a52c 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,5 +1,4 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
-AUX 1.6.1-chmod.patch 647 BLAKE2B 55983e761e3cc85c092c2ee79a9c724ca48b4b0a5e32bc475fa382b24c56bcb8c6c7463a94d88044a5ecac0ee128fae0fbea7e9e90ea0c8ea7d7c32e60a85834 SHA512 0f7d5f0ab6179f48b7a2367434a370de95ed82811f8816a791a01054fcbbc1ff037333461ca50915307d2b99b265b7b6678a16897359d17ecb75b5e3774ec3f9
 AUX 1.6.1-desktop-files.patch 1671 BLAKE2B 4eec89c64a1fdb4dc05cc5ccb7b92daa5cae4485ba8eaf03c980336ebf23b871b1a59b48fa207bb6c7d560e23ea31482d2cda20bbc81ed94e71f303e8f3a62d8 SHA512 251ca933d840889a52f3464274338b04782d7965401bfd684408e4b9b264136d5871ef0aa6ad857cdd97099d5d7d7d6f9713684a69f450813ca6d58807fef8d2
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.2.tar.gz 20818383 BLAKE2B ecb2d4c1f3ce94f247cd86640bd6394807ed5d9a34b2256d333894e6528c0d3dac1ddcab8c790a63df67c2738ab7af8dd2ef0cae67c534e10c4b2edd8919ad8c SHA512 0bebdc89644af49232ad9a0b753dee501f3e99d6615ce926c71790932d228e3c6676ca4835aeaf6badf5455102278261e48bed0d3004fe9209aca68d620cae02
diff --git a/x11-wm/lumina/files/1.6.1-chmod.patch b/x11-wm/lumina/files/1.6.1-chmod.patch
deleted file mode 100644
index ca6460eb2dda..000000000000
--- a/x11-wm/lumina/files/1.6.1-chmod.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro
---- lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-10-03 02:05:49.000000000 +0700
-+++ lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-12-05 12:55:00.656682056 +0700
-@@ -12,7 +12,7 @@
- 
- SOURCES += main.c
- 
--perms.path = $$DESTDIR$${PREFIX}/sbin
--perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
-+#perms.path = $$DESTDIR$${PREFIX}/sbin
-+#perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
- 
- INSTALLS += target perms