adicionando de todo

14 files changed, 617 insertions, 0 deletions

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
new file mode 100644
index 0000000..c98a578
--- /dev/null
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -0,0 +1,8 @@
+AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
+AUX e-d-s-camel-skip-failing-test.patch 660 RMD160 0907bb916a124d689f1880016eb8013971944016 SHA1 7ef6fd67bddbba16b3c6dd24a9b50ea9f8f5aa86 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5
+AUX evolution-data-server-1.8.0-camel-rewind.patch 499 RMD160 90b94f0b20a52a4fdf476bcfa5fe0ad2a064d488 SHA1 db7d42df20ab50d81835b9c1b9ebed84d1e0d8cb SHA256 1323e9dc957e3cc02fd1628fa21d448c8c985028e5b57d03596b6bde9ad66e0e
+AUX evolution-data-server-2.28.0-gentoo_etc_services.patch 1294 RMD160 058a86636b5b544c312f086f31902b38001484f1 SHA1 2e7fb34243ed00efdcec2fda3fc109856ca451ff SHA256 14a3954871868cbae15891cfcb87135fd82077628f7ad49290fb955aeb4f192a
+DIST evolution-data-server-2.30.1.tar.bz2 4636784 RMD160 fe3a2a2a7333a631fcfe81c1afee80b1acf77235 SHA1 18d2517234edc85309b7e86ec1e9b946d37227b6 SHA256 b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e
+DIST evolution-data-server-2.31.3.1.tar.bz2 4128233 RMD160 835b671f3edf40d3d07f37edbfcc1f73355b187d SHA1 5143e8d88567c17d21fd7d8672e03d42b58fb1e4 SHA256 1e21edddea949fea6605a458e09ca0a79f3fe572879b77da99f1216aa849146a
+EBUILD evolution-data-server-2.30.1.ebuild 2982 RMD160 e9f0b20f845537afb7dc84c0b3baea7890f5d155 SHA1 ee486864f659d5f1b37f271e84b45d170c8573b6 SHA256 0219afaa0f1b129df0428873ae0de014622611995b5f1869a5acefa3da62015c
+EBUILD evolution-data-server-2.31.3.1.ebuild 3176 RMD160 69562dea6d3a6a54ea2684c1a7dfcdf755856021 SHA1 e8e404420b06919aa2e67da3d46efe0c0043bb31 SHA256 15016456fe9bb162ccfed03d7e26ac6bee2de3f1b74207ac53a0ba50ba757ed1
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.30.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.30.1.ebuild
new file mode 100644
index 0000000..6e28ff9
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.30.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit db-use eutils flag-o-matic gnome2 versionator virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 BSD DB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc ipv6 kerberos gnome-keyring ldap nntp ssl"
+
+RDEPEND=">=dev-libs/glib-2.16.1
+	>=x11-libs/gtk+-2.18:2
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.3
+	>=dev-libs/libgweather-2.25.4
+	>=dev-libs/libical-0.43
+	>=dev-libs/dbus-glib-0.6
+	sys-devel/bison
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+	>=sys-libs/db-4
+	virtual/libiconv
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	sys-libs/zlib
+
+	ldap? ( >=net-nds/openldap-2.0 )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with kerberos krb5 /usr)
+		$(use_with ldap openldap)
+		$(use_enable gnome-keyring)
+		$(use_enable ipv6)
+		$(use_enable nntp)
+		$(use_enable ssl ssl)
+		$(use_enable ssl smime)
+		--with-weather
+		--enable-largefile
+		--with-libdb=/usr/$(get_libdir)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Adjust to gentoo's /etc/service
+	epatch "${FILESDIR}/${PN}-2.28.0-gentoo_etc_services.patch"
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch"
+
+	# GNOME bug 611353 (skips failing test atm)
+	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 3 failed"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "intltool rules fix failed"
+
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		MY_MAJORV=$(get_version_component_range 1-2)
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema || die "doins failed"
+		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	Xemake check || die "Tests failed."
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.31.3.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.31.3.1.ebuild
new file mode 100644
index 0000000..74db368
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.31.3.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.1-r1.ebuild,v 1.1 2010/06/13 19:03:53 pacho Exp $
+
+EAPI="2"
+
+inherit db-use eutils flag-o-matic gnome2 versionator virtualx autotools
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+
+LICENSE="LGPL-2 BSD DB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+IUSE="doc ipv6 kerberos gnome-keyring ldap nntp ssl"
+
+RDEPEND=">=dev-libs/glib-2.16.1
+	>=x11-libs/gtk+-2.20:2
+	>=gnome-base/gconf-2
+	>=dev-db/sqlite-3.5
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.3
+	>=dev-libs/libgweather-2.25.4
+	>=dev-libs/libical-0.43
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/libgdata-0.6.3
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+	>=sys-libs/db-4
+	virtual/libiconv
+	ssl? (
+		>=dev-libs/nspr-4.4
+		>=dev-libs/nss-3.9 )
+	sys-libs/zlib
+
+	ldap? ( >=net-nds/openldap-2.0 )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-2
+	>=dev-util/gtk-doc-am-1.9
+	sys-devel/bison
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+DOCS="ChangeLog MAINTAINERS NEWS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with kerberos krb5 /usr)
+		$(use_with ldap openldap)
+		$(use_enable gnome-keyring)
+		$(use_enable ipv6)
+		$(use_enable nntp)
+		$(use_enable ssl)
+		$(use_enable ssl smime)
+		--with-weather
+		--enable-largefile
+		--with-libdb=/usr/$(get_libdir)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Adjust to gentoo's /etc/service
+	epatch "${FILESDIR}/${PN}-2.28.0-gentoo_etc_services.patch"
+
+	# Rewind in camel-disco-diary to fix a crash
+	epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch"
+
+	# GNOME bug 611353 (skips failing test atm)
+	epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
+
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 3 failed"
+
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		MY_MAJORV=$(get_version_component_range 1-2)
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema || die "doins failed"
+		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	Xemake check || die "Tests failed."
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libedataserver-1.2.so.11
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use ldap; then
+		elog ""
+		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libedataserver-1.2.so.11
+}
diff --git a/gnome-extra/evolution-data-server/files/calentry.schema b/gnome-extra/evolution-data-server/files/calentry.schema
new file mode 100644
index 0000000..bc79da2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/calentry.schema
@@ -0,0 +1,108 @@
+# RFC2739 calEntry schema for OpenLDAP 2.x 
+
+#
+# From https://bugs.gentoo.org/show_bug.cgi?id=83988
+# Please notify us of updated revisions by submitting a bug report at bugs.gentoo.org
+#
+
+# Version of RFC 2739 schema translated by Terrelle Shaw 
+# (xytek@xytek.org) # Nov. 7, 2002 # Modifications by Peter Marschall
+# <peter.marschall@adpm.de> # Nov. 9, 2002
+
+# Notes:
+# * RFC2739 seems to be a bit sloppy about attribute type and
+#   objectclass definitions syntax and also about attribute syntax
+#   and matching rules.
+#   (It even counts the attributes in the calEntry objectclass wrong ;-)
+# * The following changes have been applied to correct the schema
+#   - added description to each attributetype definition
+#   - changed SYNTAX from 'IA5String' to corresponding OID
+#     to make matching rules and syntax consistent
+#   - replaced illegal keyword SUBSTRING by SUBSTR
+#   - changed SUBSTR from caseIgnoreIA5Match to caseIgnoreIA5SubstringsMatch
+#   - removed illegal keyword MULTI-VALUE
+#   - added keyword SINGLE-VALUE where appropriate
+#   - removed USAGE since cwuserApplications is the default 
+#   - added description to the objectclass defintion
+#   - corrected typo in objectclass definition
+#   - added the attributetypes defined but not used to the objectclass
+
+
+# 2.4.4.1 calCalURI
+attributetype ( 1.2.840.113556.1.4.478 
+	NAME 'calCalURI' 
+	DESC 'URI to a snapshot of the users entire default calendar'
+	EQUALITY caseIgnoreIA5Match 
+	SUBSTR caseIgnoreIA5SubstringsMatch 
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.2 calFBURL
+attributetype ( 1.2.840.113556.1.4.479
+	NAME 'calFBURL'
+	DESC 'URI to the users default free/busy time data'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.3 calCAPURI
+attributetype ( 1.2.840.113556.1.4.480
+	NAME 'calCAPURI'
+	DESC 'URI used to communicate with the users calendar'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.4 calCalAdrURI
+attributetype ( 1.2.840.113556.1.4.481
+	NAME 'calCalAdrURI'
+	DESC 'URI to which event requests should be sent for the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+# 2.4.4.5 calOtherCalURIs
+attributetype ( 1.2.840.113556.1.4.482
+	NAME 'calOtherCalURIs'
+	DESC 'URIs to snapshots of non-default calendars belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.6 calOtherFBURLs
+attributetype ( 1.2.840.113556.1.4.483
+	NAME 'calOtherFBURLs'
+	DESC 'URIs to non-default free/busy data belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.7 calOtherCAPURIs
+attributetype ( 1.2.840.113556.1.4.484
+	NAME 'calOtherCAPURIs'
+	DESC 'URIs to non-default calendars belonging to the user'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.8 calOtherCalAdrURIs
+attributetype ( 1.2.840.113556.1.4.485
+	NAME 'calOtherCalAdrURIs'
+	DESC 'URIs of destinations for event requests to non-default calendars'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.3.1 calEntry
+objectclass ( 1.2.840.113556.1.5.87
+	NAME 'calEntry'
+	DESC 'Calendering and free/busy information'
+	SUP top AUXILIARY
+	MAY ( calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
+		calOtherCAPURIs $ calOtherCalURIs $ calOtherFBURLs $ 
+		calOtherCalAdrURIs ) )
+
+# EOF
diff --git a/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch b/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch
new file mode 100644
index 0000000..3c07f09
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch
@@ -0,0 +1,22 @@
+We are currently skipping this test so we can pass make check
+Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=611353
+diff --git a/calendar/tests/ecal/test-ecal-get-free-busy.c b/calendar/tests/ecal/test-ecal-get-free-busy.c
+index 8ecdf7e..471d807 100644
+--- a/calendar/tests/ecal/test-ecal-get-free-busy.c
++++ b/calendar/tests/ecal/test-ecal-get-free-busy.c
+@@ -10,6 +10,7 @@
+ gint
+ main (gint argc, gchar **argv)
+ {
++#if 0
+ 	ECal *cal;
+ 	gchar *uri = NULL;
+         GList *users = NULL;
+@@ -34,6 +35,6 @@ main (gint argc, gchar **argv)
+ 
+ 	g_list_foreach (free_busy, (GFunc) g_object_unref, NULL);
+ 	g_list_free (free_busy);
+-
++#endif
+ 	return 0;
+ }
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch
new file mode 100644
index 0000000..c420759
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.0-camel-rewind.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN evolution-data-server-1.7.90.1.orig/camel/camel-disco-diary.c evolution-data-server-1.7.90.1/camel/camel-disco-diary.c
+--- evolution-data-server-1.7.90.1.orig/camel/camel-disco-diary.c	2006-02-16 04:36:28.000000000 -0500
++++ evolution-data-server-1.7.90.1/camel/camel-disco-diary.c	2006-08-01 22:55:43.000000000 -0400
+@@ -404,6 +404,7 @@
+ 
+ 	/* Truncate the log */
+ 	ftruncate (fileno (diary->file), 0);
++	rewind (diary->file);
+ }
+ 
+ CamelDiscoDiary *
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch
new file mode 100644
index 0000000..07eb146
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.28.0-gentoo_etc_services.patch
@@ -0,0 +1,39 @@
+From 02cc551defa9cb222216b4ae03a9e883a9abcb64 Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Mon, 28 Sep 2009 21:34:36 +0200
+Subject: [PATCH] Adjust imap+pop3 stuffs to gentoo services
+
+---
+ camel/providers/imap/camel-imap-store.c |    2 +-
+ camel/providers/pop3/camel-pop3-store.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
+index a5eb640..1574e79 100644
+--- a/camel/providers/imap/camel-imap-store.c
++++ b/camel/providers/imap/camel-imap-store.c
+@@ -959,7 +959,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
+ 		port = ssl_options[i].port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = (gchar *) "imap";
++		serv = (gchar *) "imap2";
+ 		port = IMAP_PORT;
+ 	}
+ 
+diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
+index 89be794..a79c06b 100644
+--- a/camel/providers/pop3/camel-pop3-store.c
++++ b/camel/providers/pop3/camel-pop3-store.c
+@@ -311,7 +311,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex)
+ 		port = ssl_options[i].port;
+ 	} else {
+ 		mode = MODE_CLEAR;
+-		serv = (gchar *) "pop3";
++		serv = (gchar *) "pop-3";
+ 		port = POP3S_PORT;
+ 	}
+ 
+-- 
+1.6.5.rc1
+
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
new file mode 100644
index 0000000..c3d55e0
--- /dev/null
+++ b/gnome-extra/gcalctool/Manifest
@@ -0,0 +1,2 @@
+DIST gcalctool-5.31.4.tar.bz2 1147774 RMD160 be2d013efef85d46574cdf4635848a8f3f59cc06 SHA1 d27de49a97c74dab43e52d7e4d13e317dfa19f97 SHA256 fffe98adb2db4b0b6ad31585e111e1a1a7ca6612996679cc3f1139f6bc4b7a83
+EBUILD gcalctool-5.31.4.ebuild 944 RMD160 2a4fa4f0ee124b3f0d7d69b8831d38d9cdeb9c69 SHA1 e3dc127025936624513abbc7fe039956d082ac15 SHA256 8c44d372bbba639a4f6320df82681fe0b15ef80ed8534ef483e6ee7a7e951aaf
diff --git a/gnome-extra/gcalctool/gcalctool-5.31.4.ebuild b/gnome-extra/gcalctool/gcalctool-5.31.4.ebuild
new file mode 100644
index 0000000..93020d6
--- /dev/null
+++ b/gnome-extra/gcalctool/gcalctool-5.31.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.30.1.ebuild,v 1.1 2010/06/13 19:48:21 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="http://calctool.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.18.0:2
+	>=dev-libs/glib-2.25.10
+	dev-libs/libxml2
+	!<gnome-extra/gnome-utils-2.3"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix bashisms
+	sed 's/\[\[\(.*\)\]\]/[\1]/g' -i configure.ac configure || die "sed failed"
+}
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
new file mode 100644
index 0000000..a97d5b9
--- /dev/null
+++ b/gnome-extra/gnome-media/Manifest
@@ -0,0 +1,3 @@
+AUX gnome-media-2.31.5-use-libunique-3.patch 649 RMD160 52dd87c1e9a442759e09e2af1484d47eda35de13 SHA1 9e0f8ce99dc76c0c12ffff7df55cbbac5cefdbcd SHA256 32f8eb98cf1d49677e610a49ae0f5d121d36dd9bc987d6bee2580b47b8a77bfe
+DIST gnome-media-2.31.5.tar.bz2 2752117 RMD160 e9fe2ed12c1526cbfcd0ee852f1d78b690052f4a SHA1 fd3d147de2e46aca993e0cd6f11814fd9e14940d SHA256 80ba1732ad3a0a1421c58f60d94884f770c3943e698d8e117f06cb484ad28374
+EBUILD gnome-media-2.31.5.ebuild 1994 RMD160 e232b1ac7db71b91cece18ccc60158c264ddb16e SHA1 0f3c52a42bc44a4c6a9cc4d9b1fe56248d2e731e SHA256 213fca710b0fef9bb1664f6b0ccfbfc0e97389a2f7bdc15bdc2af4af9aa6296c
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.31.5-use-libunique-3.patch b/gnome-extra/gnome-media/files/gnome-media-2.31.5-use-libunique-3.patch
new file mode 100644
index 0000000..dd5a4f4
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.31.5-use-libunique-3.patch
@@ -0,0 +1,21 @@
+From faadc51fb554b90cfd07d108262383e1772f279b Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Wed, 14 Jul 2010 00:47:18 +0000
+Subject: Complete the GTK+ 3 port by using unique-3.0
+
+---
+diff --git a/configure.ac b/configure.ac
+index 7622885..637c4d4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,7 +115,7 @@ if test "x$enable_pulseaudio" != "xno"; then
+             gio-2.0
+             gconf-2.0 >= $GCONF_REQUIRED_VERSION
+             libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
+-            unique-1.0
++            unique-3.0
+             libxml-2.0
+     )
+     AC_SUBST(VOLUME_CONTROL_CFLAGS)
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/gnome-media/gnome-media-2.31.5.ebuild b/gnome-extra/gnome-media/gnome-media-2.31.5.ebuild
new file mode 100644
index 0000000..64fa58b
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-2.31.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild,v 1.1 2010/06/13 19:14:28 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="pulseaudio"
+
+RDEPEND=">=dev-libs/glib-2.18.2:2
+	x11-libs/gtk+:3
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/gnome-control-center-2.31.5
+	>=media-libs/gstreamer-0.10.23
+	>=media-libs/gst-plugins-base-0.10.23
+	>=media-libs/gst-plugins-good-0.10
+	dev-libs/libunique:3
+
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+	>=media-libs/libcanberra-0.13[gtk3]
+	dev-libs/libxml2
+	>=media-libs/gst-plugins-base-0.10.23:0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-gconf-0.10.1"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.35.0"
+
+DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--enable-gstprops
+		--enable-grecord
+		--enable-profiles
+		$(use_enable pulseaudio)
+		$(use_enable !pulseaudio gstmix)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Use libunique:3
+	epatch "${FILESDIR}"/${P}-use-libunique-3.patch
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn
+	ewarn "If you cannot play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+	if use pulseaudio; then
+		ewarn "You have enabled pulseaudio support, gstmixer will not be built"
+		ewarn "If you do not use pulseaudio, you do not want this"
+	fi
+}
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
new file mode 100644
index 0000000..11843c1
--- /dev/null
+++ b/gnome-extra/gtkhtml/Manifest
@@ -0,0 +1,2 @@
+DIST gtkhtml-3.30.1.tar.bz2 1350166 RMD160 e47734cf521bfe20ebd340162769b8c372f453e9 SHA1 e72ace1cf3461d3b01746e7ebcfef6e94124103b SHA256 70c8e2bffaff783408b847e54e9bb68f438dcd488721b9597168f88395a8f703
+EBUILD gtkhtml-3.30.1.ebuild 1635 RMD160 6dc71b7e50541a090c7c0b410f7ccdf3744220dc SHA1 0eb5a16be7e5f5dda140ae98b6a5b22352b18a79 SHA256 1924ba353a565857a939c209e6d2bc3e3a46c065068c1e1580fd45f37c25d190
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.30.1.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.30.1.ebuild
new file mode 100644
index 0000000..c4a0244
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-3.30.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+# Glade support is disabled, because it's install broken by design:
+# Install directories for glade are queried from gladeui-1.0.pc which doesn't
+# take our prefix into account. On the other side, there are maybe 3 to 4 
+# people in the world who really need to install the Glade file, so they can
+# fix it themselves :)
+
+# We keep bonobo until we can make sure no apps in tree uses
+# the old composer code.
+RDEPEND=">=x11-libs/gtk+-2.18:2
+	>=x11-themes/gnome-icon-theme-2.22.0
+	>=gnome-base/orbit-2
+	>=app-text/enchant-1.1.7
+	gnome-base/gconf:2
+	>=app-text/iso-codes-0.49
+	>=net-libs/libsoup-2.26.0:2.4"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	ELTCONF="--reverse-deps"
+	G2CONF="${G2CONF}
+		--disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: Fix compilation flags crazyness
+	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
+		-i configure.ac configure || die "sed 1 failed"
+	sed -i -e 's:-DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1::g' \
+		a11y/Makefile.am a11y/Makefile.in || die "sed 2 failed"
+}