Make fuse stuff optional

3 files changed, 54 insertions, 25 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 6e8c612..1daa4d4 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -1,27 +1,7 @@
 AUX daily-av-scan.cron 120 RMD160 734d836d94a6255fdbc02de5fe0a0bd4100bdf8b SHA1 2bee1fc40d9b1f14e12bfc927f4ba0251fc34dc7 SHA256 800eb46f54670ba4fccb0908cb2129aa8026628f64bc1753be4d234ff768d2cc
-MD5 cebdc60be517b39ede4cc12c88a0f2ba files/daily-av-scan.cron 120
-RMD160 734d836d94a6255fdbc02de5fe0a0bd4100bdf8b files/daily-av-scan.cron 120
-SHA256 800eb46f54670ba4fccb0908cb2129aa8026628f64bc1753be4d234ff768d2cc files/daily-av-scan.cron 120
 AUX daily-av-update.cron 31 RMD160 17399a1386d96221b51960ec38c7059af01c609e SHA1 e4ef1c8f4d2195229da18b4d23b8a42e9b61afe8 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78
-MD5 31721d0ddc172778aeca674dd81fd55d files/daily-av-update.cron 31
-RMD160 17399a1386d96221b51960ec38c7059af01c609e files/daily-av-update.cron 31
-SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78 files/daily-av-update.cron 31
 AUX update.local.portage.cron 136 RMD160 f92d7664b6307ad77bfdf7c1d9acde096eb26118 SHA1 968e735b490db21485bdd3e9bff28391c0dee732 SHA256 4d65ecfcbeac115ab2d6da181c58c12f2e2401b9400d8719e7943942b138fd3b
-MD5 0b25d7dfa5f1351c5f1fc37f7496cc5f files/update.local.portage.cron 136
-RMD160 f92d7664b6307ad77bfdf7c1d9acde096eb26118 files/update.local.portage.cron 136
-SHA256 4d65ecfcbeac115ab2d6da181c58c12f2e2401b9400d8719e7943942b138fd3b files/update.local.portage.cron 136
 AUX update.portage.cron 187 RMD160 7a72c570223b3f13ed88300972838e3442f88517 SHA1 bedf1d6c37716da7bf9746826a700516c03b4b45 SHA256 8bfe8833dc166d3cd76e80ef768ec04b52dd3d72d51e34ce70db1021ff81cc5e
-MD5 33b7c61669226a5eeefefcca7251ed55 files/update.portage.cron 187
-RMD160 7a72c570223b3f13ed88300972838e3442f88517 files/update.portage.cron 187
-SHA256 8bfe8833dc166d3cd76e80ef768ec04b52dd3d72d51e34ce70db1021ff81cc5e files/update.portage.cron 187
 AUX weekly-av-scan.cron 107 RMD160 3a97f8c9491dc7af6614731414b3a94333e680fa SHA1 89db27be1082b77ef241e0285556ec16f312b5d6 SHA256 9f8b3828e9914c76261d29ce1575bb6c55f71fa2c3205d26c4356e3595f757f5
-MD5 0bc9c7053d71f3877d3f4d999bed6eb4 files/weekly-av-scan.cron 107
-RMD160 3a97f8c9491dc7af6614731414b3a94333e680fa files/weekly-av-scan.cron 107
-SHA256 9f8b3828e9914c76261d29ce1575bb6c55f71fa2c3205d26c4356e3595f757f5 files/weekly-av-scan.cron 107
-EBUILD miller-base-6-r5.ebuild 1214 RMD160 abc670d350e633044e42055fc0f57f3e34b77280 SHA1 65fa9b153cc2a575a1cd56dd44f775b9e571c9b3 SHA256 4be9a7a9279d76d3e777e050e1bcb7dc4a1c2462b92249726992b9458e73d41e
-MD5 3f5e9851ee7c784542d3d54a5ea09010 miller-base-6-r5.ebuild 1214
-RMD160 abc670d350e633044e42055fc0f57f3e34b77280 miller-base-6-r5.ebuild 1214
-SHA256 4be9a7a9279d76d3e777e050e1bcb7dc4a1c2462b92249726992b9458e73d41e miller-base-6-r5.ebuild 1214
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-base-6-r5 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-base-6-r5 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-base-6-r5 0
+EBUILD miller-base-6-r5.ebuild 1218 RMD160 dc6674a95c6c8698624817b185b38aa1f1ced630 SHA1 d139a12149e8a45041cb055b7734a260c99ef3f8 SHA256 890e7ee05417eacbe4e0e911532f5653dcd1498636521e16e437debb76fa8d57
+EBUILD miller-base-6-r6.ebuild 1224 RMD160 29e3e260d2ce5c5970f1fbd2e568f780928ac2aa SHA1 8a33704eb583a71dedb0c3e0562cbcb4aded8af4 SHA256 1681abc3c5719e780acb8bc49f81bc2474569da79c6dbe69f780a3a375675018
diff --git a/virtual/miller-base/miller-base-6-r5.ebuild b/virtual/miller-base/miller-base-6-r5.ebuild
index a8de05d..68f5cb8 100644
--- a/virtual/miller-base/miller-base-6-r5.ebuild
+++ b/virtual/miller-base/miller-base-6-r5.ebuild
@@ -5,7 +5,7 @@ KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="nohardenedkernel nohourlyupdate"
 
 DEPEND="
-|| (kde-base/kdebase kde-base/ksysguard)
+|| ( kde-base/kdebase kde-base/ksysguard )
 net-dns/bind-tools
 sys-fs/sshfs-fuse
 sys-fs/xfsdump
@@ -26,8 +26,8 @@ app-admin/syslog-ng
 app-admin/logrotate
 app-admin/gkrellm
 app-antivirus/clamav
-nohardenedkernel?  ( sys-kernel/gentoo-sources)
-!nohardenedkernel?  ( sys-kernel/hardened-sources)
+nohardenedkernel?  ( sys-kernel/gentoo-sources )
+!nohardenedkernel?  ( sys-kernel/hardened-sources )
 app-text/unix2dos
 app-misc/screen
 sys-boot/grub
diff --git a/virtual/miller-base/miller-base-6-r6.ebuild b/virtual/miller-base/miller-base-6-r6.ebuild
new file mode 100644
index 0000000..b4ca529
--- /dev/null
+++ b/virtual/miller-base/miller-base-6-r6.ebuild
@@ -0,0 +1,49 @@
+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"
+
+DEPEND="
+|| ( kde-base/kdebase kde-base/ksysguard )
+net-dns/bind-tools
+fuse? sys-fs/sshfs-fuse
+sys-fs/xfsdump
+app-portage/gentoolkit
+sys-process/vixie-cron
+sys-apps/eject
+app-admin/sudo
+mail-client/mailx
+sys-apps/pciutils
+net-misc/ntp
+net-analyzer/netcat
+net-ftp/ncftp
+dev-util/cvs
+x11-apps/xauth
+sys-process/lsof
+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"
+
+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
+	newexe "${FILESDIR}"/update.local.portage.cron portage-update || die
+
+	use nohourlyupdate && exeinto /etc/cron.daily
+	use !nohourlyupdate && exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/update.portage.cron gentoo-portage-update || die
+}