mark stable

Package-Manager: portage-2.1_pre3

7 files changed, 14 insertions, 180 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 130ad8a941dd..93b2cdb664d2 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/setools
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.42 2005/12/05 02:17:43 pebenito Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.43 2006/01/02 05:38:51 pebenito Exp $
+
+  02 Jan 2006; Chris PeBenito <pebenito@gentoo.org> -setools-2.1.2.ebuild,
+  -setools-2.1.3.ebuild, setools-2.2.ebuild:
+  Mark stable.
 
   05 Dec 2005; Chris PeBenito <pebenito@gentoo.org> metadata.xml,
   setools-2.1.2.ebuild, setools-2.1.3.ebuild, setools-2.2.ebuild:
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 2e9e4372c44d..e3d310aa77dd 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7a3c664aedbdf5688a56da442d20bff1 ChangeLog 5536
-MD5 d5e3ea2528cfdcc54874e15ff5d5fbf2 files/digest-setools-2.1.2 67
-MD5 ac6b09b47a0b179e764fe646e1e6f9a9 files/digest-setools-2.1.3 67
+MD5 c082971acbbf7a375492bdd7f61a5059 ChangeLog 5672
 MD5 ed1b98717ae185328af09c8127668fdf files/digest-setools-2.2 65
 MD5 e7f3c1619fcbcf575ad7dee10f250108 files/setools-2.2-nogui.diff 3821
 MD5 f5d096116ff7743b040148ced68e4f7b metadata.xml 369
-MD5 3ba582cf255e6d409b94dd3611c71e42 setools-2.1.2.ebuild 2024
-MD5 8204348ac1ebe560da584cae6e8ca920 setools-2.1.3.ebuild 1880
-MD5 206669ada8dd7ebcf83d0fcd21598169 setools-2.2.ebuild 1938
+MD5 a268d0c9b61d5d4bdd08e243cbac52c9 setools-2.2.ebuild 1935
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDk6NUJ+ChZlpDtAoRAvG6AJ4xI8ayVDnUMXeJ1re2WRLOGQMruwCeNwg2
-87r0zPvaVO5NwVmbZ8tWSnQ=
-=LMv/
+iD8DBQFDuLzcJ+ChZlpDtAoRAtTsAJsHxSrWnE3piL06XzlvSbgUP78OdACgpbPf
+5hs/qLREj4pmYh43vILKKHI=
+=Q8rx
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/files/digest-setools-2.1.2 b/app-admin/setools/files/digest-setools-2.1.2
deleted file mode 100644
index 71fd5c688543..000000000000
--- a/app-admin/setools/files/digest-setools-2.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5d70325cc16e9815a6e624727f00e16 setools-2.1.2.tar.bz2 1388995
diff --git a/app-admin/setools/files/digest-setools-2.1.3 b/app-admin/setools/files/digest-setools-2.1.3
deleted file mode 100644
index 0ce134a6f3c7..000000000000
--- a/app-admin/setools/files/digest-setools-2.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5f2f96e392922f85e0fe077daadd90a setools-2.1.3.tar.bz2 1401249
diff --git a/app-admin/setools/setools-2.1.2.ebuild b/app-admin/setools/setools-2.1.2.ebuild
deleted file mode 100644
index a042bcd5aee3..000000000000
--- a/app-admin/setools/setools-2.1.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.1.2.ebuild,v 1.4 2005/12/05 02:17:43 pebenito Exp $
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://www.tresys.com/files/setools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-IUSE="X debug selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=gnome-base/libglade-2.0
-	)"
-
-RDEPEND="dev-libs/libxml2
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=dev-tcltk/bwidget-1.4.1
-		>=gnome-base/libglade-2.0
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix the Makefile to listen to portage CFLAGS
-	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/g" ${S}/Makefile
-	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/" ${S}/libsefs/sqlite/Makefile
-
-	# enable debug if requested
-	useq debug && sed -i -e '/^DEBUG/s/0/1/' ${S}/Makefile
-
-	# dont chcon or install -Z
-	sed -i -e '/object_r/d' ${S}/secmds/Makefile
-	sed -i -e 's,-Z system_u:object_r:etc_t,,g' ${S}/seaudit/Makefile
-
-	# dont do findcon, replcon, searchcon, or indexcon if USE=-selinux
-	if ! useq selinux; then
-		sed -i -e '/^USE_LIBSELINUX/s/1/0/' ${S}/Makefile
-		sed -i -e '/^SE_CMDS/s/replcon//' \
-			-e '/^SE_CMDS/s/findcon//' \
-			-e '/^SE_CMDS/s/searchcon//' \
-			-e '/^SE_CMDS/s/indexcon//' ${S}/secmds/Makefile
-	fi
-}
-
-src_compile() {
-	cd ${S}
-
-	if useq X; then
-		make all || die
-	else
-		make all-nogui || die
-	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 useq X; then
-		# graphical tools
-		make DESTDIR=${D} install-apol install-seaudit install-sediffx \
-			|| die "Graphical tool install failed."
-	fi
-}
diff --git a/app-admin/setools/setools-2.1.3.ebuild b/app-admin/setools/setools-2.1.3.ebuild
deleted file mode 100644
index 076843d91b4b..000000000000
--- a/app-admin/setools/setools-2.1.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.1.3.ebuild,v 1.2 2005/12/05 02:17:43 pebenito Exp $
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://www.tresys.com/files/setools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="X debug selinux"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=gnome-base/libglade-2.0
-	)"
-
-RDEPEND="dev-libs/libxml2
-	selinux? ( sys-libs/libselinux )
-	X? (
-		dev-lang/tk
-		>=dev-tcltk/bwidget-1.4.1
-		>=gnome-base/libglade-2.0
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fix the Makefile to listen to portage CFLAGS
-	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/g" ${S}/Makefile
-	sed -i -e "/^CFLAGS/s/-O2/${CFLAGS}/" ${S}/libsefs/sqlite/Makefile
-
-	# enable debug if requested
-	useq debug && sed -i -e '/^DEBUG/s/0/1/' ${S}/Makefile
-
-	# dont chcon or install -Z
-	sed -i -e '/object_r/d' ${S}/secmds/Makefile
-	sed -i -e 's,-Z system_u:object_r:etc_t,,g' ${S}/seaudit/Makefile
-
-	# dont do findcon, replcon, searchcon, or indexcon if USE=-selinux
-	if ! useq selinux; then
-		sed -i -e '/^USE_LIBSELINUX/s/1/0/' ${S}/Makefile
-		sed -i -e '/^SE_CMDS/s/replcon//' \
-			-e '/^SE_CMDS/s/findcon//' \
-			-e '/^SE_CMDS/s/searchcon//' \
-			-e '/^SE_CMDS/s/indexcon//' ${S}/secmds/Makefile
-	fi
-}
-
-src_compile() {
-	cd ${S}
-
-	if useq X; then
-		make all || die
-	else
-		make all-nogui || die
-	fi
-}
-
-src_install() {
-	cd ${S}
-
-	# some of the Makefiles are broken, and will fail
-	# if ${D}/usr/bin is nonexistant
-	dodir /usr/bin
-
-	if use X; then
-		make DESTDIR=${D} install || die "install failed."
-	else
-		make DESTDIR=${D} install-nogui || die "install failed."
-	fi
-}
diff --git a/app-admin/setools/setools-2.2.ebuild b/app-admin/setools/setools-2.2.ebuild
index 4148c596584e..7fe0af44dc4e 100644
--- a/app-admin/setools/setools-2.2.ebuild
+++ b/app-admin/setools/setools-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.2.ebuild,v 1.3 2005/12/05 02:17:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.2.ebuild,v 1.4 2006/01/02 05:38:51 pebenito Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.tresys.com/files/setools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 IUSE="X debug selinux"
 
 DEPEND="sys-devel/bison