Huge collection of fixes

54 files changed, 158 insertions, 182 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index b960051..da87549 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -46,11 +46,11 @@ AUX service-check 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb38
 AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f WHIRLPOOL f1afae03bdf094cb08d3389cf329d10debd89c73f360c0e16f686cc267eb49c1e5780bbfe78fdd8518c9cdba1cefe6849b598c9f8d5da667516d705bd650c966
 AUX update-autoshutdown 88 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6 SHA512 0f2480fe16ae69279937cab620fa2a4764114659759654b63e844415ba937e1ede8aa3974979c7adec3b8dbb8bf2f68eb80f7da5c97daeccd69df28e8fbf0430 WHIRLPOOL f4619f0bf51faf9d1ab572f32c14b7fc9dec1b8b101f78e8c80e7fa3fb3832567dbeba462f4f27490a3398916aa6f08e1d7e66d69ed4b43c68451bbf15187e00
 AUX update-install2 457 SHA256 40fcd47ac532d65e0ea54712df2fc0e0ae1685cb2afd8827082d0ee5575815c7 SHA512 531b7e48c40b4b404c3b5e378ddad6d800a6d637708c0e3755de08e9693abe8785ba5281afcfc835aa391b4eba7345170523fc1f66f2192e5f17abf2d77ee98d WHIRLPOOL 5fa8d93af40819a210b976f8bcd3f1d5ea1ac38d47e208c81014beb0c3b5bdf3304d479eb37e4ca11fc7ea454b947f05bb22a525195f10ec131c571913a6f2ba
-AUX update-kernel 815 SHA256 054742e544c40656b77baff6a748654cf78179c3887945f7e3b30a8d4e274d9c SHA512 9d4833374c09f74be9bb421224f3648f79c9a73ebd6b06abfb05c4acf0a3fb6c546bff678669fa1e4e26ef3dcf4f58403acfedde912bede4e4281b09f1f5cfd0 WHIRLPOOL 074535d8aad65a59a41ebd15b5eebe1f96d294a70fc5affb270a9c72d4bc94750953f8bdb911aaf262c2b86003f7f93f35be435812bfdc6ebd4b0038875e4d84
+AUX update-kernel 838 SHA256 3c7caa53b2f4b80aae80d265ec1d01cf9d6bc267b6b2eb08d9bcc5b374580dab SHA512 72fb78dd875635212a1d1097caec6d1adec84cca84d43e72cc96c7cf3c1ce132db65e1177dacc2aa375039c8f307177fc04d939fec977e7389e79a789cf8a441 WHIRLPOOL b3011eb07b924c3200229380ba165a28b26935c0aeb38cae800a8166d708097f46f4d18b5f897aa34dd77bfbd609c752de097c9c7a1a4125d4811901f026ed5e
 AUX update.portage.cron 171 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03 SHA512 02ca67cf126591a18f5243261c4bcb5ec2f67c75ded69709932d2972bcd43c500eb5d82160f0d23539141285670d12713e12f1f55aba5ca02ad72e4672ff18fa WHIRLPOOL 07630c59b46c9ae0fd8369e5d66375bcc5ad901473721746e1ad8983dbe43bf5182302149334d4367cc49c6da853ca56a2733b2c0e53d953f7b5e55b67bae17f
 AUX update.portage.cron-2 180 SHA256 19f7c7171b3c86f60605f6576dd14ceccd1f156c1de600fefe66d00554d153b6 SHA512 742b9e9f792a9e9445a515320b9432fd6f64d148a383c6abd142d44af5806f0c4126800b31261a6b37c7e71fc4d29777ceb68f0019695bd07b510f3393b351b5 WHIRLPOOL a5facd48808b08d561c762d14f82bf42f5dc61cf7adcf6fb59295a5b5fe1b78ed62621998a84d08d4524a3640a43d7fc64804c5331704cb176079bb0d48bc68d
 AUX weekly-av-scan.cron 257 SHA256 79c7bca330ec2c2e7d3fe542d8744cdeea84cf97f325f3554dbac849fe80d020 SHA512 c4ff727ab7f9d492a35c42d0b8f1a4153e61e8ea5282f5bdfb2377a0b7af640bea0aa7089a2ac518fe4c771421014c8827022be0ca43b0842bd55a880d3c8bd2 WHIRLPOOL 4064b8bf952fe143070de7d8ecf091ccfc2fb542fb8a8e31da265451971627613d61f33e04cde5b3ba5c9407588f76d26cb2ac1ba091112d6a3e0f764398bfbb
 AUX weekly-distclean-exec-eclean.cron 40 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38 SHA512 9caeec20a9c19c0eb6c73d1c06b3f0c3ba0477f82b6390ab1392ffbad9e22a3b39d7c58c2d4b58d4a04729b8c3be2adc2735d38a8dd4a5e01862a4911bf67d8e WHIRLPOOL e7e03e6a02883dd35e8a55a67b53f070b7eece1613b5ad60a2d3bd6940ff2fa3319e7371a0b1fe78481e235d665734ae3c8fb158e22c315e15794b7ff4337659
 AUX weekly-distclean-exec.cron 664 SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141 SHA512 a0c52724253294dd9693577b38e9fa85e328c2c251b6230a436975accc6cf72abbff6083eb0a6c0bc07145ef592d2d224d88a29acb3ef958df1eeeeafc7672a0 WHIRLPOOL 3a894420a2fd430bf0366c995000b851893dad99bba48fa778c95c5f80fa9cced938a6c06c6e4b2dc7909380a0875da733445638cdda8b91350f03b6fe28605e
 AUX write-new-updates 123 SHA256 98d35a82d75ed3e4a7b9857c57ab41f3cbf60a82dc255b7c62d372e0ed410d84 SHA512 02d696e3abffe919fdbea7f580efc4ee8988f1f10c815dfaf00b0bf7ba4b3386e935883f28821d5c064c8706769eed2e55ba7cc184d4355c74e75fdf1feba116 WHIRLPOOL 8a6b1a03e7552701d7053c7eefe092ac0473940eff419445f6c45e959a910c8920cdde8b512699210ed578ad7312657e638710ea3d66fd6ad9ead32299d2f3b8
-EBUILD miller-base-9-r7.ebuild 3585 SHA256 380e4d3a7276a36d2a37bca75c4bb8f79fec94e12a0778ae1b12da375497b23c SHA512 971356606114b9db3c7ad4e98ebd18580e6b588a7085290691d432e67aaf748659e65cab75fe5c1f9ae35b7c1cbae1b981a8d4e5ca8cd7d52639c73f28dc6ec8 WHIRLPOOL 1afcf6df1919485509bb4bb1fdfd8c17ed0b54fa211a4096aac885b89023ca6ccec97d39c20e2094d6128ff50515d993c844a81fe73896a70598a75762606213
+EBUILD miller-base-9-r8.ebuild 3349 SHA256 3ff51861fbde5ba92f75c925e6e25d8f59c3ec474c83ebc5fa47b3594fc6ad69 SHA512 7498a8568336be123361878277e0012247b635d8ad214f258b005e4fdba77d3e613a54aa7fb99a461620377cf15e91a02c4a8872cf5e949835484b7fa212f644 WHIRLPOOL 79af47867f92ace998d2a9530cce7b1ed862735c311b40d5efa3ba970a89ceb5dfc123459d266af77e79b11f311c8d9fb847c7f8f240573aa0a2391f7c6db613
diff --git a/virtual/miller-base/files/update-kernel b/virtual/miller-base/files/update-kernel
index 1f50c98..bf1b22d 100755
--- a/virtual/miller-base/files/update-kernel
+++ b/virtual/miller-base/files/update-kernel
@@ -8,7 +8,7 @@ make modules_install -j2 || ( echo "Make modules install failed" ; exit 1 )
 emerge -q1 @module-rebuild || exit 1
 make install -j2 || ( echo "Make install failed" ; exit 1 )
 
-KV=$(head /boot/config -n3 | tail -n1 | cut -d ' ' -f 3)
+KV=$(head $(ls -lt /boot/config-* | head -n1) -n3 | tail -n1 | cut -d ' ' -f 3)
 if [ -x /usr/bin/dracut ] ; then
 	/usr/bin/dracut -H -f --lzma /boot/initramfs-$KV.img $KV
 fi
diff --git a/virtual/miller-base/miller-base-9-r7.ebuild b/virtual/miller-base/miller-base-9-r8.ebuild
index 8f09d1d..78c0b94 100644
--- a/virtual/miller-base/miller-base-9-r7.ebuild
+++ b/virtual/miller-base/miller-base-9-r8.ebuild
@@ -1,18 +1,17 @@
 EAPI="2"
-DESCRIPTION="Virtual for Miller servers"
+DESCRIPTION="Virtual for base systems"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion git fbsplash
 minimal autoupdate autoshutdown autoservicerestart lvmboot lvmroot sw-suspend raid
-video_cards_nvidia video_cards_radeon"
+video_cards_nvidia firmware"
 
-DEPEND="
+RDEPEND="
 	sys-apps/kexec-tools
 	sys-process/htop
 	sys-apps/less
 	app-admin/eclean-kernel
-	!minimal? ( www-servers/apache )
 	raid? ( sys-fs/mdadm )
 	app-admin/ide-smart
 	sys-cluster/glusterfs
@@ -20,12 +19,7 @@ DEPEND="
 	sys-apps/ethtool
 	cdr? ( app-cdr/k3b )
 	sys-apps/hdparm
-	!minimal? ( net-dns/bind-tools )
 	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || (
-		net-fs/mount-cifs
-		net-fs/samba-client
-		net-fs/samba[client] ) )
 	xfs? ( sys-fs/xfsdump )
 	sys-fs/lvm2
 	lvmboot? ( >=sys-boot/grub-1.98 )
@@ -34,23 +28,32 @@ DEPEND="
 			sys-kernel/dracut[dracut_modules_lvm]
 			)
 	video_cards_nvidia? ( sys-apps/v86d )
-	video_cards_radeon? ( x11-drivers/radeon-ucode )
 	>=app-portage/gentoolkit-0.2.1
 	sys-process/vixie-cron
-	!minimal? ( virtual/eject )
 	app-admin/sudo
 	mail-client/mailx
 	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
+	sys-apps/usbutils
 	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	!minimal? ( x11-apps/xauth )
+	!minimal? (
+			dev-util/strace
+			net-analyzer/netcat
+			net-ftp/ncftp
+			app-text/dos2unix
+			net-dns/bind-tools 
+			www-servers/apache 
+			app-antivirus/clamav 
+			|| (
+				net-fs/mount-cifs
+				net-fs/samba-client
+				net-fs/samba[client]
+			   )
+			)
+	firmware? ( sys-kernel/linux-firmware )
 	sys-process/lsof
 	app-portage/layman[subversion]
 	app-admin/syslog-ng
 	app-admin/logrotate
-	!minimal? ( app-antivirus/clamav )
 	!hardened? ( 
 			sys-devel/prelink
 			!sw-suspend? ( sys-kernel/gentoo-sources )
@@ -58,9 +61,6 @@ DEPEND="
 				|| ( sys-kernel/tuxonice-sources
 					sys-kernel/pf-sources ) ) )
 	hardened? ( sys-kernel/hardened-sources sys-apps/gradm )
-	!minimal? ( ||
-		( app-text/dos2unix <app-text/unix2dos-5 )
-		( >=app-text/dos2unix-5 !app-text/unix2dos ) )
 	app-misc/screen
 	sys-boot/grub
 	app-vim/gentoo-syntax
@@ -68,7 +68,6 @@ DEPEND="
 	sys-auth/nss_ldap
 	app-editors/gvim
 	git? ( dev-vcs/git )
-	!minimal? ( dev-util/strace )
 	bash-completion? ( app-shells/bash-completion )
 	net-misc/wakeonlan
 	"
diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index 46b4702..e6bb257 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1 +1 @@
-EBUILD miller-desktop-2-r6.ebuild 1076 SHA256 13e03bb93c0ea7d84169ab1caad6817a2e48bdfafb15069313916d7a35735d40 SHA512 88c7b6a54fdc76c67cb821025272d09957bb46bacd6074023281e2f697ed9b6889205cf5a544058e3eed567cadceead2e44b43f38b334a04b19934dc29d84fae WHIRLPOOL f5c04046d7f5e0b8225facf6dde69af7b80377b6b5fb9dc0c17615a4edc236ba97da1c4d8b2f42414d96399ffdd7f3a2189a48559eead49ed8f307cdf0861e61
+EBUILD miller-desktop-2-r6.ebuild 1044 SHA256 4574c9505912c0e10b66aa6635080d4eeb601eb6c58bee3a93c969aa083878ba SHA512 e7ea3ed634e30076e58e0e431aec3e071848810464d6ee99eef751c902210ee441cab38c6d961167930dfb0c072954f784b425ffc8fa22313a6eb9c0d8f29716 WHIRLPOOL bb10c73b8f787b1b151176c9b2cca1d929e30b93e2cc8e09e7990d819d265612b9ee652fcae3c93c3e957e6cead8fcb947aa6c60726fa575ef9921e232c565b6
diff --git a/virtual/miller-desktop/files/digest-miller-desktop-1 b/virtual/miller-desktop/files/digest-miller-desktop-1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-desktop/files/digest-miller-desktop-1
+++ /dev/null
diff --git a/virtual/miller-desktop/files/digest-miller-desktop-2 b/virtual/miller-desktop/files/digest-miller-desktop-2
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-desktop/files/digest-miller-desktop-2
+++ /dev/null
diff --git a/virtual/miller-desktop/files/digest-miller-desktop-2-r1 b/virtual/miller-desktop/files/digest-miller-desktop-2-r1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-desktop/files/digest-miller-desktop-2-r1
+++ /dev/null
diff --git a/virtual/miller-desktop/miller-desktop-2-r6.ebuild b/virtual/miller-desktop/miller-desktop-2-r6.ebuild
index 3d2239c..526b2ee 100644
--- a/virtual/miller-desktop/miller-desktop-2-r6.ebuild
+++ b/virtual/miller-desktop/miller-desktop-2-r6.ebuild
@@ -1,11 +1,11 @@
-DESCRIPTION="Virtual for Miller servers"
+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 ndiswrapper b43 networkmanager input_devices_synaptics fbsplash iwl3945
-kde gnome"
+IUSE="vpnc pptp wifi ndiswrapper b43 networkmanager input_devices_synaptics fbsplash kde gnome"
 
-DEPEND="
+RDEPEND="
+	virtual/eject
 	media-gfx/MIB-Ossigeno-Ultimate-Plymouth
 	virtual/miller-base
 	x11-base/xorg-server
@@ -33,7 +33,6 @@ DEPEND="
 		net-dns/openresolv
 		ndiswrapper? ( net-wireless/ndiswrapper )
 		b43? ( sys-firmware/b43-firmware )
-		iwl3945? ( sys-firmware/iwl3945-ucode )
 		)
 	sys-fs/dosfstools
 	sys-boot/syslinux
diff --git a/virtual/miller-dev/Manifest b/virtual/miller-dev/Manifest
index 7bcd148..3bc674c 100644
--- a/virtual/miller-dev/Manifest
+++ b/virtual/miller-dev/Manifest
@@ -1 +1 @@
-EBUILD miller-dev-10-r2.ebuild 1427 SHA256 b0cf8097b189a8b0d9929356436842ee521cdb80a77dd50e85e87ac0efc247eb SHA512 22ef30bb4efa67fd6b110a4692a6854ad216575b9c953b032c9dd483e10edb6bb7900819fd2f1f16639623ae8f6bf992d7c590694e35fd3f7c8cd4a9eb5653a0 WHIRLPOOL 432ee0a1a9fe04eb497b6dc6c5eb88232e77e8992e7857b017a6321bcb3759c719567f8f1b6cb2aefbcf80ba8e1b54137492a9e690866c8eb1a2e5990ffdcee6
+EBUILD miller-dev-10-r2.ebuild 1571 SHA256 66f126880f6673ef3b1f85dbf776db44298030653085c1bdad9c9982f72ceb24 SHA512 54f9ed6fb577458bcb67890439e77418610e6c38d059371cbcb92a68b8747db3ef354d1b29521c6cc8d7a8f4967337f86b07de9f49ffb85d4f2d0264ec088630 WHIRLPOOL 3edcbd133ce54449bbc0d006585e7be071608c66731a11ce1699c56d2c69f162178443f0e7f1462d54de509ec91f1ba761699567872c8e2bad83ae809d1b1475
diff --git a/virtual/miller-dev/files/digest-miller-dev-6 b/virtual/miller-dev/files/digest-miller-dev-6
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-dev/files/digest-miller-dev-6
+++ /dev/null
diff --git a/virtual/miller-dev/files/digest-miller-dev-7 b/virtual/miller-dev/files/digest-miller-dev-7
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-dev/files/digest-miller-dev-7
+++ /dev/null
diff --git a/virtual/miller-dev/miller-dev-10-r2.ebuild b/virtual/miller-dev/miller-dev-10-r2.ebuild
index a182038..1e67a15 100644
--- a/virtual/miller-dev/miller-dev-10-r2.ebuild
+++ b/virtual/miller-dev/miller-dev-10-r2.ebuild
@@ -1,13 +1,15 @@
+EAPI="4"
 DESCRIPTION="Virtual for Miller development workstations"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="X dotnet odbc mysql postgres"
+IUSE="X dotnet odbc mysql postgres cxx"
 
-DEPEND="virtual/miller-base
+RDEPEND="
+	virtual/miller-base
 	www-client/lynx
 	www-client/chromium
-	|| ( www-client/firefox www-client/icecat )
+	www-client/firefox
 	www-client/opera
 	postgres? ( dev-db/apgdiff )
 	sys-devel/gdb
@@ -15,12 +17,15 @@ DEPEND="virtual/miller-base
 	app-text/htmltidy
 	app-doc/doxygen
 	app-benchmarks/siege
-	dev-util/cppcheck
+	cxx? (
+			dev-util/cppcheck
+			sys-devel/clang[static-analyzer]
+			app-vim/omnicppcomplete
+			dev-util/splint
+		 )
 	media-fonts/freefont
 	app-vim/vcscommand
 	net-analyzer/arping
-	dev-util/splint
-	app-vim/omnicppcomplete
 	dev-libs/fcgi
 	dev-libs/Ice
 	dev-cpp/glibmm
@@ -34,7 +39,6 @@ DEPEND="virtual/miller-base
 	net-ftp/ftp
 	media-video/ffmpeg
 	postgres? ( dev-db/postgresql_autodoc )
-	dev-db/squirrel-sql
 	odbc? (
 			mysql? ( dev-db/myodbc )
 			postgres? ( dev-db/psqlodbc )
@@ -42,26 +46,35 @@ DEPEND="virtual/miller-base
 	net-misc/youtube-dl
 	www-servers/apache
 	X? (
-		|| ( net-misc/tightvnc net-misc/vnc )
-		net-misc/rdesktop
-		media-gfx/gimp
-		kde-base/kruler
-		net-analyzer/wireshark
-		x11-apps/xhost
-		dev-db/tora
-		dev-util/nemiver
-		dev-util/kdbg
-		kde-base/okteta
-		dev-vcs/kdesvn
-		net-analyzer/nmap
-		dotnet? (
-			dev-util/mono-debugger
-			dev-util/monodevelop
-			dev-util/monodevelop-database
-			dev-util/monodevelop-debugger-gdb
-		)
-		postgres? ( >=dev-db/pgadmin3-1.12 )
-		kde-base/kcachegrind
-		app-editors/gvim
+			|| (
+				net-misc/tightvnc
+				net-misc/vnc
+			   )
+			net-misc/rdesktop
+			media-gfx/gimp
+			kde-base/kruler
+			net-analyzer/wireshark
+			x11-apps/xhost
+			dev-db/tora
+			dev-db/squirrel-sql
+			dev-util/nemiver
+			dev-util/kdbg
+			kde-base/okteta
+			dev-vcs/kdesvn
+			net-analyzer/nmap
+			dotnet? (
+				dev-util/mono-debugger
+				dev-util/monodevelop
+				|| (
+					>=dev-util/monodevelop-4
+					(
+					 dev-util/monodevelop-database
+					 dev-util/monodevelop-debugger-gdb
+					)
+				   )
+				)
+	postgres? ( >=dev-db/pgadmin3-1.12 )
+	kde-base/kcachegrind
+	app-editors/gvim
 	)"
 
diff --git a/virtual/miller-kiosk/Manifest b/virtual/miller-kiosk/Manifest
index 6be3371..63348e2 100644
--- a/virtual/miller-kiosk/Manifest
+++ b/virtual/miller-kiosk/Manifest
@@ -1 +1 @@
-EBUILD miller-kiosk-3.ebuild 312 RMD160 09861dab635f071d70c1aefe44fd9fdad9ffa33f SHA1 a5095b8069704152618f510cdd53a0df294f26cb SHA256 8e0edd6f75501dc2fd5ddca9691c231be91b738c64b803fc90dd98cf91f77252
+EBUILD miller-kiosk-3.ebuild 313 SHA256 47308250b23d74008fb850e9408ef9b372026b8bf5ea8ae35f87da13d20dff3b SHA512 b2ba4823f299f11c2ffaeb27e3871d6f21d25b80dd0638ed14569a9430c90333ff7574968deacfc0e5c4222240bbc941125a2687996d2e74f9c36ab771f586a2 WHIRLPOOL a14d72eed765b8dd02bfeaa0b4edb7600540293e566aca41853f871279e577904a3b2ca546aea028bf6d230678267104fe76d77a23d129975b0dfbf142ad8e5a
diff --git a/virtual/miller-kiosk/files/digest-miller-kiosk-2 b/virtual/miller-kiosk/files/digest-miller-kiosk-2
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-kiosk/files/digest-miller-kiosk-2
+++ /dev/null
diff --git a/virtual/miller-kiosk/files/digest-miller-kiosk-2-r1 b/virtual/miller-kiosk/files/digest-miller-kiosk-2-r1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-kiosk/files/digest-miller-kiosk-2-r1
+++ /dev/null
diff --git a/virtual/miller-kiosk/miller-kiosk-3.ebuild b/virtual/miller-kiosk/miller-kiosk-3.ebuild
index cbbd376..d2fc72e 100644
--- a/virtual/miller-kiosk/miller-kiosk-3.ebuild
+++ b/virtual/miller-kiosk/miller-kiosk-3.ebuild
@@ -4,7 +4,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	virtual/miller-base
 	x11-wm/evilwm
 	x11-apps/xset
diff --git a/virtual/miller-kioskserver/Manifest b/virtual/miller-kioskserver/Manifest
index 141baab..609bad2 100644
--- a/virtual/miller-kioskserver/Manifest
+++ b/virtual/miller-kioskserver/Manifest
@@ -1 +1 @@
-EBUILD miller-kioskserver-1.ebuild 265 RMD160 f25a0f333c5efb1b89bc54df4e0cf48e1a32f776 SHA1 62ee89cf7c9c56830d1942d21e31c83eadea60b4 SHA256 1976b1ec9b6c84db1765ef6e5321a869825f63ede887c41390c81b6f25ff69ef
+EBUILD miller-kioskserver-1.ebuild 270 SHA256 4c839cc4e6cc4308acd1711ecac0d33773b36ba47a1d0d876b6d41e633854389 SHA512 fb5c158255d97a2c52b2152774eea7e7271e9aa0089e27c8d7521792917ffa1e16f919ad310a522a81c6070d2ccf5e22ca9b740895ce603502427dae106c8330 WHIRLPOOL 981b684363e73e7f0092b8f3342ddd307519757b24bd47c3fb57f370a84992d10959cf77334dbfb68d9bfa6d8168de63ff51e222323be93722f96ced119b4973
diff --git a/virtual/miller-kioskserver/files/digest-miller-kioskserver-0 b/virtual/miller-kioskserver/files/digest-miller-kioskserver-0
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-kioskserver/files/digest-miller-kioskserver-0
+++ /dev/null
diff --git a/virtual/miller-kioskserver/files/digest-miller-kioskserver-1 b/virtual/miller-kioskserver/files/digest-miller-kioskserver-1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-kioskserver/files/digest-miller-kioskserver-1
+++ /dev/null
diff --git a/virtual/miller-kioskserver/miller-kioskserver-1.ebuild b/virtual/miller-kioskserver/miller-kioskserver-1.ebuild
index 2b897b5..2583543 100644
--- a/virtual/miller-kioskserver/miller-kioskserver-1.ebuild
+++ b/virtual/miller-kioskserver/miller-kioskserver-1.ebuild
@@ -2,9 +2,9 @@ DESCRIPTION="Virtual for Miller kiosk servers"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
+IUSE="mail"
 
-DEPEND="
+RDEPEND="
 	virtual/miller-webserver
 	virtual/miller-postgresql
 	mail? ( virtual/miller-mailserver )
diff --git a/virtual/miller-mailserver/Manifest b/virtual/miller-mailserver/Manifest
index 742b0a7..069490e 100644
--- a/virtual/miller-mailserver/Manifest
+++ b/virtual/miller-mailserver/Manifest
@@ -1,3 +1,2 @@
-AUX sa-learn 81 RMD160 757552dc2ffdfb9b03683768521813735579d30b SHA1 4b35ab90c614343a39f10314306ff168d9d8c274 SHA256 6a51cd3e7704df0a960e1051d08d2db582e73ad0222a92c0d2bc8d89963d3aec
-EBUILD miller-mailserver-0.ebuild 262 RMD160 0b642baee2d644cae626951f5de1d4adc93b1d4e SHA1 4bbfb1234b0f6341cc4059ba24c671f0a32c42bd SHA256 28c503d0346a21ecaf6ddd02b50be5882cfdcecda760ff7ab2fc00ada0230651
-EBUILD miller-mailserver-1.ebuild 376 RMD160 7aa34727a24f400661635a40b19036f91e7f4348 SHA1 dc7882fc118f0fd56b03e9db2d09fbcb5cb47a7c SHA256 d441273cbe0a7a72d3e4a49f739b9e1eecea29ac319eadcd49ea44f02d971a4d
+AUX sa-learn 81 SHA256 6a51cd3e7704df0a960e1051d08d2db582e73ad0222a92c0d2bc8d89963d3aec SHA512 47e192b340a944c41c96be38b6b80ec24f1de32d07a23ace0e1f8a3cb9deb81a03d420cd16377935237ce2f72ab6d4f7bc5cd07f8ec90feb8143b0586aa87621 WHIRLPOOL 2201293a076cceeff7efc93c4dcb9b55b8265a0f7df28dd009e81b283038e320361d2138671cdb42214f517c32a65d12cbd06dac386631b67073a1e63c5de79d
+EBUILD miller-mailserver-1.ebuild 382 SHA256 1e78b9f26658fce9adfe85dd2c58aa0dd0dac1e8e2149268443773db6175f3e0 SHA512 1f435d532604d975d5d88290c9535c16f45d2c318cc4afec52acc320dddc502f1eb93285c7e7110c3e0e3cc2296e282d6b525657e6eec57937f295a0d73a3594 WHIRLPOOL f5327cf276e7ccb4ba7d2a834b5931b31fd177d55c86613cd1b47f171d0e430949c4766c6cd80defe4747ccda83611ff52fcd239dcf078c5c34a76123ad6884d
diff --git a/virtual/miller-mailserver/miller-mailserver-0.ebuild b/virtual/miller-mailserver/miller-mailserver-0.ebuild
deleted file mode 100644
index f597cd0..0000000
--- a/virtual/miller-mailserver/miller-mailserver-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION="Virtual for Miller mail servers"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="
-virtual/miller-base
-|| ( net-mail/courier-imap mail-mta/courier )
-mail-mta/exim
-mail-filter/spamassassin
-"
diff --git a/virtual/miller-mailserver/miller-mailserver-1.ebuild b/virtual/miller-mailserver/miller-mailserver-1.ebuild
index b9842c2..e6f6f0d 100644
--- a/virtual/miller-mailserver/miller-mailserver-1.ebuild
+++ b/virtual/miller-mailserver/miller-mailserver-1.ebuild
@@ -5,12 +5,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
 
-DEPEND="
-virtual/miller-base
-virtual/cron
-|| ( net-mail/courier-imap mail-mta/courier )
-mail-mta/exim
-mail-filter/spamassassin[berkdb]
+RDEPEND="
+	virtual/miller-base
+	virtual/cron
+	|| ( net-mail/courier-imap mail-mta/courier )
+	mail-mta/exim
+	mail-filter/spamassassin[berkdb]
 "
 
 src_install() {
diff --git a/virtual/miller-mysql/Manifest b/virtual/miller-mysql/Manifest
index 51ede0a..1eb4bf4 100644
--- a/virtual/miller-mysql/Manifest
+++ b/virtual/miller-mysql/Manifest
@@ -1,7 +1 @@
-EBUILD miller-mysql-0.ebuild 190 RMD160 ccbbdd7b82fd9fa305cd1d784949ad7b98efa645 SHA1 d29f25ef11405374e7672c7e9b5c4f813605054f SHA256 b0901a6b3e1d78daa55bc0f2978fea78a39ec4fc66f6f88afcff95918944fe4a
-MD5 b65690128299a260e72f118353516863 miller-mysql-0.ebuild 190
-RMD160 ccbbdd7b82fd9fa305cd1d784949ad7b98efa645 miller-mysql-0.ebuild 190
-SHA256 b0901a6b3e1d78daa55bc0f2978fea78a39ec4fc66f6f88afcff95918944fe4a miller-mysql-0.ebuild 190
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-mysql-0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-mysql-0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-mysql-0 0
+EBUILD miller-mysql-0.ebuild 194 SHA256 a8add08c725ce214f396cb85bc592e5a73f2ba92f53103a1105ac39a5f5c00d8 SHA512 e05b241d216c81d93642b0a3233c9609391fc2ac6f5b7d379e75f2d9ea3d6f5f653579625d25e30274cb73baf3eadbc18e9e5601612cd09761be13b4bd91d0a2 WHIRLPOOL 214453c5393a3e39e0fb8345911a523e4b75785988c2ebbc18337304088786b22e8345378191328ad9af83deac0d44567bbfcb2eb3b2cbc131e28864a85bdc69
diff --git a/virtual/miller-mysql/files/digest-miller-mysql-0 b/virtual/miller-mysql/files/digest-miller-mysql-0
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-mysql/files/digest-miller-mysql-0
+++ /dev/null
diff --git a/virtual/miller-mysql/miller-mysql-0.ebuild b/virtual/miller-mysql/miller-mysql-0.ebuild
index 4535634..a5d9d73 100644
--- a/virtual/miller-mysql/miller-mysql-0.ebuild
+++ b/virtual/miller-mysql/miller-mysql-0.ebuild
@@ -1,10 +1,10 @@
-DESCRIPTION="Virtual for Miller workstations"
+DESCRIPTION="Virtual for Miller MySQL servers"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
 
-DEPEND="
-virtual/miller-base
-dev-db/mysql
+RDEPEND="
+	virtual/miller-base
+	dev-db/mysql
 "
diff --git a/virtual/miller-postgresql/Manifest b/virtual/miller-postgresql/Manifest
index 34a21ed..bf1ca7c 100644
--- a/virtual/miller-postgresql/Manifest
+++ b/virtual/miller-postgresql/Manifest
@@ -1 +1 @@
-EBUILD miller-postgresql-4.ebuild 288 SHA256 db6aec606695ae3016d7a0295e9c0fc8fcf77332eac8b0d04f56a6710142011b SHA512 a6d3780bc7b3910988321f1fdae78036b7a1b49744df9be8dbd83a0579764545fe4677b10e9c1ba96181e88d4bfcb1755971c17775840ec35d5d31c7c8d5ae1f WHIRLPOOL 9131cc55651a326dcbefe205c636d2767ecb45db4587d7763802449b26eb0ed3d6db62db4a9c57d8f9ab5c8f9e44dfa5fa1f083c04e6d324fba67b3e420adaa9
+EBUILD miller-postgresql-4.ebuild 293 SHA256 3e2c3c92f518eb09e44f1ad3f354bad833f13f0f7a4c8f75e3706871b6a77aad SHA512 5ead5c5d5de13cbccf7f2db8b902bc2cb98d5f12a1d80d0a0a26f27e23dbf82275ee83a173da297f9c423315350de2a3fd16178879cd9e07baed7bf992b6c400 WHIRLPOOL 8601547f90fada0589fa67b8fee28429e8543700d84297f8749d3050d206832aa702be24c44731aeaba515852ba2e0632111a7ad17aa7ef957a683d10f6dde5c
diff --git a/virtual/miller-postgresql/files/digest-miller-postgresql-0 b/virtual/miller-postgresql/files/digest-miller-postgresql-0
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-postgresql/files/digest-miller-postgresql-0
+++ /dev/null
diff --git a/virtual/miller-postgresql/files/digest-miller-postgresql-1-r1 b/virtual/miller-postgresql/files/digest-miller-postgresql-1-r1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-postgresql/files/digest-miller-postgresql-1-r1
+++ /dev/null
diff --git a/virtual/miller-postgresql/miller-postgresql-4.ebuild b/virtual/miller-postgresql/miller-postgresql-4.ebuild
index 68ce034..18d635f 100644
--- a/virtual/miller-postgresql/miller-postgresql-4.ebuild
+++ b/virtual/miller-postgresql/miller-postgresql-4.ebuild
@@ -5,10 +5,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="pgmaster"
 
-DEPEND="
-virtual/miller-base
-=dev-db/postgresql-server-9.2*
->=dev-db/slony1-2
-pgmaster? ( >=dev-db/slony1-2[perl] )
+RDEPEND="
+	virtual/miller-base
+	=dev-db/postgresql-server-9.2*
+	>=dev-db/slony1-2
+	pgmaster? ( >=dev-db/slony1-2[perl] )
 "
 
diff --git a/virtual/miller-proxy/Manifest b/virtual/miller-proxy/Manifest
index 1507181..e4fecb3 100644
--- a/virtual/miller-proxy/Manifest
+++ b/virtual/miller-proxy/Manifest
@@ -1,7 +1 @@
-EBUILD miller-proxy-0.ebuild 186 RMD160 da4e70488577fdcbb59acf29a2c27304ffd84361 SHA1 90ab9997c29cdbda5e073664cddb549c29fc8ee8 SHA256 4d6bcbe1e1b7f059e23c90e19ebed02f667adb82d83f47698755f0f8a383004d
-MD5 104c097a3b929b8e69ed7a64ee7af838 miller-proxy-0.ebuild 186
-RMD160 da4e70488577fdcbb59acf29a2c27304ffd84361 miller-proxy-0.ebuild 186
-SHA256 4d6bcbe1e1b7f059e23c90e19ebed02f667adb82d83f47698755f0f8a383004d miller-proxy-0.ebuild 186
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-proxy-0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-proxy-0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-proxy-0 0
+EBUILD miller-proxy-0.ebuild 189 SHA256 a652bf3067beef9cb11e4b30a7426ec0046af87a138670356c9316b6a76aece2 SHA512 fe0ff616b1f163bc4664ac50f084d57e955d58937240f5147d39468546790b8dd65472176b32f99900844b23302746afde1ce4607474785a6e444885416a180d WHIRLPOOL 6f15437e003f6f90c21a7a35ff40bf458062d0c4836e8348dbeaa68ebea2298774314328debc08263e3157da299d1eef5e38af54b5c0234063555205986dfc0f
diff --git a/virtual/miller-proxy/files/digest-miller-proxy-0 b/virtual/miller-proxy/files/digest-miller-proxy-0
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-proxy/files/digest-miller-proxy-0
+++ /dev/null
diff --git a/virtual/miller-proxy/miller-proxy-0.ebuild b/virtual/miller-proxy/miller-proxy-0.ebuild
index f6ac3f5..78961ea 100644
--- a/virtual/miller-proxy/miller-proxy-0.ebuild
+++ b/virtual/miller-proxy/miller-proxy-0.ebuild
@@ -4,7 +4,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
 
-DEPEND="
-virtual/miller-base
-net-proxy/squid
+RDEPEND="
+	virtual/miller-base
+	net-proxy/squid
 "
diff --git a/virtual/miller-webappserver/Manifest b/virtual/miller-webappserver/Manifest
index dcc8cda..ddbbd72 100644
--- a/virtual/miller-webappserver/Manifest
+++ b/virtual/miller-webappserver/Manifest
@@ -1 +1 @@
-EBUILD miller-webappserver-3.ebuild 288 RMD160 19771a0d9fdd267e4ecd99c1e760c928c09d73ad SHA1 4345002b9d07963be6d27ffb58a35ce6fbfed8b1 SHA256 b79c0eb930d15419a55d3bc1518c43f67bcecc1dc60fcca1243067be19903fcb
+EBUILD miller-webappserver-3.ebuild 297 SHA256 da1798c36cf946e46f00e19a7d794b290e84a471ca4f772760cd286e3183a7ae SHA512 07e71f2c68897a52709701df36a833503f3a2136fe0852b849f01a706941befd1d645cee2e4215a9b6cf4ae3f4abf0421989bd0d617430dbb939703fd617cee2 WHIRLPOOL 7bc19029a3f91125986ef2869d909031dbf9429d9e777da3a8c40dee2da566df81ed81948499666f8d3ba0687eeffacc9316b78711a2c1dd5c31b9f537d0d54b
diff --git a/virtual/miller-webappserver/miller-webappserver-3.ebuild b/virtual/miller-webappserver/miller-webappserver-3.ebuild
index e6b5688..8f292c8 100644
--- a/virtual/miller-webappserver/miller-webappserver-3.ebuild
+++ b/virtual/miller-webappserver/miller-webappserver-3.ebuild
@@ -4,11 +4,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
 
-DEPEND="virtual/miller-base
-dev-db/phppgadmin
-www-apps/bugzilla
-www-apps/mythweb
-net-nds/phpldapadmin
-www-apps/phpsysinfo
-www-apps/websvn
+RDEPEND="
+	virtual/miller-base
+	dev-db/phppgadmin
+	www-apps/bugzilla
+	www-apps/mythweb
+	net-nds/phpldapadmin
+	www-apps/phpsysinfo
+	www-apps/websvn
 "
diff --git a/virtual/miller-webserver/Manifest b/virtual/miller-webserver/Manifest
index 05e98f3..a8a6f6b 100644
--- a/virtual/miller-webserver/Manifest
+++ b/virtual/miller-webserver/Manifest
@@ -1,2 +1 @@
-EBUILD miller-webserver-2-r1.ebuild 296 SHA256 06e5a145120ef08c3ea5eb2445a4ae167bc2426d35030f78eec453516f6dae93 SHA512 be403d110be8bc905088f746d2f188700213551bf876121f4b5ec46ed7e4f603350b6ed25a17f7b5f5bbf15a1e78635a859f96e78b5a1a8eeffd4714f69496ac WHIRLPOOL 1a1bb8ec03660e0419d6376797203e04a61efaad460ada4b5198c9d401212a425feacb693fb3d46767597712f86e458a9c9c529a8340948372c1d6ba62f9404d
-EBUILD miller-webserver-2.ebuild 321 SHA256 238c5aad1fce22480df05b9e08b9f4844cbcfc3ed04a1e1479bf8dd7b89acdba SHA512 9c2349c2bbdb10716ef89c736f1b380c0dbbde4179f6139cd369d186e316c597547143c83ea48bf6a0b837f565de57f40fd39b1657f43054e64a5e86a7dc01b7 WHIRLPOOL 303d384347274900879e56459b43496507ab3549a78f3054ee3c323431f2afc01c992739ad6b82eec79e2a96f0f2b6677ff4b50beb949155691225537dd95237
+EBUILD miller-webserver-2-r1.ebuild 308 SHA256 7cade384fde05cf7f3c14b278ca4162cb08c24ef8389f63a277e8bad241a507d SHA512 64deccdeab9203c0df34bee1f44b091488cc9bebdd46175ec7830650e2fe2c31d5cdca1ca3124bc217695d66026b490beb02f740cc21b88bf6e80c2ca56e44f0 WHIRLPOOL c96afb9001caad9fae0de7a7bbe0503b3b38f70b8b57f4067bc314be093f674ea3cd8580576d87a777da962cbbb11919ce5779e1e771d264c47a5328a05dad95
diff --git a/virtual/miller-webserver/files/digest-miller-webserver-0 b/virtual/miller-webserver/files/digest-miller-webserver-0
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-webserver/files/digest-miller-webserver-0
+++ /dev/null
diff --git a/virtual/miller-webserver/files/digest-miller-webserver-1 b/virtual/miller-webserver/files/digest-miller-webserver-1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-webserver/files/digest-miller-webserver-1
+++ /dev/null
diff --git a/virtual/miller-webserver/files/digest-miller-webserver-2 b/virtual/miller-webserver/files/digest-miller-webserver-2
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-webserver/files/digest-miller-webserver-2
+++ /dev/null
diff --git a/virtual/miller-webserver/miller-webserver-2-r1.ebuild b/virtual/miller-webserver/miller-webserver-2-r1.ebuild
index 81fca1f..09eb29f 100644
--- a/virtual/miller-webserver/miller-webserver-2-r1.ebuild
+++ b/virtual/miller-webserver/miller-webserver-2-r1.ebuild
@@ -1,12 +1,14 @@
-DESCRIPTION="Virtual for Miller servers"
+DESCRIPTION="Virtual for Miller web servers"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
 
-DEPEND="virtual/miller-base
-www-servers/apache
-www-apache/Apache2-Filter-Minifier-CSS
-www-apache/Apache2-Filter-Minifier-JavaScript
-www-apache/mod_fcgid"
+RDEPEND="
+	virtual/miller-base
+	www-servers/apache
+	www-apache/Apache2-Filter-Minifier-CSS
+	www-apache/Apache2-Filter-Minifier-JavaScript
+	www-apache/mod_fcgid
+"
 
diff --git a/virtual/miller-webserver/miller-webserver-2.ebuild b/virtual/miller-webserver/miller-webserver-2.ebuild
deleted file mode 100644
index 545ef1e..0000000
--- a/virtual/miller-webserver/miller-webserver-2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION="Virtual for Miller servers"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/miller-base
-www-servers/apache
-www-apache/Apache2-Filter-Minifier-CSS
-www-apache/Apache2-Filter-Minifier-JavaScript
-www-apache/mod_transform
-www-apache/mod_fcgid"
-
diff --git a/virtual/miller-workstation/Manifest b/virtual/miller-workstation/Manifest
index c973f53..8aa8155 100644
--- a/virtual/miller-workstation/Manifest
+++ b/virtual/miller-workstation/Manifest
@@ -1 +1 @@
-EBUILD miller-workstation-11-r9.ebuild 1232 SHA256 3e038f2e24dce8340c9819e01afb170efdd9fd4c43a2f9ab5ec7caa1bb4379e7 SHA512 4e73fc46898c2fd8eeb4ed51a73798b9ed71d72a3206f163fe0f1bd87e8fd36a445347ae5990779729e9db971e9ab248cf441bce18581f85a3695a5aab4ad3e4 WHIRLPOOL b36989d87919084639ad4c94f40ed89a7388545c06f45fc1d9bee45ef2d02adbcb7ed950ba36e6a87a0f18639a16b72d2749bcd54151abe48a0ee7038ab4eb4e
+EBUILD miller-workstation-11-r9.ebuild 1033 SHA256 cbbbd8a098cd840c01eebe3a655b2dd35708317a4aa54eba62f131a01ffc31e7 SHA512 f3ee9a23dcdfc1f9c2bf398efab3865148d6d35513af7a88efbbc38f57c29aeaaab2c4550ccf9b6a136bf8c093618379a0dd05568a486498801c01047b2b91aa WHIRLPOOL 65b3c54515556afa97e4bde1aa9d02d8aa9f49286174c0e860a8d2b97971274c95f38b324dab31dc17f001809575e99ee1564154634836fc40a265529db4d7e9
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-10 b/virtual/miller-workstation/files/digest-miller-workstation-10
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-10
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-11 b/virtual/miller-workstation/files/digest-miller-workstation-11
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-11
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-11-r1 b/virtual/miller-workstation/files/digest-miller-workstation-11-r1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-11-r1
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-11-r2 b/virtual/miller-workstation/files/digest-miller-workstation-11-r2
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-11-r2
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-7 b/virtual/miller-workstation/files/digest-miller-workstation-7
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-7
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-8 b/virtual/miller-workstation/files/digest-miller-workstation-8
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-8
+++ /dev/null
diff --git a/virtual/miller-workstation/files/digest-miller-workstation-9 b/virtual/miller-workstation/files/digest-miller-workstation-9
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-workstation/files/digest-miller-workstation-9
+++ /dev/null
diff --git a/virtual/miller-workstation/miller-workstation-11-r9.ebuild b/virtual/miller-workstation/miller-workstation-11-r9.ebuild
index 1aec1ce..e2de9ec 100644
--- a/virtual/miller-workstation/miller-workstation-11-r9.ebuild
+++ b/virtual/miller-workstation/miller-workstation-11-r9.ebuild
@@ -4,9 +4,9 @@ DESCRIPTION="Virtual for Miller workstations"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 
-DEPEND="
+RDEPEND="
 	virtual/miller-base
-	|| ( kde-base/kcalc kde-base/kdeutils )
+	kde-base/kcalc
 	media-video/vlc
 	net-im/skype
 	net-im/pidgin
@@ -15,22 +15,31 @@ DEPEND="
 	media-fonts/corefonts
 	kde-misc/basket
 	virtual/jre
-	|| ( kde-base/krdc kde-base/kdenetwork )
+	kde-base/krdc
 	kde-misc/kwebkitpart
-	|| ( www-client/firefox www-client/icecat )
-	|| ( kde-misc/filelight kde-base/filelight )
+	|| (
+			www-client/firefox
+			www-client/chromium
+			www-client/firefox-bin
+			www-client/google-chrome
+			www-client/opera
+	   )
+	kde-base/filelight
 	mail-client/thunderbird
 	games-misc/fortune-mod
-	|| ( app-office/libreoffice-bin app-office/libreoffice )
+	|| (
+			app-office/libreoffice-bin
+			app-office/libreoffice
+	   )
 	media-gfx/gimp
 	www-plugins/adobe-flash
 	media-sound/clementine
-	|| ( kde-base/ksnapshot kde-base/kdegraphics )
-	|| ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork )
-	|| ( kde-base/kdeutils-meta kde-base/kwalletmanager kde-base/kdeutils )
-	|| ( kde-misc/kdocker kde-base/kdemisc x11-misc/kdocker )
-	|| ( kde-base/superkaramba kde-base/kdeutils )
-	|| ( kde-base/okular kde-base/kpdf kde-base/kdegraphics )
+	kde-base/ksnapshot
+	kde-base/kdeartwork-kscreensaver
+	kde-base/kwallet
+	x11-misc/kdocker
+	kde-base/superkaramba
+	kde-base/okular
 	kde-misc/gx-mail-notify
 	kde-base/gwenview
 	kde-base/kdebase-meta
diff --git a/virtual/pressnet-dev/Manifest b/virtual/pressnet-dev/Manifest
index 9946010..bc4d198 100644
--- a/virtual/pressnet-dev/Manifest
+++ b/virtual/pressnet-dev/Manifest
@@ -1 +1 @@
-EBUILD pressnet-dev-0.ebuild 1194 SHA256 0888e38b1b5e8445772cb4ff9d050516fa418dc97fab52a75e3fdf064c1dd90b SHA512 b3e134f108408b6f814171e27ecd2692f0fbbd6fa732a8461d8142b10dda2dee99b02ca7b92b9f1c044ae4ef053f5d75083da8237c3f589eff5523e552529f47 WHIRLPOOL 52d7c30775750c0b52a8e200af3d1f36626d42ea3c8ba3c2e057cfc86f176aa8ec8a66f3a9a287bf5822214a25a21faa9321fc3a7db81770f807c6533faab15e
+EBUILD pressnet-dev-0.ebuild 1036 SHA256 33d0ef68ce348158c4388b5b2880879fe17a19d782c4cadad48f82514e527e74 SHA512 48875125211ade2db5656dc59eb9eec7eb1ad7c6f9e5a157991ee869179fa1fc26e9c41a6d3e17935086e356cd6acad8879159f0ab8629a6f033a30ed90109e6 WHIRLPOOL 74e3f9a7afbd75da4735ed0437f49cbe4437532ccfbbb59701fa4566b032fb684ffc650f3c70bfd1e2b281a577ea1f480114d0b10469f091bab53e2051932278
diff --git a/virtual/pressnet-dev/pressnet-dev-0.ebuild b/virtual/pressnet-dev/pressnet-dev-0.ebuild
index 2693f1c..7533dc9 100644
--- a/virtual/pressnet-dev/pressnet-dev-0.ebuild
+++ b/virtual/pressnet-dev/pressnet-dev-0.ebuild
@@ -1,14 +1,15 @@
-EAPI="2"
-DESCRIPTION="Virtual for Miller development workstations"
+EAPI="4"
+DESCRIPTION="Virtual for Pressnet development workstations"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="X dotnet"
+IUSE="X odbc"
 
-DEPEND="virtual/miller-base
+RDEPEND="
+	virtual/miller-base
 	www-client/lynx
 	www-client/chromium
-	|| ( www-client/firefox www-client/icecat )
+	www-client/firefox
 	www-client/opera
 	sys-devel/gdb
 	dev-util/valgrind
@@ -26,8 +27,7 @@ DEPEND="virtual/miller-base
 	app-shells/gentoo-bashcomp
 	app-arch/rar
 	net-ftp/ftp
-	dev-db/squirrel-sql
-	dev-db/myodbc
+	odbc? ( dev-db/myodbc )
 	dev-util/cppunit
 	www-servers/apache
 	app-vim/tt2-syntax
@@ -35,24 +35,18 @@ DEPEND="virtual/miller-base
 	dev-java/jakarta-jstl
 	dev-java/sun-jdk
 	dev-java/sun-jre-bin
-	dev-java/maven-bin
 	dev-libs/omniEvents
-	dev-util/eclipse-sdk
 	net-misc/omniORB
 	www-servers/tomcat:5.5
 	X? (
-		media-gfx/gimp
-		dev-db/tora
-		dev-util/nemiver
-		kde-base/okteta
-		dev-vcs/kdesvn
-		dotnet? (
-			dev-util/mono-debugger
-			=dev-util/monodevelop-2.1*
-			=dev-util/monodevelop-database-2.1*
-			=dev-util/monodevelop-debugger-gdb-2.1*
-		)
-		kde-base/kcachegrind
-		app-editors/gvim
-	)"
+			dev-util/eclipse-sdk
+			media-gfx/gimp
+			dev-db/squirrel-sql[mysql]
+			dev-db/tora[mysql]
+			dev-util/nemiver
+			kde-base/okteta
+			dev-vcs/kdesvn
+			kde-base/kcachegrind
+			app-editors/gvim
+	   )"
 
diff --git a/virtual/random-server/Manifest b/virtual/random-server/Manifest
index fce4cec..0092c9c 100644
--- a/virtual/random-server/Manifest
+++ b/virtual/random-server/Manifest
@@ -1 +1 @@
-EBUILD random-server-0.ebuild 662 SHA256 a34d16bc5986739a5ee77a59361f3a58502b58b5ee07de0dd6e79376bc94fda7 SHA512 f3664a9a3715a3d55a6307d6a2704faa789b72b9c9de68b039a76ff188220c90f1e9118b4e9752c5ce61b9bf98a3e4f6efb02b4f7f0e298320cb5276638e5823 WHIRLPOOL f0e14348def031aaeea62cc2931fb7cb35eddac96c7ea8e696161b1f32a956d4b32956f2d090c91c69f5e80b96ff813d6d4118205afc1c570a503b9500c1374c
+EBUILD random-server-0.ebuild 611 SHA256 cf9bb3f821964ed22c00307f98f91613027af29bc12efe35cacc1c7c8c3a93f9 SHA512 c6cade538dc3c928928da3199ac11d4b3929735d50eef2af57c7010dd267d3cadd46ff7be271743d8a968fe9ef9156cd1e84d712f5030978ae28442c423aec2e WHIRLPOOL da4505684e6503b3d1ff286a43bd00494d7f02c81ac750b20b3131e3ebc471ff2e7c6a15f1612aed9e974aa8eb3c13f17ab060c807dcbe5e25c28d7dac3f1b73
diff --git a/virtual/random-server/random-server-0.ebuild b/virtual/random-server/random-server-0.ebuild
index 43bda0f..9ac6c5b 100644
--- a/virtual/random-server/random-server-0.ebuild
+++ b/virtual/random-server/random-server-0.ebuild
@@ -9,7 +9,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="mediaserver"
 
-DEPEND="net-dialup/ppp
+RDEPEND="
+	net-dialup/ppp
 	net-dialup/pptpd
 	net-dns/bind
 	net-dns/ddclient
@@ -27,9 +28,6 @@ DEPEND="net-dialup/ppp
 	www-apps/project2
 	mediaserver? (
 			net-misc/minidlna
-			media-tv/linuxtv-dvb-firmware
 			media-tv/mythtv
 			net-p2p/transmission )
 "
-RDEPEND="${DEPEND}"
-