added selinux

9 files changed, 14 insertions, 287 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 2ae85019fbae..b126393f7b45 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,14 +1,14 @@
 # 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.9 2003/03/20 07:24:34 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.10 2003/03/20 11:22:41 seemant Exp $
 
-*coreutils-4.5.10-r1 (20 Mar 2003)
+*coreutils-4.5.10 (14 Mar 2003)
 
-  20 Mar 2003; Joshua Brindle <method@gentoo.org> coreutils-4.5.10-r1.ebuild:
-  Revision bump to add selinux support
-  Thanks to sindian
+  20 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  coreutils-4.5.10.ebuild :
 
-*coreutils-4.5.10 (14 Mar 2003)
+  Patched to add selinux, thanks to sindian. Note, I removed the -r1
+  revision bump as it was unnecessary.
 
   14 Mar 2003; Seemant Kulleen <seemant@gentoo.org> coreutils-4.5.10.ebuild:
   version bump thanks to drobbins on -core
diff --git a/sys-apps/coreutils/coreutils-4.5.10.ebuild b/sys-apps/coreutils/coreutils-4.5.10.ebuild
index b3da2ca20358..222bd77401de 100644
--- a/sys-apps/coreutils/coreutils-4.5.10.ebuild
+++ b/sys-apps/coreutils/coreutils-4.5.10.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-4.5.10.ebuild,v 1.1 2003/03/15 03:28:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-4.5.10.ebuild,v 1.2 2003/03/20 11:22:41 seemant Exp $
 
 inherit eutils
 
-IUSE="nls build"
+IUSE="nls build selinux"
 
 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="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.bz2"
+SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.bz2
+	selinux? mirror://gentoo/${P}-selinux.patch.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -23,6 +24,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Causes compile failure
+#	use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2
+
 	# 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.
 	epatch ${FILESDIR}/${P}-gentoo-rms.diff
diff --git a/sys-apps/coreutils/coreutils-4.5.9-r1.ebuild b/sys-apps/coreutils/coreutils-4.5.9-r1.ebuild
deleted file mode 100644
index b78cf4a5dace..000000000000
--- a/sys-apps/coreutils/coreutils-4.5.9-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-4.5.9-r1.ebuild,v 1.2 2003/03/11 22:12:38 zwelch Exp $
-
-inherit eutils
-
-IUSE="nls build"
-
-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="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa arm"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# 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.
-	epatch ${FILESDIR}/${P}-gentoo-rms.diff
-
-	# Patch to add processor specific info to the uname output
-	if [ -z "`use hppa`" ] && [ -z "`use arm`" ]
-	then
-		epatch ${FILESDIR}/${P}-gentoo-uname.diff
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="--disable-nls"
-	
-	econf \
-		--bindir=/bin \
-		${myconf} || die
-	
-	if [ "`use static`" ]
-	then
-		emake LDFLAGS=-static || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin || die
-
-	# hostname comes from net-base
-	# hostname does not work with the -f switch, which breaks gnome2
-	#   amongst other things
-	rm -f ${D}/{bin,usr/bin}/hostname ${D}/usr/share/man/man1/hostname.*
-
-	# /bin/su comes from sys-apps/shadow
-	rm -f ${D}/{bin,usr/bin}/su ${D}/usr/share/man/man1/su.*
-
-	# /usr/bin/uptime comes from the sys-apps/procps packaga
-	rm -f ${D}/{bin,usr/bin}/uptime ${D}/usr/share/man/man1/uptime*
-
-	cd ${D}
-	dodir /usr/bin
-	rm -rf usr/lib
-	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/coreutils-4.5.9-r2.ebuild b/sys-apps/coreutils/coreutils-4.5.9-r2.ebuild
deleted file mode 100644
index 18c1ebf8663a..000000000000
--- a/sys-apps/coreutils/coreutils-4.5.9-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-4.5.9-r2.ebuild,v 1.1 2003/03/17 20:00:39 method Exp $
-
-inherit eutils
-
-IUSE="nls build selinux"
-
-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="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.bz2"
-use selinux && SRC_URI="${SRC_URI} http://www.coker.com.au/selinux/coreutils/core-diff-4.5.9"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa arm"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	use selinux && epatch ${DISTDIR}/core-diff-4.5.9
-
-	# 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.
-	epatch ${FILESDIR}/${P}-gentoo-rms.diff
-
-	# Patch to add processor specific info to the uname output
-	if [ -z "`use hppa`" ] && [ -z "`use arm`" ]
-	then
-		epatch ${FILESDIR}/${P}-gentoo-uname.diff
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="--disable-nls"
-	
-	econf \
-		--bindir=/bin \
-		${myconf} || die
-	
-	if [ "`use static`" ]
-	then
-		emake LDFLAGS=-static || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin || die
-
-	# hostname comes from net-base
-	# hostname does not work with the -f switch, which breaks gnome2
-	#   amongst other things
-	rm -f ${D}/{bin,usr/bin}/hostname ${D}/usr/share/man/man1/hostname.*
-
-	# /bin/su comes from sys-apps/shadow
-	rm -f ${D}/{bin,usr/bin}/su ${D}/usr/share/man/man1/su.*
-
-	# /usr/bin/uptime comes from the sys-apps/procps packaga
-	rm -f ${D}/{bin,usr/bin}/uptime ${D}/usr/share/man/man1/uptime*
-
-	cd ${D}
-	dodir /usr/bin
-	rm -rf usr/lib
-	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/coreutils-4.5.9.ebuild b/sys-apps/coreutils/coreutils-4.5.9.ebuild
deleted file mode 100644
index 24455a6495f5..000000000000
--- a/sys-apps/coreutils/coreutils-4.5.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-4.5.9.ebuild,v 1.5 2003/03/11 22:12:38 zwelch Exp $
-
-inherit eutils
-
-IUSE="nls build"
-
-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="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa arm"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# 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.
-	epatch ${FILESDIR}/${P}-gentoo-rms.diff
-
-	# Patch to add processor specific info to the uname output
-	if [ -z "`use hppa`" ] && [ -z "`use arm`" ]
-	then
-		epatch ${FILESDIR}/${P}-gentoo-uname.diff
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="--disable-nls"
-	
-	econf \
-		--bindir=/bin \
-		${myconf} || die
-	
-	if [ "`use static`" ]
-	then
-		emake LDFLAGS=-static || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-	einstall \
-		bindir=${D}/bin || die
-
-	# hostname comes from net-base
-	# hostname does not work with the -f switch, which breaks gnome2
-	#   amongst other things
-	rm -f ${D}/usr/bin/hostname
-
-	# /bin/su comes from sys-apps/shadow
-	rm -f ${D}/bin/su ${D}/usr/share/man/man1/su.*
-
-	# /usr/bin/uptime comes from the sys-apps/procps packaga
-	rm -f ${D}/usr/bin/uptime ${D}/usr/share/man/man1/uptime*
-
-	cd ${D}
-	dodir /usr/bin
-	rm -rf usr/lib
-	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-4.5.10 b/sys-apps/coreutils/files/digest-coreutils-4.5.10
index 141dd6089801..3f7d30b13d7f 100644
--- a/sys-apps/coreutils/files/digest-coreutils-4.5.10
+++ b/sys-apps/coreutils/files/digest-coreutils-4.5.10
@@ -1,2 +1,2 @@
 MD5 073aa616506e2eede6c199fa9c759ae2 coreutils-4.5.10.tar.bz2 3981173
-MD5 c3fba5a37ab5ff4d4c228da9a5533df5 core-diff-4.5.9 92345
+MD5 8b5ee47e5493d22f450d30e57aeba746 coreutils-4.5.10-selinux.patch.bz2 40646
diff --git a/sys-apps/coreutils/files/digest-coreutils-4.5.9 b/sys-apps/coreutils/files/digest-coreutils-4.5.9
deleted file mode 100644
index 626e9f838ad3..000000000000
--- a/sys-apps/coreutils/files/digest-coreutils-4.5.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3dfa6dedf941caff97a7b69ac13cb664 coreutils-4.5.9.tar.bz2 3972934
diff --git a/sys-apps/coreutils/files/digest-coreutils-4.5.9-r1 b/sys-apps/coreutils/files/digest-coreutils-4.5.9-r1
deleted file mode 100644
index 626e9f838ad3..000000000000
--- a/sys-apps/coreutils/files/digest-coreutils-4.5.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3dfa6dedf941caff97a7b69ac13cb664 coreutils-4.5.9.tar.bz2 3972934
diff --git a/sys-apps/coreutils/files/digest-coreutils-4.5.9-r2 b/sys-apps/coreutils/files/digest-coreutils-4.5.9-r2
deleted file mode 100644
index 88c7698056e8..000000000000
--- a/sys-apps/coreutils/files/digest-coreutils-4.5.9-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3dfa6dedf941caff97a7b69ac13cb664 coreutils-4.5.9.tar.bz2 3972934
-MD5 c3fba5a37ab5ff4d4c228da9a5533df5 core-diff-4.5.9 92345