Drop old (#508854)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

20 files changed, 26 insertions, 905 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 8963d0cd874b..1cae85464cc3 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.307 2014/10/11 11:58:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.308 2014/11/13 11:12:44 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -gconf-2.32.4-r1.ebuild,
+  -gconf-3.2.6-r1.ebuild, -gconf-3.2.6-r2.ebuild, metadata.xml:
+  Drop old (#508854)
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> gconf-3.2.6-r3.ebuild:
   arm stable, bug #512012
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index fd312ab42cb7..ad5d14a7b051 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -6,18 +6,14 @@ AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd7
 AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 SHA256 836d5259ae84832004447defc2f0cea15ca1d8fffec6b8bf5d7eabb4d090070d SHA512 f4d7cc2261f82f7a28e574ec3b732a56bb3f067048312e318f8d23df93046489fdd5ad39d669cf0d9ada6cc07617524511c537a4f2fd0a37cd03788e84b9803b WHIRLPOOL 7e0f0d27fc05dcca803600b05ddddd3a7d02d4e984042aaa3be06a86943910dcb734c1a577a24db6f27c9b021a08ca866f6ab357162518398998f8d66ba79e91
 AUX gconf-3.2.6-mconvert-crasher.patch 1514 SHA256 22ada6a8e7c26b1c89df8c79a9a46fd3a43b35b9e96657e328ccd6f376f7034e SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b WHIRLPOOL 483cd709829cee9396486f521f07aa978b2fed04d942230bd28f9bc1e040ac668d0bc3c2755c2778356bf754700c7b09e5c15b098a4a23f146d337f5d5ffd99e
 AUX gconf-3.2.6-spew-console-error.patch 2594 SHA256 3638009b19744bd301364e110da70f8013fa41a68e4367f7eefae4b8fd7a05c7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602 WHIRLPOOL 27a02c790d3b59b7c2c717310270f3665bffb1e13d2786f98880e9bf38ab57f694e8ee384c00926ad1a67f62dff2ae20ea3392c176fb91ccedbbff8f1f52d141
-DIST GConf-2.32.4.tar.xz 1326600 SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025 SHA512 fabcd35ae9dd50969dc60219172e613fdb9f81ecaf182003a7e9d81745ffa9931fc279383dae9d6eb25817f594ab38e1ec2e910e14df402a1cb515eae258358f WHIRLPOOL 836491977e5af62a02fa8e70c92f2c2a07c350aabd44b75b0e9ab203c36d0fd53ed7605e26c81a01e498c8bb7d5e3089427ede8d7583964b65aecc46ddac7faf
 DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 WHIRLPOOL ef38b5fb25b3cf915052ce00f926a0a9bf8ecb5771c2db0fd6f5f11531a8edb1c098a036eaaa20490e3de87a0a5eb411542f86d8c6a2be8ac45dcae0b29d3414
-EBUILD gconf-2.32.4-r1.ebuild 2488 SHA256 29c75fbb6c8025623e14ddf84da1b0de338440d4484dc8c8098e28007b7e1198 SHA512 697746bfd1fbbef06c62b2088241d13d906939c0fb01bbd45fca6af16e8308e554ef699973e24e3ad28db019e50b97d4775e2e906dc4c6ecd31ce91cb4d01828 WHIRLPOOL f0e4837bc71a873424b194511a2155f6ebf64e9d7d178b88ddf6ad35a09687e3fd397f5885348cd57292df991774fba892c0120018fb76a34a1ef07012b8b68b
-EBUILD gconf-3.2.6-r1.ebuild 3222 SHA256 6634017c12c0a729f7b58dac8207b76c1b40fd53871d9ef97edf79a6e6e99b1d SHA512 721234c48d0f055fcb863dc1a717c564937f2d06cef7010eabd36d3431835d29a3ace8c70a70ac51e21e564ef25ecdcc860320e39d99646fd2a3c5c279cb312f WHIRLPOOL 58f3287de3373bde5d48c4ba20c5285ff15ba85266a5488c4bf9eecbaa7cf1a701985ef8bcac78aadac6a9163ad4c590fb807b1f6265aec4ceae5d3d74e88c01
-EBUILD gconf-3.2.6-r2.ebuild 2999 SHA256 0a981602e4fc622755b347aefbd8302d56444bf7b7b2b5472994e175fbd53386 SHA512 9fc28708328b70ce15d0e1afd7c372934650203ce338614cafdce931417fadfd12024b7eb6877e99129278d1dec885f0e36535fd77305c8322f0d59cc7ebcf43 WHIRLPOOL 31d2529a96247bcad3b383889aefb95ce3b164556decb3adb214808ad47592ef5e66fa93c0f2389718468d47b22d4082aff61a23312d3c9d968ff8f14a514b8b
 EBUILD gconf-3.2.6-r3.ebuild 3514 SHA256 9b3653cfe66fbb52a10c0071a70600daab700e464160e78ee29f538209b1ee65 SHA512 c0153cdcf875b5dd7a82da4b1e1c1094eff437d9a203e54eab785a979f3c0759fcfdba3d734bf5272da1ad117004097c3e07be906b724fa021fcf0eda6c5ac51 WHIRLPOOL 3bce622200fa3e3eb5a407540d2935d8a5d947405ebfbe686ce22fd0cf73538da03e1a294c22b6cf26cfcdb4dc169aa713895dfecfce37d0a7dd1cda48f2a080
-MISC ChangeLog 41501 SHA256 e466a6419168071cd15fd6ebce395d96c3bda6d4a6dddebacf95f9ac2b9d8c9d SHA512 66f01f5b96864c1ddb9813b4bc545b302ece6bf1a4bde617049873b9a742d539a084979130a568755a5b8f490bba6606f478263fa1afb6ed95fafa25d053a08a WHIRLPOOL 74061c453d1a4ff1486390b5631d647a181b54f718ebf333c8b442deb242410bd40c4ee1e743fd66c11e9026473832329951289b753d03998c59043ab7153cc3
-MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
+MISC ChangeLog 41657 SHA256 e94824b98d909453f85ca34ec1362e343ec27bcc56e4eb4b3b6b229bc8809e3f SHA512 0bb579b7830f88a5fa420ab4713150c6a71a3f189be571c50ec3030a7c90e6c7d8f9f1267bf090c048347f9eb79024c64a153e8790ca6f12f09f4acf7fa4598a WHIRLPOOL 45122701ea2727be519bea05f77101495eca9714a3c06b09aaa0cb7dd98963f79a43ed3706664cbacde8b00d432f79fe679fdb159154a1ce4e8f72af69ebb34f
+MISC metadata.xml 339 SHA256 6df68c717dc28b23ae144c3e0eaa95d9985e10d1d67de5b0eb267179b009ae56 SHA512 4a2feae9db869d0a9ce4bd7a305f2033d5713ba486b488f5924ad6b78dc5bce131eb04bb972a4b4383bb6a8eb4caa7743bb376497017f0c174559e04d216b712 WHIRLPOOL 400e6181c7430ea80181f83093464c583f6ee1f3158410b0616b052150cc6afc94ed7edfd9cb77dda12c16e8c80d3e81bd48aa2ede4f9f5feec10f21985e25e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5G24ACgkQkKaRLQcq0GIsAQCggy4WPmAoUKmbEK8kN0VneDQO
-jdUAnR/+0KkKisnQDITCIVW/nl+YRgHd
-=qytu
+iEYEAREIAAYFAlRkki0ACgkQCaWpQKGI+9QBjACdFE1R+EJs/5LKcD0cOb1xXhiA
+yNcAn12ZKJvXAZpf1Faz/x9ujbHR2l95
+=81cq
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/gconf-2.32.4-r1.ebuild b/gnome-base/gconf/gconf-2.32.4-r1.ebuild
deleted file mode 100644
index bafb8194467c..000000000000
--- a/gnome-base/gconf/gconf-2.32.4-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4-r1.ebuild,v 1.1 2013/05/10 10:36:24 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME configuration system and daemon"
-HOMEPAGE="http://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug gtk +introspection ldap policykit"
-
-RDEPEND="
-	>=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-2.14:2
-	>=dev-libs/dbus-glib-0.74:=
-	>=sys-apps/dbus-1:=
-	>=gnome-base/orbit-2.4:2
-	>=dev-libs/libxml2-2:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	ldap? ( net-nds/openldap:= )
-	policykit? ( sys-auth/polkit:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	kill_gconf
-}
-
-src_prepare() {
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
-	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gsettings-backend \
-		$(use_enable gtk) \
-		$(usex gtk --with-gtk=2.0 "") \
-		$(use_enable introspection) \
-		$(use_with ldap openldap) \
-		$(use_enable policykit defaults-service) \
-		ORBIT_IDL=$(type -P orbit-idl-2)
-}
-
-src_install() {
-	gnome2_src_install
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
-	then
-		"${EPREFIX}"/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/gconf-3.2.6-r1.ebuild b/gnome-base/gconf/gconf-3.2.6-r1.ebuild
deleted file mode 100644
index caf517fa2295..000000000000
--- a/gnome-base/gconf/gconf-3.2.6-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r1.ebuild,v 1.7 2014/02/22 21:37:23 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="GNOME configuration system and daemon"
-HOMEPAGE="http://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug gtk +introspection ldap orbit policykit"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.31:2
-	>=dev-libs/dbus-glib-0.74:=
-	>=sys-apps/dbus-1:=
-	>=dev-libs/libxml2-2:2
-	gtk? ( >=x11-libs/gtk+-2.90:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	ldap? ( net-nds/openldap:= )
-	orbit? ( >=gnome-base/orbit-2.4:2 )
-	policykit? ( sys-auth/polkit:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	kill_gconf
-}
-
-src_prepare() {
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
-	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gsettings-backend \
-		$(use_enable gtk) \
-		$(usex gtk --with-gtk=3.0 "") \
-		$(use_enable introspection) \
-		$(use_with ldap openldap) \
-		$(use_enable orbit) \
-		$(use_enable policykit defaults-service) \
-		ORBIT_IDL=$(type -P orbit-idl-2)
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert || die
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-
-	if ! use orbit; then
-		ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
-		ewarn "<=gconf-3.2.3, or were previously using gconf with USE=orbit,"
-		ewarn "you will need to now restart your desktop session (for example,"
-		ewarn "by logging out and then back in)."
-		ewarn "Otherwise, gconf-based applications may crash with 'Method ..."
-		ewarn "on interface \"org.gnome.GConf.Server\" doesn't exist' errors."
-	fi
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
-	then
-		"${EPREFIX}"/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/gconf-3.2.6-r2.ebuild b/gnome-base/gconf/gconf-3.2.6-r2.ebuild
deleted file mode 100644
index 25ed45e670d7..000000000000
--- a/gnome-base/gconf/gconf-3.2.6-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r2.ebuild,v 1.9 2014/06/20 14:45:02 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-r1
-
-DESCRIPTION="GNOME configuration system and daemon"
-HOMEPAGE="http://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug +introspection ldap policykit"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.31:2
-	>=dev-libs/dbus-glib-0.74:=
-	>=sys-apps/dbus-1:=
-	>=dev-libs/libxml2-2:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	ldap? ( net-nds/openldap:= )
-	policykit? ( sys-auth/polkit:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	kill_gconf
-}
-
-src_prepare() {
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
-	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
-	# From 'master'
-	# mconvert: enable recursive scheme lookup and fix a crasher
-	epatch "${FILESDIR}/${P}-mconvert-crasher.patch"
-
-	# dbus: Don't spew to console when unable to connect to dbus daemon
-	epatch "${FILESDIR}/${P}-spew-console-error.patch"
-
-	# gsettings-data-convert: Warn (and fix) invalid schema paths
-	epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gsettings-backend \
-		--with-gtk=3.0 \
-		--disable-orbit \
-		$(use_enable introspection) \
-		$(use_with ldap openldap) \
-		$(use_enable policykit defaults-service)
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert || die
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
-	then
-		"${EPREFIX}"/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml
index 07f0b7f4661a..40c5d90d727f 100644
--- a/gnome-base/gconf/metadata.xml
+++ b/gnome-base/gconf/metadata.xml
@@ -6,7 +6,5 @@
 	<flag name="ldap">Build backend which enables default mail accounts,
 	addressbooks and calendars for Evolution to be configured using each
 	user's LDAP entry."</flag>
-	<flag name="orbit">Use <pkg>gnome-base/orbit</pkg> for IPC, same as in
-	gconf-2.x</flag>
 </use>
 </pkgmetadata>
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 30bc38e81206..3505bd76d8a2 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.410 2014/09/29 15:05:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.411 2014/11/13 11:16:52 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/49-keychain,
+  -files/50-ssh-agent, -files/gdm-2.13.0.1-selinux-remove-attr.patch,
+  -files/gdm-2.20.10-custom-session.patch,
+  -files/gdm-2.20.10-desktop-session-dmrc-autologin.patch,
+  -files/gdm-2.20.10-gdmsetup-24hr-combo.patch,
+  -files/gdm-2.20.10-xinitrc-ssh-agent.patch,
+  -files/gdm-2.20.11-underlinking.patch, -files/gdm-2.20.2-gksu.patch,
+  -files/gdm-2.20.9-parallel-make.patch, -gdm-2.20.11-r1.ebuild, metadata.xml:
+  Drop old (#508854)
 
   29 Sep 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-3.12.2.ebuild,
   gdm-3.12.2-r1.ebuild:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 6c94a023ded0..78216b3c6333 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,42 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 49-keychain 181 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140 SHA512 72b9a7d0a9dc17c4f51795b665a1a8db035a3423b35769fa68c8c471e76d9ab698d1841c3e354efdafe6167e8358b018028268d7a17d0750bdcc55cbfe481290 WHIRLPOOL 4ab8099ea4f66e2935a930ea9d8ab9202732689206ee2b57eb3946692622bb4cd56f5429d40a28b7d2beaf1c2261610462f96a7362fcae2e5548da23396a2a61
 AUX 49-keychain-r1 193 SHA256 32e0b028eb6d1189fc82d72ef62661de78c491bcfa099e7ac652d6b4daa1598d SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21 WHIRLPOOL dd8f9249e2f1c1c60131e1c030bfa4a8c251cfba083d55847273ac906bbfb27576ac29e4039c70269592667024b8a4871060139717796eed0edd3a341edbc4e0
-AUX 50-ssh-agent 243 SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042 SHA512 b955253fcb58ccd2cb7d0c30eba01f240821a1ee12751975407dbd3331d54460c75654c5d1931b6245b03ce7966d660cdd627c2b6f0f41aceeed97173d9e3195 WHIRLPOOL 7c93297c37ca66ebf34dc1515e2033c75af80a43f1ac69ebb842256927b2719c42117f661a79a673f079e0974cefd73affd9e376189488905238506eccee1753
 AUX 50-ssh-agent-r1 255 SHA256 bd91721bdccb7b1eb403c368caa6e9b84dcd75ddf89946db329ec42f9a8e7a8b SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba WHIRLPOOL d4dc95afb4ef97e2a6365df27cbf8b2a3533d63471b52d5e54fc52247638701eea65fda0f339fa184919c1f8b386cff32e444e8a856bf1741aad23dd24b808de
-AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b SHA512 d50cd2f1f2700c7feb9c7e887497581c8bd3d57760032974ef7cc361784de0a8998629aa8f993e60cd0027bf182187115c14b0b710954d15e58463ccb37e3d9d WHIRLPOOL 65cc7d5c8a52884d35882c7246ec323fcbc1f9c33d3aef8c289fed1cba40e39785c532f7326d423c39e329995e80099382569ecff6803da30c7e8571afea8bd7
-AUX gdm-2.20.10-custom-session.patch 1105 SHA256 58d09e131375f993e46088078993953ea2fedc87ed9deafbfa35eb7f4e731e67 SHA512 6d127ed622372ad5e8eca88abf3ffd374b0b6afff33a77ad62bca7f8f4a3582ff9237e35217048da62249b2e2313267b281aab2fb5cd5593b188ace421c7f754 WHIRLPOOL 94f99868c9db380beda18bd6b283bdd35a87c9769c14c99138fd3fa2fd060b18591e5e80fe0e6387085ad77801ad384611a9c5076740f49da84d05a94cab519f
-AUX gdm-2.20.10-desktop-session-dmrc-autologin.patch 873 SHA256 57f8e88acaf45b0cb84d80bb672dddf8e71a5152e9bff8216ff76d15b1e7dfcf SHA512 0dc69cf2e2ea41b4e200d681885263b596a053670a0d02b0035c4765a78e41cf776c16ce985aedd60ab76a5f5342d2cb08f1c7b401f588780e23169ca2fb9b61 WHIRLPOOL 5db6ce48d43c707ec1eaa1190e1ff46e0dd75be4633e135838647c9d6ecbf61ed3e3b5c07244b98dd51f07beb559e8a37d2b70da92d190ba45cc428c49f4223f
-AUX gdm-2.20.10-gdmsetup-24hr-combo.patch 1108 SHA256 558de681677fd631619dd90aba2b3fe99e783d051d706c536b85268eae40f19c SHA512 916ef335a7cb7121eb4c6446a85c36a6892830ae8fd3f3668e0c43b67f731830c1604046865b842d4850effcf8d1179b73b85db7420464bbda16885ff40a6751 WHIRLPOOL 3e8600a80f74b214e685aef2c0f293e61873ad04eb82060de03f5bd12a344916ab7f38fb852377ca36b87daf1b884025e3389822edd87e0239cd745fd2eb4f70
-AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 SHA256 59b0150159776a200c6041290f672f367b4a56f8adc5218d74a271a376c7cfe1 SHA512 c54fa3a3ec762290138e28b6b52f95ca765c7e279f6c3538f90e2df61dc6f7d45bc970a0f6f1a543c87404e8e094fd889a2ec6d3cd7ae0f651a5643fef1c725a WHIRLPOOL 646aa42795546b5131e56996fc38a4b49c963e4e85c76e410dd7f75b4945aade7b13d3f4200db1e57f656c78ae0c5684778f3f244c6a515571ffd1a3c8e1dc56
-AUX gdm-2.20.11-underlinking.patch 1441 SHA256 90dc3103d54789804b88a171d20353c710cb4eedc9f932590f1dbe6518a50406 SHA512 7ab638f50e9a362728f64ae0f89db4ff89145a5bb6e2fe1e57aefba7b134c6063c8c85b89441fd956510e0db4f812b215c93bbae45bd0a0e6a7228d2c11b56ab WHIRLPOOL e016b85b759e40dafa4ea86a71f1145c4d2d61a3ddeeba92306f90f1b566601d05f7cc6f5de011cd57735e3946836904869ad6385eaac1b871254d0ba2d924fd
-AUX gdm-2.20.2-gksu.patch 544 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d SHA512 6fcb5681a47f9bb0aa248e9c0dba27ccc7820ac56e8d1bb4621652a8bd759981899d24c08bd0546a1c4937c664e5d82e101da9900938198a9a0d1a9349891877 WHIRLPOOL 655d16026cf3dfe3a5e7c0007c7e80fa996b5afe6f5704a5326e40540b049c348caa70b7c4e681e5bbeafc28160142be0abb73015905e42a202a9a5f322fe06a
-AUX gdm-2.20.9-parallel-make.patch 1499 SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d SHA512 3ba30cdc5c9c665dc1000923d7fe61b2a4bf1ea9b5e8b88d07ed30e4ae28afa529894177e57fb032ec37b0a8ecc426a5f6acc4a6d2b1a973abf0ace50b17a8f3 WHIRLPOOL 7bf3163f549d498ded4f36a0a7f38b48819a676c0ac314286f920ee25e056a128c843b1df683edc2ceb3e8e947ca420f3fea1eb1d43519b2147aa5d262851c06
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 863 SHA256 71231d08baf41ee7b91c33c3d8a731c078d1d29328e09223efb1f579bacdaffe SHA512 3d7e841c018044ab1fd9804ad57ae75ece0ed2f9a9731023e90a1b25099bff5375c73ac842e353b38328f95f5baf59b84e4859a54f47176da0443aed6b58e3b3 WHIRLPOOL 56302e13dd104ae7f19dabc443403c25ef7a69428934e3d8ce0432442845dfd03854576a2b426b307954f9fc17e7ef846992a210054c7cc0e744450a7e5743a4
 AUX gdm-3.12.2-SIGUSR1-blocking-1.patch 1584 SHA256 adbb4aa5706653b6222ad3e0f29b0a16840b9f5b2f01523955f335a6bcfb70fe SHA512 2d694811fbf71bb32b0f8a03695961409b2136f9fa40f7d820421c5ad9432e5568603f6374cb3006eb3f77626236021ec19786a164f7f37c48ae65304bd63804 WHIRLPOOL a33c0e28d7cd479a5fd91ddcb964a5e71fc388cf8956284f25301c21e64b720e271c65aae4e42085c334a6cf47b687d67622491affaf3fa8ea062a490f3eba41
 AUX gdm-3.12.2-SIGUSR1-blocking.patch 1725 SHA256 8d1e3c7ea31ce777d354f3674f8f554129d11c2306c638b8f9c25535718303ac SHA512 ca0b220b559e4a0a605c1adf06a889ae67528784e6bcd0bff5ec9a3f9126d4e62a9d0d420497e6681d594aa002cd32d2e1225bc6c588d8359b790accf77e390c WHIRLPOOL 36a57864d3aafaf1d768fb335e5a17698e11dc22e22fa5aa636d5d633b4521bd70e18f7347cc34d4f3eb847bb01634ada8fc0681db4f637d15b55d86fdb4a8e3
 AUX gdm-3.2.1.1-custom-session.patch 1317 SHA256 75bd1bdc0d396fee71ff41c2657f922a4c8e290c891cc72f47647ab832d0c285 SHA512 474f839febcebd86449e21ecd7557b599889af7b070b305afcd3c008164de2fc2d42749a4f06e7e405e27671da49a32291468b2940d1d15f05cb1088fb7f42f9 WHIRLPOOL 2310fd849c3a87eab5e78b482f74fb4b97a93b49bc4ecd60197054eadaaad35a6bc73500c246368c031e4646c3effd555233fe5a0cf17e99d81ab4b62e7215e4
 AUX gdm-3.8.4-fingerprint-auth.patch 919 SHA256 d7a24f252fe78f3a1ebfe4ab3c3ceceec3ad737be3d0d435d33695c34fbdca81 SHA512 abc0836a0e87cb0e9a276aa6c086a68505140db86c063ead56f4e457f2970a4e1df97f1b4b7b0b5dd03769ddb00c9b5c0be5af13430a2dfe1b00500017d5815c WHIRLPOOL f335a677c72f806d741fbfc5816d1dee7902cfe41eaf2a445f25a2601a9bd82d5eb60cd7ee999a8c2f576ece95b8966b13169c03aac81dc686305d223301627d
 AUX gdm-3.8.4-logo.patch 432 SHA256 78072659f969d2c49ad28c466d1553d49caead71c09acd6aa1552ff1b46ecee7 SHA512 7f2e985f584a6b4f184c452eb7b86161af11b84a7a5d5c94f874fc13b3fea7d6c944adf084fe9ad0435226786444dc0dea0d1dd56caebd9c6ff29a7bc71decbe WHIRLPOOL cf1854933345310ab1ead3d09c2b9194d5e147ff74c20f45cc8a333af1f4790c8730ac39835d27e6ba8307f87602e2b400726f87389e79f5f74e592e023bc59e
-DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 SHA512 ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39 WHIRLPOOL 0bdb90aef849c7b505ffb1b0af1b904970a9cd11c27cf631794b14a01b5e0fb01666a51b68cf288ae79057dd7bfca9a8f1ef9518ec5b04a4867eb7792c631765
-DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
 DIST gdm-3.12.2.tar.xz 1522384 SHA256 cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4 SHA512 0c7f93fa12f1b2c4b6af71ea2767dc2b3367cc0330edfa106b1fe6c1ed6f112cc148f2319801bc44bc9ff6636d0b8cf5bd4be67999b48f1a7275c68ce9d5dbab WHIRLPOOL 3fd6ca8f53316a0cc167741b35a9ac402d00da12feae162c567e62d4b72cf63ef6f695725f7bc8a755c7c567daf0de0661bf8d96e22472da22fd6ba110880ed7
-DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
-EBUILD gdm-2.20.11-r1.ebuild 7373 SHA256 0a27e4a2c37ba6980cc886ddfafdbce65c88d29cd66b79c95d04832f3b993b10 SHA512 493f7d8863fda71849ea7c3385889c1bfa3fe1e95060d0b4c1842338c46aaa912474de38c8531158cdba12db0e24baff1e9b215ab9ad52d6ea8504a857398fc4 WHIRLPOOL d89f68ad7b60493bf6f0bd1cb725942da9b050a10c9cc2c955f541f9e19a1b7ca99fccee6fb2b5dcf944c074c6dde70befb81f2f15a0bff730a53f7698867af3
 EBUILD gdm-3.12.2-r1.ebuild 6688 SHA256 b4600eb4f3e73b911d3d5e1be75a57dee5183ea3028b5626d8b080cbffafe17b SHA512 1ebcd9e7101c922ccb9a0ebbf65a1121d9c37f91eabaf020a1f9597bf4d3b3161d486532e24ae1d611bf5c2664a3c1e4951a74580784632dbc8a9dd967d2bb6d WHIRLPOOL 371ebd4563ec5494096094740f37964a07089af9c179906e468f321a69dceced3c02f3a096f4ea8b98745c034517b7492ac1c09161c01603d679da65bc5926c3
 EBUILD gdm-3.12.2.ebuild 6581 SHA256 ab8e1e14a0ce200018e8ddfc1dadb8e38b810e1019529d4912317c8cc4d2bd15 SHA512 1a6996104ac4c11d34f88c7e0c3d646501047aafc8f3b31fd04b60b5ca9678c29686fd1622d3050131219a7f7f66441bd83fb6bfe40fe3472091c7dc2ff8b4a6 WHIRLPOOL 92449f1ecb30251036c1ca5471e6aa47bef7552b844258e1743661e11806d56ca366ec8df57e893e8518020f9d3500e58935a1c7dea3a22f6564bf6522a2458d
-MISC ChangeLog 62891 SHA256 77e6dc05b04733392ea8cfd3e538bfa11cf8af7e3bb64cb546bc80232c9f6a71 SHA512 e1e08d9312f00c814dc52b3adce15af15c1e5e099c5b4fb99190df07757e8e4b378d41c960eaae32fb81abd758baba6b0cae34c6c647fa6aa9994376a103064c WHIRLPOOL 423c0e0484905096cbf1a6e9773dfb664136f405f1157d23f3365d93a40a8d1dd749f77653c38751f3a9178f9f318cefa2c9e3fdf5d2c8741f81435c22af7694
-MISC metadata.xml 734 SHA256 ef71a7383585093a248a016783da93359975e3d91a4dbc14572d209fe7a44106 SHA512 512897b71e9fe9b1bc119f57ccea852341de68970b6c113d281a7422d6df449c28744301f46aa38190c5f9cb7b4ddf6ed37a44034201e592c097106a92c83b78 WHIRLPOOL d59b6d8ef1776254e52854e08896ae563c48dcdd5c9ca139f7b80085a81931aeb589f926f713e6cd8b24b8023c06e89d47b2ca0958bf63a3917ad398c76f3d16
+MISC ChangeLog 63391 SHA256 3aa108502c7faff495bec15492a8808bfb0a208e4fc99621f05e970acfd2f95a SHA512 58fdfeda291811aac87ff5e17be3402ab493444e8753d144531c92b3a98317b853b2ccf64c372361bed04a1b0cd978a2f2d408e2534250487c3b1051d57a2ea4 WHIRLPOOL 872ab69ec3c17e6f224feae000130b1a6c2569e2eaef87b9e30e27ff79473de43f2ff3b0cf7b6ae1332d9747cbf1891f397b64fd6231731b16a98580b48ac08c
+MISC metadata.xml 461 SHA256 40f9beae7d9944963e2c6d06b81770cddd7e349b48241b9fa49ad51fe926fd94 SHA512 b0a72a33e823f76f562dec12cdbb31d989f7c384111f3a55d0afb04ede80494adc5565c0479b0056912db730919b0bba0a84ed07c9a100817b0c2bb33ed7bfb7 WHIRLPOOL 01c6db8b57ea1bb8fa7c66e0f7ae44400a5a874ec11af22ea8499b7abbf896582dbe7b8b4b3b1210475b15d39d677ddff0fc1ec5023c864fc1256948ce400434
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUKXUuAAoJEJ0WA1zPCt1hMCoIALJrKLrlVOuYajBK938cl0LU
-VnQXl2+fJhWJSbcSiYaHMzzVaDpkNZ8ZXYc09eYT1u8cvMePtKdcn5ue2JRWZNor
-riAifQoozQ25fimWGKJJg1n8ye9OC/OPHVyjG+4HYFlq5XbYZ4fzWQCaeuTQtxCk
-7EP56KGcm8iueEijtcC+DSAy4N7H4+A5RnCzsEyJTt8N9NVYATNnhrKyZo1fRHvk
-ATwnI10xbBvHxpSJ03R3o7ToVJykW1je7L1MRfLTxZ+myw0GAXCLCtKxpawqBk2v
-FpJD/EfJQ7H7wLrvh1WtdPyoXfXI37YUsH20ETz7frEktnjmroMnOiP8SmUcQg4=
-=Snx5
+iEYEAREIAAYFAlRkkyYACgkQCaWpQKGI+9SAiACfcwa54tNfti9YH/hlQ4UFnZm6
+CcsAn16UEJupGtvtY8Rz2u72d9crWnMQ
+=TV3H
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/49-keychain b/gnome-base/gdm/files/49-keychain
deleted file mode 100644
index 77310b2a7461..000000000000
--- a/gnome-base/gdm/files/49-keychain
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# source keychain variables
-
-keychain="`which keychain`"
-if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ]
-then
-	. "${HOME}/.bash_profile"
-fi
diff --git a/gnome-base/gdm/files/50-ssh-agent b/gnome-base/gdm/files/50-ssh-agent
deleted file mode 100644
index 28af2672c794..000000000000
--- a/gnome-base/gdm/files/50-ssh-agent
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# add ssh-agent if found
-
-sshagent="`which ssh-agent`"
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-	command="$sshagent -- $command"
-elif [ -z "$sshagent" ] ; then
-	echo "$0: ssh-agent not found!"
-fi
diff --git a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
deleted file mode 100644
index 7af2f9a18ffc..000000000000
--- a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure gdm-2.13.0.1/configure
---- gdm-2.13.0.1.orig/configure	2005-11-14 17:34:33.000000000 -0500
-+++ gdm-2.13.0.1/configure	2005-11-18 14:59:31.000000000 -0500
-@@ -31700,7 +31700,7 @@
- #define HAVE_SELINUX 1
- _ACEOF
- 
--	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
-+	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
- fi
- 
- #
-diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure.ac gdm-2.13.0.1/configure.ac
---- gdm-2.13.0.1.orig/configure.ac	2005-11-14 17:13:40.000000000 -0500
-+++ gdm-2.13.0.1/configure.ac	2005-11-18 14:59:23.000000000 -0500
-@@ -750,7 +750,7 @@
- 	AC_CHECK_LIB(selinux,setexeccon,/bin/true)
- 	AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
- 	AC_DEFINE(HAVE_SELINUX)
--	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
-+	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
- fi
- 
- #
diff --git a/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch b/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch
deleted file mode 100644
index b1f70c00cb54..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch
+++ /dev/null
@@ -1,42 +0,0 @@
----
- fix custom sessions (see bug #216984, work done by Gilles, I'm just committing)
-
- config/Xsession.in |   18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-Index: b/config/Xsession.in
-===================================================================
---- a/config/Xsession.in
-+++ b/config/Xsession.in
-@@ -177,15 +177,6 @@ if [ -n "$GDM_LANG" ]; then
-   fi
- fi
- 
--# run all system xinitrc shell scripts.
--if [ -d /etc/X11/xinit/xinitrc.d ]; then
--    for i in /etc/X11/xinit/xinitrc.d/* ; do
--        if [ -x "$i" ]; then
--	    . "$i"
--        fi
--    done
--fi
--
- if [ "x$command" = "xcustom" ] ; then
-   if [ -x "$HOME/.xsession" ]; then
-     command="$HOME/.xsession"
-@@ -213,6 +204,15 @@ if [ "x$command" = "xdefault" ] ; then
-   fi
- fi
- 
-+# run all system xinitrc shell scripts.
-+if [ -d /etc/X11/xinit/xinitrc.d ]; then
-+    for i in /etc/X11/xinit/xinitrc.d/* ; do
-+        if [ -x "$i" ]; then
-+	    . "$i"
-+        fi
-+    done
-+fi
-+
- # add ssh-agent if found
- sshagent="`gdmwhich ssh-agent`"
- if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
diff --git a/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch b/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch
deleted file mode 100644
index 1c7b674382f5..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Fabio Erculiani <lxnay@sabayonlinux.org>
-Date: Fri, 08 Aug 2009 09:19 +0000
-Subject: Fix DESTOP_SESSION when dmrc is empty and autologin enabled.
-
----
- daemon/slave.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/slave.c b/daemon/slave.c
-index b52774d..ced9567 100644
---- a/daemon/slave.c
-+++ b/daemon/slave.c
-@@ -4638,10 +4638,6 @@ gdm_slave_session_start (void)
- 		language = g_strdup (usrlang);
- 	}
- 
--	tmp = gdm_strip_extension (session, ".desktop");
--	g_free (session);
--	session = tmp;
--
- 	if (ve_string_empty (session)) {
- 		g_free (session);
- 		session = find_a_session ();
-@@ -4651,6 +4647,10 @@ gdm_slave_session_start (void)
- 		}
- 	}
- 
-+	tmp = gdm_strip_extension (session, ".desktop");
-+	g_free (session);
-+	session = tmp;
-+
- 	if G_LIKELY (ve_string_empty (language)) {
- 		g_free (language);
- 		language = NULL;
diff --git a/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch b/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch
deleted file mode 100644
index 327d8e6fec90..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gdm/+bug/256283
-# Description: Fix 24 hour combo box in gdmsetup
-#
-Index: gdm-2.20.10/gui/gdmsetup.c
-===================================================================
---- gdm-2.20.10.orig/gui/gdmsetup.c	2009-04-03 14:17:35.000000000 +1100
-+++ gdm-2.20.10/gui/gdmsetup.c	2009-04-03 14:17:45.000000000 +1100
-@@ -1529,11 +1529,11 @@
- 		val     = gdm_config_get_string ((gchar *)key);
- 
- 		if (new_val) {
--                    if (strcmp (_(new_val), _("auto"))) {
-+                    if (strcmp (_(new_val), _("auto")) == 0) {
-                        if (strcasecmp (ve_sure_string (val), "auto") != 0)
-                           gdm_setup_config_set_string (key, "auto");
-                     }
--                    else if (strcmp (_(new_val), _("yes"))) {
-+                    else if (strcmp (_(new_val), _("yes")) == 0) {
-                        if (strcasecmp (ve_sure_string (val), "true") != 0 &&
-                            strcasecmp (ve_sure_string (val), "yes") != 0)
-                           gdm_setup_config_set_string (key, "true");
diff --git a/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch
deleted file mode 100644
index 8d20d1c1c671..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- ssh-agent really needs to be handled by xinitrc like other agents.
- Gentoo bug: 220603
-
- config/Xsession.in |    8 --------
- 1 file changed, 8 deletions(-)
-
-Index: b/config/Xsession.in
-===================================================================
---- a/config/Xsession.in
-+++ b/config/Xsession.in
-@@ -213,14 +213,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
-     done
- fi
- 
--# add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
--    command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
--    echo "$0: ssh-agent not found!"
--fi
--
- echo "$0: Setup done, will execute: $command"
- 
- eval exec $command
diff --git a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch b/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
deleted file mode 100644
index f7accccf3a46..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=496914
-
-diff --git a/configure.ac b/configure.ac
-index 3da7f33..8a0eedf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,6 +160,9 @@ AC_CHECK_TYPE(socklen_t,,
- 
- AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv getutxent updwtmpx logwtmp login logout])
- 
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- dnl checks needed for Darwin compatibility to linux **environ.
- AC_CHECK_HEADERS(crt_externs.h)
- AC_CHECK_FUNCS(_NSGetEnviron)
-diff --git a/gui/Makefile.am b/gui/Makefile.am
-index 577dc9f..3334381 100644
---- a/gui/Makefile.am
-+++ b/gui/Makefile.am
-@@ -123,6 +123,7 @@ gdmchooser_LDADD = \
- 	$(XINERAMA_LIBS)	\
- 	$(X_LIBS)		\
- 	$(XDMCP_LIBS)		\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig		\
- 	$(NULL)
-@@ -143,8 +144,10 @@ gdmlogin_LDADD = \
- 	$(X_EXTRA_LIBS)		\
- 	$(XINERAMA_LIBS)	\
- 	$(X_LIBS)		\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig		\
-+	$(LIBM)			\
- 	$(NULL)
- 
- # LIBGNOMEUI should be removed from gdmsetup at some point.
-@@ -183,6 +186,7 @@ gdmphotosetup_LDADD = \
- 	$(INTLLIBS)		\
- 	$(EXTRA_SOCKET_LIB)	\
- 	$(EXTRA_NSL_LIB)	\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig		\
- 	$(top_builddir)/common/libgdmcommon.a \
-diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am
-index fd0f500..7b9840d 100644
---- a/gui/greeter/Makefile.am
-+++ b/gui/greeter/Makefile.am
-@@ -91,6 +91,7 @@ gdmgreeter_LDADD = \
- 	$(X_EXTRA_LIBS)		\
- 	$(XINERAMA_LIBS)	\
- 	$(X_LIBS)		\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig
- 
diff --git a/gnome-base/gdm/files/gdm-2.20.2-gksu.patch b/gnome-base/gdm/files/gdm-2.20.2-gksu.patch
deleted file mode 100644
index 388917708047..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.2-gksu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in gdm-2.20.2/gui/gdmsetup.desktop.in.in
---- gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in	2007-11-26 18:11:04.000000000 -0500
-+++ gdm-2.20.2/gui/gdmsetup.desktop.in.in	2007-11-29 11:40:38.000000000 -0500
-@@ -3,7 +3,7 @@ Encoding=UTF-8
- _Name=Login Window
- _Comment=Configure GDM login window appearance and behavior
- TryExec=@sbindir@/gdmsetup
--Exec=@sbindir@/gdmsetup
-+Exec=gksu @sbindir@/gdmsetup
- Icon=gdmsetup
- StartupNotify=true
- Terminal=false
diff --git a/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch b/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch
deleted file mode 100644
index 3327e967d51f..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/gui/Makefile.am	2009-01-04 16:51:19.000000000 +0100
-+++ b/gui/Makefile.am	2009-01-04 16:52:10.000000000 +0100
-@@ -263,7 +263,7 @@
- Gladedir = $(datadir)/gdm
- Glade_DATA = gdmsetup.glade gdmchooser.glade gdmphotosetup.glade
- 
--install-data-local:
-+install-data-hook:
- 	-test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest
- 	$(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest
- 
---- a/gui/Makefile.in	2009-01-04 16:51:39.000000000 +0100
-+++ b/gui/Makefile.in	2009-01-04 16:52:52.000000000 +0100
-@@ -1222,7 +1225,9 @@
- info-am:
- 
- install-data-am: install-GladeDATA install-SettingsDATA \
--	install-SystemDATA install-data-local
-+	install-SystemDATA
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-dvi: install-dvi-recursive
- 
-@@ -1275,7 +1280,7 @@
- 	html-am info info-am install install-GladeDATA \
- 	install-SettingsDATA install-SystemDATA install-am \
- 	install-binPROGRAMS install-data install-data-am \
--	install-data-local install-dvi install-dvi-am install-exec \
-+	install-data-hook install-dvi install-dvi-am install-exec \
- 	install-exec-am install-html install-html-am install-info \
- 	install-info-am install-libexecPROGRAMS install-man \
- 	install-pdf install-pdf-am install-ps install-ps-am \
-@@ -1295,7 +1300,7 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--install-data-local:
-+install-data-hook:
- 	-test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest
- 	$(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest
- 
diff --git a/gnome-base/gdm/gdm-2.20.11-r1.ebuild b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
deleted file mode 100644
index 4e8bb36ef129..000000000000
--- a/gnome-base/gdm/gdm-2.20.11-r1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.12 2014/01/03 20:13:17 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils pam gnome2 user
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=x11-libs/gtk+-2.6:2
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2:2.0
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1:2
-	>=dev-libs/libxml2-2.4.12:2
-	>=media-libs/libart_lgpl-2.3.11
-	x11-libs/gksu
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	xinerama? ( x11-libs/libXinerama )
-	consolekit? (
-		sys-auth/consolekit
-		dev-libs/dbus-glib )
-	accessibility? ( x11-libs/libXevie )
-	afs? ( net-fs/openafs sys-libs/lwp )
-	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	pam? ( virtual/pam )
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	remote? ( gnome-extra/zenity )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-misc/xdg-utils-1.0.2-r3"
-DEPEND="${RDEPEND}
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--with-pam-prefix=/etc
-		--disable-static
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with accessibility xevie)
-		$(use_with consolekit console-kit)
-		$(use_with dmx)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-	# Add gksu to gdmsetup menu entry
-	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-
-	# Fix parallel install, bug #217037
-	epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch"
-
-	# Make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch"
-
-	# Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or
-	# does not contain any relevant data and autologin enabled, bug #281442
-	epatch "${FILESDIR}/${PN}-2.20.10-desktop-session-dmrc-autologin.patch"
-
-	# Fix 24 hour combo box in gdmsetup, bug #301151
-	# patch imported from ubuntu mirrors
-	epatch "${FILESDIR}/${PN}-2.20.10-gdmsetup-24hr-combo.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	# Underlinking for libXau, libm; bug #496914
-	epatch "${FILESDIR}/${P}-underlinking.patch"
-	rm missing || die # old version in tarball
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}/usr/sbin/gdm"
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-
-	fowners root:gdm /var/gdm
-	fperms 1770 /var/gdm
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain"
-	doexe "${FILESDIR}/50-ssh-agent"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	# add a custom sound playing script (#248253)
-	dobin "${gentoodir}/gdmplay"
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		dopamd "${gentoodir}"/pam.d/*
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-	fi
-
-	# use graphical greeter local
-	sed -i -e "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		"${D}"/usr/share/gdm/defaults.conf || die
-
-	# list available users
-	sed -i -e "s:^#MinimalUID=.*:MinimalUID=1000:" "${D}"/usr/share/gdm/defaults.conf || die
-	sed -i -e "s:^#IncludeAll=.*:IncludeAll=true:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Fix old X11R6 paths
-	sed -i -e "s:/usr/X11R6/bin:/usr/bin:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Use Clearlooks as default theme, bug #268496
-	sed -i -e "s:#GtkTheme=Default:GtkTheme=Clearlooks:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Wait more before assuming Xserver is defunct, bug #378765
-	sed -i -e "s:GdmXserverTimeout=10:GdmXserverTimeout=25:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Move Gentoo theme in
-	if use branding ; then
-		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-	elog "See README.install for more information about the change."
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [ "$(rc-config list default | grep xdm)" != "" ] ; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index ded957cd0f30..78fb7ea43f02 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -4,13 +4,9 @@
 <herd>gnome</herd>
 <use>
 	<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
-	<flag name="consolekit">Allow proper handling of removable media according
-		to who is actually present on the machine.</flag>
-	<flag name="dmx">Enables Distributed Multihead X (DMX) support</flag>
 	<flag name="fprint">Enables experimental fingerprint authentication using
 		<pkg>sys-auth/fprintd</pkg></flag>
 	<flag name="plymouth">Enable support for smooth transition from
 		<pkg>sys-boot/plymouth</pkg></flag>
-	<flag name="remote">Enables support for secure remote connections</flag>
 </use>
 </pkgmetadata>