9 files changed, 18 insertions, 55 deletions
diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index a9c9402..68c8f01 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1,21 +1,14 @@
-EBUILD miller-desktop-0.ebuild 258 RMD160 b2d9365f6c0f64c2a7c9f02b5e9b98c777c198ac SHA1 b4ba0e486bf4def8e05b2cb7da0f6b9a7de936e0 SHA256 662a02811c71e37b15223928f13a41799d30ab7088a68f4371a38726aa515701
-MD5 1cff9f6efa31acb835ee56cf507811f2 miller-desktop-0.ebuild 258
-RMD160 b2d9365f6c0f64c2a7c9f02b5e9b98c777c198ac miller-desktop-0.ebuild 258
-SHA256 662a02811c71e37b15223928f13a41799d30ab7088a68f4371a38726aa515701 miller-desktop-0.ebuild 258
-EBUILD miller-desktop-1.ebuild 275 RMD160 b2031608f309de42ba249dc33e70c0d195687040 SHA1 89c5ba6c27fbbf9f0394c58c31e3dcc75a2c1386 SHA256 acbc36c7f41b5387d195a6927f16ed989f7a309ad0848003949445a59b6265b6
-MD5 a23b781181a11e769875b2d8687d000b miller-desktop-1.ebuild 275
-RMD160 b2031608f309de42ba249dc33e70c0d195687040 miller-desktop-1.ebuild 275
-SHA256 acbc36c7f41b5387d195a6927f16ed989f7a309ad0848003949445a59b6265b6 miller-desktop-1.ebuild 275
+EBUILD miller-desktop-2-r1.ebuild 305 RMD160 2213c36cc9251981c6ff67ecfee8111c2e3c0d1b SHA1 863d7345d376c8a9ecac531e9b4fd3d35263b335 SHA256 a27fac65f444268befe3e3fc4ae134a1869ad2e7dd3c3e259e5cfb0a2e9abe63
+MD5 15a4069ddf0b0b0cc74dcf7132906907 miller-desktop-2-r1.ebuild 305
+RMD160 2213c36cc9251981c6ff67ecfee8111c2e3c0d1b miller-desktop-2-r1.ebuild 305
+SHA256 a27fac65f444268befe3e3fc4ae134a1869ad2e7dd3c3e259e5cfb0a2e9abe63 miller-desktop-2-r1.ebuild 305
 EBUILD miller-desktop-2.ebuild 289 RMD160 371270227ccd1474874afd30d6f426302bcb3084 SHA1 53d5b0b14e391a5bf81d9e940f86246be5028b47 SHA256 3b590a44ecc481faeb336562fefd29b9ffeb64ba0526501ae2e2c246254254a7
 MD5 6912603392109e90b6d0cb7dcb00e4a2 miller-desktop-2.ebuild 289
 RMD160 371270227ccd1474874afd30d6f426302bcb3084 miller-desktop-2.ebuild 289
 SHA256 3b590a44ecc481faeb336562fefd29b9ffeb64ba0526501ae2e2c246254254a7 miller-desktop-2.ebuild 289
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-desktop-0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-desktop-0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-desktop-0 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-desktop-1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-desktop-1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-desktop-1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-desktop-2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-desktop-2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-desktop-2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-desktop-2-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-desktop-2-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-desktop-2-r1 0
diff --git a/virtual/miller-desktop/files/digest-miller-desktop-0 b/virtual/miller-desktop/files/digest-miller-desktop-2-r1
index e69de29..e69de29 100644
--- a/virtual/miller-desktop/files/digest-miller-desktop-0
+++ b/virtual/miller-desktop/files/digest-miller-desktop-2-r1
diff --git a/virtual/miller-desktop/miller-desktop-0.ebuild b/virtual/miller-desktop/miller-desktop-0.ebuild
deleted file mode 100644
index 9cbace9..0000000
--- a/virtual/miller-desktop/miller-desktop-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION="Virtual for Miller servers"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="
-virtual/miller-base
-media-gfx/splash-themes-gentoo
-media-gfx/splash-themes-livecd
-media-sound/alsa-utils
-"
-
diff --git a/virtual/miller-desktop/miller-desktop-1.ebuild b/virtual/miller-desktop/miller-desktop-2-r1.ebuild
index b97f56a..6b30dd0 100644
--- a/virtual/miller-desktop/miller-desktop-1.ebuild
+++ b/virtual/miller-desktop/miller-desktop-2-r1.ebuild
@@ -10,5 +10,7 @@ media-gfx/splash-themes-gentoo
 media-gfx/splash-themes-livecd
 media-sound/alsa-utils
 sys-apps/ifplugd
+sys-power/acpid
+sys-apps/v86d
 "
 
diff --git a/virtual/miller-kiosk/Manifest b/virtual/miller-kiosk/Manifest
index 389062e..8831fea 100644
--- a/virtual/miller-kiosk/Manifest
+++ b/virtual/miller-kiosk/Manifest
@@ -1,21 +1,14 @@
-EBUILD miller-kiosk-0.ebuild 239 RMD160 d0eeb730ca554177640933d560c08810b3732cdd SHA1 cc5d22aa092dff352bb625ff3b26cc5cf74b0f5e SHA256 dac8c8bd140291846121e161af62e0bf1ce848e07af9fde8146d2c2ed0e08351
-MD5 460f2825cffdfc7ccd64db36f8777d91 miller-kiosk-0.ebuild 239
-RMD160 d0eeb730ca554177640933d560c08810b3732cdd miller-kiosk-0.ebuild 239
-SHA256 dac8c8bd140291846121e161af62e0bf1ce848e07af9fde8146d2c2ed0e08351 miller-kiosk-0.ebuild 239
-EBUILD miller-kiosk-1.ebuild 256 RMD160 0950f4cc181d48a44b45ed969139df3b35807a67 SHA1 80d6d1f1478cc4f10b3e647e9a31978225ef2190 SHA256 6ef11383423e73fdaf39b3324945184d5d2614c7828446e7dccf7dea3c052227
-MD5 ae48286d187398d132ddc47f3cb4fefa miller-kiosk-1.ebuild 256
-RMD160 0950f4cc181d48a44b45ed969139df3b35807a67 miller-kiosk-1.ebuild 256
-SHA256 6ef11383423e73fdaf39b3324945184d5d2614c7828446e7dccf7dea3c052227 miller-kiosk-1.ebuild 256
+EBUILD miller-kiosk-2-r1.ebuild 294 RMD160 f424e2e135229f8a133e683e7db30185d84bcf85 SHA1 ee58d9aef53500a8badab0afed5cb33b0fd89908 SHA256 d9a6f23846960d8e518c4ad62718e1e4f044856c4e5f3d5035445e28ab9b6c8a
+MD5 2e15c556de56b19fac8000f8980f8c02 miller-kiosk-2-r1.ebuild 294
+RMD160 f424e2e135229f8a133e683e7db30185d84bcf85 miller-kiosk-2-r1.ebuild 294
+SHA256 d9a6f23846960d8e518c4ad62718e1e4f044856c4e5f3d5035445e28ab9b6c8a miller-kiosk-2-r1.ebuild 294
 EBUILD miller-kiosk-2.ebuild 278 RMD160 8c3b3a096a840e6ffe89756cabdc1cc6a462662b SHA1 39ceffec7fba56652ad2841dc3750a0da32513d0 SHA256 b5db9dbaae6b779fe2a189d17a99c2176258c7bd0a6a10e993e16afe17fda541
 MD5 653c796f09af98cfae3cacd0740e54c6 miller-kiosk-2.ebuild 278
 RMD160 8c3b3a096a840e6ffe89756cabdc1cc6a462662b miller-kiosk-2.ebuild 278
 SHA256 b5db9dbaae6b779fe2a189d17a99c2176258c7bd0a6a10e993e16afe17fda541 miller-kiosk-2.ebuild 278
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-kiosk-0 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-kiosk-0 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-kiosk-0 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-kiosk-1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-kiosk-1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-kiosk-1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-kiosk-2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-kiosk-2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-kiosk-2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-miller-kiosk-2-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-miller-kiosk-2-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-miller-kiosk-2-r1 0
diff --git a/virtual/miller-kiosk/files/digest-miller-kiosk-1 b/virtual/miller-kiosk/files/digest-miller-kiosk-1
deleted file mode 100644
index e69de29..0000000
--- a/virtual/miller-kiosk/files/digest-miller-kiosk-1
+++ /dev/null
diff --git a/virtual/miller-kiosk/files/digest-miller-kiosk-0 b/virtual/miller-kiosk/files/digest-miller-kiosk-2-r1
index e69de29..e69de29 100644
--- a/virtual/miller-kiosk/files/digest-miller-kiosk-0
+++ b/virtual/miller-kiosk/files/digest-miller-kiosk-2-r1
diff --git a/virtual/miller-kiosk/miller-kiosk-0.ebuild b/virtual/miller-kiosk/miller-kiosk-0.ebuild
deleted file mode 100644
index ed575b9..0000000
--- a/virtual/miller-kiosk/miller-kiosk-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION="Virtual for Miller kiosk"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE=""
-
-DEPEND="
-virtual/miller-base
-x11-wm/fluxbox
-kde-base/kdm
-net-misc/dhcp
-www-client/mozilla-firefox
-"
diff --git a/virtual/miller-kiosk/miller-kiosk-1.ebuild b/virtual/miller-kiosk/miller-kiosk-2-r1.ebuild
index a8d8c5a..6a0977f 100644
--- a/virtual/miller-kiosk/miller-kiosk-1.ebuild
+++ b/virtual/miller-kiosk/miller-kiosk-2-r1.ebuild
@@ -7,8 +7,9 @@ IUSE=""
 DEPEND="
 virtual/miller-base
 x11-wm/fluxbox
-kde-base/kdm
+|| (kde-base/kdm kde-base/kdebase)
 net-misc/dhcp
 sys-apps/ifplugd
+sys-power/acpid
 www-client/mozilla-firefox
 "