Minor tweaks and updates

6 files changed, 22 insertions, 16 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index c07f094..f9743dd 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -52,4 +52,4 @@ AUX weekly-av-scan.cron 232 RMD160 1eb8c0e031fc10a8299f8d00cddf46aee7dc011a SHA1
 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-r3.ebuild 3449 RMD160 1f96ffbef30f9562000ada4d1f7270e5bed641c2 SHA1 abbce90179c2334beaab46819d33eb26227f72b3 SHA256 d19ba371867bb00016e1219a260448c622a2f8bcc789c2d8f09faf67114976ed
+EBUILD miller-base-9-r3.ebuild 3388 RMD160 7d5ad9126823a56f816611894a45a5a937ff171e SHA1 d04db8481c909b2cee60dccb357bae719de5c55d SHA256 b770d5cd7b997874207a54466bb8e10c8eda85aa8ee91f34c5029ef8077d1604
diff --git a/virtual/miller-base/miller-base-9-r3.ebuild b/virtual/miller-base/miller-base-9-r3.ebuild
index 72eacb1..f50f712 100644
--- a/virtual/miller-base/miller-base-9-r3.ebuild
+++ b/virtual/miller-base/miller-base-9-r3.ebuild
@@ -18,7 +18,6 @@ DEPEND="
 	sys-apps/ethtool
 	cdr? ( app-cdr/k3b )
 	sys-apps/hdparm
-	sys-apps/unscd
 	!minimal? ( net-dns/bind-tools )
 	fuse? ( sys-fs/sshfs-fuse )
 	!minimal? ( || (
@@ -26,11 +25,10 @@ DEPEND="
 		net-fs/samba-client
 		net-fs/samba[client] ) )
 	xfs? ( sys-fs/xfsdump )
-	!lvmroot? ( sys-fs/lvm2 )
+	sys-fs/lvm2
 	lvmboot? ( >=sys-boot/grub-1.98 )
 	lvmroot? (
-			sys-fs/lvm2[static]
-			sys-apps/busybox[static]
+			sys-apps/busybox
 			sys-kernel/dracut[dracut_modules_lvm]
 			)
 	video_cards_nvidia? ( sys-apps/v86d )
diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index 364b63f..a097757 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1 +1,4 @@
-EBUILD miller-desktop-2-r6.ebuild 934 RMD160 09767a51c0d85c1ad36df6a962f1b45b6a3b3194 SHA1 67bdb7012d185c15e68b9001334d75da4e15e93f SHA256 8235fe6bc16c97064180217492cf997ddc6e941c69b15e3ce6f8fabeec2e89b1
+EBUILD miller-desktop-2-r6.ebuild 1015 RMD160 75aba7d8b6b542baf3d69a0070a92fa169612842 SHA1 a8b044ddb20c0f85547f15b20a63a16c53485d66 SHA256 0a383bf0f32eeb214b19741e13c86dfdceafbdeaefc7dc3158874ca23106087b
+MISC Manifest.mine 204 RMD160 45dc65af9229c1ed9904f5e5ad9ced83705cbf0f SHA1 db49eda316aff42c4cedc9c8b87a6c5db943c950 SHA256 e3f894249b35cbca822595341cbc0cf2388809df0375c8b930ac5adc6ee59906
+MISC Manifest.r493 204 RMD160 c41954abb45c8cf26aa9ed246adc7cdc49cd0969 SHA1 733f10892a1d8f59404b352fe0fadfdd5d5f0d1c SHA256 829481a56cd848ad0c283e4b6278006a40d019e18e883a0a69b6ec0a9b4dc94f
+MISC Manifest.r494 204 RMD160 ddef409a7aa3850b6f9b25bb8a6a3b2d05d47cb1 SHA1 93e0220bcb86e1a4e88b2398ef406731991332e1 SHA256 594dc054007d7ff29c93f965bf21cd45a1a9d9b2f134394bec66161c664744c3
diff --git a/virtual/miller-desktop/miller-desktop-2-r6.ebuild b/virtual/miller-desktop/miller-desktop-2-r6.ebuild
index 1c83c2e..61a2260 100644
--- a/virtual/miller-desktop/miller-desktop-2-r6.ebuild
+++ b/virtual/miller-desktop/miller-desktop-2-r6.ebuild
@@ -2,14 +2,16 @@ DESCRIPTION="Virtual for Miller servers"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="vpn wifi ndiswrapper b43 networkmanager input_devices_synaptics iwl3945
+IUSE="vpnc pptp wifi ndiswrapper b43 networkmanager input_devices_synaptics fbsplash iwl3945
 kde gnome"
 
 DEPEND="
 	virtual/miller-base
 	x11-base/xorg-server
-	media-gfx/splash-themes-gentoo
-	media-gfx/splash-themes-livecd
+	fbsplash? (
+			media-gfx/splash-themes-gentoo
+			media-gfx/splash-themes-livecd
+			)
 	media-sound/alsa-utils
 	kde? ( kde-base/kmix )
 	!networkmanager? (
@@ -19,9 +21,11 @@ DEPEND="
 	networkmanager? (
 		gnome? ( gnome-extra/nm-applet )
 		kde? ( kde-misc/networkmanagement )
-		vpn? ( net-misc/networkmanager-pptp )
-		)
-	wifi? ( net-wireless/wireless-tools
+		pptp? ( net-misc/networkmanager-pptp )
+		vpnc? ( net-misc/networkmanager-vpnc )
+			)
+	wifi? (
+	net-wireless/wireless-tools
 		net-wireless/wpa_supplicant
 		net-dialup/ppp
 		net-dialup/pptpclient
diff --git a/virtual/miller-postgresql/Manifest b/virtual/miller-postgresql/Manifest
index ba5b923..8fc5daf 100644
--- a/virtual/miller-postgresql/Manifest
+++ b/virtual/miller-postgresql/Manifest
@@ -1 +1 @@
-EBUILD miller-postgresql-4.ebuild 248 RMD160 5782845d418bbdd8edd0d3b5a5f734772628fe27 SHA1 b1f20998f6d9d023177a7275256c6b5c77f46eae SHA256 08cd9e58f90ae3ceb0cfbc8d3601d8b670db4778bea48846b903e7f617b2452a
+EBUILD miller-postgresql-4.ebuild 288 RMD160 c5a4c36f86cd8e7a8148b8503c97f319f6078e60 SHA1 199f66656125e59a716cb24600dbe4aca84fcf7d SHA256 bc5df49146be77553c854922b179dc9f8c532f6143bbabda3888009dc352b526
diff --git a/virtual/miller-postgresql/miller-postgresql-4.ebuild b/virtual/miller-postgresql/miller-postgresql-4.ebuild
index 43370d2..567ecbd 100644
--- a/virtual/miller-postgresql/miller-postgresql-4.ebuild
+++ b/virtual/miller-postgresql/miller-postgresql-4.ebuild
@@ -2,12 +2,13 @@ DESCRIPTION="Virtual for Miller PostgreSQL servers"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-EAPI="2"
+IUSE="pgmaster"
+EAPI="4"
 
 DEPEND="
 virtual/miller-base
 =dev-db/postgresql-server-9.1*
->=dev-db/slony1-2[perl]
+>=dev-db/slony1-2
+pgmaster? ( >=dev-db/slony1-2[perl] )
 "