11 files changed, 68 insertions, 200 deletions
diff --git a/virtual/miller-apps/Manifest b/virtual/miller-apps/Manifest
index c777757..aa5907a 100644
--- a/virtual/miller-apps/Manifest
+++ b/virtual/miller-apps/Manifest
@@ -1,2 +1 @@
-EBUILD miller-apps-4.ebuild 477 RMD160 1960ca48f034342cdbd7a90b179ae39f2420d8d4 SHA1 a6595628cb7b9d6469276fa511b47540bc9568cd SHA256 2414aa193975cd77750b5dea7deb7068568418e16125c3048c5295c635a26b14
-EBUILD miller-apps-5.ebuild 514 RMD160 81b1f00081b25ff37e6577f4419ec6cb40f01ea0 SHA1 6870d8861ed86122cef9298ac84758813f95dc0f SHA256 a21a4514768466976ae6b9b9b8eb65af590c63ec45bc2e1a3b9027af0d9b92fd
+EBUILD miller-apps-5.ebuild 530 RMD160 75fb3ada1ad30102d029a4df1bec4de5c72bcc7e SHA1 9270fe593ee4f768fd81a57392d1d2ca1c80d23a SHA256 afe7f265674139145f83621e7098b22f45a5becf4dbd6290e444f4f9b44ad495
diff --git a/virtual/miller-apps/miller-apps-4.ebuild b/virtual/miller-apps/miller-apps-4.ebuild
deleted file mode 100644
index 0abb789..0000000
--- a/virtual/miller-apps/miller-apps-4.ebuild
+++ /dev/null
@@ -1,22 +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
-net-misc/curl
-dev-db/oracle-instantclient-odbc
-dev-util/kdbg
-dev-util/valgrind
-dev-util/strace
-media-gfx/imagemagick
-dev-db/oracle-instantclient-sqlplus
-sys-devel/gdb
-dev-util/ctags
-dev-db/oracle-instantclient-precomp
-dev-db/unixODBC
-media-libs/clibpdf
-media-gfx/graphviz
-dev-db/oracle-instantclient-basic"
-
diff --git a/virtual/miller-apps/miller-apps-5.ebuild b/virtual/miller-apps/miller-apps-5.ebuild
index f8fedf1..9dc5424 100644
--- a/virtual/miller-apps/miller-apps-5.ebuild
+++ b/virtual/miller-apps/miller-apps-5.ebuild
@@ -5,20 +5,20 @@ KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE=""
 
 DEPEND="virtual/miller-base
-net-misc/curl
-dev-db/oracle-instantclient-odbc
-dev-util/ccache
-dev-java/sun-jre-bin
-dev-util/kdbg
-dev-util/valgrind
-dev-util/strace
-media-gfx/imagemagick
-dev-db/oracle-instantclient-sqlplus
-sys-devel/gdb
-dev-util/ctags
-dev-db/oracle-instantclient-precomp
-dev-db/unixODBC
-media-libs/clibpdf
-media-gfx/graphviz
-dev-db/oracle-instantclient-basic"
+	net-misc/curl
+	dev-db/oracle-instantclient-odbc
+	dev-util/ccache
+	dev-java/sun-jre-bin
+	dev-util/kdbg
+	dev-util/valgrind
+	dev-util/strace
+	media-gfx/imagemagick
+	dev-db/oracle-instantclient-sqlplus
+	sys-devel/gdb
+	dev-util/ctags
+	dev-db/oracle-instantclient-precomp
+	dev-db/unixODBC
+	media-libs/clibpdf
+	media-gfx/graphviz
+	dev-db/oracle-instantclient-basic"
 
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index f49a905..b848ea0 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -6,5 +6,4 @@ AUX update.portage.cron-2 291 RMD160 6c5d01317821ba01df42fd596541c0e6538dfbc3 SH
 AUX weekly-av-scan.cron 125 RMD160 f899ac0fd639b9f498877a518b7658a9d0d67c88 SHA1 76e0acd80e769bc7a3ff7095c274033021cabdda SHA256 c36075a5d6061813cf3c2ca0944a7c7365a3dfb313a7077f6a70ec3de0541532
 AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a820e5f5fe SHA1 a077c7c5265c3d9817fa4846dbbab8bc9addfeb5 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38
 AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141
-EBUILD miller-base-6-r17.ebuild 1349 RMD160 215b4de319df7e12ceae517c723b71f33dff9759 SHA1 47fbb0008559bfa286f53deeca2b5383b4937277 SHA256 90f34959931027de164bc642d1827071e61673faf9704fa952446cc36cd94d1a
-EBUILD miller-base-6-r20.ebuild 1474 RMD160 d214d493c041157729327880f2deb3ea61318283 SHA1 a27fd3c5201db032b0323aba2ed484266a2a328a SHA256 c9b25a374051e67d79ae376ea4e652ff54236bd7dbe875cc441cb5fdd98d73ed
+EBUILD miller-base-6-r20.ebuild 1511 RMD160 ea137a08ea5b98759f17f249f68ea8f014988230 SHA1 92d57bf293dfbb3507b1129358840b6f3a18c368 SHA256 a00dbd30a8b2776fd297071ec892e73d64519fd4988328836c6b5147fae85638
diff --git a/virtual/miller-base/miller-base-6-r17.ebuild b/virtual/miller-base/miller-base-6-r17.ebuild
deleted file mode 100644
index 42ace5b..0000000
--- a/virtual/miller-base/miller-base-6-r17.ebuild
+++ /dev/null
@@ -1,56 +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="nohardenedkernel nohourlyupdate fuse xfs"
-
-DEPEND="
-sys-libs/unscd
-net-dns/bind-tools
-fuse? ( sys-fs/sshfs-fuse )
-net-fs/mount-cifs
-xfs? ( sys-fs/xfsdump )
-sys-fs/lvm2
->=app-portage/gentoolkit-0.2.1
-sys-process/vixie-cron
-sys-apps/eject
-app-admin/sudo
-mail-client/mailx
-sys-apps/pciutils
-app-dicts/myspell-en
-net-misc/ntp
-net-analyzer/netcat
-net-ftp/ncftp
-dev-util/cvs
-x11-apps/xauth
-sys-process/lsof
-app-portage/layman
-net-analyzer/net-snmp
-app-admin/syslog-ng
-app-admin/logrotate
-app-admin/gkrellm
-app-antivirus/clamav
-nohardenedkernel?  ( sys-kernel/gentoo-sources )
-!nohardenedkernel?  ( sys-kernel/hardened-sources )
-app-text/unix2dos
-app-misc/screen
-sys-boot/grub
-app-vim/gentoo-syntax
-sys-apps/kexec-tools
-app-text/dos2unix
-sys-auth/pam_ldap
-sys-auth/nss_ldap
-"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/weekly-av-scan.cron av-scan || die
-	newexe "${FILESDIR}"/weekly-distclean-exec-eclean.cron portage-distclean-exec || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/daily-av-update.cron av-update || die
-
-	use nohourlyupdate && exeinto /etc/cron.daily
-	use !nohourlyupdate && exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/update.portage.cron gentoo-portage-update || die
-}
diff --git a/virtual/miller-base/miller-base-6-r20.ebuild b/virtual/miller-base/miller-base-6-r20.ebuild
index a1e5453..1c34d73 100644
--- a/virtual/miller-base/miller-base-6-r20.ebuild
+++ b/virtual/miller-base/miller-base-6-r20.ebuild
@@ -5,43 +5,43 @@ KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="nohardenedkernel nohourlyupdate fuse xfs"
 
 DEPEND="
-sys-apps/hdparm
-sys-libs/unscd
-net-dns/bind-tools
-fuse? ( sys-fs/sshfs-fuse )
-net-fs/mount-cifs
-xfs? ( sys-fs/xfsdump )
-sys-fs/lvm2
->=app-portage/gentoolkit-0.2.1
-sys-process/vixie-cron
-sys-apps/eject
-app-admin/sudo
-mail-client/mailx
-sys-apps/pciutils
-app-dicts/myspell-en
-net-misc/ntp
-net-analyzer/netcat
-net-ftp/ncftp
-dev-util/cvs
-x11-apps/xauth
-sys-process/lsof
-app-portage/layman
-net-analyzer/net-snmp
-app-admin/syslog-ng
-app-admin/logrotate
-app-admin/gkrellm
-app-antivirus/clamav
-nohardenedkernel?  ( sys-kernel/gentoo-sources )
-!nohardenedkernel?  ( sys-kernel/hardened-sources )
-app-text/unix2dos
-app-misc/screen
-sys-boot/grub
-app-vim/gentoo-syntax
-sys-apps/kexec-tools
-app-text/dos2unix
-sys-auth/pam_ldap
-sys-auth/nss_ldap
-"
+	sys-apps/hdparm
+	sys-libs/unscd
+	net-dns/bind-tools
+	fuse? ( sys-fs/sshfs-fuse )
+	net-fs/mount-cifs
+	xfs? ( sys-fs/xfsdump )
+	sys-fs/lvm2
+	>=app-portage/gentoolkit-0.2.1
+	sys-process/vixie-cron
+	sys-apps/eject
+	app-admin/sudo
+	mail-client/mailx
+	sys-apps/pciutils
+	app-dicts/myspell-en
+	net-misc/ntp
+	net-analyzer/netcat
+	net-ftp/ncftp
+	dev-util/cvs
+	x11-apps/xauth
+	sys-process/lsof
+	app-portage/layman
+	net-analyzer/net-snmp
+	app-admin/syslog-ng
+	app-admin/logrotate
+	app-admin/gkrellm
+	app-antivirus/clamav
+	nohardenedkernel?  ( sys-kernel/gentoo-sources )
+	!nohardenedkernel?  ( sys-kernel/hardened-sources )
+	app-text/unix2dos
+	app-misc/screen
+	sys-boot/grub
+	app-vim/gentoo-syntax
+	sys-apps/kexec-tools
+	app-text/dos2unix
+	sys-auth/pam_ldap
+	sys-auth/nss_ldap
+	"
 
 src_install() {
 	exeinto /etc/cron.weekly
diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index 6c2716b..ababf98 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1,4 +1 @@
-EBUILD miller-desktop-2-r1.ebuild 305 RMD160 2213c36cc9251981c6ff67ecfee8111c2e3c0d1b SHA1 863d7345d376c8a9ecac531e9b4fd3d35263b335 SHA256 a27fac65f444268befe3e3fc4ae134a1869ad2e7dd3c3e259e5cfb0a2e9abe63
-EBUILD miller-desktop-2-r2.ebuild 350 RMD160 b62a4cb733d734c1b800732a3604c1316e8922e7 SHA1 35b4a3361996d123055a4e8e007db0645218f7ba SHA256 339851950b05051c5fe3b7a84ff1b2e3fcc45bba96d92ff4a2ec7265f7d96931
-EBUILD miller-desktop-2-r3.ebuild 532 RMD160 ce14f0a7fd9f8511445cc3a20e29d5c275831061 SHA1 ae401fd073323323cd17664c9a2bac6a622efca0 SHA256 2771217561849408eae15d3f0da92135d5db926da9fc9a13b9e357558bfd645a
-EBUILD miller-desktop-2.ebuild 289 RMD160 371270227ccd1474874afd30d6f426302bcb3084 SHA1 53d5b0b14e391a5bf81d9e940f86246be5028b47 SHA256 3b590a44ecc481faeb336562fefd29b9ffeb64ba0526501ae2e2c246254254a7
+EBUILD miller-desktop-2-r3.ebuild 544 RMD160 0ae69c55af2940347040719cd3d5ced0e6ac9f5a SHA1 60c6b3a716e57147071151a67364a3c221442464 SHA256 5a7a6f669962387b3127872a6ef0eafad2c8f9a4dcbb1f2d281bb622cd59ed83
diff --git a/virtual/miller-desktop/miller-desktop-2-r1.ebuild b/virtual/miller-desktop/miller-desktop-2-r1.ebuild
deleted file mode 100644
index 6b30dd0..0000000
--- a/virtual/miller-desktop/miller-desktop-2-r1.ebuild
+++ /dev/null
@@ -1,16 +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
-media-gfx/splash-themes-gentoo
-media-gfx/splash-themes-livecd
-media-sound/alsa-utils
-sys-apps/ifplugd
-sys-power/acpid
-sys-apps/v86d
-"
-
diff --git a/virtual/miller-desktop/miller-desktop-2-r2.ebuild b/virtual/miller-desktop/miller-desktop-2-r2.ebuild
deleted file mode 100644
index f24e21a..0000000
--- a/virtual/miller-desktop/miller-desktop-2-r2.ebuild
+++ /dev/null
@@ -1,18 +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
-media-gfx/splash-themes-gentoo
-media-gfx/splash-themes-livecd
-media-sound/alsa-utils
-media-sound/alsamixergui
-sys-apps/ifplugd
-sys-power/acpid
-sys-apps/v86d
-x11-apps/mesa-progs
-"
-
diff --git a/virtual/miller-desktop/miller-desktop-2-r3.ebuild b/virtual/miller-desktop/miller-desktop-2-r3.ebuild
index d77285b..d273ec8 100644
--- a/virtual/miller-desktop/miller-desktop-2-r3.ebuild
+++ b/virtual/miller-desktop/miller-desktop-2-r3.ebuild
@@ -5,17 +5,17 @@ KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="laptop ndiswrapper b43"
 
 DEPEND="
-virtual/miller-base
-media-gfx/splash-themes-gentoo
-media-gfx/splash-themes-livecd
-media-sound/alsa-utils
-media-sound/alsamixergui
-|| ( sys-apps/ifplugd sys-apps/netplug )
-sys-power/acpid
-sys-apps/v86d
-x11-apps/mesa-progs
-laptop? ( net-wireless/wireless-tools net-dns/openresolv )
-ndiswrapper? ( net-wireless/ndiswrapper )
-b43? ( net-wireless/b43-fwcutter )
+	virtual/miller-base
+	media-gfx/splash-themes-gentoo
+	media-gfx/splash-themes-livecd
+	media-sound/alsa-utils
+	media-sound/alsamixergui
+	|| ( sys-apps/ifplugd sys-apps/netplug )
+	sys-power/acpid
+	sys-apps/v86d
+	x11-apps/mesa-progs
+	laptop? ( net-wireless/wireless-tools net-dns/openresolv )
+	ndiswrapper? ( net-wireless/ndiswrapper )
+	b43? ( net-wireless/b43-fwcutter )
 "
 
diff --git a/virtual/miller-desktop/miller-desktop-2.ebuild b/virtual/miller-desktop/miller-desktop-2.ebuild
deleted file mode 100644
index 6181c71..0000000
--- a/virtual/miller-desktop/miller-desktop-2.ebuild
+++ /dev/null
@@ -1,15 +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
-media-gfx/splash-themes-gentoo
-media-gfx/splash-themes-livecd
-media-sound/alsa-utils
-sys-apps/ifplugd
-sys-apps/v86d
-"
-