From ddc1ef28caf65437af8aed981a8198b3f5392c78 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Sun, 11 Jan 2015 13:56:24 +0200 Subject: Added gdm --- gnome-base/gdm/Manifest | 7 +- gnome-base/gdm/gdm-3.10.0.1.ebuild | 2 +- gnome-base/gdm/gdm-3.12.1.ebuild | 242 +++++++++++++++++++++++++++++++++++ gnome-base/gdm/gdm-3.12.2.ebuild | 243 ++++++++++++++++++++++++++++++++++++ gnome-base/gdm/gdm-3.14.1-r1.ebuild | 241 +++++++++++++++++++++++++++++++++++ gnome-base/gdm/gdm-3.8.4.ebuild | 2 +- 6 files changed, 732 insertions(+), 5 deletions(-) create mode 100644 gnome-base/gdm/gdm-3.12.1.ebuild create mode 100644 gnome-base/gdm/gdm-3.12.2.ebuild create mode 100644 gnome-base/gdm/gdm-3.14.1-r1.ebuild diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 37239df5..deccd0fc 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,3 +1,4 @@ -DIST gdm-3.10.0.1.tar.xz 1552460 SHA256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7 SHA512 9c108fd70324c17bd93c1f9ad74a87404350041c4d0c45f72c233a1414202b107502f0154486d8c8cceb9f0826275608045539c8bc96cbc6ef5350fc55d5462a WHIRLPOOL 34dd4595ad94822703b4c9d49ce413b64a93e0ccd50bd757dbdf79b592fb714b24d9c9b87d852d04d62750bec3daa3039e5d0d70ff03611c698f63b3b91c9404 -DIST gdm-3.8.4.tar.xz 1677040 SHA256 db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447 SHA512 a64df8a4b7e1000aadfe1433b1d0f5d9bd16eeca45f1fdf36adc207a9f1dd410cf8e888553205135952a6da30b8c9efd4a240fc3f454636e0c9e4f86414a3283 WHIRLPOOL 4d3fe4cbd084a169bce29481271c99a8e9523cd6b1d163e4e1dc5cd829097daf9339de538d43998109596b41bde34ff798d2eaf607f38c5c859ee3b526f7e04e -DIST gdm-gentoo-2012.09.25.tar.xz 1448 SHA256 f5978e4309e5486be41fec437a6e538dbfca3451757f3282a557941c4e70700d SHA512 c9d1a4699c34ce8708a4e7eed1b38d66ead507a4a2a6b45f2ef6254d54b46c755c9195db0593d6aa6785a8986e2ef5235592071c0cae8c1c8963951ecdb7c079 WHIRLPOOL c0efd131977b0036431b9edd6932025247323f198dc1bd7195efb55d31fd6b106ebdf391944b0009cf7a3261e99160fa6041a26348fe020badf26d0785f5dcc8 +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 gdm-3.14.1.tar.xz 1503232 SHA256 ed83498131bcea69ce60f882783c669c24b007d2b7e1219b4bdde18f6c94deb1 SHA512 73a9490aec122b3240d2e6c0b106821c10635e55c1a5f2570771b2504007a4ca3172d1378e102bd42105514e702441d6baa6a5edfd30fc7bd5f85d2707e7d911 WHIRLPOOL 87f206199a45413979f8d198774d96dd897b4969e13acde0ff19aee189fc464f1cf0276888215b74cc9a7b1140f0161ec68191dd756bc344de76fdcc9d75771a +DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153 diff --git a/gnome-base/gdm/gdm-3.10.0.1.ebuild b/gnome-base/gdm/gdm-3.10.0.1.ebuild index d3e7c777..d9368b2e 100644 --- a/gnome-base/gdm/gdm-3.10.0.1.ebuild +++ b/gnome-base/gdm/gdm-3.10.0.1.ebuild @@ -199,7 +199,7 @@ src_install() { echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm doenvd 99xdg-gdm - # Sabayon: install our own script to set the gdm session via dbus + # Kogaion: install our own script to set the gdm session via dbus # AccountServices interface. This is useful for live booting to select # xbmc or fluxbox. exeinto /usr/libexec diff --git a/gnome-base/gdm/gdm-3.12.1.ebuild b/gnome-base/gdm/gdm-3.12.1.ebuild new file mode 100644 index 00000000..32ebed28 --- /dev/null +++ b/gnome-base/gdm/gdm-3.12.1.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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 + !=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" + + # Correctly set systemd unit dependencies if plymouth is disabled + # This avoids screwing up VT1 + use plymouth || epatch "${FILESDIR}/gdm-3.10.0.1-fix-systemd-unit-if-plymouth-disabled.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 + + # Kogaion: install our own script to set the gdm session via dbus + # AccountServices interface. This is useful for live booting to select + # xbmc or fluxbox. + exeinto /usr/libexec + doexe "${FILESDIR}/gdm-set-session" + + 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 new file mode 100644 index 00000000..9f8a12fa --- /dev/null +++ b/gnome-base/gdm/gdm-3.12.2.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +GCONF_DEBUG="yes" +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/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 +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 + !=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" + + # Correctly set systemd unit dependencies if plymouth is disabled + # This avoids screwing up VT1 + use plymouth || epatch "${FILESDIR}/gdm-3.10.0.1-fix-systemd-unit-if-plymouth-disabled.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 + + # Kogaion: install our own script to set the gdm session via dbus + # AccountServices interface. This is useful for live booting to select + # xbmc or fluxbox. + exeinto /usr/libexec + doexe "${FILESDIR}/gdm-set-session" + + 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.14.1-r1.ebuild b/gnome-base/gdm/gdm-3.14.1-r1.ebuild new file mode 100644 index 00000000..00906535 --- /dev/null +++ b/gnome-base/gdm/gdm-3.14.1-r1.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" +GCONF_DEBUG="yes" +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/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 +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 + !=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/gdbus-codegen + >=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, upstream bug #737578 + 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" + + # Correctly set systemd unit dependencies if plymouth is disabled + # This avoids screwing up VT1 + use plymouth || epatch "${FILESDIR}/gdm-3.10.0.1-fix-systemd-unit-if-plymouth-disabled.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 + + 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 + + # Kogaion: install our own script to set the gdm session via dbus + # AccountServices interface. This is useful for live booting to select + # xbmc or fluxbox. + exeinto /usr/libexec + doexe "${FILESDIR}/gdm-set-session" + + 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.8.4.ebuild b/gnome-base/gdm/gdm-3.8.4.ebuild index e382c3f1..c22d44b9 100644 --- a/gnome-base/gdm/gdm-3.8.4.ebuild +++ b/gnome-base/gdm/gdm-3.8.4.ebuild @@ -205,7 +205,7 @@ src_install() { emake GDM_WELCOME="gdm-launch-environment" LDAP=${LDAP} EPREFIX="${EPREFIX}" \ SYSTEMD_UNITDIR="$(systemd_get_unitdir)" DESTDIR="${D}" install - # Sabayon: install our own script to set the gdm session via dbus + # Kogaion: install our own script to set the gdm session via dbus # AccountServices interface. This is useful for live booting to select # xbmc or fluxbox. exeinto /usr/libexec -- cgit v1.2.3