summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virtual/miller-desktop/Manifest2
-rw-r--r--virtual/miller-desktop/miller-desktop-2-r6.ebuild5
-rw-r--r--virtual/miller-workstation/Manifest2
-rw-r--r--virtual/miller-workstation/miller-workstation-11-r9.ebuild4
4 files changed, 5 insertions, 8 deletions
diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest
index 5bedb49..7604362 100644
--- a/virtual/miller-desktop/Manifest
+++ b/virtual/miller-desktop/Manifest
@@ -1,3 +1,3 @@
EBUILD miller-desktop-2-r4.ebuild 649 RMD160 416bf96a6325efff4461a00595cbed09dc918242 SHA1 ddc2826affdef5da0f21337758d709d1ed3a65b0 SHA256 944b3588d06991196e316af3f1461903b202a5ce126e20ede8ec221e5f8336b6
EBUILD miller-desktop-2-r5.ebuild 619 RMD160 e6a1ab6aa4f23e5533c745758f7084050bb3ca76 SHA1 436ba69942c04f2b41f7bc963ff747c1a9372d53 SHA256 fe5b0cdf435d5b132100f03dbc5d0aaf9b35bd4677b3748ad0b277a74a7afe88
-EBUILD miller-desktop-2-r6.ebuild 811 RMD160 015b84d0da6f932768d6d8250ac5e77f1439d32a SHA1 9a32a99f4a628fe7158e11488a056e760743e995 SHA256 0fd4b62d905084e68e501371e127c3767a04b1e2f89b2eafd8e4b93c52e98d6d
+EBUILD miller-desktop-2-r6.ebuild 847 RMD160 1a07b9a910416f72d3c57c74996f111238ebc31f SHA1 00c5dcba3faca7db19961c2f1e3114f8380cda6d SHA256 56f6dd287238d816f3536c6b5ab90c9f355a6d78c71992dd58b8bb3ce8f242de
diff --git a/virtual/miller-desktop/miller-desktop-2-r6.ebuild b/virtual/miller-desktop/miller-desktop-2-r6.ebuild
index ba3e859..1db4a08 100644
--- a/virtual/miller-desktop/miller-desktop-2-r6.ebuild
+++ b/virtual/miller-desktop/miller-desktop-2-r6.ebuild
@@ -11,11 +11,12 @@ DEPEND="
media-gfx/splash-themes-livecd
media-sound/alsa-utils
media-sound/alsamixergui
- || ( sys-apps/netplug
- sys-apps/ifplugd )
+ !networkmanager? ( || ( sys-apps/netplug
+ sys-apps/ifplugd ) )
sys-power/acpid
sys-apps/v86d
x11-apps/mesa-progs
+ net-misc/dhcp
networkmanager? (
kde-base/knetworkconf
gnome-extra/nm-applet
diff --git a/virtual/miller-workstation/Manifest b/virtual/miller-workstation/Manifest
index a3928cb..1e71f0c 100644
--- a/virtual/miller-workstation/Manifest
+++ b/virtual/miller-workstation/Manifest
@@ -1,3 +1,3 @@
EBUILD miller-workstation-11-r7.ebuild 1399 RMD160 a218e6733fdbf0f8ccc7f1d750c6174fa70c520d SHA1 68b223e046ad285f3e6a1b00bc1ef6bd7ac4e933 SHA256 92fb98b7ed9882112c5e8ac531c9c51e04b3200964d3c80443d5be89f4db4cc6
EBUILD miller-workstation-11-r8.ebuild 1424 RMD160 26899eacb3e9232a6b0e83d2922c6d916198d2b1 SHA1 90a56ddec3780f78ed6636e73a4d6fe81b2f6ab2 SHA256 eaad85ae5904685bed19b79f9a11f4bb92a65b549b2d1e3e0c8adcd86e95e2c7
-EBUILD miller-workstation-11-r9.ebuild 1289 RMD160 eab42c2e051932eeb25a5e4904d696d40d697a19 SHA1 91f432bc546d161f54cef446495a7953b88554e5 SHA256 3956f7b471bffafd70b63b49496ea8dcde90574de37ee46063c679d36c757b5e
+EBUILD miller-workstation-11-r9.ebuild 1222 RMD160 e47d86b07fbf5d7399ecfdf24e7002ee6d5b2337 SHA1 740c6d6d78bc3ced1f28cb5e091c2adc9f945930 SHA256 119b25a8bc9e543f5c158d90b2dbb7e838c301c6a73088f2b8580b78ca818e77
diff --git a/virtual/miller-workstation/miller-workstation-11-r9.ebuild b/virtual/miller-workstation/miller-workstation-11-r9.ebuild
index 801d1f8..f89cea4 100644
--- a/virtual/miller-workstation/miller-workstation-11-r9.ebuild
+++ b/virtual/miller-workstation/miller-workstation-11-r9.ebuild
@@ -7,10 +7,8 @@ DEPEND="
virtual/miller-base
|| ( kde-base/kcalc kde-base/kdeutils )
|| ( www-plugins/mplayerplug-in www-plugins/gecko-mediaplayer )
- mail-client/mutt
net-im/pidgin
games-misc/fortune-mod-all
- sys-devel/bc
x11-misc/xscreensaver
media-fonts/corefonts
virtual/jre
@@ -19,14 +17,12 @@ DEPEND="
media-video/mplayer
kde-misc/filelight
mail-client/mozilla-thunderbird
- app-emulation/wine
games-misc/fortune-mod
|| ( app-office/koffice-meta app-office/openoffice-bin )
media-gfx/gimp
www-plugins/adobe-flash
x11-plugins/pidgin-encryption
x11-plugins/pidgin-facebookchat
- net-misc/dhcp
media-sound/amarok
|| ( kde-base/ksnapshot kde-base/kdegraphics )
|| ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork )