Add new version for Gnome 2.30

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

15 files changed, 557 insertions, 6 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index 9c5266d9f69d..c07f0c27d460 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.132 2010/06/04 21:02:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.133 2010/06/13 21:38:32 pacho Exp $
+
+*deskbar-applet-2.30.1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +deskbar-applet-2.30.1.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org>
   deskbar-applet-2.28.0.ebuild:
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.30.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.30.1.ebuild
new file mode 100644
index 000000000000..e20da3bd1a70
--- /dev/null
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.30.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.30.1.ebuild,v 1.1 2010/06/13 21:38:32 pacho Exp $
+
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="An Omnipresent Versatile Search Interface"
+HOMEPAGE="http://raphael.slinckx.net/deskbar/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="eds spell test"
+
+RDEPEND=">=dev-lang/python-2.4
+	>=x11-libs/gtk+-2.20
+	>=gnome-base/gnome-desktop-2.10
+	>=gnome-base/gconf-2
+
+	>=dev-python/pygtk-2.12
+	>=dev-python/pygobject-2.15.3
+	>=dev-python/dbus-python-0.80.2
+
+	>=dev-python/gconf-python-2.22.1
+	>=dev-python/libgnome-python-2.22.1
+	>=dev-python/gnome-applets-python-2.22.0
+	>=dev-python/gnome-desktop-python-2.22.0
+	>=dev-python/gnome-keyring-python-2.22.0
+	>=dev-python/libwnck-python-2.22.0
+
+	eds? ( >=gnome-extra/evolution-data-server-1.7.92 )
+	spell? ( >=gnome-extra/gnome-utils-2.16.2 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	dev-util/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.2 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable eds evolution)
+		--exec-prefix=/usr
+		--disable-scrollkeeper"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_compile() {
+	# Needed for import gnomedesktop in configure, bug #270524
+	addpredict "$(unset HOME; echo ~)/.gnome2"
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize $(python_get_sitedir)/deskbar
+	python_mod_optimize /usr/libexec/deskbar-applet/deskbar-applet
+	python_mod_optimize /usr/libexec/deskbar-applet/modules-2.20-compatible
+
+	ebeep 5
+	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
+	ewarn "gnome-extra/gnome-utils.  If it is not present, the dictionary "
+	ewarn "plugin will fail silently."
+	epause 5
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/libexec/python*/site-packages/deskbar
+	python_mod_cleanup /usr/libexec/deskbar-applet/modules-2.20-compatible
+}
diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index 72d7b7a63889..0b299fcf6e8a 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.114 2010/06/04 21:01:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.115 2010/06/13 21:41:06 pacho Exp $
+
+*evolution-exchange-2.30.1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +evolution-exchange-2.30.1.ebuild,
+  +files/evolution-exchange-2.30.1-fix-warnings.patch,
+  +files/evolution-exchange-2.30.1-ldap-flags.patch,
+  +files/evolution-exchange-2.30.1-message-source.patch,
+  +files/evolution-exchange-2.30.1-windows-mobile.patch:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org>
   evolution-exchange-2.28.3.ebuild:
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.30.1.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.30.1.ebuild
new file mode 100644
index 000000000000..205afbffdbdb
--- /dev/null
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.30.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.30.1.ebuild,v 1.1 2010/06/13 21:41:06 pacho Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
+HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
+LICENSE="GPL-2"
+
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug doc static"
+
+RDEPEND="
+	>=mail-client/evolution-${PV}
+	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
+	>=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gconf-2.0
+	>=gnome-base/libbonobo-2.20.3
+	>=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.0
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	>=net-nds/openldap-2.1.30-r2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-openldap
+		--disable-static
+		$(use_with debug e2k-debug)
+		$(use_with static static-ldap)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Add LDAP build flags to the EPlugin.
+	epatch "${FILESDIR}/${P}-ldap-flags.patch"
+
+	# bgo#403903:Appointments don't display in Windows Mobile 5
+	epatch "${FILESDIR}/${P}-windows-mobile.patch"
+
+	# bgo#616913: Unnecessary check producing false critical warnings
+	epatch "${FILESDIR}/${P}-fix-warnings.patch"
+
+	# bgo#617510: Displays source of a message sent by RoadSync 5
+	epatch "${FILESDIR}/${P}-message-source.patch"
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-fix-warnings.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-fix-warnings.patch
new file mode 100644
index 000000000000..74a127c97c5e
--- /dev/null
+++ b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-fix-warnings.patch
@@ -0,0 +1,21 @@
+From ed3fb164eb20364498d8a619671328c024068bfe Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Fri, 30 Apr 2010 14:24:45 +0000
+Subject: Bug #616913 - Unnecessary check producing false critical warnings
+
+---
+diff --git a/tools/exchange-share-config-listener.c b/tools/exchange-share-config-listener.c
+index 8d8bc66..3dc1ae1 100644
+--- a/tools/exchange-share-config-listener.c
++++ b/tools/exchange-share-config-listener.c
+@@ -736,8 +736,6 @@ exchange_share_config_listener_get_account_for_uri (ExchangeShareConfigListener
+ 	GSList *accounts, *a;
+ 	ExchangeAccount *res = NULL;
+ 
+-	g_return_val_if_fail (uri != NULL, NULL);
+-
+ 	if (!excl)
+ 		excl = exchange_share_config_listener_get_global ();
+ 
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-ldap-flags.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-ldap-flags.patch
new file mode 100644
index 000000000000..0c7f7c804c7b
--- /dev/null
+++ b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-ldap-flags.patch
@@ -0,0 +1,30 @@
+From 5f4159f4050fdc84753a342fa2fb6c1f9e47dc51 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Wed, 28 Apr 2010 12:49:46 +0000
+Subject: Add LDAP build flags to the EPlugin.
+
+---
+diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
+index 4f710d7..b256dd5 100644
+--- a/eplugin/Makefile.am
++++ b/eplugin/Makefile.am
+@@ -27,7 +27,8 @@ liborg_gnome_exchange_operations_la_CPPFLAGS = \
+ 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
+ 	$(EVOLUTION_PLUGIN_CFLAGS) \
+ 	$(EVOLUTION_SHELL_CFLAGS) \
+-	$(EVOLUTION_MAIL_CFLAGS)
++	$(EVOLUTION_MAIL_CFLAGS) \
++	$(LDAP_CFLAGS)
+ 
+ 
+ liborg_gnome_exchange_operations_la_SOURCES = \
+@@ -65,6 +66,7 @@ liborg_gnome_exchange_operations_la_LIBADD = \
+ 	$(EVOLUTION_SHELL_LIBS) \
+ 	$(EVOLUTION_MAIL_LIBS) \
+ 	$(PTHREAD_LIB) \
++	$(LDAP_LIBS) \
+ 	$(DNS_LIBS)
+ 
+ liborg_gnome_exchange_operations_la_LDFLAGS = \
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-message-source.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-message-source.patch
new file mode 100644
index 000000000000..55b8c07303c7
--- /dev/null
+++ b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-message-source.patch
@@ -0,0 +1,35 @@
+From c81811577adc7003b6917e9b22c8a9cdd769fc24 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 10 May 2010 12:23:03 +0000
+Subject: Bug #617510 - Displays source of a message sent by RoadSync 5
+
+---
+diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
+index c45243a..abbad0b 100644
+--- a/camel/camel-exchange-folder.c
++++ b/camel/camel-exchange-folder.c
+@@ -423,6 +423,22 @@ get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
+ 	if (!ba)
+ 		return NULL;
+ 
++	while ((ba->len > 10 && g_str_has_prefix ((const gchar *)ba->data, "MAIL FROM:")) ||
++	       (ba->len >  8 && g_str_has_prefix ((const gchar *)ba->data, "RCPT TO:")) ||
++	       (ba->len >  2 && (ba->data[0] == '\n' || ba->data[1] == '\n'))) {
++		guint i;
++
++		i = 0;
++		while (i < ba->len && ba->data[i] != '\n')
++			i++;
++
++		if (i < ba->len)
++			g_byte_array_remove_range (ba, 0, i + 1);
++		else
++			break;
++	}
++
++
+ 	stream = camel_stream_mem_new_with_byte_array (ba);
+ 
+ 	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-windows-mobile.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-windows-mobile.patch
new file mode 100644
index 000000000000..ee11e5df5fc1
--- /dev/null
+++ b/gnome-extra/evolution-exchange/files/evolution-exchange-2.30.1-windows-mobile.patch
@@ -0,0 +1,38 @@
+From 2ecc00b0c4ba504d67549977e21509ddf53c5ac8 Mon Sep 17 00:00:00 2001
+From: Peter <peter@petesbox.net>
+Date: Thu, 29 Apr 2010 19:08:49 +0000
+Subject: Bug #403903 - Appointments don't display in Windows Mobile 5
+
+---
+diff --git a/calendar/e-cal-backend-exchange-calendar.c b/calendar/e-cal-backend-exchange-calendar.c
+index e17f495..8a84afa 100644
+--- a/calendar/e-cal-backend-exchange-calendar.c
++++ b/calendar/e-cal-backend-exchange-calendar.c
+@@ -748,6 +748,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal,
+ 	E2kContext *e2kctx;
+ 	struct _cb_data *cbdata;
+ 	gboolean send_options;
++	ECalComponentClassification classif;
+ 
+ 	d(printf ("ecbexc_create_object(%p, %p, %s, %s)", backend, cal, *calobj ? *calobj : NULL, *uid ? *uid : NULL));
+ 
+@@ -836,6 +837,17 @@ create_object (ECalBackendSync *backend, EDataCal *cal,
+ 	cbdata->vcal_comp = e_cal_util_new_top_level ();
+ 	cbdata->cal = cal;
+ 
++	/* Though OWA produces "CLASS:" (which we map to
++	 * "CLASS:PUBLIC" above), it will accept "CLASS:PUBLIC".
++	 * However, some other exchange clients, notably Windows
++	 * Mobile Outlook, don't work unless we map "CLASS:PUBLIC"
++	 * back to "CLASS:". For details, see
++	 * https://bugzilla.gnome.org/show_bug.cgi?id=403903#c23
++	 */
++	e_cal_component_get_classification (comp, &classif);
++	if (classif == E_CAL_COMPONENT_CLASS_PUBLIC)
++		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_NONE);
++
+ 	/* Remove X parameters from properties */
+ 	/* This is specifically for X-EVOLUTION-END-DATE,
+ 	   but removing anything else is probably ok too */
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog
index 065b7cd5b894..c9b60292acb3 100644
--- a/gnome-extra/gconf-editor/ChangeLog
+++ b/gnome-extra/gconf-editor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gconf-editor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.155 2010/06/04 20:22:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.156 2010/06/13 21:43:42 pacho Exp $
+
+*gconf-editor-2.30.0 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gconf-editor-2.30.0.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gconf-editor-2.28.0.ebuild:
   x86 stable, bug #314899
diff --git a/gnome-extra/gconf-editor/gconf-editor-2.30.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.30.0.ebuild
new file mode 100644
index 000000000000..3f902005352d
--- /dev/null
+++ b/gnome-extra/gconf-editor/gconf-editor-2.30.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.30.0.ebuild,v 1.1 2010/06/13 21:43:42 pacho Exp $
+
+EAPI="2"
+
+inherit gnome2
+
+DESCRIPTION="An editor to the GNOME 2 config system"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=x11-libs/gtk+-2.20
+	>=gnome-base/gconf-2.12.0"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	sys-devel/gettext
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-scrollkeeper"
+}
diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 2a3f4f6d0d5d..a796b9532938 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.285 2010/06/04 20:38:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.286 2010/06/13 21:47:18 pacho Exp $
+
+*gnome-games-2.30.1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gnome-games-2.30.1.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gnome-games-2.28.2.ebuild:
   x86 stable, bug #314899
diff --git a/gnome-extra/gnome-games/gnome-games-2.30.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.30.1.ebuild
new file mode 100644
index 000000000000..7d1054715e8f
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-2.30.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.30.1.ebuild,v 1.1 2010/06/13 21:47:18 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.11"
+
+# make sure games is inherited first so that the gnome2
+# functions will be called if they are not overridden
+inherit games games-ggz eutils gnome2 python virtualx
+
+DESCRIPTION="Collection of games for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/GnomeGames/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="artworkextra guile opengl sound test" # introspection
+
+# Introspection support needs
+#	media-libs/clutter
+#	>=dev-libs/gobject-introspection 0.6.3
+# and generates GnomeGames...gir
+RDEPEND="
+	>=dev-games/libggz-0.0.14
+	>=dev-games/ggz-client-libs-0.0.14
+	>=dev-libs/dbus-glib-0.75
+	>=dev-libs/glib-2.6.3
+	>=dev-libs/libxml2-2.4.0
+	>=dev-python/gconf-python-2.17.3
+	>=dev-python/pygobject-2
+	>=dev-python/pygtk-2.14
+	>=dev-python/pycairo-1
+	>=gnome-base/gconf-2
+	>=gnome-base/librsvg-2.14
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-2.16
+	x11-libs/libSM
+
+	sound? ( media-libs/libcanberra[gtk] )
+	guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] )
+	artworkextra? ( gnome-extra/gnome-games-extra-data )
+	opengl? (
+		dev-python/pygtkglext
+		>=dev-python/pyopengl-3 )
+	!games-board/glchess"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.53
+	>=dev-util/pkgconfig-0.15
+	>=dev-util/intltool-0.40.4
+	>=sys-devel/gettext-0.10.40
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/scrollkeeper-0.3.8
+	>=app-text/gnome-doc-utils-0.10
+	test? ( >=dev-libs/check-0.9.4 )"
+
+# Others are installed below; multiples in this package.
+DOCS="AUTHORS HACKING MAINTAINERS TODO"
+
+# dang make-check fails on docs with -j > 1.  Restrict them for the moment until
+# it can be chased down.
+RESTRICT="test"
+
+_omitgame() {
+	G2CONF="${G2CONF},${1}"
+}
+
+pkg_setup() {
+	# create the games user / group
+	games_pkg_setup
+
+	# Needs "seed", which needs gobject-introspection, libffi, etc.
+	#$(use_enable clutter)
+	#$(use_enable clutter staging)
+	#$(use_enable introspection)
+	G2CONF="${G2CONF}
+		$(use_enable sound)
+		--disable-introspection
+		--disable-card-themes-installer
+		--with-scores-group=${GAMES_GROUP}
+		--with-platform=gnome
+		--with-card-theme-formats=all
+		--with-smclient
+		--enable-omitgames=none" # This line should be last for _omitgame
+
+	# Needs clutter, always disable till we can have that
+	#if ! use clutter; then
+		_omitgame quadrapassel
+		_omitgame lightsoff
+		_omitgame swell-foop
+		_omitgame gnibbles
+	#fi
+
+	if ! use guile; then
+		ewarn "USE='-guile' implies that Aisleriot won't be installed"
+		_omitgame aisleriot
+	fi
+
+	if ! use opengl; then
+		ewarn "USE=-opengl implies that glchess won't be installed"
+		_omitgame glchess
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# Fix bug #281718 -- *** glibc detected *** gtali: free(): invalid pointer
+	epatch "${FILESDIR}/${PN}-2.26.3-gtali-invalid-pointer.patch"
+}
+
+src_test() {
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Documentation install for each of the games
+	for game in \
+	$(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
+		docinto ${game}
+		for doc in AUTHORS ChangeLog NEWS README TODO; do
+			[ -s ${game}/${doc} ] && dodoc ${game}/${doc}
+		done
+	done
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	# Avoid overwriting previous .scores files
+	local basefile
+	for scorefile in "${D}"/var/lib/games/*.scores; do
+		basefile=$(basename $scorefile)
+		if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then
+			cp "${ROOT}/var/lib/games/${basefile}" \
+			"${D}/var/lib/games/${basefile}"
+		fi
+	done
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	games-ggz_update_modules
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize $(python_get_sitedir)/gnome_sudoku
+	if use opengl; then
+		python_mod_optimize $(python_get_sitedir)/glchess
+	fi
+}
+
+pkg_postrm() {
+	games-ggz_update_modules
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{gnome_sudoku,glchess}
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/glchess
+}
diff --git a/gnome-extra/gnome-games/metadata.xml b/gnome-extra/gnome-games/metadata.xml
index 1a190ebb7989..96420426707e 100644
--- a/gnome-extra/gnome-games/metadata.xml
+++ b/gnome-extra/gnome-games/metadata.xml
@@ -4,5 +4,6 @@
 <herd>gnome</herd>
 <use>
 	<flag name='artworkextra'>Installs extra artwork for various games</flag>
+	<flag name='sound'>Enable sound using libcanberra</flag>
 </use>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index bd32ef4f0dbf..200ee3077ed0 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-user-share
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.5 2009/12/23 23:18:46 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.6 2010/06/13 21:49:09 pacho Exp $
+
+*gnome-user-share-2.30.0 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +gnome-user-share-2.30.0.ebuild:
+  Add new version for Gnome 2.30.
 
 *gnome-user-share-2.28.2 (23 Dec 2009)
 
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild
new file mode 100644
index 000000000000..88e59c0d926f
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild,v 1.1 2010/06/13 21:49:09 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Personal file sharing for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# FIXME: could libnotify be made optional ?
+#        is consolekit needed or not ?
+# FIXME: gnome-bluetooth is a hard-dep
+# bluetooth is pure runtime dep (dbus)
+RDEPEND=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.14
+	>=app-mobilephone/obex-data-server-0.4
+	>=dev-libs/dbus-glib-0.70
+	dev-libs/libunique
+	>=gnome-base/gconf-2.10
+	media-libs/libcanberra[gtk]
+	>=net-wireless/gnome-bluetooth-2.27.7.2:2
+	>=net-wireless/bluez-4.18
+	>=sys-apps/dbus-1.1.1
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.17
+	app-text/gnome-doc-utils
+	app-text/docbook-xml-dtd:4.1.2"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-httpd=apache2
+		--with-modules-path=/usr/lib/apache2/modules/"
+}