From ee43325d272950e04e91572d9eea8cbf9a495959 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Sat, 7 Nov 2009 16:11:15 +0000
Subject: Fix auto shutdown script

---
 virtual/miller-base/Manifest                  |  4 +-
 virtual/miller-base/files/update-autoshutdown |  2 +-
 virtual/miller-base/miller-base-6-r32.ebuild  | 83 ---------------------------
 virtual/miller-base/miller-base-6-r33.ebuild  | 83 +++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 86 deletions(-)
 delete mode 100644 virtual/miller-base/miller-base-6-r32.ebuild
 create mode 100644 virtual/miller-base/miller-base-6-r33.ebuild

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 419926d..385c9ea 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -3,7 +3,7 @@ AUX auto-update-overlays 25 RMD160 7c8c5594cfd401e8b38b4ae4df07f17f4c4415a4 SHA1
 AUX daily-av-update.cron 31 RMD160 17399a1386d96221b51960ec38c7059af01c609e SHA1 e4ef1c8f4d2195229da18b4d23b8a42e9b61afe8 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78
 AUX hourly-distclean-updatedb.cron 940 RMD160 f6f420a2da2588be0f5ba47c3c887a403002fce0 SHA1 f5626fcddd829d6bfa75bb132e2644162548f9d2 SHA256 ce2ec02cd3a9b1af3df6f7eba15dedb1b4ca8b224fc68431a9afc1a76702c0c6
 AUX sync-distclean-exec.cron 48 RMD160 06f9d602ab5c35a524e1605aa2296975fbf93fef SHA1 fda026a86c93267d3e29aae42e39cc10be150428 SHA256 48d786065199b15d7e9ec719fa5f519ff11b546022057245c08a27a722544eb6
-AUX update-autoshutdown 85 RMD160 3c40fec855c611af3f4e89032ec844aa157e57b1 SHA1 13f4ad3756eaa8a2c88976cb57c6a38f3e619c72 SHA256 a219a1db431188ef17c5792fe3395debd12ca9a280b060c2c96e42395c5a2af9
+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
@@ -22,4 +22,4 @@ EBUILD miller-base-6-r26.ebuild 2415 RMD160 4e9a889c29a9e9b51af60bd69dc2b5a32526
 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-r32.ebuild 2613 RMD160 8100f5c6662a49c5722245600f6df5a533380e6e SHA1 7df04f894578f8888767030cb4e585c1b50bae9f SHA256 8f2dcb85eb861642237d5c63db402ccc3635f830a92df50109b955bdfb95906b
+EBUILD miller-base-6-r33.ebuild 2613 RMD160 8100f5c6662a49c5722245600f6df5a533380e6e SHA1 7df04f894578f8888767030cb4e585c1b50bae9f SHA256 8f2dcb85eb861642237d5c63db402ccc3635f830a92df50109b955bdfb95906b
diff --git a/virtual/miller-base/files/update-autoshutdown b/virtual/miller-base/files/update-autoshutdown
index 174d08f..0287e7a 100755
--- a/virtual/miller-base/files/update-autoshutdown
+++ b/virtual/miller-base/files/update-autoshutdown
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-if [ `who -q | grep ^# | cut -d = -f 2` -eq 0 ] ; then shutdown 2 ; fi
+if [ `who -q | grep ^# | cut -d = -f 2` -eq 0 ] ; then shutdown -h 2 ; fi
 
diff --git a/virtual/miller-base/miller-base-6-r32.ebuild b/virtual/miller-base/miller-base-6-r32.ebuild
deleted file mode 100644
index 544a7d6..0000000
--- a/virtual/miller-base/miller-base-6-r32.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-6-r33.ebuild b/virtual/miller-base/miller-base-6-r33.ebuild
new file mode 100644
index 0000000..544a7d6
--- /dev/null
+++ b/virtual/miller-base/miller-base-6-r33.ebuild
@@ -0,0 +1,83 @@
+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
+}
-- 
cgit v1.2.3