mark stable

5 files changed, 8 insertions, 140 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index a4a21f79572d..52d767e36763 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/setools
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.13 2004/02/08 22:24:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.14 2004/03/03 21:16:42 pebenito Exp $
+
+  03 Mar 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.2.1.ebuild:
+  Mark stable.
 
 *setools-1.2.1 (08 Feb 2004)
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 5befeb4cdaaa..bae0918089a8 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,4 @@
-MD5 b4d93ef8e337c405bca8a4b788906f40 ChangeLog 2009
-MD5 fe59aef368ef7326b4ec4feec77508b1 setools-1.2.1.ebuild 3407
-MD5 7d030e939434c24f4affee294efcc78f setools-1.1.1.ebuild 3185
+MD5 86dfe5a7a30fb40c03d3345686b2445a ChangeLog 2099
+MD5 78439fb2235605b3529049f9586bdc75 setools-1.2.1.ebuild 3406
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
 MD5 7516bc91695071e1cda10f67c9c73c62 files/digest-setools-1.2.1 62
-MD5 021e046b2976f4ea4e1b48546b8ba7ee files/digest-setools-1.1.1 62
diff --git a/app-admin/setools/files/digest-setools-1.1.1 b/app-admin/setools/files/digest-setools-1.1.1
deleted file mode 100644
index f18b5c059932..000000000000
--- a/app-admin/setools/files/digest-setools-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0147413a6d28dd9d281fc8e41e124ea setools-1.1.1.tgz 687548
diff --git a/app-admin/setools/setools-1.1.1.ebuild b/app-admin/setools/setools-1.1.1.ebuild
deleted file mode 100644
index 05c32dc4cdbc..000000000000
--- a/app-admin/setools/setools-1.1.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.2 2004/01/31 17:18:51 pebenito Exp $
-
-DESCRIPTION="SELinux 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="X gtk selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	X? ( dev-lang/tk gtk? ( >=gnome-base/libglade-2.0 ) )"
-
-RDEPEND="X? (
-		dev-lang/tk
-		>=dev-tcltk/bwidget-1.4.1
-		gtk? ( >=gnome-base/libglade-2.0 )
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix the Makefile to listen to portage CFLAGS
-	sed -i -e "s:-O2:-O2 ${CFLAGS}:" ${S}/Makefile
-
-	# fix for tcl/tk version
-	has_version '=dev-lang/tk-8.4*' && \
-		sed -i -e 's:8.3:8.4:' ${S}/Makefile
-
-	# fix up the scripts we're going to install
-	sed -i -e 's:local/selinux/::g' ${S}/seuser/seuseradd
-	sed -i -e 's:local/selinux/::g' ${S}/seuser/seuserdel
-	sed -i -e 's:local/selinux/::g' ${S}/seuser/seusermod
-
-	# we will manually install policy
-	sed -i -e "s: policy-install::g" ${S}/seuser/Makefile
-
-	# fix up the file contexts
-	sed -i -e 's:local/selinux/::' -e 's:local/::' ${S}/policy/seuser.fc
-
-	# ensure install -Z isn't used
-	sed -i -e 's,-Z system_u:object_r:seuser_exec_t,,g' ${S}/seuser/Makefile
-	sed -i -e 's,-Z system_u:object_r:seuser_conf_t,,g' ${S}/seuser/Makefile
-	sed -i -e 's,-Z system_u:object_r:policy_src_t,,g' ${S}/seuser/Makefile
-}
-
-src_compile() {
-	cd ${S}
-
-	# build command line tools
-	make all-nogui || die "command line tools compile failed"
-
-	if use X; then
-		make apol sepcut seuserx \
-			|| die "apol, sepcut, or seuserx compile failed"
-
-		if use gtk; then
-			make seaudit || die "seaudit compile failed."
-		fi
-
-	fi
-}
-
-src_install() {
-	cd ${S}
-
-	dodoc COPYING ChangeLog-setools README
-
-	# some of the Makefiles are broken, and will fail
-	# if ${D}/usr/bin is nonexistant
-	dodir /usr/bin
-
-	# command line tools
-	make DESTDIR=${D} install-secmds \
-		|| die "secmds install failed."
-
-	if use X; then
-		# graphical tools
-
-		make DESTDIR=${D} install-apol install-sepcut \
-			|| die "apol and sepcut install failed."
-
-		if use gtk; then
-			make DESTDIR=${D} install-seaudit \
-				|| die "seaudit install failed."
-		fi
-	fi
-
-	if use selinux; then
-		if use X; then
-			make DESTDIR=${D} install-seuserx \
-				|| die "seuserx install failed."
-		else
-			make DESTDIR=${D} install-seuser \
-				|| die "seuser install failed."
-		fi
-
-		insinto ${POLICYDIR}/domains/program
-		doins ${S}/policy/seuser.te
-		insinto ${POLICYDIR}/file_contexts/program
-		doins ${S}/policy/seuser.fc
-	fi
-}
-
-pkg_postinst() {
-	einfo "Installed tools:"
-	einfo " "
-	einfo "seinfo"
-	einfo "sesearch"
-	if use X; then
-		einfo "apol"
-		einfo "sepcut"
-		use gtk && einfo "seaudit"
-	fi
-	if use selinux; then
-		einfo "seuser"
-		use X && einfo "seuserx"
-		einfo "seuseradd"
-		einfo "seuserdel"
-		einfo "seusermod"
-		einfo " "
-		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.2.1.ebuild b/app-admin/setools/setools-1.2.1.ebuild
index 2802b40f3c48..19c6d7348a99 100644
--- a/app-admin/setools/setools-1.2.1.ebuild
+++ b/app-admin/setools/setools-1.2.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.2.1.ebuild,v 1.1 2004/02/08 22:24:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.2.1.ebuild,v 1.2 2004/03/03 21:16:42 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