Fix gdm.conf paths for new locations. bug #110495

Package-Manager: portage-2.0.53_rc7

4 files changed, 37 insertions, 22 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 618ec5b7d8a6..00e164a25dc6 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.128 2005/10/16 00:28:07 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.129 2005/11/01 17:43:17 dang Exp $
+
+  01 Nov 2005; <dang@gentoo.org> gdm-2.8.0.5.ebuild:
+  Fix gdm.conf paths for new locations. bug #110495
 
   16 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> gdm-2.8.0.5.ebuild:
   add enewgroup/enewuser into pkgsetup for #104767 ( for 2.8.0.5 )
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 934056eaa5ed..802fbb520963 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,26 +1,36 @@
-MD5 b5feff9292f322953f1622bc2234f622 gdm-2.8.0.3.ebuild 3650
-MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
-MD5 65e67c78973b4878d1e6b700bb912ef8 gdm-2.8.0.1-r1.ebuild 3713
-MD5 aedc8c652821c355e11a46d93edbcc91 gdm-2.8.0.5.ebuild 3679
-MD5 37330f87e87c8fceb266a57f66bfdb81 gdm-2.6.0.9-r2.ebuild 3561
-MD5 9561bde0db86667a5075640a52bb7f99 ChangeLog 16634
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 94376baba0cbbf02a3297b7b4ea3a0ef gdm-2.8.0.4.ebuild 3654
-MD5 222144a2577237cab4e4cd9b929a1654 files/gdm-2.6.0.9-ipv6_config.patch 649
-MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
-MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r2 137
-MD5 97ae11c23f88fbfd0eb6058b6a8d56b9 files/digest-gdm-2.8.0.3 211
-MD5 2f36da0ccf882cf2e65d4e7c26e014e5 files/digest-gdm-2.8.0.4 211
-MD5 760cce8742853b3bf48248051b87193b files/digest-gdm-2.8.0.5 211
-MD5 5b650e1d4d90f356434d217d78a02714 files/digest-gdm-2.8.0.1-r1 211
-MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e3f7b93571bc52f95efd6da2845c736a ChangeLog 16735
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
-MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0/Xsession 6198
-MD5 a3f4b5a7ab813f106578125638e3b2f0 files/2.6.0/custom.desktop 301
 MD5 d0cb338160e3be8790524af8071cc4df files/2.2.5/pam.d/gdm 380
 MD5 89cc8ab9525284af6babcb9c86122443 files/2.2.5/pam.d/gdmconfig 288
+MD5 114395565e31f41b44d31d731f1478b0 files/2.2.5/security/console.apps/gdmconfig 66
+MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0/Xsession 6198
+MD5 a3f4b5a7ab813f106578125638e3b2f0 files/2.6.0/custom.desktop 301
 MD5 2edddb54af0c3c979b9ef73ba52deb4a files/2.6.0/pam.d/gdm 425
 MD5 6c45b586e2cf16cf89ab544197b12bae files/2.6.0/pam.d/gdm-autologin 406
 MD5 89cc8ab9525284af6babcb9c86122443 files/2.6.0/pam.d/gdmconfig 288
-MD5 114395565e31f41b44d31d731f1478b0 files/2.2.5/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.6.0/security/console.apps/gdmconfig 66
+MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
+MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r2 137
+MD5 5b650e1d4d90f356434d217d78a02714 files/digest-gdm-2.8.0.1-r1 211
+MD5 97ae11c23f88fbfd0eb6058b6a8d56b9 files/digest-gdm-2.8.0.3 211
+MD5 2f36da0ccf882cf2e65d4e7c26e014e5 files/digest-gdm-2.8.0.4 211
+MD5 6b6d0be7add58349e04329e1e4af41b9 files/digest-gdm-2.8.0.5 211
+MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
+MD5 222144a2577237cab4e4cd9b929a1654 files/gdm-2.6.0.9-ipv6_config.patch 649
+MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
+MD5 37330f87e87c8fceb266a57f66bfdb81 gdm-2.6.0.9-r2.ebuild 3561
+MD5 65e67c78973b4878d1e6b700bb912ef8 gdm-2.8.0.1-r1.ebuild 3713
+MD5 b5feff9292f322953f1622bc2234f622 gdm-2.8.0.3.ebuild 3650
+MD5 94376baba0cbbf02a3297b7b4ea3a0ef gdm-2.8.0.4.ebuild 3654
+MD5 4364a980b8357e8a5c52d4506fba8483 gdm-2.8.0.5.ebuild 3755
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZ6lDomPajV0RnrERAmuKAJ9j3zJkVz3xRTgitvl9GFyRjs6rkwCfYUZf
+rdaxxnYq8l+kY9nSHgFKeCY=
+=YU2T
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/digest-gdm-2.8.0.5 b/gnome-base/gdm/files/digest-gdm-2.8.0.5
index 000e141d4848..40df785108e4 100644
--- a/gnome-base/gdm/files/digest-gdm-2.8.0.5
+++ b/gnome-base/gdm/files/digest-gdm-2.8.0.5
@@ -1,3 +1,3 @@
+MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
 MD5 2944ba9c2a2bf7032ac81dc24eecf32d gdm-2.8.0.5.tar.bz2 2758902
 MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
diff --git a/gnome-base/gdm/gdm-2.8.0.5.ebuild b/gnome-base/gdm/gdm-2.8.0.5.ebuild
index cefb76520670..4cd31ea46f3a 100644
--- a/gnome-base/gdm/gdm-2.8.0.5.ebuild
+++ b/gnome-base/gdm/gdm-2.8.0.5.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.5.ebuild,v 1.3 2005/10/16 00:28:07 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.8.0.5.ebuild,v 1.4 2005/11/01 17:43:17 dang Exp $
 
 inherit eutils pam gnome2
 
@@ -114,6 +114,8 @@ src_install() {
 	# list available users
 	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /etc/X11/gdm/gdm.conf
 	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /etc/X11/gdm/gdm.conf
+	# Fix old X11R6 paths
+	dosed "s:/usr/X11R6/bin:/usr/bin:" /etc/X11/gdm/gdm.conf
 
 	# Move Gentoo theme in
 	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes