Force people to use a gtk+-3 fixed version for getting proper fallback theming instead of relying on workarounds.

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

4 files changed, 294 insertions, 4 deletions

diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index fa5771d611c0..ac6909516578 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-light
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.150 2011/12/06 19:06:33 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.151 2012/03/25 09:12:20 pacho Exp $
+
+*gnome-light-2.32.1-r2 (25 Mar 2012)
+
+  25 Mar 2012; Pacho Ramos <pacho@gentoo.org> +gnome-light-2.32.1-r2.ebuild:
+  Force people to use a gtk+-3 fixed version for getting proper fallback theming
+  instead of relying on workarounds.
 
   06 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-light-3.2.1.ebuild:
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
new file mode 100644
index 000000000000..3c96ab7fa7e6
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# 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-r2.ebuild,v 1.1 2012/03/25 09:12:20 pacho Exp $
+
+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"
+
+# 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 'light' Gnome2 desktop,
+#  This should only consist of the bare minimum of libs/apps needed
+#  It is basicly the gnome-base/gnome without all extra apps
+
+#  This is currently in it's test phase, if you feel like some dep
+#  should be added or removed from this pack file a bug to
+#  gnome@gentoo.org on bugs.gentoo.org
+
+#	>=media-gfx/eog-2.30.2
+
+RDEPEND="!<x11-libs/gtk+-3.2.4-r1
+	!gnome-base/gnome
+
+	>=dev-libs/glib-2.26.1:2
+	>=x11-libs/gtk+-2.22.1-r1:2
+	>=x11-libs/gdk-pixbuf-2.22.1:2
+	>=dev-libs/atk-1.32.0
+	>=x11-libs/pango-1.28.3
+
+	>=gnome-base/orbit-2.14.19:2
+
+	>=x11-libs/libwnck-2.30.6:1
+	>=x11-wm/metacity-2.30.3
+
+	>=gnome-base/gconf-2.32.0-r1:2
+	>=gnome-base/dconf-0.5.1-r2
+
+	>=gnome-base/libbonobo-2.24.3
+	>=gnome-base/libbonoboui-2.24.4
+	>=gnome-base/libgnome-2.32.0
+	>=gnome-base/libgnomecanvas-2.30.2
+	>=gnome-base/libglade-2.6.4:2.0
+
+	>=gnome-base/gnome-settings-daemon-2.32.1
+	>=gnome-base/gnome-control-center-2.32.0
+
+	>=gnome-base/nautilus-2.32.1
+
+	>=gnome-base/gnome-desktop-2.32.1:2
+	>=gnome-base/gnome-session-2.32.1
+	>=gnome-base/gnome-panel-2.32.1
+
+	>=x11-themes/gnome-icon-theme-2.31.0
+	>=x11-themes/gnome-themes-2.32.1-r1
+	>=x11-themes/gnome-themes-standard-3.0.2
+
+	>=x11-terms/gnome-terminal-2.32.1
+
+	>=gnome-base/librsvg-2.32.1:2
+
+	>=gnome-extra/yelp-2.30.2"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.6.6
+	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
+
+pkg_postinst () {
+# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
+# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost
+# FIXME: support for it, but we don't ship with gnome-session-2.24 yet
+#	elog "Note that to change windowmanager to metacity do: "
+#	elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
+#	elog "of course this works for all other window managers as well"
+#	elog
+
+	elog
+	elog "Use gnome-base/gnome for the full GNOME Desktop"
+	elog "as released by the GNOME team."
+}
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 5d50210c4927..39247170edc9 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.430 2011/12/07 07:36:52 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.431 2012/03/25 09:16:09 pacho Exp $
+
+*gnome-2.32.1-r2 (25 Mar 2012)
+
+  25 Mar 2012; Pacho Ramos <pacho@gentoo.org> +gnome-2.32.1-r2.ebuild:
+  Force people to use a gtk+-3 fixed version for getting proper fallback theming
+  instead of relying on workarounds.
 
   07 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-2.32.1-r1.ebuild:
diff --git a/gnome-base/gnome/gnome-2.32.1-r2.ebuild b/gnome-base/gnome/gnome-2.32.1-r2.ebuild
new file mode 100644
index 000000000000..e7c441539a25
--- /dev/null
+++ b/gnome-base/gnome/gnome-2.32.1-r2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/03/25 09:16:09 pacho Exp $
+
+EAPI="4"
+
+DESCRIPTION="Meta package for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="as-is"
+SLOT="2.0"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="accessibility cdr cups dvdr ldap mono policykit"
+
+S=${WORKDIR}
+
+# FIXME: bump gstreamer to 0.10.26
+# XXX: lower gdm to 2.20 since we still keep 2.28 masked
+# Lower epiphany to 2.26 since 2.28 is not ready to go stable
+RDEPEND="!<x11-libs/gtk+-3.2.4-r1
+	>=dev-libs/glib-2.26.1:2
+	>=x11-libs/gtk+-2.22.1-r1:2
+	>=x11-libs/gdk-pixbuf-2.22.1:2
+	>=dev-libs/atk-1.32.0
+	>=x11-libs/pango-1.28.3
+
+	>=dev-libs/libxml2-2.7.2:2
+	>=dev-libs/libxslt-1.1.22
+
+	>=media-libs/audiofile-0.2.7
+	>=x11-libs/libxklavier-5.0
+	>=media-libs/libart_lgpl-2.3.21
+
+	>=dev-libs/libIDL-0.8.14
+	>=gnome-base/orbit-2.14.19:2
+
+	>=x11-libs/libwnck-2.30.6:1
+	>=x11-wm/metacity-2.30.3
+
+	>=gnome-base/gnome-keyring-2.32.1
+	>=gnome-base/libgnome-keyring-2.32.0
+	>=app-crypt/seahorse-2.32.0
+
+	>=gnome-base/gconf-2.32.0-r1:2
+	>=net-libs/libsoup-2.32.1:2.4
+	>=gnome-base/dconf-0.5.1-r2
+
+	>=gnome-base/libbonobo-2.24.3
+	>=gnome-base/libbonoboui-2.24.4
+	>=gnome-base/libgnome-2.32.0
+	>=gnome-base/libgnomecanvas-2.30.2
+	>=gnome-base/libglade-2.6.4:2.0
+
+	>=gnome-extra/bug-buddy-2.32.0:2
+	>=gnome-base/libgnomekbd-2.32.0
+	>=gnome-base/gnome-settings-daemon-2.32.1
+	>=gnome-base/gnome-control-center-2.32.0:2
+
+	>=gnome-base/nautilus-2.32.1
+
+	>=media-libs/gstreamer-0.10.30.2:0.10
+	>=media-libs/gst-plugins-base-0.10.30.4:0.10
+	>=media-libs/gst-plugins-good-0.10.23:0.10
+	>=gnome-extra/gnome-media-2.32.0:2
+	<gnome-extra/gnome-media-2.91:2
+	>=media-sound/sound-juicer-2.32.0
+	>=dev-libs/totem-pl-parser-2.32.1
+	>=media-video/totem-2.32.0
+	>=media-video/cheese-2.32.0
+
+	>=media-gfx/eog-2.32.1:1
+
+	>=www-client/epiphany-2.30.6
+	>=app-arch/file-roller-2.32.1
+	>=gnome-extra/gcalctool-5.32.1
+
+	>=gnome-extra/gconf-editor-2.32.0
+	>=gnome-base/gdm-2.20.11
+	>=x11-libs/gtksourceview-2.10.5:2.0
+	>=app-editors/gedit-2.30.4
+
+	>=app-text/evince-2.32.0
+
+	>=gnome-base/gnome-desktop-2.32.1:2
+	>=gnome-base/gnome-session-2.32.1
+	>=dev-libs/libgweather-2.30.3:2
+	<dev-libs/libgweather-2.91:2
+	>=gnome-base/gnome-applets-2.32.0
+	>=gnome-base/gnome-panel-2.32.1
+	>=gnome-base/gnome-menus-2.30.5
+	>=x11-themes/gnome-icon-theme-2.31.0
+	>=x11-themes/gnome-themes-2.32.1-r1
+	>=x11-themes/gnome-themes-standard-3.0.2
+	>=gnome-extra/deskbar-applet-2.32.0
+	>=gnome-extra/hamster-applet-2.32.1
+
+	>=x11-themes/gtk-engines-2.20.2:2
+	>=x11-themes/gnome-backgrounds-2.32.0
+
+	>=x11-libs/vte-0.26.2:0
+	>=x11-terms/gnome-terminal-2.32.1
+
+	>=gnome-extra/gucharmap-2.32.1
+
+	>=gnome-extra/gnome-utils-2.32.0
+
+	>=gnome-extra/gnome-games-2.28.2
+	>=gnome-base/librsvg-2.32.1:2
+
+	>=gnome-extra/gnome-system-monitor-2.28.2
+	>=gnome-base/libgtop-2.28.2:2
+
+	>=x11-libs/startup-notification-0.10
+
+	>=gnome-extra/gnome-user-docs-2.32.0
+	>=gnome-extra/yelp-2.30.2
+	>=gnome-extra/zenity-2.32.1
+
+	>=net-analyzer/gnome-netstatus-2.28.2
+	>=net-analyzer/gnome-nettool-2.32.0
+
+	cdr? ( >=app-cdr/brasero-2.32.1 )
+	dvdr? ( >=app-cdr/brasero-2.32.1 )
+
+	>=gnome-extra/gtkhtml-3.32.1:3.14
+	>=mail-client/evolution-2.32.1-r1:2.0
+	>=gnome-extra/evolution-data-server-2.32.1-r1
+	>=gnome-extra/evolution-webcal-2.32.0
+
+	>=net-misc/vino-2.32.0
+
+	>=app-admin/pessulus-2.30.4
+	ldap? (	>=app-admin/sabayon-2.30.1 )
+
+	>=gnome-extra/gnome-screensaver-2.30.2
+	>=x11-misc/alacarte-0.13.2
+	>=gnome-extra/gnome-power-manager-2.32.0
+
+	>=net-misc/vinagre-2.30.3
+	>=gnome-extra/swfdec-gnome-2.30.1
+
+	accessibility? (
+		>=gnome-extra/libgail-gnome-1.20.3
+		>=gnome-extra/at-spi-1.32.0:1
+		>=app-accessibility/dasher-4.11
+		>=app-accessibility/gnome-mag-0.16.3:1
+		>=app-accessibility/gnome-speech-0.4.25:1
+		>=app-accessibility/gok-2.30.1:1
+		>=app-accessibility/orca-2.32.1
+		>=gnome-extra/mousetweaks-2.32.1 )
+	cups? ( >=app-admin/system-config-printer-gnome-1.3.3 )
+
+	mono? (
+		>=dev-dotnet/gtk-sharp-2.12.10:2
+		>=app-misc/tomboy-1.4.2 )
+	policykit? ( gnome-extra/polkit-gnome )"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.6.6[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
+#	>=app-admin/system-tools-backends-2.8
+
+# Development tools
+#   scrollkeeper
+#   pkgconfig
+#   intltool
+#   gtk-doc
+#   gnome-doc-utils
+
+pkg_postinst() {
+# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
+# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost
+# FIXME: support for it, but we don't ship with gnome-session-2.24 yet
+#	elog "Note that to change windowmanager to metacity do: "
+#	elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
+#	elog "of course this works for all other window managers as well"
+
+	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
+}