6 files changed, 18 insertions, 159 deletions
diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 284e93a7a628..bd4f433109fe 100644
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/checkpolicy
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.50 2008/10/03 03:31:56 pebenito Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.51 2009/07/22 13:21:18 pebenito Exp $
+
+  22 Jul 2009; Chris PeBenito <pebenito@gentoo.org>
+  -checkpolicy-1.34.4.ebuild, checkpolicy-2.0.16.ebuild:
+  Mark stable. Remove old ebuilds.
 
 *checkpolicy-2.0.16 (03 Oct 2008)
 
diff --git a/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild b/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild
deleted file mode 100644
index 055578942e9f..000000000000
--- a/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-1.34.4.ebuild,v 1.4 2008/09/10 18:06:49 pebenito Exp $
-
-IUSE="debug"
-
-inherit eutils
-
-SEMNG_VER="1.10.9"
-
-# BUGFIX_PATCH="${FILESDIR}/checkpolicy-1.30.4.diff"
-
-DESCRIPTION="SELinux policy compiler"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 mips ppc sparc x86"
-
-DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
-	sys-devel/flex
-	sys-devel/bison"
-
-RDEPEND="=sys-libs/libsemanage-${SEMNG_VER}*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	[ ! -z "${BUGFIX_PATCH}" ] && epatch "${BUGFIX_PATCH}"
-}
-
-src_compile() {
-	emake YACC="bison -y" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	if useq debug; then
-		dobin "${S}/test/{dismod,dispol}"
-	fi
-}
-
-pkg_postinst() {
-	einfo "This checkpolicy can compile version `checkpolicy -V |cut -f 1 -d ' '` policy."
-}
diff --git a/sys-apps/checkpolicy/checkpolicy-2.0.16.ebuild b/sys-apps/checkpolicy/checkpolicy-2.0.16.ebuild
index 2c3b779bc0f5..abc7912eff0d 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.0.16.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.0.16.ebuild,v 1.2 2008/10/03 03:37:23 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.0.16.ebuild,v 1.3 2009/07/22 13:21:18 pebenito Exp $
 
 IUSE="debug"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://userspace.selinuxproject.org"
 SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="=sys-libs/libsemanage-${SEMNG_VER}*
 	sys-devel/flex
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index dfe906c12461..2c820b19abd8 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.71 2008/10/03 03:51:23 pebenito Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.72 2009/07/22 13:20:53 pebenito Exp $
+
+  18 Jul 2009; Chris PeBenito <pebenito@gentoo.org>
+  -policycoreutils-1.34.15.ebuild, policycoreutils-2.0.55.ebuild:
+  Mark stable. Remove old ebuilds.
 
 *policycoreutils-2.0.55 (03 Oct 2008)
 
diff --git a/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild b/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
deleted file mode 100644
index 40e45c3057ee..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.34.15.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.4 2008/05/29 17:58:30 hawking Exp $
-
-IUSE="nls"
-
-inherit eutils python multilib
-
-EXTRAS_VER="1.18"
-SEMNG_VER="1.10.9"
-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-process/audit-1.5.1
-	>=sys-libs/libcap-1.10-r10
-	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}"
-
-	# 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
-		# add in CFLAGS
-		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" "${S}/${i}/Makefile" \
-			|| die "${i} Makefile CFLAGS fix failed."
-	done
-}
-
-src_compile() {
-	python_version
-
-	einfo "Compiling policycoreutils"
-	emake -C "${S}" PYLIBVER="python${PYVER}" AUDIT_LOG_PRIV=y || die
-	einfo "Compiling policycoreutils-extra"
-	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
-	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 /usr/$(get_libdir)/python${PYVER}/site-packages
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild
index 968526ea8f0f..ce8f817359e2 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild,v 1.1 2008/10/03 03:51:23 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.55.ebuild,v 1.2 2009/07/22 13:20:53 pebenito Exp $
 
 IUSE="nls"
 
@@ -18,7 +18,7 @@ SRC_URI="http://userspace.selinuxproject.org/releases/current/devel/${P}.tar.gz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}
 	>=sys-libs/glibc-2.4