More sensible control over scripts and deps

4 files changed, 11 insertions, 14 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 9fef06b..986043d 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -12,4 +12,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa
 AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8
 AUX weekly-av-scan.cron 1591 BLAKE2B 8262ff9f7c8aadf503b8fbf0c283f87d619f1ee174bd52762cd421064e3ef6ad301dbfbfdf557334e76c11adc963976417c3275e8c1167d7c609cbdda201ead9 SHA512 6d5ca06bfdb020d1435b51837b4f2f8676cab808e7ffdf39be40e822858f0b7150d16d5fce991fab026c236fd3a32e1ff9a0f7eca62a679e77d1799ed15e2366
 AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182
-EBUILD miller-base-10.8.6.ebuild 3845 BLAKE2B c6cef4dbf97210d07ee9851805c2e584cba4ec84af2764ef51c7b10ead6d2485516c026e752e0e3d13ced9d3bf641ae52c61a02a269a7265ebb96c4d2ac9f466 SHA512 9a06638fe6c7855bb66440fe93576873d6cd76363fd15ab441f4a8e6adcaadb3c80d7431b40e3fec6a2cdcac33817e0ff1bfe102d5db09d41de177c711f07780
+EBUILD miller-base-10.9.ebuild 3823 BLAKE2B 2994305ea7c05943ee5b7043999de6a1e34daff929d7110814b341a444a3f3f667b00b9ec529db883362f1fb039f4d3fa9fefc329c1444a7b0cce4d5a415258e SHA512 cac6cdb37f3e87e142d8e705471937ad9cbe96a59466f09bb9d859a056c10fa1aee95f1fe1a23c2e88a60229a3c5d1a30ae2a444322bfbd0e2950b642a7d808d
diff --git a/virtual/miller-base/miller-base-10.8.6.ebuild b/virtual/miller-base/miller-base-10.9.ebuild
index 51d20f4..821979d 100644
--- a/virtual/miller-base/miller-base-10.8.6.ebuild
+++ b/virtual/miller-base/miller-base-10.9.ebuild
@@ -4,7 +4,7 @@ DESCRIPTION="Virtual for base systems"
 
 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
+IUSE="hardened nohourlyupdate fuse xfs btrfs bash-completion git samba
 minimal autoupdate autoshutdown autoservicerestart sw-suspend mdadm
 video_cards_nvidia video_cards_nouveau firmware ischroot"
 
@@ -22,7 +22,6 @@ RDEPEND="
 		sys-apps/kexec-tools
 		>=app-admin/eclean-kernel-1.99
 		mdadm? ( sys-fs/mdadm )
-		cdr? ( kde-apps/k3b )
 		sys-apps/hdparm
 		xfs? ( sys-fs/xfsdump )
 		btrfs? (
@@ -54,10 +53,6 @@ RDEPEND="
 			net-ftp/ncftp
 			app-text/dos2unix
 			net-dns/bind-tools
-			!ischroot? (
-				www-servers/apache
-				app-antivirus/clamav
-				)
 			)
 	sys-process/lsof
 	app-portage/layman[git]
@@ -65,6 +60,7 @@ RDEPEND="
 		sys-devel/prelink
 	)
 	!ischroot? (
+		app-antivirus/clamav
 		!sw-suspend? ( sys-kernel/gentoo-sources )
 		sw-suspend? ( sys-apps/tuxonice-userui
 			|| ( sys-kernel/tuxonice-sources
@@ -92,14 +88,14 @@ src_install() {
 	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
+	use !ischroot && 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
+	use !ischroot && dosym /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service
 	dosym /lib/systemd/system/cronie.service /etc/systemd/system/multi-user.target.wants/cronie.service
 
 	exeinto /etc/cron.weekly
-	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
-	use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner
+	use !ischroot && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
+	use !ischroot && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner
 	use !minimal && newexe "${FILESDIR}"/hardlink-ccache hardlink-ccache
 
 	if [ -n "${UPDATETIME}" ]; then
@@ -116,7 +112,7 @@ src_install() {
 	newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec
 	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package
 	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
-	newexe "${FILESDIR}"/newkernel 80-newkernel
+	use !ischroot && newexe "${FILESDIR}"/newkernel 80-newkernel
 	newexe "${FILESDIR}"/systemd-reload 90-systemd-reload
 	newexe "${FILESDIR}"/linkfiles 98-linkfiles
 	if use autoupdate ; then
diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index 621a264..9983039 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1 +1 @@
-EBUILD miller-desktop-2.1-r1.ebuild 815 BLAKE2B 2a9ad27a0d1a35bf9a47dfeb486c8249c3ebfb99efb2c84c88a9b3765346c82e9bd4ec94b137743b0f3700fa546607b43c4ec9462c91c44046533c4f7f58531d SHA512 88394d92fb9e9ddca81155eaa6bf05b2f8233ba02958e9040ff7ad5aa17edd5ad6c02a95a148b3bd1b86ea25e36f5a45ad1c32ca40d7c8fd3e20528341adc150
+EBUILD miller-desktop-2.1.1.ebuild 842 BLAKE2B e5552aaaa1d2ae89e759ca512ee66f593f4944a5d3f1c04aed494140579f048c15f68bccce68c8432a5b0e7372f7ed7aa56a226cf524e1f4ea9d3ccbf1baaf42 SHA512 962d682f34f29b569cf48413b2fe7ad8e657b85ce872e54ee8f2fcbaa5c9dc56efee6538d2755aecc91aef351f21ee9507626db65d311a6256534321ced351c1
diff --git a/virtual/miller-desktop/miller-desktop-2.1-r1.ebuild b/virtual/miller-desktop/miller-desktop-2.1.1.ebuild
index 7435628..0985fbd 100644
--- a/virtual/miller-desktop/miller-desktop-2.1-r1.ebuild
+++ b/virtual/miller-desktop/miller-desktop-2.1.1.ebuild
@@ -2,13 +2,14 @@ DESCRIPTION="Virtual for desktops/laptops"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="vpnc pptp forticlient wifi b43 networkmanager plymouth"
+IUSE="cdr vpnc pptp forticlient wifi b43 networkmanager plymouth"
 
 RDEPEND="
 	virtual/eject
 	plymouth? (
 			media-gfx/MIB-Ossigeno-Ultimate-Plymouth
 	)
+	cdr? ( kde-apps/k3b )
 	virtual/miller-base
 	x11-base/xorg-server
 	kde-apps/yakuake