4 files changed, 92 insertions, 5 deletions
diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 6996f1317783..6973f921fe5c 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.39 2005/10/12 22:55:09 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.40 2005/11/08 01:42:25 pebenito Exp $
+
+*setools-2.2 (08 Nov 2005)
+
+  08 Nov 2005; Chris PeBenito <pebenito@gentoo.org> +setools-2.2.ebuild:
+  New upstream release.
 
 *setools-2.1.3 (12 Oct 2005)
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index e0a660806332..5b8e82e72bbc 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2556b600d51b310fcd09ca7ac603eef1 ChangeLog 5107
+MD5 d65d72f97c8c3c64e09b34cb24ecb1f1 ChangeLog 5233
 MD5 d5e3ea2528cfdcc54874e15ff5d5fbf2 files/digest-setools-2.1.2 67
 MD5 ac6b09b47a0b179e764fe646e1e6f9a9 files/digest-setools-2.1.3 67
+MD5 ed1b98717ae185328af09c8127668fdf files/digest-setools-2.2 65
 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
 MD5 d097d8aac65d5756e00a413d572fbadf setools-2.1.2.ebuild 2015
 MD5 4f3a2b38eed026af086ef4b0ba5c57e1 setools-2.1.3.ebuild 1871
+MD5 087692ae17352503c32cc970d977b251 setools-2.2.ebuild 1869
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDTZRbJ+ChZlpDtAoRAmpzAKCPoUOh8YtGaGB8dMSR02ibuNh8twCfQw4G
-O8WI0EjaWQWuMCWT+/FVnRw=
-=72Eo
+iD8DBQFDcAKMJ+ChZlpDtAoRAvvQAJ4ohvCKC5zHi/bIqX5di3fHl+frVwCggUYJ
+D3J8M6fd5zn1QyD5QP+HyGM=
+=61Np
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/files/digest-setools-2.2 b/app-admin/setools/files/digest-setools-2.2
new file mode 100644
index 000000000000..cc7f2ab3a41d
--- /dev/null
+++ b/app-admin/setools/files/digest-setools-2.2
@@ -0,0 +1 @@
+MD5 e3fc1af44bcf8ef0714f48c91509ad95 setools-2.2.tar.bz2 1370889
diff --git a/app-admin/setools/setools-2.2.ebuild b/app-admin/setools/setools-2.2.ebuild
new file mode 100644
index 000000000000..923a437fb0b1
--- /dev/null
+++ b/app-admin/setools/setools-2.2.ebuild
@@ -0,0 +1,79 @@
+# 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.2.ebuild,v 1.1 2005/11/08 01:42:25 pebenito Exp $
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
+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
+}