Move stuff round a bit

6 files changed, 80 insertions, 14 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index e21937a..1fb3ac5 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -3,4 +3,5 @@ AUX hourly-distclean-updatedb.cron 940 RMD160 f6f420a2da2588be0f5ba47c3c887a4030
 AUX update.portage.cron 170 RMD160 e289dd8dcc69e6d84c6e97dd2ae7b046b36c9c62 SHA1 d77ce987e1bef56b00cc42f605b669b5a9f71436 SHA256 4bc798143cc26d9d0ab25ce662f5c7c3819670ef1ad91c4a712c8436f0444cf4
 AUX weekly-av-scan.cron 125 RMD160 f899ac0fd639b9f498877a518b7658a9d0d67c88 SHA1 76e0acd80e769bc7a3ff7095c274033021cabdda SHA256 c36075a5d6061813cf3c2ca0944a7c7365a3dfb313a7077f6a70ec3de0541532
 AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141
-EBUILD miller-base-6-r15.ebuild 1396 RMD160 5fa69d9acce410ebaa095dce46dd3a4b7677f249 SHA1 c97cc53c3946534243a23f5893adbca7c42e291d SHA256 15d41363c7e28934157ec81af65f8a756ca0fb0ade0714335f14cd6dc66f4b50
+EBUILD miller-base-6-r15.ebuild 1433 RMD160 ab0fe8577a4d6df034126a6e3cccb2431f40f378 SHA1 1a0af07ad04fdf1e384db460d4ed870382d36e44 SHA256 eb0354f6311ddb6964b4fe6d5c8fb74cff97e75bda94b3e0b3a7b2766e2430d7
+MISC .miller-base-6-r15.ebuild.swp 12288 RMD160 25b796a2e2309158a404c052049969b24d553c5d SHA1 c36e9c599960f329f3bf182b9b9d7220c7d6c2ae SHA256 3f6cd58f6ed24ff520a99185e696cfdd18f380f369b1c440db26cd8ebb7f8f9f
diff --git a/virtual/miller-base/miller-base-6-r15.ebuild b/virtual/miller-base/miller-base-6-r15.ebuild
index c7d0622..b7318ce 100644
--- a/virtual/miller-base/miller-base-6-r15.ebuild
+++ b/virtual/miller-base/miller-base-6-r15.ebuild
@@ -35,7 +35,10 @@ app-misc/screen
 sys-boot/grub
 app-vim/gentoo-syntax
 sys-apps/kexec-tools
-app-text/dos2unix"
+app-text/dos2unix
+sys-auth/pam_ldap
+sys-auth/nss_ldap
+"
 
 src_install() {
 	exeinto /etc/cron.weekly
diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index 68c8f01..1eabe86 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1,14 +1,4 @@
 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-r2.ebuild 350 RMD160 b62a4cb733d734c1b800732a3604c1316e8922e7 SHA1 35b4a3361996d123055a4e8e007db0645218f7ba SHA256 339851950b05051c5fe3b7a84ff1b2e3fcc45bba96d92ff4a2ec7265f7d96931
 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-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
+MISC .miller-desktop-2-r2.ebuild.swp 12288 RMD160 0a1bd92af3f41a4ce1f0ff70fd010306c84b5e80 SHA1 42af23ca32672cc6e15c4ba37e176a6054f58872 SHA256 98960e57c4fdcd4e0a60f61685008e17413ceda2ded798184c6380f43866c348
diff --git a/virtual/miller-desktop/miller-desktop-2-r2.ebuild b/virtual/miller-desktop/miller-desktop-2-r2.ebuild
new file mode 100644
index 0000000..f24e21a
--- /dev/null
+++ b/virtual/miller-desktop/miller-desktop-2-r2.ebuild
@@ -0,0 +1,18 @@
+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
+media-sound/alsamixergui
+sys-apps/ifplugd
+sys-power/acpid
+sys-apps/v86d
+x11-apps/mesa-progs
+"
+
diff --git a/virtual/miller-workstation/Manifest b/virtual/miller-workstation/Manifest
index 368289a..58664fa 100644
--- a/virtual/miller-workstation/Manifest
+++ b/virtual/miller-workstation/Manifest
@@ -2,7 +2,9 @@ EBUILD miller-workstation-10.ebuild 1059 RMD160 c96e5336f77c507b4578864c33a61995
 EBUILD miller-workstation-11-r1.ebuild 1217 RMD160 63b8b53384bbbb8000197939484866ede4753e0c SHA1 d1772e7a71ab4760153aca231d4edb16007d6ba1 SHA256 412f3627a08cef483dfa967a49a7aff8bf7474271e729ac36e054bb46cc0ae94
 EBUILD miller-workstation-11-r2.ebuild 1216 RMD160 486bf5e01db55e9b814ce796d5ff9da5d5a1a76a SHA1 8e1c85778fe611b41a29ac273d4b0093ccecc85b SHA256 5c1da7b6fd71a20b7d90ba801d8c611e6a32cb0866ada90d74f0b96a9921e45f
 EBUILD miller-workstation-11-r3.ebuild 1241 RMD160 1cfc99ad07ebe3c67ee9636707f01da897544879 SHA1 8730b18d8cd7c63f42de42fa70ee8e5d8ffc7908 SHA256 141cc8a12d030417a6fea362d258f0ce5ff34497eda968abaa91405323b95639
+EBUILD miller-workstation-11-r4.ebuild 1297 RMD160 34750a411fd5a169796def1f40afcfd10e285044 SHA1 d64da57ee9de3d3eca6278f1146caee761e25cfa SHA256 6d5ae2f889418a033fd703b3c3c859b5bbfbad4104394a45249b3fa6f7074c8b
 EBUILD miller-workstation-11.ebuild 1073 RMD160 a59f17db1aa36590c2b9b121f4da1ddce8c7b5d7 SHA1 81d3ee792cd418d12497753f8a47e1033cb49c9a SHA256 19fba3722e25c5b04c29ff32b2402cdd0411b1fd527b8531b808307a44cb562a
 EBUILD miller-workstation-7.ebuild 889 RMD160 0e20168e180fd1f3e140ceb50fcff627a591bbcb SHA1 b1e4e34a5bae2fb6e031843bd3bbd372b8a4397a SHA256 523f868647d89d8abac456300a4158279bb9e20c215f9da30867a552b61ccf15
 EBUILD miller-workstation-8.ebuild 933 RMD160 9a9fa7182f3827ddbc7210472df92335f076d2f4 SHA1 78c96a9b97e64738e620aabe01a352b547d162f8 SHA256 d17145c2cd2e01f8a7452157eeec385ce233f1bb814432403696b9f948e8f542
 EBUILD miller-workstation-9.ebuild 950 RMD160 654bd3436805237ae8cb4ec2b7dfd3f04d632741 SHA1 b84d1eddc0a01a67705ac86a366072a24b04e03c SHA256 35432649a59694ab81479a823a73874de8be4194985ad275e619c4dbeb5cec1f
+MISC .miller-workstation-11-r4.ebuild.swp 12288 RMD160 df0e100752ff66e5d380bf3c6518eca8d15733a5 SHA1 707ed9466866aa8a3c0dbf21e612b8c5142d8a19 SHA256 98b9c5ec4a16055eec4198cbc63633c501b9203316f960c66116841b91a12527
diff --git a/virtual/miller-workstation/miller-workstation-11-r4.ebuild b/virtual/miller-workstation/miller-workstation-11-r4.ebuild
new file mode 100644
index 0000000..bb7b333
--- /dev/null
+++ b/virtual/miller-workstation/miller-workstation-11-r4.ebuild
@@ -0,0 +1,52 @@
+DESCRIPTION="Virtual for Miller workstations"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
+IUSE="firefox3"
+
+DEPEND="
+virtual/miller-base
+|| ( kde-base/kdeutils kde-base/kcalc )
+xulrunner? ( net-www/mplayerplug-in )
+mail-client/mutt
+net-im/pidgin
+games-misc/fortune-mod-all
+x11-themes/gtk-engines-qt
+sys-devel/bc
+x11-misc/xscreensaver
+media-fonts/corefonts
+dev-java/blackdown-jre
+media-gfx/inkscape
+|| ( kde-base/krdc kde-base/kdenetwork )
+www-client/mozilla-firefox
+media-video/mplayer
+kde-misc/filelight
+mail-client/mozilla-thunderbird
+app-emulation/wine
+net-mail/fetchmail
+www-client/links
+app-misc/freemind
+games-misc/fortune-mod
+app-office/openoffice-bin
+media-gfx/gimp
+net-www/netscape-flash
+x11-plugins/pidgin-encryption
+x11-themes/gtk-chtheme
+media-gfx/gimageview
+app-office/dia
+net-misc/dhcp
+x11-misc/googleearth
+media-sound/amarok
+|| ( kde-base/ksnapshot kde-base/kdegraphics )
+|| ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork )
+|| ( kde-base/kwalletmanager kde-base/kdeutils )
+|| ( kde-misc/kdocker kde-base/kdemisc )
+|| ( kde-base/superkaramba kde-base/kdeutils )
+|| ( kde-base/kpdf kde-base/kdegraphics )
+mail-client/mail-notification
+sys-auth/pam_mount
+x11-themes/gtk-engines-qtcurve
+x11-themes/qtcurve
+x11-themes/qtcurve-qt4
+"
+