mark stable

5 files changed, 9 insertions, 147 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 7ccc9455e694..b090d5fc7798 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2004/04/30 00:46:34 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.17 2004/05/04 20:37:01 pebenito Exp $
+
+  04 May 2004; Chris PeBenito <pebenito@gentoo.org> -setools-1.2.1.ebuild,
+  setools-1.3.ebuild:
+  Mark stable
 
   29 Apr 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.2.1.ebuild,
   setools-1.3.ebuild:
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 8aa09e2df9f0..1dbb4e6f0203 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,4 @@
-MD5 003bb7dc8a00ba941dfe681383b866c1 ChangeLog 2349
-MD5 62849f3570e1fe73f5e40e0a0bf60148 setools-1.2.1.ebuild 3442
-MD5 5be68c6315f75f335caf8a29a555ed01 setools-1.3.ebuild 3274
+MD5 3bcf66768867411407e3c76f7d3ce97b ChangeLog 2461
+MD5 568504c6d0304eeff7789f6ce081977a setools-1.3.ebuild 3273
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
 MD5 abe7748f2a7a7bb63192ec3e0035aa8f files/digest-setools-1.3 60
-MD5 7516bc91695071e1cda10f67c9c73c62 files/digest-setools-1.2.1 62
diff --git a/app-admin/setools/files/digest-setools-1.2.1 b/app-admin/setools/files/digest-setools-1.2.1
deleted file mode 100644
index e5dff152efe5..000000000000
--- a/app-admin/setools/files/digest-setools-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfcdad721490ea89ed030c15485cdbf7 setools-1.2.1.tgz 815956
diff --git a/app-admin/setools/setools-1.2.1.ebuild b/app-admin/setools/setools-1.2.1.ebuild
deleted file mode 100644
index 92af391d6467..000000000000
--- a/app-admin/setools/setools-1.2.1.ebuild
+++ /dev/null
@@ -1,139 +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.2.1.ebuild,v 1.5 2004/04/30 04:53:20 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"
-KEYWORDS="x86"
-IUSE="X gtk selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	X? ( dev-lang/tk gtk? ( >=gnome-base/libglade-2.0 ) )"
-
-RDEPEND="dev-libs/libxml2
-	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:/usr/apol:/usr/lib/apol:' ${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
-
-	# set policy dir in seuser.conf
-	sed -i -e '/^policy_dir/d' -e '/^user_file/d' ${S}/seuser/seuser.conf
-	echo "policy_dir ${POLICYDIR}" >> ${S}/seuser/seuser.conf
-	echo "user_file ${POLICYDIR}/users" >> ${S}/seuser/seuser.conf
-}
-
-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 and relabel"
-		einfo "setools:  rlpkg setools"
-	fi
-}
diff --git a/app-admin/setools/setools-1.3.ebuild b/app-admin/setools/setools-1.3.ebuild
index 8aec75dbc770..c4b687a7e2a5 100644
--- a/app-admin/setools/setools-1.3.ebuild
+++ b/app-admin/setools/setools-1.3.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.3.ebuild,v 1.3 2004/04/30 04:53:20 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.3.ebuild,v 1.4 2004/05/04 20:37:01 pebenito Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.tresys.com/Downloads/selinux-tools/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="X gtk selinux"
 
 DEPEND="sys-devel/bison