From 85478da6633d5528a06a56ef9b7307f56260af2c Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 18 Feb 2020 14:42:47 +0000
Subject: Desktop and workstation updates

Removes some old options, adds some new bits
---
 virtual/miller-desktop/Manifest                   |  2 +-
 virtual/miller-desktop/miller-desktop-2-r9.ebuild | 44 -----------------------
 virtual/miller-desktop/miller-desktop-2.1.ebuild  | 38 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 virtual/miller-desktop/miller-desktop-2-r9.ebuild
 create mode 100644 virtual/miller-desktop/miller-desktop-2.1.ebuild

(limited to 'virtual/miller-desktop')

diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index a257161..10a0a4e 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1 +1 @@
-EBUILD miller-desktop-2-r9.ebuild 1039 BLAKE2B 0d835e19e4559aa1f6f4c4959d4ce5fb966e60923b196a1a3cd57bc15b45ff43930ae55b2c792014ceb645c468dea81fb4a38f3307271e47df958bc17ed312d7 SHA512 9b174f3514ccedda741d13b8e6c265186f69ee9f1fd33cca343b9c3db7a059fe3da74800b55f096499c9d4ab532307ab29a6282e485c739ad2830f27cccb1e5c
+EBUILD miller-desktop-2.1.ebuild 803 BLAKE2B b1eb72f5b4d3c7157d403070203edd7537e010a3b9b46dafd60fbb92a67a73a8a4c9bfc079664a7cd8d02ad46f95475a105a6d7554790d156b10b17b081f586c SHA512 5b8c14be458582aff921612acb1df7222f972a0b3adc9b1dea49db438110598d3c66cdfe3602509cdb37452313c8763da6617110f7e388ba3bad7992bca2bd8d
diff --git a/virtual/miller-desktop/miller-desktop-2-r9.ebuild b/virtual/miller-desktop/miller-desktop-2-r9.ebuild
deleted file mode 100644
index e3051e3..0000000
--- a/virtual/miller-desktop/miller-desktop-2-r9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION="Virtual for desktops/laptops"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="vpnc pptp wifi b43 networkmanager fbsplash kde gnome systemd plasma plymouth"
-
-RDEPEND="
-	virtual/eject
-	plymouth? (
-			media-gfx/MIB-Ossigeno-Ultimate-Plymouth
-	)
-	!systemd? (
-		sys-boot/plymouth-openrc-plugin )
-	virtual/miller-base
-	x11-base/xorg-server
-	kde-apps/yakuake
-	fbsplash? (
-			media-gfx/splash-themes-gentoo
-			media-gfx/splash-themes-livecd
-			)
-	media-sound/alsa-utils
-	kde? ( kde-apps/kmix )
-	plasma? ( kde-apps/kmix )
-	!networkmanager? (
-		net-misc/dhcp )
-	sys-power/acpid
-	x11-apps/mesa-progs
-	networkmanager? (
-		gnome? ( gnome-extra/nm-applet )
-		kde? ( !plasma? ( kde-misc/plasma-nm ) )
-		plasma? ( kde-plasma/plasma-nm )
-		pptp? ( net-misc/networkmanager-pptp )
-		vpnc? ( net-misc/networkmanager-vpnc )
-			)
-	wifi? (
-		net-wireless/wireless-tools
-		net-wireless/wpa_supplicant
-		net-dns/openresolv
-		b43? ( sys-firmware/b43-firmware )
-		)
-	sys-fs/dosfstools
-	sys-block/kvpm
-"
-
diff --git a/virtual/miller-desktop/miller-desktop-2.1.ebuild b/virtual/miller-desktop/miller-desktop-2.1.ebuild
new file mode 100644
index 0000000..85a7727
--- /dev/null
+++ b/virtual/miller-desktop/miller-desktop-2.1.ebuild
@@ -0,0 +1,38 @@
+DESCRIPTION="Virtual for desktops/laptops"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
+IUSE="vpnc pptp forticlient wifi b43 networkmanager plymouth"
+
+RDEPEND="
+	virtual/eject
+	plymouth? (
+			media-gfx/MIB-Ossigeno-Ultimate-Plymouth
+	)
+	virtual/miller-base
+	x11-base/xorg-server
+	kde-apps/yakuake
+	media-sound/alsa-utils
+	kde-apps/kmix
+	!networkmanager? (
+		net-misc/dhcp )
+	sys-power/acpid
+	x11-apps/mesa-progs
+	networkmanager? (
+		kde-plasma/plasma-nm
+		pptp? ( net-misc/networkmanager-pptp )
+		vpnc? ( net-misc/networkmanager-vpnc )
+		)
+	wifi? (
+		net-wireless/wireless-tools
+		net-wireless/wpa_supplicant
+		net-dns/openresolv
+		b43? ( sys-firmware/b43-firmware )
+		)
+	forticlient? (
+		net-vpn/forticlientsslvpn
+		)
+	sys-fs/dosfstools
+	sys-block/kvpm
+"
+
-- 
cgit v1.2.3