6 files changed, 13 insertions, 75 deletions
diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 6962edc3b6d5..cd25937613c1 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.23 2004/04/27 09:18:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.24 2004/04/28 21:28:40 pebenito Exp $
+
+*policycoreutils-1.10-r1 (28 Apr 2004)
+
+  28 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  +policycoreutils-1.10-r1.ebuild, -policycoreutils-1.10.ebuild,
+  -policycoreutils-1.8.ebuild:
+  Update extras and mark stable.
 
 *policycoreutils-1.10 (20 Apr 2004)
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.10 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.10
deleted file mode 100644
index 7f9660414016..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 50c449595b8d415e2e00afd1bea2abe0 policycoreutils-1.10.tgz 38548
-MD5 e3f37c89c63fad4ca89a9b26399fd180 policycoreutils-extra-1.2.tar.bz2 8032
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.10-r1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.10-r1
new file mode 100644
index 000000000000..c1d30e91b175
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.10-r1
@@ -0,0 +1,2 @@
+MD5 50c449595b8d415e2e00afd1bea2abe0 policycoreutils-1.10.tgz 38548
+MD5 5d22c16bf2c11c82e4c6ea8cc4fd9c3d policycoreutils-extra-1.3.tar.bz2 8154
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.8 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.8
deleted file mode 100644
index f63cc138e3af..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a0675f8049f06a9c11f080951da57461 policycoreutils-1.8.tgz 34967
-MD5 e3f37c89c63fad4ca89a9b26399fd180 policycoreutils-extra-1.2.tar.bz2 8032
diff --git a/sys-apps/policycoreutils/policycoreutils-1.10.ebuild b/sys-apps/policycoreutils/policycoreutils-1.10-r1.ebuild
index 15d76336abb9..3754d0924be8 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.10.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.10-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.10.ebuild,v 1.1 2004/04/20 01:57:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.10-r1.ebuild,v 1.1 2004/04/28 21:28:40 pebenito Exp $
 
 IUSE="build"
 
 inherit eutils
 
-EXTRAS_VER="1.2"
+EXTRAS_VER="1.3"
 
 DESCRIPTION="SELinux core utilites"
 HOMEPAGE="http://www.nsa.gov/selinux"
@@ -14,7 +14,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="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND=">=sys-libs/libselinux-${PV}
 	sys-devel/gettext
diff --git a/sys-apps/policycoreutils/policycoreutils-1.8.ebuild b/sys-apps/policycoreutils/policycoreutils-1.8.ebuild
deleted file mode 100644
index a8b65a9985fe..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.8.ebuild,v 1.6 2004/04/09 03:31:48 pebenito Exp $
-
-IUSE="build"
-
-EXTRAS_VER="1.2"
-
-DESCRIPTION="SELinux core utilites"
-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="x86 ppc sparc"
-
-DEPEND=">=sys-libs/libselinux-${PV}
-	sys-devel/gettext
-	!build? ( sys-libs/pam )"
-
-RDEPEND="${DEPEND}"
-
-S2=${WORKDIR}/policycoreutils-extra
-
-src_unpack() {
-	unpack ${A}
-
-	# Change script paths POLICYDIR
-	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/genhomedircon
-
-	# 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 use 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 use 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
-}
-
-pkg_postinst() {
-	ewarn "WARNING: seinit is deprecated, and is no"
-	ewarn "longer installed.  Please remove seinit from"
-	ewarn "your bootloader.  The policy is now loaded"
-	ewarn "by init itself."
-}