Fix up dependencies and checks for non-GNU userlands (where shadow is not used) and mark ~x86-fbsd.

(Portage version: 2.1_pre10-r2)

2 files changed, 11 insertions, 6 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 92799b6860da..3ecd417d427f 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.155 2006/04/27 22:45:32 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.156 2006/05/02 22:43:22 flameeyes Exp $
+
+  02 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  distcc-2.18.3-r10.ebuild:
+  Fix up dependencies and checks for non-GNU userlands (where shadow is not
+  used) and mark ~x86-fbsd.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-distcc-2.16-r2,
   files/digest-distcc-2.16-r3, files/digest-distcc-2.18.3-r6,
diff --git a/sys-devel/distcc/distcc-2.18.3-r10.ebuild b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
index 3c2c3b7c0c01..fdab2e3aa76f 100644
--- a/sys-devel/distcc/distcc-2.18.3-r10.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v 1.1 2006/04/17 11:25:31 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v 1.2 2006/05/02 22:43:23 flameeyes Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
@@ -15,12 +15,12 @@ SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="gnome gtk selinux ipv6"
 
 DEPEND=">=sys-apps/portage-2.0.49-r6
 	>=sys-devel/gcc-config-1.3.1
-	sys-apps/shadow
+	userland_GNU? ( sys-apps/shadow )
 	gnome? ( dev-util/pkgconfig )
 	gtk? ( dev-util/pkgconfig )"
 RDEPEND="
@@ -55,7 +55,7 @@ src_compile() {
 	local myconf="--with-included-popt "
 	#Here we use the built in parse-options package. saves a dependancy
 
-	#not taking any chances here, guessing which takes precedence in the 
+	#not taking any chances here, guessing which takes precedence in the
 	#configure script, so we'll just make the distinction here:
 	#gnome takes precedence over gtk if both are specified (gnome pulls
 	#in gtk anyways...)
@@ -119,7 +119,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#are we doing bootstrap with has no useradd?
-	if [ -x /usr/sbin/useradd ]; then
+	if [[ ${CHOST} != *-*-gnu && ${CHOST} != *-linux* ]] || [ -x /usr/sbin/useradd ]; then
 	  enewuser distcc 240
 	else
 	  ewarn "You do not have useradd (bootstrap) from shadow so I didn't"