change selinux patches for new (2.6) selinux api

13 files changed, 43 insertions, 55 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index bd34f2f23783..278b93adf7f0 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.22 2003/10/23 20:00:16 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.23 2003/10/29 03:14:07 pebenito Exp $
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org>
+  findutils-4.1.20-r1.ebuild, findutils-4.1.20.ebuild,
+  findutils-4.1.7-r3.ebuild, findutils-4.1.7-r4.ebuild,
+  findutils-4.1.7-r5.ebuild, files/findutils-4.1.20-selinux.diff.bz2:
+  Switch SELinux patch from old API to new API.
 
 *findutils-4.1.7-r5 (23 Oct 2003)
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index ac7d4b56762b..c9c31af7a27c 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,16 +1,17 @@
-MD5 bb77a313043bf852abde778b33873a13 ChangeLog 3743
+MD5 b555f506633d8fea1802b60b0acb2f04 findutils-4.1.20.ebuild 1745
+MD5 4c6a909441bc5e7c0f66cd8cfb80ae1b findutils-4.1.7-r3.ebuild 1462
 MD5 b92f7c59f607a94b3422d6ec5b4f64c1 findutils-4.1.7-r1.ebuild 1392
 MD5 4d717bd3a8b1379d34f1a479fc500ca5 findutils-4.1.7-r2.ebuild 1540
-MD5 e8d15cea8b64b0944e5b0dbd814591cf findutils-4.1.7-r3.ebuild 1649
-MD5 8fc76e43de3e427dd3a438072cd3bb54 findutils-4.1.7-r4.ebuild 1882
-MD5 1881e21684c89ee5c0298fbd815287a6 findutils-4.1.20.ebuild 1931
-MD5 2cd340ee43809b5b54676bc6f0677342 findutils-4.1.20-r1.ebuild 2037
-MD5 26760f50b3501714617ed7775456497a findutils-4.1.7-r5.ebuild 1985
-MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r1 67
-MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r2 67
-MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r3 161
-MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r4 161
-MD5 0f46bcbcd2bbd50b40c7d29499686ca6 files/digest-findutils-4.1.20 163
+MD5 162fbcd88b09e5220bfa78d3d0073e2f ChangeLog 4027
+MD5 b10590ef0635bf4f23a97f65f06fa2e2 findutils-4.1.7-r5.ebuild 1799
+MD5 f9b56f3761a3c9e0a7734d36737b9f5d findutils-4.1.20-r1.ebuild 1997
+MD5 ba0f08982fefb5eb863553f81ff96bae findutils-4.1.7-r4.ebuild 1697
+MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r5 67
+MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20-r1 68
 MD5 0315b5033cf65d15f24b1c252070db45 files/findutils-env-size.patch 672
-MD5 0f46bcbcd2bbd50b40c7d29499686ca6 files/digest-findutils-4.1.20-r1 163
-MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r5 161
+MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r4 67
+MD5 214b1bc8ab622fdccc95a2ad658e7dad files/findutils-4.1.20-selinux.diff.bz2 3550
+MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r2 67
+MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r1 67
+MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20 68
+MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r3 67
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.20 b/sys-apps/findutils/files/digest-findutils-4.1.20
index f304c6405801..ee97aa90b56d 100644
--- a/sys-apps/findutils/files/digest-findutils-4.1.20
+++ b/sys-apps/findutils/files/digest-findutils-4.1.20
@@ -1,2 +1 @@
 MD5 e90ce7222daadeb8616b8db461e17cbc findutils-4.1.20.tar.gz 777980
-MD5 0fe2231e7a309c98077b7290b6269e49 findutils-4.1.20-2003011510-selinux-gentoo.patch.bz2 4407
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.20-r1 b/sys-apps/findutils/files/digest-findutils-4.1.20-r1
index f304c6405801..ee97aa90b56d 100644
--- a/sys-apps/findutils/files/digest-findutils-4.1.20-r1
+++ b/sys-apps/findutils/files/digest-findutils-4.1.20-r1
@@ -1,2 +1 @@
 MD5 e90ce7222daadeb8616b8db461e17cbc findutils-4.1.20.tar.gz 777980
-MD5 0fe2231e7a309c98077b7290b6269e49 findutils-4.1.20-2003011510-selinux-gentoo.patch.bz2 4407
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r3 b/sys-apps/findutils/files/digest-findutils-4.1.7-r3
index b2cddade2458..71e0d8a53382 100644
--- a/sys-apps/findutils/files/digest-findutils-4.1.7-r3
+++ b/sys-apps/findutils/files/digest-findutils-4.1.7-r3
@@ -1,2 +1 @@
 MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058
-MD5 b6849c4f026a8c9b3015c2ca5b10f509 findutils-4.1.7-2003011510-selinux-gentoo.patch.bz2 4165
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r4 b/sys-apps/findutils/files/digest-findutils-4.1.7-r4
index b2cddade2458..71e0d8a53382 100644
--- a/sys-apps/findutils/files/digest-findutils-4.1.7-r4
+++ b/sys-apps/findutils/files/digest-findutils-4.1.7-r4
@@ -1,2 +1 @@
 MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058
-MD5 b6849c4f026a8c9b3015c2ca5b10f509 findutils-4.1.7-2003011510-selinux-gentoo.patch.bz2 4165
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r5 b/sys-apps/findutils/files/digest-findutils-4.1.7-r5
index b2cddade2458..71e0d8a53382 100644
--- a/sys-apps/findutils/files/digest-findutils-4.1.7-r5
+++ b/sys-apps/findutils/files/digest-findutils-4.1.7-r5
@@ -1,2 +1 @@
 MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058
-MD5 b6849c4f026a8c9b3015c2ca5b10f509 findutils-4.1.7-2003011510-selinux-gentoo.patch.bz2 4165
diff --git a/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2 b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2
new file mode 100644
index 000000000000..bbf61aa14a5c
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2
diff --git a/sys-apps/findutils/findutils-4.1.20-r1.ebuild b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
index 1fcf0e9534de..bf1a4a0976b2 100644
--- a/sys-apps/findutils/findutils-4.1.20-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.1 2003/10/23 10:51:39 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $
 
 IUSE="nls build afs selinux"
 
@@ -13,18 +13,19 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 # supplying the development versions.  If it comes back in the future
 # then we might want to redirect the link.  See bug 18729
 SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
+	mirror://gentoo/${P}.tar.gz"
 
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~arm ~alpha ~ia64"
 SLOT="0"
 LICENSE="GPL-2"
 
+SELINUX_PATCH="findutils-4.1.20-selinux.diff.bz2"
+
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	afs? ( net-fs/openafs )
-	selinux? ( sys-apps/selinux-small )"
+	selinux? ( sys-libs/libselinux )"
 RDEPEND="virtual/glibc"
 
 src_unpack() {
@@ -38,7 +39,7 @@ src_unpack() {
 	#get a bigger environment as ebuild.sh is growing large
 	epatch ${FILESDIR}/findutils-env-size.patch
 
-	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
 }
 
 src_compile() {
diff --git a/sys-apps/findutils/findutils-4.1.20.ebuild b/sys-apps/findutils/findutils-4.1.20.ebuild
index 5d24c2acfb94..aa5ffa70db22 100644
--- a/sys-apps/findutils/findutils-4.1.20.ebuild
+++ b/sys-apps/findutils/findutils-4.1.20.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20.ebuild,v 1.1 2003/09/28 16:23:14 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="nls build afs selinux"
+IUSE="nls build afs"
 
 inherit eutils
 
@@ -13,8 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 # supplying the development versions.  If it comes back in the future
 # then we might want to redirect the link.  See bug 18729
 SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
+	mirror://gentoo/${P}.tar.gz"
 
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~arm ~alpha ~ia64"
 SLOT="0"
@@ -23,8 +22,7 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
-	afs? ( net-fs/openafs )
-	selinux? ( sys-apps/selinux-small )"
+	afs? ( net-fs/openafs )"
 RDEPEND="virtual/glibc"
 
 src_unpack() {
@@ -34,8 +32,6 @@ src_unpack() {
 	# Don't build or install locate because it conflicts with slocate,
 	# which is a secure version of locate.  See bug 18729
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
 }
 
 src_compile() {
diff --git a/sys-apps/findutils/findutils-4.1.7-r3.ebuild b/sys-apps/findutils/findutils-4.1.7-r3.ebuild
index 1b83cbb1a523..a152bc6bcd1a 100644
--- a/sys-apps/findutils/findutils-4.1.7-r3.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r3.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r3.ebuild,v 1.7 2003/09/07 01:34:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r3.ebuild,v 1.8 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="nls build afs selinux"
+IUSE="nls build afs"
 
 inherit eutils
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="GNU utilities to find files"
-SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
+SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
 
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 
@@ -20,13 +19,11 @@ LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
 	nls? ( sys-devel/gettext )
-	afs? ( net-fs/openafs )
-	selinux? ( sys-apps/selinux-small )"
+	afs? ( net-fs/openafs )"
 RDEPEND="virtual/glibc"
 
 src_compile() {
 
-	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
 	local myconf
 
 	use nls || myconf="${myconf} --disable-nls"
diff --git a/sys-apps/findutils/findutils-4.1.7-r4.ebuild b/sys-apps/findutils/findutils-4.1.7-r4.ebuild
index bc4cd62ac33d..69f2189b7d06 100644
--- a/sys-apps/findutils/findutils-4.1.7-r4.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.12 2003/09/18 00:07:12 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.13 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="nls build afs selinux"
+IUSE="nls build afs"
 
 inherit eutils
 
@@ -12,8 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 # Note this doesn't point to gnu.org because alpha.gnu.org has quit
 # supplying the development versions.  If it comes back in the future
 # then we might want to redirect the link.  See bug 18729
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 KEYWORDS="x86 amd64 ppc sparc hppa ~arm alpha ia64"
 SLOT="0"
@@ -22,8 +21,7 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
-	afs? ( net-fs/openafs )
-	selinux? ( sys-apps/selinux-small )"
+	afs? ( net-fs/openafs )"
 RDEPEND="virtual/glibc"
 
 src_unpack() {
@@ -33,8 +31,6 @@ src_unpack() {
 	# Don't build or install locate because it conflicts with slocate,
 	# which is a secure version of locate.  See bug 18729
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
 }
 
 src_compile() {
diff --git a/sys-apps/findutils/findutils-4.1.7-r5.ebuild b/sys-apps/findutils/findutils-4.1.7-r5.ebuild
index dc72582f491a..be7e7ba3d5fd 100644
--- a/sys-apps/findutils/findutils-4.1.7-r5.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r5.ebuild,v 1.1 2003/10/23 20:00:16 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r5.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="nls build afs selinux"
+IUSE="nls build afs"
 
 inherit eutils
 
@@ -12,8 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 # Note this doesn't point to gnu.org because alpha.gnu.org has quit
 # supplying the development versions.  If it comes back in the future
 # then we might want to redirect the link.  See bug 18729
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 KEYWORDS="x86 amd64 ppc sparc hppa ~arm alpha ia64"
 SLOT="0"
@@ -22,8 +21,7 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
-	afs? ( net-fs/openafs )
-	selinux? ( sys-apps/selinux-small )"
+	afs? ( net-fs/openafs )"
 RDEPEND="virtual/glibc"
 
 src_unpack() {
@@ -36,8 +34,6 @@ src_unpack() {
 
 	#get a bigger environment as ebuild.sh is growing large
 	epatch ${FILESDIR}/findutils-env-size.patch
-
-	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
 }
 
 src_compile() {