Remove a whole bunch of outdated stuff

svn path=/; revision=326

26 files changed, 135 insertions, 1194 deletions

diff --git a/app-misc/emerillon/Manifest b/app-misc/emerillon/Manifest
deleted file mode 100644
index 3927f85..0000000
--- a/app-misc/emerillon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX fixlibrest.patch 184 RMD160 c7a1cdddc9f036eebb081b084c12a81ae1aed8df SHA1 a0232a10a760374f043ef22b02f6a3b2b96a5db3 SHA256 0759e1217a005f086b26437492556d088954af9240b3fa0ca78af4908bde0fac
-DIST emerillon-0.1.1.tar.bz2 321758 RMD160 39a49108c75fa42122af73531bcf76e86b53e2c6 SHA1 62d1f3ccf64e74b5e146fd1ad0e6ccf9c8e1eb07 SHA256 5cae4d9f560ea6677b1e1dba04bb26fb7b3b3d6012fa49eacb19866d05adef29
-EBUILD emerillon-0.1.1.ebuild 689 RMD160 a2d5cfb96128b79d58ae47f910dcfb7264981fa0 SHA1 cdf498419f94ebe08b4bb872bd2bd70f89f78dc6 SHA256 830a6f996c1483cd7d0b964f0129e0fef7a74aee025eada3dacd0cc2ead0a3a0
diff --git a/app-misc/emerillon/emerillon-0.1.1.ebuild b/app-misc/emerillon/emerillon-0.1.1.ebuild
deleted file mode 100644
index 57f7cb8..0000000
--- a/app-misc/emerillon/emerillon-0.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="GNOME-based Map viewer, using Open Street Maps"
-HOMEPAGE="http://www.novopia.com/emerillon/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.12.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2.5.90
-	>=media-libs/libchamplain-0.4
-	>=gnome-extra/geoclue-0.11.1
-	>=dev-libs/ethos-0.2
-	>=dev-libs/librest-0.6"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS NEWS README"
-
-src_prepare() {
-
-	epatch ${FILESDIR}/fixlibrest.patch
-	eautoreconf
-}
diff --git a/app-misc/emerillon/files/fixlibrest.patch b/app-misc/emerillon/files/fixlibrest.patch
deleted file mode 100644
index 463f6dc..0000000
--- a/app-misc/emerillon/files/fixlibrest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac 
-+++ configure.ac 
-@@ -103,7 +103,7 @@
-   AC_SUBST(SEARCH_DEPS_LIBS)
-   PKG_CHECK_MODULES(SEARCH_DEPS,
-     [
--      rest-0.6 >= 0.6
-+      rest >= 0.6
-     ]
-   )
- 
-
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
deleted file mode 100644
index dfe240e..0000000
--- a/app-misc/gourmet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gourmet-0.13.4-2.tar.gz 3015264 RMD160 19acfae42a3ee2ea06fad8374b4d34a5e8968f06 SHA1 944e7cc3dc4632d8ebfbf9106d0f6aa8b7435e43 SHA256 373d03f88854d575adde90e86ac64ff7182eb15d7d7c146cfa13c2b62e15583f
-EBUILD gourmet-0.13.4-r2.ebuild 1408 RMD160 362309c403dfeaa6b72965c8bc364cb5f32bf678 SHA1 8cc790601c3bee7b0c324200c170b9827ace99ee SHA256 85555210cc4cb41e8d5dd2ca4c82f0845a47fc89f9ce904e0ec27ab252d4810a
diff --git a/app-misc/gourmet/gourmet-0.13.4-r2.ebuild b/app-misc/gourmet/gourmet-0.13.4-r2.ebuild
deleted file mode 100644
index e585216..0000000
--- a/app-misc/gourmet/gourmet-0.13.4-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils distutils
-
-DESCRIPTION="Simple but powerful recipe-managing application"
-HOMEPAGE="http://grecipe-manager.sourceforge.net/"
-MY_P="${P}-2"
-SRC_URI="mirror://sourceforge/grecipe-manager/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=virtual/python-2.3
-	>=dev-python/pygtk-2.3.93
-	=dev-python/gnome-python-2*
-	=gnome-base/libglade-2*
-	>=dev-python/pysqlite-2.0
-	dev-python/imaging
-	dev-python/gnome-python-extras
-	dev-python/pyrtf
-	dev-python/reportlab
-	dev-db/metakit"
-
-DOCS="README TODO PKG-INFO CHANGES"
-
-src_unpack() {
-        unpack ${A}
-        cd ${S}
-}
-
-pkg_setup() {
-	if ! built_with_use 'dev-db/metakit' python ; then
-		eerror "You need to install metakit with python support. Try:"
-		eerror "USE='python' emerge metakit"
-		die "python support missing from metakit"
-	fi
-}
-
-src_compile() {
-        einfo "Nothing to be compiled."
-}
-
-src_install() {
-	distutils_src_install --disable-modules-check
-
-        for doc in ${DOCS}; do
-                [ -s "$doc" ] && dodoc $doc
-        done
-}
-
-pkg_postinst() {
-        python_version
-        python_mod_optimize /usr/lib/python${PYVER}/site-packages/dosage
-        einfo "Please consult the README file included."
-}
-
-pkg_postrm() {
-        python_version
-        python_mod_cleanup
-}
-
diff --git a/dev-libs/ethos/Manifest b/dev-libs/ethos/Manifest
deleted file mode 100644
index 5534b68..0000000
--- a/dev-libs/ethos/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD ethos-9999.ebuild 938 RMD160 b676156c6a50c3576a5b28c7615b10fbf0d302c5 SHA1 2dac4790bc138289c75752b239d56d7deb44bba8 SHA256 797526443d4e9bb52601efc110feb7366920c8b6b8bd530e3c6d0b7e07abb8ed
diff --git a/dev-libs/ethos/ethos-9999.ebuild b/dev-libs/ethos/ethos-9999.ebuild
deleted file mode 100644
index 5ae3c93..0000000
--- a/dev-libs/ethos/ethos-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools gnome2 git
-
-EGIT_REPO_URI="git://git.dronelabs.com/ethos"
-
-DESCRIPTION="Generic Plugin Engine for GLib"
-HOMEPAGE="http://git.dronelabs.com/ethos/about/"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="introspection javascript python"
-
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.10.0
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
-	javascript? ( >=dev-libs/gjs-0.2 )
-	python? ( >=dev-python/pygobject-2.15.3
-		>=dev-python/pygtk-2.12 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS NEWS README TODO"
-
-S=${WORKDIR}/trunk
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-vala
-		$(use_enable python)
-		$(use_enable javascript js)
-		$(use_enable introspection)"
-}
-
-src_unpack() {
-	git_src_unpack
-	cd ${S}
-	./autogen.sh
-}
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
deleted file mode 100644
index 07c0d29..0000000
--- a/dev-libs/json-glib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST json-glib-0.12.0.tar.bz2 417623 RMD160 c08f0a1bda25187296b51ccbf5596dfe3609ec76 SHA1 2295a704d4e45a4e5333ea9eeda9b9c413b118d1 SHA256 e22978aadbe92a12e4cef2f494eb3571ac5c983ad05cff4256328157f1112842
-EBUILD json-glib-0.12.0.ebuild 737 RMD160 554a2355f732d7fffb8703dca214a9c7b7e835e4 SHA1 120d34758ef8ce08b0dfaefac76b52a206551328 SHA256 878e1c0e7cd351ea0dfe7ad3b48eaa6696d61aeb35ff79f1f3afa9802e4aada0
-MISC metadata.xml 1062 RMD160 8c9644851c8d144f4ea9ad5b9f16e40f8c0e4d80 SHA1 1da40081dc5b39a6f6dcba28a2c985f59a713e5e SHA256 1cc59d76f12fcda3ba90fcbc8bae0a22eadb4dc22ec798e65605ea2df73ee510
diff --git a/dev-libs/json-glib/json-glib-0.12.0.ebuild b/dev-libs/json-glib/json-glib-0.12.0.ebuild
deleted file mode 100644
index 549438e..0000000
--- a/dev-libs/json-glib/json-glib-0.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-0.8.2.ebuild,v 1.1 2009/11/02 20:19:10 voyageur Exp $
-
-EAPI=2
-inherit gnome2 eutils
-
-DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
-HOMEPAGE="http://live.gnome.org/JsonGlib"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc introspection"
-
-RDEPEND=">=dev-libs/glib-2.15"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.11 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-G2CONF="${G2CONF} $(use_enable introspection)"
diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml
deleted file mode 100644
index cdb3af2..0000000
--- a/dev-libs/json-glib/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<longdescription>JSON-GLib is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format described by RFC 4627. Many high-level languages already provide native modules for parsing, generating and manipulating JSON data streams. JSON-GLib is a C library based on GLib and released under the terms of the GNU Lesser General Public License version 2.1. It provides a parser and a generator GObject classes and various wrappers for the complex data types employed by JSON, such as arrays and objects.
-
-JSON-GLib uses GLib native data types and the generic value container GValue for ease of development. It also provides integration with the GObject classes for direct serialization into, and deserialization from, JSON data streams.</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/librest/Manifest b/dev-libs/librest/Manifest
deleted file mode 100644
index da383de..0000000
--- a/dev-libs/librest/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST rest-0.6.tar.gz 379628 RMD160 8b7b5bcfd20c66ecf1551bda7785276a27746566 SHA1 9ed2814ae123b73d15598ebd0b1457ab9b6208be SHA256 8734c43d99651c17ce0346ddaac97122b92e28e21e625200b4a12a30f0d8e7f6
-EBUILD librest-0.6.0.ebuild 671 RMD160 4bde4c6f385807833c58d4b8683d467d6a7d0e2a SHA1 f2466799393ca51595299db8e86a501404bb44eb SHA256 9ffdf5d1b8c856bae99e21b366a7145acc1365cdf81626a0e0e35e70b294fa5e
diff --git a/dev-libs/librest/librest-0.6.0.ebuild b/dev-libs/librest/librest-0.6.0.ebuild
deleted file mode 100644
index cabe04d..0000000
--- a/dev-libs/librest/librest-0.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Library to access RESTful web-services"
-HOMEPAGE="http://moblin.org/projects/librest"
-SRC_URI="http://moblin.org/sites/all/files/rest-0.6.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	>=net-libs/libsoup-2.4
-	gnome? ( >=net-libs/libsoup-gnome-2.25.1 )
-	>=dev-libs/libxml2-2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS NEWS README"
-
-S="${WORKDIR}/rest-0.6"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with gnome)"
-}
diff --git a/eclass/gnome2-la.eclass b/eclass/gnome2-la.eclass
deleted file mode 100644
index e9506c3..0000000
--- a/eclass/gnome2-la.eclass
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
deleted file mode 100644
index c488dd9..0000000
--- a/eclass/gnome2-utils.eclass
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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>
-#
-
-case "${EAPI:-0}" in
-	0|1|2|3) ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# Path to gconftool-2
-: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}
-
-# Directory where scrollkeeper-update should do its work
-: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}
-
-# Path to scrollkeeper-update
-: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}
-
-# Path to gtk-update-icon-cache
-: ${GTK_UPDATE_ICON_CACHE:="/usr/bin/gtk-update-icon-cache"}
-
-# Path to glib-compile-schemas
-: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
-
-
-
-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() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /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() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GCONFTOOL_BIN}"
-
-	if [[ ! -x "${updater}" ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-		debug-print "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="$("${updater}" --get-default-source | sed "s;:/;:${EROOT};")"
-
-	einfo "Installing GNOME 2 GConf schemas"
-
-	local F
-	for F in ${GNOME2_ECLASS_SCHEMAS}; do
-		if [[ -e "${EROOT}${F}" ]]; then
-			debug-print "Installing schema: ${F}"
-			"${updater}" --makefile-install-rule "${EROOT}${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() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GCONFTOOL_BIN}"
-
-	if [[ ! -x "${updater}" ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
-		debug-print "No GNOME 2 GConf schemas found"
-		return
-	fi
-
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${EROOT};")"
-
-	einfo "Uninstalling GNOME 2 GConf schemas"
-
-	local F
-	for F in ${GNOME2_ECLASS_SCHEMAS}; do
-		if [[ -e "${EROOT}${F}" ]]; then
-			debug-print "Uninstalling gconf schema: ${F}"
-			"${updater}" --makefile-uninstall-rule "${EROOT}${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() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &> /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() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GTK_UPDATE_ICON_CACHE}"
-
-	if [[ ! -x "${updater}" ]] ; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z "${GNOME2_ECLASS_ICONS}" ]]; then
-		debug-print "No icon cache to update"
-		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 "${EROOT}${dir}"
-			rv=$?
-
-			if [[ ! $rv -eq 0 ]] ; then
-				debug-print "Updating cache failed on ${EROOT}${dir}"
-
-				# Add to the list of failures
-				fails[$(( ${#fails[@]} + 1 ))]="${EROOT}${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() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	if [[ -x "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" ]]; then
-		einfo "Updating scrollkeeper database ..."
-		"${EROOT}${SCROLLKEEPER_UPDATE_BIN}" -q -p "${EROOT}${SCROLLKEEPER_DIR}"
-	fi
-}
-
-gnome2_schemas_savelist() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
-	pushd "${ED}" &>/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() {
-	has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
-
-	if [[ ! -x ${updater} ]]; then
-		debug-print "${updater} is not executable"
-		return
-	fi
-
-	if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
-		debug-print "No GSettings schemas to update"
-		return
-	fi
-
-	ebegin "Updating GSettings schemas"
-	${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
-	eend $?
-}
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index f206fc1..f3c3d72 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,16 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: $
 
-#
-# gnome2.eclass
-#
+# @ECLASS: gnome2.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @BLURB: 
+# @DESCRIPTION:
 # 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
 
@@ -18,28 +16,74 @@ case "${EAPI:-0}" in
 	0|1)
 		EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
-	2|3)
+	2|3|4)
 		EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
 		;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+#if [[ "${I_WANT_GNOME_3_3_X}" != "yes" ]]; then
+#	die "
+#
+#The GNOME overlay is switching to GNOME 3.3.x prerelease packages.
+#These are unstable, potentially incompatible with 3.2, and may well
+#break your system in intriguing ways.
+#
+#If you enabled the GNOME overlay to get GNOME 3.2, please disable
+#it now, since GNOME 3.2 is already in portage and unmasked.
+#
+#If you really do want experimental GNOME 3.3.x, please add
+#I_WANT_GNOME_3_3_X=yes
+#to your /etc/make.conf and continue.
+#
+#"
+#fi
+
+# @ECLASS-VARIABLE: G2CONF
+# @DEFAULT-UNSET
+# @DESCRIPTION:
 # Extra configure opts passed to econf
 G2CONF=${G2CONF:-""}
 
+# @ECLASS-VARIABLE: GNOME2_LA_PUNT
+# @DESCRIPTION:
 # Should we delete all the .la files?
-# Do NOT use without due consideration
+# NOT to be used without due consideration.
 GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
 
+# @ECLASS-VARIABLE: ELTCONF
+# @DEFAULT-UNSET
+# @DESCRIPTION:
 # Extra options passed to elibtoolize
 ELTCONF=${ELTCONF:-""}
 
+# @ECLASS-VARIABLE: USE_EINSTALL
+# @DEFAULT-UNSET
+# @DEPRECATED
+# @DESCRIPTION:
 # Should we use EINSTALL instead of DESTDIR
 USE_EINSTALL=${USE_EINSTALL:-""}
 
-# Run scrollkeeper for this package?
+# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE
+# @DEPRECATED
+# @DESCRIPTION:
+# Whether to run scrollkeeper for this package or not.
 SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:-"1"}
 
+# @ECLASS-VARIABLE: DOCS
+# @DEFAULT-UNSET
+# @DESCRIPTION:
+# String containing documents passed to dodoc command.
+
+# @ECLASS-VARIABLE: GCONF_DEBUG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Whether to handle debug or not.
+# Some gnome applications support various levels of debugging (yes, no, minimum,
+# etc), but using --disable-debug also removes g_assert which makes debugging
+# harder. This variable should be set to yes for such packages for the eclass
+# to handle it properly. It will enable minimal debug with USE=-debug.
+# Note that this is most commonly found in configure.ac as GNOME_DEBUG_CHECK.
 
 
 if [[ ${GCONF_DEBUG} != "no" ]]; then
@@ -47,25 +91,50 @@ if [[ ${GCONF_DEBUG} != "no" ]]; then
 fi
 
 
-
+# @FUNCTION: gnome2_src_unpack
+# @DESCRIPTION:
+# Stub function for old EAPI.
 gnome2_src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	has ${EAPI:-0} 0 1 && gnome2_src_prepare
 }
 
+# @FUNCTION: gnome2_src_prepare
+# @DESCRIPTION:
+# Prepare environment for build, fix build of scrollkeeper documentation,
+# run elibtoolize.
 gnome2_src_prepare() {
-	# Don't use the session bus address inherited via the environment
-	# causes test and introspection-building failures
+	# Reset various variables inherited via the environment.
+	# Causes test failures, introspection-build failures, and access violations
+	# FIXME: seems to have no effect for exported variables, at least with
+	# portage-2.2.0_alpha74
 	unset DBUS_SESSION_BUS_ADDRESS
+	unset DISPLAY
+	unset GNOME_KEYRING_CONTROL
+	unset GNOME_KEYRING_PID
+	unset XAUTHORITY
+	unset XDG_SESSION_COOKIE
+
+	# Prevent assorted access violations and test failures
+	gnome2_environment_reset
 
 	# Prevent scrollkeeper access violations
 	gnome2_omf_fix
 
 	# Run libtoolize
-	elibtoolize ${ELTCONF}
+	if has ${EAPI:-0} 0 1 2 3; then
+		elibtoolize ${ELTCONF}
+	else
+		# Everything is fatal EAPI 4 onwards
+		nonfatal elibtoolize ${ELTCONF}
+	fi
+
 }
 
+# @FUNCTION: gnome2_src_configure
+# @DESCRIPTION:
+# Gnome specific configure handling
 gnome2_src_configure() {
 	# Update the GNOME configuration options
 	if [[ ${GCONF_DEBUG} != 'no' ]] ; then
@@ -75,31 +144,38 @@ gnome2_src_configure() {
 	fi
 
 	# Prevent a QA warning
-	if hasq doc ${IUSE} ; then
+	if has doc ${IUSE} ; then
 		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
 	fi
 
-	# Avoid sandbox violations caused by misbehaving packages (bug #128289)
-	addwrite "/root/.gnome2"
+	# Pass --disable-maintainer-mode when needed
+	if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+		G2CONF="${G2CONF} --disable-maintainer-mode"
+	fi
+
+	# Pass --disable-scrollkeeper when possible
+	if grep -q "disable-scrollkeeper" configure; then
+		G2CONF="${G2CONF} --disable-scrollkeeper"
+	fi
+
+	# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
+	addwrite "$(unset HOME; echo ~)/.gnome2"
 
-	# GST_REGISTRY is to work around gst-inspect trying to read/write /root
-	GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF} || die "configure failed"
+	econf "$@" ${G2CONF}
 }
 
+# @FUNCTION: gnome2_src_compile
+# @DESCRIPTION:
+# Stub function for old EAPI.
 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"
 }
 
+# @FUNCTION: gnome2_src_install
+# @DESCRIPTION:
+# Gnome specific install. Handles typical GConf and scrollkeeper setup
+# in packages and removal of .la files if requested
 gnome2_src_install() {
 	has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
 	# if this is not present, scrollkeeper-update may segfault and
@@ -129,10 +205,9 @@ gnome2_src_install() {
 	# 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}"
+	rmdir "${ED}/var/lib" 2>/dev/null
+	rmdir "${ED}/var" 2>/dev/null
 
 	# Make sure this one doesn't get in the portage db
 	rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
@@ -140,42 +215,57 @@ gnome2_src_install() {
 	# Delete all .la files
 	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 		ebegin "Removing .la files"
-		find "${D}" -name '*.la' -exec rm -f '{}' + || die
+		if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+			find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+		fi
 		eend
 	fi
 }
 
+# @FUNCTION: gnome2_pkg_preinst
+# @DESCRIPTION:
+# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
 gnome2_pkg_preinst() {
 	gnome2_gconf_savelist
 	gnome2_icon_savelist
 	gnome2_schemas_savelist
+	gnome2_scrollkeeper_savelist
 }
 
+# @FUNCTION: gnome2_pkg_postinst
+# @DESCRIPTION:
+# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
+# database updates.
 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_scrollkeeper_update
+
+	# This should only be in the overlay
+	ewarn "**************************************************************"
+	ewarn "This is the *experimental* Gentoo GNOME Overlay"
+	ewarn "Please report bugs at #gentoo-desktop @ FreeNode"
+	ewarn "Do NOT go to upstream with bugs without checking with us first"
+	ewarn "**************************************************************"
 }
 
+# @#FUNCTION: gnome2_pkg_prerm
+# @#DESCRIPTION:
+# # FIXME Handle GConf schemas removal
 #gnome2_pkg_prerm() {
 #	gnome2_gconf_uninstall
 #}
 
+# @FUNCTION: gnome2_pkg_postrm
+# @DESCRIPTION:
+# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
 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
+	gnome2_schemas_update
+	gnome2_scrollkeeper_update
 }
-
-# pkg_prerm
diff --git a/gnome-extra/geoclue/Manifest b/gnome-extra/geoclue/Manifest
deleted file mode 100644
index d98349e..0000000
--- a/gnome-extra/geoclue/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch 7048 RMD160 cba53196a9ae95430e2dee9511259f98308132a2 SHA1 8d432e6cdf9e1b409a7307c5829d738b1183b5fd SHA256 1220b53b93972c6f317b6258272ce53a4718cf0070f5a012bc85f3d1d66ee11a
-AUX 0002-Fix-NM-pkgcheck.patch 727 RMD160 837959313c457eebfff5262124b01fdcd1943112 SHA1 50bf343fbb0d8bccec77b50c947cb50d8cbb3551 SHA256 17b04dd9a1bc6c3ce9e404b104bc7bf10c3c0a9b920afff5a8880950fc5c45cd
-AUX geoclue-hostip-api.diff 1737 RMD160 b808627eabb7b358fb56adf07a495180b397234c SHA1 27b0ee9922fcf4e0abe88a573553999e1d10385c SHA256 8b32518b605e6bf143974944152f6dc16eeeef593ccf2161281b6be84011a7cf
-DIST geoclue-0.11.1.tar.gz 557743 RMD160 7727f8ca2278244512068e38daef0653a926b6e5 SHA1 16a2084e2a47cbd4570b2cb31fc13c95c265cec1 SHA256 9c3b38aa8de51063651f93b4d1ba66266605722ecaa436d36791789cae970205
-EBUILD geoclue-0.11.1.ebuild 1426 RMD160 d9af38fbb1a3420858768839f16d6cd0156f9ade SHA1 718e6384984b3359814dd5d496bd33d56ef0facf SHA256 1605c405c828fea00a8f4f91dc1821b529e93e5526baf0e36778b25f495e9180
diff --git a/gnome-extra/geoclue/files/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch b/gnome-extra/geoclue/files/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch
deleted file mode 100644
index 9007911..0000000
--- a/gnome-extra/geoclue/files/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 5be732fcd92de66614f434ebeb1bd8ec5905544d Mon Sep 17 00:00:00 2001
-From: Mikel Olasagasti Uranga <mikel@olasagasti.info>
-Date: Mon, 22 Jun 2009 17:24:22 +0200
-Subject: [PATCH] Remove automagic deps and add switches to enable/disable them
-
----
- configure.ac |  176 +++++++++++++++++++++++++++++++++++++++++++++------------
- 1 files changed, 139 insertions(+), 37 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3109048..8e5e67c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -55,35 +55,90 @@ AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir
- 
- CFLAGS="$CFLAGS -g -Wall -Werror -Wno-format"
- 
-+# -----------------------------------------------------------
-+# gtk+
-+# -----------------------------------------------------------
-+AC_ARG_ENABLE(gtk,
-+              AS_HELP_STRING([--enable-gtk=@<:@no/yes/auto@:>@],
-+                             [build with gtk support]), ,
-+                             enable_gtk=auto)
- 
-+if test "x$enable_gtk" != "xno"; then
-+   PKG_CHECK_MODULES(GTK,
-+   [
-+      gtk+-2.0
-+   ], have_gtk="yes", have_gtk="no")
- 
--PKG_CHECK_MODULES(GTK, [
--		  gtk+-2.0
--], HAVE_GTK=yes, HAVE_GTK=no)
--AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
-+   if test "x$have_gtk" = "xyes"; then
-+      AC_DEFINE(HAVE_GTK, 1, [Define if you have gtk+])
-+   fi
-+else
-+   have_gtk=no
-+fi
-+
-+if test "x$enable_gtk" = "xyes" -a "x$have_gtk" != "xyes"; then
-+   AC_MSG_ERROR([Couldn't find gtk dependencies.])
-+fi
-+
-+AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
- AC_SUBST(GTK_LIBS)
- AC_SUBST(GTK_CFLAGS)
- 
-+# -----------------------------------------------------------
-+# connectivity
-+# -----------------------------------------------------------
-+
- CONNECTIVITY="None"
- 
--PKG_CHECK_MODULES(CONIC, [
--		  conic
--], HAVE_CONIC=yes, HAVE_CONIC=no)
--if test "x$HAVE_CONIC" = "xyes"; then
--	CONNECTIVITY="Maemo LibConIC"
--	CONNECTIVITY_LIBS=${CONIC_LIBS}
--	CONNECTIVITY_CFLAGS=${CONIC_CFLAGS}
--	AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed])
-+AC_ARG_ENABLE(conic,
-+              AS_HELP_STRING([--enable-conic=@<:@no/yes/auto@:>@],
-+                             [build with conic support]), ,
-+                             enable_conic=auto)
-+
-+if test "x$enable_conic" != "xno"; then
-+   PKG_CHECK_MODULES(CONIC,
-+   [
-+      conic
-+   ], have_conic="yes", have_conic="no")
-+
-+   if test "x$have_conic" = "xyes"; then
-+      CONNECTIVITY="Maemo LibConIC"
-+      CONNECTIVITY_LIBS=${CONIC_LIBS}
-+      CONNECTIVITY_CFLAGS=${CONIC_CFLAGS}
-+      AC_DEFINE(HAVE_CONIC, 1, [define if libconic is installed])
-+   fi
-+else
-+   have_conic=no
-+fi
-+
-+if test "x$enable_conic" = "xyes" -a "x$have_conic" != "xyes"; then
-+   AC_MSG_ERROR([Couldn't find conic dependencies.])
- fi
- 
--PKG_CHECK_MODULES(NETWORK_MANAGER, [
--		  NetworkManager
--], HAVE_NETWORK_MANAGER=yes, HAVE_NETWORK_MANAGER=no)
--if test "x$HAVE_NETWORK_MANAGER" = "xyes"; then
--	CONNECTIVITY="Network Manager"
--	CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS}
--	CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS}
--	AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed])
-+
-+AC_ARG_ENABLE(networkmanager,
-+              AS_HELP_STRING([--enable-networkmanager=@<:@no/yes/auto@:>@],
-+                             [build with NetworkManager support]), ,
-+                             enable_networkmanager=auto)
-+
-+if test "x$enable_networkmanager" != "xno"; then
-+   PKG_CHECK_MODULES(NETWORKMANAGER,
-+   [
-+      NetworkManager
-+   ], have_networkmanager="yes", have_networkmanager="no")
-+
-+   if test "x$have_networkmanager" = "xyes"; then
-+      CONNECTIVITY="Network Manager"
-+      CONNECTIVITY_LIBS=${NETWORK_MANAGER_LIBS}
-+      CONNECTIVITY_CFLAGS=${NETWORK_MANAGER_CFLAGS}
-+      AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [define if Network Manager is installed])
-+   fi
-+else
-+   have_networkmanager=no
-+fi
-+
-+if test "x$enable_networkmanager" = "xyes" -a "x$have_networkmanager" != "xyes"; then
-+   AC_MSG_ERROR([Couldn't find Network Manager dependencies.])
- fi
- 
- AC_SUBST(CONNECTIVITY_LIBS)
-@@ -92,35 +147,82 @@ AC_SUBST(CONNECTIVITY_CFLAGS)
- 
- PROVIDER_SUBDIRS="example hostip geonames manual plazes localnet yahoo"
- 
--PKG_CHECK_MODULES(GSMLOC, [
--		  gammu >= 1.12
--], HAVE_GSMLOC=yes, HAVE_GSMLOC=no)
--if test "x$HAVE_GSMLOC" = "xyes"; then
--	PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc"
-+# -----------------------------------------------------------
-+# gsmloc / gypsy / gpsd
-+# -----------------------------------------------------------
-+
-+AC_ARG_ENABLE(gsmloc,
-+              AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@],
-+                             [build with gsmloc support]), ,
-+                             enable_gsmloc=auto)
-+
-+if test "x$enable_gsmloc" != "xno"; then
-+   PKG_CHECK_MODULES(GSMLOC,
-+   [
-+      gammu >= 1.12
-+   ], have_gsmloc="yes", have_gsmloc="no")
-+
-+   if test "x$have_gsmloc" = "xyes"; then
-+      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc"
-+   else
-+      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc"
-+   fi
- else
--	NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gsmloc"
-+   have_gsmloc=no
-+fi
-+
-+if test "x$enable_gsmloc" = "xyes" -a "x$have_gsmloc" != "xyes"; then
-+   AC_MSG_ERROR([Couldn't find gsmloc dependencies.])
- fi
- AC_SUBST(GSMLOC_LIBS)
- AC_SUBST(GSMLOC_CFLAGS)
- 
- 
--PKG_CHECK_MODULES(GYPSY, [
--		  gypsy
--], HAVE_GYPSY=yes,HAVE_GYPSY=no)
--if test "x$HAVE_GYPSY" = "xyes"; then
--	PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy"
-+AC_ARG_ENABLE(gypsy,
-+              AS_HELP_STRING([--enable-gypsy=@<:@no/yes/auto@:>@],
-+                             [build with gypsy support]), ,
-+                             enable_gypsy=auto)
-+
-+if test "x$enable_gypsy" != "xno"; then
-+   PKG_CHECK_MODULES(GYPSY,
-+   [
-+      gypsy
-+   ], have_gypsy="yes", have_gypsy="no")
-+
-+   if test "x$have_gypsy" = "xyes"; then
-+      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gypsy"
-+   else
-+      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy"
-+   fi
- else
--	NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gypsy"
-+   have_gypsy=no
-+fi
-+
-+if test "x$enable_gypsy" = "xyes" -a "x$have_gypsy" != "xyes"; then
-+   AC_MSG_ERROR([Couldn't find gypsy dependencies.])
- fi
- AC_SUBST(GYPSY_LIBS)
- AC_SUBST(GYPSY_CFLAGS)
- 
--AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
--if test "x$libgps" = xyes; then
--	PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
--    GPSD_LIBS="-lgps"
-+AC_ARG_ENABLE(gpsd,
-+              AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@],
-+                             [build with gpsd support]), ,
-+                             enable_gpsd=auto)
-+
-+if test "x$enable_gpsd" != "xno"; then
-+   AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
-+   if test "x$have_gpsd" = "xyes"; then
-+      PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
-+      GPSD_LIBS="-lgps"
-+   else
-+      NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
-+   fi
- else
--	NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
-+   have_gpsd=no
-+fi
-+
-+if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then
-+   AC_MSG_ERROR([Couldn't find gpsd dependencies.])
- fi
- AC_SUBST(GPSD_LIBS)
- AC_SUBST(GPSD_CFLAGS)
--- 
-1.6.3.1
-
diff --git a/gnome-extra/geoclue/files/0002-Fix-NM-pkgcheck.patch b/gnome-extra/geoclue/files/0002-Fix-NM-pkgcheck.patch
deleted file mode 100644
index bd03196..0000000
--- a/gnome-extra/geoclue/files/0002-Fix-NM-pkgcheck.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8b2cf000d91a8ede9f22b1bfd3bbf7845f5e933 Mon Sep 17 00:00:00 2001
-From: Mikel Olasagasti Uranga <mikel@olasagasti.info>
-Date: Mon, 22 Jun 2009 19:14:09 +0200
-Subject: [PATCH 2/2] Fix NM pkgcheck
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8e5e67c..94847f0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,7 +122,7 @@ AC_ARG_ENABLE(networkmanager,
-                              enable_networkmanager=auto)
- 
- if test "x$enable_networkmanager" != "xno"; then
--   PKG_CHECK_MODULES(NETWORKMANAGER,
-+   PKG_CHECK_MODULES(NETWORK_MANAGER,
-    [
-       NetworkManager
-    ], have_networkmanager="yes", have_networkmanager="no")
--- 
-1.6.3.1
-
diff --git a/gnome-extra/geoclue/files/geoclue-hostip-api.diff b/gnome-extra/geoclue/files/geoclue-hostip-api.diff
deleted file mode 100644
index 0dc7511..0000000
--- a/gnome-extra/geoclue/files/geoclue-hostip-api.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/providers/hostip/geoclue-hostip.c
-+++ b/providers/hostip/geoclue-hostip.c
-@@ -42,13 +42,11 @@
- 
- #define HOSTIP_NS_GML_NAME "gml"
- #define HOSTIP_NS_GML_URI "http://www.opengis.net/gml"
--#define HOSTIP_NS_HOSTIP_NAME "hostip"
--#define HOSTIP_NS_HOSTIP_URI "http://www.hostip.info/api"
- 
--#define HOSTIP_COUNTRY_XPATH "//gml:featureMember/hostip:Hostip/hostip:countryName"
--#define HOSTIP_COUNTRYCODE_XPATH "//gml:featureMember/hostip:Hostip/hostip:countryAbbrev"
--#define HOSTIP_LOCALITY_XPATH "//gml:featureMember/hostip:Hostip/gml:name"
--#define HOSTIP_LATLON_XPATH "//gml:featureMember/hostip:Hostip//gml:coordinates"
-+#define HOSTIP_COUNTRY_XPATH "//gml:featureMember/Hostip/countryName"
-+#define HOSTIP_COUNTRYCODE_XPATH "//gml:featureMember/Hostip/countryAbbrev"
-+#define HOSTIP_LOCALITY_XPATH "//gml:featureMember/Hostip/gml:name"
-+#define HOSTIP_LATLON_XPATH "//gml:featureMember/Hostip//gml:coordinates"
- 
- static void geoclue_hostip_init (GeoclueHostip *obj);
- static void geoclue_hostip_position_init (GcIfacePositionClass  *iface);
-@@ -101,7 +99,6 @@ geoclue_hostip_get_position (GcIfacePosition        *iface,
- 		return FALSE;
- 	}
- 	
--	
- 	if (gc_web_service_get_string (obj->web_service, 
- 	                                &coord_str, HOSTIP_LATLON_XPATH)) {
- 		if (sscanf (coord_str, "%lf,%lf", longitude , latitude) == 2) {
-@@ -240,8 +237,6 @@ geoclue_hostip_init (GeoclueHostip *obj)
- 	gc_web_service_set_base_url (obj->web_service, HOSTIP_URL);
- 	gc_web_service_add_namespace (obj->web_service,
- 	                              HOSTIP_NS_GML_NAME, HOSTIP_NS_GML_URI);
--	gc_web_service_add_namespace (obj->web_service,
--	                              HOSTIP_NS_HOSTIP_NAME, HOSTIP_NS_HOSTIP_URI);
- }
- 
- static void
-
diff --git a/gnome-extra/geoclue/geoclue-0.11.1.ebuild b/gnome-extra/geoclue/geoclue-0.11.1.ebuild
deleted file mode 100644
index 52920ed..0000000
--- a/gnome-extra/geoclue/geoclue-0.11.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools
-
-DESCRIPTION="A modular geoinformation service built on top of the D-Bus messaging system"
-HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="http://folks.o-hand.com/jku/geoclue-releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="dbus doc gpsd gtk networkmanager"
-
-RDEPEND=">=dev-libs/glib-2
-        >=gnome-base/gconf-2
-        >=dev-libs/dbus-glib-0.60
-        dev-libs/libxml2
-	gpsd? ( sci-geosciences/gpsd )
-        gtk? ( >=x11-libs/gtk+-2 )
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${RDEPEND}
-        dev-util/pkgconfig
-        dev-libs/libxslt
-        doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove automagic deps b.fd.o #22416
-	epatch "${FILESDIR}/0001-Remove-automagic-deps-and-add-switches-to-enable-dis.patch"
-	epatch "${FILESDIR}/0002-Fix-NM-pkgcheck.patch"
-	epatch "${FILESDIR}/geoclue-hostip-api.diff"
-
-	eautoreconf
-}
-
-src_compile() {
-	# gross hack to make it build
-	LDFLAGS=""
-	econf --disable-conic --disable-gypsy --disable-gsmloc \
-		$(use_enable gpsd) \
-		$(use_enable gtk) \
-		$(use_enable networkmanager) || die "econf failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README || die "dodoc failed"
-}
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
deleted file mode 100644
index 2de6267..0000000
--- a/x11-libs/startup-notification/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX startup-notification-0.10-application-based.patch 6159 RMD160 2b5c9318a18e7c2725605ede03501df7e9836c17 SHA1 740ffcae8482baa0938d9203bfa265dd2a182c3e SHA256 81c488a458c3ecfc3e623f5aed6f23a49b1275c2c50e8ccc7a8831979060da0c
-AUX startup-notification-0.10-tests.patch 408 RMD160 6a2d9310b3dabd4264a65ca22be718dc7688678f SHA1 07478c3408779e115df5aea3229259cc6985725e SHA256 379caf2a12757163179d5a490c6d1fe346f70a8db4f9b9af609aba28db1b8452
-DIST startup-notification-0.10.tar.gz 328787 RMD160 de905634db3263d24b69ae42887111b7ff95b3ba SHA1 670c5e44f59e3844e2ca0c67730ba9ca5f5228fc SHA256 64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459
-EBUILD startup-notification-0.10-r1.ebuild 1280 RMD160 d9afd3fe258e4eadeaa8b8de1b81223b35ba2618 SHA1 9df374f96917a59f2a4c17e5b11e23b9ce349c99 SHA256 61c60ee8ebfcc138fc3faf7fb5ec866246b3a9b4bc82ee1593784784e76cf9e9
diff --git a/x11-libs/startup-notification/files/startup-notification-0.10-application-based.patch b/x11-libs/startup-notification/files/startup-notification-0.10-application-based.patch
deleted file mode 100644
index 34ddae5..0000000
--- a/x11-libs/startup-notification/files/startup-notification-0.10-application-based.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 1b14d72976741afc33d9f7fac22e20b831e47e1f Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 25 Feb 2010 20:33:54 +0000
-Subject: Support APPLICATION_ID key
-
-For moving GNOME to an application-based system, it's useful if
-launcher systems say which .desktop file they're launching, so
-that we can show it as the current focus even while a launch is
-in progress.
-
-Signed-off-by: Julien Danjou <julien@danjou.info>
----
-diff --git a/doc/startup-notification.txt b/doc/startup-notification.txt
-index cf5b250..dd1ccc2 100644
---- a/doc/startup-notification.txt
-+++ b/doc/startup-notification.txt
-@@ -300,6 +300,16 @@ The following keys may be provided optionally in either a "new" or a
-           have their window mapped on the desktop specified by
-           the value of DESKTOP.
- 
-+  APPLICATION_ID
-+
-+          When launching an application using a .desktop file from
-+          the normal application paths (see desktop file specification),
-+          this should be basename of the .desktop file.
-+          For example: "foo.desktop".
-+
-+          When launching a .desktop file NOT in the paths, this should
-+          be an absolute path to the .desktop file.
-+
- Some details of the startup sequence:
- 
-  - "new" and "change" messages are sent by the launcher code
-diff --git a/libsn/sn-launcher.c b/libsn/sn-launcher.c
-index 21344cd..089b5c2 100644
---- a/libsn/sn-launcher.c
-+++ b/libsn/sn-launcher.c
-@@ -44,6 +44,7 @@ struct SnLauncherContext
-   char               *wmclass;
-   char               *binary_name;
-   char               *icon_name;
-+  char               *application_id;
-   struct timeval      initiation_time;
-   unsigned int        completed : 1;
-   unsigned int        canceled : 1;
-@@ -121,6 +122,7 @@ sn_launcher_context_unref (SnLauncherContext *context)
-       sn_free (context->wmclass);
-       sn_free (context->binary_name);
-       sn_free (context->icon_name);
-+      sn_free (context->application_id);
- 
-       sn_display_unref (context->display);
-       sn_free (context);
-@@ -266,9 +268,16 @@ sn_launcher_context_initiate (SnLauncherContext *context,
-       values[i] = context->icon_name;
-       ++i;
-     }
--  
-+
-+  if (context->application_id != NULL)
-+    {
-+      names[i] = "APPLICATION_ID";
-+      values[i] = context->application_id;
-+      ++i;
-+    }
-+
-   assert (i < MAX_PROPS);
--  
-+
-   names[i] = NULL;
-   values[i] = NULL;
- 
-@@ -433,6 +442,16 @@ sn_launcher_context_set_icon_name (SnLauncherContext *context,
- }
- 
- void
-+sn_launcher_set_application_id (SnLauncherContext *context,
-+                                const char        *desktop_file)
-+{
-+  WARN_ALREADY_INITIATED (context);
-+
-+  sn_free (context->application_id);
-+  context->application_id = sn_internal_strdup (desktop_file);
-+}
-+
-+void
- sn_launcher_context_set_extra_property (SnLauncherContext *context,
-                                         const char        *name,
-                                         const char        *value)
-diff --git a/libsn/sn-launcher.h b/libsn/sn-launcher.h
-index f88f11c..9cd34fd 100644
---- a/libsn/sn-launcher.h
-+++ b/libsn/sn-launcher.h
-@@ -61,6 +61,8 @@ void sn_launcher_context_set_binary_name (SnLauncherContext *context,
-                                           const char        *name);
- void sn_launcher_context_set_icon_name   (SnLauncherContext *context,
-                                           const char        *name);
-+void sn_launcher_context_set_application_id (SnLauncherContext *context,
-+                                             const char        *desktop_file);
- 
- void sn_launcher_context_set_extra_property (SnLauncherContext *context,
-                                              const char        *name,
-diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c
-index 223473a..035d523 100644
---- a/libsn/sn-monitor.c
-+++ b/libsn/sn-monitor.c
-@@ -66,7 +66,8 @@ struct SnStartupSequence
-   Time timestamp;
- 
-   char *binary_name;
--  char *icon_name;  
-+  char *icon_name;
-+  char *application_id;
- 
-   unsigned int completed : 1;
-   unsigned int canceled : 1;
-@@ -269,7 +270,8 @@ sn_startup_sequence_unref (SnStartupSequence *sequence)
-       sn_free (sequence->wmclass);
-       sn_free (sequence->binary_name);
-       sn_free (sequence->icon_name);
--      
-+      sn_free (sequence->application_id);
-+
-       sn_display_unref (sequence->display);
-       sn_free (sequence);
-     }
-@@ -337,6 +339,12 @@ sn_startup_sequence_get_icon_name (SnStartupSequence *sequence)
-   return sequence->icon_name;
- }
- 
-+const char*
-+sn_startup_sequence_get_application_id (SnStartupSequence *sequence)
-+{
-+  return sequence->application_id;
-+}
-+
- int
- sn_startup_sequence_get_screen (SnStartupSequence *sequence)
- {
-@@ -805,10 +813,18 @@ xmessage_func (SnDisplay  *display,
-                   changed = TRUE;
-                 }
-             }
-+          else if (strcmp (names[i], "APPLICATION_ID") == 0)
-+            {
-+              if (sequence->application_id == NULL)
-+                {
-+                  sequence->application_id = sn_internal_strdup (values[i]);
-+                  changed = TRUE;
-+                }
-+            }
-           else if (strcmp (names[i], "DESKTOP") == 0)
-             {
-               int workspace;
--              
-+
-               workspace = sn_internal_string_to_ulong (values[i]);
- 
-               sequence->workspace = workspace;
-diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
-index 15a38d7..b58581f 100644
---- a/libsn/sn-monitor.h
-+++ b/libsn/sn-monitor.h
-@@ -73,6 +73,7 @@ Time        sn_startup_sequence_get_timestamp             (SnStartupSequence *se
- const char* sn_startup_sequence_get_wmclass               (SnStartupSequence *sequence);
- const char* sn_startup_sequence_get_binary_name           (SnStartupSequence *sequence);
- const char* sn_startup_sequence_get_icon_name             (SnStartupSequence *sequence);
-+const char* sn_startup_sequence_get_application_id        (SnStartupSequence *sequence);
- int         sn_startup_sequence_get_screen                (SnStartupSequence *sequence);
- 
- void        sn_startup_sequence_get_initiated_time        (SnStartupSequence *sequence,
---
-cgit v0.8.3-6-g21f6
diff --git a/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch b/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
deleted file mode 100644
index 612d0b1..0000000
--- a/x11-libs/startup-notification/files/startup-notification-0.10-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Do not build tests unless required.
-
-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226257
---- a/test/Makefile.am	2009-04-03 16:56:51.000000000 +0200
-+++ b/test/Makefile.am	2009-07-26 12:08:44.855802976 +0200
-@@ -16,7 +16,7 @@
- 	test-launcher-xcb			\
- 	test-watch-xmessages-xcb
- 
--noinst_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
-+check_PROGRAMS=$(XLIB_TEST) $(XCB_TEST)
- 
- test_launcher_SOURCES= test-launcher.c
- 
diff --git a/x11-libs/startup-notification/startup-notification-0.10-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.10-r1.ebuild
deleted file mode 100644
index 57a9406..0000000
--- a/x11-libs/startup-notification/startup-notification-0.10-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.10.ebuild,v 1.11 2010/01/15 22:10:10 fauli Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="1.10"
-
-inherit autotools
-
-DESCRIPTION="Application startup notification and feedback library"
-HOMEPAGE="http://www.freedesktop.org/software/startup-notification"
-SRC_URI="http://freedesktop.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libxcb
-	>=x11-libs/xcb-util-0.3"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto
-	x11-libs/libXt"
-
-src_prepare() {
-	# Do not build tests unless required
-	epatch "${FILESDIR}/${P}-tests.patch"
-	epatch "${FILESDIR}/${P}-application-based.patch"
-
-	eautomake
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README doc/startup-notification.txt || die "dodoc failed"
-}
diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest
deleted file mode 100644
index 5cce502..0000000
--- a/x11-misc/fpm2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST fpm2-0.78.tar.bz2 271633 RMD160 b9e737344a9afbcd52508ee3224769b64438b9e1 SHA1 2139d076c01f66b063d1ac8721b6d8d4f1b09835 SHA256 e7a022e32638f5ad6a989230269c169b37769f82db421abb8dfe9f12edca072b
-EBUILD fpm2-0.78.ebuild 605 RMD160 7300584aa838db7da002a97f5d8d970f7eba9566 SHA1 46a670c5389d489441764f91ebe6aefeaf19bca2 SHA256 4e703a31ab2d7486cde3685b690917e492414220df4264e5f0bea42ca7f3dac1
diff --git a/x11-misc/fpm2/fpm2-0.78.ebuild b/x11-misc/fpm2/fpm2-0.78.ebuild
deleted file mode 100644
index b4e9dff..0000000
--- a/x11-misc/fpm2/fpm2-0.78.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="A GUI password manager utility with password generator"
-HOMEPAGE="http://als.regnet.cz/fpm2/"
-SRC_URI="http://als.regnet.cz/${PN}/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.10.14
-	dev-libs/libxml2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
-}