mark 1.1.1 stable

4 files changed, 7 insertions, 88 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 286a902d9f7f..f80fe6a2d2d8 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/setools
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.9 2004/01/06 23:56:57 pebenito Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.10 2004/01/31 17:18:50 pebenito Exp $
+
+  31 Jan 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.1.1.ebuild:
+  Mark stable.
 
 *setools-1.1.1 (06 Jan 2004)
 
diff --git a/app-admin/setools/files/digest-setools-1.0.1 b/app-admin/setools/files/digest-setools-1.0.1
deleted file mode 100644
index 483b6e9aca1a..000000000000
--- a/app-admin/setools/files/digest-setools-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4573f34a16c220972d951de8c9059527 setools-1.0.1.tgz 913202
diff --git a/app-admin/setools/setools-1.0.1.ebuild b/app-admin/setools/setools-1.0.1.ebuild
deleted file mode 100644
index e4e48d496c99..000000000000
--- a/app-admin/setools/setools-1.0.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.0.1.ebuild,v 1.2 2003/11/20 21:31:03 pebenito Exp $
-
-DESCRIPTION="SELinux graphical policy tools"
-HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
-SRC_URI="http://www.tresys.com/Downloads/selinux-tools/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-S="${WORKDIR}/${P}"
-KEYWORDS="x86"
-IUSE="selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-lang/tk"
-
-RDEPEND="dev-lang/tk
-	>=dev-tcltk/bwidget-1.4.1"
-
-src_unpack() {
-	unpack ${A}
-
-	# fix the Makefile to listen to portage CFLAGS
-	sed -i -e 's:-O2:-O2 $(EXTRA_CFLAGS):' ${S}/Makefile
-
-	if [ "`use selinux`" ]; then
-		# fix up the scripts we're going to install
-		cd ${S}/seuser
-
-		sed -i -e 's:local/selinux/::g' seuseradd
-		sed -i -e 's:local/selinux/::g' seuserdel
-		sed -i -e 's:local/selinux/::g' seusermod
-
-		# fix up the file contexts
-		cd ${S}/policy
-		sed -i -e 's:local/selinux/::' -e 's:local/::' seuser.fc
-	fi
-}
-
-src_compile() {
-	cd ${S}
-
-	# adjust for tcl/tk versions
-	has_version '>=dev-lang/tk-8.4' && \
-		TCL_LIBS="-ltk8.4 -ltcl8.4 -lfl -lm -dl" || \
-		TCL_LIBS="-ltk8.3 -ltcl8.3 -lfl -lm -dl"
-
-	make TCL_LIBS="${TCL_LIBS}" EXTRA_CFLAGS="${CFLAGS}" all \
-		|| die "compile failed"
-}
-
-src_install() {
-	dodoc COPYING ChangeLog-setools README
-
-	dobin ${S}/apol/apol
-	dobin ${S}/awish/awish
-	dobin ${S}/sepct/sepcut
-
-	insinto /usr/lib/apol
-	doins ${S}/apol/{apol.tcl,apol_help.txt,dta_help.txt,iflow_help.txt}
-	doins ${S}/sepct/sepcut_help.txt
-	newins ${S}/apol/apol_perm_mapping_ver15 apol_perm_mapping
-
-	if [ "`use selinux`" ]; then
-		dobin ${S}/seuser/{seuser,seuseradd,seuserdel,seusermod}
-		doins ${S}/seuser/{se_user.tcl,seuser_help.txt,seuser.conf}
-
-		insinto ${POLICYDIR}/domains/program
-		doins ${S}/policy/seuser.te
-		insinto ${POLICYDIR}/file_contexts/program
-		doins ${S}/policy/seuser.fc
-	fi
-}
-
-pkg_postinst() {
-	if [ "`use selinux`" ]; then
-		einfo "A policy for the seuser program has been installed into"
-		einfo "${POLICYDIR}.  Please reload your policy at relabel"
-		einfo "setools:  rlpkg setools"
-	fi
-}
diff --git a/app-admin/setools/setools-1.1.1.ebuild b/app-admin/setools/setools-1.1.1.ebuild
index 1d3e59ba25df..05c32dc4cdbc 100644
--- a/app-admin/setools/setools-1.1.1.ebuild
+++ b/app-admin/setools/setools-1.1.1.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/app-admin/setools/setools-1.1.1.ebuild,v 1.1 2004/01/06 23:56:57 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.1.1.ebuild,v 1.2 2004/01/31 17:18:51 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -9,7 +9,7 @@ SRC_URI="http://www.tresys.com/Downloads/selinux-tools/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 S="${WORKDIR}/${P}"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="X gtk selinux"
 
 DEPEND="sys-devel/bison