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

(Portage version: 2.1.5_rc6)

9 files changed, 25 insertions, 637 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/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"
 }