[gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/files/, gnome-base/gdm/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     a0613363e125b608ed2d24b97e9d3c5013316ca3
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 00:05:52 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 00:33:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0613363

gnome-base/gdm: cleanup old revision

Package-Manager: portage-2.3.2

 gnome-base/gdm/Manifest                            |   1 -
 .../gdm/files/gdm-3.2.1.1-custom-session.patch     |  51 -----
 gnome-base/gdm/gdm-3.18.3.ebuild                   | 218 ---------------------
 3 files changed, 270 deletions(-)

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index bc368e1..3011116 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,4 +1,3 @@
-DIST gdm-3.18.3.tar.xz 1605980 SHA256 068729fa1744b38eb96be5440416e420c6e41783e9e53d0a217c89928581b1a3 SHA512 b1d80a37f8ae7fe924d7539c1d10e15ce5fb25ad00e6ca8ae1e8df5b901a4a7327b126e869eb56b76a6247709fed193eecd636b74643f61e296d371ae7468e98 WHIRLPOOL 6e9e44796787663b75547821972b3e2cfdcf5b0711bafa412ca1c2961ff00de868b5bf664ab949b7e4736ef86e1bbfdce7f6212edda1017ae48114b90d8de40f
 DIST gdm-3.20.1.tar.xz 1148952 SHA256 10a2512fc8455a3e60e61907a8419ae7dfba9e7ea80cfb7e2ffa746eb165789f SHA512 6d6121aa86b78e0353f9f4c230151efbf45da64f5af3e0a694ed84ecbf9d64b2ae769755b6f3d0c55b9ad88f2710e4a6cf2aafc15201444a843a40daf40dcbc6 WHIRLPOOL 2a42fb8c0becb51e87f67415fb20c3a2fc90d85b74e919fda0df36cf45f68a271fd9631f0bbdff914a164fcbabcdc535934cd18a75c0f9b6afa08c62190a9e32
 DIST gdm-3.22.1.tar.xz 1110372 SHA256 6a43e623f563c2e366297c2ee8d160526a285e102c73936e27a1d79076d6969f SHA512 dfd66017f62b4cfeac41b9f86a09ce826d08b994b608fd3c8bc1a27ed0245a755921bee8720d442e300a60367f7be8a7dc85f917ccc6ef0b71f712348c0e3060 WHIRLPOOL 5c352321590728be20c0e866aadc31092b59f07be90d819ec214df9f6ccb9a60f9c3e2ee7d0518f3a89395e178f18cf4d2edc29c9ce0bdfb70dfda2752bdbc86
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153

diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
deleted file mode 100644
index c27f8fd..00000000
--- a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e61ece2b42b270dd3f68718fef291be7b7f44aa6 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:19:07 +0100
-Subject: [PATCH 1/4] make custom session work
-
-Gentoo bug: #216984
-
-fix custom sessions not doing sourcing in the proper order.
----
- data/Xsession.in | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/data/Xsession.in b/data/Xsession.in
-index 118518c..201be92 100755
---- a/data/Xsession.in
-+++ b/data/Xsession.in
-@@ -155,15 +155,6 @@ fi
- 
- xhost +si:localuser:`id -un` || :
- 
--# 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" -a ! -d "$i" ]; then
--	    . "$i"
--        fi
--    done
--fi
--
- if [ "x$command" = "xcustom" ] ; then
-   if [ -x "$HOME/.xsession" ]; then
-     command="$HOME/.xsession"
-@@ -191,6 +182,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" -a ! -d "$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
--- 
-1.8.5.1
-

diff --git a/gnome-base/gdm/gdm-3.18.3.ebuild b/gnome-base/gdm/gdm-3.18.3.ebuild
deleted file mode 100644
index 3019e3d..00000000
--- a/gnome-base/gdm/gdm-3.18.3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pam readme.gentoo-r1 systemd user versionator
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/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 tcpd test wayland xinerama"
-
-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[dbus]
-	>=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:1.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-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-
-	>=sys-apps/systemd-186:0=[pam]
-
-	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
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		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/gdbus-codegen
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	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() {
-	# 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 \
-		--enable-gdm-xsession \
-		--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 \
-		--without-xevie \
-		--enable-systemd-journal \
-		$(use_with audit libaudit) \
-		$(use_enable ipv6) \
-		$(use_with plymouth) \
-		$(use_with selinux) \
-		$(systemd_with_unitdir) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable wayland wayland-support) \
-		$(use_with xinerama) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# 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 ! version_is_at_least 3.16.0 ${REPLACING_VERSIONS}; then
-		ewarn "GDM will now use a new TTY per logged user as explained at:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:GNOME/GNOME3-Troubleshooting#GDM_.3E.3D_3.16_opens_one_graphical_session_per_user"
-	fi
-}