diff options
author | Mike Gardiner <obz@gentoo.org> | 2003-08-11 12:39:10 +0000 |
---|---|---|
committer | Mike Gardiner <obz@gentoo.org> | 2003-08-11 12:39:10 +0000 |
commit | 853a9a71ee28b9f2f4f2b117e0c1189c8b72cffe (patch) | |
tree | cf2d5c57396ec6c62082b59aadbfdff9f7db966c /gnome-base/gdm | |
parent | "Version bump" (diff) | |
download | gentoo-2-853a9a71ee28b9f2f4f2b117e0c1189c8b72cffe.tar.gz gentoo-2-853a9a71ee28b9f2f4f2b117e0c1189c8b72cffe.tar.bz2 gentoo-2-853a9a71ee28b9f2f4f2b117e0c1189c8b72cffe.zip |
"Version bump"
Diffstat (limited to 'gnome-base/gdm')
-rw-r--r-- | gnome-base/gdm/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/gdm/Manifest | 4 | ||||
-rw-r--r-- | gnome-base/gdm/files/digest-gdm-2.4.1.6 | 2 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.4.1.6.ebuild | 194 |
4 files changed, 204 insertions, 3 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 3bafd1afe10b..f2a5db1be3ba 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gdm # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.37 2003/07/15 13:31:12 todd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.38 2003/08/11 12:37:55 obz Exp $ + +*gdm-2.4.1.6 (11 Aug 2003) + + 11 Aug 2003; Mike Gardiner <obz@gentoo.org> gdm-2.4.1.6.ebuild: + New version, removed obsolete omf-install section, and fixed postinst comment 15 Jul 2003; Todd Sunderlin <todd@gentoo.org> gdm-2.4.1.3.ebuild: Marked stable for sparc diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 5a5e12a568fd..6013381e6f5f 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,9 +1,9 @@ MD5 f36db8e8df066aa514d4d9d51c398a6a gdm-2.4.1.3.ebuild 5178 MD5 4a4bbd6eb4bc9ab0838198e6c076fd91 gdm-2.2.5.4-r5.ebuild 4526 MD5 5e2e48863fa27e1691185436297190e5 gdm-2.4.1.4.ebuild 5007 -MD5 0e66d9e5f1f54daf2e9cb26ff5608f33 ChangeLog 5305 +MD5 6e320d8ac157bb8e736f4ea501725a3a ChangeLog 5479 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 2bce5b49a04a1da5d3191a57a1710a0d gdm-2.4.1.6.ebuild 4714 +MD5 12dd94ecd50b3f492430a2d6c6217cd9 gdm-2.4.1.6.ebuild 4807 MD5 2038d05d9334211c8dab5a9c3e4593e2 gdm-2.4.0.12-r2.ebuild 5241 MD5 e630dae2e336b72763cc29724733521b files/digest-gdm-2.4.0.12-r2 135 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65 diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.6 b/gnome-base/gdm/files/digest-gdm-2.4.1.6 new file mode 100644 index 000000000000..db7926072cb0 --- /dev/null +++ b/gnome-base/gdm/files/digest-gdm-2.4.1.6 @@ -0,0 +1,2 @@ +MD5 ef8cba099c650bd46661b764db2717bd gdm-2.4.1.6.tar.bz2 2085553 +MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423 diff --git a/gnome-base/gdm/gdm-2.4.1.6.ebuild b/gnome-base/gdm/gdm-2.4.1.6.ebuild new file mode 100644 index 000000000000..346958f0077b --- /dev/null +++ b/gnome-base/gdm/gdm-2.4.1.6.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.6.ebuild,v 1.1 2003/08/11 12:37:58 obz Exp $ + +inherit eutils gnome2 + +DESCRIPTION="GNOME2 Display Manager" +HOMEPAGE="http://www.gnome.org/" + +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa amd64" +LICENSE="GPL-2" +IUSE="" +SRC_URI="${SRC_URI} + mirror://gentoo/gentoo-gdm-theme.tar.bz2" +MY_V="`echo ${PV} |cut -b -5`" + +RDEPEND=">=sys-libs/pam-0.72 + >=sys-apps/tcp-wrappers-7.6 + >=x11-libs/gtk+-2 + >=gnome-base/libglade-2 + >=gnome-base/librsvg-2 + >=dev-libs/libxml2-2.4.12 + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=gnome-base/libgnomecanvas-2" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=app-text/scrollkeeper-0.3.11 + >=x11-base/xfree-4.2.0-r3" + +src_unpack() { + unpack ${A} + + cd ${S}/daemon + cp gdm.h gdm.h.orig + sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ + gdm.h.orig > gdm.h + rm -f gdm.h.orig + + # Make Gentoo theme default + cd ${S}/config + cp gdm.conf.in gdm.conf.in.orig + sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \ + -e "s:=circles:=gentoo-emergence:" \ + -e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \ + gdm.conf.in.orig > gdm.conf.in + + rm -f gdm.conf.in.orig +} + +src_compile() { + ./configure --host=${CHOST} \ + --prefix=/usr \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var/lib \ + --with-pam-prefix=/etc \ + ${myconf} || die + + emake || die +} + +src_install() { + + make prefix=${D}/usr \ + sysconfdir=${D}/etc/X11 \ + localstatedir=${D}/var/lib \ + PAM_PREFIX=${D}/etc \ + install || die + + # We need to move gdm-binary to gdm, else our xdm script + # have problems stopping gdm (bug #5598) + rm -f ${D}/usr/bin/gdm + mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm + + rm -f ${D}/etc/pam.d/gdm + + # log + dodir /var/lib/gdm + chown gdm:gdm ${D}/var/lib/gdm + chmod 0750 ${D}/var/lib/gdm + + # pam startup + dodir /etc/pam.d + insinto /etc/pam.d + doins ${FILESDIR}/${MY_V}/pam.d/gdm + doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig + + # pam security + dodir /etc/security/console.apps + insinto /etc/security/console.apps + doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig + + # gnomerc + dodir /etc/X11/gdm + exeinto /etc/X11/gdm + doexe ${FILESDIR}/${MY_V}/gnomerc + + cd ${D}/etc/X11/gdm + for i in Init/Default PostSession/Default PreSession/Default gdm.conf + do + cp ${i} ${i}.orig + sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \ + ${i}.orig > ${i} + rm ${i}.orig + done + + cd ${D}/etc/X11/gdm + cp gdm.conf gdm.conf.orig + + sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \ + -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \ + -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \ + -e "s:TitleBar=true:TitleBar=false:g" \ + -e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \ + gdm.conf.orig > gdm.conf + + rm gdm.conf.orig + + cd ${S} + + # Support for new session stuff + rm -rf ${D}/etc/X11/gdm/Sessions + dosym ../Sessions /etc/X11/gdm/Sessions + + # Make sure the users environment are set properly + # (bash users only though :( ) + dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default + + # Move Gentoo theme in + mv ${WORKDIR}/gentoo-emergence ${D}/usr/share/gdm/themes + + dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO +} + +pkg_preinst() { + #support for new session stuff + if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ] + then + mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old + fi +} + +pkg_postinst() { + gnome2_scrollkeeper_update + + # Attempt to restart GDM softly by use of the fifo. Wont work on older + # then 2.2.3.1 versions but should work nicely on later upgrades. + # FIXME: this is just way too complex + FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`" + if [ -z "${FIFOFILE}" ] + then + FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo + else + FIFOFILE=${FIFOFILE}/.gdmfifo + fi + PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`" + if [ -z "${PIDFILE}" ] + then + PIDFILE=${ROOT}/var/run/gdm.pid + fi + if [ -w ${FIFOFILE} ] + then + if [ -f ${PIDFILE} ] + then + if kill -0 `cat ${PIDFILE}` + then + (echo;echo SOFT_RESTART) >> ${FIFOFILE} + fi + fi + fi + + # Unmerge nukes sometimes + if [ ! -d ${ROOT}/var/lib/gdm ] + then + mkdir -p ${ROOT}/var/lib/gdm + chown gdm.gdm ${ROOT}/var/lib/gdm + chmod 0750 ${ROOT}/var/lib/gdm + fi + touch ${ROOT}/var/lib/gdm/.keep + + echo "" + einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)" + einfo "and then execute 'rc-update add xdm default'." +} + +pkg_postrm() { + gnome2_scrollkeeper_update + + echo "" + einfo "To remove GDM from startup please execute" + einfo "'rc-update del xdm default'" +} |