sys-apps/policycoreutils: Mark 1.34.15 stable, clear old ebuilds.

Package-Manager: portage-2.1.5_rc6

10 files changed, 37 insertions, 653 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 0993c52adfc3..7d3841840f5d 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.67 2008/01/29 15:19:00 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.68 2008/05/13 02:22:47 pebenito Exp $
+
+  13 May 2008; Chris PeBenito <pebenito@gentoo.org>
+  -files/policycoreutils-1.28-quietlp.diff,
+  -files/policycoreutils-1.32-quietlp.diff,
+  -files/policycoreutils-unsigned-char-ppc.diff,
+  -policycoreutils-1.28.ebuild, -policycoreutils-1.30-r1.ebuild,
+  -policycoreutils-1.34.1.ebuild, -policycoreutils-1.34.11.ebuild,
+  policycoreutils-1.34.15.ebuild:
+  Mark 1.34.15 stable, clear old ebuilds.
 
 *policycoreutils-1.34.15 (29 Jan 2008)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index fb5affdc22d0..20950fa4c19e 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,19 +1,15 @@
-AUX policycoreutils-1.28-quietlp.diff 817 RMD160 cb467fd6bda873331c79163517008945010f1cde SHA1 f67c3893d2f658fcefa9e53000ce8e180fc8f8e9 SHA256 c78d8f4fc65642c3287f951c6a25d6ad9f2fc5bfaf96f619edd3d1d72cb02d31
-AUX policycoreutils-1.32-quietlp.diff 638 RMD160 e7c5bd7c50ff6bd198d8e768a49563f893b6c214 SHA1 ea4d4a18bb9c293dc814292fbd61f0d7ca37d2a3 SHA256 7271acdd6e35c7b8bc2f9d390d243dfe378a5ed18c6b649ee1ba03abbbd70cca
-AUX policycoreutils-unsigned-char-ppc.diff 2244 RMD160 869bfeed038833946168a48fb1278bba0e09b5ab SHA1 5835bcc31b4fd41aa720a33a46e7af6e2f0fe5b7 SHA256 bb8a1e89a7b8a3765a2dc788f0635471831545c6d7a6480ddaf4b31d1121c6ea
-DIST policycoreutils-1.28.tgz 74321 RMD160 0dd32e3e6dd3dcca0c01f3679f956800bcf6868f SHA1 1d0db2cfeb1dd658ac27bc4011245fce357d5ec6 SHA256 84df52fe09bac8e7476683e7d796f7388f9ce1986c06a0e7274b51e0fbef5c51
-DIST policycoreutils-1.30.tgz 90544 RMD160 65b629ce435d86b6103c20ac81b89cabe20b7e69 SHA1 ff0f40ec9071ce39e162fa8febd369a9048f3d82 SHA256 2e18de7e7915df12ee7079c0e10fae919738c7dfcb58e8b5f1b5f1309b336931
-DIST policycoreutils-1.34.1.tgz 294929 RMD160 cfe78de6dd6e0074be389170ed8b45f253029efa SHA1 2eabc0088a11db8fafe9933d634758fe73849605 SHA256 7530f193054fbcc803d1f7153973736919bc300ccfaf401e65302839b914fffe
-DIST policycoreutils-1.34.11.tgz 317028 RMD160 5973ba96e627b3bf621549a6b8d19b0f1483b920 SHA1 dd9412c2d3df91401c6cd497fa4484a6bd55415f SHA256 68eb034769673effea02928ac9785c45cd9cb398a93386bf97a5fc8d8d03d778
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST policycoreutils-1.34.15.tgz 317142 RMD160 5ba97a754773a31740521d00fd84779c47f6f29a SHA1 dcedba4cd50c57ad3ff321a3ac91282026a2e967 SHA256 bdeda76caeb7ea2b8950b47991c85c9429d092e19f8be06d62366780548a3606
-DIST policycoreutils-extra-1.14.tar.bz2 15209 RMD160 ba63c608883ffdbfd8b4c6cb82e4db836d011b38 SHA1 36af9414ba904c56079312dd3c3f50defe03a00f SHA256 f031173ac99808c9bd99ca888464dcf32d25e614161dfccfea537905f36f96b2
-DIST policycoreutils-extra-1.15.tar.bz2 14367 RMD160 6925c5bd2351567315f056f74f578ccd1b2bd1f9 SHA1 8e2f62835980da82749e9d291008c77671cb6c7f SHA256 4de52d774744217036cfcca3c71b20427ee865920e2c83e9e86b736d2f51c6a8
-DIST policycoreutils-extra-1.17.tar.bz2 17034 RMD160 bf613e08ee1b032390ee588c77a5b1b1d7a50695 SHA1 19abfc754c34a92526baf5699d25f27485456bbd SHA256 a4ffc80381ddf1e7d5fe8a537cf83af2338d9e0a8e9103ba73fe77bc17b92ca7
 DIST policycoreutils-extra-1.18.tar.bz2 17109 RMD160 150a443b3942808ab3ef2a1fec8da789776861f5 SHA1 71174bb943b0c0dcdde2781ad8cf45b5e574d9d0 SHA256 0835baaef5ad93e130cf399048752f0821a545cf33ce53760ae46d43c043e8eb
-EBUILD policycoreutils-1.28.ebuild 3566 RMD160 8dc00dde490d097fc36587a195fa3e4a1f9efe81 SHA1 db51d47b605855e8d57f48ac06a96c09967827cf SHA256 1009800d22a1515baae61a65af5e8393076893a9e7f8189b6a773d9e70dd4361
-EBUILD policycoreutils-1.30-r1.ebuild 3790 RMD160 a5d030579d974fdc436e54a6c4013b532d550566 SHA1 71e43f6982a72da1b37f28fe69d338a82cb016c6 SHA256 a9dd240a0efe0ff6db43f23665a5a307ff78a56c15b2441667fb96b6ee05c977
-EBUILD policycoreutils-1.34.1.ebuild 3840 RMD160 f1f1fb91bf2469283bb8cd9dc3898bd6465dbdf3 SHA1 ef2bb51d903316c5923591c15e51ba6043bfb368 SHA256 fd2daa12a8c800f85d72dd0f7d3f6978077906cd9b2b14b2a87166980cee5707
-EBUILD policycoreutils-1.34.11.ebuild 2713 RMD160 a86528e1f8f6cd2b000b57c5152b51d3e2eb5a81 SHA1 73ca5e6729b8fe8cc71e4fecb9944051ec86293a SHA256 a84714d516480aee07e14450ebd24539d7e893837a0a2a8d947d854d6bd0963e
-EBUILD policycoreutils-1.34.15.ebuild 2534 RMD160 909aeb40cfc6a1292231dd1d822358ccea5cd40c SHA1 feef0df8b19ec919d5c604fe617044ce97854826 SHA256 823f75e6d71b5b33d524683196d1e8086cfc7560902319caf0fa8014db7aae87
-MISC ChangeLog 10346 RMD160 28de2a0b313078f9d5e89cde083594193e6ea1a9 SHA1 03e1abb996b04378c74e74c7e8842e10b006d49c SHA256 3cbdca080026df5ee70e5fb8379f85c11ac43e84af605031fd38da0ae3f0dbc5
+EBUILD policycoreutils-1.34.15.ebuild 2554 RMD160 05ab77a18273bd4f6957f2358f897e9fc389def0 SHA1 c441e91736bd2ad058ba177fb4486cc32a650ed0 SHA256 f7bf3341f5371b3f0a868f534cb6b8bd65647d58efe2ddb6fe08b6ebcb99e23d
+MISC ChangeLog 10744 RMD160 982f3d35f9f4d8d4b8aefac215b99856a4d1eb4c SHA1 fab6fe3d1ab45d2187aa169d0668f2401e812047 SHA256 e48032afb5d7961459ddcfa559394941e5af4f3817dbf661b581b05880b3634f
 MISC metadata.xml 836 RMD160 421e492e89112f8436f8c5535aa2340cc8795929 SHA1 91c830f5358b9786f2b61e1967214f49212c4e3a SHA256 1d14250f52ecf63b67bed2289833d6f1ff2eba3cad9a80794b356e747917cdb7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgo+4EACgkQ1wYvhvBeaEYcxQCgwcYeTKnfibiTTh0axKErMTIB
+tt0An2HcbEtGiaRwNRqvmpOMHLuug2KN
+=dd2/
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.28-quietlp.diff b/sys-apps/policycoreutils/files/policycoreutils-1.28-quietlp.diff
deleted file mode 100644
index 3429d2fd1e47..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-1.28-quietlp.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN policycoreutils-1.28.orig/load_policy/load_policy.c policycoreutils-1.28/load_policy/load_policy.c
---- policycoreutils-1.28.orig/load_policy/load_policy.c	2005-10-06 08:56:12.000000000 -0400
-+++ policycoreutils-1.28/load_policy/load_policy.c	2005-12-08 18:51:11.509441294 -0500
-@@ -50,12 +50,6 @@
- 	nargs = argc - optind;
- 	if (nargs > 2)
- 		usage(argv[0]);
--	if (nargs >= 1) {
--		fprintf(stderr, "%s:  Warning!  Policy file argument (%s) is no longer supported, installed policy is always loaded.  Continuing...\n", argv[0], argv[optind++]);
--	}
--	if (nargs == 2) {
--		fprintf(stderr, "%s:  Warning!  Boolean file argument (%s) is no longer supported, installed booleans file is always used.  Continuing...\n", argv[0], argv[optind++]);
--	}
- 
- 	ret = selinux_mkload_policy(preservebools);
- 	if (ret < 0) {
diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.32-quietlp.diff b/sys-apps/policycoreutils/files/policycoreutils-1.32-quietlp.diff
deleted file mode 100644
index 1c932bf6cd8d..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-1.32-quietlp.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: load_policy/load_policy.c
-===================================================================
---- load_policy/load_policy.c	(revision 1986)
-+++ load_policy/load_policy.c	(working copy)
-@@ -50,11 +50,6 @@
- 	nargs = argc - optind;
- 	if (nargs > 2)
- 		usage(argv[0]);
--	if (nargs >= 1) {
--		fprintf(stderr,
--			"%s:  Warning!  Policy file argument (%s) is no longer supported, installed policy is always loaded.  Continuing...\n",
--			argv[0], argv[optind++]);
--	}
- 	if (nargs == 2) {
- 		fprintf(stderr,
- 			"%s:  Warning!  Boolean file argument (%s) is no longer supported, installed booleans file is always used.  Continuing...\n",
diff --git a/sys-apps/policycoreutils/files/policycoreutils-unsigned-char-ppc.diff b/sys-apps/policycoreutils/files/policycoreutils-unsigned-char-ppc.diff
deleted file mode 100644
index 61c3c4f85075..000000000000
--- a/sys-apps/policycoreutils/files/policycoreutils-unsigned-char-ppc.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-? policy/policy.20
-? policy/policy.conf
-? policy/tmp
-? policy/file_contexts/file_contexts
-? policy/file_contexts/homedir_template
-? policy/file_contexts/misc
-Index: policycoreutils/semodule_expand/semodule_expand.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/semodule_expand/semodule_expand.c,v
-retrieving revision 1.9
-diff -u -r1.9 semodule_expand.c
---- policycoreutils/semodule_expand/semodule_expand.c	20 Oct 2005 16:37:23 -0000	1.9
-+++ policycoreutils/semodule_expand/semodule_expand.c	5 Feb 2006 20:28:13 -0000
-@@ -36,8 +36,8 @@
- 
- int main(int argc, char **argv)
- {
--	char ch, *basename, *outname;
--	int ret, show_version = 0, verbose = 0;
-+	char *basename, *outname;
-+	int ch, ret, show_version = 0, verbose = 0;
- 	struct sepol_policy_file *pf;
- 	sepol_module_package_t *base;
- 	sepol_policydb_t *out;
-Index: policycoreutils/semodule_link/semodule_link.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/semodule_link/semodule_link.c,v
-retrieving revision 1.7
-diff -u -r1.7 semodule_link.c
---- policycoreutils/semodule_link/semodule_link.c	20 Oct 2005 16:37:23 -0000	1.7
-+++ policycoreutils/semodule_link/semodule_link.c	5 Feb 2006 20:28:13 -0000
-@@ -73,8 +73,8 @@
- 
- int main(int argc, char **argv)
- {
--	int i, show_version = 0, verbose = 0, num_mods;
--	char ch, *basename, *outname = NULL;
-+	int ch, i, show_version = 0, verbose = 0, num_mods;
-+	char *basename, *outname = NULL;
- 	sepol_module_package_t *base, **mods;
- 	FILE *outfile;
- 	struct sepol_policy_file *pf;
-Index: policycoreutils/sestatus/sestatus.c
-===================================================================
-RCS file: /cvsroot/selinux/nsa/selinux-usr/policycoreutils/sestatus/sestatus.c,v
-retrieving revision 1.9
-diff -u -r1.9 sestatus.c
---- policycoreutils/sestatus/sestatus.c	29 Nov 2005 15:55:02 -0000	1.9
-+++ policycoreutils/sestatus/sestatus.c	5 Feb 2006 20:28:13 -0000
-@@ -160,9 +160,8 @@
- 
- int main(int argc, char **argv) {
- 	/* these vars are reused several times */
--	int rc, i,c;
-+	int rc,opt, i,c;
- 	char *context;
--	char opt;
- 
- 	/* files that need context checks */
- 	char *fc[MAX_CHECK];
diff --git a/sys-apps/policycoreutils/policycoreutils-1.28.ebuild b/sys-apps/policycoreutils/policycoreutils-1.28.ebuild
deleted file mode 100644
index 99398d1980cc..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.28.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.28.ebuild,v 1.7 2006/02/22 17:01:06 spb Exp $
-
-IUSE="build nls pam"
-
-inherit eutils
-
-EXTRAS_VER="1.14"
-SEMNG_VER="1.4"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
-	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 mips ppc sparc x86"
-
-RDEPEND=">=sys-libs/libselinux-${PV}
-	!build? ( pam? ( sys-libs/pam ) =sys-libs/libsemanage-${SEMNG_VER}* )
-	build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
-	!build? ( nls? ( sys-devel/gettext ) )"
-
-S2=${WORKDIR}/policycoreutils-extra
-
-throw_pam_warning() {
-	# this is an extremely important message that needs to be seen
-	# thus it being shown at the beginning and end of the ebuild
-
-	if ! useq pam; then
-		eerror "PAM is disabled.  This is not a supported config for"
-		eerror "general use.  Disabling PAM decreases security with"
-		eerror "respect to SELinux protection of authentication."
-		eerror "It also requires policy changes."
-		ebeep 4
-		epause 4
-	fi
-}
-
-pkg_setup() {
-	throw_pam_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/policycoreutils-1.28-quietlp.diff
-	epatch ${FILESDIR}/policycoreutils-unsigned-char-ppc.diff
-
-	# This warning makes no sense, in this context
-	sed -i -e '/FILE/ s/;/=NULL;/' ${S}/audit2why/audit2why.c \
-		|| die "audit2why sed failed"
-
-	# fixfiles is extremely dangerous
-	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 2 failed"
-
-	if ! useq pam; then
-		# disable pam
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S}/run_init/Makefile || die "PAM sed 1 failed"
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S}/newrole/Makefile || die "PAM sed 2 failed"
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S2}/src/Makefile || die "PAM sed 3 failed"
-	fi
-
-	if ! useq nls; then
-		# disable locale stuff
-		sed -i -e s/-DUSE_NLS// ${S}/run_init/Makefile \
-			|| die "NLS sed 1 failed"
-		sed -i -e s/-DUSE_NLS// ${S}/newrole/Makefile \
-			|| die "NLS sed 2 failed"
-		sed -i -e s/-DUSE_NLS// ${S}/load_policy/Makefile \
-			|| die "NLS sed 3 failed"
-		sed -i -e 's/ po //' ${S}/Makefile \
-			|| die "NLS sed 4 failed"
-	fi
-
-	# fix up to accept Gentoo CFLAGS
-	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
-	for i in ${SUBDIRS}; do
-		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/${i}/Makefile \
-			|| die "${i} Makefile CFLAGS fix failed."
-	done
-}
-
-src_compile() {
-	if useq build; then
-		einfo "Compiling setfiles"
-		emake -C ${S}/setfiles || die
-	else
-		einfo "Compiling policycoreutils"
-		emake -C ${S} || die
-		einfo "Compiling policycoreutils-extra"
-		emake -C ${S2} || die
-	fi
-}
-
-src_install() {
-	if useq build; then
-		dosbin ${S}/setfiles/setfiles
-	else
-		einfo "Installing policycoreutils"
-		make DESTDIR="${D}" -C ${S} install || die
-		einfo "Installing policycoreutils-extra"
-		make DESTDIR="${D}" -C ${S2} install || die
-	fi
-
-	useq pam || rm -fR ${D}/etc/pam.d
-}
-
-pkg_postinst() {
-	if useq build; then
-		# need to ensure these
-		mkdir -p ${ROOT}/selinux
-		touch ${ROOT}/selinux/.keep
-		mkdir -p ${ROOT}/sys
-		touch ${ROOT}/sys/.keep
-		mkdir -p ${ROOT}/dev/pts
-		touch ${ROOT}/dev/pts/.keep
-		chmod 0666 ${ROOT}/dev/{ptmx,tty}
-	fi
-
-	throw_pam_warning
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.30-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.30-r1.ebuild
deleted file mode 100644
index 813149005f24..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.30-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.30-r1.ebuild,v 1.2 2006/07/31 01:30:13 pebenito Exp $
-
-IUSE="build nls pam"
-
-inherit eutils python
-
-EXTRAS_VER="1.15"
-SEMNG_VER="1.6"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
-	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ~sparc x86"
-
-RDEPEND=">=sys-libs/libselinux-${PV}
-	!build? ( pam? ( sys-libs/pam ) =sys-libs/libsemanage-${SEMNG_VER}* )
-	build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
-	!build? ( nls? ( sys-devel/gettext ) )"
-
-S2=${WORKDIR}/policycoreutils-extra
-
-throw_pam_warning() {
-	# this is an extremely important message that needs to be seen
-	# thus it being shown at the beginning and end of the ebuild
-
-	if ! useq pam; then
-		eerror "PAM is disabled.  This is not a supported config for"
-		eerror "general use.  Disabling PAM decreases security with"
-		eerror "respect to SELinux protection of authentication."
-		eerror "It also requires policy changes."
-		ebeep 4
-		epause 4
-	fi
-}
-
-pkg_setup() {
-	throw_pam_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/policycoreutils-1.28-quietlp.diff
-
-	# This warning makes no sense, in this context
-	sed -i -e '/FILE/ s/;/=NULL;/' ${S}/audit2why/audit2why.c \
-		|| die "audit2why sed failed"
-
-	# fixfiles is extremely dangerous
-	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 2 failed"
-
-	if ! useq pam; then
-		# disable pam
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S}/run_init/Makefile || die "PAM sed 1 failed"
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S}/newrole/Makefile || die "PAM sed 2 failed"
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S2}/src/Makefile || die "PAM sed 3 failed"
-	fi
-
-	if ! useq nls; then
-		# disable locale stuff
-		sed -i -e s/-DUSE_NLS// ${S}/run_init/Makefile \
-			|| die "NLS sed 1 failed"
-		sed -i -e s/-DUSE_NLS// ${S}/newrole/Makefile \
-			|| die "NLS sed 2 failed"
-		sed -i -e s/-DUSE_NLS// ${S}/load_policy/Makefile \
-			|| die "NLS sed 3 failed"
-		sed -i -e 's/ po //' ${S}/Makefile \
-			|| die "NLS sed 4 failed"
-	fi
-
-	# fix up to accept Gentoo CFLAGS
-	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
-	for i in ${SUBDIRS}; do
-		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/${i}/Makefile \
-			|| die "${i} Makefile CFLAGS fix failed."
-	done
-}
-
-src_compile() {
-	python_version
-	if useq build; then
-		einfo "Compiling setfiles"
-		emake -C ${S}/setfiles || die
-	else
-		einfo "Compiling policycoreutils"
-		emake -C ${S} PYLIBVER="python${PYVER}" || die
-		einfo "Compiling policycoreutils-extra"
-		emake -C ${S2} || die
-	fi
-}
-
-src_install() {
-	python_version
-	if useq build; then
-		dosbin ${S}/setfiles/setfiles
-	else
-		einfo "Installing policycoreutils"
-		make DESTDIR="${D}" -C ${S} PYLIBVER="python${PYVER}" install || die
-		einfo "Installing policycoreutils-extra"
-		make DESTDIR="${D}" -C ${S2} install || die
-	fi
-
-	useq pam || rm -fR ${D}/etc/pam.d
-}
-
-pkg_postinst() {
-	python_version
-
-	if useq build; then
-		# need to ensure these
-		mkdir -p ${ROOT}/selinux
-		touch ${ROOT}/selinux/.keep
-		mkdir -p ${ROOT}/sys
-		touch ${ROOT}/sys/.keep
-		mkdir -p ${ROOT}/dev/pts
-		touch ${ROOT}/dev/pts/.keep
-		chmod 0666 ${ROOT}/dev/{ptmx,tty}
-	fi
-
-	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
-
-	throw_pam_warning
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild
deleted file mode 100644
index 937d21d832b7..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild,v 1.4 2007/06/26 02:48:24 mr_bones_ Exp $
-
-IUSE="nls pam"
-
-inherit eutils python
-
-EXTRAS_VER="1.17"
-SEMNG_VER="1.10"
-SELNX_VER="1.34"
-
-# BUGFIX_PATCH="${FILESDIR}/policycoreutils-1.30.6.diff"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
-	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 mips ppc sparc x86"
-
-RDEPEND=">=sys-libs/libselinux-${SELNX_VER}
-	>=sys-libs/glibc-2.4
-	pam? ( sys-libs/pam )
-	=sys-libs/libsemanage-${SEMNG_VER}*"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S2=${WORKDIR}/policycoreutils-extra
-
-throw_pam_warning() {
-	# this is an extremely important message that needs to be seen
-	# thus it being shown at the beginning and end of the ebuild
-
-	if ! useq pam; then
-		eerror "PAM is disabled.  This is not a supported config for"
-		eerror "general use.  Disabling PAM decreases security with"
-		eerror "respect to SELinux protection of authentication."
-		eerror "It also requires policy changes."
-		ebeep 4
-		epause 4
-	fi
-}
-
-pkg_setup() {
-	throw_pam_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
-
-	# This warning makes no sense, in this context
-	sed -i -e '/FILE/ s/;/=NULL;/' ${S}/audit2why/audit2why.c \
-		|| die "audit2why sed failed"
-
-	# rlpkg is more useful than fixfiles
-	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 2 failed"
-
-	if ! useq pam; then
-		# disable pam
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S}/run_init/Makefile || die "PAM sed 1 failed"
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S}/newrole/Makefile || die "PAM sed 2 failed"
-		sed -i -e s/-lpam/-lcrypt/ -e s/-lpam_misc// -e s/-DUSE_PAM// \
-			${S2}/src/Makefile || die "PAM sed 3 failed"
-	fi
-
-	if ! useq nls; then
-		# disable locale stuff
-		sed -i -e s/-DUSE_NLS// ${S}/run_init/Makefile \
-			|| die "NLS sed 1 failed"
-		sed -i -e s/-DUSE_NLS// ${S}/newrole/Makefile \
-			|| die "NLS sed 2 failed"
-		sed -i -e s/-DUSE_NLS// ${S}/load_policy/Makefile \
-			|| die "NLS sed 3 failed"
-		sed -i -e 's/ po //' ${S}/Makefile \
-			|| die "NLS sed 4 failed"
-	fi
-
-	# fix up to accept Gentoo CFLAGS
-	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
-	for i in ${SUBDIRS}; do
-		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" \
-			-e '/^AUDITH/d' \
-			${S}/${i}/Makefile \
-			|| die "${i} Makefile CFLAGS fix failed."
-
-		# disable audit support because the required version
-		# in portage does not exist yet
-	done
-}
-
-src_compile() {
-	python_version
-
-	einfo "Compiling policycoreutils"
-	emake -C ${S} PYLIBVER="python${PYVER}" || die
-	einfo "Compiling policycoreutils-extra"
-	emake -C ${S2} || die
-}
-
-src_install() {
-	python_version
-
-	einfo "Installing policycoreutils"
-	make DESTDIR="${D}" -C ${S} PYLIBVER="python${PYVER}" install || die
-	einfo "Installing policycoreutils-extra"
-	make DESTDIR="${D}" -C ${S2} install || die
-
-	# remove redhat-style init script
-	rm -fR ${D}/etc/rc.d
-
-	# compatibility symlink
-	dosym /sbin/setfiles /usr/sbin/setfiles
-
-	if ! useq pam; then
-		rm -fR ${D}/etc/pam.d
-	else
-		if has_version '<sys-libs/pam-0.99'; then
-			# install compat pam.d entries
-			# for older pam
-			make DESTDIR="${D}" -C ${S2}/pam.d install || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
-
-	throw_pam_warning
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.34.11.ebuild b/sys-apps/policycoreutils/policycoreutils-1.34.11.ebuild
deleted file mode 100644
index d23ca1067ba4..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.34.11.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.34.11.ebuild,v 1.2 2007/10/19 14:57:32 pebenito Exp $
-
-IUSE="nls"
-
-inherit eutils python
-
-EXTRAS_VER="1.18"
-SEMNG_VER="1.10"
-SELNX_VER="1.34"
-
-# BUGFIX_PATCH="${FILESDIR}/policycoreutils-1.30.6.diff"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
-	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
-
-RDEPEND=">=sys-libs/libselinux-${SELNX_VER}
-	>=sys-libs/glibc-2.4
-	sys-libs/pam
-	=sys-libs/libsemanage-${SEMNG_VER}*"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S2=${WORKDIR}/policycoreutils-extra
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
-
-	# This warning makes no sense, in this context
-	sed -i -e '/FILE/ s/;/=NULL;/' "${S}/audit2why/audit2why.c" \
-		|| die "audit2why sed failed"
-
-	# rlpkg is more useful than fixfiles
-	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 2 failed"
-
-	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
-
-	if ! useq nls; then
-		for i in ${SUBDIRS}; do
-			# disable locale stuff
-			sed -i -e s/-DUSE_NLS// "${S}/${i}/Makefile" \
-				|| die "${i} NLS sed failed"
-		done
-	fi
-
-	# Gentoo Fixes
-	for i in ${SUBDIRS}; do
-		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" \
-			-e '/^AUDITH/d' \
-			"${S}/${i}/Makefile" \
-			|| die "${i} Makefile CFLAGS fix failed."
-
-		# disable audit support because the required version
-		# in portage does not exist yet
-	done
-}
-
-src_compile() {
-	python_version
-
-	einfo "Compiling policycoreutils"
-	emake -C "${S}" PYLIBVER="python${PYVER}" || die
-	einfo "Compiling policycoreutils-extra"
-	emake -C "${S2}" || die
-}
-
-src_install() {
-	python_version
-
-	einfo "Installing policycoreutils"
-	make DESTDIR="${D}" -C "${S}" PYLIBVER="python${PYVER}" install || die
-	einfo "Installing policycoreutils-extra"
-	make DESTDIR="${D}" -C "${S2}" install || die
-
-	# remove redhat-style init script
-	rm -fR "${D}/etc/rc.d"
-
-	# compatibility symlink
-	dosym /sbin/setfiles /usr/sbin/setfiles
-
-	if has_version '<sys-libs/pam-0.99'; then
-		# install compat pam.d entries
-		# for older pam
-		make DESTDIR="${D}" -C "${S2}/pam.d" install || die
-	fi
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize "${ROOT}usr/lib/python${PYVER}/site-packages"
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup "${ROOT}usr/lib/python${PYVER}/site-packages"
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild b/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
index 9655bf058f07..355de89d87fc 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild,v 1.1 2008/01/29 15:19:00 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild,v 1.2 2008/05/13 02:22:47 pebenito Exp $
 
 IUSE="nls"
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 mips ppc sparc x86"
 
 RDEPEND=">=sys-libs/libselinux-${SELNX_VER}
 	>=sys-libs/glibc-2.4
@@ -34,14 +34,14 @@ S2=${WORKDIR}/policycoreutils-extra
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
 
 	# rlpkg is more useful than fixfiles
-	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
 		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' ${S}/scripts/Makefile \
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
 		|| die "fixfiles sed 2 failed"
 
 	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
@@ -49,7 +49,7 @@ src_unpack() {
 	if ! useq nls; then
 		for i in ${SUBDIRS}; do
 			# disable locale stuff
-			sed -i -e s/-DUSE_NLS// ${S}/${i}/Makefile \
+			sed -i -e s/-DUSE_NLS// "${S}/${i}/Makefile" \
 				|| die "${i} NLS sed failed"
 		done
 	fi
@@ -57,7 +57,7 @@ src_unpack() {
 	# Gentoo Fixes
 	for i in ${SUBDIRS}; do
 		# add in CFLAGS
-		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/${i}/Makefile \
+		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" "${S}/${i}/Makefile" \
 			|| die "${i} Makefile CFLAGS fix failed."
 	done
 }
@@ -66,21 +66,21 @@ src_compile() {
 	python_version
 
 	einfo "Compiling policycoreutils"
-	emake -C ${S} PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y || die
+	emake -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y || die
 	einfo "Compiling policycoreutils-extra"
-	emake -C ${S2} || die
+	emake -C "${S2}" || die
 }
 
 src_install() {
 	python_version
 
 	einfo "Installing policycoreutils"
-	make DESTDIR="${D}" -C ${S} PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y install || die
+	make DESTDIR="${D}" -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y install || die
 	einfo "Installing policycoreutils-extra"
-	make DESTDIR="${D}" -C ${S2} install || die
+	make DESTDIR="${D}" -C "${S2}" install || die
 
 	# remove redhat-style init script
-	rm -fR ${D}/etc/rc.d
+	rm -fR "${D}/etc/rc.d"
 
 	# compatibility symlink
 	dosym /sbin/setfiles /usr/sbin/setfiles
@@ -88,16 +88,16 @@ src_install() {
 	if has_version '<sys-libs/pam-0.99'; then
 		# install compat pam.d entries
 		# for older pam
-		make DESTDIR="${D}" -C ${S2}/pam.d install || die
+		make DESTDIR="${D}" -C "${S2}/pam.d" install || die
 	fi
 }
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_optimize "${ROOT}usr/lib/python${PYVER}/site-packages"
 }
 
 pkg_postrm() {
 	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_cleanup "${ROOT}usr/lib/python${PYVER}/site-packages"
 }