adicionando de todo

47 files changed, 2401 insertions, 29 deletions

diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
new file mode 100644
index 0000000..c9e367c
--- /dev/null
+++ b/app-arch/file-roller/Manifest
@@ -0,0 +1,3 @@
+AUX file-roller-2.10.3-use_bin_tar.patch 504 RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 SHA1 a40077b5ace4be970dae46b44aa5b8ce19a75780 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052
+DIST file-roller-2.31.4.tar.bz2 1832150 RMD160 29f2915b88a4858eb90caa3095a18489d91b8a08 SHA1 960b73cfd8e9403a15b99a7f2de8a14f3429912a SHA256 be0310d57804c27bb4550298648ae5da350bd9e982f1b89d2a3939cd479f2a49
+EBUILD file-roller-2.31.4.ebuild 2016 RMD160 c6fa7feaf5ced8f43c980a69cdc4450a024a8ed0 SHA1 d13b0b847e6de599e0cfa637406796f1d3b72bdf SHA256 9b79a5ea5fc98b9d9a75db5ff73b79adbb3bdf3114352e58b4d0a387128da156
diff --git a/app-arch/file-roller/file-roller-2.31.4.ebuild b/app-arch/file-roller/file-roller-2.31.4.ebuild
new file mode 100644
index 0000000..8f35679
--- /dev/null
+++ b/app-arch/file-roller/file-roller-2.31.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.30.1.1.ebuild,v 1.1 2010/06/13 19:22:40 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="archive manager for GNOME"
+HOMEPAGE="http://fileroller.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="nautilus"
+
+RDEPEND=">=dev-libs/glib-2.25.5
+	>=x11-libs/gtk+-2.19.7:2
+	>=gnome-base/gconf-2.6
+	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	dev-util/pkgconfig
+	app-text/gnome-doc-utils"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-scrollkeeper
+		--disable-run-in-place
+		--disable-static
+		--disable-packagekit
+		$(use_enable nautilus nautilus-actions)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Use absolute path to GNU tar since star doesn't have the same
+	# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
+	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format support, see ${HOMEPAGE}"
+	elog "and install the relevant package."
+	elog
+	elog "for example:"
+	elog "  7-zip   - app-arch/p7zip"
+	elog "  ace     - app-arch/unace"
+	elog "  arj     - app-arch/arj"
+	elog "  cpio    - app-arch/cpio"
+	elog "  deb     - app-arch/dpkg"
+	elog "  iso     - app-cdr/cdrtools"
+	elog "  jar,zip - app-arch/zip and app-arch/unzip"
+	elog "  lha     - app-arch/lha"
+	elog "  lzma    - app-arch/xz-utils"
+	elog "  lzop    - app-arch/lzop"
+	elog "  rar     - app-arch/unrar"
+	elog "  rpm     - app-arch/rpm"
+	elog "  unstuff - app-arch/stuffit"
+	elog "  zoo     - app-arch/zoo"
+}
diff --git a/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch b/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch
new file mode 100644
index 0000000..edaa16c
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch
@@ -0,0 +1,12 @@
+diff -uNr file-roller-2.10.3/src/fr-command-tar.c file-roller-2.10.3.patched/src/fr-command-tar.c
+--- file-roller-2.10.3/src/fr-command-tar.c	2005-04-22 18:39:22.000000000 +0200
++++ file-roller-2.10.3.patched/src/fr-command-tar.c	2005-06-06 14:29:45.000000000 +0200
+@@ -225,7 +225,7 @@
+ 	if (command != NULL)
+ 		fr_process_begin_command (comm->process, command);
+ 	else
+-		fr_process_begin_command (comm->process, "tar");
++		fr_process_begin_command (comm->process, "/bin/tar");
+ 	g_free (command);
+ }
+ 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
new file mode 100644
index 0000000..def1b29
--- /dev/null
+++ b/app-cdr/brasero/Manifest
@@ -0,0 +1,2 @@
+DIST brasero-2.31.5.tar.bz2 4461808 RMD160 6314e4e0867cbdceb8d5da78e6218c207fdc05ea SHA1 1f80a12e71b41a508cbf7726e8863a3260ae8bdd SHA256 0690ce8ff4ca77d19eac00ace154d78d635829f50a748eada562918dab2f0b25
+EBUILD brasero-2.31.5.ebuild 2447 RMD160 83531414f062aa1f82e73dbbe6c1db494f1b3f44 SHA1 af3260fc43846a1c4867b1df59a6603fedc8acd0 SHA256 6dc66ebfb90f263d4fd2f65774a4e8892ea21bf64d43a62d6cfa8cd139e669b6
diff --git a/app-cdr/brasero/brasero-2.31.5.ebuild b/app-cdr/brasero/brasero-2.31.5.ebuild
new file mode 100644
index 0000000..a094c67
--- /dev/null
+++ b/app-cdr/brasero/brasero-2.31.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.30.1.ebuild,v 1.1 2010/06/13 19:25:35 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib
+
+DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+HOMEPAGE="http://www.gnome.org/projects/brasero"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="beagle +cdr +css doc +introspection +libburn nautilus playlist test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.25.10
+	>=x11-libs/gtk+-2.90.2:3[introspection?]
+	>=gnome-base/gconf-2.31.1[introspection?]
+	>=media-libs/gstreamer-0.10.15
+	>=media-libs/gst-plugins-base-0.10
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/dbus-glib-0.7.2
+	media-libs/libcanberra[gtk3]
+	x11-libs/libSM
+	beagle? ( >=dev-libs/libbeagle-0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
+	libburn? (
+		>=dev-libs/libburn-0.4
+		>=dev-libs/libisofs-0.6.4 )
+	nautilus? ( >=gnome-base/nautilus-2.31.3[introspection?] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
+RDEPEND="${COMMON_DEPEND}
+	app-cdr/cdrdao
+	app-cdr/dvd+rw-tools
+	media-plugins/gst-plugins-meta
+	css? ( media-libs/libdvdcss )
+	cdr? ( virtual/cdrtools )
+	!libburn? ( virtual/cdrtools )"
+DEPEND="${COMMON_DEPEND}
+	app-text/gnome-doc-utils
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1.3 )
+	test? ( app-text/docbook-xml-dtd:4.3 )"
+# eautoreconf deps
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
+PDEPEND="gnome-base/gvfs"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-caches
+		--disable-dependency-tracking
+		--enable-gtk3
+		$(use_enable beagle search beagle)
+		$(use_enable cdr cdrtools)
+		$(use_enable cdr cdrkit)
+		$(use_enable introspection)
+		$(use_enable libburn libburnia)
+		$(use_enable nautilus)
+		$(use_enable playlist)"
+
+	if ! use libburn; then
+		G2CONF="${G2CONF} --enable-cdrtools --enable-cdrkit"
+	fi
+
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Remove useless .la files
+	rm -f "${D}"/usr/$(get_libdir)/brasero/plugins/*.la
+	rm -f "${D}"/usr/$(get_libdir)/nautilus/extensions-2.0/*.la
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	echo
+	elog "If ${PN} doesn't handle some music or video format, please check"
+	elog "your USE flags on media-plugins/gst-plugins-meta"
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
new file mode 100644
index 0000000..4f59d1c
--- /dev/null
+++ b/app-editors/gedit/Manifest
@@ -0,0 +1,2 @@
+DIST gedit-2.31.5.tar.bz2 4646909 RMD160 ea98448525508613760794166eaf1a22ec1ca744 SHA1 3fc5647598dcb07bbb95c8c98e9abaf707797822 SHA256 0dd0fed77da57738573239bf33a83a493c54d8b8a9b833eff12d9d984c8269a4
+EBUILD gedit-2.31.5.ebuild 1756 RMD160 cd0cc3e7d96cc9728c059ad4e8a5be495672f927 SHA1 c5528174979f27cabbdbe9262f05ccede04ac483 SHA256 84964c9ca4eb8683f9ea10ace9d7ef12d874ef0504b35069ce33624ee5209220
diff --git a/app-editors/gedit/gedit-2.31.5.ebuild b/app-editors/gedit/gedit-2.31.5.ebuild
new file mode 100644
index 0000000..8316a73
--- /dev/null
+++ b/app-editors/gedit/gedit-2.31.5.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/app-editors/gedit/gedit-2.30.2.ebuild,v 1.1 2010/06/13 19:34:52 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
+
+inherit gnome2 python
+
+DESCRIPTION="A text editor for the GNOME desktop"
+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 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="doc +introspection spell"
+
+# Note: introspection is *not* optional on pygobject: we need
+# gi.repository.Gtk, etc.
+RDEPEND=">=x11-libs/libSM-1.0
+	>=dev-libs/libxml2-2.5.0
+	>=dev-libs/glib-2.25.10
+	>=x11-libs/gtk+-2.90:3[introspection?]
+	>=x11-libs/gtksourceview-2.11.2:3.0[introspection?]
+	>=dev-libs/libpeas-0.5.2[gtk]
+	dev-python/pygobject[introspection]
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.1.2
+	doc? ( >=dev-util/gtk-doc-1 )"
+# gnome-common and gtk-doc-am needed to eautoreconf
+
+DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-updater
+		$(use_enable spell)"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Installed for plugins, but they're dlopen()-ed
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins
+}
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
new file mode 100644
index 0000000..fa160b3
--- /dev/null
+++ b/app-text/evince/Manifest
@@ -0,0 +1,3 @@
+AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
+DIST evince-2.31.5.tar.bz2 2254628 RMD160 6286269fc460acd18e4dcfb555d900b00f861268 SHA1 de35d028885159da83376ad1b27bd617d6521df0 SHA256 1e13d171f784c90642ba4d0fa4d70455de9e22f491bb1c49c8c40adfc5738995
+EBUILD evince-2.31.5.ebuild 2295 RMD160 a268a7dd59d1a7709cd3f1502e1367a322da690c SHA1 af59999b7356957be45c85cef6b5447712b35d2f SHA256 c49041d5d101f51659734ab155afd80a4d2b12214801c7cc1e798710909796bd
diff --git a/app-text/evince/evince-2.31.5.ebuild b/app-text/evince/evince-2.31.5.ebuild
new file mode 100644
index 0000000..93f417c
--- /dev/null
+++ b/app-text/evince/evince-2.31.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="http://www.gnome.org/projects/evince/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+
+IUSE="dbus debug djvu doc dvi gnome gnome-keyring +introspection nautilus t1lib tiff"
+
+# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
+# not mature enough
+RDEPEND="
+	>=app-text/libspectre-0.2.0
+	>=dev-libs/glib-2.25.11
+	>=dev-libs/libxml2-2.5
+	>=x11-libs/gtk+-2.90.5:3[introspection?]
+	>=x11-libs/libSM-1
+	>=x11-themes/gnome-icon-theme-2.17.1
+	gnome? ( >=gnome-base/gconf-2[introspection?] )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 )
+	nautilus? ( >=gnome-base/nautilus-2.10[introspection?] )
+	>=app-text/poppler-0.14[cairo]
+	dvi? (
+		virtual/tex-base
+		t1lib? ( >=media-libs/t1lib-5.0.0 ) )
+	tiff? ( >=media-libs/tiff-3.6 )
+	djvu? ( >=app-text/djvu-3.5.17 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6 )"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.1.2
+	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	dev-util/gtk-doc-am
+	doc? ( dev-util/gtk-doc )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+ELTCONF="--portage"
+
+# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
+# Releases: http://people.redhat.com/zcerza/dogtail/releases/
+RESTRICT="test"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-static
+		--disable-tests
+		--enable-pdf
+		--enable-comics
+		--enable-impress
+		--enable-thumbnailer
+		--with-smclient=xsmp
+		--with-platform=gnome
+		$(use_enable dbus)
+		$(use_enable djvu)
+		$(use_enable dvi)
+		$(use_with gnome gconf)
+		$(use_with gnome-keyring keyring)
+		$(use_enable t1lib)
+		$(use_enable tiff)
+		$(use_enable nautilus)
+		$(use_enable introspection)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix .desktop file so menu item shows up
+	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
diff --git a/app-text/evince/files/evince-0.7.1-display-menu.patch b/app-text/evince/files/evince-0.7.1-display-menu.patch
new file mode 100644
index 0000000..9edc43e
--- /dev/null
+++ b/app-text/evince/files/evince-0.7.1-display-menu.patch
@@ -0,0 +1,11 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN evince-0.7.1.orig/data/evince.desktop.in.in evince-0.7.1/data/evince.desktop.in.in
+--- evince-0.7.1.orig/data/evince.desktop.in.in	2007-01-10 11:04:20.000000000 -0500
++++ evince-0.7.1/data/evince.desktop.in.in	2007-01-18 17:30:52.000000000 -0500
+@@ -9,7 +9,6 @@ StartupNotify=true
+ Terminal=false
+ Type=Application
+ Icon=evince
+-NoDisplay=true
+ X-GNOME-DocPath=
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=evince
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
new file mode 100644
index 0000000..e0e20be
--- /dev/null
+++ b/dev-python/pygobject/Manifest
@@ -0,0 +1,6 @@
+AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
+AUX pygobject-2.18.0-automake111.patch 323 RMD160 182ea96cbb8fe28a93add0ef3dfd7710777615d8 SHA1 96c22e5bb8f07ea117248f4c8ca580474938c7af SHA256 4a94e9ca2a421a923c522ad4132c8988f22e74949f0361e231b6ba0ca813bc57
+AUX pygobject-2.18.0-support_multiple_python_versions.patch 2349 RMD160 054080d2a62b466ffe2ba9e182e5e796c652161f SHA1 d1ac7d308cb82caab4a5c56256ebd53b13cb9a3b SHA256 d66bcf31acf8b310ad346b9803d5e41d9840cfbca3c62d19b5c99f605c58066d
+AUX pygobject-2.21.4-make_check.patch 1799 RMD160 299e2064b3685822957c45c9ae8a5007ff9c9c04 SHA1 553bb63d96eb5cb0dae511a4c3a9505bd8076b8d SHA256 f03bb8460ce6bcef8d9c6dfab6b39a96860ea7528ed8b840e375c26a2726f38e
+DIST pygobject-2.21.5.tar.bz2 767809 RMD160 f1341e01cfd14399ba6b4a5dad8638da67d8de9d SHA1 8017d5dba28278727501194d45310d3156937c70 SHA256 14dc23bd8adb3626cfbaa7b7df1070c8da260e60925ec83beac517d7155cfed8
+EBUILD pygobject-2.21.5.ebuild 3222 RMD160 3bdb21c639e03ad8cc4754479a7268fc8ed0c896 SHA1 91d750fd18f3f4a72caab2a4d29711d02f8c6133 SHA256 3fde61026edc1848b19260b31506cb0c8b6106bfcd00be2300df3e226b6939c0
diff --git a/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch b/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
new file mode 100644
index 0000000..8882cd0
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.15.4-fix-codegen-location.patch
@@ -0,0 +1,50 @@
+---
+ Fix FHS compliance of codegen
+
+ codegen/Makefile.am          |    2 +-
+ codegen/pygtk-codegen-2.0.in |    3 ++-
+ pygtk-2.0.pc.in              |    2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+--- a/codegen/Makefile.am	2007-11-01 12:20:22.000000000 -0400
++++ b/codegen/Makefile.am	2008-05-28 22:21:04.000000000 -0400
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
+ 
+ bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
+ 
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+ 
+ codegen_PYTHON = \
+ 	__init__.py \
+--- a/codegen/pygobject-codegen-2.0.in	2007-11-01 12:20:22.000000000 -0400
++++ b/codegen/pygobject-codegen-2.0.in	2008-05-28 22:24:38.000000000 -0400
+@@ -1,9 +1,10 @@
+ #!/bin/sh
+ 
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=@pyexecdir@/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+--- a/pygobject-2.0.pc.in	2007-11-01 12:20:22.000000000 -0400
++++ b/pygobject-2.0.pc.in	2008-05-28 22:21:04.000000000 -0400
+@@ -4,6 +4,7 @@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
++pyexecdir=@pyexecdir@
+ 
+ # you can use the --variable=pygtkincludedir argument to
+ # pkg-config to get this value.  You might want to use this to
+@@ -12,5 +12,5 @@
+ defsdir=${datadir}/pygobject/2.0/defs
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+ 
+ Name: PyGObject
+ Description: Python bindings for GObject
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch b/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
new file mode 100644
index 0000000..9e57bb7
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.18.0-automake111.patch
@@ -0,0 +1,13 @@
+# Fix build failure due to automake 1.11.
+# defsgen.py was installed twice
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=279813
+--- a/codegen/Makefile.am
++++ b/codegen/Makefile.am
+@@ -18,7 +18,6 @@
+ 	docextract_to_xml.py \
+ 	docgen.py \
+ 	h2def.py \
+-	defsgen.py \
+ 	createdefs.py \
+ 	mergedefs.py \
+ 	missingdefs.py \
diff --git a/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch b/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
new file mode 100644
index 0000000..b27d408
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.18.0-support_multiple_python_versions.patch
@@ -0,0 +1,66 @@
+--- codegen/pygobject-codegen-2.0.in
++++ codegen/pygobject-codegen-2.0.in
+@@ -4,7 +4,7 @@
+ exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=@pyexecdir@/gtk-2.0/codegen
++codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
+ 
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+--- gio/Makefile.am
++++ gio/Makefile.am
+@@ -56,7 +56,7 @@
+ gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
+ _gio_la_CFLAGS = $(GIO_CFLAGS)
+ _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
+-_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gio_la_SOURCES = \
+ 	giomodule.c \
+ 	pygio-utils.c \
+--- glib/Makefile.am
++++ glib/Makefile.am
+@@ -4,7 +4,7 @@
+ pkgincludedir = $(includedir)/pygtk-2.0
+ pkginclude_HEADERS = pyglib.h
+ 
+-lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
++lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ 
+ pkgpyexecdir = $(pyexecdir)/gtk-2.0
+ 
+@@ -19,9 +19,9 @@
+ common_ldflags += -no-undefined
+ endif
+ 
+-libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
+-libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES = 	\
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
++libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES = 	\
+ 	pyglib.c		\
+ 	pyglib.h		\
+ 	pyglib-private.h 	\
+@@ -29,7 +29,7 @@
+ 
+ _glib_la_CFLAGS = $(GLIB_CFLAGS)
+ _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
+-_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
++_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _glib_la_SOURCES = 	 	\
+ 	glibmodule.c	 	\
+ 	pygiochannel.c 	 	\
+--- gobject/Makefile.am
++++ gobject/Makefile.am
+@@ -42,7 +42,7 @@
+ _gobject_la_LIBADD = \
+ 	$(GLIB_LIBS) \
+ 	$(FFI_LIBS) \
+-	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
++	$(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
+ _gobject_la_SOURCES =           \
+         gobjectmodule.c         \
+         pygboxed.c              \
diff --git a/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch b/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch
new file mode 100644
index 0000000..7b1c20d
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.21.4-make_check.patch
@@ -0,0 +1,55 @@
+--- pygobject-2.21.4.orig/tests/Makefile.am
++++ pygobject-2.21.4/tests/Makefile.am
+@@ -12,7 +12,7 @@ EXTRA_DIST = \
+ 	test-thread.h \
+ 	test-unknown.h
+ 
+-noinst_LTLIBRARIES = testhelper.la
++check_LTLIBRARIES = testhelper.la
+ linked_LIBS = testhelper.la
+ 
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -46,13 +46,11 @@ endif
+ testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
+ 	$(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
+ 
+-check-local: $(LTLIBRARIES:.la=.so)
++check-local: $(check_LTLIBRARIES:.la=.so)
+ 	$(EXEC_NAME) $(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(tests)
+ 
+-all: $(LTLIBRARIES:.la=.so)
+-
+ clean-local:
+-	rm -f $(LTLIBRARIES:.la=.so)
++	rm -f $(check_LTLIBRARIES:.la=.so)
+ 
+ .la.so:
+ 	$(LN_S) .libs/$@ $@ || true
+--- pygobject-2.21.4.orig/tests/runtests.py
++++ pygobject-2.21.4/tests/runtests.py
+@@ -6,6 +6,9 @@ import unittest
+ 
+ import common
+ 
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
++
+ program = None
+ if len(sys.argv) < 2:
+     raise ValueError('Need at least 2 parameters: runtests.py <build-dir> '
+--- pygobject-2.21.4.orig/tests/test_gio.py
++++ pygobject-2.21.4/tests/test_gio.py
+@@ -410,9 +410,10 @@ class TestFile(unittest.TestCase):
+ 
+     def testQueryWritableNamespaces(self):
+         infolist = self.file.query_writable_namespaces()
+-        for info in infolist:
+-            if info.name == "xattr":
+-                self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
++        if infolist:
++            for info in infolist:
++                if info.name == "xattr":
++                    self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
+ 
+     def testSetAttribute(self):
+         self._f.write("testing attributes")
diff --git a/dev-python/pygobject/pygobject-2.21.5.ebuild b/dev-python/pygobject/pygobject-2.21.5.ebuild
new file mode 100644
index 0000000..b564ba7
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.21.5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.20.0.ebuild,v 1.4 2010/01/11 16:56:25 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.5"
+inherit alternatives autotools gnome2 python virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +introspection libffi test"
+
+RDEPEND=">=dev-libs/glib-2.22.4
+	introspection? (
+		>=dev-libs/gobject-introspection-0.9.1
+		>=dev-python/pycairo-1.0.2
+	)
+	!<dev-python/pygtk-2.13
+	libffi? ( virtual/libffi )"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 )
+	test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc )
+	>=dev-util/pkgconfig-0.12.0"
+
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		$(use_enable doc docs)
+		$(use_enable introspection)
+		$(use_with libffi ffi)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix FHS compliance, see upstream bug #535524
+	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${PN}-2.21.4-make_check.patch"
+
+	# Support installation for multiple Python versions
+	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
+
+	# needed to build on a libtool-1 system, bug #255542
+	rm m4/lt* m4/libtool.m4 ltmain.sh
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	eautoreconf
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		if has ${PYTHON_ABI} 2.4 2.5; then
+			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
+			return 0
+		fi
+
+		Xemake check
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	[[ -z ${ED} ]] && local ED="${D}"
+	installation() {
+		gnome2_src_install
+		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
+		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
+	}
+	python_execute_function -s installation
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	create_symlinks() {
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+
+	python_mod_optimize gtk-2.0 pygtk.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup gtk-2.0 pygtk.py
+
+	create_symlinks() {
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+}
diff --git a/dev-util/eclipse-cpp/Manifest b/dev-util/eclipse-cpp/Manifest
index 4b6519c..24d80c0 100644
--- a/dev-util/eclipse-cpp/Manifest
+++ b/dev-util/eclipse-cpp/Manifest
@@ -7,4 +7,3 @@ DIST eclipse-cpp-galileo-linux-gtk.tar.gz 82867170 RMD160 0b45886ef500e5a057972a
 DIST site-1.4.8.zip 10968716 RMD160 f6dfcbdabd282f6ce1d2ebeba664ee7175e4ed97 SHA1 aee6aa633319fb1d4590f8f7c07a56bc1ff69669 SHA256 1a6d37e9ec66f35daef97d9cf85efe95902f7bbcf7595a1ecb7780d4659799e8
 EBUILD eclipse-cpp-3.5.ebuild 2980 RMD160 21417fe6507c5c6662d561de0c9cbc4019d2e6a6 SHA1 cd44d646a317d7090a6608e8215891afbb31179a SHA256 091365c7e1cb3c9f9c843b507d34d0d963894d6bc5b401a1047e726b70e5ea0e
 MISC metadata.xml 640 RMD160 7199ea5174bee34e4a8121288075d1bd3782b7c0 SHA1 ac86ecc49e15f7daed9cbed3c666b98ea6f7f47f SHA256 e7554de6ada7bd0ceb90b02f11fb4a2c929d8846d2f569d831b22f4dc7a9ed1b
-MISC site-1.6.5.zip 11489997 RMD160 871c3ff3ff85be7a89e964794621e6cd5a1d18dc SHA1 1d1cebc8611d82749ceb02215ab8f48f15969ccc SHA256 413708c7a706e749d110cf92ea242b6d0be54bf6ae6470c611eced0ea01b4210
diff --git a/dev-util/subeclipse/Manifest b/dev-util/subeclipse/Manifest
new file mode 100644
index 0000000..1fc18ea
--- /dev/null
+++ b/dev-util/subeclipse/Manifest
@@ -0,0 +1,2 @@
+DIST CMakeEd-1.1.2.zip 549312 RMD160 726548c584e08be90bcb5359c1240350811f3285 SHA1 31c65df186fb23983ed85b5bd405c56cfb79d203 SHA256 9ed64c841e429fd728e7187437fb24a414bdb13e4554dad778de044e0b0d0dd1
+EBUILD subeclipse-1.4.8.ebuild 807 RMD160 aa25a77c09cb8be45a7ba2556217e45e529ce66a SHA1 fb5136d0fad9105fc56b55a0b6838db0eae6ce68 SHA256 063fb915545d302a80a045089a50b0487c97ea63a5e954b233149af6b722f65e
diff --git a/eclass/gnome2-la.eclass b/eclass/gnome2-la.eclass
new file mode 100644
index 0000000..e9506c3
--- /dev/null
+++ b/eclass/gnome2-la.eclass
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#
+# gnome2-la.eclass
+#
+# Original Author: Nirbheek Chauhan <nirbheek@gentoo.org>
+# Purpose: Temporary eclass for facilitating .la file removal
+#
+# Only for usage in the overlay. This eclass will be redundant once this feature
+# is reviewed and patched into gnome2.eclass (in-tree)
+#
+
+inherit gnome2
+
+EXPORT_FUNCTIONS src_install
+
+# Remove .la files in src_install?
+G2PUNT_LA=${G2PUNT_LA:-"no"}
+
+gnome2-la_src_install() {
+	gnome2_src_install
+
+	# Remove .la files if they're unneeded
+	# Be *absolutely* sure before doing this and read
+	# http://dev.gentoo.org/~nirbheek/gnome/gnome-policy.xml#doc_chap3
+	if [[ "${G2PUNT_LA}" = "yes" ]]; then
+		ebegin "Removing .la files"
+		find "${D}" -name '*.la' -delete
+		eend
+	fi
+}
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
new file mode 100644
index 0000000..4c7d4f3
--- /dev/null
+++ b/eclass/gnome2-utils.eclass
@@ -0,0 +1,247 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.13 2008/10/22 21:04:53 eva Exp $
+
+#
+# gnome2-utils.eclass
+#
+# Set of auxiliary functions used to perform actions commonly needed by packages
+# using the GNOME framework.
+#
+# Maintained by Gentoo's GNOME herd <gnome@gentoo.org>
+#
+
+
+
+# Path to gconftool-2
+: ${GCONFTOOL_BIN:="${ROOT}usr/bin/gconftool-2"}
+
+# Directory where scrollkeeper-update should do its work
+: ${SCROLLKEEPER_DIR:="${ROOT}var/lib/scrollkeeper"}
+
+# Path to scrollkeeper-update
+: ${SCROLLKEEPER_UPDATE_BIN:="${ROOT}usr/bin/scrollkeeper-update"}
+
+
+
+DEPEND=">=sys-apps/sed-4"
+
+
+
+# Find the GConf schemas that are about to be installed and save their location
+# in the GNOME2_ECLASS_SCHEMAS environment variable
+gnome2_gconf_savelist() {
+	pushd "${D}" &> /dev/null
+	export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
+	popd &> /dev/null
+}
+
+
+# Applies any schema files installed by the current ebuild to Gconf's database
+# using gconftool-2
+gnome2_gconf_install() {
+	local F
+
+	if [[ ! -x "${GCONFTOOL_BIN}" ]]; then
+		return
+	fi
+
+	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
+		einfo "No GNOME 2 GConf schemas found"
+		return
+	fi
+
+	# We are ready to install the GCONF Scheme now
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+	export GCONF_CONFIG_SOURCE="$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")"
+
+	einfo "Installing GNOME 2 GConf schemas"
+
+	for F in ${GNOME2_ECLASS_SCHEMAS}; do
+		if [[ -e "${ROOT}${F}" ]]; then
+			# echo "DEBUG::gconf install  ${F}"
+			"${GCONFTOOL_BIN}" --makefile-install-rule "${ROOT}${F}" 1>/dev/null
+		fi
+	done
+
+	# have gconf reload the new schemas
+	pids=$(pgrep -x gconfd-2)
+	if [[ $? == 0 ]] ; then
+		ebegin "Reloading GConf schemas"
+		kill -HUP ${pids}
+		eend $?
+	fi
+}
+
+
+# Removes schema files previously installed by the current ebuild from Gconf's
+# database.
+gnome2_gconf_uninstall() {
+	local F
+
+	if [[ ! -x "${GCONFTOOL_BIN}" ]]; then
+		return
+	fi
+
+	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
+		einfo "No GNOME 2 GConf schemas found"
+		return
+	fi
+
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+	export GCONF_CONFIG_SOURCE="$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")"
+
+	einfo "Uninstalling GNOME 2 GConf schemas"
+
+	for F in ${GNOME2_ECLASS_SCHEMAS}; do
+		if [[ -e "${ROOT}${F}" ]]; then
+			# echo "DEBUG::gconf uninstall  ${F}"
+			"${GCONFTOOL_BIN}" --makefile-uninstall-rule "${ROOT}${F}" 1>/dev/null
+		fi
+	done
+
+	# have gconf reload the new schemas
+	pids=$(pgrep -x gconfd-2)
+	if [[ $? == 0 ]] ; then
+		ebegin "Reloading GConf schemas"
+		kill -HUP ${pids}
+		eend $?
+	fi
+}
+
+
+# Find the icons that are about to be installed and save their location
+# in the GNOME2_ECLASS_ICONS environment variable
+# That function should be called from pkg_preinst
+gnome2_icon_savelist() {
+	pushd "${D}" &> /dev/null
+	export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	popd &> /dev/null
+}
+
+
+# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
+# have installed anything under that location.
+gnome2_icon_cache_update() {
+	local updater="$(type -p gtk-update-icon-cache 2> /dev/null)"
+
+	if [[ ! -x "${updater}" ]] ; then
+		debug-print "${updater} is not executable"
+		return
+	fi
+
+	if [[ -z "${GNOME2_ECLASS_ICONS}" ]]; then
+		return
+	fi
+
+
+	ebegin "Updating icons cache"
+
+	local retval=0
+	local fails=( )
+
+	for dir in ${GNOME2_ECLASS_ICONS}
+	do
+		if [[ -f "${ROOT}${dir}/index.theme" ]] ; then
+			local rv=0
+
+			"${updater}" -qf "${ROOT}${dir}"
+			rv=$?
+
+			if [[ ! $rv -eq 0 ]] ; then
+				debug-print "Updating cache failed on ${ROOT}${dir}"
+
+				# Add to the list of failures
+				fails[$(( ${#fails[@]} + 1 ))]="${ROOT}${dir}"
+
+				retval=2
+			fi
+		fi
+	done
+
+	eend ${retval}
+
+	for f in "${fails[@]}" ; do
+		eerror "Failed to update cache with icon $f"
+	done
+}
+
+
+# Workaround applied to Makefile rules in order to remove redundant
+# calls to scrollkeeper-update and sandbox violations.
+gnome2_omf_fix() {
+	local omf_makefiles filename
+
+	omf_makefiles="$@"
+
+	if [[ -f ${S}/omf.make ]] ; then
+		omf_makefiles="${omf_makefiles} ${S}/omf.make"
+	fi
+
+	# testing fixing of all makefiles found
+	# The sort is important to ensure .am is listed before the respective .in for
+	# maintainer mode regeneration not kicking in due to .am being newer than .in
+	for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am" |sort) ; do
+		omf_makefiles="${omf_makefiles} ${filename}"
+	done
+
+	ebegin "Fixing OMF Makefiles"
+
+	local retval=0
+	local fails=( )
+
+	for omf in ${omf_makefiles} ; do
+		local rv=0
+
+		sed -i -e 's:scrollkeeper-update:true:' "${omf}"
+		retval=$?
+
+		if [[ ! $rv -eq 0 ]] ; then
+			debug-print "updating of ${omf} failed"
+
+			# Add to the list of failures
+			fails[$(( ${#fails[@]} + 1 ))]=$omf
+
+			retval=2
+		fi
+	done
+
+	eend $retval
+
+	for f in "${fails[@]}" ; do
+		eerror "Failed to update OMF Makefile $f"
+	done
+}
+
+
+# Updates the global scrollkeeper database.
+gnome2_scrollkeeper_update() {
+	if [[ -x "${SCROLLKEEPER_UPDATE_BIN}" ]]; then
+		einfo "Updating scrollkeeper database ..."
+		"${SCROLLKEEPER_UPDATE_BIN}" -q -p "${SCROLLKEEPER_DIR}"
+	fi
+}
+
+gnome2_schemas_savelist() {
+	pushd "${D}" &>/dev/null
+	export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
+	popd &>/dev/null
+}
+
+gnome2_schemas_update() {
+	local updater="$(type -P glib-compile-schemas 2>/dev/null)"
+
+	if [[ ! -x ${updater} ]]; then
+		debug-print "${updater} is not executable"
+		return
+	fi
+
+	if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+		debug-print "no schemas to update"
+		return
+	fi
+
+	ebegin "Updating GSettings schemas"
+	${updater} --allow-any-name "$@" "${ROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
+	eend $?
+}
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
new file mode 100644
index 0000000..9d5d53b
--- /dev/null
+++ b/eclass/gnome2.eclass
@@ -0,0 +1,163 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.87 2010/04/26 19:37:25 abcd Exp $
+
+#
+# gnome2.eclass
+#
+# Exports portage base functions used by ebuilds written for packages using the
+# GNOME framework. For additional functions, see gnome2-utils.eclass.
+#
+# Maintained by Gentoo's GNOME herd <gnome@gentoo.org>
+#
+
+
+inherit fdo-mime libtool gnome.org gnome2-utils
+
+case "${EAPI:-0}" in
+	0|1)
+		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+	*)
+		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+		;;
+esac
+
+# Extra configure opts passed to econf
+G2CONF=${G2CONF:-""}
+
+# Extra options passed to elibtoolize
+ELTCONF=${ELTCONF:-""}
+
+# Should we use EINSTALL instead of DESTDIR
+USE_EINSTALL=${USE_EINSTALL:-""}
+
+# Run scrollkeeper for this package?
+SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:-"1"}
+
+
+
+if [[ ${GCONF_DEBUG} != "no" ]]; then
+	IUSE="debug"
+fi
+
+
+
+gnome2_src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	has ${EAPI:-0} 0 1 && gnome2_src_prepare
+}
+
+gnome2_src_prepare() {
+	# Prevent scrollkeeper access violations
+	gnome2_omf_fix
+
+	# Run libtoolize
+	elibtoolize ${ELTCONF}
+}
+
+gnome2_src_configure() {
+	# Update the GNOME configuration options
+	if [[ ${GCONF_DEBUG} != 'no' ]] ; then
+		if use debug ; then
+			G2CONF="${G2CONF} --enable-debug=yes"
+		fi
+	fi
+
+	# Prevent a QA warning
+	if hasq doc ${IUSE} ; then
+		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+	fi
+
+	# Avoid sandbox violations caused by misbehaving packages (bug #128289)
+	addwrite "/root/.gnome2"
+
+	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
+	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF} || die "configure failed"
+}
+
+gnome2_src_compile() {
+	has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
+
+	# Whenever new API is added to glib/cairo/libxml2 etc, gobject-introspection
+	# needs to be rebuilt so that the typelibs/girs contain the new API data
+	if has introspection ${IUSE} && use introspection; then
+		ewarn "If you get a compilation failure related to introspection, try"
+		ewarn "rebuilding dev-libs/gobject-introspection so that it's updated"
+		ewarn "for any new glib, cairo, etc APIs"
+	fi
+
+	emake || die "compile failure"
+}
+
+gnome2_src_install() {
+	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+	# if this is not present, scrollkeeper-update may segfault and
+	# create bogus directories in /var/lib/
+	local sk_tmp_dir="/var/lib/scrollkeeper"
+	dodir "${sk_tmp_dir}"
+
+	# we must delay gconf schema installation due to sandbox
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+
+	if [[ -z "${USE_EINSTALL}" || "${USE_EINSTALL}" = "0" ]]; then
+		debug-print "Installing with 'make install'"
+		emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
+	else
+		debug-print "Installing with 'einstall'"
+		einstall "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" || die "einstall failed"
+	fi
+
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+	# Manual document installation
+	[[ -n "${DOCS}" ]] && dodoc ${DOCS}
+
+	# Do not keep /var/lib/scrollkeeper because:
+	# 1. The scrollkeeper database is regenerated at pkg_postinst()
+	# 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg
+	#    thus it makes no sense if pkg_postinst ISN'T run for some reason.
+	if [[ -z "$(find "${D}" -name '*.omf')" ]]; then
+		export SCROLLKEEPER_UPDATE="0"
+	fi
+	rm -rf "${ED}${sk_tmp_dir}"
+
+	# Make sure this one doesn't get in the portage db
+	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
+}
+
+gnome2_pkg_preinst() {
+	gnome2_gconf_savelist
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+gnome2_pkg_postinst() {
+	gnome2_gconf_install
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+
+	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
+		gnome2_scrollkeeper_update
+	fi
+}
+
+#gnome2_pkg_prerm() {
+#	gnome2_gconf_uninstall
+#}
+
+gnome2_pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update --uninstall
+
+	if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
+		gnome2_scrollkeeper_update
+	fi
+}
+
+# pkg_prerm
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"
+}
diff --git a/media-fonts/ttf-jgaramond/ttf-jgaramond-1.ebuild b/media-fonts/ttf-jgaramond/ttf-jgaramond-1.ebuild
deleted file mode 100644
index 0922a25..0000000
--- a/media-fonts/ttf-jgaramond/ttf-jgaramond-1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit font
-
-DESCRIPTION="Jan Thor's Garamond True Type Font"
-HOMEPAGE="http://www.janthor.de/jGaramond/"
-
-SRC_URI="http://www.janthor.de/jGaramond/jGara.zip"
-
-# "Use it as you may seem fit, as long as you don't ask for any money for
-# redistrib."
-LICENSE="free-noncomredistr"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-FONT_SUFFIX="ttf"
-
-S="${WORKDIR}"
-FONT_S="${WORKDIR}"
-
-src_install() {
-	DOCS="jGaramd2.txt"
-	font_src_install
-}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
new file mode 100644
index 0000000..a89398f
--- /dev/null
+++ b/media-gfx/eog/Manifest
@@ -0,0 +1,2 @@
+DIST eog-2.31.4.tar.bz2 2869883 RMD160 80e4073b4b09a7120512f513611ec0fced091949 SHA1 2cdfff75d5318704da522bedbbdecf254f960df0 SHA256 5cc733cdb98105fac4b5cc380003e888769c109287c0433f500da205cad50bb7
+EBUILD eog-2.31.4.ebuild 1533 RMD160 22f1b0a745ab8bb6a554d77eadd7f41a4ddcc637 SHA1 a6e9e91f7ac413617d024680ea084276c7868959 SHA256 037a8f7735ad4d8fe48f9b7a936e20aa6935dde11d0c20b75b9559a23fc54aa7
diff --git a/media-gfx/eog/eog-2.31.4.ebuild b/media-gfx/eog/eog-2.31.4.ebuild
new file mode 100644
index 0000000..3e299cc
--- /dev/null
+++ b/media-gfx/eog/eog-2.31.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.1.ebuild,v 1.2 2010/06/21 11:48:28 ssuominen Exp $
+
+EAPI=2
+inherit gnome2
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="http://www.gnome.org/projects/eog/"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus doc exif jpeg lcms python svg tiff xmp"
+
+RDEPEND=">=x11-libs/gtk+-2.18:2[jpeg?,tiff?]
+	>=dev-libs/glib-2.25.9
+	>=dev-libs/libxml2-2
+	>=gnome-base/gconf-2.31.1
+	>=gnome-base/gnome-desktop-2.25.1:0
+	>=x11-themes/gnome-icon-theme-2.19.1
+	>=x11-misc/shared-mime-info-0.20
+	x11-libs/libX11
+
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	exif? (
+		>=media-libs/libexif-0.6.14
+		>=media-libs/jpeg-8:0 )
+	jpeg? ( >=media-libs/jpeg-8:0 )
+	lcms? ( =media-libs/lcms-1* )
+	python? (
+		=dev-lang/python-2*
+		>=dev-python/pygobject-2.15.1
+		>=dev-python/pygtk-2.13 )
+	svg? ( >=gnome-base/librsvg-2.26 )
+	xmp? ( >=media-libs/exempi-2 )"
+
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.17
+	doc? ( >=dev-util/gtk-doc-1.10 )"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with jpeg libjpeg)
+		$(use_with exif libexif)
+		$(use_with dbus)
+		$(use_with lcms cms)
+		$(use_enable python)
+		$(use_with xmp)
+		$(use_with svg librsvg)
+		--disable-scrollkeeper
+		--disable-schemas-install"
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
new file mode 100644
index 0000000..9956c1a
--- /dev/null
+++ b/media-video/totem/Manifest
@@ -0,0 +1,9 @@
+AUX totem-2.26.1-smclient-target-detection.patch 1420 RMD160 4808f108ff486f5dc992ce3ea7aa1ac5d0e463da SHA1 d56ea9d8bbe96cd2edf0c68607732d4a8345c29e SHA256 5270fdce107cf60566bcd3a3eac49edeb85307503cc5228bad8ddbfbfcb695b3
+AUX totem-2.30.1-fix-gmp-plugin.patch 2659 RMD160 98ea3e484960fb15edc2df76842427bfd70d0a5b SHA1 d4d69b338aa476cc77ec802530376b42ca9ef3f9 SHA256 21dde71ce2807841f369d600f5d0e1369af9ad580e9396c66d4d0fd3d922ccd0
+AUX totem-2.30.1-fix-pygtk-include.patch 1426 RMD160 e4a186bafe7b00340f82937c145e6412021e485e SHA1 10464e94e1b77c2489d6ff5a667f80cdf6dc1d4b SHA256 b72260c8993860d6639e5524445b653b41bc4b756378b66a06e343c65f700345
+AUX totem-2.30.1-fix-qt-eos.patch 1199 RMD160 1d4e0d09ea5581a2c0670eca85a2b7a8e10743b3 SHA1 a0d7fcd8fbed625b31458b65cc63710dbe810ed0 SHA256 eb5bf9646e12b980e2fc0ab44338cddf1bd7be6058c4afe6d2413907f708de1a
+AUX totem-2.90.0-smclient-target-detection.patch 1347 RMD160 d8036450e777d4ed8602f6e274b60db21b85d47a SHA1 2329108629cb3736f5a521b58a97458872b5c9ca SHA256 4a40366c2a7e7ce7e9e88279f18757c7e5ccff8d18ced75bf5efb6dee3930a3e
+DIST totem-2.30.1.tar.bz2 3218782 RMD160 bf9fae0c8bb8ad23d2b33e21eeaebbb09c6ab279 SHA1 e8f68ed4c97e20210bd12d5e8431c439f7b392e1 SHA256 b6ad5ca26de437d24ca919357154b67d95d27dbebaa292ab7b66cc64e574eff7
+DIST totem-2.90.5.tar.bz2 3214471 RMD160 ea080c7d28080bd8e31e7fbb00a01bc4747fbb07 SHA1 bca4e544fa3968f73a9c81ad67357661d14ec93b SHA256 0a107492e0bf40bffedb004057746e308ec25eec50b751a1f3338f41cc7846ab
+EBUILD totem-2.30.1.ebuild 4945 RMD160 e050f6c2c970a2f6fccb0b9426d664eb14963633 SHA1 e7ed9961f858477077ffce110b40b2ece9055802 SHA256 069219161da696a61d9ae5220dbe8f4e069266d9270699b1e6e4caa129b963e0
+EBUILD totem-2.90.5.ebuild 5340 RMD160 54cb9e6426d5b80c97ca9b7d5592211dcdae2ee8 SHA1 efd693d5748b84bcfb2d2a3366bc46211cdfdd05 SHA256 07a7f9f339533dd4206a12b63f600d342c375d6801bfe06cee6e570023bc6ada
diff --git a/media-video/totem/files/totem-2.26.1-smclient-target-detection.patch b/media-video/totem/files/totem-2.26.1-smclient-target-detection.patch
new file mode 100644
index 0000000..6be089a
--- /dev/null
+++ b/media-video/totem/files/totem-2.26.1-smclient-target-detection.patch
@@ -0,0 +1,46 @@
+---
+ Fixing passing any kind of argument to --with-smclient
+
+ configure.in |   23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -226,18 +226,29 @@ GDK_TARGET="$($PKG_CONFIG --variable tar
+ SMCLIENT_PKGS=
+ AC_MSG_CHECKING([which smclient backend to use])
+ AC_ARG_WITH([smclient],
+-  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
++  [AS_HELP_STRING([--with-smclient],[which smclient backend to use @<:@xsmp/win32/quartz/auto@:>@])],
+   [],
+-  [case "$GDK_TARGET" in
+-    x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
++  [$with_smclient=auto])
++
++
++if test "$with_smclient" != "no"; then
++
++  if test "$with_smclient" != "auto" -a "$with_smclient" != "yes"; then
++    GDK_TARGET="$with_smclient"
++  fi
++
++  case "$GDK_TARGET" in
++    x11|xsmp) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
+     win32|quartz) with_smclient=$GDK_TARGET ;;
+     *) with_smclient=no ;;
+-   esac])
+-AC_MSG_RESULT([$with_smclient])
++  esac
++
++  AC_MSG_RESULT([$with_smclient])
+ 
+-if test "$with_smclient" != "no"; then
+   PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
+   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
++else
++  AC_MSG_RESULT([$with_smclient])
+ fi
+ 
+ AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
diff --git a/media-video/totem/files/totem-2.30.1-fix-gmp-plugin.patch b/media-video/totem/files/totem-2.30.1-fix-gmp-plugin.patch
new file mode 100644
index 0000000..df13ef1
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.1-fix-gmp-plugin.patch
@@ -0,0 +1,87 @@
+From d3b494595f7be012c400a4426bc89dcca1528f66 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 05 May 2010 16:50:52 +0000
+Subject: Fix URL parameter usage in GMP plugin
+
+The URL parameter is never the baseURI, it's the same as the SRC
+parameter, so some websites use both.
+
+Add support for the actual "baseURL" parameter instead.
+
+Fixes playback at:
+http://www.ta3.com/sk/relacie/23_hlavne-spravy/9167_hlavne-spravy-z-27-aprila
+
+https://bugzilla.gnome.org/show_bug.cgi?id=617639
+---
+diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
+index a30ffcc..25cf7ff 100644
+--- a/browser-plugin/totemPlugin.cpp
++++ b/browser-plugin/totemPlugin.cpp
+@@ -1042,7 +1042,6 @@ totemPlugin::RequestStream (bool aForceViewer)
+ 	/* Prefer filename over src */
+ 	if (mURLURI) {
+ 		requestURI = mURLURI;
+-		baseURI = mSrcURI; /* FIXME: that correct? */
+ 	}
+ #endif /* TOTEM_GMP_PLUGIN */
+ 
+@@ -1655,7 +1654,23 @@ totemPlugin::SetURL (const char* aURL)
+ 
+         mURLURI = g_strdup (aURL);
+ 
+-	/* FIXME: what is the correct base for the URL param? mSrcURI or mBaseURI? */
++	/* FIXME: security checks? */
++        /* FIXMEchpe: resolve the URI here? */
++}
++
++void
++totemPlugin::SetBaseURL (const char *aBaseURL)
++{
++        g_free (mBaseURI);
++
++	/* Don't allow empty URL */
++        if (!aBaseURL || !aBaseURL[0]) {
++                mBaseURI = NULL;
++		return;
++        }
++
++        mBaseURI = g_strdup (aBaseURL);
++
+ 	/* FIXME: security checks? */
+         /* FIXMEchpe: resolve the URI here? */
+ }
+@@ -2006,6 +2021,12 @@ totemPlugin::Init (NPMIMEType mimetype,
+         if (filename) {
+                 SetURL (filename);
+         }
++
++        /* http://msdn.microsoft.com/en-us/library/dd564090(v=VS.85).aspx */
++        const char *base = (const char *) g_hash_table_lookup (args, "baseurl");
++        if (base)
++		SetBaseURL (base);
++
+ #endif /* TOTEM_GMP_PLUGIN */
+ 
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+@@ -2141,6 +2162,7 @@ totemPlugin::Init (NPMIMEType mimetype,
+ 
+ 	/* Dump some disagnostics */
+ 	D ("mSrcURI: %s", mSrcURI ? mSrcURI : "");
++	D ("mBaseURI: %s", mBaseURI ? mBaseURI : "");
+ 	D ("mCache: %d", mCache);
+ 	D ("mControllerHidden: %d", mControllerHidden);
+ 	D ("mShowStatusbar: %d", mShowStatusbar);
+diff --git a/browser-plugin/totemPlugin.h b/browser-plugin/totemPlugin.h
+index 1cd33d1..d42b9e1 100644
+--- a/browser-plugin/totemPlugin.h
++++ b/browser-plugin/totemPlugin.h
+@@ -284,6 +284,7 @@ class totemPlugin {
+ #ifdef TOTEM_GMP_PLUGIN
+   public:
+     void SetURL (const char* aURL);
++    void SetBaseURL (const char* aBaseURL);
+     const char* URL() const { return mURLURI; }
+ 
+   private:
+--
+cgit v0.8.3.1
diff --git a/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch b/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch
new file mode 100644
index 0000000..8980dad
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch
@@ -0,0 +1,41 @@
+From aeeb165117a80080b044d54d5dc8b64df3128c26 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@kaolin.wh9.net>
+Date: Fri, 07 May 2010 12:23:17 +0000
+Subject: Fix version requirements for PyGTK
+
+pygtk.require() actually needs the major GTK+ version, and
+doesn't use the minor version in the require.
+
+Also make sure to check for the return value to avoid surprises.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=617821
+---
+diff --git a/src/plugins/totem-python-module.c b/src/plugins/totem-python-module.c
+index 5db787d..7eee97c 100644
+--- a/src/plugins/totem-python-module.c
++++ b/src/plugins/totem-python-module.c
+@@ -151,7 +151,7 @@ totem_python_module_init_python (void)
+ 
+ 	PySys_SetArgv (1, argv);
+ 
+-	/* pygtk.require("2.8") */
++	/* pygtk.require("2.0") */
+ 	pygtk = PyImport_ImportModule ("pygtk");
+ 	if (pygtk == NULL) {
+ 		g_warning ("Could not import pygtk, check your installation");
+@@ -161,7 +161,12 @@ totem_python_module_init_python (void)
+ 
+ 	mdict = PyModule_GetDict (pygtk);
+ 	require = PyDict_GetItemString (mdict, "require");
+-	PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.8")));
++	PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.0")));
++	if (PyErr_Occurred ()) {
++		g_warning ("Could not get required pygtk version, check your installation");
++		PyErr_Print();
++		return;
++	}
+ 
+ 	/* import gobject */
+ 	init_pygobject ();
+--
+cgit v0.8.3.1
diff --git a/media-video/totem/files/totem-2.30.1-fix-qt-eos.patch b/media-video/totem/files/totem-2.30.1-fix-qt-eos.patch
new file mode 100644
index 0000000..36147aa
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.1-fix-qt-eos.patch
@@ -0,0 +1,30 @@
+From f6fa6e869330bb2e64b67f966f6873412c3ca081 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 07 May 2010 09:10:55 +0000
+Subject: Fix position when QT gets to EOS
+
+When QuickTime reaches the end of a stream, the expected behaviour
+is for the position to stay at the end of the file, rather than
+back at 0.
+---
+diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
+index 25cf7ff..5382bb2 100644
+--- a/browser-plugin/totemPlugin.cpp
++++ b/browser-plugin/totemPlugin.cpp
+@@ -1276,9 +1276,12 @@ totemPlugin::TickCallback (DBusGProxy *proxy,
+ 			scriptable->mPluginState = totemNarrowSpacePlayer::eState_Playable;
+ 			break;
+ 		case TOTEM_STATE_STOPPED:
+-			if (scriptable->mPluginState == totemNarrowSpacePlayer::eState_Playable)
++			if (scriptable->mPluginState == totemNarrowSpacePlayer::eState_Playable) {
+ 				scriptable->mPluginState = totemNarrowSpacePlayer::eState_Complete;
+-			else
++				/* The QuickTime plugin expects the duration to be the
++				 * length of the file on EOS */
++				plugin->mTime = plugin->mDuration;
++			} else
+ 				scriptable->mPluginState = totemNarrowSpacePlayer::eState_Waiting;
+ 			break;
+ 		default:
+--
+cgit v0.8.3.1
diff --git a/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch b/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
new file mode 100644
index 0000000..ad6cc69
--- /dev/null
+++ b/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
@@ -0,0 +1,39 @@
+diff -pur totem-2.90.0.orig/configure.in totem-2.90.0/configure.in
+--- totem-2.90.0.orig/configure.in	2010-06-19 14:22:16.000000000 -0400
++++ totem-2.90.0/configure.in	2010-06-25 20:52:05.720211025 -0400
+@@ -153,18 +153,29 @@ GDK_TARGET="$($PKG_CONFIG --variable tar
+ SMCLIENT_PKGS=
+ AC_MSG_CHECKING([which smclient backend to use])
+ AC_ARG_WITH([smclient],
+-  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
++  [AS_HELP_STRING([--with-smclient],[which smclient backend to use @<:@xsmp/win32/quartz/auto@:>@])],
+   [],
+-  [case "$GDK_TARGET" in
+-    x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
++  [$with_smclient=auto])
++
++
++if test "$with_smclient" != "no"; then
++
++  if test "$with_smclient" != "auto" -a "$with_smclient" != "yes"; then
++    GDK_TARGET="$with_smclient"
++  fi
++
++  case "$GDK_TARGET" in
++    x11|xsmp) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
+     win32|quartz) with_smclient=$GDK_TARGET ;;
+     *) with_smclient=no ;;
+-   esac])
+-AC_MSG_RESULT([$with_smclient])
++  esac
++
++  AC_MSG_RESULT([$with_smclient])
+ 
+-if test "$with_smclient" != "no"; then
+   PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
+   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
++else
++  AC_MSG_RESULT([$with_smclient])
+ fi
+ 
+ AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
diff --git a/media-video/totem/totem-2.30.1.ebuild b/media-video/totem/totem-2.30.1.ebuild
new file mode 100644
index 0000000..e0803cd
--- /dev/null
+++ b/media-video/totem/totem-2.30.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit autotools eutils gnome2 multilib python
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://gnome.org/projects/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+#KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="-amd64 -x86 -x86-fbsd"
+
+# FIXME: Enable for now python USE flag per bug #316409
+# this change should only be noticed by people not following current
+# current linux profiles default
+IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker +youtube" #zeroconf
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# check gmyth requirement ? -> waiting for updates in tree
+# coherence plugin not enabled until we have deps in tree
+# vala ( dev-lang/vala ) requires 0.7.5
+RDEPEND=">=dev-libs/glib-2.22
+	>=x11-libs/gtk+-2.19.5:2
+	>=gnome-base/gconf-2.0
+	>=dev-libs/totem-pl-parser-2.29.1
+	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
+	app-text/iso-codes
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/dbus-glib-0.71
+	>=media-libs/gstreamer-0.10.26
+	>=media-libs/gst-plugins-good-0.10
+	>=media-libs/gst-plugins-base-0.10.26
+	>=media-plugins/gst-plugins-gconf-0.10
+
+	>=media-plugins/gst-plugins-taglib-0.10
+	>=media-plugins/gst-plugins-gio-0.10
+	>=media-plugins/gst-plugins-pango-0.10
+	>=media-plugins/gst-plugins-x-0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2
+
+	dev-libs/libunique
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXtst
+	>=x11-libs/libXrandr-1.1.1
+	>=x11-libs/libXxf86vm-1.0.1
+
+	bluetooth? ( || (
+		net-wireless/bluez
+		net-wireless/bluez-libs ) )
+	galago? ( >=dev-libs/libgalago-0.5.2 )
+	iplayer? (
+		dev-python/pygobject
+		dev-python/pygtk
+		dev-python/httplib2
+		dev-python/feedparser
+		dev-python/beautifulsoup )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.10 )
+	python? (
+		dev-lang/python[threads]
+		>=dev-python/pygtk-2.12
+		dev-python/pyxdg
+		dev-python/gst-python
+		dev-python/dbus-python
+		dev-python/gconf-python )
+	tracker? ( >=app-misc/tracker-0.7.1 )
+	youtube? (
+		>=dev-libs/libgdata-0.4.0
+		media-plugins/gst-plugins-soup )"
+# FIXME: freezes totem
+#	zeroconf? ( >=net-libs/libepc-0.3 )
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.20
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.11 )
+	app-text/docbook-xml-dtd:4.5"
+# docbook-xml-dtd is needed for user doc
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--disable-static
+		--disable-vala
+		--with-dbus
+		--with-smclient
+		--enable-easy-codec-installation
+		$(use_enable nsplugin browser-plugins)"
+
+	# Plugin configuration
+	G2CONF="${G2CONF}
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
+		PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
+
+	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot"
+	use bluetooth && plugins="${plugins},bemused"
+	use galago && plugins="${plugins},galago"
+	use iplayer && plugins="${plugins},iplayer"
+	use lirc && plugins="${plugins},lirc"
+	use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service"
+	use tracker && plugins="${plugins},tracker"
+	use youtube && plugins="${plugins},youtube"
+	#use zeroconf && plugins="${plugins},publish"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable nautilus)
+		$(use_enable python)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix broken smclient option passing
+	epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch"
+
+	epatch "${FILESDIR}/${P}-fix-gmp-plugin.patch"
+	epatch "${FILESDIR}/${P}-fix-pygtk-include.patch"
+	epatch "${FILESDIR}/${P}-fix-qt-eos.patch"
+
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_configure() {
+	# FIXME: why does it need write access here, probably need to set up a fake
+	# home in /var/tmp like other pkgs do
+
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	addpredict "$(unset HOME; echo ~)/.gnome2"
+
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+	# Installed for plugins, but they're dlopen()-ed
+	# firefox, totem as well as nautilus
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/$(get_libdir)/totem/plugins
+	fi
+
+	ewarn
+	ewarn "If totem doesn't play some video format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+}
diff --git a/media-video/totem/totem-2.90.5.ebuild b/media-video/totem/totem-2.90.5.ebuild
new file mode 100644
index 0000000..9b3942c
--- /dev/null
+++ b/media-video/totem/totem-2.90.5.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="1.11"
+#PYTHON_DEPEND="python? 2"
+#PYTHON_USE_WITH="threads"
+#PYTHON_USE_WITH_OPT="python"
+inherit autotools eutils gnome2 multilib #python
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://gnome.org/projects/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# FIXME: Enable for now python USE flag per bug #316409
+# this change should only be noticed by people not following current
+# current linux profiles default
+IUSE="bluetooth debug doc galago lirc nautilus nsplugin tracker +youtube" #iplayer +python vala zeroconf
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# check gmyth requirement ? -> waiting for updates in tree
+# coherence plugin not enabled until we have deps in tree
+# vala ( dev-lang/vala ) requires 0.7.5
+RDEPEND=">=dev-libs/glib-2.25.11
+	>=x11-libs/gtk+-2.90.3:3
+	>=gnome-base/gconf-2.0
+	>=dev-libs/totem-pl-parser-2.29.1
+	>=dev-libs/libpeas-0.5.2[gtk]
+	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/dbus-glib-0.71
+	>=media-libs/gstreamer-0.10.28.1
+	>=media-libs/gst-plugins-good-0.10
+	>=media-libs/gst-plugins-base-0.10.26
+	>=media-plugins/gst-plugins-gconf-0.10
+
+	>=media-plugins/gst-plugins-taglib-0.10
+	>=media-plugins/gst-plugins-gio-0.10
+	>=media-plugins/gst-plugins-pango-0.10
+	>=media-plugins/gst-plugins-x-0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2
+
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXtst
+	>=x11-libs/libXrandr-1.1.1
+	>=x11-libs/libXxf86vm-1.0.1
+
+	nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
+
+	bluetooth? ( || (
+		net-wireless/bluez
+		net-wireless/bluez-libs ) )
+	galago? ( >=dev-libs/libgalago-0.5.2 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.10 )
+	tracker? ( >=app-misc/tracker-0.8.1 )
+	youtube? (
+		>=dev-libs/libgdata-0.4.0
+		media-plugins/gst-plugins-soup )"
+# FIXME: no libpeas[vala] yet
+#	vala? ( >=dev-lang/vala-0.7.5 )
+
+# FIXME: disabled upstream (introspection not quite stable)
+#	python? (
+#		dev-python/pygobject[introspection]
+#		>=gnome-base/gconf-2.0[introspection]
+#		x11-libs/gtk+-2.90.3:3[introspection]
+#		x11-libs/pango[introspection]
+#		dev-python/pyxdg
+#		dev-python/gst-python
+#		dev-python/dbus-python
+#		iplayer? (
+#			dev-python/httplib2
+#			dev-python/feedparser
+#			dev-python/beautifulsoup ) )
+
+# FIXME: freezes totem
+#	zeroconf? ( >=net-libs/libepc-0.3 )
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.20
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.11 )
+	app-text/docbook-xml-dtd:4.5"
+# docbook-xml-dtd is needed for user doc
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+#	python_set_active_version 2
+
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--disable-static
+		--disable-vala
+		--with-dbus
+		--with-smclient
+		--enable-easy-codec-installation
+		$(use_enable nsplugin browser-plugins)"
+
+	# Plugin configuration
+	G2CONF="${G2CONF}
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+	local plugins="thumbnail,screensaver,ontop,gromit,media-player-keys,properties,sidebar-test,skipto,screenshot,brasero-disc-recorder"
+	use bluetooth && plugins="${plugins},bemused"
+	use galago && plugins="${plugins},galago"
+#	use iplayer && plugins="${plugins},iplayer"
+	use lirc && plugins="${plugins},lirc"
+#	use python && plugins="${plugins},pythonconsole,jamendo,opensubtitles,dbus-service"
+	use tracker && plugins="${plugins},tracker"
+	use youtube && plugins="${plugins},youtube"
+	#use zeroconf && plugins="${plugins},publish"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable nautilus)
+		--disable-python
+		--disable-introspection"
+#		$(use_enable python)
+#		$(use_enable python introspection)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix broken smclient option passing
+	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_configure() {
+	# FIXME: why does it need write access here, probably need to set up a fake
+	# home in /var/tmp like other pkgs do
+
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	addpredict "$(unset HOME; echo ~)/.gnome2"
+
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+	# Installed for plugins, but they're dlopen()-ed
+	# firefox, totem as well as nautilus
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+#	if use python; then
+#		python_need_rebuild
+#		python_mod_optimize /usr/$(get_libdir)/totem/plugins
+#	fi
+
+	ewarn
+	ewarn "If totem doesn't play some video format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+#	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+}
diff --git a/www-apps/dropbox/Manifest b/www-apps/dropbox/Manifest
index 0f172bd..d5d6dbe 100644
--- a/www-apps/dropbox/Manifest
+++ b/www-apps/dropbox/Manifest
@@ -1,4 +1,3 @@
 DIST dropbox-lnx.x86-0.7.110.tar.gz 13121925 RMD160 bdc8ef448975ec843a7b4f6ceb28b745f629c8a2 SHA1 290d6f7a0a0b792a97e6f68073ddaf45168ac516 SHA256 c0bf86580d7d56f1c8dd5de0e03fff330646e57080d749ef4bd529c19e42de58
 DIST dropbox-lnx.x86_64-0.7.110.tar.gz 13913378 RMD160 98abbdcf31bc34bce0d045d4890c7cc3137a23e6 SHA1 d1c1a1645dcd31bc993d0adb8b3b8a99093eb563 SHA256 16e972d31c33bde875df5baa49b6d260f219a5f7aedf16edf4c74e3d1434435f
 EBUILD dropbox-0.7.110.ebuild 939 RMD160 6866a99934d086aab810f3ed93900b0b71176ea3 SHA1 cfec1305ac50aaf68b8f1883e7d8dbd5fe68589c SHA256 37be457f9ed433d7089a36cd6b67ecc6d878b93a1a0258478da3ef192c284a09
-MISC dropbox-0.7.110.ebuild~ 892 RMD160 2742117d54411206301333bc886768094e15bd77 SHA1 9975a8425f147fe5e74d93e72c5412090b4ed0c8 SHA256 700852a97b41439bce9ba6bb324757b535fac90cd81355481fc8d0233c8e5e08