Add X USE flag

3 files changed, 12 insertions, 142 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index c70357b..3a4c6ce 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -12,5 +12,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa
 AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8
 AUX weekly-av-scan.cron 1788 BLAKE2B 2c5b9394f18e882971ea883639fdcfc24cda342a6e63f166fe737a3d09e32de42b5b960f80c676994e8f8471d76b21d61cf5bfe7148eb8284d84407da8ebd5aa SHA512 ef2168213d81ce0db8eed96adf48e362f0e620ba509728beb97a5809c1f82443be356c01b7c645a7baf5cee1939d3db1f42940824b4a1a9ad8fd451d899c9179
 AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182
-EBUILD miller-base-10.10.10.ebuild 3822 BLAKE2B a27120de811f5f45bc1df6477d248e9cc1362d85def03d9f753f08a691e74aa73d04df8db1b962df28dac46323beed33b36a90071df2eeaf713638d3ec827a95 SHA512 69bc70a19f116c2b0a3de6cb76f47f52494f4657b68451aec85f49f3cb4132f8cc0b7a73f5e5a9448f47881a4dffff3390b6435c606a1bfae6d2c430a1acd28f
-EBUILD miller-base-10.10.11.ebuild 3858 BLAKE2B dc03fbf904a1daf637b6e2f0ec4cec714283003e8b27ca7e1ae9eceb6f036adb4db720742889b1930bc0f03c6ddb53e79de32f2953656ebe1a9148185c126834 SHA512 6860eef5a507735694ca8af654192f08b89babe3d253a3b1ee5109a03ae9477d3a503f83999d49ff2736351b1fd06191ca6e5961c03af1415d24d31f13b8125f
+EBUILD miller-base-10.11.ebuild 3849 BLAKE2B 49eef679203a39d05a0e847fdb98bcc8bf08fbb52b0a44c99555be069bd303050c0016569ab2507b007698d5d4caf45f87bdd0966b9e596c4298fbcaaa52c9d3 SHA512 6fc10ef4f7c5966fe8e0892bb3088d2d725fd7ee702dfefa636f80d87850df1426d9af3ee2e6237ca557f1c17b8f45b1a836064cfbef1a2c3c05cb9cf746e60d
diff --git a/virtual/miller-base/miller-base-10.10.10.ebuild b/virtual/miller-base/miller-base-10.10.10.ebuild
deleted file mode 100644
index d943b1b..0000000
--- a/virtual/miller-base/miller-base-10.10.10.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-EAPI="7"
-inherit systemd tmpfiles
-DESCRIPTION="Virtual for base systems"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="hardened nohourlyupdate fuse xfs btrfs bash-completion git samba
-minimal autoupdate autoshutdown autoservicerestart mdadm ssd
-video_cards_nvidia video_cards_nouveau firmware ischroot ldap"
-
-RDEPEND="
-	app-misc/simplify
-	|| ( app-arch/hardlink sys-apps/util-linux[hardlink] )
-	sys-process/htop
-	sys-process/iotop
-	sys-process/time
-	sys-apps/less
-	fuse? ( net-fs/sshfs )
-	!ischroot? (
-		sys-kernel/kergen
-		sys-apps/ethtool
-		sys-cluster/netfs
-		sys-apps/kexec-tools
-		>=app-admin/eclean-kernel-1.99
-		mdadm? ( sys-fs/mdadm )
-		!ssd? (
-			sys-apps/systemd-readahead
-			)
-		xfs? ( sys-fs/xfsdump )
-		btrfs? (
-			sys-fs/btrfs-progs
-			sys-fs/btrfsmaintenance
-			)
-		sys-fs/lvm2
-		>=sys-boot/grub-2
-		sys-apps/pciutils
-		sys-apps/usbutils
-		samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) )
-		firmware? ( sys-kernel/linux-firmware )
-		app-admin/logrotate
-		video_cards_nouveau? ( sys-firmware/nvidia-firmware )
-		app-antivirus/clamav
-		sys-kernel/gentoo-kernel
-	)
-	sys-process/cronie
-	>=app-portage/gentoolkit-0.2.1
-	app-admin/sudo
-	mail-client/mailx
-	!minimal? (
-			app-shells/thefuck
-			app-shells/hstr
-			x11-apps/xauth
-			sys-apps/moreutils
-			dev-util/strace
-			net-analyzer/netcat
-			net-ftp/ncftp
-			app-text/dos2unix
-			net-dns/bind-tools
-			)
-	sys-process/lsof
-	app-portage/layman[git]
-	app-misc/screen
-	app-vim/gentoo-syntax
-	ldap? (
-		sys-auth/pam_ldap
-		sys-auth/nss_ldap
-	)
-	app-editors/vim
-	app-editors/gvim
-	git? ( dev-vcs/git )
-	bash-completion? ( app-shells/bash-completion )
-	sys-apps/systemd
-	autoservicerestart? (
-			sys-apps/autorestart
-		)
-	app-portage/cpuid2cpuflags
-	app-text/ansifilter
-	"
-
-src_unpack() {
-	mkdir ${S}
-}
-
-src_install() {
-	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}"/service-check.systemd service-check
-	newtmpfiles "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf"
-	dodir /etc/systemd/system/multi-user.target.wants
-	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
-	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 !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
-		if [[ ${UPDATETIME} = @* ]]; then
-			exeinto /etc/cron.${UPDATETIME#"@"}
-		else
-			mkdir -p ${D}/etc/cron.d
-			echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-			exeinto /sbin
-		fi
-	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 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}"/systemd-reload 90-systemd-reload
-	newexe "${FILESDIR}"/linkfiles 98-linkfiles
-	if use autoupdate ; then
-		dosym /sbin/update-install /etc/portage/postsync.d/75-update-install
-		if use autoshutdown ; then
-			newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown
-		fi
-	fi
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install2 update-install
-}
-
-pkg_postinst() {
-	tmpfiles_process "portage.conf"
-}
diff --git a/virtual/miller-base/miller-base-10.10.11.ebuild b/virtual/miller-base/miller-base-10.11.ebuild
index e5cbb99..c5c0113 100644
--- a/virtual/miller-base/miller-base-10.10.11.ebuild
+++ b/virtual/miller-base/miller-base-10.11.ebuild
@@ -5,14 +5,13 @@ DESCRIPTION="Virtual for base systems"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
 IUSE="hardened nohourlyupdate fuse xfs btrfs bash-completion git samba
-minimal autoupdate autoshutdown autoservicerestart mdadm ssd
+minimal autoupdate autoshutdown autoservicerestart mdadm ssd X
 video_cards_nvidia video_cards_nouveau firmware ischroot ldap"
 
 RDEPEND="
 	app-misc/simplify
 	|| ( app-arch/hardlink sys-apps/util-linux[hardlink] )
 	sys-process/htop
-	sys-process/iotop
 	sys-process/time
 	sys-apps/less
 	fuse? ( net-fs/sshfs )
@@ -32,7 +31,7 @@ RDEPEND="
 			sys-fs/btrfsmaintenance
 			)
 		sys-fs/lvm2
-		>=sys-boot/grub-2
+		sys-boot/grub
 		sys-apps/pciutils
 		sys-apps/usbutils
 		samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) )
@@ -43,13 +42,15 @@ RDEPEND="
 		sys-kernel/gentoo-kernel
 	)
 	sys-process/cronie
-	>=app-portage/gentoolkit-0.2.1
+	app-portage/gentoolkit
 	app-admin/sudo
 	mail-client/mailx
 	!minimal? (
 		app-shells/thefuck
 		app-shells/hstr
-		x11-apps/xauth
+		X? (
+			x11-apps/xauth
+		)
 		sys-apps/moreutils
 		dev-util/strace
 		|| (
@@ -69,13 +70,15 @@ RDEPEND="
 		sys-auth/nss_ldap
 	)
 	app-editors/vim
-	app-editors/gvim
+	X? (
+		app-editors/gvim
+	)
 	git? ( dev-vcs/git )
 	bash-completion? ( app-shells/bash-completion )
 	sys-apps/systemd
 	autoservicerestart? (
-			sys-apps/autorestart
-		)
+		sys-apps/autorestart
+	)
 	app-portage/cpuid2cpuflags
 	app-text/ansifilter
 	"