mark stable

8 files changed, 14 insertions, 111 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 24f9cce3a2ad..e66ef2f7aa8b 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2004/05/14 05:21:14 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.26 2004/06/11 22:12:05 pebenito Exp $
+
+  11 Jun 2004; Chris PeBenito <pebenito@gentoo.org>
+  -policycoreutils-1.10-r1.ebuild, policycoreutils-1.12.ebuild:
+  Mark stable
 
 *policycoreutils-1.12 (14 May 2004)
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.10-r1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.10-r1
deleted file mode 100644
index c1d30e91b175..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.10-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 50c449595b8d415e2e00afd1bea2abe0 policycoreutils-1.10.tgz 38548
-MD5 5d22c16bf2c11c82e4c6ea8cc4fd9c3d policycoreutils-extra-1.3.tar.bz2 8154
diff --git a/sys-apps/policycoreutils/policycoreutils-1.10-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-1.10-r1.ebuild
deleted file mode 100644
index 1ee71ebcad23..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.10-r1.ebuild
+++ /dev/null
@@ -1,70 +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.10-r1.ebuild,v 1.2 2004/05/07 20:18:49 pebenito Exp $
-
-IUSE="build"
-
-inherit eutils
-
-EXTRAS_VER="1.3"
-
-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 )"
-
-S2=${WORKDIR}/policycoreutils-extra
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/policycoreutils-1.10-genhomedircon-reverse.diff
-
-	# 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."
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.12.ebuild b/sys-apps/policycoreutils/policycoreutils-1.12.ebuild
index b729c0ac79b8..2159a5653f64 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.12.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.12.ebuild
@@ -1,6 +1,6 @@
 # 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.12.ebuild,v 1.1 2004/05/14 05:21:14 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.12.ebuild,v 1.2 2004/06/11 22:12:05 pebenito Exp $
 
 IUSE="build"
 
@@ -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-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index f6ac22d04bb8..f258ebea20dc 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libselinux
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.19 2004/05/14 05:19:18 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.20 2004/06/11 22:07:45 pebenito Exp $
+
+  11 Jun 2004; Chris PeBenito <pebenito@gentoo.org> -libselinux-1.10.ebuild,
+  libselinux-1.12.ebuild:
+  Mark stable
 
 *libselinux-1.12 (14 May 2004)
 
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.10 b/sys-libs/libselinux/files/digest-libselinux-1.10
deleted file mode 100644
index 5cb5663a4d4c..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7278775d499f13e66eb55f0e6dd6707d libselinux-1.10.tgz 44023
diff --git a/sys-libs/libselinux/libselinux-1.10.ebuild b/sys-libs/libselinux/libselinux-1.10.ebuild
deleted file mode 100644
index 12b305c44811..000000000000
--- a/sys-libs/libselinux/libselinux-1.10.ebuild
+++ /dev/null
@@ -1,32 +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-libs/libselinux/libselinux-1.10.ebuild,v 1.2 2004/04/28 20:17:21 pebenito Exp $
-
-IUSE=""
-
-DESCRIPTION="SELinux userland library"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="sys-libs/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" src/Makefile \
-		|| die "src Makefile CFLAGS fix failed."
-	sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" utils/Makefile \
-		|| die "utils Makefile CFLAGS fix failed."
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-}
diff --git a/sys-libs/libselinux/libselinux-1.12.ebuild b/sys-libs/libselinux/libselinux-1.12.ebuild
index 059ae880d1b8..233bd6cbe317 100644
--- a/sys-libs/libselinux/libselinux-1.12.ebuild
+++ b/sys-libs/libselinux/libselinux-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.12.ebuild,v 1.1 2004/05/14 05:19:18 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-1.12.ebuild,v 1.2 2004/06/11 22:07:45 pebenito Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nsa.gov/selinux"
 SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="sys-libs/glibc"