forgot to remove selinux patch from 5.0-r4

4 files changed, 19 insertions, 31 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index dbbe1c060e14..d7125cdac71c 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,9 @@
 # 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.42 2003/10/29 03:14:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.43 2003/11/03 05:47:12 pebenito Exp $
+
+  02 Nov 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r4.ebuild:
+  Missed removing SELinux patch from 5.0-r4
 
   28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> coreutils-5.0-r1.ebuild,
   coreutils-5.0-r2.ebuild, coreutils-5.0-r3.ebuild, coreutils-5.0.91.ebuild:
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index bfcb2a1dc3a2..e7f08a297d76 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,11 +1,11 @@
 MD5 bf02875b53f5188bf75f5e1796b6dbfe coreutils-5.0-r2.ebuild 2623
-MD5 473b76dd0e401d64b5aa72918f9dd5a5 coreutils-5.0-r4.ebuild 3483
-MD5 7d6759d3ae8b38e49ac0984104d50f8e ChangeLog 8110
+MD5 00e2bb8e03c7b04e62ed7c3a39304f6f coreutils-5.0-r4.ebuild 3096
+MD5 ee91ebbd8507d9c6fecf6a0639d679e7 ChangeLog 8232
 MD5 8cb475010cc493c6df8d356b315fa72f coreutils-5.0-r1.ebuild 2593
 MD5 28c3f9e8ca2cfb6039827f203f76bf7d coreutils-5.0.91.ebuild 3828
 MD5 fd60467c5fb00dfd07df0a90e7d1c9aa coreutils-5.0-r3.ebuild 2738
 MD5 76472cadee79dff1a2a26d8ae8a74866 files/digest-coreutils-5.0-r2 138
 MD5 c9b338f24be4a49f01620b40b0e18cfb files/digest-coreutils-5.0-r1 138
 MD5 981d1c1d7cf8006aa46b44f269697262 files/digest-coreutils-5.0-r3 138
-MD5 4c297e5aecd29157a82e5ada19c5382d files/digest-coreutils-5.0-r4 217
+MD5 e68c4bf70f7067710c3a52fc8d50d49d files/digest-coreutils-5.0-r4 139
 MD5 b5d176b166158cfe97d58ad43eec055e files/digest-coreutils-5.0.91 149
diff --git a/sys-apps/coreutils/coreutils-5.0-r4.ebuild b/sys-apps/coreutils/coreutils-5.0-r4.ebuild
index 46ba1790a1eb..05d511e5c959 100644
--- a/sys-apps/coreutils/coreutils-5.0-r4.ebuild
+++ b/sys-apps/coreutils/coreutils-5.0-r4.ebuild
@@ -1,10 +1,10 @@
 # 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-5.0-r4.ebuild,v 1.12 2003/09/26 18:52:43 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0-r4.ebuild,v 1.13 2003/11/03 05:47:12 pebenito Exp $
 
 inherit eutils
 
-IUSE="nls build acl selinux static"
+IUSE="nls build acl static"
 
 PATCH_VER=1.7
 
@@ -12,8 +12,7 @@ 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="http://ftp.gnu.org/pub/gnu/coreutils/${P}.tar.bz2
-	mirror://gentoo/${PN}-gentoo-${PATCH_VER}.tar.bz2
-	selinux? mirror://gentoo/${P}-r2-selinux.patch.bz2"
+	mirror://gentoo/${PN}-gentoo-${PATCH_VER}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -24,8 +23,7 @@ DEPEND="virtual/glibc
 	sys-devel/automake
 	sys-devel/autoconf
 	nls? ( sys-devel/gettext )
-	acl? ( sys-apps/acl )
-	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+	acl? ( sys-apps/acl )"
 
 PATCHDIR=${WORKDIR}/patch
 
@@ -33,12 +31,6 @@ 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
-
 	# HPPA and ARM platforms do not work well with the uname patch
 	# (see below about it)
 	if use hppa || use arm
@@ -53,8 +45,8 @@ src_unpack() {
 		if [ -z "`use nls`" ] ; then
 			mv ${PATCHDIR}/acl/004* ${PATCHDIR}/excluded
 		fi
-		use selinux || mv ${PATCHDIR}/001* ${PATCHDIR}/excluded
-		use selinux || EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
+		mv ${PATCHDIR}/001* ${PATCHDIR}/excluded
+		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
 	fi
 
 	# patch to remove Stallman's su/wheel group rant (which doesn't apply,
@@ -64,9 +56,6 @@ src_unpack() {
 	# Patch to add processor specific info to the uname output
 
 	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	use selinux && epatch ${WORKDIR}/${P}-r2-selinux.patch
-
 }
 
 src_compile() {
@@ -75,17 +64,14 @@ src_compile() {
 
 	if use acl
 	then
-		if [ -z "`use selinux`" ]
+		if [ -z "`which cvs 2>/dev/null`" ]
 		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
-			autoreconf --force --install || die
+			# 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
+		autoreconf --force --install || die
 	fi
 
 	econf \
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.0-r4 b/sys-apps/coreutils/files/digest-coreutils-5.0-r4
index c25eeb2b8e8d..a4178a02d4dd 100644
--- a/sys-apps/coreutils/files/digest-coreutils-5.0-r4
+++ b/sys-apps/coreutils/files/digest-coreutils-5.0-r4
@@ -1,3 +1,2 @@
 MD5 94e5558ee2a65723d4840bfde2d323f0 coreutils-5.0.tar.bz2 3952653
 MD5 fb3e6e44a1493fb3da4ae348fb5e4e4a coreutils-gentoo-1.7.tar.bz2 45892
-MD5 56309285e57c7175a993c20a2084c0e3 coreutils-5.0-r2-selinux.patch.bz2 20091