minor tweak and bin old stuff

14 files changed, 2 insertions, 804 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 49ca91b..ce455e7 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -36,7 +36,6 @@ AUX restart/unscd 27 RMD160 73e53d26fabc6f096716611fb49079eec087d5de SHA1 d66cf3
 AUX restart/vsftpd 27 RMD160 91be22938c872d12b96c8c695f9cba1c2767ed45 SHA1 016b411d34273ae75962ac4023b1c9e6c632a19a SHA256 75ecac8ca02bf650883aecdc5e8d7d4c233ad1d96d4497f99135703930c38932
 AUX sync-distclean-exec.cron 48 RMD160 06f9d602ab5c35a524e1605aa2296975fbf93fef SHA1 fda026a86c93267d3e29aae42e39cc10be150428 SHA256 48d786065199b15d7e9ec719fa5f519ff11b546022057245c08a27a722544eb6
 AUX update-autoshutdown 88 RMD160 f029249c1e727d4feaa06bbdc8bac1a9e84ba178 SHA1 2f55e2283efae01ae9fa30d5ae136989257563c2 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6
-AUX update-install 294 RMD160 8089dd8aa514b6600117d72dd1a4c89d45745c39 SHA1 6e89192c6cb5e41b0b24fa187d08657c74e0706c SHA256 f9501bfe63a9691e46ff4822ab3e81f120632c8d8d235172ac05714208035f42
 AUX update-install2 433 RMD160 4502c28c312a52d25a3f9c910c298756c85fe087 SHA1 a2c43865c87ac92e6e71088ead6725cf22f69d82 SHA256 7d0c4381a0509aafb3a0b1457810e93b81d1d9495a2f2c29f15980d3b5241a85
 AUX update-kernel 435 RMD160 0b7becad4f9a43110cc7e9b0b8912c97cfafe4b7 SHA1 6634ec3b65d631a496bfaade36385b82cf8251ff SHA256 272a3ed8d5d2f863279ec77bc81578f0547c716cfa852ba3d32072d2600754fa
 AUX update.portage.cron 171 RMD160 c388289e78342b65d48077868f4acbe9b3b00849 SHA1 d7430ff8e906ad8d66918750c29722bfa6030c73 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03
@@ -44,15 +43,5 @@ AUX update.portage.cron-2 159 RMD160 eada35db78d363502c4d0486cfcbc8493514562f 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
-AUX write-new-updates 128 RMD160 0f5452b7a9c4bacb98eff3863ab46509825cd0c1 SHA1 a1c595bb41cdaba7a4afd58c75801b34397a78cd SHA256 4f41e90666fe873bac92c4a53aea0664601da4540c0b61b75caf737362c87696
-EBUILD miller-base-6-r21.ebuild 1610 RMD160 537d58e83b03efb0336093af8f598c14cc77382c SHA1 c14fe5fe5ba408839c9d46b51de499c9f229620d SHA256 82efd5a2cb7078ce8b1ea0543cc3ddc08cdf3b0a513f43fc32bd2796178a0041
-EBUILD miller-base-6-r22.ebuild 1862 RMD160 afaf2e96c5041d17836f6f3cf71713e75a7c6c54 SHA1 cc23bd2da05c4ced712180902c4a98790bd0bcf3 SHA256 1c12cefe710ecfa737ad466d2ce8d88a447ca2ec73f7837fb1cda7b07ac4b778
-EBUILD miller-base-6-r23.ebuild 1994 RMD160 b6c73b60515bd886919722caff44b5293d0412ad SHA1 cc769f32c57fde9069cc47b82823636e769bcf82 SHA256 3111792c081e5d12893d07dc46fabe8a1b7d014bf77fa1cdb1724f9d60f8ca96
-EBUILD miller-base-6-r24.ebuild 2208 RMD160 0513c248fd999884013960cab53dc57f6233fd95 SHA1 b94f615027a2e47171e3a339e6dd4918d1afba60 SHA256 7dbad9aad6f33982df79519009b60b4ea833f38550b1b10aa21f20a6310cb8fb
-EBUILD miller-base-6-r25.ebuild 2230 RMD160 08f056b00edda07d4470d2b799b4e18f25f9d640 SHA1 55dd626296968b263b8ee20efca5f49f52f3b7bb SHA256 a79d674c28bb15745006dcf3b3949102206a109229c678d28b68a16d63b7a8b4
-EBUILD miller-base-6-r26.ebuild 2415 RMD160 4e9a889c29a9e9b51af60bd69dc2b5a32526eb0f SHA1 6f3578efd7084b691c7bc68d37be96a66b35c320 SHA256 8837172d4db8b67bcb8eb248bdd6f589522f9f20f11d09ee2b0a8bbc03fb8b91
-EBUILD miller-base-6-r29.ebuild 2588 RMD160 864e73ac0af8d960bf0838a4c3c58622492bc2cb SHA1 abb1e75bfe2e5f7a664e131d403bd05fadac8ccc SHA256 33c9f3d8e030aafb5268d3f1c5d32a4a8e1702d2500c7b1068b9bc78088ab9df
-EBUILD miller-base-6-r30.ebuild 2484 RMD160 5a7d0122b70e29fd0547895d5e7c18952c8b800a SHA1 031d80178d865a7bc0e999eeeba2054e95a99489 SHA256 e7d3e2294f3f33808f0625ee41ce989ef303a74d84e7ef390581876569fc72b5
-EBUILD miller-base-6-r31.ebuild 2503 RMD160 636ee7ce618ce4b67af27c03803fb71318d4c879 SHA1 6714bad8e34ff1ad1ef0d2e1fe89c4a6872e4063 SHA256 e19b62b18056211c398fb31c559977a166d1188fd44ddaeaf08782df04ac8676
-EBUILD miller-base-6-r33.ebuild 2613 RMD160 8100f5c6662a49c5722245600f6df5a533380e6e SHA1 7df04f894578f8888767030cb4e585c1b50bae9f SHA256 8f2dcb85eb861642237d5c63db402ccc3635f830a92df50109b955bdfb95906b
-EBUILD miller-base-7.ebuild 2948 RMD160 61bcffc3220eabc14c74414c7dfc918f898345cd SHA1 50e650e4b9a2f5d0ccacf1606406e9eec6e2fd28 SHA256 0078d2d1883a1f08eacd0507366cab28e569f3d03666c785d1e1b3bb1628c1ce
+AUX write-new-updates 109 RMD160 e0e86168f79c5cbdfd5585057f26965937f2db89 SHA1 c15d9aa1b5af983767bd2ff7b8a28882409155d4 SHA256 5d73a0c75d88e458fd3deaebbaf2c645488ad9f572908e720aebc2d1c555277d
+EBUILD miller-base-7-r1.ebuild 2948 RMD160 61bcffc3220eabc14c74414c7dfc918f898345cd SHA1 50e650e4b9a2f5d0ccacf1606406e9eec6e2fd28 SHA256 0078d2d1883a1f08eacd0507366cab28e569f3d03666c785d1e1b3bb1628c1ce
diff --git a/virtual/miller-base/files/update-install b/virtual/miller-base/files/update-install
deleted file mode 100755
index f5fd9e0..0000000
--- a/virtual/miller-base/files/update-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-file="/var/www/files/localhost/`hostname`_updates.txt"
-dpfile="/var/www/files/localhost/`hostname`_depclean.txt"
-
-( emerge -uqDN @world @system --keep-going && rm -f $file && emerge --depclean -q 2>&1 | tee $dpfile && emerge -q @preserved-rebuild)
-revdep-rebuild -q -i
-etc-update 
diff --git a/virtual/miller-base/files/write-new-updates b/virtual/miller-base/files/write-new-updates
index b45fe7d..15db08c 100755
--- a/virtual/miller-base/files/write-new-updates
+++ b/virtual/miller-base/files/write-new-updates
@@ -1,5 +1,4 @@
 #!/bin/bash
 
 file="/var/www/files/localhost/`hostname`_updates.txt"
-hostname > ${file}
 emerge -uDNpvq @world @system >> ${file}
diff --git a/virtual/miller-base/miller-base-6-r21.ebuild b/virtual/miller-base/miller-base-6-r21.ebuild
deleted file mode 100644
index 8e0f2d1..0000000
--- a/virtual/miller-base/miller-base-6-r21.ebuild
+++ /dev/null
@@ -1,65 +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="cdr nohardenedkernel nohourlyupdate fuse xfs"
-
-DEPEND="
-	www-servers/apache
-	net-fs/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	media-tv/mythtv
-	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
-	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
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/auto-download-packages auto-download-package || die
-}
diff --git a/virtual/miller-base/miller-base-6-r22.ebuild b/virtual/miller-base/miller-base-6-r22.ebuild
deleted file mode 100644
index a05dad6..0000000
--- a/virtual/miller-base/miller-base-6-r22.ebuild
+++ /dev/null
@@ -1,71 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion"
-
-DEPEND="
-	www-servers/apache
-	net-fs/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	media-tv/mythtv
-	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
-	app-editors/gvim
-	dev-util/git
-	dev-util/strace
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-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-2 gentoo-portage-update || die
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/auto-download-packages auto-download-package || die
-	newexe "${FILESDIR}"/auto-update-overlays auto-update-overlays || die
-	newexe "${FILESDIR}"/write-new-updates write-new-updates || die
-}
diff --git a/virtual/miller-base/miller-base-6-r23.ebuild b/virtual/miller-base/miller-base-6-r23.ebuild
deleted file mode 100644
index 3e414aa..0000000
--- a/virtual/miller-base/miller-base-6-r23.ebuild
+++ /dev/null
@@ -1,75 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion"
-
-DEPEND="
-	www-servers/apache
-	net-fs/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	media-tv/mythtv
-	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
-	app-editors/gvim
-	dev-util/git
-	dev-util/strace
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-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-2 gentoo-portage-update || die
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/auto-download-packages auto-download-package || die
-	newexe "${FILESDIR}"/auto-update-overlays auto-update-overlays || die
-	newexe "${FILESDIR}"/write-new-updates write-new-updates || die
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install update-install || die
-	newexe "${FILESDIR}"/update-kernel update-kernel || die
-}
diff --git a/virtual/miller-base/miller-base-6-r24.ebuild b/virtual/miller-base/miller-base-6-r24.ebuild
deleted file mode 100644
index 9492152..0000000
--- a/virtual/miller-base/miller-base-6-r24.ebuild
+++ /dev/null
@@ -1,81 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion"
-
-DEPEND="
-	www-servers/apache
-	net-fs/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	media-tv/mythtv
-	sys-apps/hdparm
-	sys-libs/unscd
-	net-dns/bind-tools
-	fuse? ( sys-fs/sshfs-fuse )
-	|| ( net-fs/mount-cifs net-fs/samba-client )
-	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
-	app-editors/gvim
-	dev-util/git
-	dev-util/strace
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/weekly-av-scan.cron av-scan || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/daily-av-update.cron av-update || die
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update || die
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 98-portage-distclean-exec || die
-	newexe "${FILESDIR}"/auto-download-packages 99-auto-download-package || die
-	newexe "${FILESDIR}"/auto-update-overlays 01-auto-update-overlays || die
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates || die
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install update-install || die
-	newexe "${FILESDIR}"/update-kernel update-kernel || die
-}
diff --git a/virtual/miller-base/miller-base-6-r25.ebuild b/virtual/miller-base/miller-base-6-r25.ebuild
deleted file mode 100644
index 6686afe..0000000
--- a/virtual/miller-base/miller-base-6-r25.ebuild
+++ /dev/null
@@ -1,81 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion nomedia"
-
-DEPEND="
-	www-servers/apache
-	net-fs/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv )
-	sys-apps/hdparm
-	sys-libs/unscd
-	net-dns/bind-tools
-	fuse? ( sys-fs/sshfs-fuse )
-	|| ( net-fs/mount-cifs net-fs/samba-client )
-	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
-	app-editors/gvim
-	dev-util/git
-	dev-util/strace
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/weekly-av-scan.cron av-scan || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/daily-av-update.cron av-update || die
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update || die
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 98-portage-distclean-exec || die
-	newexe "${FILESDIR}"/auto-download-packages 99-auto-download-package || die
-	newexe "${FILESDIR}"/auto-update-overlays 01-auto-update-overlays || die
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates || die
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install update-install || die
-	newexe "${FILESDIR}"/update-kernel update-kernel || die
-}
diff --git a/virtual/miller-base/miller-base-6-r26.ebuild b/virtual/miller-base/miller-base-6-r26.ebuild
deleted file mode 100644
index 106ed23..0000000
--- a/virtual/miller-base/miller-base-6-r26.ebuild
+++ /dev/null
@@ -1,80 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion nomedia git minimal"
-
-DEPEND="
-	!minimal? ( www-servers/apache )
-	sys-cluster/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv )
-	sys-apps/hdparm
-	sys-apps/unscd
-	!minimal? ( net-dns/bind-tools )
-	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) )
-	xfs? ( sys-fs/xfsdump )
-	sys-fs/lvm2
-	>=app-portage/gentoolkit-0.2.1
-	sys-process/vixie-cron
-	!minimal? ( sys-apps/eject )
-	app-admin/sudo
-	mail-client/mailx
-	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
-	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	dev-util/cvs
-	!minimal? ( x11-apps/xauth )
-	sys-process/lsof
-	app-portage/layman
-	app-admin/syslog-ng
-	app-admin/logrotate
-	!minimal? ( app-admin/gkrellm )
-	!minimal? ( app-antivirus/clamav )
-	nohardenedkernel?  ( sys-kernel/gentoo-sources )
-	!nohardenedkernel?  ( sys-kernel/hardened-sources )
-	!minimal? ( app-text/unix2dos )
-	app-misc/screen
-	sys-boot/grub
-	app-vim/gentoo-syntax
-	sys-apps/kexec-tools
-	!minimal? ( app-text/dos2unix )
-	sys-auth/pam_ldap
-	sys-auth/nss_ldap
-	app-editors/gvim
-	git? ( dev-util/git )
-	!minimal? ( dev-util/strace )
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/weekly-av-scan.cron av-scan || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/daily-av-update.cron av-update || die
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update || die
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 98-portage-distclean-exec || die
-	newexe "${FILESDIR}"/auto-download-packages 99-auto-download-package || die
-	newexe "${FILESDIR}"/auto-update-overlays 01-auto-update-overlays || die
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates || die
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install update-install || die
-	newexe "${FILESDIR}"/update-kernel update-kernel || die
-}
diff --git a/virtual/miller-base/miller-base-6-r29.ebuild b/virtual/miller-base/miller-base-6-r29.ebuild
deleted file mode 100644
index 4626d45..0000000
--- a/virtual/miller-base/miller-base-6-r29.ebuild
+++ /dev/null
@@ -1,82 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion nomedia git
-minimal autoupdate"
-
-DEPEND="
-	!minimal? ( www-servers/apache )
-	sys-cluster/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv )
-	sys-apps/hdparm
-	sys-apps/unscd
-	!minimal? ( net-dns/bind-tools )
-	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) )
-	xfs? ( sys-fs/xfsdump )
-	sys-fs/lvm2
-	>=app-portage/gentoolkit-0.2.1
-	sys-process/vixie-cron
-	!minimal? ( sys-apps/eject )
-	app-admin/sudo
-	mail-client/mailx
-	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
-	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	dev-util/cvs
-	!minimal? ( x11-apps/xauth )
-	sys-process/lsof
-	app-portage/layman
-	app-admin/syslog-ng
-	app-admin/logrotate
-	!minimal? ( app-admin/gkrellm )
-	!minimal? ( app-antivirus/clamav )
-	nohardenedkernel?  ( sys-kernel/gentoo-sources )
-	!nohardenedkernel?  ( sys-kernel/hardened-sources )
-	!minimal? ( app-text/unix2dos )
-	app-misc/screen
-	sys-boot/grub
-	app-vim/gentoo-syntax
-	sys-apps/kexec-tools
-	!minimal? ( app-text/dos2unix )
-	sys-auth/pam_ldap
-	sys-auth/nss_ldap
-	app-editors/gvim
-	git? ( dev-util/git )
-	!minimal? ( dev-util/strace )
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	use !minimal && ( newexe "${FILESDIR}"/weekly-av-scan.cron av-scan || die )
-
-	exeinto /etc/cron.daily
-	use !minimal && ( newexe "${FILESDIR}"/daily-av-update.cron av-update || die )
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && ( exeinto /etc/cron.daily || die )
-		use !nohourlyupdate && ( exeinto /etc/cron.hourly || die )
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update || die
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 88-portage-distclean-exec || die
-	newexe "${FILESDIR}"/auto-download-packages 89-auto-download-package || die
-	newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays || die
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates || die
-	use autoupdate && ( dosym /sbin/update-install /etc/portage/postsync.d/99-update-install || die )
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install2 update-install || die
-	newexe "${FILESDIR}"/update-kernel update-kernel || die
-}
diff --git a/virtual/miller-base/miller-base-6-r30.ebuild b/virtual/miller-base/miller-base-6-r30.ebuild
deleted file mode 100644
index e1a87b9..0000000
--- a/virtual/miller-base/miller-base-6-r30.ebuild
+++ /dev/null
@@ -1,82 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion nomedia git
-minimal autoupdate"
-
-DEPEND="
-	!minimal? ( www-servers/apache )
-	sys-cluster/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv )
-	sys-apps/hdparm
-	sys-apps/unscd
-	!minimal? ( net-dns/bind-tools )
-	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) )
-	xfs? ( sys-fs/xfsdump )
-	sys-fs/lvm2
-	>=app-portage/gentoolkit-0.2.1
-	sys-process/vixie-cron
-	!minimal? ( sys-apps/eject )
-	app-admin/sudo
-	mail-client/mailx
-	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
-	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	dev-util/cvs
-	!minimal? ( x11-apps/xauth )
-	sys-process/lsof
-	app-portage/layman
-	app-admin/syslog-ng
-	app-admin/logrotate
-	!minimal? ( app-admin/gkrellm )
-	!minimal? ( app-antivirus/clamav )
-	nohardenedkernel?  ( sys-kernel/gentoo-sources )
-	!nohardenedkernel?  ( sys-kernel/hardened-sources )
-	!minimal? ( app-text/unix2dos )
-	app-misc/screen
-	sys-boot/grub
-	app-vim/gentoo-syntax
-	sys-apps/kexec-tools
-	!minimal? ( app-text/dos2unix )
-	sys-auth/pam_ldap
-	sys-auth/nss_ldap
-	app-editors/gvim
-	git? ( dev-util/git )
-	!minimal? ( dev-util/strace )
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
-
-	exeinto /etc/cron.daily
-	use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 88-portage-distclean-exec
-	newexe "${FILESDIR}"/auto-download-packages 89-auto-download-package
-	newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
-	use autoupdate && dosym /sbin/update-install /etc/portage/postsync.d/99-update-install
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install2 update-install
-	newexe "${FILESDIR}"/update-kernel update-kernel
-}
diff --git a/virtual/miller-base/miller-base-6-r31.ebuild b/virtual/miller-base/miller-base-6-r31.ebuild
deleted file mode 100644
index d9668fc..0000000
--- a/virtual/miller-base/miller-base-6-r31.ebuild
+++ /dev/null
@@ -1,82 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion nomedia git
-minimal autoupdate"
-
-DEPEND="
-	!minimal? ( www-servers/apache )
-	sys-cluster/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv )
-	sys-apps/hdparm
-	sys-apps/unscd
-	!minimal? ( net-dns/bind-tools )
-	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) )
-	xfs? ( sys-fs/xfsdump )
-	sys-fs/lvm2
-	>=app-portage/gentoolkit-0.2.1
-	sys-process/vixie-cron
-	!minimal? ( sys-apps/eject )
-	app-admin/sudo
-	mail-client/mailx
-	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
-	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	dev-util/cvs
-	!minimal? ( x11-apps/xauth )
-	sys-process/lsof
-	app-portage/layman
-	app-admin/syslog-ng
-	app-admin/logrotate
-	!minimal? ( app-admin/gkrellm )
-	!minimal? ( app-antivirus/clamav )
-	nohardenedkernel?  ( sys-kernel/gentoo-sources )
-	!nohardenedkernel?  ( sys-kernel/hardened-sources )
-	!minimal? ( app-text/unix2dos )
-	app-misc/screen
-	sys-boot/grub
-	app-vim/gentoo-syntax
-	sys-apps/kexec-tools
-	!minimal? ( app-text/dos2unix )
-	sys-auth/pam_ldap
-	sys-auth/nss_ldap
-	app-editors/gvim
-	git? ( dev-util/git )
-	!minimal? ( dev-util/strace )
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
-
-	exeinto /etc/cron.daily
-	use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 88-portage-distclean-exec
-	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 89-auto-download-package
-	newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
-	use autoupdate && dosym /sbin/update-install /etc/portage/postsync.d/99-update-install
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install2 update-install
-	newexe "${FILESDIR}"/update-kernel update-kernel
-}
diff --git a/virtual/miller-base/miller-base-6-r33.ebuild b/virtual/miller-base/miller-base-6-r33.ebuild
deleted file mode 100644
index 544a7d6..0000000
--- a/virtual/miller-base/miller-base-6-r33.ebuild
+++ /dev/null
@@ -1,83 +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="cdr nohardenedkernel nohourlyupdate fuse xfs bash-completion nomedia git
-minimal autoupdate autoshutdown"
-
-DEPEND="
-	!minimal? ( www-servers/apache )
-	sys-cluster/glusterfs
-	sys-apps/inotail
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv )
-	sys-apps/hdparm
-	sys-apps/unscd
-	!minimal? ( net-dns/bind-tools )
-	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || ( net-fs/mount-cifs net-fs/samba-client ) )
-	xfs? ( sys-fs/xfsdump )
-	sys-fs/lvm2
-	>=app-portage/gentoolkit-0.2.1
-	sys-process/vixie-cron
-	!minimal? ( sys-apps/eject )
-	app-admin/sudo
-	mail-client/mailx
-	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
-	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	dev-util/cvs
-	!minimal? ( x11-apps/xauth )
-	sys-process/lsof
-	app-portage/layman
-	app-admin/syslog-ng
-	app-admin/logrotate
-	!minimal? ( app-admin/gkrellm )
-	!minimal? ( app-antivirus/clamav )
-	nohardenedkernel?  ( sys-kernel/gentoo-sources )
-	!nohardenedkernel?  ( sys-kernel/hardened-sources )
-	!minimal? ( app-text/unix2dos )
-	app-misc/screen
-	sys-boot/grub
-	app-vim/gentoo-syntax
-	sys-apps/kexec-tools
-	!minimal? ( app-text/dos2unix )
-	sys-auth/pam_ldap
-	sys-auth/nss_ldap
-	app-editors/gvim
-	git? ( dev-util/git )
-	!minimal? ( dev-util/strace )
-	bash-completion? ( app-shells/bash-completion )
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
-
-	exeinto /etc/cron.daily
-	use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 88-portage-distclean-exec
-	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 89-auto-download-package
-	newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
-	use autoupdate && dosym /sbin/update-install /etc/portage/postsync.d/98-update-install
-	use autoupdate && use autoshutdown && newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install2 update-install
-	newexe "${FILESDIR}"/update-kernel update-kernel
-}
diff --git a/virtual/miller-base/miller-base-7.ebuild b/virtual/miller-base/miller-base-7-r1.ebuild
index 3f68a39..3f68a39 100644
--- a/virtual/miller-base/miller-base-7.ebuild
+++ b/virtual/miller-base/miller-base-7-r1.ebuild