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

Package-Manager: portage-2.1_pre10-r2

3 files changed, 29 insertions, 14 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/Manifest b/sys-devel/distcc/Manifest
index 27232eea426b..09dbb95bd819 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.17/conf 1200 RMD160 3f2da45b4e167ac353d51f689edf982b4d82f1a3 SHA1 e41fd2990de423da493fe4829fdb6f33d5d35d1a SHA256 2eac049781f3b7503b1c639abb9e7ba7f95ce6f68a4d081e18c98615323882ea size 1200
 MD5 5affcf06208bcb7b093812c299a7d9d5 files/2.17/conf 1200
 RMD160 3f2da45b4e167ac353d51f689edf982b4d82f1a3 files/2.17/conf 1200
@@ -44,10 +47,10 @@ EBUILD distcc-2.16-r3.ebuild 5174 RMD160 d1564acf9e230bc77f5de13cf66f13f23a27bb6
 MD5 4dcddb685b2174d4bb5f037de2a34d1a distcc-2.16-r3.ebuild 5174
 RMD160 d1564acf9e230bc77f5de13cf66f13f23a27bb63 distcc-2.16-r3.ebuild 5174
 SHA256 265525f76230663ef5c10188ed2840a04657116cadbadfbe4bf19dedaaf97717 distcc-2.16-r3.ebuild 5174
-EBUILD distcc-2.18.3-r10.ebuild 4990 RMD160 69016637e30105626cbd1661a243a7932176cf85 SHA1 290d7fad7c76d011fe5b2939a50616b629def52a SHA256 18e94c9d84d733f0f0dd22f40a2130bc530317749535526a59d37ff934f826b5 size 4990
-MD5 2649b44a91a2866945bf350369d6b5bd distcc-2.18.3-r10.ebuild 4990
-RMD160 69016637e30105626cbd1661a243a7932176cf85 distcc-2.18.3-r10.ebuild 4990
-SHA256 18e94c9d84d733f0f0dd22f40a2130bc530317749535526a59d37ff934f826b5 distcc-2.18.3-r10.ebuild 4990
+EBUILD distcc-2.18.3-r10.ebuild 5075 RMD160 78bb74b2942e61bb66ba99f95dc029ff171eadd6 SHA1 37c1026ea30db41e0b3ab96cfcf37ee71d6991b0 SHA256 4804aea578ea5fe700cb12f6db2c53294d0fe6e27338b1ded6d1c533612729ca size 5075
+MD5 3ee0c585d6da0c2aca29b56438bf8481 distcc-2.18.3-r10.ebuild 5075
+RMD160 78bb74b2942e61bb66ba99f95dc029ff171eadd6 distcc-2.18.3-r10.ebuild 5075
+SHA256 4804aea578ea5fe700cb12f6db2c53294d0fe6e27338b1ded6d1c533612729ca distcc-2.18.3-r10.ebuild 5075
 EBUILD distcc-2.18.3-r6.ebuild 4593 RMD160 3d0a7c620e60ac57a6613934969fcd8e600ee3f4 SHA1 6e27c2964147fc773b44694bca3ef49790d1aeb0 SHA256 d73a0d3d6d584ed16b6ca87c35ee4bde50a0cfe3e69b8ddfaf938ede5a85549c size 4593
 MD5 64e0afe30accc560225a5c48fc49119d distcc-2.18.3-r6.ebuild 4593
 RMD160 3d0a7c620e60ac57a6613934969fcd8e600ee3f4 distcc-2.18.3-r6.ebuild 4593
@@ -60,10 +63,10 @@ EBUILD distcc-2.18.3-r8.ebuild 5016 RMD160 d5733383dbc54699ff2d2fd7987991d4508f8
 MD5 94b1faf946a456fcab1ccf9b57d3494e distcc-2.18.3-r8.ebuild 5016
 RMD160 d5733383dbc54699ff2d2fd7987991d4508f8c1b distcc-2.18.3-r8.ebuild 5016
 SHA256 83602aa9aca10059f9a721bb3640778b81d0d87a1a85b41e5b2cd98310ec4480 distcc-2.18.3-r8.ebuild 5016
-MISC ChangeLog 28182 RMD160 0c9aeff8f37b3c2f5c5db0652b4a53e1112c2a0b SHA1 758f1df3ddb6d7fad60f79eb5f9b4c73e5881b23 SHA256 5122ee6c40400441856be3561e7401bbf587bc668655d10ecb071ecbffff4061 size 28182
-MD5 8d88e4dfc1f67df4b442c4f6bebeabd1 ChangeLog 28182
-RMD160 0c9aeff8f37b3c2f5c5db0652b4a53e1112c2a0b ChangeLog 28182
-SHA256 5122ee6c40400441856be3561e7401bbf587bc668655d10ecb071ecbffff4061 ChangeLog 28182
+MISC ChangeLog 28370 RMD160 7c2d64156010063170a4e5615af4c6a4b8c86ef7 SHA1 3c3faf0cf6c827e2e9cc19bbc1d7ad59207402c7 SHA256 c23e632e5fce92ad77b810168acfc6fc84eca5db09b84b5fb8690e05fec6de1d size 28370
+MD5 c5ebf9715ada557cfdf36ccb58f8f771 ChangeLog 28370
+RMD160 7c2d64156010063170a4e5615af4c6a4b8c86ef7 ChangeLog 28370
+SHA256 c23e632e5fce92ad77b810168acfc6fc84eca5db09b84b5fb8690e05fec6de1d ChangeLog 28370
 MISC metadata.xml 375 RMD160 c51731438e30cf1cc094028d42732d2b67f2ff24 SHA1 44b18921608391fca87317209be9c7150a5854ca SHA256 c21cb46b52e1a9ca95bc476adb654962a4db6905930b59f5c607f9db3d20fcaf size 375
 MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375
 RMD160 c51731438e30cf1cc094028d42732d2b67f2ff24 metadata.xml 375
@@ -86,3 +89,10 @@ SHA256 16cd80dff3cb0d5ddccc99aa4cb46229bb277646da1bc6427337af3ee9b5c738 files/di
 MD5 26926294f8738c38d04eb72522388057 files/digest-distcc-2.18.3-r8 244
 RMD160 352188e1e5d7c0b7c409fe75d08db4222d693c95 files/digest-distcc-2.18.3-r8 244
 SHA256 16cd80dff3cb0d5ddccc99aa4cb46229bb277646da1bc6427337af3ee9b5c738 files/digest-distcc-2.18.3-r8 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEV+CRAiZjviIA2XgRAj+gAJoDxKwsAnrAeD6ndhy6aSW2DAqgDgCfUlja
+uCnuGaiqG1ibUT5bVLLZi0c=
+=/8uH
+-----END PGP SIGNATURE-----
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"