9 files changed, 12 insertions, 158 deletions
diff --git a/virtual/miller-workstation/Manifest b/virtual/miller-workstation/Manifest
index f857b7c..ce1a302 100644
--- a/virtual/miller-workstation/Manifest
+++ b/virtual/miller-workstation/Manifest
@@ -1,19 +1,3 @@
-EBUILD miller-workstation-3.ebuild 821 RMD160 ab57669da5bc1d8c67c091da5840dd8b2514ebbc SHA1 cab94af1cd1ce13fbea200f36f042cd10868f4f7 SHA256 d8bcaa5b2f5e0f32450325b46e8ae6a68f2583866d1559479a5534577f213a15
-MD5 ff5ca4ba1ebb55d78b48564380acf4ca miller-workstation-3.ebuild 821
-RMD160 ab57669da5bc1d8c67c091da5840dd8b2514ebbc miller-workstation-3.ebuild 821
-SHA256 d8bcaa5b2f5e0f32450325b46e8ae6a68f2583866d1559479a5534577f213a15 miller-workstation-3.ebuild 821
-EBUILD miller-workstation-4.ebuild 835 RMD160 74357658ccf455ba654b8902b42c05006d4013ff SHA1 c85b2c7d83e057d01d8c19b37a65320f4bd8ef4e SHA256 a99921ba495aad0f94dbfa79632a260587ea7fdf2498dd063bec0d8d89b2549e
-MD5 199d53fd91f8298ec0b35b1602d7f607 miller-workstation-4.ebuild 835
-RMD160 74357658ccf455ba654b8902b42c05006d4013ff miller-workstation-4.ebuild 835
-SHA256 a99921ba495aad0f94dbfa79632a260587ea7fdf2498dd063bec0d8d89b2549e miller-workstation-4.ebuild 835
-EBUILD miller-workstation-5.ebuild 860 RMD160 c89ecaf0009d8a98de2bbc6d3737fa3d10a21eba SHA1 b0505dc875b344aa3d0b45d3e5d653dbd1fa721d SHA256 2da44f180a1e745f149869f19bb9a3a0f27b333c4382f5da72d73e98b1f0ff05
-MD5 e20dd1712e67d66cb5a2db051056be64 miller-workstation-5.ebuild 860
-RMD160 c89ecaf0009d8a98de2bbc6d3737fa3d10a21eba miller-workstation-5.ebuild 860
-SHA256 2da44f180a1e745f149869f19bb9a3a0f27b333c4382f5da72d73e98b1f0ff05 miller-workstation-5.ebuild 860
-EBUILD miller-workstation-6.ebuild 864 RMD160 e93852e0a8e14bf44d7d082b08497388fd9ced80 SHA1 20e8cf382f3da1b918b206ddb1b1deee4f79b1c2 SHA256 1f122a6d605a007f4464794d11967c9cad86cafa7fa600f3596c6b2b6b9b8078
-MD5 277f2da460352f1d8839102817facc11 miller-workstation-6.ebuild 864
-RMD160 e93852e0a8e14bf44d7d082b08497388fd9ced80 miller-workstation-6.ebuild 864
-SHA256 1f122a6d605a007f4464794d11967c9cad86cafa7fa600f3596c6b2b6b9b8078 miller-workstation-6.ebuild 864
 EBUILD miller-workstation-7.ebuild 889 RMD160 0e20168e180fd1f3e140ceb50fcff627a591bbcb SHA1 b1e4e34a5bae2fb6e031843bd3bbd372b8a4397a SHA256 523f868647d89d8abac456300a4158279bb9e20c215f9da30867a552b61ccf15
 MD5 661038202f6487f98d84c384e0ffdf8d miller-workstation-7.ebuild 889
 RMD160 0e20168e180fd1f3e140ceb50fcff627a591bbcb miller-workstation-7.ebuild 889
@@ -22,21 +6,16 @@ EBUILD miller-workstation-8.ebuild 933 RMD160 9a9fa7182f3827ddbc7210472df92335f0
 MD5 d32a5d345d6a6b0e8e60ece4e7f61400 miller-workstation-8.ebuild 933
 RMD160 9a9fa7182f3827ddbc7210472df92335f076d2f4 miller-workstation-8.ebuild 933
 SHA256 d17145c2cd2e01f8a7452157eeec385ce233f1bb814432403696b9f948e8f542 miller-workstation-8.ebuild 933
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-workstation-3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-workstation-3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-workstation-3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-workstation-4 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-workstation-4 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-workstation-4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-workstation-5 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-workstation-5 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-workstation-5 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-workstation-6 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-workstation-6 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-workstation-6 0
+EBUILD miller-workstation-9.ebuild 950 RMD160 654bd3436805237ae8cb4ec2b7dfd3f04d632741 SHA1 b84d1eddc0a01a67705ac86a366072a24b04e03c SHA256 35432649a59694ab81479a823a73874de8be4194985ad275e619c4dbeb5cec1f
+MD5 db9379f2539f24e82f0d285e05da297b miller-workstation-9.ebuild 950
+RMD160 654bd3436805237ae8cb4ec2b7dfd3f04d632741 miller-workstation-9.ebuild 950
+SHA256 35432649a59694ab81479a823a73874de8be4194985ad275e619c4dbeb5cec1f miller-workstation-9.ebuild 950
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-workstation-7 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-workstation-7 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-workstation-7 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-workstation-8 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-workstation-8 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-workstation-8 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-workstation-9 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-workstation-9 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-workstation-9 0
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-4 b/virtual/miller-workstation/files/digest-miller-workstation-4
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-4
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-5 b/virtual/miller-workstation/files/digest-miller-workstation-5
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-5
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-6 b/virtual/miller-workstation/files/digest-miller-workstation-6
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-6
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-3 b/virtual/miller-workstation/files/digest-miller-workstation-9
index e69de29..e69de29 100644
--- a/virtual/miller-workstation/files/digest-miller-workstation-3
+++ b/virtual/miller-workstation/files/digest-miller-workstation-9
diff --git a/virtual/miller-workstation/miller-workstation-3.ebuild b/virtual/miller-workstation/miller-workstation-3.ebuild
deleted file mode 100644
index d92eef6..0000000
--- a/virtual/miller-workstation/miller-workstation-3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION="Virtual for Miller workstations"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="
-virtual/miller-base
-kde-base/kcalc
-net-www/mplayerplug-in
-mail-client/mutt
-net-im/gaim
-games-misc/fortune-mod-all
-x11-themes/gtk-engines-qt
-sys-devel/bc
-sys-auth/nss_ldap
-x11-misc/xscreensaver
-media-fonts/corefonts
-sys-auth/pam_ldap
-dev-java/blackdown-jre
-media-gfx/inkscape
-kde-base/krdc
-www-client/mozilla-firefox
-media-video/mplayer
-kde-misc/filelight
-mail-client/mozilla-thunderbird
-app-emulation/wine
-net-mail/fetchmail
-app-text/xpdf
-www-client/links
-app-misc/freemind
-games-misc/fortune-mod
-app-office/openoffice-bin
-x11-wm/fluxbox
-media-gfx/gimp
-net-www/netscape-flash
-x11-plugins/gaim-encryption
-x11-themes/gtk-chtheme
-media-gfx/gimageview
-app-office/dia
-"
-
diff --git a/virtual/miller-workstation/miller-workstation-4.ebuild b/virtual/miller-workstation/miller-workstation-4.ebuild
deleted file mode 100644
index cd82a40..0000000
--- a/virtual/miller-workstation/miller-workstation-4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION="Virtual for Miller workstations"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="
-virtual/miller-base
-kde-base/kcalc
-net-www/mplayerplug-in
-mail-client/mutt
-net-im/gaim
-games-misc/fortune-mod-all
-x11-themes/gtk-engines-qt
-sys-devel/bc
-sys-auth/nss_ldap
-x11-misc/xscreensaver
-media-fonts/corefonts
-sys-auth/pam_ldap
-dev-java/blackdown-jre
-media-gfx/inkscape
-kde-base/krdc
-www-client/mozilla-firefox
-media-video/mplayer
-kde-misc/filelight
-mail-client/mozilla-thunderbird
-app-emulation/wine
-net-mail/fetchmail
-app-text/xpdf
-www-client/links
-app-misc/freemind
-games-misc/fortune-mod
-app-office/openoffice-bin
-x11-wm/fluxbox
-media-gfx/gimp
-net-www/netscape-flash
-x11-plugins/gaim-encryption
-x11-themes/gtk-chtheme
-media-gfx/gimageview
-app-office/dia
-net-misc/dhcp
-"
-
diff --git a/virtual/miller-workstation/miller-workstation-5.ebuild b/virtual/miller-workstation/miller-workstation-5.ebuild
deleted file mode 100644
index 5660ed1..0000000
--- a/virtual/miller-workstation/miller-workstation-5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION="Virtual for Miller workstations"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="
-virtual/miller-base
-kde-base/kcalc
-net-www/mplayerplug-in
-mail-client/mutt
-net-im/gaim
-games-misc/fortune-mod-all
-x11-themes/gtk-engines-qt
-sys-devel/bc
-sys-auth/nss_ldap
-x11-misc/xscreensaver
-media-fonts/corefonts
-sys-auth/pam_ldap
-dev-java/blackdown-jre
-media-gfx/inkscape
-|| (kde-base/krdc kde-base/kdenetwork)
-www-client/mozilla-firefox
-media-video/mplayer
-kde-misc/filelight
-mail-client/mozilla-thunderbird
-app-emulation/wine
-net-mail/fetchmail
-app-text/xpdf
-www-client/links
-app-misc/freemind
-games-misc/fortune-mod
-app-office/openoffice-bin
-x11-wm/fluxbox
-media-gfx/gimp
-net-www/netscape-flash
-x11-plugins/gaim-encryption
-x11-themes/gtk-chtheme
-media-gfx/gimageview
-app-office/dia
-net-misc/dhcp
-"
-
diff --git a/virtual/miller-workstation/miller-workstation-6.ebuild b/virtual/miller-workstation/miller-workstation-9.ebuild
index deba45c..e3d8cd3 100644
--- a/virtual/miller-workstation/miller-workstation-6.ebuild
+++ b/virtual/miller-workstation/miller-workstation-9.ebuild
@@ -6,7 +6,7 @@ IUSE=""
 
 DEPEND="
 virtual/miller-base
-kde-base/kcalc
+|| ( kde-base/kdeutils kde-base/kcalc )
 net-www/mplayerplug-in
 mail-client/mutt
 net-im/pidgin
@@ -31,7 +31,6 @@ www-client/links
 app-misc/freemind
 games-misc/fortune-mod
 app-office/openoffice-bin
-x11-wm/fluxbox
 media-gfx/gimp
 net-www/netscape-flash
 x11-plugins/pidgin-encryption
@@ -39,5 +38,9 @@ x11-themes/gtk-chtheme
 media-gfx/gimageview
 app-office/dia
 net-misc/dhcp
+x11-misc/googleearth
+media-sound/amarok
+kde-base/ksnapshot
+kde-misc/kdocker
 "