Handful of changes to bring inline with lots of other changes

6 files changed, 16 insertions, 33 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index ef43ab2..ae5471e 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -1,15 +1,13 @@
 AUX auto-download-packages 81 SHA256 0ec31222dc2d7b7dac658faffed8b971d9ee6710811c6eefe0145e4ed4c95792 SHA512 ce5a4d320fa33cceaacd6f446340026d14da04a91b57cfe1bc78d026487748b6644d04d30a3d904af416e8914dd69f0dcfb89267011da59e7084f78f74f8a1b7 WHIRLPOOL 550f0108b061b0ca35a7513e5f85a969308b1eae7741282e8362542fb9eee0b3faa87b774e5b59a40fea10c99def8112b75a9cfb8b614fc1944887b2b7f35d3b
-AUX auto-update-overlays 25 SHA256 98ce8786c0fb1612bb1778a2ee0aea88728b7d74929650a5b249bc0e05d3abdd SHA512 70e69f299817b93debbffd0ea7d05cb8fe00be21d8103bf70024fd07443fb3abe3cebe32003128e9d241463b6eb954c98d335d8040a35a0035f05f93b99678d1 WHIRLPOOL 4140a9ffd1ff024260bded5ad5edc7bbb90a755be1b2b4703769d18e83000c8834deaa60aa10e8aebc5b5d03353bfb1a4065c830d481778c46314949ae60363f
 AUX kernels-cleaner 171 SHA256 e6beaee48340672ed6bdfd1ab4377b44cc4a8a2d559cb1f29627b368dc9ad669 SHA512 944fe9811e652a7a42f907f229bf955583a7107ccc44d2973ca65bb785b9285b6f88f6f8811d2ce26e9faa3e6d2fb0120c96b6602f8d1234ea4bc1d4726ef15d WHIRLPOOL e434436e9d138df86649d0231b45efa2d0b3135cce5c0457994e21b89e7bb72647e6473e9138d7efa83aaae23f33d74dcaa2a82aac8b09757f4e3dff7ed05d5d
 AUX newkernel 301 SHA256 869ebc9260b81e07a57d3bc7a2997c9252fa3e8de830bc593f7b15b74c6db7a0 SHA512 d338d1604c6ff6ad963187da6bf63d2c25c3286f60bc61301d4f516bcdc4becae99234f663aab171c582804792133d7c4ece755db8967b70a2e85d23ba91bc48 WHIRLPOOL 43ff64d037114b2e60f789fd8444e33a130f78795f64516eabcdddda028b5a47b02617c8ada03f848b159141f5c4bcb226cfd84257d7b0b525c93a19112f0ca2
-AUX service-check.openrc 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb3879f82f4fcdef SHA512 486e527013f694dd543d4ac877058a3f4c45a2879c2fb82519223a4aef52446e5c370892aae2d7a75766a77e47024086ec15573d1aee131b91437ad2acf4433f WHIRLPOOL c1b4806deb1ad4963089b5fb7bc14a202e206616b9eac645f1603813f60e745cfeb2370128dbd7904f75f821262f215eae61adc729d9014c979768429e15c289
-AUX service-check.systemd 54 SHA256 0b30767a9ae16c85275ce88861c8528f11f65ad52bdbb50c87e52adc41a4a888 SHA512 89bd6a5acbc99c4a6fa958dcdbd0dda09128d1ac0e50b5e312283b3dc396154fe1b5a18092994817153b80fd4a7df9ab4e86d5f958aa5ad5f2fab26303c44dc6 WHIRLPOOL 332e6780cf2b7daf2c524574c389131c7f5a889950315703da093d226a1fbec70112e70895c207c5c8f8dfe1797334dc3b129e8391a6741e464dcbb5c23a1569
+AUX service-check.systemd 57 SHA256 ca750872121356253a005cce12c04e27bd2c24d7e6e42e8c75485f0bd7065c04 SHA512 58d52a5623f478d2e104047c75fb89656e1cda6a7552e56f552bc075f488577dd856ec60d0e8842a07dadb700205a1dbf27baa9e8889692598d661ae26fdc114 WHIRLPOOL adc5f98e6ac563db57e4be61275a5b7db5a789de987a6251b87deb0164170c8a27cd827cc11b3ebdc0a142160e1b6715511526016887dd12df41aca5d047271d
 AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e SHA512 e8075f330b879f3888f47086e5fdd0144be7decbe264a105e5071f851065bd6eb55a22be6fb4eb90a4e3bca00e76fee79f372adc5c3a8f25660c61bd9379ab0f WHIRLPOOL f1afae03bdf094cb08d3389cf329d10debd89c73f360c0e16f686cc267eb49c1e5780bbfe78fdd8518c9cdba1cefe6849b598c9f8d5da667516d705bd650c966
 AUX systemd-reload 38 SHA256 1330d4fdb021f86e92a15a8c9498ae4803d4fd88f0ef4aeb30789d4529741af0 SHA512 ffbf5b57643b30fff86ec16c5d25c50337255ba44f930beba614a4600a4bed61e7ca9ecf9c85ddd7555df4e44c2cd77c2aa0ef321575b712f0d66e21a86c9999 WHIRLPOOL 3fe4b6b93b21e78e87a82ca7d564ea01f0fbd9fcd62d23b2615daa981ddfdec2836968050153e51bd9bf2e7717f254f9e622d2659988a10a3f78d47aebc8243c
 AUX tmpfiles-d-portage.conf 43 SHA256 dc88c8cb76df1ca82861b5b9430785d0c1f5bdec19ed5fc2f0296c75692ce099 SHA512 e329444f9b38df6cd5a3075ee799827438555e7b6fc53bbb820485ec0ad7c5ca8cad00b1679f0baae7dc484bd185955b8a9fcf66527d5bd7a55c443b4999fb42 WHIRLPOOL 84ad446bec2b45b70767b4b57a47ebb609659b30a7e84a704d317a970e62caebc2e275156667be61673fef94b64b3fc43693f320ef3eeb12ef3c62bce2c666d2
-AUX update-autoshutdown 94 SHA256 bd42a7125c4cf5cfb013178f9562f21e8827a9879be85f3fd5445b6c50579023 SHA512 8d131120646ff1aef8403c2decb92bb9150aef9d57cb36438a42438f4573a4d52fe390d2644c423a76997fdbcdb94a7b72c1a56ecebc81937a71d7181ac71ddf WHIRLPOOL a11b2e8c0eaaea890f3aa2ecf4efc61b16e53848ffd67c9e502c4b6516c20f257e685b299b880dc0ee449ca72e26f4cf08aea75ca9da6b75c3cc0e74024403d9
+AUX update-autoshutdown 93 SHA256 4f4a4d03a5a7b2b94c9b51c3fbb14df9a7ec9ee445311c9901416f2a06473f3c SHA512 4a08701deb2f6ff98225b49bfd498a81f73bc1c7956cfdf6239cd7aadca5cbef0086bc0d8834f861640b0d4ab0ab4d90777abe1da3b116e4e84d69a3dc8a2a46 WHIRLPOOL 74163ce4ca403381ad594e09ddc7c9096d2b303612fb24418a6ac1066d46564adaf9be60d665a6bd172026cb6f83e6badb054492aef2e7ec5e79a1bc81e2d33e
 AUX update-install2 683 SHA256 632be90dea05414607e7be7be72f4546b831b719deedb2068ad14575bc0ac70e SHA512 64895037bb13f59a255c75f852249ff1d23088e9b4faf7e908f9f112a1ce30ce9efe9fc568836da43cddc3c3f906f6c92c62642fd17bc19b74689632c03403b1 WHIRLPOOL 766182bcb66204078ffe36c5e6d9784493c506dd83481cd7e8bb132c1355ef6fce5e507b63391e18e6b67b0dd0fbd1df05b3be77185276af49c8041a54accf04
 AUX update.portage.cron-2 48 SHA256 db1c43c1d9aa7b906e39dd397499a1a33fc36103a1bc06c21eea36156be895a9 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 WHIRLPOOL 8cd7b3a90dbaa55f7dacb22f9408a75a121abea37392328f749cf27c3f82ba81379c4de7a1e0db3352de0cfd1697fe89f866eeb002a5c159c481e22e5243b244
 AUX weekly-av-scan.cron 1215 SHA256 86cfd030137a08d82c3d678196db9b582e93a5ece138ac97939a0efb4a3be3b0 SHA512 3da4781490a1703c0a00884e0a3a053b4a65207a5cb1320418cce02a10fd2c8802d6516cd22080b32d2a36212adbf4b5e471623019997dfddfe6cc1c15bf64a6 WHIRLPOOL 77f02904e7aa53179fedffe849f0dd1a0f9e4b5ac9bd97e5b1b3543da3310d176c19b398ccd261b8d75f6873a1860a6434e2587d5ecd2cf5a904ec32790db5de
 AUX write-new-updates 409 SHA256 e4c05e38082914bd9d367c69a7d1fe44fb459d8526c9e407f0b73784878640cc SHA512 5f6b852ec563f764617d747c3024a89044e409345b599e5476963573f4ef639fcf67c7eadc0cc12857c7e3c0be59a2b912d1d06a10c647c5af61cefd182ff1a5 WHIRLPOOL a42d0115ad685f28a3da51e2593ee9ae90a4021797655aef7e6083ee59572507f2a105ed32fbc019fe535783b73ce14739478cda9c707840b7c0cca3b667542a
-EBUILD miller-base-10.5.2.ebuild 4095 SHA256 170d9a3f31f0a8a5a351202c0a08b6b8246f93f7228ebcc20b8462501a001b88 SHA512 c16d64823707a673fce0bd923a194115202fd9ba5520e0b59bca885fe53fe76a6357134c9a9ae0a927c874a8de5ddb56f4217c0de53a95c741497aef6143607f WHIRLPOOL 360b96328c706d2c9cfc1258503b55ec98f027e7602b1d500c93cc633a3e03fd39a27a00ddd04c149af9d22543066aaabecf9978cd4cdf3f7b7f0d0545d61e26
+EBUILD miller-base-10.6.ebuild 3771 SHA256 e7defd9566ceae6c5b9c238c21915ca0f7cfda23fe75e6997fcfa881f8b300b9 SHA512 c4607b66db6017d5135bc47884b8143baef6f88cfc982df1af90234241575978b57d24896d5a87d9ac5c1ccd307ffb4e263a4d71055ba03a57ea94c419e17f1c WHIRLPOOL 26c5707945add2d6130b44337f85afe68a37dddb6687e5fe91609ea67e014f2b348f362616adc5283bd33b482929b2c59abacd48204e9c90af81ccb1d6ab83a2
diff --git a/virtual/miller-base/files/auto-update-overlays b/virtual/miller-base/files/auto-update-overlays
deleted file mode 100755
index 6fac2c8..0000000
--- a/virtual/miller-base/files/auto-update-overlays
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-layman -SQ0
diff --git a/virtual/miller-base/files/service-check.openrc b/virtual/miller-base/files/service-check.openrc
deleted file mode 100755
index b872698..0000000
--- a/virtual/miller-base/files/service-check.openrc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rc-status -Cac
diff --git a/virtual/miller-base/files/service-check.systemd b/virtual/miller-base/files/service-check.systemd
index 79ee05c..4e4ce33 100755
--- a/virtual/miller-base/files/service-check.systemd
+++ b/virtual/miller-base/files/service-check.systemd
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-systemctl list-unit-files | grep failed
+!(systemctl list-unit-files | grep failed)
 
diff --git a/virtual/miller-base/files/update-autoshutdown b/virtual/miller-base/files/update-autoshutdown
index c75812e..05afcc3 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 /sbin/shutdown -h 2 ; fi
+if [ `who -q | grep ^# | cut -d = -f 2` -eq 0 ] ; then systemctl poweroff ; fi
 
diff --git a/virtual/miller-base/miller-base-10.5.2.ebuild b/virtual/miller-base/miller-base-10.6.ebuild
index a54aa76..99c7a39 100644
--- a/virtual/miller-base/miller-base-10.5.2.ebuild
+++ b/virtual/miller-base/miller-base-10.6.ebuild
@@ -6,7 +6,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="cdr hardened nohourlyupdate fuse xfs btrfs bash-completion git samba
 minimal autoupdate autoshutdown autoservicerestart sw-suspend raid
-video_cards_nvidia video_cards_nouveau firmware ischroot systemd"
+video_cards_nvidia video_cards_nouveau firmware ischroot"
 
 RDEPEND="
 	app-misc/simplify
@@ -36,7 +36,6 @@ RDEPEND="
 		|| ( net-misc/openntpd net-misc/ntp )
 		samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) )
 		firmware? ( sys-kernel/linux-firmware )
-		app-admin/syslog-ng
 		app-admin/logrotate
 		video_cards_nvidia? ( sys-apps/v86d )
 		video_cards_nouveau? ( sys-firmware/nvidia-firmware )
@@ -76,11 +75,10 @@ RDEPEND="
 	app-editors/gvim
 	git? ( dev-vcs/git )
 	bash-completion? ( app-shells/bash-completion )
+	sys-apps/systemd
 	autoservicerestart? (
-			systemd? (
-				sys-apps/autorestart
-				)
-			)
+			sys-apps/autorestart
+		)
 	"
 
 src_unpack() {
@@ -89,24 +87,18 @@ src_unpack() {
 
 src_install() {
 	exeinto /etc/cron.hourly
-	if use systemd ; then
-		newexe "${FILESDIR}"/service-check.systemd service-check
-		systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf"
-		dodir /etc/systemd/system/multi-user.target.wants
-		dosym /usr/lib/systemd/system/freshclamd.service /etc/systemd/system/multi-user.target.wants/freshclamd.service
-		dosym /lib/systemd/system/nscd.service /etc/systemd/system/multi-user.target.wants/nscd.service
-		dosym /usr/lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service
-		dosym /usr/lib/systemd/system/syslog-ng.service /etc/systemd/system/multi-user.target.wants/syslog-ng.service
-		dosym /usr/lib/systemd/system/vixie-cron.service /etc/systemd/system/multi-user.target.wants/vixie-cron.service
-	else
-		newexe "${FILESDIR}"/service-check.openrc service-check
-	fi
+	newexe "${FILESDIR}"/service-check.systemd service-check
+	systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf"
+	dodir /etc/systemd/system/multi-user.target.wants
+	dosym /lib/systemd/system/freshclamd.service /etc/systemd/system/multi-user.target.wants/freshclamd.service
+	dosym /lib/systemd/system/nscd.service /etc/systemd/system/multi-user.target.wants/nscd.service
+	dosym /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service
+	dosym /lib/systemd/system/vixie-cron.service /etc/systemd/system/multi-user.target.wants/vixie-cron.service
 
 	exeinto /etc/cron.weekly
 	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
 	use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner
 
-
 	if [ -n "${UPDATETIME}" ]; then
 		mkdir -p ${D}/etc/cron.d
 		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
@@ -120,7 +112,6 @@ src_install() {
 	exeinto /etc/portage/postsync.d/
 	newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec
 	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package
-	newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays
 	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
 	newexe "${FILESDIR}"/newkernel 80-newkernel
 	newexe "${FILESDIR}"/systemd-reload 90-systemd-reload