diff options
Diffstat (limited to 'gnome-base/gdm/gdm-9999.ebuild')
| -rw-r--r-- | gnome-base/gdm/gdm-9999.ebuild | 150 |
1 files changed, 75 insertions, 75 deletions
diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild index 26d01bb..f36a929 100644 --- a/gnome-base/gdm/gdm-9999.ebuild +++ b/gnome-base/gdm/gdm-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.7.ebuild,v 1.5 2008/08/12 13:54:55 armin76 Exp $ -inherit eutils pam gnome2 gnome2-live gnome2-eapi-fixes +EAPI="2" + +inherit eutils pam gnome2 gnome2-live DESCRIPTION="GNOME Display Manager" HOMEPAGE="http://www.gnome.org/projects/gdm/" @@ -13,75 +14,81 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE_LIBC="elibc_glibc" -IUSE="accessibility afs debug ipv6 gnome-keyring policykit selinux tcpd xinerama $IUSE_LIBC" +IUSE="accessibility +consolekit debug ipv6 gnome-keyring policykit selinux tcpd test xinerama +xklavier $IUSE_LIBC" # Name of the tarball with gentoo specific files -GDM_EXTRA="${PN}-2.20.5-gentoo-files" +GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1" SRC_URI="${SRC_URI} - mirror://gentoo/${GDM_EXTRA}.tar.bz2" - -# FIXME: automagic libxklavier check + mirror://gentoo/${GDM_EXTRA}.tar.bz2" RDEPEND=">=dev-libs/dbus-glib-0.74 - dev-libs/glib:2 - x11-libs/gtk+:2 - x11-libs/pango - gnome-base/libglade:2.0 - gnome-base/gconf:2 - gnome-base/gnome-panel - x11-wm/metacity - >=x11-libs/libxklavier-3.5 - virtual/xft - app-text/iso-codes - - x11-libs/gksu - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - sys-auth/consolekit - virtual/pam - sys-auth/pambase[gnome-keyring?] - - accessibility? ( x11-libs/libXevie ) - afs? ( net-fs/openafs sys-libs/lwp ) - gnome-keyring? ( - gnome-base/gnome-keyring[pam] - ) - policykit? ( >=sys-auth/policykit-0.8 ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) - !gnome-extra/fast-user-switch-applet" + >=dev-libs/glib-2.15.4 + >=x11-libs/gtk+-2.10.0 + >=x11-libs/pango-1.3 + >=gnome-base/libglade-2 + >=gnome-base/gconf-2.6.1 + >=gnome-base/gnome-panel-2 + xklavier? ( >=x11-libs/libxklavier-3.5 ) + x11-libs/libXft + app-text/iso-codes + + x11-libs/gksu + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXext + x11-apps/sessreg + x11-libs/libXdmcp + virtual/pam + consolekit? ( + sys-auth/consolekit + >=sys-apps/hal-0.5.12_rc1-r1[consolekit] ) + + accessibility? ( x11-libs/libXevie ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) + policykit? ( + >=sys-auth/policykit-0.8 + >=gnome-extra/policykit-gnome-0.8 ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) + + !gnome-extra/fast-user-switch-applet" DEPEND="${RDEPEND} - test? ( >=dev-libs/check-0.9.4 ) - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) + sys-devel/gettext + x11-proto/inputproto + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + >=app-text/scrollkeeper-0.1.4 + >=app-text/gnome-doc-utils-0.3.2" +PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]" DOCS="AUTHORS ChangeLog NEWS README TODO" -PATCHES=" -${PN}-selinux-remove-attr.patch -${PN}-fix-daemonize-regression.patch" + +PATCHES="${FILESDIR}/${PN}-selinux-remove-attr.patch +${FILESDIR}/${PN}-2.24.1-fix-daemonize-regression.patch +${FILESDIR}/${PN}-2.26.1-broken-VT-detection.patch +${FILESDIR}/${PN}-2.26.1-custom-session.patch +${FILESDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch +${FILESDIR}/${PN}-2.24.1-automagic-libxklavier-support.patch" pkg_setup() { G2CONF="${G2CONF} --disable-schemas-install --localstatedir=/var --with-xdmcp=yes - --with-pam-prefix=/etc --enable-authentication-scheme=pam - --with-console-kit=yes + --with-pam-prefix=/etc + SOUND_PROGRAM=/usr/bin/gdmplay $(use_with accessibility xevie) $(use_enable debug) $(use_enable ipv6) + $(use_enable xklavier libxklavier) $(use_enable policykit polkit) + $(use_with consolekit console-kit) $(use_with selinux) $(use_with tcpd tcp-wrappers) $(use_with xinerama)" @@ -90,6 +97,7 @@ pkg_setup() { enewuser gdm -1 -1 /var/lib/gdm gdm } + src_install() { gnome2_src_install @@ -109,14 +117,21 @@ src_install() { fowners root:gdm /var/gdm fperms 1770 /var/gdm - # use our own session script - rm -f "${D}/etc/X11/gdm/Xsession" - exeinto /etc/X11/gdm - doexe "${gentoodir}/Xsession" - # add a custom xsession .desktop by default (#44537) exeinto /etc/X11/dm/Sessions - doexe "${gentoodir}/custom.desktop" + doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed" + + # add xinitrc.d scripts + exeinto /etc/X11/xinit/xinitrc.d + doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" + doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm || die "doenvd failed" + + # add a custom sound playing script (#248253) + dobin "${gentoodir}/gdmplay" # avoid file collision, bug #213118 rm -f "${D}/usr/share/xsessions/gnome.desktop" @@ -124,7 +139,6 @@ src_install() { # We replace the pam stuff by our own rm -rf "${D}/etc/pam.d" - # GDM 2.24 doesn't work without PAM use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* dopamd "${gentoodir}"/pam.d/* @@ -132,7 +146,7 @@ src_install() { } pkg_postinst() { - gnome2_pkg_postinst + gnome2-live_pkg_postinst ewarn ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" @@ -152,20 +166,6 @@ pkg_postinst() { 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 - gnome2-live_pkg_postinst } pkg_postrm() { |