change selinux patches for new (2.6) selinux api

15 files changed, 49 insertions, 69 deletions

diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index 52661b7697b9..24846ccb8e0e 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/procps
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.45 2003/10/24 10:01:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.46 2003/10/29 03:14:07 pebenito Exp $
+
+  28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> procps-3.1.11-r1.ebuild,
+  procps-3.1.12.ebuild, procps-3.1.13.ebuild, procps-3.1.14.ebuild,
+  procps-3.1.8.ebuild, procps-3.1.9.ebuild,
+  files/procps-3.1.12-selinux.diff.bz2:
+  Switch SELinux patch from old API to new API.
 
 *procps-3.1.14 (22 Oct 2003)
 
diff --git a/sys-apps/procps/Manifest b/sys-apps/procps/Manifest
index 61eaa85cce3f..ec2728d4813e 100644
--- a/sys-apps/procps/Manifest
+++ b/sys-apps/procps/Manifest
@@ -1,20 +1,21 @@
-MD5 670a82e980b52b5e7c2f8e9e341bd49d ChangeLog 7544
-MD5 f0e072627571655893d0099f0ad2c9ec procps-2.0.10-r1.ebuild 1898
-MD5 c934206d172d7d6db7db66022f721272 procps-2.0.11.ebuild 1885
-MD5 7b48ded996ed30b210515cf9852f0509 procps-3.1.8.ebuild 1459
-MD5 b45542475578901ed01f590365a139e6 procps-3.1.9.ebuild 1471
-MD5 363bee0d4034490d2d1f0f7f23528408 procps-3.1.12.ebuild 1467
-MD5 1fc7b387238bb8bdc45096891e517fcf procps-3.1.11-r1.ebuild 1653
+MD5 e0a14ac6c4ec157164fe79797b669499 procps-3.1.9.ebuild 1290
 MD5 67d6ad41f90d9a757901ce164b1e9c8e procps-2.0.16.ebuild 2020
-MD5 f4e116024bc8a3869b647b87d8300d82 procps-3.1.13.ebuild 1442
-MD5 b43c25e3bdc56b76400bd87581bb3fa7 procps-3.1.14.ebuild 1443
+MD5 c934206d172d7d6db7db66022f721272 procps-2.0.11.ebuild 1885
+MD5 c6837e9674b55f71f9ed875b311cae4a procps-3.1.13.ebuild 1261
+MD5 f0e072627571655893d0099f0ad2c9ec procps-2.0.10-r1.ebuild 1898
+MD5 946ab5956f8d3774449c44e5df5e9768 procps-3.1.14.ebuild 1263
+MD5 e8586d81e5deac7d9bcd182a328877fd procps-3.1.12.ebuild 1405
+MD5 66a880a55e8d5e04eae6ce6237215dce ChangeLog 7826
+MD5 c8985fd2d809441bddeea8e8943c5e7a procps-3.1.8.ebuild 1292
+MD5 2704d61dc19aed93e2a6b4e8394dedc3 procps-3.1.11-r1.ebuild 1475
+MD5 9a240e887d0ca5948c23825937bcf53c files/digest-procps-3.1.9 64
+MD5 9dc38f56c976cdb1aa550458fe3e8bb7 files/digest-procps-3.1.12 65
+MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515
+MD5 3dfa108ba0c53240d5bfe044fa8be931 files/procps-3.1.12-selinux.diff.bz2 8800
 MD5 fe8c47a48243025d5ec650370012c15b files/digest-procps-2.0.10-r1 66
+MD5 291408557077f13b14c9223a9d2bc632 files/digest-procps-3.1.13 65
 MD5 b4d64145eb394bd49421f63d182313d0 files/digest-procps-2.0.11 66
-MD5 0fd90d51ff8a0ebb2611d5a978931397 files/digest-procps-3.1.8 136
-MD5 9b6e44ab96ca5da78ac7dcbb43c5d87c files/digest-procps-3.1.9 136
-MD5 8932eac2d657eb8555b9d7b70ab3f175 files/digest-procps-3.1.12 138
-MD5 690fe9639c02050c56bc9c54ad0318c1 files/digest-procps-3.1.11-r1 137
-MD5 e8320bb8f3dafed943fd15207648cf7f files/procps-3.1.11-multipids.patch 515
+MD5 63bfed08ef66560a298069b405fb5d37 files/digest-procps-3.1.11-r1 65
+MD5 4b01561bf8dc6371f2b36a477812d42a files/digest-procps-3.1.8 64
 MD5 7d8e6a0530e7ebd56a0445da8dcefb9b files/digest-procps-2.0.16 65
-MD5 6c1c3a8e609620e85c255191c9d4facf files/digest-procps-3.1.13 137
-MD5 53d263ae44c73022d521eb0168b0b9f9 files/digest-procps-3.1.14 137
+MD5 74e03ab7d527f0d3a5ccde0b4502b132 files/digest-procps-3.1.14 65
diff --git a/sys-apps/procps/files/digest-procps-3.1.11-r1 b/sys-apps/procps/files/digest-procps-3.1.11-r1
index 4dc6defd33a7..2f227017357e 100644
--- a/sys-apps/procps/files/digest-procps-3.1.11-r1
+++ b/sys-apps/procps/files/digest-procps-3.1.11-r1
@@ -1,2 +1 @@
 MD5 18d6c40c61fd8a94b315c07e949837ab procps-3.1.11.tar.gz 242320
-MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764
diff --git a/sys-apps/procps/files/digest-procps-3.1.12 b/sys-apps/procps/files/digest-procps-3.1.12
index 2483a10981e4..de593ab37df1 100644
--- a/sys-apps/procps/files/digest-procps-3.1.12
+++ b/sys-apps/procps/files/digest-procps-3.1.12
@@ -1,2 +1 @@
 MD5 419b312699ac01b25259769a1bfb7ca4 procps-3.1.12.tar.gz 244651
-MD5 8507c309a1fb17484e715c0be028a581 procps-3.1.12-selinux.patch.bz2 658
diff --git a/sys-apps/procps/files/digest-procps-3.1.13 b/sys-apps/procps/files/digest-procps-3.1.13
index a7f21c0dfeb6..5455cedd15b4 100644
--- a/sys-apps/procps/files/digest-procps-3.1.13
+++ b/sys-apps/procps/files/digest-procps-3.1.13
@@ -1,2 +1 @@
 MD5 459a361ad73ecb4cf4346b8d3ce7a27f procps-3.1.13.tar.gz 246880
-MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764
diff --git a/sys-apps/procps/files/digest-procps-3.1.14 b/sys-apps/procps/files/digest-procps-3.1.14
index 3694dfebca4d..d2cc9c955864 100644
--- a/sys-apps/procps/files/digest-procps-3.1.14
+++ b/sys-apps/procps/files/digest-procps-3.1.14
@@ -1,2 +1 @@
 MD5 e146860df435f863811206e4f9d3becf procps-3.1.14.tar.gz 250300
-MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764
diff --git a/sys-apps/procps/files/digest-procps-3.1.8 b/sys-apps/procps/files/digest-procps-3.1.8
index 71cf703e7965..b02f7793a416 100644
--- a/sys-apps/procps/files/digest-procps-3.1.8
+++ b/sys-apps/procps/files/digest-procps-3.1.8
@@ -1,2 +1 @@
 MD5 617e282bf3eefbd1753529aa8df4144f procps-3.1.8.tar.gz 239249
-MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764
diff --git a/sys-apps/procps/files/digest-procps-3.1.9 b/sys-apps/procps/files/digest-procps-3.1.9
index a4975a84ae42..a25b174cfea4 100644
--- a/sys-apps/procps/files/digest-procps-3.1.9
+++ b/sys-apps/procps/files/digest-procps-3.1.9
@@ -1,2 +1 @@
 MD5 2b0d8ba21a20699439cdb1f272dd67cf procps-3.1.9.tar.gz 239260
-MD5 6e144b0f65b2bb67b2ecfabbe5e7dfe1 procps-3.1.8-selinux.patch.bz2 764
diff --git a/sys-apps/procps/files/procps-3.1.12-selinux.diff.bz2 b/sys-apps/procps/files/procps-3.1.12-selinux.diff.bz2
new file mode 100644
index 000000000000..48adc916289b
--- /dev/null
+++ b/sys-apps/procps/files/procps-3.1.12-selinux.diff.bz2
diff --git a/sys-apps/procps/procps-3.1.11-r1.ebuild b/sys-apps/procps/procps-3.1.11-r1.ebuild
index 5c65ada8eef2..9e76a3a9a9d4 100644
--- a/sys-apps/procps/procps-3.1.11-r1.ebuild
+++ b/sys-apps/procps/procps-3.1.11-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.11-r1.ebuild,v 1.3 2003/09/18 00:15:19 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.11-r1.ebuild,v 1.4 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="selinux"
+IUSE=""
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl"
-SRC_URI="http://${PN}.sf.net/${P}.tar.gz
-	selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
 HOMEPAGE="http://procps.sourceforge.net/"
 
 inherit flag-o-matic
@@ -20,15 +19,12 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ia64"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.35
-	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+	>=sys-devel/gettext-0.10.35"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2
-
 	# fix multiple-pids for cli top
 	einfo "Applying ${PN}-3.1.11-multipids.patch .."
 	cd ${S}; patch -p0 < ${FILESDIR}/${PN}-3.1.11-multipids.patch || die "patch failed"
diff --git a/sys-apps/procps/procps-3.1.12.ebuild b/sys-apps/procps/procps-3.1.12.ebuild
index ea7b1d0106c1..44a10fe76002 100644
--- a/sys-apps/procps/procps-3.1.12.ebuild
+++ b/sys-apps/procps/procps-3.1.12.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.12.ebuild,v 1.2 2003/09/24 19:08:06 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.12.ebuild,v 1.3 2003/10/29 03:14:07 pebenito Exp $
 
 IUSE="selinux"
 
-SELINUX_PATCH="procps-3.1.12-selinux.patch.bz2"
+SELINUX_PATCH="procps-3.1.12-selinux.diff.bz2"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl"
-SRC_URI="http://${PN}.sf.net/${P}.tar.gz
-	selinux? mirror://gentoo/${SELINUX_PATCH}"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
 HOMEPAGE="http://procps.sourceforge.net/"
 
 inherit flag-o-matic
@@ -23,13 +22,13 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64"
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.10.35
-	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+	selinux? ( sys-libs/libselinux )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use selinux && epatch ${DISTDIR}/${SELINUX_PATCH}
+	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
 
 	# Use the CFLAGS from /etc/make.conf.
 	for file in `find . -iname "Makefile"`;do
diff --git a/sys-apps/procps/procps-3.1.13.ebuild b/sys-apps/procps/procps-3.1.13.ebuild
index 0144615308a7..1f67c379ce36 100644
--- a/sys-apps/procps/procps-3.1.13.ebuild
+++ b/sys-apps/procps/procps-3.1.13.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.13.ebuild,v 1.3 2003/10/08 03:47:31 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.13.ebuild,v 1.4 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="selinux"
+IUSE=""
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl"
-SRC_URI="http://${PN}.sf.net/${P}.tar.gz
-	selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
 HOMEPAGE="http://procps.sourceforge.net/"
 
 inherit flag-o-matic
@@ -20,15 +19,12 @@ KEYWORDS="~x86 amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ia64"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.35
-	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+	>=sys-devel/gettext-0.10.35"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2
-
 	# Use the CFLAGS from /etc/make.conf.
 	for file in `find . -iname "Makefile"`;do
 		sed -i "s:-O2:${CFLAGS}:" ${file}
diff --git a/sys-apps/procps/procps-3.1.14.ebuild b/sys-apps/procps/procps-3.1.14.ebuild
index 55850501c452..2a3d18af6979 100644
--- a/sys-apps/procps/procps-3.1.14.ebuild
+++ b/sys-apps/procps/procps-3.1.14.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.14.ebuild,v 1.1 2003/10/22 22:32:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.14.ebuild,v 1.2 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="selinux"
+IUSE=""
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl"
-SRC_URI="http://${PN}.sf.net/${P}.tar.gz
-	selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
 HOMEPAGE="http://procps.sourceforge.net/"
 
 inherit flag-o-matic
@@ -20,15 +19,12 @@ KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.35
-	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+	>=sys-devel/gettext-0.10.35"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2
-
 	# Use the CFLAGS from /etc/make.conf.
 	for file in `find . -iname "Makefile"`;do
 		sed -i "s:-O2:${CFLAGS}:" ${file}
diff --git a/sys-apps/procps/procps-3.1.8.ebuild b/sys-apps/procps/procps-3.1.8.ebuild
index 4a6267b4dca5..785e32bd5de8 100644
--- a/sys-apps/procps/procps-3.1.8.ebuild
+++ b/sys-apps/procps/procps-3.1.8.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.8.ebuild,v 1.8 2003/09/07 00:40:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.8.ebuild,v 1.9 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="selinux"
+IUSE=""
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl"
-SRC_URI="http://${PN}.sf.net/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-selinux.patch.bz2"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
 HOMEPAGE="http://procps.sourceforge.net/"
 
 inherit flag-o-matic
@@ -20,15 +19,12 @@ KEYWORDS="x86 amd64 ppc sparc ~alpha ~hppa arm ~mips"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.35
-	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+	>=sys-devel/gettext-0.10.35"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2
-
 	# Use the CFLAGS from /etc/make.conf.
 	for file in `find . -iname "Makefile"`;do
 		mv ${file} ${file}.orig
diff --git a/sys-apps/procps/procps-3.1.9.ebuild b/sys-apps/procps/procps-3.1.9.ebuild
index 11560f1096be..b7c2d10e1c1e 100644
--- a/sys-apps/procps/procps-3.1.9.ebuild
+++ b/sys-apps/procps/procps-3.1.9.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.9.ebuild,v 1.8 2003/09/07 00:40:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-3.1.9.ebuild,v 1.9 2003/10/29 03:14:07 pebenito Exp $
 
-IUSE="selinux"
+IUSE=""
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools -ps top tload snice vmstat free w watch uptime pmap skill pkill kill pgrep sysctl"
-SRC_URI="http://${PN}.sf.net/${P}.tar.gz
-	selinux? mirror://gentoo/${PN}-3.1.8-selinux.patch.bz2"
+SRC_URI="http://${PN}.sf.net/${P}.tar.gz"
 HOMEPAGE="http://procps.sourceforge.net/"
 
 inherit flag-o-matic
@@ -20,15 +19,12 @@ KEYWORDS="x86 amd64 ppc sparc alpha hppa ~arm mips"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10.35
-	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+	>=sys-devel/gettext-0.10.35"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use selinux && epatch ${DISTDIR}/${PN}-3.1.8-selinux.patch.bz2
-
 	# Use the CFLAGS from /etc/make.conf.
 	for file in `find . -iname "Makefile"`;do
 		mv ${file} ${file}.orig