From: Roy Marples <uberlord@gentoo.org>
Date: Mon, 30 Apr 2007 14:03:21 +0000 (+0000)
Subject: shadow is a glibc specific thing, fixes -pam for FreeBSD.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d9b450ac42919b778f4f9296fb8a0f85a46f364;p=gentoo.git

shadow is a glibc specific thing, fixes -pam for FreeBSD.
Package-Manager: portage-2.1.2.5
---

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 95d90aea34e5..036459c31569 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.205 2007/04/21 00:08:46 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.206 2007/04/30 14:03:21 uberlord Exp $
+
+  30 Apr 2007; Roy Marples <uberlord@gentoo.org> gdm-2.18.1.ebuild:
+  shadow is a glibc specific thing, fixes -pam for FreeBSD.
 
 *gdm-2.18.1 (20 Apr 2007)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index f0289544e1a4..a04e270a624a 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -42,14 +42,14 @@ EBUILD gdm-2.18.0.ebuild 5006 RMD160 6fdf7be92e764cd835c4684d07b215684ebd2989 SH
 MD5 2c5be8c8b1d7e0496578bf8671079e92 gdm-2.18.0.ebuild 5006
 RMD160 6fdf7be92e764cd835c4684d07b215684ebd2989 gdm-2.18.0.ebuild 5006
 SHA256 58497b869c605918928a9b585caf4b16584a72b2fe29965e739bbf7e36579c2c gdm-2.18.0.ebuild 5006
-EBUILD gdm-2.18.1.ebuild 5006 RMD160 bcdb4f2184c309c10b138a35b154a33aaf790de4 SHA1 f400f89716d81f6b61f230fd8f88cdbb3057ef52 SHA256 c8ef0e4f45d24d8b1a721725f5ed5fcd0f2a797a61fd5128a135c913ddb804f6
-MD5 6fbd696d16c9a729121e7701dc76f422 gdm-2.18.1.ebuild 5006
-RMD160 bcdb4f2184c309c10b138a35b154a33aaf790de4 gdm-2.18.1.ebuild 5006
-SHA256 c8ef0e4f45d24d8b1a721725f5ed5fcd0f2a797a61fd5128a135c913ddb804f6 gdm-2.18.1.ebuild 5006
-MISC ChangeLog 27438 RMD160 b270da01d24e182c6b8402c1ea81cf9b5c904d36 SHA1 5ba24eebe21196af5dde352f293d51f9ff2a146d SHA256 2182c0db4e7ed6c4bc0115319c2287bba007099310da8ba2295d4dda545f62cd
-MD5 c8dcbbd41c5d85dc8aa15a5fbf21a82a ChangeLog 27438
-RMD160 b270da01d24e182c6b8402c1ea81cf9b5c904d36 ChangeLog 27438
-SHA256 2182c0db4e7ed6c4bc0115319c2287bba007099310da8ba2295d4dda545f62cd ChangeLog 27438
+EBUILD gdm-2.18.1.ebuild 5149 RMD160 88bbd2796d501bf5710e00fee254318ff555e805 SHA1 ea21a2d8d72ad8a4dd44ba2a79ab08ae3eaa3125 SHA256 2dc4bf0ded5b4df10bb59399683691d9af5dd1039d375651f6cec55a00343c87
+MD5 d9cb17f28a8daaff03abd3d44682a93b gdm-2.18.1.ebuild 5149
+RMD160 88bbd2796d501bf5710e00fee254318ff555e805 gdm-2.18.1.ebuild 5149
+SHA256 2dc4bf0ded5b4df10bb59399683691d9af5dd1039d375651f6cec55a00343c87 gdm-2.18.1.ebuild 5149
+MISC ChangeLog 27571 RMD160 ee0eed48c26e00aa682cb7da8c0ae37b121ff571 SHA1 6b2a522a19e2d0929c4df142db87ae4274069583 SHA256 12c9a272a8bbf885df942cfb6081e05353fab00323de78a4419e372d7024f5ee
+MD5 01c049b011b80987a36e1f9d965748c9 ChangeLog 27571
+RMD160 ee0eed48c26e00aa682cb7da8c0ae37b121ff571 ChangeLog 27571
+SHA256 12c9a272a8bbf885df942cfb6081e05353fab00323de78a4419e372d7024f5ee ChangeLog 27571
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/gnome-base/gdm/gdm-2.18.1.ebuild b/gnome-base/gdm/gdm-2.18.1.ebuild
index 792b25482218..e37c9bc43240 100644
--- a/gnome-base/gdm/gdm-2.18.1.ebuild
+++ b/gnome-base/gdm/gdm-2.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.1.ebuild,v 1.1 2007/04/21 00:08:46 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.1.ebuild,v 1.2 2007/04/30 14:03:21 uberlord Exp $
 
 inherit eutils pam gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/gdm/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility branding ipv6 pam selinux tcpd xinerama"
+IUSE="accessibility branding ipv6 pam selinux tcpd xinerama elibc_glibc"
 
 # Name of the tarball with gentoo specific files
 GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
@@ -23,7 +23,7 @@ RDEPEND="pam?	(
 					virtual/pam
 					sys-auth/consolekit
 				)
-	!pam? ( sys-apps/shadow )
+	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
 	>=dev-libs/glib-2.8
 	>=x11-libs/gtk+-2.6
 	>=x11-libs/pango-1.3
@@ -77,8 +77,12 @@ pkg_setup() {
 						  --with-console-kit=yes"
 	else
 		G2CONF="${G2CONF} --enable-console-helper=no \
-						  --enable-authentication-scheme=shadow \
 						  --with-console-kit=no"
+		if use elibc_glibc; then
+			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
+		else
+			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
+		fi
 	fi
 
 	enewgroup gdm