Remove obsolete configuration message, drop old

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

4 files changed, 11 insertions, 257 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index b82545f107f7..5585b07dc684 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.407 2014/07/23 15:16:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.408 2014/07/28 16:25:33 pacho Exp $
+
+  28 Jul 2014; Pacho Ramos <pacho@gentoo.org> -gdm-3.12.1.ebuild,
+  gdm-3.12.2.ebuild:
+  Remove obsolete configuration message, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gdm-3.12.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d4573cbfa550..2dc414841069 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -23,30 +23,18 @@ DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
 DIST gdm-3.10.0.1-patches.tar.xz 10116 SHA256 249b0676498477aaa4da70ea1f39d9612222b1dbd8100cbdbd7b46a37998ed94 SHA512 f4cbf9f96c8f999601bf9e940af6db7172f79013355779869cbbf4be0a6bdecc808bc536a0267608095cd2af362226c291c8f8deac5a642534d31af5007cdbee WHIRLPOOL 51cdbf01ca64154d65152fff69ed3476619c850358a87dae9a765ce2c0bdea2c8a74a3ff2cb6c2660799b519b4e54e1631f0898422c5461ccc2b8551d84222b2
 DIST gdm-3.10.0.1.tar.xz 1552460 SHA256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7 SHA512 9c108fd70324c17bd93c1f9ad74a87404350041c4d0c45f72c233a1414202b107502f0154486d8c8cceb9f0826275608045539c8bc96cbc6ef5350fc55d5462a WHIRLPOOL 34dd4595ad94822703b4c9d49ce413b64a93e0ccd50bd757dbdf79b592fb714b24d9c9b87d852d04d62750bec3daa3039e5d0d70ff03611c698f63b3b91c9404
-DIST gdm-3.12.1.tar.xz 1505728 SHA256 41a009252bf491dadd7644b3e74be5c9364b1971b519a1a9ef31257180c74913 SHA512 351282d9e2f4b6441a91fe2fb33110b28d157ebf41faf7756ba2d14f4a3a417908fbbd1883de300e6ae2acf3186674f2e6932bc1873838f91563afd53a9250ba WHIRLPOOL 950789b3fea58d5720835a0b1cd28a6c258d81cd6d86669471c802f8229f21b95dea4a10ba56af5ea9d345c728015b24bd2c88d86179c254d7361cc021074f83
 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.10.0.1-r1.ebuild 6934 SHA256 bcead6db10a9b83f559a4ed80124edb8f2694c773de67bc42e6de74f1368161d SHA512 e68a1f8ee888b1ba2b44fa7fc44b47c68a90fbcf3f198fd6ae83c39ecd2f6ee0a3ddb3d576ec2d8a58a2bb6184fbd88f17071c15791b6894a5d31280158b2af6 WHIRLPOOL 35dda1238551c9b4c950518dec0a14f2c285161a77b4aea2e5b414d0d5a39b433f2a28aab531e09d5ba83a92f7e0aa20791d2ef49c9cdc6dfdb7bd5b241c95b2
-EBUILD gdm-3.12.1.ebuild 6796 SHA256 5fc2fd0781f3a516582fc5920c22179f93badc8f4d151aa741ad6efb349a88d0 SHA512 3ff50e2f1b570c237557ef169a706c5c86ba9637c0f00583b5d52af41b7dd34a91036d5d0dfb60c8d28ebdafd7c5a335cf805ea7be41c326f7a65feb6415a9cc WHIRLPOOL 4ad6faa551364b7566694af7d649bc2ca578347830c8f72040e4f851da80795233ebe4cd136decf934c06b01e134f2ce930a44f48a3319d3cff3ba6baa022e8b
-EBUILD gdm-3.12.2.ebuild 6797 SHA256 02036f60fe614d84fde99318994276642013adfcd2997c56d441612ff8bdeb15 SHA512 6f24336364d51f94ce86ee3955bf0a1b17556de617a09d72aca98a1babc8c10b1ddf5609451f93503340cae81f913414ae295a3bc7445a9e37f06f96740615a7 WHIRLPOOL 81e1a637e97d93038cb1971d372a13b8b94779da291714d1303d7f0a92a7e51edc3fa78892a730ed0bec76348b7cfaf5befd15aa175a3de59c542934fdf4a2e8
-MISC ChangeLog 62219 SHA256 6cca51ee69aef8e2d304977906fc81e25578f10e8b1d5b26af305f989287082a SHA512 3594db89c4cdb0d99e87574fea859a722a04ce0f7c7cd197883887205b62b2a82cd1b8829811c0ba9c079cdc357147cba14ef4ca858ef233bc0c7e9558b0dae6 WHIRLPOOL a15e1bc298af60d73400637d44d4848b56e4f059cb7dacfabb43d0e51fb9f1d6896865184cba8be42f2cbbc1d35220d2a224ff627928d6d0f65ac279fa7854df
+EBUILD gdm-3.12.2.ebuild 6553 SHA256 2f63df3215bd9a6026a282140ff279c9b02a488f73849bb9a744f8f0e8f70cd1 SHA512 9e8f503fc668651990240c3ab8fdc72c6957a7e88afb52f705e13db05999a8cc19afb4acb3845ecc233893d0fab3a9b1979c3f7823505dbb5aafa24980c5b560 WHIRLPOOL d3b31daac9d6767bde8c923938a97a1fd592824b0ec03b4f5a4a5f99442e23f3094662757cd63dd4885f39f3eb0f868980ff998594c8b5236e7831467bb4349a
+MISC ChangeLog 62359 SHA256 317873ebb48b0ca6c6a357d1d98ca0af6ccaebaf24c74125b336c25be112db10 SHA512 95a8bdc4eb479e616f954861397b9bfbc4a0b0760e75a48d5237f555d1fbbb7252042d4182e759e6ca61ce4c5358eec45b3998f09ff7818d838b691003f4d09f WHIRLPOOL 3a1243630b880399691fc2e972bdef16040046e92d4b24968785ce74050f1af752aa70a01973149e6d03fb4791cb25a79f00111a2db328ccbf30655ae50ff583
 MISC metadata.xml 734 SHA256 ef71a7383585093a248a016783da93359975e3d91a4dbc14572d209fe7a44106 SHA512 512897b71e9fe9b1bc119f57ccea852341de68970b6c113d281a7422d6df449c28744301f46aa38190c5f9cb7b4ddf6ed37a44034201e592c097106a92c83b78 WHIRLPOOL d59b6d8ef1776254e52854e08896ae563c48dcdd5c9ca139f7b80085a81931aeb589f926f713e6cd8b24b8023c06e89d47b2ca0958bf63a3917ad398c76f3d16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9HaAAoJELp701BxlEWfI4UP/3SLS/AmATV+b0wRrGySzGme
-rbnPOgugohmLDvyzsaUVbS82ytIaqk03e1oPsiV4m/UyxHAezzlFyYI9Sqo7JyNz
-ZWLs8vYXR3cs5CaD9cPq6FkWxKIvHGKm0lYycTJPoX2jawI3a+pQmepA31i6rIRa
-+XFiqZb53LF8VqbYSyslfayHUYj/04cnFnHLYSoCUN5C1w0nkZAOfw4c19DnUNe5
-b/e6G2iJD6lltU5Yk2JHvtWOdEue+iEckP2nYYETmSdeb2WqCLq/fgPLGf8+NG7q
-+p72vFuWY6KSEfl8ozXUkQoPoAZT9lZf/ku5mU3GIR+R7cNyv0WDxaptNloKG4UI
-A7sH+29uFr9nU8ekeUTPkcB2TrJ9wiPp1udrdfc1s368llc7KnBhgcD83c75uQK5
-yw4UrxdwYvi9SbR+XZgFUBovRuwTOpcyBoDSZfLl2cXOThUPh4ZYhYrsC9i6hBBa
-Yc8AFQ77xqWoPXnCSbpMKaCGZQ+7B4wUNNDi732++AHfex0582tHOk9UEd9JkfZm
-ybouvGl2hE3kr02mSm/yVWAQ8skDnKCOQTfB/eNb/QQHwEXiOTep2PM1vulRHIg6
-r/7Z2VW+3BEbzQ6Mo6f+IIKs2I+wXJf4tOrOFL1emyoIKKxzmx59EJtI/Z0zIhvf
-LPEVOqhdr0S+gMeromKP
-=fK+8
+iEYEAREIAAYFAlPWeX4ACgkQCaWpQKGI+9TIoQCghmitFVgf9TAiNP0hIhU1ET3Z
+0tAAn38NZi0wR2Yz7EMok25gcs0Z5L2A
+=F8Sj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-3.12.1.ebuild b/gnome-base/gdm/gdm-3.12.1.ebuild
deleted file mode 100644
index 0674e009ff2b..000000000000
--- a/gnome-base/gdm/gdm-3.12.1.ebuild
+++ /dev/null
@@ -1,232 +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-3.12.1.ebuild,v 1.1 2014/04/27 16:48:32 eva Exp $
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pam readme.gentoo systemd user
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-Sampling-Plus-1.0 )
-"
-
-SLOT="0"
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
-REQUIRED_USE="wayland? ( systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.12
-
-	x11-apps/sessreg
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-	systemd? ( >=sys-apps/systemd-186:0=[pam] )
-	!systemd? (
-		>=x11-base/xorg-server-1.14.3-r1
-		>=sys-auth/consolekit-0.4.5_p20120320-r2
-		!<sys-apps/openrc-0.12
-	)
-	sys-auth/pambase[systemd?]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	gnome-extra/polkit-gnome:0
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		app-accessibility/caribou
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/randrproto
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Show logo when branding is enabled
-	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	! use plymouth && myconf="${myconf} --with-initial-vt=7"
-
-	gnome2_src_configure \
-		--with-run-dir=/run/gdm \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--with-xdmcp=yes \
-		--enable-authentication-scheme=pam \
-		--with-default-pam-config=exherbo \
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
-		--with-consolekit-directory="${EPREFIX}"/usr/lib/ConsoleKit \
-		--with-initial-vt=7 \
-		--without-xevie \
-		$(use_with audit libaudit) \
-		$(use_enable ipv6) \
-		$(use_with plymouth) \
-		$(use_with selinux) \
-		$(use_with systemd) \
-		$(use_with !systemd console-kit) \
-		$(use_enable systemd systemd-journal) \
-		$(systemd_with_unitdir) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable wayland wayland-support) \
-		$(use_with xinerama) \
-		ITSTOOL=$(type -P true) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	insinto /etc/X11/xinit/xinitrc.d
-	newins "${FILESDIR}/49-keychain-r1" 49-keychain
-	newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# log, etc.
-	keepdir /var/log/gdm
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local d ret
-
-	gnome2_pkg_postinst
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	readme.gentoo_print_elog
-
-	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
-}
diff --git a/gnome-base/gdm/gdm-3.12.2.ebuild b/gnome-base/gdm/gdm-3.12.2.ebuild
index 501440146a28..6fafddced1f7 100644
--- a/gnome-base/gdm/gdm-3.12.2.ebuild
+++ b/gnome-base/gdm/gdm-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # 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-3.12.2.ebuild,v 1.3 2014/07/23 15:16:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.12.2.ebuild,v 1.4 2014/07/28 16:25:33 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -223,10 +223,4 @@ pkg_postinst() {
 	eend ${ret}
 
 	readme.gentoo_print_elog
-
-	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
 }