Marking 2.6.0.9-r3 stable (x86). List available users in 2.8.0.1-r1 (bug #101645).

(Portage version: 2.0.51.22-r2)

5 files changed, 40 insertions, 27 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index ffc1155c4c7d..8b8a5000d9d6 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,10 +1,21 @@
 # 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.101 2005/07/24 19:45:44 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.102 2005/08/08 10:37:17 leonardop Exp $
+
+*gdm-2.8.0.1-r1 (08 Aug 2005)
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> gdm-2.8.0.1-r1.ebuild:
+  New revision. Rename old pam.d file from gdmconfig to gdmsetup. Move
+  G2CONF declaration to pkg_setup() so src_compile() doesn't get
+  overwritten. Modify gdm.conf to list available users in gdmsetup by
+  default (bug #101645).
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> gdm-2.6.0.9-r3.ebuild:
+  Stable on x86.
 
 *gdm-2.8.0.1 (24 Jul 2005)
 
-  24 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> gdm-2.8.0.1.ebuild :
+  24 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> gdm-2.8.0.1.ebuild:
   New release. Added 'static' USE flag. Updated HOMEPAGE. Now gentoo
   specific files are distributed in an extra tarball. Adjusted references to
   some binaries installed by GDM, as they are installed in different
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 07f919615a77..06dc2ad130d6 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -5,10 +5,13 @@ MD5 9bf25f27fc961e4a02a7a12bb033bd45 gdm-2.8.0.1.ebuild 3661
 MD5 b5c93605fcf054a4095cb57eab2dfcd8 gdm-2.6.0.9-r3.ebuild 3320
 MD5 dc176d15d4147fc47f76ed34c97db7d2 gdm-2.6.0.7.ebuild 3271
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 05ab452b78ec8afa603ab5a50115da98 gdm-2.8.0.1-r1.ebuild 3593
+MD5 a512ba2cf20beb423b75a1b762d51589 .gdm-2.8.0.1-r1.ebuild.swp 20480
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r2 137
 MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r3 137
 MD5 7aa6906b7eaa7f0ae5083c6d4aee316e files/digest-gdm-2.8.0.1 211
+MD5 5b650e1d4d90f356434d217d78a02714 files/digest-gdm-2.8.0.1-r1 211
 MD5 c343d16819b3e271f74187954492a212 files/digest-gdm-2.6.0.7 137
 MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
 MD5 222144a2577237cab4e4cd9b929a1654 files/gdm-2.6.0.9-ipv6_config.patch 649
diff --git a/gnome-base/gdm/files/digest-gdm-2.8.0.1 b/gnome-base/gdm/files/digest-gdm-2.8.0.1-r1
index 64aeadf5d2f9..bb294d9691f4 100644
--- a/gnome-base/gdm/files/digest-gdm-2.8.0.1
+++ b/gnome-base/gdm/files/digest-gdm-2.8.0.1-r1
@@ -1,3 +1,3 @@
 MD5 b3925c68b828fbb63994eba577c4b4fd gdm-2.8.0.1.tar.bz2 3522871
 MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
-MD5 8e956971bb537fcc757411204eed12c4 gdm-2.8-gentoo-files-r1.tar.bz2 3110
+MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
diff --git a/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild b/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild
index f84c136e44bf..ed3d4cb0deb3 100644
--- a/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild
+++ b/gnome-base/gdm/gdm-2.6.0.9-r3.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.9-r3.ebuild,v 1.1 2005/06/05 15:05:46 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild,v 1.2 2005/08/08 10:37:17 leonardop Exp $
 
 inherit gnome2 eutils pam
 
@@ -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 pam"
 
 SRC_URI="${SRC_URI}
diff --git a/gnome-base/gdm/gdm-2.8.0.1.ebuild b/gnome-base/gdm/gdm-2.8.0.1-r1.ebuild
index be60811b7d9b..47ebb76be620 100644
--- a/gnome-base/gdm/gdm-2.8.0.1.ebuild
+++ b/gnome-base/gdm/gdm-2.8.0.1-r1.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.8.0.1.ebuild,v 1.1 2005/07/24 19:45:44 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.1-r1.ebuild,v 1.1 2005/08/08 10:37:17 leonardop Exp $
 
 inherit eutils pam versionator gnome2
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
 IUSE="ipv6 pam selinux static tcpd xinerama"
 
 # Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-$(get_version_component_range 1-2)-gentoo-files-r1"
+GDM_EXTRA="${PN}-$(get_version_component_range 1-2)-gentoo-files-r2"
 SRC_URI="${SRC_URI}
 	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2
 	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
@@ -40,6 +40,22 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README* TODO"
 
+
+pkg_setup() {
+	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_enable static)"
+
+	if use pam; then
+		G2CONF="${G2CONF} --with-pam-prefix=/etc \
+			--enable-authentication-scheme=pam"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no \
+			--enable-authentication-scheme=shadow"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -47,29 +63,9 @@ src_unpack() {
 	# remove unneeded linker directive for selinux (#41022)
 	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
 
-	einfo "Running autoconf"
 	autoconf || die "autoconf failed"
 }
 
-src_compile() {
-	local myconf="--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_enable static)"
-
-	if use pam; then
-		myconf="${myconf} --with-pam-prefix=/etc \
-		--enable-authentication-scheme=pam"
-	else
-		myconf="${myconf} --enable-console-helper=no \
-		--enable-authentication-scheme=shadow"
-	fi
-
-	G2CONF="${G2CONF} ${myconf}"
-
-	gnome2_src_compile
-}
-
 src_install() {
 	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
 	local pam_prefix=""
@@ -109,6 +105,9 @@ src_install() {
 	# use graphical greeter local
 	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
 		/etc/X11/gdm/gdm.conf
+	# list available users
+	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /etc/X11/gdm/gdm.conf
+	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /etc/X11/gdm/gdm.conf
 
 	# Move Gentoo theme in
 	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes