Minor fixes

5 files changed, 9 insertions, 8 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index d3d20c0..b083e3a 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -17,7 +17,7 @@ AUX restart/apache2 28 RMD160 c715f4652679c600023d72783f391c36aad01d17 SHA1 a05e
 AUX restart/authdaemond 37 RMD160 19715d01f4ba77efc4e3a6b6d3249592bacb2d39 SHA1 98dc2035c16ebaecb2820491c4cc80640fbc110a SHA256 cc62abec53e1bf9c39e0f524ba6b7cb2eaf68f5de192ae5a7faa6f3436e00d2e
 AUX restart/clamd 26 RMD160 2a2d5f6daf2cbd812c5645b2881badc18a9268c1 SHA1 ef025c0c1e956fe14256be782ab1e97b4e8cf904 SHA256 a0e925214aed147b82240943b2f3cdbf38f9a6a069645cf7e62c4234253d59af
 AUX restart/console-kit-dae 32 RMD160 f13782b6f93101c9d02b5aab97f13a04bf4301d6 SHA1 bf193cde16295a3c212d3b5503efc454ecaa3b7a SHA256 6abf0b5fa0c764d3e025816968b11dc3408ea9a808a2b499ee1aed88bfc844a8
-AUX restart/couriertcpd 35 RMD160 1e99bf108be00e308a0323dade375d642f62eb6a SHA1 0e7aafb0d7c6639b8e8f536d82fb47b4c84417fa SHA256 992381db69bccdfe358975397af48e3a1bf30029a0737ddb32cc750ac4486ee3
+AUX restart/couriertcpd 39 RMD160 61151164924f35efae46af135da2ab93c4d84dfe SHA1 a28a2b68309cc2ed56c9b7db4a9632e16109edf3 SHA256 d888579ab9afe45d7d828d0553ca0496d03374ede4589f52c4612986d5c6bbde
 AUX restart/dbus-daemon 26 RMD160 5b07be08d13a90e2dc9bfaf0df0e69960b9cb3d1 SHA1 fac364460ef3d577f923970509b6bb11dee4924b SHA256 fd1fdf3e734cebead4787817dde12a714e7624bae5a0d6da1b177513fb8674f9
 AUX restart/ddclient 30 RMD160 984b62a4b26547cdf2bf528b975986109f82dd79 SHA1 897a274945bdadf8a40391a1595b3990c0045642 SHA256 f687a395fbf513b03366e8804d777f290f1cb1a5c2c009fcd9e3ea4f674f7709
 AUX restart/dhcpd 27 RMD160 486cef33ae8554bf725bbdc5867c1ae72a8c5a63 SHA1 a2d5b7f8691d1247e6f90db6e1005468a72f07c3 SHA256 663a9703c4569a2eee95faff7eb71af776570449291094bfc4b08b7034dbe347
@@ -44,12 +44,12 @@ AUX restart/unscd 27 RMD160 73e53d26fabc6f096716611fb49079eec087d5de SHA1 d66cf3
 AUX restart/vsftpd 27 RMD160 91be22938c872d12b96c8c695f9cba1c2767ed45 SHA1 016b411d34273ae75962ac4023b1c9e6c632a19a SHA256 75ecac8ca02bf650883aecdc5e8d7d4c233ad1d96d4497f99135703930c38932
 AUX sync-distclean-exec.cron 60 RMD160 b012f4963ffa84869ce9e9593f64e5e26e09cf8c SHA1 c0389c2e1e947e75910a5ff3b9b0a7a122754c76 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e
 AUX update-autoshutdown 88 RMD160 f029249c1e727d4feaa06bbdc8bac1a9e84ba178 SHA1 2f55e2283efae01ae9fa30d5ae136989257563c2 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6
-AUX update-install2 465 RMD160 1d4c5ecf72bfa132d72fed4d4671949c7e3b46d7 SHA1 e2ac26e09a6c85f5b449ac5d9cbbd637d2d3022a SHA256 42c5a9a7effbed59f8c02afebeadb29c19a453b914783fa238c41e4dd4f182ca
-AUX update-kernel 488 RMD160 22f8e214e482fcbb3ac37390cc91356d18b60cac SHA1 a6cc9f8b164cf6b345ac4775755de835f699ae40 SHA256 0d7d6441d9c0469611db50063f401656a54e1bcd6b44cd1c963ac73ce1c11ff3
+AUX update-install2 457 RMD160 b73bac2c53533fcb0f4c931ed34548421cf72cca SHA1 e6088eb347d43d1f48968a249eb55a4cd4cb6730 SHA256 40fcd47ac532d65e0ea54712df2fc0e0ae1685cb2afd8827082d0ee5575815c7
+AUX update-kernel 571 RMD160 9d75e8fcdbfa50587eaf4d6bdcf3310d536b642e SHA1 44fa0e577347bb2787796290bf0d63c00a5f9ca1 SHA256 268d735670fc18fbfaa1a3de49583f6ecc4061e04a62775add1673f0396efd0f
 AUX update.portage.cron 171 RMD160 c388289e78342b65d48077868f4acbe9b3b00849 SHA1 d7430ff8e906ad8d66918750c29722bfa6030c73 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03
 AUX update.portage.cron-2 159 RMD160 eada35db78d363502c4d0486cfcbc8493514562f SHA1 4be58a5f236829928865c800585cc9c811a6aad3 SHA256 a910ae7e18b6e759380f1d9e30bffa100912b3a6f1c60c69f33b9cd186d0e92c
 AUX weekly-av-scan.cron 232 RMD160 1eb8c0e031fc10a8299f8d00cddf46aee7dc011a SHA1 d39efdf4398a679b8a87603c51e92f01ce1e9362 SHA256 1b1e3751560d72c0e146046149084e213f8bc8f878e8cb24446be8ee45b6da28
 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 123 RMD160 bd8177f3baf9287676389a8c24d3419a995400bb SHA1 2812937b3a746c919fe5bea90b3b6c9930d203f0 SHA256 98d35a82d75ed3e4a7b9857c57ab41f3cbf60a82dc255b7c62d372e0ed410d84
-EBUILD miller-base-9-r1.ebuild 3407 RMD160 23af1f232cb6c3f8a5f727741307a0b4127ccbbf SHA1 b1d7d921a7df1af6b528779aa31b029b6e81430f SHA256 32c4255e3c225486d99fac0eeb698d36cc75baedcd15ce3c1ba4b23575392ca5
+EBUILD miller-base-9-r2.ebuild 3407 RMD160 23af1f232cb6c3f8a5f727741307a0b4127ccbbf SHA1 b1d7d921a7df1af6b528779aa31b029b6e81430f SHA256 32c4255e3c225486d99fac0eeb698d36cc75baedcd15ce3c1ba4b23575392ca5
diff --git a/virtual/miller-base/files/restart/couriertcpd b/virtual/miller-base/files/restart/couriertcpd
index a6b8546..c3f7065 100755
--- a/virtual/miller-base/files/restart/couriertcpd
+++ b/virtual/miller-base/files/restart/couriertcpd
@@ -1,2 +1,2 @@
-/etc/init.d/courier-imapd restart
+/etc/init.d/courier-imapd-ssl restart
 
diff --git a/virtual/miller-base/files/update-install2 b/virtual/miller-base/files/update-install2
index 9381780..c4d2e4f 100755
--- a/virtual/miller-base/files/update-install2
+++ b/virtual/miller-base/files/update-install2
@@ -7,11 +7,11 @@ TTYTEST=$?
 ( \
 	( \
 		( \
-			emerge -uqDN -j2 @world @system --keep-going --with-bdeps=y && \
+			emerge -uqDN @world @system --keep-going --with-bdeps=y && \
 			rm -f $file ) || \
 		/etc/portage/postsync.d/50-write-new-updates ) && \
 	emerge --depclean -q 2>&1 | tee $dpfile && \
-	emerge -q -j2 --keep-going @preserved-rebuild \
+	emerge -q --keep-going @preserved-rebuild \
 )
 revdep-rebuild -q -i
 if [ $TTYTEST -eq 0 ]; then
diff --git a/virtual/miller-base/files/update-kernel b/virtual/miller-base/files/update-kernel
index 13f2b90..0f4dbce 100755
--- a/virtual/miller-base/files/update-kernel
+++ b/virtual/miller-base/files/update-kernel
@@ -1,9 +1,10 @@
 #!/bin/bash
 
 cd /usr/src/linux || ( echo "No kernel directory"; exit 1 )
+[ -f .config ] || ( echo "No kernel configuration"; exit 1 )
 make -j2 || ( echo "Make failed" ; exit 1 )
 make modules -j2 || ( echo "Make modules failed" ; exit 1 )
 make modules_install -j2 || ( echo "Make modules install failed" ; exit 1 )
-emerge -q1 /lib/modules || exit 1
+qfile /lib/modules && emerge -q1 /lib/modules || exit 1
 make install -j2 || ( echo "Make install failed" ; exit 1 )
 [ -x /usr/sbin/dracut ] && /usr/sbin/dracut -H -f --lzma /boot/dracut.initrd.cpio.lzma $(head /boot/config -n3 | tail -n1 | cut -d ' ' -f 3)
diff --git a/virtual/miller-base/miller-base-9-r1.ebuild b/virtual/miller-base/miller-base-9-r2.ebuild
index 09d4b93..09d4b93 100644
--- a/virtual/miller-base/miller-base-9-r1.ebuild
+++ b/virtual/miller-base/miller-base-9-r2.ebuild