[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome/, gnome-base/gnome-extra-apps/, status/portage-configs/, ...

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome/, gnome-base/gnome-extra-apps/, status/portage-configs/, ...

[Nirbheek Chauhan]

commit:     f0bf531029d5865c0f5b6d34843828261468b8bf
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 04:45:35 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 04:55:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f0bf5310

gnome-base metas: categorize gnome deps using virtuals

* gnome-base/gnome is *all* the applications which integrate well with GNOME 3
* gnome-base/gnome-core-libs are all the core GNOME 3 libraries
* gnome-base/gnome-core-apps are all the core apps tightly integrated with GNOME 3
* gnome-base/gnome-extra-apps are other GNOME 3 apps
* gnome-base/gnome-light is the same as before
* Add new metas to package.keywords

---
 .../gnome-core-apps/gnome-core-apps-3.0.0.ebuild   |   56 ++++++++++
 .../gnome-core-libs/gnome-core-libs-3.0.0.ebuild   |   40 +++++++
 .../gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild |   42 ++++++++
 .../gnome-fallback/gnome-fallback-3.0.0.ebuild     |   27 +++++
 gnome-base/gnome-light/gnome-light-3.0.0.ebuild    |   43 ++------
 gnome-base/gnome/gnome-3.0.0.ebuild                |  107 +++++---------------
 status/portage-configs/package.keywords.gnome3     |    6 +-
 7 files changed, 207 insertions(+), 114 deletions(-)

diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild
new file mode 100644
index 0000000..5f4d2be
--- /dev/null
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+DESCRIPTION="Meta package for the core applications integrated with GNOME 3"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="as-is"
+SLOT="3.0"
+IUSE="+bluetooth +cdr cups"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# Note to developers:
+# This is a wrapper for the core apps tightly integrated with GNOME 3
+# gtk-engines:2 is still around because it's needed for gtk2 apps
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+
+	>=gnome-base/gnome-session-${PV}
+	>=gnome-base/gnome-menus-${PV}
+	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
+	>=gnome-base/gnome-control-center-${PV}[cups?]
+
+	>=gnome-base/nautilus-${PV}
+	>=gnome-base/gnome-keyring-${PV}
+	>=gnome-base/libgnome-keyring-${PV}
+	>=gnome-extra/evolution-data-server-${PV}
+	>=gnome-extra/gnome-power-manager-${PV}
+	>=gnome-extra/gnome-screensaver-${PV}
+	>=gnome-extra/nm-applet-0.8.998[bluetooth?]
+
+	>=app-crypt/seahorse-${PV}
+	>=app-editors/gedit-${PV}
+	>=app-text/evince-${PV}
+	>=media-gfx/eog-${PV}
+	>=media-video/totem-${PV}
+	>=net-im/empathy-${PV}
+	>=x11-terms/gnome-terminal-${PV}
+
+	>=gnome-extra/gnome-user-docs-${PV}
+	>=gnome-extra/yelp-${PV}
+
+	>=x11-themes/gtk-engines-2.20.2:2
+	>=x11-themes/gnome-icon-theme-${PV}
+	>=x11-themes/gnome-icon-theme-symbolic-${PV}
+	>=x11-themes/gnome-themes-standard-${PV}
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} )
+	cdr? ( >=app-cdr/brasero-${PV} )
+"
+DEPEND=""
+S=${WORKDIR}

diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild
new file mode 100644
index 0000000..f6207c9
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+DESCRIPTION="Meta package for the core libraries of GNOME 3"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="as-is"
+SLOT="3.0"
+IUSE="cups"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# Note to developers:
+# This is a wrapper for the core libraries used by GNOME 3
+RDEPEND="
+	>=dev-libs/glib-2.28.4:2
+	>=x11-libs/gdk-pixbuf-2.23.2:2
+	>=x11-libs/pango-1.28.3
+	>=media-libs/clutter-1.6.10:1.0
+	>=x11-libs/gtk+-3.0.8:3[cups?]
+	>=dev-libs/atk-1.33.6
+	>=x11-libs/libwnck-${PV}:3
+	>=gnome-base/librsvg-2.32.1[gtk]
+	>=gnome-base/gnome-desktop-${PV}:3
+	>=gnome-base/libgnomekbd-${PV}
+	>=x11-libs/startup-notification-0.10
+
+	>=gnome-base/gvfs-1.8
+	>=gnome-base/dconf-0.7.3
+
+	>=media-libs/gstreamer-0.10.32:0.10
+	>=media-libs/gst-plugins-base-0.10.32:0.10
+	>=media-libs/gst-plugins-good-0.10.23:0.10
+"
+DEPEND=""
+S=${WORKDIR}

diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild
new file mode 100644
index 0000000..b285a87
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+DESCRIPTION="Meta package for the applications of GNOME 3"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="as-is"
+SLOT="3.0"
+IUSE=""
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# Note to developers:
+# This is a wrapper for the extra apps integrated with GNOME 3
+# New package
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}
+
+	>=app-arch/file-roller-${PV}
+	>=gnome-extra/bug-buddy-2.32.0:2
+	>=gnome-extra/gcalctool-6.0.0
+	>=gnome-extra/gconf-editor-${PV}
+	>=gnome-extra/gnome-games-${PV}
+	>=gnome-extra/gnome-system-monitor-${PV}
+	>=gnome-extra/gnome-tweak-tool-${PV}
+	>=gnome-extra/gnome-utils-${PV}
+	>=gnome-extra/gucharmap-${PV}
+	>=mail-client/evolution-${PV}
+	>=media-gfx/shotwell-0.8.1
+	>=media-sound/sound-juicer-2.99
+	>=media-video/cheese-${PV}
+	>=net-analyzer/gnome-nettool-${PV}
+	>=net-misc/vinagre-${PV}
+	>=net-misc/vino-${PV}
+	>=www-client/epiphany-${PV}
+"
+DEPEND=""
+S=${WORKDIR}

diff --git a/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild b/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild
new file mode 100644
index 0000000..3dc8a2c
--- /dev/null
+++ b/gnome-base/gnome-fallback/gnome-fallback-3.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+DESCRIPTION="Meta package for GNOME 3 fallback mode"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="as-is"
+SLOT="3.0"
+IUSE="+bluetooth cups +cdr"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# Note to developers:
+# This is a wrapper for the GNOME 3 fallback apps list
+RDEPEND="
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
+
+	>=x11-wm/metacity-2.34.0
+	>=gnome-base/gnome-panel-${PV}
+"
+DEPEND=""
+S=${WORKDIR}

diff --git a/gnome-base/gnome-light/gnome-light-3.0.0.ebuild b/gnome-base/gnome-light/gnome-light-3.0.0.ebuild
index 1b23b6d..dcbde38 100644
--- a/gnome-base/gnome-light/gnome-light-3.0.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.0.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1.ebuild,v 1.4 2011/02/24 18:58:57 tomka Exp $
 
-EAPI="3"
+EAPI="4"
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
 HOMEPAGE="http://www.gnome.org/"
 LICENSE="as-is"
 SLOT="2.0"
-IUSE="+automount"
+IUSE="cups +fallback"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
@@ -19,48 +19,27 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-l
 # This is a wrapper for the 'light' Gnome2 desktop,
 # This should only consist of the bare minimum of libs/apps needed
 # It is basically gnome-base/gnome without all extra apps
-#
-# metacity is still needed for fallback mode, that will change later
-# XXX: This list is incomplete!
 RDEPEND="!gnome-base/gnome
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
 
-	>=dev-libs/glib-2.28.4:2
-	>=media-libs/clutter-1.6.10:1.0
-	>=x11-libs/gtk+-3.0.8:3
-	>=x11-libs/gdk-pixbuf-2.23.2:2
-	>=dev-libs/atk-1.33.6
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/libwnck-${PV}:3
-	>=gnome-base/librsvg-2.32.1[gtk]
-
-	>=gnome-base/gnome-desktop-${PV}:3
-	>=gnome-base/gnome-settings-daemon-${PV}
-	>=gnome-base/gnome-control-center-${PV}
+	>=gnome-base/gnome-session-${PV}
+	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
+	>=gnome-base/gnome-control-center-${PV}[cups?]
 
 	>=gnome-base/nautilus-${PV}
 
-	>=gnome-base/gnome-session-${PV}
-	
 	>=x11-wm/mutter-${PV}
 	>=gnome-base/gnome-shell-${PV}
 
-	>=x11-wm/metacity-2.34.0
-	>=gnome-base/gnome-panel-${PV}
+	fallback? (
+		>=x11-wm/metacity-2.34.0
+		>=gnome-base/gnome-panel-${PV} )
 
 	>=x11-themes/gnome-icon-theme-${PV}
 	>=x11-themes/gnome-icon-theme-symbolic-${PV}
 	>=x11-themes/gnome-themes-standard-${PV}
 
 	>=x11-terms/gnome-terminal-${PV}
-
-	>=gnome-extra/yelp-${PV}"
+"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.7.2"
-# Automount is handled by gnome-settings-daemon now.
-# Double-check how it's done, and add deps if needed.
-
-# XXX: Uncomment when we have a gnome-base/gnome meta for GNOME 3
-#pkg_postinst () {
-#	elog "Use gnome-base/gnome for the full GNOME Desktop"
-#	elog "as released by the GNOME team."
-#}
+PDEPEND=">=gnome-base/gvfs-1.8.0"

diff --git a/gnome-base/gnome/gnome-3.0.0.ebuild b/gnome-base/gnome/gnome-3.0.0.ebuild
index 23cc860..12a33c4 100644
--- a/gnome-base/gnome/gnome-3.0.0.ebuild
+++ b/gnome-base/gnome/gnome-3.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1.ebuild,v 1.7 2011/03/11 18:47:45 pacho Exp $
+# $Header: $
 
-EAPI="3"
+EAPI="4"
 
-DESCRIPTION="Meta package for the GNOME desktop"
+DESCRIPTION="Meta package for GNOME 3"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="as-is"
@@ -14,86 +14,29 @@ SLOT="2.0"
 # double check none of the deps are still masked !
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="cdr cups dvdr" # accessibility
+IUSE="+cdr cups +extras +fallback" # accessibility
 
 S=${WORKDIR}
 
 # TODO: check a11y and re-enable USE-flag
+# GDM-3.0 integrates very nicely with GNOME Shell
 RDEPEND="
-	>=dev-libs/glib-2.28.4:2
-	>=media-libs/clutter-1.6.10:1.0
-	>=x11-libs/gtk+-3.0.8:3[cups?]
-	>=x11-libs/gdk-pixbuf-2.23.2:2
-	>=dev-libs/atk-1.33.6
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/libwnck-${PV}:3
-	>=gnome-base/librsvg-2.32.1[gtk]
-	>=gnome-base/gnome-desktop-${PV}:3
-	>=gnome-base/libgnomekbd-${PV}
-	>=x11-libs/startup-notification-0.10
-
-	>=media-libs/gstreamer-0.10.32:0.10
-	>=media-libs/gst-plugins-base-0.10.32:0.10
-	>=media-libs/gst-plugins-good-0.10.23:0.10
+	>=gnome-base/gnome-core-libs-${PV}[cups?]
+	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth,cdr?]
+	>=gnome-base/gnome-extra-apps-${PV}
 
 	>=gnome-base/gdm-${PV}
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-extra/bug-buddy-2.32.0:2
 
 	>=x11-wm/mutter-${PV}
 	>=gnome-base/gnome-shell-${PV}
 
-	>=x11-wm/metacity-2.34
-	>=gnome-base/gnome-panel-${PV}
-	>=gnome-base/gnome-menus-${PV}
-
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-	>=gnome-extra/gnome-screensaver-${PV}
-	>=gnome-extra/gnome-power-manager-${PV}
-	>=gnome-base/gnome-keyring-${PV}
-	>=gnome-base/libgnome-keyring-${PV}
-
-	>=gnome-base/gvfs-1.8
-	>=gnome-base/nautilus-${PV}
-
-	>=app-arch/file-roller-${PV}
-	>=app-crypt/seahorse-${PV}
-	>=app-editors/gedit-${PV}
-	>=app-text/evince-${PV}
-	>=gnome-extra/gcalctool-6.0.0
-	>=gnome-extra/gconf-editor-${PV}
-	>=gnome-extra/gnome-games-${PV}
-	>=gnome-extra/gnome-system-monitor-${PV}
-	>=gnome-extra/gnome-utils-${PV}
-	>=gnome-extra/gucharmap-${PV}
-	>=media-gfx/eog-${PV}
-	>=media-sound/sound-juicer-2.99
-	>=media-video/cheese-${PV}
-	>=media-video/totem-${PV}
-	>=net-analyzer/gnome-nettool-${PV}
-	>=net-misc/vinagre-${PV}
-	>=net-misc/vino-${PV}
-	>=www-client/epiphany-${PV}
-	>=x11-terms/gnome-terminal-${PV}
-
-	>=mail-client/evolution-${PV}
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=x11-themes/gtk-engines-2.20.2:2
 	>=x11-themes/gnome-backgrounds-${PV}
-	>=x11-themes/gnome-icon-theme-${PV}
-	>=x11-themes/gnome-icon-theme-symbolic-${PV}
-	>=x11-themes/gnome-themes-standard-${PV}
+	>=x11-themes/gnome-icon-theme-extras-${PV}
+	x11-themes/sound-theme-freedesktop
 
-	>=gnome-extra/gnome-user-docs-${PV}
-	>=gnome-extra/yelp-${PV}
-	>=gnome-extra/zenity-${PV}
-
-	cdr? ( >=app-cdr/brasero-${PV} )
-	dvdr? ( >=app-cdr/brasero-${PV} )"
+	fallback? ( >=gnome-base/gnome-fallback-${PV} )"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.6[gdu]"
+PDEPEND=">=gnome-base/gvfs-1.8.0[gdu]"
 # Broken from assumptions of gnome-vfs headers being included in nautilus headers,
 # which isn't the case with nautilus-2.22, bug #216019
 #	>=app-admin/gnome-system-tools-2.32.0
@@ -135,17 +78,19 @@ PDEPEND=">=gnome-base/gvfs-1.6.6[gdu]"
 #   gtk-doc
 #   gnome-doc-utils
 
-pkg_postinst() {
+#pkg_postinst() {
 # gnome-wm is gone, session files are now used by gnome-session to decide which
 # windowmanager etc to use. Need to document this
-
-	elog "The main file alteration monitoring functionality is"
-	elog "provided by >=glib-2.16. Note that on a modern Linux system"
-	elog "you do not need the USE=fam flag on it if you have inotify"
-	elog "support in your linux kernel ( >=2.6.13 ) enabled."
-	elog "USE=fam on glib is however useful for other situations,"
-	elog "such as Gentoo/FreeBSD systems. A global USE=fam can also"
-	elog "be useful for other packages that do not use the new file"
-	elog "monitoring API yet that the new glib provides."
-	elog
-}
+#
+# FIXME: Is this still relevant?
+#
+#	elog "The main file alteration monitoring functionality is"
+#	elog "provided by >=glib-2.16. Note that on a modern Linux system"
+#	elog "you do not need the USE=fam flag on it if you have inotify"
+#	elog "support in your linux kernel ( >=2.6.13 ) enabled."
+#	elog "USE=fam on glib is however useful for other situations,"
+#	elog "such as Gentoo/FreeBSD systems. A global USE=fam can also"
+#	elog "be useful for other packages that do not use the new file"
+#	elog "monitoring API yet that the new glib provides."
+#	elog
+#}

diff --git a/status/portage-configs/package.keywords.gnome3 b/status/portage-configs/package.keywords.gnome3
index d5d11ce..24a8810 100644
--- a/status/portage-configs/package.keywords.gnome3
+++ b/status/portage-configs/package.keywords.gnome3
@@ -1,8 +1,11 @@
 ###################
 ## START GNOME 3 ##
 ###################
-gnome-base/gnome-light
 gnome-base/gnome
+gnome-base/gnome-fallback
+gnome-base/gnome-extra-apps
+gnome-base/gnome-core-apps
+gnome-base/gnome-core-libs
 
 # Core
 app-accessibility/orca
@@ -168,6 +171,7 @@ gnome-base/nautilus
 
 # GNOME Shell
 gnome-base/gnome-shell
+net-libs/xulrunner
 net-im/telepathy-logger
 >=net-libs/telepathy-glib-0.13.12