gentoo auto-resync : 24:08:2023 - 21:52:33

3 files changed, 123 insertions, 5 deletions

diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 7b09f84e3a9d..3a9c70b0a80d 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,7 +1,9 @@
 AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e547a955e45571860e5a5d87ba6bc0de565cb38355d08019a791965170eb0b5d6f215cd1bcb673f93addfde86485847cc7af987a72bfc02324dd56142f4d SHA512 9c12516dd0a2c3e81f7236e2e0f2f8137710e7f1a54ae84d279850d65afb52cb46cada6e84a0ba1f2c92fdfa8d7a0b4630f703e5a5e24664e0fec5ee718f83ae
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
+DIST WindowMaker-0.96.0.tar.gz 3443048 BLAKE2B 75fd73cfcf7a57f68120bdc1ac50781bb460da54641b5f42e369008b9066b9183cb7ef60f436627edf8c241ea24ca5c44ef894c1ff0cae64f3a5b2d24df8db93 SHA512 cca1796722803922aa28ea20534f10566b594b7a69eba8c1da6bd1305654583f39ef67f10fd6a550730714e728d876f807aee50968e9392190bb9dc7ffe8409a
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
 EBUILD windowmaker-0.95.9-r4.ebuild 3185 BLAKE2B a3d347ab62825cfe5acff5b3681663f5f738e942d9bc521715f2f450ad314f8dd31e5120d5b1e37fcc9f2144712b3e0226a83817445376aeafe1a36cc1b7a40d SHA512 5b54c83d1f94ecd5155650780db37f2cb1b98a2122ffa81cb5c0f83cacf334f4cbb612c1f6c6b77a89649b51064e63cfe16ca5b122d8c46a47d8fea2a9f16031
-EBUILD windowmaker-9999.ebuild 3039 BLAKE2B cdf15ce0684538ce95831ea107371f757faba84b97cca06ff250120a06352a16ec548a4fc46c2f426c7a9968bc9217efe5296875c974c1a509a4077858491102 SHA512 c265936ed90b203f90ca25f5e68be7e90f056000dbff049d62a77b2d9f2674857c0ce69a9d405ee93e4332fcc8e9e53726f62d5222e18b37c2a01b98ae7c905d
+EBUILD windowmaker-0.96.0.ebuild 3120 BLAKE2B 2ed5d3b0ac78fa2249cefda43b5663fbe82df8ed43354d38bee5dcf1659f5318af579f6524b45a8215dac36f91595387b013a957925f3b5983b97f2bca346862 SHA512 54f188ac43f4983d1efe0acc3d06cd5c9381b6d85dcef44e02b0d08bd1b26d357c407433ee560363dc564983fc64c34398ed7c9207c1ad8a37250789796ddbc5
+EBUILD windowmaker-9999.ebuild 3016 BLAKE2B 77f6c55c177702a21d5e66e9c27e78fcc18084f542d7243281ece2f59b4ad3a6a8341a6a6a7ec7d865c7f683004793c4824c4222b331c0a714a47b264bd14eff SHA512 3d5e7c679e2f46b94daaa00c3d226f2babd3052115e5b171042618ea2a598d844ff84d840fd27e823ae7ed2b4aa358b5bf7f8f56422ccf4d5749d4279c082141
 MISC metadata.xml 575 BLAKE2B da6b670bef941ab36136768fafdf4dbbe1260ecd77e7879e0573c34ada0267f89fd6d2a321652638d8a724fc92d41d572100e1b68519ff623ffde5263c7179ba SHA512 9d8d3aff1bff83276f0dc0cb6439d4fcc53f00ff0c0b265aff75fee9238b5061738960b30aef0091b86699e53dc98996a9f86c713e144e6fc4db2909b3490a18
diff --git a/x11-wm/windowmaker/windowmaker-0.96.0.ebuild b/x11-wm/windowmaker/windowmaker-0.96.0.ebuild
new file mode 100644
index 000000000000..22deff8a8194
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.96.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="https://www.windowmaker.org/"
+SRC_URI="
+https://github.com/window-maker/wmaker/releases/download/wmaker-${PV}/${P/windowm/WindowM}.tar.gz
+	https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( >=media-gfx/imagemagick-7:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:= )
+	tiff? ( media-libs/tiff:= )
+	webp? ( media-libs/libwebp:= )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ
+	NEWS README README.definable-cursor README.i18n TODO )
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
+			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+		fi
+	done
+
+	default
+}
+
+src_configure() {
+	local -a myeconfargs=(
+		# image format types
+		$(use_enable gif)
+		$(use_enable imagemagick magick)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable tiff)
+		$(use_enable webp)
+		$(use_enable xpm)
+
+		# optional X capabilities
+		$(use_enable modelock)
+		$(use_enable xinerama)
+		$(use_enable xrandr randr)
+	)
+
+	# NLS depends on whether LINGUAS is empty
+	if use nls; then
+		myeconfargs+=( LINGUAS="${LINGUAS:-$(cd po; x=(*.po); echo ${x[*]%.po})}" )
+	else
+		myeconfargs+=( LINGUAS= )
+	fi
+
+	econf \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--disable-static \
+		--enable-usermenu \
+		--with-{incs,libs}-from= \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-x \
+		"${myeconfargs[@]}"
+
+	pushd ../WindowMaker-extra-0.1 &>/dev/null || die
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	emake -C ../WindowMaker-extra-0.1
+}
+
+src_install() {
+	default
+
+	# WindowMaker Extra
+	emake -C ../WindowMaker-extra-0.1 DESTDIR="${D}" install
+	newdoc ../WindowMaker-extra-0.1/README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index e156f2ab7dfc..ad2be5a87876 100644
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools desktop git-r3
+EAPI=8
+inherit desktop git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="https://www.windowmaker.org/"
@@ -54,7 +54,6 @@ src_prepare() {
 	done
 
 	default
-	eautoreconf
 }
 
 src_configure() {