From df5c72088a029a523949a06c24b586b663c619cc Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Sat, 5 Jul 2025 21:54:21 -0400
Subject: [PATCH 1/2] zero-system: reorg a little, add keepassxc

---
 ....1-r2.ebuild => zero-system-2025.2.ebuild} | 27 +++++++------------
 .../pentoo/zero-system/package.use/app-admin  |  1 +
 2 files changed, 10 insertions(+), 18 deletions(-)
 rename pentoo/zero-system/{zero-system-2025.1-r2.ebuild => zero-system-2025.2.ebuild} (88%)
 create mode 100644 profiles/pentoo/zero-system/package.use/app-admin

diff --git a/pentoo/zero-system/zero-system-2025.1-r2.ebuild b/pentoo/zero-system/zero-system-2025.2.ebuild
similarity index 88%
rename from pentoo/zero-system/zero-system-2025.1-r2.ebuild
rename to pentoo/zero-system/zero-system-2025.2.ebuild
index d8a15a586..09acb3616 100644
--- a/pentoo/zero-system/zero-system-2025.1-r2.ebuild
+++ b/pentoo/zero-system/zero-system-2025.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Foundation
+# Copyright 1999-2025 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,20 +10,27 @@ S="${WORKDIR}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="dev lto minimal nu printer naga"
+IUSE="dev desktop lto minimal nu printer naga"
 
 RDEPEND="
+	app-admin/keepassxc
 	app-shells/zsh
 	net-misc/keychain
 	sys-auth/ykpers
 	!minimal? (
+		desktop? (
+			gnome-base/gnome-keyring
+			www-client/firefox
+		)
 		dev? (
 			app-crypt/glep63-check
 			app-doc/eclass-manpages
 			app-doc/pms
+			app-misc/jq
 			app-portage/iwdevtools
 			app-shells/dash
 			app-shells/mksh
+			dev-embedded/platformio
 			dev-python/mock
 			dev-python/pytest
 			dev-ruby/blinkstick
@@ -39,20 +46,6 @@ RDEPEND="
 			dev-vcs/cvs
 			sys-kernel/gentoo-sources
 		)
-		naga? (
-			app-misc/jq
-			app-misc/siglo
-			dev-embedded/platformio
-			dev-embedded/stlink
-			dev-util/android-sdk-build-tools
-			dev-util/android-sdk-cmdline-tools
-			gnome-base/gnome-keyring
-			kde-apps/filelight
-			media-plugins/swh-plugins
-			media-libs/noise-suppression-for-voice
-			net-p2p/transmission
-			www-client/firefox
-		)
 		app-arch/p7zip
 		app-arch/pixz
 		app-containers/docker
@@ -117,8 +110,6 @@ RDEPEND="
 		)
 	)
 "
-			# I just can't build this lately
-			#!arm? ( app-emulation/virtualbox app-emulation/virtualbox-extpack-oracle app-emulation/virtualbox-additions )
 
 src_install() {
 	if [ -d /home/zero ]; then
diff --git a/profiles/pentoo/zero-system/package.use/app-admin b/profiles/pentoo/zero-system/package.use/app-admin
new file mode 100644
index 000000000..8fca5ddb5
--- /dev/null
+++ b/profiles/pentoo/zero-system/package.use/app-admin
@@ -0,0 +1 @@
+app-admin/keepassxc browser yubikey

From 272ac2159cd6194cb8e9ab178930a9cb54cf87e5 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Sat, 5 Jul 2025 22:02:06 -0400
Subject: [PATCH 2/2] zero-system: more moving things around, fix metadata

---
 pentoo/zero-system/metadata.xml              |  4 +--
 pentoo/zero-system/zero-system-2025.2.ebuild | 30 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pentoo/zero-system/metadata.xml b/pentoo/zero-system/metadata.xml
index b5bb93a6c..0015a3c0b 100644
--- a/pentoo/zero-system/metadata.xml
+++ b/pentoo/zero-system/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Rick Farina (Zero_Chaos)</name>
 	</maintainer>
 	<use>
-		<flag name="dev">Packages for doing gentoo dev work</flag>
-		<flag name="naga">Packages for my main laptop</flag>
+		<flag name="desktop">Random desktop stuff I want</flag>
+		<flag name="dev">Packages for doing gentoo and other dev work</flag>
 		<flag name="nu">Packages for the build machine</flag>
 		<flag name="printer">Packages for printing</flag>
 	</use>
diff --git a/pentoo/zero-system/zero-system-2025.2.ebuild b/pentoo/zero-system/zero-system-2025.2.ebuild
index 09acb3616..0aa73ce60 100644
--- a/pentoo/zero-system/zero-system-2025.2.ebuild
+++ b/pentoo/zero-system/zero-system-2025.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="dev desktop lto minimal nu printer naga"
+IUSE="dev desktop lto minimal nu printer"
 
 RDEPEND="
 	app-admin/keepassxc
@@ -21,6 +21,20 @@ RDEPEND="
 		desktop? (
 			gnome-base/gnome-keyring
 			www-client/firefox
+			gui-apps/input-leap
+			x11-misc/xtrlock
+			arm? ( www-client/firefox )
+			!arm? ( www-client/firefox-bin )
+			net-ftp/filezilla
+			!arm? ( www-plugins/chrome-binary-plugins:stable )
+			amd64? ( www-client/chromium )
+			!arm? ( www-client/google-chrome )
+			|| ( app-office/libreoffice app-office/libreoffice-bin )
+			x11-misc/slim
+			media-gfx/gimp
+			x11-apps/mesa-progs
+			media-video/xine-ui
+			x11-misc/xdotool
 		)
 		dev? (
 			app-crypt/glep63-check
@@ -85,28 +99,14 @@ RDEPEND="
 			net-wireless/nanovna-saver
 			net-wireless/sdrtrunk-bin
 			net-wireless/trunk-recorder
-			gui-apps/input-leap
-			x11-misc/xtrlock
 			app-text/doxygen
-			arm? ( www-client/firefox )
-			!arm? ( www-client/firefox-bin )
-			net-ftp/filezilla
-			!arm? ( www-plugins/chrome-binary-plugins:stable )
-			amd64? ( naga? ( www-client/chromium ) )
-			!arm? ( www-client/google-chrome )
-			|| ( app-office/libreoffice app-office/libreoffice-bin )
 			!arm? ( sys-apps/preload )
-			x11-misc/slim
-			media-gfx/gimp
-			x11-apps/mesa-progs
-			media-video/xine-ui
 			net-wireless/hidclient
 			x11-misc/redshift
 			app-vim/nerdtree
 			media-sound/asunder
 			net-wireless/md380tools
 			!lto? ( dev-embedded/arduino )
-			x11-misc/xdotool
 		)
 	)
 "