mark policycoreutils stable, remove old ebuild

(Portage version: 2.1.2.2)

4 files changed, 4 insertions, 150 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 9512d37926ef..ba6adc8052a8 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.63 2007/03/25 20:19:17 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.64 2007/06/04 00:52:47 pebenito Exp $
 
-  25 Mar 2007; Chris PeBenito <pebenito@gentoo.org>
+  04 Jun 2007; Chris PeBenito <pebenito@gentoo.org>
   policycoreutils-1.34.1.ebuild:
   Mark stable.
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.30.30 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.30.30
deleted file mode 100644
index 0947c29f3bf9..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.30.30
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2ab5ee943d155af7b0e4827b3053808c policycoreutils-1.30.30.tgz 243624
-RMD160 e651afa6d74369477c99baf46e60d04ba53177db policycoreutils-1.30.30.tgz 243624
-SHA256 501dbdb3be7a191864421132301408f393b73b339da977dca286976be135940a policycoreutils-1.30.30.tgz 243624
-MD5 064d17f1a9c3228fbf9450d7cc0c8776 policycoreutils-extra-1.16.tar.bz2 17022
-RMD160 a3cd953840c51a91254b57e181bd7a46368774a3 policycoreutils-extra-1.16.tar.bz2 17022
-SHA256 fd7a0d3fd2f5e8373c9865fa9df7ebf8144fdbad7d14c933668fa1a112031afc policycoreutils-extra-1.16.tar.bz2 17022
diff --git a/sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild b/sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild
deleted file mode 100644
index 9c870ea47336..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.30.30.ebuild
+++ /dev/null
@@ -1,140 +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.30.ebuild,v 1.4 2006/10/24 00:12:29 pebenito Exp $
-
-IUSE="nls pam"
-
-inherit eutils python
-
-EXTRAS_VER="1.16"
-SEMNG_VER="1.6.17"
-#SELNX_VER="${PV}"
-SELNX_VER="1.30.29"
-
-# 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}
-	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}"
-
-	epatch ${FILESDIR}/policycoreutils-1.32-quietlp.diff
-
-	# 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 ! has_version '>=sys-libs/glibc-2.4'; then
-		ewarn "Glibc 2.4 or newer is not available.  Disabling restorecond."
-		sed -i -e '/^SUBDIRS/s/restorecond//' ${S}/Makefile
-	fi
-
-	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
-
-	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
-
-	useq pam || rm -fR ${D}/etc/pam.d
-}
-
-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.1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild
index 23521275bec6..ee580cfad00e 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/03/25 20:19:17 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.34.1.ebuild,v 1.3 2007/06/04 00:52:47 pebenito Exp $
 
 IUSE="nls pam"
 
@@ -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