gnome-base/gnome-me: Remove crap, add alternatives

2 files changed, 33 insertions, 28 deletions

diff --git a/gnome-base/gnome-me/Manifest b/gnome-base/gnome-me/Manifest
index 3ce2e4a..ff3ec9c 100644
--- a/gnome-base/gnome-me/Manifest
+++ b/gnome-base/gnome-me/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-me-2.26.0.ebuild 3549 RMD160 2fdd979fa6eefbf0bc4635de4727af46cbd1b762 SHA1 079713360da6578daa8fdf4a9dcf1d04df4bcdb8 SHA256 ef5f0b9be026b7216caa694a33c6786cdff5e5fdb620f6984c454461bf002cb6
+EBUILD gnome-me-2.26.0.ebuild 3631 RMD160 1ec342a36b4dd21bd0bc91e713ae26c50d3d86fc SHA1 7c1a0f57204af2bb48638166310f0a06e15a94fd SHA256 8fd482e871a3a680aa34e0e680fae53e45ca5d35ce22c927ce04334683d2c950
 MISC metadata.xml 237 RMD160 1f439c0491a9da3212d3824f440db74b93d31935 SHA1 d69f1c19dd3a151c212b23312be67f10b517ecfa SHA256 3533e6327c76d13a3f05e3b9381bde61fa8bd0b4504f319d280763f09bd01a4a
diff --git a/gnome-base/gnome-me/gnome-me-2.26.0.ebuild b/gnome-base/gnome-me/gnome-me-2.26.0.ebuild
index d18ad7c..077570b 100644
--- a/gnome-base/gnome-me/gnome-me-2.26.0.ebuild
+++ b/gnome-base/gnome-me/gnome-me-2.26.0.ebuild
@@ -12,32 +12,41 @@ SLOT="0"
 IUSE="applets archives bluetooth +console dev extras games +fancy +fonts +laptop
 mobile net p2p +portage pulseaudio scim +splash +vcs"
 
-# when unmasking for an arch
-# double check none of the deps are still masked !
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="gnome-base/gnome-light
 
 	media-gfx/eog
 	app-crypt/seahorse
-	app-text/evince[djvu,dvi,t1lib]
+	app-text/evince[djvu]
+	net-im/pidgin
 	gnome-base/gdm
-	|| ( mail-client/evolution
-		 mail-client/mozilla-thunderbird-bin
-		 mail-client/mozilla-thunderbird )
-	|| ( gnome-extra/nautilus-cd-burner
-		 app-cdr/brasero )
 	media-fonts/dejavu
-
-	>=www-client/mozilla-firefox-3
-	www-plugins/adobe-flash
-	net-im/pidgin
-	net-irc/conspire
 	app-dicts/myspell-en
+
 	|| ( app-editors/leafpad
 		 app-editors/gedit
 		 app-editors/gvim )
 
+	|| ( mail-client/evolution
+		 mail-client/mozilla-thunderbird-bin
+		 mail-client/mozilla-thunderbird )
+
+	|| ( >=www-client/mozilla-firefox-3
+		 >=www-client/mozilla-firefox-bin-3
+		 >=www-client/epiphany-2.26.3
+		 >=www-client/seamonkey-bin-2.0
+		 >=www-client/seamonkey-2.0
+		 www-client/chromium-bin
+		 www-client/chromium )
+
+	|| ( app-cdr/brasero
+		 gnome-extra/nautilus-cd-burner )
+
+	|| ( www-plugins/adobe-flash
+		 www-plugins/swfdec-mozilla
+		 www-plugins/gnash )
+
 	applets? ( gnome-base/gnome-applets )
 
 	archives? ( app-arch/file-roller
@@ -67,8 +76,7 @@ RDEPEND="gnome-base/gnome-light
 			  media-libs/gst-plugins-bad
 			  gnome-extra/gnome-utils )
 
-	fancy? ( x11-wm/compiz-fusion
-			 x11-themes/gnome-backgrounds
+	fancy? ( x11-themes/gnome-backgrounds
 			 x11-themes/tango-icon-theme
 			 x11-themes/vanilla-dmz-xcursors
 			 x11-themes/sound-theme-freedesktop )
@@ -102,16 +110,15 @@ RDEPEND="gnome-base/gnome-light
 				   ( app-office/abiword
 					 app-office/gnumeric ) ) )
 	
-	p2p? ( net-p2p/transmission
-		   net-p2p/linuxdcpp )
+	p2p? ( || ( net-p2p/transmission
+				net-p2p/deluge ) )
 
 	portage? ( app-portage/eix
-			   app-portage/genlop
 			   app-portage/gentoolkit
-			   dev? ( app-portage/gentoolkit-dev
-					  app-portage/portage-utils )
 			   app-portage/layman
-			   dev-util/ccache )
+			   dev-util/ccache
+			   dev? ( app-portage/gentoolkit-dev
+					  app-portage/portage-utils ) )
 
 	pulseaudio? ( extras? ( media-sound/pavucontrol
 							media-sound/padevchooser
@@ -120,8 +127,6 @@ RDEPEND="gnome-base/gnome-light
 				  media-libs/libao
 				  media-plugins/gst-plugins-pulse )
 
-	science? ( dev-python/matplotlib )
-
 	scim? ( app-i18n/freewnn
 			app-i18n/scim-anthy )
 
@@ -129,10 +134,10 @@ RDEPEND="gnome-base/gnome-light
 			  media-gfx/splashutils
 			  sys-apps/v86d )
 
-	vcs? ( dev-util/giggle
-		   dev-util/git
-		   dev-util/cvs
-		   dev-util/subversion )
+	vcs? ( dev-util/git
+		   dev-util/subversion
+		   extras? ( dev-util/giggle )
+		   dev? ( dev-util/cvs ) )
 "
 
 pkg_postinst() {