Hi,

successfully emerged coreutils on x86-solaris successfully, but with
applied patch only.

Without patch I got this collision:
* checking 224 files for package collisions
existing file /tools/haubi/gentoo/usr/bin/m4 is not owned by this package
* spent 0.0120599269867 seconds checking for file collisions

I don't want to explain the details why this happened (should I), just
look at the patch.

/haubi/
-- 
Michael Haubenwallner                    SALOMON Automation GmbH
Forschung & Entwicklung                  A-8114 Friesach bei Graz
mailto:[EMAIL PROTECTED]  http://www.salomon.at
No HTML/MIME please, see http://expita.com/nomime.html
Index: sys-apps/coreutils/coreutils-5.94-r3.ebuild
===================================================================
--- sys-apps/coreutils/coreutils-5.94-r3.ebuild	(revision 1663)
+++ sys-apps/coreutils/coreutils-5.94-r3.ebuild	(working copy)
@@ -35,7 +35,7 @@
 	if [[ $(${EPREFIX}/bin/expr a : '\(a\)') != "a" ]] ; then
 		if [[ -x ${EPREFIX}/bin/busybox ]] ; then
 			ln -sf ${EPREFIX}/bin/busybox ${EPREFIX}/bin/expr
-		else
+		elif [[ $(expr a : '\(a\)') != "a" ]]; then
 			eerror "Your expr binary appears to be broken, please fix it."
 			eerror "For more info, see http://bugs.gentoo.org/123342";
 			die "your expr is broke"
@@ -123,25 +123,25 @@
 
 src_install() {
 	make install DESTDIR="${EDEST}" || die
-	rm -f "${D}/${EPREFIX}"/usr/lib/charset.alias
+	rm -f "${D}"/usr/lib/charset.alias
 	dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
 
 	# remove files provided by other packages
-	rm "${D}/${EPREFIX}"/bin/{kill,uptime} # procps
-	rm "${D}/${EPREFIX}"/bin/{groups,su}   # shadow
-	rm "${D}/${EPREFIX}"/bin/hostname      # net-tools
-	rm "${D}/${EPREFIX}"/usr/share/man/man1/{groups,kill,hostname,su,uptime}.1
+	rm "${D}"/bin/{kill,uptime} # procps
+	rm "${D}"/bin/{groups,su}   # shadow
+	rm "${D}"/bin/hostname      # net-tools
+	rm "${D}"/usr/share/man/man1/{groups,kill,hostname,su,uptime}.1
 	# provide by the man-pages package
-	rm "${D}/${EPREFIX}"/usr/share/man/man1/{chgrp,chmod,chown,cp,dd,df,dir,dircolors}.1
-	rm "${D}/${EPREFIX}"/usr/share/man/man1/{du,install,ln,ls,mkdir,mkfifo,mknod,mv}.1
-	rm "${D}/${EPREFIX}"/usr/share/man/man1/{rm,rmdir,touch,vdir}.1
+	rm "${D}"/usr/share/man/man1/{chgrp,chmod,chown,cp,dd,df,dir,dircolors}.1
+	rm "${D}"/usr/share/man/man1/{du,install,ln,ls,mkdir,mkfifo,mknod,mv}.1
+	rm "${D}"/usr/share/man/man1/{rm,rmdir,touch,vdir}.1
 
 	insinto /etc
 	newins src/dircolors.hin DIR_COLORS
 
 	if [[ ${USERLAND} == "GNU" ]] ; then
 		# move non-critical packages into /usr
-		cd "${D}/${EPREFIX}"
+		cd "${D}" || die
 		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

Reply via email to