the patches link against ncurses rather than libtermcap, closing bug #37026 by Martin Flugeldufel <martin_flugeldufel@yahoo.com>. Additionally, some of the non-critical binaries (those not needed for bootup) have been moved to /usr/bin, which partially sorts out bug #36453, also by Martin Flugedufel

4 files changed, 182 insertions, 4 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 2065b709800c..68d6cb76f4f9 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/coreutils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.64 2003/12/31 08:15:30 seemant Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.65 2004/01/09 08:24:52 seemant Exp $
+
+*coreutils-5.0.91-r4 (09 Jan 2004)
+
+  09 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-5.0.91-r4.ebuild:
+  the patches link against ncurses rather than libtermcap, closing bug #37026 by
+  Martin Flugeldufel <martin_flugeldufel@yahoo.com>. Additionally, some of the
+  non-critical binaries (those not needed for bootup) have been moved to
+  /usr/bin, which partially sorts out bug #36453, also by Martin Flugedufel
 
   31 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
   coreutils-5.0.91-r3.ebuild:
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 89f7bca369fd..65d661ed6f88 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -2,8 +2,8 @@ MD5 10894dea50f4a0010ee4d27b26df8b9e coreutils-5.0.91-r3.ebuild 4063
 MD5 fb0112dcad7f6d1ee0531fa66426a261 coreutils-5.0-r6.ebuild 2741
 MD5 a884c01088b155094153e54aca9e2d3c coreutils-5.0.91-r2.ebuild 3648
 MD5 abdfeb9b44e6951ae6ed1229d436ffca coreutils-5.0-r5.ebuild 2573
-MD5 9500a4e20bc57825ceca97b790bb5eba coreutils-5.0.91-r4.ebuild 4028
-MD5 9a118a57cb28aae1f092c022f504166b ChangeLog 12730
+MD5 0e6474d52b18d3e89a7b8e7f2433ab33 coreutils-5.0.91-r4.ebuild 4273
+MD5 46855cc97d388d02d653a2ccc4d4cef9 ChangeLog 13158
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 4638c50e0ea024536055d69519cd5fad files/digest-coreutils-5.0.91-r2 151
 MD5 a56b66f95289815e386f537689ef29a0 files/digest-coreutils-5.0.91-r3 229
diff --git a/sys-apps/coreutils/coreutils-5.0.91-r4.ebuild b/sys-apps/coreutils/coreutils-5.0.91-r4.ebuild
new file mode 100644
index 000000000000..fe9534f5c39c
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-5.0.91-r4.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0.91-r4.ebuild,v 1.1 2004/01/09 08:24:52 seemant Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="nls build acl selinux static"
+
+PATCH_VER=1.4.5
+I18N_PATCH=i18n-0.2
+PATCHDIR=${WORKDIR}/patch
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
+HOMEPAGE="http://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/coreutils/${P}.tar.bz2
+	mirror://coreutils/${P}.tar.bz2
+	http://www.openi18n.org/subgroups/utildev/patch/${P}-${I18N_PATCH}.patch.gz
+	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~seemant/extras/${P}-gentoo-${PATCH_VER}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64 ~amd64 ~ppc64"
+
+DEPEND="virtual/glibc
+	>=sys-apps/portage-2.0.49
+	>=sys-devel/automake-1.7.6
+	>=sys-devel/autoconf-2.57
+	>=sys-devel/m4-1.4-r1
+	sys-apps/help2man
+	acl? ( !hppa? ( sys-apps/acl ) )
+	selinux? ( sys-libs/libselinux )"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( !hppa? ( sys-apps/acl ) )
+	nls? ( sys-devel/gettext )
+	>=sys-libs/libtermcap-compat-2.0.8"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	if use acl && use selinux
+	then
+		ewarn "Both ACL and SELINUX are not supported together!"
+		ewarn "Will Select SELINUX instead"
+	fi
+
+	# Mandrake's lsw patch caused issues on ia64 and amd64 with ls
+	# Reported upstream, but we don't apply it for now
+#	mv ${PATCHDIR}/mandrake/019* ${PATCHDIR}/excluded
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
+	epatch ${WORKDIR}/${P}-${I18N_PATCH}.patch
+
+	# ARM platform does not work well with the uname patch
+	# (see below about it)
+	if use arm
+	then
+		mv ${PATCHDIR}/003* ${PATCHDIR}/excluded
+	fi
+
+	# Apply the ACL patches. 
+	# WARNING: These CONFLICT with the SELINUX patches
+	if use acl
+	then
+	#
+	# This one also needs porting like the rest, but its a bit more involved,
+	# so I will leave it for somebody that use i18n that can actually test it.
+	#
+	#	if [ -z "`use nls`" ] ; then
+			mv ${PATCHDIR}/acl/004* ${PATCHDIR}/excluded
+	#	fi
+
+		# This test do seem to be fixed in another way, the acl guys
+		# can just verify please ...
+		mv ${PATCHDIR}/acl/006* ${PATCHDIR}/excluded
+
+		use selinux || mv ${PATCHDIR}/{001*,002*,004*} ${PATCHDIR}/excluded
+		use selinux || 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}
+
+	use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux
+}
+
+src_compile() {
+	append-flags "-fPIC"
+
+	local myconf=
+	use nls || myconf="--disable-nls"
+
+	if use acl
+	then
+		if [ -z "`use selinux`" ]
+		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
+	fi
+
+	export WANT_AUTOMAKE=1.7
+
+	aclocal -I ${S}/m4 || die
+	autoconf || die
+	automake || die
+
+	econf \
+		--bindir=/bin \
+		${myconf} || die
+
+	if use static
+	then
+		emake LDFLAGS=-static || die
+	else
+		emake || die
+	fi
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin || die
+
+	cd ${D}
+	dodir /usr/bin
+	rm -rf usr/lib
+
+	# move non-critical packages into /usr
+	mv bin/{csplit,expand,factor,fmt,fold,install,join,md5sum,nl,od} usr/bin
+	mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,split,sum,tac} usr/bin
+	mv bin/{tail,test,tsort,unexpand,uniq,users} usr/bin
+	cd usr/bin
+	ln -s ../../bin/* .
+
+	if [ -z "`use build`" ]
+	then
+		cd ${S}
+		dodoc AUTHORS ChangeLog* COPYING NEWS README* THANKS TODO
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
+
+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
+	fi
+}
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.0.91-r4 b/sys-apps/coreutils/files/digest-coreutils-5.0.91-r4
new file mode 100644
index 000000000000..996842386679
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-5.0.91-r4
@@ -0,0 +1,3 @@
+MD5 e62c18cde8b254c2512e47dd0c47c332 coreutils-5.0.91.tar.bz2 4183673
+MD5 816c0a3ebdf9f66d004d822dd94b3864 coreutils-5.0.91-i18n-0.2.patch.gz 26150
+MD5 f00231fe4b8be8a425eb0dfefd358573 coreutils-5.0.91-gentoo-1.4.5.tar.bz2 85343