Specify lvm boot and root separately

Switch to using dracut
Put dvb firmware in for mediaservers

4 files changed, 118 insertions, 2 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index e8de2b1..fd42e13 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -53,3 +53,4 @@ AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a8
 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-8-r12.ebuild 4110 RMD160 0bb54f1eaa05f01caa7b1de4cda91f420d3456b8 SHA1 0283bca7e6398d3c8c2c10e810a9a3cb573909bb SHA256 add8d7a66707c0c6d7ca736f23b7c25e6b10a27b8de58e4f61487bf57b4c2354
+EBUILD miller-base-9.ebuild 3485 RMD160 557221a5a6b02f138546fadae74cbd9b962f016d SHA1 1b7b48f4ca289ea20c6a6eed0c274e48622a20b4 SHA256 8dbd79f80a7dfde8b725a50dd0d6e20e20909cd2f66b54eefbf642507102150e
diff --git a/virtual/miller-base/miller-base-9.ebuild b/virtual/miller-base/miller-base-9.ebuild
new file mode 100644
index 0000000..2b2dc7f
--- /dev/null
+++ b/virtual/miller-base/miller-base-9.ebuild
@@ -0,0 +1,114 @@
+DESCRIPTION="Virtual for Miller servers"
+
+EAPI="2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
+IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion nomedia git fbsplash
+minimal autoupdate autoshutdown autoservicerestart lvmboot lvmroot sw-suspend raid
+video_cards_nvidia"
+
+DEPEND="
+	!minimal? ( www-servers/apache )
+	raid? ( sys-fs/mdadm )
+	app-admin/ide-smart
+	sys-cluster/glusterfs
+	sys-cluster/netfs
+	sys-apps/ethtool
+	cdr? ( app-cdr/k3b )
+	!nomedia? ( media-tv/mythtv media-plugins/mythvideo )
+	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
+		net-fs/samba[client] ) )
+	xfs? ( sys-fs/xfsdump )
+	!lvmroot? ( sys-fs/lvm2 )
+	lvmboot? ( >=sys-boot/grub-1.98 virtual/miller-base[lvmroot] )
+	lvmroot? (
+			sys-fs/lvm2[static]
+			sys-apps/busybox[static]
+			sys-kernel/dracut[lvm]
+			)
+	video_cards_nvidia? ( sys-apps/v86d )
+	>=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 )
+	!minimal? ( x11-apps/xauth )
+	sys-process/lsof
+	app-portage/layman[subversion]
+	app-admin/syslog-ng
+	app-admin/logrotate
+	!minimal? ( app-antivirus/clamav )
+	!hardened? ( 
+			!sw-suspend? ( sys-kernel/gentoo-sources )
+			sw-suspend? ( sys-apps/tuxonice-userui
+				|| ( sys-kernel/tuxonice-sources
+					sys-kernel/pf-sources ) ) )
+	hardened? ( sys-kernel/hardened-sources =sys-apps/gradm-2.2.2* )
+	!minimal? ( ||
+		( app-text/dos2unix <app-text/unix2dos-5 )
+		( >=app-text/dos2unix-5 !app-text/unix2dos ) )
+	app-misc/screen
+	sys-boot/grub
+	app-vim/gentoo-syntax
+	sys-auth/pam_ldap
+	sys-auth/nss_ldap
+	app-editors/gvim
+	git? ( dev-vcs/git )
+	!minimal? ( dev-util/strace )
+	bash-completion? ( app-shells/bash-completion )
+	net-misc/wakeonlan
+	"
+
+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 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
+	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
+		else
+			if use autoservicerestart ; then
+				exeinto /usr/libexec/scripts/auto-restart
+				for f in ${FILESDIR}/restart/* ; do
+					newexe ${FILESDIR}/restart/`basename $f` `basename $f`
+				done
+				exeinto /etc/portage/postsync.d/
+				newexe "${FILESDIR}"/auto-restart-services 80-auto-restart-services
+			fi
+		fi
+	fi
+
+	exeinto /sbin
+	newexe "${FILESDIR}"/update-install2 update-install
+	newexe "${FILESDIR}"/update-kernel update-kernel
+}
diff --git a/virtual/random-server/Manifest b/virtual/random-server/Manifest
index b30df84..2c945df 100644
--- a/virtual/random-server/Manifest
+++ b/virtual/random-server/Manifest
@@ -1 +1 @@
-EBUILD random-server-0.ebuild 568 RMD160 f65edea6e53ab81af41ae8b0e6570cb73ee03d72 SHA1 ccbddaf5851c32d1fbfd4ed0e4bb4eadc122cea6 SHA256 2047aae511c1887a031133aaf80c17fcf292f14f6b10eddd12dd3e30cf942419
+EBUILD random-server-0.ebuild 602 RMD160 51d4163b08700b290cff61fd96825a40ea9cf4b4 SHA1 0e9e5a740869dbeac06d3015d8346aebe78d4190 SHA256 a000bf5de0348de8028eb32b9c37ae23e67b437d257ed8825defe1dd3caaf30b
diff --git a/virtual/random-server/random-server-0.ebuild b/virtual/random-server/random-server-0.ebuild
index e6c1b4a..f3f3799 100644
--- a/virtual/random-server/random-server-0.ebuild
+++ b/virtual/random-server/random-server-0.ebuild
@@ -24,7 +24,8 @@ DEPEND="net-dialup/ppp
 	virtual/miller-webserver
 	www-apps/project2
 	mediaserver? ( media-video/ushare
-		net-p2p/transmission )
+			media-tv/linuxtv-dvb-firmware
+			net-p2p/transmission )
 "
 RDEPEND="${DEPEND}"