Index: coreutils-5.2.1-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r6.ebuild,v
retrieving revision 1.14
diff -u -B -r1.14 coreutils-5.2.1-r6.ebuild
--- coreutils-5.2.1-r6.ebuild	28 Jul 2005 14:24:25 -0000	1.14
+++ coreutils-5.2.1-r6.ebuild	3 Aug 2005 16:02:04 -0000
@@ -88,11 +88,17 @@
 	automake || die "automake"
 	eend $?
 
+	if [[ ${USERLAND} != "GNU" ]]; then
+		myconf="${myconf} --program-prefix=g"
+	else
+		myconf="${myconf} --bindir=/bin"
+	fi
+
 	econf \
-		--bindir=/bin \
 		--enable-largefile \
 		$(use_enable nls) \
 		$(use_enable selinux) \
+		${myconf} \
 		|| die "econf"
 
 	use static && append-ldflags -static
@@ -116,17 +122,20 @@
 	insinto /etc
 	doins ${FILESDIR}/DIR_COLORS
 
-	# move non-critical packages into /usr
-	cd "${D}"
-	dodir /usr/bin
-	mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
-	mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
-	mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
-	cd bin
-	local x
-	for x in * ; do
-		dosym /bin/${x} /usr/bin/${x}
-	done
+	# not needed for non-GNU userland as it installs everything on /usr/bin
+	if [[ ${USERLAND} == "GNU" ]]; then
+		# move non-critical packages into /usr
+		cd "${D}"
+		dodir /usr/bin
+		mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
+		mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
+		mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
+		cd bin
+		local x
+		for x in * ; do
+			dosym /bin/${x} /usr/bin/${x}
+		done
+	fi
 
 	if ! use build ; then
 		cd ${S}
@@ -134,13 +143,17 @@
 	else
 		rm -r "${D}"/usr/share
 	fi
+
+	rm -f ${D}/usr/lib/charset.alias
 }
 
 pkg_postinst() {
-	# hostname does not get removed as it is included with older stage1
-	# tarballs, and net-tools installs to /bin
-	if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
-	then
-		rm -f ${ROOT}/usr/bin/hostname
+	if [[ ${USERLAND} == "GNU" ]]; then
+		# hostname does not get removed as it is included with older stage1
+		# tarballs, and net-tools installs to /bin
+		if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
+		then
+			rm -f ${ROOT}/usr/bin/hostname
+		fi
 	fi
 }