Added man page fix, removed coreutils-5.0

(Portage version: 2.0.51.22-r1)

4 files changed, 26 insertions, 208 deletions

diff --git a/sys-apps/coreutils-darwin/ChangeLog b/sys-apps/coreutils-darwin/ChangeLog
index c0a023d1b1b4..bd960df63aec 100644
--- a/sys-apps/coreutils-darwin/ChangeLog
+++ b/sys-apps/coreutils-darwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/coreutils-darwin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/ChangeLog,v 1.6 2005/05/28 19:31:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/ChangeLog,v 1.7 2005/05/28 21:31:21 josejx Exp $
+
+  28 May 2005; Joseph Jezak <josejx@gentoo.org>
+  -coreutils-darwin-5.0.ebuild, coreutils-darwin-5.3.0.ebuild:
+  Added man page fix, removed coreutils-5.0.
 
   28 May 2005; Joseph Jezak <josejx@gentoo.org> coreutils-darwin-5.0.ebuild,
   coreutils-darwin-5.3.0.ebuild:
diff --git a/sys-apps/coreutils-darwin/coreutils-darwin-5.0.ebuild b/sys-apps/coreutils-darwin/coreutils-darwin-5.0.ebuild
deleted file mode 100644
index 7f35963a8963..000000000000
--- a/sys-apps/coreutils-darwin/coreutils-darwin-5.0.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/coreutils-darwin-5.0.ebuild,v 1.3 2005/05/28 19:31:54 josejx Exp $
-
-inherit eutils
-
-PATCH_VER=1.9.1
-
-DESCRIPTION="Standard GNU file utilities, text utilities, and shell utilities missing from Darwin."
-HOMEPAGE="http://www.gnu.org/software/coreutils/"
-SRC_URI="http://ftp.gnu.org/pub/gnu/coreutils/coreutils-${PV}.tar.bz2
-	mirror://gentoo/coreutils-gentoo-${PATCH_VER}.tar.bz2
-	mirror://gentoo/coreutils-gentoo-${PATCH_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-macos"
-IUSE="nls build acl static"
-PROVIDES="virtual/coreutils"
-
-DEPEND=">=sys-apps/portage-2.0.49
-	sys-devel/automake
-	sys-devel/autoconf
-	sys-apps/help2man
-	nls? ( sys-devel/gettext )
-	acl? ( sys-apps/acl )"
-
-PATCHDIR=${WORKDIR}/patch
-S=${WORKDIR}/coreutils-${PV}
-
-# Existing utils
-
-EXISTINGUSR="basename chgrp cksum comm cut dirname \
-	du env expand false fmt fold head install id join \
-	logname mkfifo nice nohup od paste pr printenv \
-	printf sort split stat sum tail tee touch tr true \
-	tsort tty uname unexpand uniq users wc who whoami yes"
-EXISTINGBIN="cat chmod cp date dd df echo expr ln ls mkdir mv pwd rm rmdir sleep stty sync test"
-EXISTINGUSBIN="chown chroot uptime"
-EXISTINGSBIN="mknod"
-
-src_unpack() {
-	unpack coreutils-${PV}.tar.bz2 coreutils-gentoo-${PATCH_VER}.tar.bz2
-	cd ${S}
-
-	# Apply the ACL patches. 
-	# WARNING: These CONFLICT with the SELINUX patches
-	if use acl
-	then
-		if ! use nls ; then
-			mv ${PATCHDIR}/acl/004* ${PATCHDIR}/excluded
-		fi
-		mv ${PATCHDIR}/{001*,002*,004*} ${PATCHDIR}/excluded
-		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
-	fi
-
-	# patch to remove Stallman's su/wheel group rant (which doesn't apply,
-	# since Gentoo's su is not GNU/su, but that from shadow.
-	# do not include su infopage, as it is not valid for the su
-	# from sys-apps/shadow that we are using.
-	# Patch to add processor specific info to the uname output
-
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-}
-
-src_compile() {
-	 cd ${S}
-
-	if use acl
-	then
-		if [ -z "`which cvs 2>/dev/null`" ]
-		then
-			# Fix issues with gettext's autopoint if cvs is not installed,
-			# bug #28920.
-			export AUTOPOINT="/bin/true"
-		fi
-		mv m4/inttypes.m4 m4/inttypes-eggert.m4
-	fi
-
-	ebegin "Reconfiguring configure scripts (this can take a while)"
-	# Remove configure info
-	rm config/config.guess config/config.sub
-
-	# Fix configure errors	
-	sed -i  -e 's/1.6b/1.6/' configure.ac || die "Can't fix version number"
-	sed -i 	-e 's/AC_PROG_RANLIB/AC_PROG_LIBTOOL/' configure.ac || die "Can't fix RANLIB"
-	sed -i	-e 's/AC_CONFIG_HEADERS(\[config.h:config.hin\])/AM_CONFIG_HEADER(config.h:config.hin)/' configure.ac || die "Can't fix RANLIB"
-	sed -i	-e 's/AC_AIX/\n/' configure.ac || die "Can't fix AIX error"
-	sed -i	-e 's/AC_MINIX/\n/' configure.ac || die "Can't fix configure.ac"
-	sed -i -e 's/AC_PROG_RANLIB/AC_PROG_LIBTOOL/' aclocal.m4  || die "Can't replace AC_PROG_RANLIB"
-
-	aclocal -I m4 || die
-	glibtoolize > /dev/null || die
-	autoconf || die
-	automake || die
-	eend
-
-	econf \
-		--bindir=/bin \
-		`use_enable nls` || die
-
-	if use static
-	then
-		emake LDFLAGS="${LDFLAGS} -static" || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-
-	# Install the utils
-	cd ${S}
-	make install infodir=${D}usr/share/info mandir=${D}usr/share/man bindir=${D}bin || die
-
-	cd ${D}
-	dodir /usr/bin
-	rm -rf usr/lib
-
-	cd bin
-	rm ${EXISTINGBIN} ${EXISTINGUSR} ${EXISTINGUSBIN} ${EXISTINGSBIN}
-
-	# Move the non-critical pacakges to /usr/bin
-	mv csplit factor md5sum nl ${D}usr/bin
-	mv pathchk pinky sha1sum tac ${D}usr/bin
-
-	# Link binaries
-	cd ${D}/usr/bin
-	for BINS in `ls ${D}/bin` ; do
-		dosym ../../bin/${BINS} /usr/bin/${BINS}
-	done
-
-	for BINS in ${EXISTINGUSR} ; do
-		dosym /usr/bin/${BINS} /bin/${BINS}
-	done
-
-	for BINS in ${EXISTINGBIN} ; do
-		dosym /bin/${BINS} /usr/bin/${BINS}
-	done
-
-	for BINS in ${EXISTINGUSBIN} ; do
-		dosym /usr/sbin/${BINS} /bin/${BINS}
-		dosym /usr/sbin/${BINS} /usr/bin/${BINS}
-	done
-
-	for BINS in ${EXISTINGSBIN} ; do
-		dosym /sbin/${BINS} /bin/${BINS}
-		dosym /sbin/${BINS} /usr/bin/${BINS}
-	done
-
-	# Remove the redundant man pages
-	cd ${D}/usr/share/man/man1
-	rm basename.1 cat.1 chroot.1 cksum.1 comm.1 \
-	   cut.1 date.1 dirname.1 echo.1 env.1 expand.1 expr.1 \
-	   false.1 fmt.1 fold.1 head.1 id.1 join.1 \
-	   logname.1 nice.1 nohup.1 od.1 paste.1 pr.1 printenv.1 \
-	   printf.1 pwd.1 readlink.1 sleep.1 sort.1 split.1 stat.1 \
-	   stty.1 sum.1 sync.1 tail.1 tee.1 test.1 tr.1 true.1 tsort.1 \
-	   tty.1 uname.1 unexpand.1 uniq.1 users.1 wc.1 who.1 whoami.1 \
-	   yes.1
-
-	if ! use build
-	then
-		cd ${S}
-		dodoc AUTHORS ChangeLog* COPYING NEWS README* THANKS TODO
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
-
-pkg_postrm() {
-	# Unlink binaries
-	for BINS in ${EXISTINGUSR} ; do
-		rm /bin/${BINS}
-	done
-
-	for BINS in ${EXISTINGBIN} ; do
-		rm /usr/bin/${BINS}
-	done
-
-	for BINS in ${EXISTINGUSBIN} ; do
-		rm /bin/${BINS}
-		rm /usr/bin/${BINS}
-	done
-
-	for BINS in ${EXISTINGSBIN} ; do
-		rm /bin/${BINS}
-		rm /usr/bin/${BINS}
-	done
-}
diff --git a/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild b/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild
index f96d80c47909..7a140f88d488 100644
--- a/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild
+++ b/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild,v 1.5 2005/05/28 19:31:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils-darwin/coreutils-darwin-5.3.0.ebuild,v 1.6 2005/05/28 21:31:21 josejx Exp $
 
 inherit eutils
 
@@ -61,17 +61,18 @@ src_install() {
 	dodir /usr/bin
 	rm -rf usr/lib
 
+	cd ${D}/bin
 	if [ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]; then
-		rm bin/${TENFOURBIN}
-		rm usr/bin/${TENFOURUSBIN}
+		rm ${TENFOURBIN} ${TENFOURUSBIN}
 	fi
 
-	cd bin
 	rm ${EXISTINGBIN} ${EXISTINGUSR} ${EXISTINGUSBIN} ${EXISTINGSBIN} ${DONTLINK}
 
 	# Move the non-critical pacakges to /usr/bin
-	mv csplit factor md5sum nl ${D}usr/bin
-	mv pathchk pinky sha1sum tac ${D}usr/bin
+	if [ "$MACOSX_DEPLOYMENT_TARGET" != "10.4" ]; then
+		mv csplit nl pathchk ${D}usr/bin
+	fi
+	mv factor md5sum pinky sha1sum tac ${D}usr/bin
 
 	# Link binaries
 	cd ${D}/usr/bin
@@ -99,19 +100,24 @@ src_install() {
 
 	# Remove the redundant man pages
 	cd ${D}/usr/share/man/man1
-	rm basename.1 cat.1 chroot.1 cksum.1 comm.1 \
-	   cut.1 date.1 dirname.1 echo.1 env.1 expand.1 expr.1 \
-	   false.1 fmt.1 fold.1 head.1 id.1 join.1 \
-	   logname.1 nice.1 nohup.1 od.1 paste.1 pr.1 printenv.1 \
-	   printf.1 pwd.1 readlink.1 sleep.1 sort.1 split.1 stat.1 \
-	   stty.1 sum.1 sync.1 tail.1 tee.1 test.1 tr.1 true.1 tsort.1 \
-	   tty.1 uname.1 unexpand.1 uniq.1 users.1 wc.1 who.1 whoami.1 \
-	   yes.1
+	for BINS in ${EXISTINGBIN} ${EXISTINGUSR} ${EXISTINGUSBIN} ${EXISTINGSBIN} ${DONTLINK}; do
+		if [ -f ${BINS}.1 ]; then
+			rm ${BINS}.1
+		fi
+	done
+
+	if [ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]; then
+		for BINS in ${TENFOURBIN} ${TENFOURUSBIN}; do
+			if [ -f ${BINS}.1 ]; then
+				rm ${BINS}.1
+			fi
+		done
+	fi
 
 	if ! use build
 	then
 		cd ${S}
-		dodoc AUTHORS ChangeLog* COPYING NEWS README* THANKS TODO
+		dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
 	else
 		rm -rf ${D}/usr/share
 	fi
diff --git a/sys-apps/coreutils-darwin/files/digest-coreutils-darwin-5.0 b/sys-apps/coreutils-darwin/files/digest-coreutils-darwin-5.0
deleted file mode 100644
index 85a507947cbd..000000000000
--- a/sys-apps/coreutils-darwin/files/digest-coreutils-darwin-5.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 94e5558ee2a65723d4840bfde2d323f0 coreutils-5.0.tar.bz2 3952653
-MD5 fffa185d0465f7c1759775e2396335fa coreutils-gentoo-1.9.1.tar.bz2 56075