public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-clocks/, media-gfx/gnome-font-viewer/, app-misc/bijiben/, ...
@ 2013-11-14 23:19 Gilles Dartiguelongue
  0 siblings, 0 replies; only message in thread
From: Gilles Dartiguelongue @ 2013-11-14 23:19 UTC (permalink / raw
  To: gentoo-commits

commit:     bfe417e47cecb9cf26ae179c905c127d0aea16e9
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 01:14:17 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 01:17:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bfe417e4

Revert commit 255f0218..92e8d28f

Those commits are improperly tested and were not meant to be pushed yet.

---
 app-accessibility/orca/orca-3.10.0.ebuild          |  72 -----------
 app-arch/file-roller/file-roller-3.10.0.ebuild     | 102 ---------------
 app-arch/file-roller/file-roller-9999.ebuild       | 109 +++++++---------
 app-crypt/seahorse/seahorse-3.10.0.ebuild          |  66 ----------
 app-crypt/seahorse/seahorse-9999.ebuild            |  55 ++++----
 app-editors/gedit/gedit-3.10.0.ebuild              |  84 ------------
 app-editors/gedit/gedit-9999.ebuild                |  61 ++++-----
 app-misc/bijiben/bijiben-3.10.0.ebuild             |  38 ------
 app-misc/bijiben/metadata.xml                      |   5 -
 dev-util/devhelp/devhelp-3.10.0.ebuild             |  61 ---------
 gnome-base/nautilus/nautilus-3.10.0.ebuild         | 128 ------------------
 gnome-base/nautilus/nautilus-9999.ebuild           |  73 ++++-------
 .../gnome-clocks/gnome-clocks-3.10.0.ebuild        |  43 ------
 gnome-extra/gnome-clocks/metadata.xml              |   5 -
 .../gnome-contacts/gnome-contacts-3.10.ebuild      |  65 ----------
 .../gnome-contacts/gnome-contacts-9999.ebuild      |  15 +--
 .../gnome-documents/gnome-documents-3.10.0.ebuild  |  54 --------
 .../gnome-documents/gnome-documents-9999.ebuild    |  24 ++--
 .../gnome-system-monitor-3.10.0.ebuild             |  45 -------
 .../gnome-system-monitor-9999.ebuild               |  25 ++--
 .../gnome-user-share-3.10.0.ebuild                 |  55 --------
 gnome-extra/gnome-user-share/metadata.xml          |  10 --
 .../gnome-weather/gnome-weather-3.10.0.ebuild      |  28 ----
 .../gnome-font-viewer-3.10.0.ebuild                |  34 -----
 .../gnome-font-viewer-9999.ebuild                  |   9 +-
 media-gfx/gnome-photos/gnome-photos-3.10.0.ebuild  |  44 -------
 media-gfx/gnome-photos/metadata.xml                |   5 -
 media-video/totem/totem-3.10.0.ebuild              | 144 ---------------------
 media-video/totem/totem-9999.ebuild                | 107 ++++++++-------
 net-misc/vinagre/vinagre-3.10.0.ebuild             |  69 ----------
 net-misc/vinagre/vinagre-9999.ebuild               |  22 ++--
 sys-apps/baobab/baobab-3.10.ebuild                 |  39 ------
 sys-apps/baobab/baobab-9999.ebuild                 |  22 ++--
 ...iphany-3.10.0.ebuild => epiphany-3.7.91.ebuild} |  32 +++--
 www-client/epiphany/epiphany-9999.ebuild           |  36 +++---
 35 files changed, 273 insertions(+), 1513 deletions(-)

diff --git a/app-accessibility/orca/orca-3.10.0.ebuild b/app-accessibility/orca/orca-3.10.0.ebuild
deleted file mode 100644
index 3f3c275..0000000
--- a/app-accessibility/orca/orca-3.10.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.8.2.ebuild,v 1.1 2013/08/02 20:49:29 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_3 )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="http://projects.gnome.org/orca/"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# liblouis is not in portage yet
-# it is used to provide contracted braille support
-# XXX: Check deps for correctness
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.10:2
-	>=app-accessibility/at-spi2-core-2.10:2[introspection]
-	>=dev-libs/atk-2.10
-	>=dev-libs/glib-2.28:2
-	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-	dev-libs/atk[introspection]
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure ITSTOOL="$(type -P true)"
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-	installing() {
-		gnome2_src_install
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
-			-i src/orca/orca || die
-		python_doscript src/orca/orca
-	}
-	python_foreach_impl run_in_build_dir installing
-}

diff --git a/app-arch/file-roller/file-roller-3.10.0.ebuild b/app-arch/file-roller/file-roller-3.10.0.ebuild
deleted file mode 100644
index 4072333..0000000
--- a/app-arch/file-roller/file-roller-3.10.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.9.3:3
-	>=x11-libs/libnotify-0.4.3:=
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/pango
-	nautilus? ( >=gnome-base/nautilus-3 )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular achive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-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
-
-	# app-arch/{un,}rar-5 support, https://bugzilla.gnome.org/show_bug.cgi?id=707568
-	epatch "${FILESDIR}"/${PN}-3.8.4-rar-5.patch
-
-	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		--with-smclient=xsmp \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}

diff --git a/app-arch/file-roller/file-roller-9999.ebuild b/app-arch/file-roller/file-roller-9999.ebuild
index 4a45d61..5e5ecb5 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 readme.gentoo
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -14,39 +14,36 @@ fi
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="http://fileroller.sourceforge.net/"
 
-LICENSE="GPL-2+ CC-BY-SA-3.0"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 IUSE="nautilus packagekit"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 fi
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
 # pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.9.3:3
-	>=x11-libs/libnotify-0.4.3:=
+RDEPEND=">=dev-libs/glib-2.29.14:2
 	sys-apps/file
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
 	x11-libs/pango
+	x11-libs/libSM
+	x11-libs/libICE
+	>=x11-libs/gtk+-3.4:3
+	>=app-arch/libarchive-3:=
+	>=x11-libs/libnotify-0.4.3:=
+	>=dev-libs/json-glib-0.14
 	nautilus? ( >=gnome-base/nautilus-3 )
 	packagekit? ( app-admin/packagekit-base )
 "
 DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
 	>=dev-util/intltool-0.40.0
 	sys-devel/gettext
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 # eautoreconf needs:
 #	gnome-base/gnome-common
 
@@ -55,62 +52,50 @@ if [[ ${PV} = 9999 ]]; then
 		app-text/yelp-tools"
 fi
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular achive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
 src_prepare() {
+	# --disable-debug because enabling it adds -O0 to CFLAGS
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-run-in-place
+		--disable-static
+		--disable-debug
+		--enable-magic
+		--enable-libarchive
+		--with-smclient=xsmp
+		$(use_enable nautilus nautilus-actions)
+		$(use_enable packagekit)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+	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
 
-	# app-arch/{un,}rar-5 support, https://bugzilla.gnome.org/show_bug.cgi?id=707568
-	epatch "${FILESDIR}"/${PN}-3.8.4-rar-5.patch
-
 	# File providing Gentoo package names for various archivers
 	cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		--with-smclient=xsmp \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	readme.gentoo_print_elog
+
+	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 "  lzop    - app-arch/lzop"
+	elog "  rar     - app-arch/unrar or app-arch/unar"
+	elog "  rpm     - app-arch/rpm"
+	elog "  unstuff - app-arch/stuffit"
+	elog "  zoo     - app-arch/zoo"
 }

diff --git a/app-crypt/seahorse/seahorse-3.10.0.ebuild b/app-crypt/seahorse/seahorse-3.10.0.ebuild
deleted file mode 100644
index cf17971..0000000
--- a/app-crypt/seahorse/seahorse-3.10.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="avahi debug ldap"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.9.1:=
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.16
-	>=net-libs/libsoup-2.33.92:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	|| (
-		=app-crypt/gnupg-2.0*
-		=app-crypt/gnupg-1.4* )
-
-	avahi? ( >=net-dns/avahi-0.6:= )
-	ldap? ( net-nds/openldap:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Need seahorse-plugins git snapshot
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
-"
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g/d' \
-		-e '/CFLAGS="$CFLAGS -O0/d' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--disable-static \
-		--enable-hkp \
-		$(use_enable avahi sharing) \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}

diff --git a/app-crypt/seahorse/seahorse-9999.ebuild b/app-crypt/seahorse/seahorse-9999.ebuild
index 358dae0..28028d1 100644
--- a/app-crypt/seahorse/seahorse-9999.ebuild
+++ b/app-crypt/seahorse/seahorse-9999.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI="4"
 GCONF_DEBUG="yes"
-VALA_MIN_API_DEPEND="0.18"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live vala
+	inherit gnome2-live
 fi
 
 DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
+HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
-LICENSE="GPL-2+ FDL-1.1+"
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="avahi debug ldap"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 COMMON_DEPEND="
-	>=app-crypt/gcr-3.9.1:=
+	>=app-crypt/gcr-3.3.4
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.16
-	>=net-libs/libsoup-2.33.92:2.4
+	>=app-crypt/libsecret-0.5
+	net-libs/libsoup:2.4
 	x11-misc/shared-mime-info
 
 	net-misc/openssh
@@ -37,10 +37,11 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-2.0*
 		=app-crypt/gnupg-1.4* )
 
-	avahi? ( >=net-dns/avahi-0.6:= )
-	ldap? ( net-nds/openldap:= )
+	avahi? ( >=net-dns/avahi-0.6 )
+	ldap? ( net-nds/openldap )
 "
 DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -51,7 +52,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
-		$(vala_depend)
 		app-text/yelp-tools"
 fi
 
@@ -65,20 +65,17 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=""
-	if [[ ${PV} != 9999 ]]; then
-		myconf="${myconf}
-			ITSTOOL=$(type -P true)
-			VALAC=$(type -P true)"
-	fi
-	gnome2_src_configure \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--disable-static \
-		--enable-hkp \
-		$(use_enable avahi sharing) \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		${myconf}
+	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
+	G2CONF="${G2CONF}
+		--enable-pgp
+		--enable-ssh
+		--enable-pkcs11
+		--disable-static
+		--enable-hkp
+		$(use_enable avahi sharing)
+		$(use_enable debug)
+		$(use_enable ldap)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+
+	gnome2_src_configure
 }

diff --git a/app-editors/gedit/gedit-3.10.0.ebuild b/app-editors/gedit/gedit-3.10.0.ebuild
deleted file mode 100644
index 6205421..0000000
--- a/app-editors/gedit/gedit-3.10.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{2,3} )
-
-inherit eutils gnome2 multilib python-r1 virtualx
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python spell zeitgeist"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-COMMON_DEPEND="
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.37.5:2
-	>=x11-libs/gtk+-3.9.9:3[introspection?]
-	>=x11-libs/gtksourceview-3.9.91:3.0[introspection?]
-	>=dev-libs/libpeas-1.7.0[gtk]
-
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-
-	x11-libs/libX11
-
-	net-libs/libsoup:2.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-0.9.3
-		>=x11-libs/gtk+-3:3[introspection]
-		>=x11-libs/gtksourceview-3.6:3.0[introspection]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
-	spell? (
-		>=app-text/enchant-1.2:=
-		>=app-text/iso-codes-0.35 )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/scrollkeeper-0.3.11
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-# yelp-tools, gnome-common needed to eautoreconf
-
-src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable spell) \
-		$(use_enable zeitgeist) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild
index 84d8f06..7580adc 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{2,3} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils gnome2 multilib python-r1 virtualx
+inherit eutils gnome2 multilib python-single-r1 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -15,30 +15,31 @@ fi
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Gedit"
 
-LICENSE="GPL-2+ CC-BY-SA-3.0"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
-
 IUSE="+introspection +python spell zeitgeist"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 fi
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
+	>=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/glib-2.37.5:2
-	>=x11-libs/gtk+-3.9.9:3[introspection?]
-	>=x11-libs/gtksourceview-3.9.91:3.0[introspection?]
-	>=dev-libs/libpeas-1.7.0[gtk]
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.3.15:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
+	>=dev-libs/libpeas-1.1.0[gtk]
 
 	gnome-base/gsettings-desktop-schemas
 	gnome-base/gvfs
 
 	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
 
 	net-libs/libsoup:2.4
 
@@ -48,16 +49,14 @@ COMMON_DEPEND="
 		>=dev-libs/gobject-introspection-0.9.3
 		>=x11-libs/gtk+-3:3[introspection]
 		>=x11-libs/gtksourceview-3.6:3.0[introspection]
-		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycairo
 		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
 	spell? (
 		>=app-text/enchant-1.2:=
 		>=app-text/iso-codes-0.35 )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
+	zeitgeist? ( dev-libs/libzeitgeist )"
 RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-"
+	x11-themes/gnome-icon-theme-symbolic"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=app-text/scrollkeeper-0.3.11
@@ -75,20 +74,24 @@ if [[ ${PV} = 9999 ]]; then
 		app-text/yelp-tools"
 fi
 
-src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable spell) \
-		$(use_enable zeitgeist) \
-		ITSTOOL=$(type -P true) \
-		${myconf}
+	G2CONF="${G2CONF}
+		--disable-deprecations
+		--enable-updater
+		--enable-gvfs-metadata
+		$(use_enable introspection)
+		$(use_enable python)
+		$(use_enable spell)
+		$(use_enable zeitgeist)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+
+	gnome2_src_prepare
 }
 
 src_test() {

diff --git a/app-misc/bijiben/bijiben-3.10.0.ebuild b/app-misc/bijiben/bijiben-3.10.0.ebuild
deleted file mode 100644
index 64ea94b..0000000
--- a/app-misc/bijiben/bijiben-3.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="http://live.gnome.org/Bijiben"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/tracker-0.16:=
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxml2
-	gnome-extra/zeitgeist
-	media-libs/clutter-gtk:1.0
-	net-libs/gnome-online-accounts
-	net-libs/webkit-gtk:3
-	sys-apps/util-linux
-	>=x11-libs/gtk+-3.9.3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure ITSTOOL="$(type -P true)"
-}

diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
deleted file mode 100644
index 6e0e2ec..0000000
--- a/app-misc/bijiben/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-</pkgmetadata>

diff --git a/dev-util/devhelp/devhelp-3.10.0.ebuild b/dev-util/devhelp/devhelp-3.10.0.ebuild
deleted file mode 100644
index 12a10bc..0000000
--- a/dev-util/devhelp/devhelp-3.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_2,3_3} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="http://live.gnome.org/devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-# FIXME: automagic python dependency
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=x11-libs/gtk+-3.9.8:3
-	>=net-libs/webkit-gtk-2:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure ${myconf}
-}

diff --git a/gnome-base/nautilus/nautilus-3.10.0.ebuild b/gnome-base/nautilus/nautilus-3.10.0.ebuild
deleted file mode 100644
index b9b2004..0000000
--- a/gnome-base/nautilus/nautilus-3.10.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit eutils gnome2 readme.gentoo virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-
-# profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-RESTRICT="test"
-
-# FIXME: selinux support is automagic
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.3:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.11:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
-	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
-	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
-		-i configure || die "sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
-	gnome2_src_configure \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable debug) \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index a6edc33..7c8dbc8 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
+GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 readme.gentoo virtualx
+inherit eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,14 +16,13 @@ HOMEPAGE="http://live.gnome.org/Nautilus"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-
 # profiling?
 IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
 
 # FIXME: tests fails under Xvfb, but pass when building manually
@@ -34,14 +33,14 @@ RESTRICT="test"
 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
 # and 2.30.0
 COMMON_DEPEND="
-	>=dev-libs/glib-2.35.3:2
+	>=dev-libs/glib-2.33.13:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.11:3[introspection?]
+	>=x11-libs/gtk+-3.5.12:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3:3=
 
 	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
+	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	x11-libs/libXext
@@ -49,9 +48,8 @@ COMMON_DEPEND="
 
 	exif? ( >=media-libs/libexif-0.6.20 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0 )
-"
+	tracker? ( >=app-misc/tracker-0.14:= )
+	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
 	>=dev-util/gdbus-codegen-2.33
@@ -59,26 +57,20 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xproto
-"
+	x11-proto/xproto"
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
 # For eautoreconf
 #	gnome-base/gnome-common
 #	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? (
+PDEPEND="gnome? (
 		>=x11-themes/gnome-icon-theme-1.1.91
 		x11-themes/gnome-icon-theme-symbolic )
 	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
 	previewer? ( >=gnome-extra/sushi-0.1.9 )
 	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
+	>=gnome-base/gvfs-1.14[gtk]"
 # Need gvfs[gtk] for recent:/// support
 
 if [[ ${PV} = 9999 ]]; then
@@ -87,34 +79,26 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
 	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
 
-	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
-	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
-		-i configure || die "sed failed"
 	gnome2_src_prepare
 }
 
 src_configure() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
-	gnome2_src_configure \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable debug) \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
+	G2CONF="${G2CONF}
+		--disable-profiling
+		--disable-update-mimedb
+		$(use_enable debug)
+		$(use_enable exif libexif)
+		$(use_enable introspection)
+		$(use_enable packagekit)
+		$(use_enable sendto nst-extension)
+		$(use_enable tracker)
+		$(use_enable xmp)"
+	gnome2_src_configure
 }
 
 src_test() {
@@ -125,16 +109,13 @@ src_test() {
 	unset GSETTINGS_BACKEND
 }
 
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 
 	if use previewer; then
-		readme.gentoo_print_elog
+		elog "nautilus uses gnome-extra/sushi to preview media files."
+		elog "To activate the previewer, select a file and press space; to"
+		elog "close the previewer, press space again."
 	else
 		elog "To preview media files, emerge nautilus with USE=previewer"
 	fi

diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.10.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.10.0.ebuild
deleted file mode 100644
index 643071c..0000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-clocks/gnome-clocks-3.8.2.ebuild,v 1.2 2013/06/30 21:35:08 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="http://live.gnome.org/GnomeClocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.9.11:3
-	>=media-libs/libcanberra-0.30
-	>=dev-libs/libgweather-3.9.91:=
-	>=gnome-base/gnome-desktop-3.7.90:=
-	>=sci-geosciences/geocode-glib-0.99.3
-	>=app-misc/geoclue-1.99.3
-	>=x11-libs/libnotify-0.7:=
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure ITSTOOL=$(type -P true)
-}

diff --git a/gnome-extra/gnome-clocks/metadata.xml b/gnome-extra/gnome-clocks/metadata.xml
deleted file mode 100644
index 6e0e2ec..0000000
--- a/gnome-extra/gnome-clocks/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-</pkgmetadata>

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.10.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.10.ebuild
deleted file mode 100644
index 1f7a4ef..0000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-0.9.6
-	dev-libs/folks[vala(+)]
-	gnome-base/gnome-desktop[introspection]
-	gnome-extra/evolution-data-server[vala]
-	net-libs/telepathy-glib[vala]
-	x11-libs/libnotify[introspection]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=dev-libs/folks-0.9.5:=[eds,telepathy]
-	>=dev-libs/glib-2.37.6:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts]
-	>=gnome-base/gnome-desktop-3.0:3=
-	net-libs/gnome-online-accounts
-	>=net-libs/telepathy-glib-0.17.5
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libnotify:=
-	>=x11-libs/gtk+-3.9.11:3
-	x11-libs/pango
-	v4l? ( >=media-video/cheese-3.5.91:= )
-"
-DEPEND="${RDEPEND}
-	${VALA_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Regenerate the pre-generated C sources, bug #471628
-	if ! use v4l; then
-		touch src/*.vala
-	fi
-
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_with v4l cheese)
-}

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
index 4a9e7d8..76a7d7c 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.18"
 
 inherit gnome2 vala
 if [[ ${PV} = 9999 ]]; then
@@ -13,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -26,8 +25,7 @@ else
 fi
 VALA_DEPEND="
 	$(vala_depend)
-	>=dev-libs/gobject-introspection-0.9.6
-	dev-libs/folks[vala(+)]
+	dev-libs/folks[vala]
 	gnome-base/gnome-desktop[introspection]
 	gnome-extra/evolution-data-server[vala]
 	net-libs/telepathy-glib[vala]
@@ -35,8 +33,8 @@ VALA_DEPEND="
 "
 # Configure is wrong; it needs cheese-3.5.91, not 3.3.91
 RDEPEND="
-	>=dev-libs/folks-0.9.5:=[eds,telepathy]
-	>=dev-libs/glib-2.37.6:2
+	>=dev-libs/folks-0.7.3:=[eds,telepathy]
+	>=dev-libs/glib-2.31.10:2
 	>=dev-libs/libgee-0.10:0.8
 	>=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts]
 	>=gnome-base/gnome-desktop-3.0:3=
@@ -45,13 +43,12 @@ RDEPEND="
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/libnotify:=
-	>=x11-libs/gtk+-3.9.11:3
+	>=x11-libs/gtk+-3.4:3
 	x11-libs/pango
 	v4l? ( >=media-video/cheese-3.5.91:= )
 "
 DEPEND="${RDEPEND}
 	${VALA_DEPEND}
-	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig

diff --git a/gnome-extra/gnome-documents/gnome-documents-3.10.0.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.10.0.ebuild
deleted file mode 100644
index ad1a9c0..0000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://live.gnome.org/Design/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
-COMMON_DEPEND="
-	>=app-misc/tracker-0.16:=
-	>=app-text/evince-3.7.4[introspection]
-	dev-libs/gjs
-	>=dev-libs/glib-2.37:2
-	>=dev-libs/gobject-introspection-1.31.6
-	>=dev-libs/libgdata-0.13.3[gnome,introspection]
-	gnome-base/gnome-desktop:3=
-	>=media-libs/clutter-1.10:1.0
-	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0
-	>=net-libs/libsoup-2.41.3:2.4
-	>=net-libs/libzapojit-0.0.2
-	>=net-libs/webkit-gtk-1.10.0:3
-	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
-	>=x11-libs/gtk+-3.9.11:3[introspection]
-	x11-libs/pango[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/gnome-online-miners
-	media-libs/clutter[introspection]
-	sys-apps/dbus
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add prev/back navigation with Left and Right keys (from 'master')
-	epatch "${FILESDIR}/${PN}-3.8.3-navigation-keys.patch"
-	gnome2_src_prepare
-}

diff --git a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild b/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
index 9e12a59..6344387 100644
--- a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
-DESCRIPTION="A document manager application for GNOME"
+DESCRIPTION="GNOME document manager"
 HOMEPAGE="https://live.gnome.org/Design/Apps/Documents"
 
 LICENSE="GPL-2+"
@@ -19,37 +20,34 @@ IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 # Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
 COMMON_DEPEND="
-	>=app-misc/tracker-0.16:=
-	>=app-text/evince-3.7.4[introspection]
+	>=app-misc/tracker-0.13.1:=
+	>=app-text/evince-3.3.0[introspection]
 	dev-libs/gjs
-	>=dev-libs/glib-2.37:2
+	>=dev-libs/glib-2.31.6:2
 	>=dev-libs/gobject-introspection-1.31.6
-	>=dev-libs/libgdata-0.13.3[gnome,introspection]
+	>=dev-libs/libgdata-0.13.1[gnome,introspection]
 	gnome-base/gnome-desktop:3=
 	>=media-libs/clutter-1.10:1.0
 	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
 	>=net-libs/gnome-online-accounts-3.2.0
-	>=net-libs/libsoup-2.41.3:2.4
+	net-libs/libsoup:2.4
 	>=net-libs/libzapojit-0.0.2
-	>=net-libs/webkit-gtk-1.10.0:3
 	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
-	>=x11-libs/gtk+-3.9.11:3[introspection]
+	>=x11-libs/gtk+-3.5.5:3[introspection]
 	x11-libs/pango[introspection]
 "
 RDEPEND="${COMMON_DEPEND}
-	gnome-extra/gnome-online-miners
 	media-libs/clutter[introspection]
 	sys-apps/dbus
 	x11-themes/gnome-icon-theme-symbolic
 "
 DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
+	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "

diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.0.ebuild
deleted file mode 100644
index 7bd7963..0000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd +X"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=gnome-base/libgtop-2.28.2:2
-	>=x11-libs/gtk+-3.9.5:3[X(+)]
-	>=x11-themes/gnome-icon-theme-2.31
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.34:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-
-	systemd? ( >=sys-apps/systemd-38 )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.20
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	systemd? ( !=sys-apps/systemd-43* )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X wnck) \
-		ITSTOOL=$(type -P true)
-}

diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
index e06ad17..b30ac5b 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
+HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,18 +22,17 @@ else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
+RDEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/libwnck-2.91.0:3
 	>=gnome-base/libgtop-2.28.2:2
-	>=x11-libs/gtk+-3.9.5:3[X(+)]
+	>=x11-libs/gtk+-3.0:3[X(+)]
 	>=x11-themes/gnome-icon-theme-2.31
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.34:2
+	>=dev-cpp/gtkmm-2.99:3.0
+	>=dev-cpp/glibmm-2.27:2
 	>=dev-libs/libxml2-2.0:2
 	>=gnome-base/librsvg-2.35:2
 
 	systemd? ( >=sys-apps/systemd-38 )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
 "
 DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.20
@@ -50,10 +49,8 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X wnck) \
-		${myconf}
+	G2CONF="${G2CONF}
+		$(use_enable systemd)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_configure
 }

diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.10.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.10.0.ebuild
deleted file mode 100644
index b54d126..0000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# FIXME: could libnotify be made optional ?
-# FIXME: selinux automagic support
-# FIXME: bluetooth can be optional if nautilus is too
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3:3
-	>=app-mobilephone/obex-data-server-0.4
-	>=dev-libs/dbus-glib-0.70
-	>=gnome-base/nautilus-2.91.7
-	media-libs/libcanberra[gtk3]
-	>=net-wireless/gnome-bluetooth-3.9.3:2
-	>=net-wireless/bluez-4.18
-	>=sys-apps/dbus-1.1.1
-	>=www-apache/mod_dnssd-0.6
-	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	>=x11-libs/libnotify-0.7:=
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_prepare() {
-	# Rebuild marshalers for <glib-2.31 compatibility
-	rm -v src/marshal.{c,h} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		ITSTOOL=$(type -P true) \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
-}

diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
deleted file mode 100644
index b9d6294..0000000
--- a/gnome-extra/gnome-user-share/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-  <maintainer>
-    <email>eva@gentoo.org</email>
-	<name>Gilles Dartiguelongue</name>
-	<description>Primary maintainer</description>
-  </maintainer>
-</pkgmetadata>

diff --git a/gnome-extra/gnome-weather/gnome-weather-3.10.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.10.0.ebuild
deleted file mode 100644
index e300534..0000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://live.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/gjs
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9
-	>=dev-libs/libgweather-3.9.5
-	>=x11-libs/gtk+-3.9.4:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-"

diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.10.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.10.0.ebuild
deleted file mode 100644
index 03eb7ad..0000000
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Font viewer for GNOME 3"
-HOMEPAGE="https://live.gnome.org/GnomeUtils"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2
-	gnome-base/gnome-desktop:3=
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=x11-libs/gtk+-3.9.11:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-control-center-2.91
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4, and of g-c-c before 2.91
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"

diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
index d58ac39..9ae69f6 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -23,11 +24,13 @@ else
 fi
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2
+	>=dev-libs/glib-2.31.0:2
 	gnome-base/gnome-desktop:3=
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	>=x11-libs/gtk+-3.9.11:3
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.0.3:3
+	x11-libs/pango
 "
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-control-center-2.91

diff --git a/media-gfx/gnome-photos/gnome-photos-3.10.0.ebuild b/media-gfx/gnome-photos/gnome-photos-3.10.0.ebuild
deleted file mode 100644
index ea6dae3..0000000
--- a/media-gfx/gnome-photos/gnome-photos-3.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/tracker-0.16:=
-	>=dev-libs/glib-2.35.1:2
-	gnome-base/gnome-desktop:3=
-	>=gnome-base/librsvg-2.26.0
-	media-libs/babl
-	>=media-libs/gegl-0.2
-	media-libs/grilo:0.2
-	media-plugins/grilo-plugins:0.2[upnp-av]
-	>=media-libs/exempi-1.99.5
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.14
-	>=net-libs/gnome-online-accounts-3.8
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.11:3
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-src_install() {
-	default
-	rm -r "${D}/usr/share/doc/${PN}" || die
-}

diff --git a/media-gfx/gnome-photos/metadata.xml b/media-gfx/gnome-photos/metadata.xml
deleted file mode 100644
index 6e0e2ec..0000000
--- a/media-gfx/gnome-photos/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-</pkgmetadata>

diff --git a/media-video/totem/totem-3.10.0.ebuild b/media-video/totem/totem-3.10.0.ebuild
deleted file mode 100644
index 7d79b35..0000000
--- a/media-video/totem/totem-3.10.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
-# see bug #359379
-REQUIRED_USE="
-	flash? ( nsplugin )
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	zeitgeist? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup to test it
-#
-# FIXME:
-# Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-RDEPEND="
-	>=dev-libs/glib-2.33:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.10:3[introspection?]
-	>=dev-libs/totem-pl-parser-3.9.92[introspection?]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=x11-themes/gnome-icon-theme-2.16
-	x11-libs/cairo
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/clutter-1.10:1.0
-	>=media-libs/clutter-gst-1.5.5:2.0
-	>=media-libs/clutter-gtk-1.0.2:1.0
-	x11-libs/mx:1.0
-
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[X,introspection?,pango]
-	>=media-libs/gst-plugins-bad-1.0.2:1.0
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	media-plugins/gst-plugins-meta:1.0
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXxf86vm-1.0.1
-
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-symbolic
-
-	flash? ( dev-libs/totem-pl-parser[quvi] )
-	grilo? (
-		media-libs/grilo:0.2
-		media-plugins/grilo-plugins:0.2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	nsplugin? (
-		>=dev-libs/dbus-glib-0.82
-		>=x11-misc/shared-mime-info-0.22 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.5.2:3[introspection] )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/scrollkeeper
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	x11-proto/xextproto
-	x11-proto/xproto
-	virtual/pkgconfig
-"
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent pylint usage by tests, bug #482538
-	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
-
-	# Disabled: sample-python, sample-vala
-	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
-	plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
-	plugins+=",properties,recent,rotation,screensaver,screenshot"
-	plugins+=",sidebar-test,skipto,vimeo"
-	use grilo && plugins+=",grilo"
-	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use zeitgeist && plugins+=",zeitgeist-dp"
-
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-	# XXX: always set to true otherwise tests fails due to pylint not
-	# respecting EPYTHON (wait for python-r1)
-	# pylint is checked unconditionally, but is only used for make check
-	gnome2_src_configure \
-		--disable-run-in-source-tree \
-		--disable-static \
-		--with-smclient=auto \
-		--enable-easy-codec-installation \
-		--enable-vala \
-		$(use_enable flash vegas-plugin) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugins) \
-		$(use_enable python) \
-		PYLINT=$(type -P true) \
-		VALAC=$(type -P true) \
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-plugins=${plugins}
-}

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 46d373f..edea640 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_COMPAT=( python2_{6,7} )
 PYTHON_REQ_USE="threads"
 
-inherit autotools eutils gnome2 multilib python-single-r1
+inherit gnome2 multilib python-single-r1
 if [[ ${PV} = 9999 ]]; then
 	VALA_MIN_API_VERSION="0.14"
 	inherit gnome2-live vala
@@ -21,18 +21,16 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
 # see bug #359379
-REQUIRED_USE="
-	flash? ( nsplugin )
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	zeitgeist? ( introspection )
-"
+REQUIRED_USE="flash? ( nsplugin )
+	python? ( introspection )
+	zeitgeist? ( introspection )"
 
 if [[ ${PV} = 9999 ]]; then
 	IUSE+=" doc vala"
 	REQUIRED_USE+=" zeitgeist? ( vala )"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 fi
 
 # TODO:
@@ -44,13 +42,13 @@ fi
 RDEPEND="
 	>=dev-libs/glib-2.33:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.10:3[introspection?]
-	>=dev-libs/totem-pl-parser-3.9.92[introspection?]
+	>=x11-libs/gtk+-3.5.2:3[introspection?]
+	>=dev-libs/totem-pl-parser-2.32.4[introspection?]
 	>=dev-libs/libpeas-1.1.0[gtk]
 	>=x11-themes/gnome-icon-theme-2.16
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6:2
-	>=media-libs/clutter-1.10:1.0
+	>=media-libs/clutter-1.6.8:1.0
 	>=media-libs/clutter-gst-1.5.5:2.0
 	>=media-libs/clutter-gtk-1.0.2:1.0
 	x11-libs/mx:1.0
@@ -71,9 +69,7 @@ RDEPEND="
 	x11-themes/gnome-icon-theme-symbolic
 
 	flash? ( dev-libs/totem-pl-parser[quvi] )
-	grilo? (
-		media-libs/grilo:0.2
-		media-plugins/grilo-plugins:0.2 )
+	grilo? ( media-libs/grilo:0.2 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	lirc? ( app-misc/lirc )
 	nautilus? ( >=gnome-base/nautilus-2.91.3 )
@@ -85,11 +81,12 @@ RDEPEND="
 		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
 		dev-python/pyxdg[${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.5.2:3[introspection] )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+		>=x11-libs/gtk+-2.91.7:3[introspection] )
+	zeitgeist? ( dev-libs/libzeitgeist )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.5
+	>=app-text/gnome-doc-utils-0.20.3
 	app-text/scrollkeeper
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40
@@ -100,79 +97,77 @@ DEPEND="${RDEPEND}
 	test? ( python? ( dev-python/pylint ) )
 "
 # docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
 # Only needed when regenerating C sources from Vala files
 if [[ ${PV} = 9999 ]]; then
 	DEPEND+=" vala? ( $(vala_depend) )
-		app-text/yelp-tools
 		doc? ( >=dev-util/gtk-doc-1.14 )"
 fi
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
 	mkdir -p m4
 
-	# Prevent pylint usage by tests, bug #482538
-	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
 	if [[ ${PV} = 9999 ]]; then
 		# Only needed when regenerating C sources from Vala files
 		use vala && vala_src_prepare
 	fi
 	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
 }
 
 src_configure() {
-	local myconf=""
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
 
+	#--with-smclient=auto needed to correctly link to libICE and libSM
+	G2CONF="${G2CONF}
+		--disable-run-in-source-tree
+		--disable-static
+		--with-smclient=auto
+		--enable-easy-codec-installation
+		$(use_enable flash vegas-plugin)
+		$(use_enable introspection)
+		$(use_enable nautilus)
+		$(use_enable nsplugin browser-plugins)
+		$(use_enable python)
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+	# XXX: always set to true otherwise tests fails due to pylint not
+	# respecting EPYTHON (wait for python-r1)
+	# pylint is checked unconditionally, but is only used for make check
+	G2CONF="${G2CONF} PYLINT=$(type -P true)"
+
 	# Disabled: sample-python, sample-vala
 	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
 	plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
-	plugins+=",properties,recent,rotation,screensaver,screenshot"
-	plugins+=",sidebar-test,skipto,vimeo"
+	plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
+	plugins+=",skipto"
 	use grilo && plugins+=",grilo"
 	use lirc && plugins+=",lirc"
 	use nautilus && plugins+=",save-file"
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
 	if [[ ${PV} = 9999 ]]; then
 		# Only needed when regenerating C sources from Vala files
-		myconf="${myconf} $(use_enable vala)"
+		G2CONF="${G2CONF} $(use_enable vala)"
 		use vala && plugins+=",rotation"
 	else
-		myconf="${myconf} --enable-vala VALAC=$(type -P true)"
+		G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
 		plugins+=",rotation"
 	fi
 	use zeitgeist && plugins+=",zeitgeist-dp"
 
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-	# XXX: always set to true otherwise tests fails due to pylint not
-	# respecting EPYTHON (wait for python-r1)
-	# pylint is checked unconditionally, but is only used for make check
-	gnome2_src_configure \
-		--disable-run-in-source-tree \
-		--disable-static \
-		--with-smclient=auto \
-		--enable-easy-codec-installation \
-		--enable-vala \
-		$(use_enable flash vegas-plugin) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugins) \
-		$(use_enable python) \
-		PYLINT=$(type -P true) \
-		VALAC=$(type -P true) \
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-plugins=${plugins} \
-		${myconf}
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	# Work around sandbox violations when FEATURES=-userpriv caused by
+	# gst-inspect-1.0(bug #358755)
+	unset DISPLAY
+	gnome2_src_configure
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ewarn
+	ewarn "If totem doesn't play some video format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
 }

diff --git a/net-misc/vinagre/vinagre-3.10.0.ebuild b/net-misc/vinagre/vinagre-3.10.0.ebuild
deleted file mode 100644
index d6ec931..0000000
--- a/net-misc/vinagre/vinagre-3.10.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
-
-inherit gnome2 vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi rdp +ssh spice +telepathy"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-# FIXME: uses xfreerdp ???
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
-	app-crypt/libsecret
-	>=dev-libs/libxml2-2.6.31:2
-	>=net-libs/gtk-vnc-0.4.3[gtk3]
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-	rdp? ( net-misc/rdesktop )
-	ssh? ( >=x11-libs/vte-0.20:2.90 )
-	spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.11.6 )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	gnome2_src_configure \
-		$(use_with avahi) \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove its own installation of DOCS that go to $PN instead of $P and aren't ecompressed
-	rm -rf "${ED}"/usr/share/doc/vinagre || die
-}

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
index 3f5845b..a4fbaa3 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -4,31 +4,30 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
+GNOME2_LA_PUNT="yes"
 
-inherit gnome2 vala
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Vinagre"
+HOMEPAGE="http://live.gnome.org/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 IUSE="avahi rdp +ssh spice +telepathy"
 
 # cairo used in vinagre-tab
 # gdk-pixbuf used all over the place
-# FIXME: uses xfreerdp ???
 RDEPEND="
 	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
+	>=x11-libs/gtk+-3.0.3:3
 	app-crypt/libsecret
 	>=dev-libs/libxml2-2.6.31:2
 	>=net-libs/gtk-vnc-0.4.3[gtk3]
@@ -49,31 +48,30 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	$(vala_depend)
 "
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND+="
+		dev-lang/vala:0.18
 		app-text/yelp-tools
 		gnome-base/gnome-common"
 fi
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} = 9999 ]] || myconf="ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
+	[[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
+		VALAC=$(type -P valac-0.18) \
 		$(use_with avahi) \
 		$(use_enable rdp) \
 		$(use_enable ssh) \
 		$(use_enable spice) \
-		$(use_with telepathy) \
-		${myconf}
+		$(use_with telepathy)
 }
 
 src_install() {
 	gnome2_src_install
 
 	# Remove its own installation of DOCS that go to $PN instead of $P and aren't ecompressed
-	rm -rf "${ED}"/usr/share/doc/vinagre || die
+	rm -rf "${ED}"/usr/share/doc/vinagre
 }

diff --git a/sys-apps/baobab/baobab-3.10.ebuild b/sys-apps/baobab/baobab-3.10.ebuild
deleted file mode 100644
index 4d364b8..0000000
--- a/sys-apps/baobab/baobab-3.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://live.gnome.org/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.5:2
-	>=x11-libs/gtk+-3.9.10:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure   \
-		ITSTOOL=$(type -P true) \
-		XMLLINT=$(type -P true) \
-		VALAC=$(type -P true)  \
-		VAPIGEN=$(type -P true)
-}

diff --git a/sys-apps/baobab/baobab-9999.ebuild b/sys-apps/baobab/baobab-9999.ebuild
index c977af5..9404413 100644
--- a/sys-apps/baobab/baobab-9999.ebuild
+++ b/sys-apps/baobab/baobab-9999.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
-	VALA_MIN_API_VERSION="0.22s"
+	VALA_MIN_API_VERSION="0.18"
 	VALA_USE_DEPEND="vapigen"
 	inherit gnome2-live vala
 fi
 
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://live.gnome.org/Baobab"
+DESCRIPTION="Disk usage browser for GNOME 3"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
@@ -25,8 +26,12 @@ else
 fi
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.37.5:2
-	>=x11-libs/gtk+-3.9.10:3
+	>=dev-libs/glib-2.30.0:2
+	gnome-base/libgtop:2=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.5.9:3
+	x11-libs/pango
 "
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/gsettings-desktop-schemas
@@ -52,13 +57,12 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=""
 	if [[ ${PV} != 9999 ]]; then
-		myconf="${myconf}
+		G2CONF="${G2CONF}
 			ITSTOOL=$(type -P true)
 			XMLLINT=$(type -P true)
 			VALAC=$(type -P true)
 			VAPIGEN=$(type -P true)"
 	fi
-	gnome2_src_configure ${myconf}
+	gnome2_src_configure
 }

diff --git a/www-client/epiphany/epiphany-3.10.0.ebuild b/www-client/epiphany/epiphany-3.7.91.ebuild
similarity index 76%
rename from www-client/epiphany/epiphany-3.10.0.ebuild
rename to www-client/epiphany/epiphany-3.7.91.ebuild
index 74dd421..0d22fc4 100644
--- a/www-client/epiphany/epiphany-3.10.0.ebuild
+++ b/www-client/epiphany/epiphany-3.7.91.ebuild
@@ -4,9 +4,11 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 pax-utils versionator virtualx
+inherit autotools eutils gnome2 pax-utils versionator virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="http://projects.gnome.org/epiphany/"
@@ -14,26 +16,30 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+nss test"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
 
 RDEPEND="
-	>=app-crypt/gcr-3.5.5
 	>=app-crypt/libsecret-0.14
+	>=app-crypt/gcr-3.5.5
 	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.1.4:3[jit?]
-	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.9.12:3
+	>=net-dns/avahi-0.6.22
+	>=net-libs/webkit-gtk-1.11.5:3
+	>=net-libs/libsoup-2.41.3:2.4
+	>=x11-libs/gtk+-3.7.10:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
-	x11-libs/libwnck:3
+	x11-libs/libwnck
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
@@ -55,9 +61,8 @@ src_configure() {
 		--enable-shared \
 		--disable-static \
 		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests) \
-		ITSTOOL=$(type -P true)
+		$(use_enable nss)
+		$(use_enable test tests)
 }
 
 src_compile() {
@@ -76,5 +81,4 @@ src_test() {
 src_install() {
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
 	gnome2_src_install
-	use jit && pax-mark m "${ED}usr/bin/epiphany"
 }

diff --git a/www-client/epiphany/epiphany-9999.ebuild b/www-client/epiphany/epiphany-9999.ebuild
index 1c6bd50..7e6cdeb 100644
--- a/www-client/epiphany/epiphany-9999.ebuild
+++ b/www-client/epiphany/epiphany-9999.ebuild
@@ -4,9 +4,8 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 pax-utils versionator virtualx
+inherit autotools eutils gnome2 pax-utils versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -17,7 +16,7 @@ HOMEPAGE="http://projects.gnome.org/epiphany/"
 # TODO: coverage
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+jit +nss test"
+IUSE="+nss test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -26,21 +25,21 @@ fi
 
 RDEPEND="
 	>=app-crypt/gcr-3.5.5
-	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
 	>=dev-libs/glib-2.35.6:2
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
+	>=gnome-base/gnome-keyring-2.26.0
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
-	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.1.4:3[jit?]
-	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.9.12:3
+	>=net-dns/avahi-0.6.22
+	>=net-libs/webkit-gtk-1.11.5:3
+	>=net-libs/libsoup-2.41.3:2.4
+	>=x11-libs/gtk+-3.5.4:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
 	dev-db/sqlite:3
-	x11-libs/libwnck:3
+	x11-libs/libwnck
 	x11-libs/libX11
 
 	x11-themes/gnome-icon-theme
@@ -56,20 +55,15 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-if [[ ${PV} == 9999 ]]; then
-	DEPEND="${DEPEND} app-text/yelp-tools"
-fi
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
-	gnome2_src_configure \
-		--enable-shared \
-		--disable-static \
-		--with-distributor-name=Gentoo \
-		$(use_enable nss) \
-		$(use_enable test tests) \
-		${myconf}
+	G2CONF="${G2CONF}
+		--enable-shared
+		--disable-static
+		--with-distributor-name=Gentoo
+		$(use_enable nss)
+		$(use_enable test tests)"
+	gnome2_src_configure
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2013-11-14 23:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-14 23:19 [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-clocks/, media-gfx/gnome-font-viewer/, app-misc/bijiben/, Gilles Dartiguelongue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox