mark 2.6.0.7 x86 & ppc, new release 2.6.0.9

(Portage version: 2.0.51.19)

4 files changed, 159 insertions, 4 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index a6900769c499..ad74a6160116 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.87 2005/04/25 12:53:14 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.88 2005/04/25 22:27:42 foser Exp $
+
+*gdm-2.6.0.9 (26 Apr 2005)
+
+  26 Apr 2005; foser <foser@gentoo.org> gdm-2.6.0.9.ebuild :
+  New release
+  Make pam optional (#48067)
 
   25 Apr 2005; Mike Gardiner <obz@gentoo.org> gdm-2.6.0.7.ebuild:
+  Don't use gentoo theme by default (#83818)
   Keyworded ppc x86
 
   02 Apr 2005; Stephen P. Becker <geoman@gentoo.org> gdm-2.6.0.6.ebuild:
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.9 b/gnome-base/gdm/files/digest-gdm-2.6.0.9
new file mode 100644
index 000000000000..6e010d17c51f
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.6.0.9
@@ -0,0 +1,2 @@
+MD5 d845fe205412bb101d4c66d1e88a317d gdm-2.6.0.9.tar.bz2 3484460
+MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/gdm-2.6.0.7.ebuild b/gnome-base/gdm/gdm-2.6.0.7.ebuild
index bd5360708244..ab23ed5fa619 100644
--- a/gnome-base/gdm/gdm-2.6.0.7.ebuild
+++ b/gnome-base/gdm/gdm-2.6.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.7.ebuild,v 1.3 2005/04/25 13:10:26 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.7.ebuild,v 1.4 2005/04/25 22:27:42 foser Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.jirka.org/gdm.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
 IUSE="tcpd xinerama selinux ipv6"
 
 SRC_URI="${SRC_URI}
@@ -99,7 +99,7 @@ src_install() {
 	# use graphical greeter local
 	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
 	# use Gentoo theme
-	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
+#	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
 
 	# Move Gentoo theme in
 	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
diff --git a/gnome-base/gdm/gdm-2.6.0.9.ebuild b/gnome-base/gdm/gdm-2.6.0.9.ebuild
new file mode 100644
index 000000000000..fa7082bcee73
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.6.0.9.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.9.ebuild,v 1.1 2005/04/25 22:27:42 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="GNOME2 Display Manager"
+HOMEPAGE="http://www.jirka.org/gdm.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+IUSE="tcpd xinerama selinux ipv6 pam"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2"
+MY_V="${PV%.*}"
+
+RDEPEND="pam? ( >=sys-libs/pam-0.72 )
+	!pam? ( sys-apps/shadow )
+	>=x11-libs/pango-1.4.1
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/libglade-2
+	>=gnome-base/librsvg-2
+	>=media-libs/libart_lgpl-2.3.11
+	>=dev-libs/libxml2-2.4.12
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2
+	selinux? ( sys-libs/libselinux )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	>=app-text/scrollkeeper-0.3.11
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+G2CONF="${G2CONF} \
+	--sysconfdir=/etc/X11 \
+	--localstatedir=/var \
+	--with-pam-prefix=/etc \
+	--with-xdmcp \
+	`use_enable ipv6` \
+	`use_with tcpd tcp-wrappers` \
+	`use_with xinerama` \
+	`use_with selinux`"
+
+use pam && G2CONF="${G2CONF} --with-pam-prefix=/etc --enable-authentication=pam" \
+	|| G2CONF="${G2CONF} --enable-console-helper=no --enable-authentication-scheme=shadow"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
+
+}
+
+src_install() {
+
+	local pam_prefix
+
+	use pam && pam_prefix="PAM_PREFIX=${D}/etc"
+
+	gnome2_src_install \
+		${pam_prefix} \
+		sysconfdir=${D}/etc/X11 \
+		localstatedir=${D}/var
+
+	# gdm-binary should be gdm to work with our init (#5598)
+	rm -f ${D}/usr/bin/gdm
+	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
+	dosym /usr/bin/gdm /usr/bin/gdm-binary
+
+	# log, etc.
+	keepdir /var/log/gdm
+	keepdir /var/gdm
+	chown root:gdm ${D}/var/gdm
+	chmod 1770 ${D}/var/gdm
+
+	# use our own session script
+	rm -f ${D}/etc/X11/gdm/Xsession
+	exeinto /etc/X11/gdm
+	doexe ${FILESDIR}/${MY_V}/Xsession
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe ${FILESDIR}/${MY_V}/custom.desktop
+
+	if use pam ; then
+		# We replace the pam stuff by our own
+		rm -f ${D}/etc/pam.d/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
+		doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin
+
+		# pam security
+		dodir /etc/security/console.apps
+		insinto /etc/security/console.apps
+		doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
+	fi
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	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
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+}
+
+pkg_postrm() {
+
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+
+}