From 56524916b1f6b502d2609cd6fb888c6d23598cf3 Mon Sep 17 00:00:00 2001
From: Shin'ya Minazuki <shinyoukai@laidback.moe>
Date: Sun, 24 May 2026 14:10:28 -0300
Subject: [PATCH] =?UTF-8?q?meta-pkgs/windowmaker-desktop:=20=E3=81=82?=
 =?UTF-8?q?=E3=82=89=E3=81=82=E3=82=89=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Shin'ya Minazuki <shinyoukai@laidback.moe>
---
 meta-pkgs/windowmaker-desktop/metadata.xml    | 15 +++---
 .../windowmaker-desktop-2026.05.22.ebuild     | 46 ++++++-------------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/meta-pkgs/windowmaker-desktop/metadata.xml b/meta-pkgs/windowmaker-desktop/metadata.xml
index a3c6665..3bf2948 100644
--- a/meta-pkgs/windowmaker-desktop/metadata.xml
+++ b/meta-pkgs/windowmaker-desktop/metadata.xml
@@ -6,11 +6,14 @@
 		<name>Shin'ya Minazuki</name>
 	</maintainer>
 	<use>
-		<flag name="display-manager">Install a display manager</flag>
-		<flag name="file-manager">Install a file manager</flag>
-		<flag name="fonts">Install additional fonts</flag>
-		<flag name="ime">Install an input method engine</flag>
-		<flag name="terminal-emulator">Install a terminal emulator</flag>
-		<flag name="themes">Install additional themes</flag>
+		<flag name="display-manager">
+			Install a graphical display manager
+		</flag>
+		<flag name="dockapps">
+			Install a set of dockapps
+		</flag>
+		<flag name="themes">
+			Install additional themes
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/meta-pkgs/windowmaker-desktop/windowmaker-desktop-2026.05.22.ebuild b/meta-pkgs/windowmaker-desktop/windowmaker-desktop-2026.05.22.ebuild
index a5ac7ae..6cf2640 100644
--- a/meta-pkgs/windowmaker-desktop/windowmaker-desktop-2026.05.22.ebuild
+++ b/meta-pkgs/windowmaker-desktop/windowmaker-desktop-2026.05.22.ebuild
@@ -1,60 +1,40 @@
 # Copyright 2026 Shin'ya Minazuki
 EAPI=8
 
-DESCRIPTION="Environment used by Shin'ya Minazuki based on WindowMaker"
-HOMEPAGE="https://laidback.moe/~shinyoukai/"
+DESCRIPTION="Provides a desktop based on the WindowMaker window manager"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
 
-IUSE="+display-manager +dockapps file-manager fonts ime terminal-emulator themes"
+IUSE="display-manager dockapps"
 
 DEPEND="
-	x11-wm/windowmaker
+	>=x11-wm/windowmaker-0.80.0
 	display-manager? (
-		|| (
-			x11-misc/lightdm[gtk]
-			x11-misc/slim[pam]
-			x11-misc/wdm
-		)
+		>=x11-misc/wdm-1.20
 	)
 	dockapps? (
+		x11-plugins/wmclock
 		x11-plugins/wmamixer
 		x11-plugins/wmbattery
-		x11-plugins/wmclock
+		x11-plugins/wmmoonclock
 		x11-plugins/wmnd
 		x11-plugins/wmsystemtray
 	)
-	file-manager? (
-		|| (
-			app-misc/gentoo
-			x11-misc/pcmanfm
-			x11-misc/xfe
-		)
+	themes? (
+		x11-themes/windowmaker-themes
 	)
-	fonts? (
-		media-fonts/arphicfonts
-		media-fonts/nanum
-		media-fonts/spleen
-		media-fonts/twemoji
-		media-fonts/umefont
-	)
-	ime? ( app-i18n/ibus )
-	terminal-emulator? (
-		|| (
-			x11-terms/sakura
-			x11-terms/st
-			x11-terms/xterm
-		)
-	)
-	themes? ( x11-themes/windowmaker-themes )
 "
 RDEPEND="${DEPEND}"
 
 pkg_postinst() {
-	if has_version '>=x11-misc/slim-1.4.0' || has_version '>=x11-misc/wdm-1.28'; then
+	if use display-manager; then
 		einfo "You may have to create an .xsessionrc script inside your home directory and make it executable"
 		einfo "Or configure the display manager to launch available sessions"
 	fi
+	if use dockapps; then
+		einfo "Most dockapps do not require any further configuration, only x11-plugins/wmnd does"
+	fi
 }