From 85478da6633d5528a06a56ef9b7307f56260af2c Mon Sep 17 00:00:00 2001 From: Dan Goodliffe 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 +++++++++++++ virtual/miller-workstation/Manifest | 2 +- .../miller-workstation-12.1.ebuild | 64 ---------------------- .../miller-workstation-12.2.ebuild | 59 ++++++++++++++++++++ 6 files changed, 99 insertions(+), 110 deletions(-) delete mode 100644 virtual/miller-desktop/miller-desktop-2-r9.ebuild create mode 100644 virtual/miller-desktop/miller-desktop-2.1.ebuild delete mode 100644 virtual/miller-workstation/miller-workstation-12.1.ebuild create mode 100644 virtual/miller-workstation/miller-workstation-12.2.ebuild 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 +" + diff --git a/virtual/miller-workstation/Manifest b/virtual/miller-workstation/Manifest index e8df4a5..a2aa214 100644 --- a/virtual/miller-workstation/Manifest +++ b/virtual/miller-workstation/Manifest @@ -1 +1 @@ -EBUILD miller-workstation-12.1.ebuild 1429 BLAKE2B ec0b8be2e4393a116d71749083aad016a8462fa1238ee79e6dfd24df00af8813c61f57175e1e2c38fc53b842735b9b9a164d987b8178321dbdd0bc5d7a1b7b69 SHA512 4a390eeca12aabbd346e67bbe337926da8aa37a82188878dfa7f49a3f77beb4b60f3bc5b7fc483e2f6e7df141949439bf9a8607be62f8d5fda98c5456376794d +EBUILD miller-workstation-12.2.ebuild 1253 BLAKE2B 8ce4c1d64884014795d5db07486a72157aca114d94eb5732ca0116ea331b7811482b1d4415d214e25dd9b694304ec7401881cce354d7faaba29515d94a1a7350 SHA512 f4102c4690a4618928e1cdb734563804883ddcba5462e41b090d8d2f41929ee1160072d58dc6f63de091e90a2c893d67817023ec4512f190d70fbedc73b9ef56 diff --git a/virtual/miller-workstation/miller-workstation-12.1.ebuild b/virtual/miller-workstation/miller-workstation-12.1.ebuild deleted file mode 100644 index 2dd9908..0000000 --- a/virtual/miller-workstation/miller-workstation-12.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -EAPI="7" -DESCRIPTION="Virtual for Miller workstations" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="systemd plasma rdp vnc xscreensaver vlc" - -RDEPEND=" - =net-misc/unison-2.48* - =dev-lang/ocaml-4.04* - systemd? ( app-admin/systemdgenie ) - virtual/miller-base - kde-apps/kcalc - vlc? ( media-video/vlc ) - net-im/pidgin - x11-plugins/pidgin-mbpurple - x11-plugins/purple-facebook - x11-plugins/pidgin-skypeweb - xscreensaver? ( x11-misc/xscreensaver ) - media-fonts/corefonts - media-fonts/noto - media-fonts/noto-emoji - kde-misc/basket - virtual/jre - rdp? ( kde-apps/krdc[rdp] ) - vnc? ( kde-apps/krdc[vnc] ) - || ( - www-client/firefox - ( www-client/chromium www-plugins/chrome-binary-plugins ) - www-client/firefox-bin - www-client/google-chrome - www-client/opera - ) - kde-apps/filelight - || ( - mail-client/thunderbird-bin - mail-client/thunderbird - ) - games-misc/fortune-mod - || ( - app-office/libreoffice-bin - app-office/libreoffice - ) - media-gfx/gimp - www-plugins/adobe-flash - media-sound/clementine - kde-apps/spectacle - kde-apps/kwalletmanager - x11-misc/kdocker - kde-apps/okular - kde-apps/gwenview - kde-apps/dolphin - kde-apps/konsole - !plasma? ( kde-apps/kdebase-meta - kde-base/kdm - kde-base/kdebase-startkde - kde-misc/gx-mail-notify ) - plasma? ( kde-plasma/plasma-meta - x11-plugins/pidgin-indicator ) - media-gfx/geeqie - kde-apps/ark - x11-themes/oxygen-gtk - " - diff --git a/virtual/miller-workstation/miller-workstation-12.2.ebuild b/virtual/miller-workstation/miller-workstation-12.2.ebuild new file mode 100644 index 0000000..ac96e4f --- /dev/null +++ b/virtual/miller-workstation/miller-workstation-12.2.ebuild @@ -0,0 +1,59 @@ +EAPI="7" +DESCRIPTION="Virtual for Miller workstations" + +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="rdp vnc xscreensaver vlc" + +RDEPEND=" + =net-misc/unison-2.48* + =dev-lang/ocaml-4.04* + app-admin/systemdgenie + virtual/miller-base + kde-apps/kcalc + vlc? ( media-video/vlc ) + net-im/pidgin + x11-plugins/pidgin-mbpurple + x11-plugins/purple-facebook + x11-plugins/pidgin-skypeweb + xscreensaver? ( x11-misc/xscreensaver ) + media-fonts/corefonts + media-fonts/noto + media-fonts/noto-emoji + kde-misc/basket + virtual/jre + rdp? ( kde-apps/krdc[rdp] ) + vnc? ( kde-apps/krdc[vnc] ) + || ( + www-client/firefox + ( www-client/chromium www-plugins/chrome-binary-plugins ) + www-client/firefox-bin + www-client/google-chrome + www-client/opera + ) + kde-apps/filelight + || ( + mail-client/thunderbird-bin + mail-client/thunderbird + ) + games-misc/fortune-mod + || ( + app-office/libreoffice-bin + app-office/libreoffice + ) + media-gfx/gimp + www-plugins/adobe-flash + media-sound/clementine + kde-apps/spectacle + kde-apps/kwalletmanager + x11-misc/kdocker + kde-apps/okular + kde-apps/gwenview + kde-apps/dolphin + kde-apps/konsole + kde-plasma/plasma-meta + media-gfx/geeqie + kde-apps/ark + x11-themes/oxygen-gtk + " + -- cgit v1.2.3