Remove obsoleted versions of setools

(Portage version: 2.1.10.3/cvs/Linux x86_64)

7 files changed, 6 insertions, 387 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 304299d72e52..a94586d1bd70 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/setools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.69 2011/08/19 17:16:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.70 2011/08/19 19:38:44 swift Exp $
+
+  19 Aug 2011; <swift@gentoo.org> -setools-2.4.ebuild, -setools-3.3.4.ebuild,
+  -setools-3.3.5.ebuild, -setools-3.3.6.ebuild,
+  -files/setools-3.3.6-headers.diff, -files/apol_tcl_fc.c.diff:
+  Remove obsoleted versions of setools
 
 *setools-3.3.7-r1 (19 Aug 2011)
 
diff --git a/app-admin/setools/files/apol_tcl_fc.c.diff b/app-admin/setools/files/apol_tcl_fc.c.diff
deleted file mode 100644
index a8543746ab95..000000000000
--- a/app-admin/setools/files/apol_tcl_fc.c.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/libapol/apol_tcl_fc.c b/libapol/apol_tcl_fc.c
---- a/libapol/apol_tcl_fc.c	2006-04-11 17:27:18.000000000 -0300
-+++ b/libapol/apol_tcl_fc.c	2006-05-12 17:11:07.000000000 -0300
-@@ -178,16 +178,16 @@
-  */
- static int Apol_Search_FC_Index_DB(ClientData clientData, Tcl_Interp *interp, int argc, CONST char *argv[])
- {	
-+#ifndef LIBSEFS
-+	Tcl_SetResult(interp, "You need to build apol with libsefs to use this feature!", TCL_STATIC);
-+	return TCL_ERROR;
-+#else		
- 	sefs_search_keys_t search_keys;
- 	CONST char **object_classes = NULL, **types = NULL, **users = NULL,
- 	    **ranges, **paths = NULL;
- 	int retval = TCL_ERROR;
- 	Tcl_Obj *result_obj = Tcl_NewListObj(0, NULL);
- 
--#ifndef LIBSEFS
--	Tcl_SetResult(interp, "You need to build apol with libsefs to use this feature!", TCL_STATIC);
--	return TCL_ERROR;
--#else		
- 	memset(&search_keys, 0, sizeof(search_keys));
- 	if (argc != 10) {
- 		Tcl_SetResult(interp, "Need a list of users, list of types, list of object classes, list of ranges, list of paths, user_regex, type_regex, range_regex, and path_regex", TCL_STATIC);
diff --git a/app-admin/setools/files/setools-3.3.6-headers.diff b/app-admin/setools/files/setools-3.3.6-headers.diff
deleted file mode 100644
index eae76e191915..000000000000
--- a/app-admin/setools/files/setools-3.3.6-headers.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -purN setools-3.3.6.orig/libqpol/include/qpol/Makefile.am setools-3.3.6/libqpol/include/qpol/Makefile.am
---- setools-3.3.6.orig/libqpol/include/qpol/Makefile.am	2009-07-14 11:03:27.000000000 -0700
-+++ setools-3.3.6/libqpol/include/qpol/Makefile.am	2009-09-20 15:15:00.362508234 -0700
-@@ -17,7 +17,7 @@ qpol_HEADERS = \
- 	netifcon_query.h \
- 	nodecon_query.h \
- 	permissive_query.h \
--	polcap_query.h
-+	polcap_query.h \
- 	policy.h \
- 	policy_extend.h \
- 	portcon_query.h \
-diff -purN setools-3.3.6.orig/libseaudit/include/seaudit/avc_message.h setools-3.3.6/libseaudit/include/seaudit/avc_message.h
---- setools-3.3.6.orig/libseaudit/include/seaudit/avc_message.h	2009-07-16 07:41:36.000000000 -0700
-+++ setools-3.3.6/libseaudit/include/seaudit/avc_message.h	2009-09-20 14:57:57.294509062 -0700
-@@ -104,7 +104,7 @@ extern "C"
-  * @return Source target, or NULL upon error or if unknown.  Do not
-  * free() this string.
-  */
--	extern const char *seaudit_avc_message_get_source__mls_lvl(const seaudit_avc_message_t * avc);
-+	extern const char *seaudit_avc_message_get_source_mls_lvl(const seaudit_avc_message_t * avc);
- 	
- /**
-  * Return the source context's mls clearance of an avc message.
-@@ -114,7 +114,7 @@ extern "C"
-  * @return Source target, or NULL upon error or if unknown.  Do not
-  * free() this string.
-  */
--	extern const char *seaudit_avc_message_get_source__mls_clr(const seaudit_avc_message_t * avc);	
-+	extern const char *seaudit_avc_message_get_source_mls_clr(const seaudit_avc_message_t * avc);	
- 
- /**
-  * Return the target context's user of an avc message.
-diff -purN setools-3.3.6.orig/seaudit/toplevel.h setools-3.3.6/seaudit/toplevel.h
---- setools-3.3.6.orig/seaudit/toplevel.h	2009-07-16 07:41:36.000000000 -0700
-+++ setools-3.3.6/seaudit/toplevel.h	2009-09-20 15:04:48.770508867 -0700
-@@ -155,28 +155,28 @@ apol_vector_t *toplevel_get_log_roles(to
- apol_vector_t *toplevel_get_log_types(toplevel_t * top);
- 
- /**
-- * Return a vector of strings corresponding to all mls
-- * levels found within the current log file.  
-- * The vector will be sorted alphabetically.
-+ * Return a vector of strings corresponding to all mls levels
-+ * found within currently opened log files.  The vector will be sorted
-+ * alphabetically.
-  *
-  * @param top Toplevel containing seaudit log object.
-  *
-  * @return Vector of sorted types, or NULL if no log is loaded.  The
-  * caller must call apol_vector_destroy() upon the return value.
-  */
--apol_vector_t *toplevel_get_log_clr(toplevel_t * top);
-+apol_vector_t *toplevel_get_log_mls_lvl(toplevel_t * top);
- 
- /**
-- * Return a vector of strings corresponding to all mls
-- * clearance found within the current log file.  
-- * The vector will be sorted alphabetically.
-+ * Return a vector of strings corresponding to all mls clearance
-+ * found within currently opened log files.  The vector will be sorted
-+ * alphabetically.
-  *
-  * @param top Toplevel containing seaudit log object.
-  *
-  * @return Vector of sorted types, or NULL if no log is loaded.  The
-  * caller must call apol_vector_destroy() upon the return value.
-  */
--apol_vector_t *toplevel_get_log_clr(toplevel_t * top);
-+apol_vector_t *toplevel_get_log_mls_clr(toplevel_t * top);
- 
- /**
-  * Return a vector of strings corresponding to all object classes
diff --git a/app-admin/setools/setools-2.4.ebuild b/app-admin/setools/setools-2.4.ebuild
deleted file mode 100644
index 79c8c805afc1..000000000000
--- a/app-admin/setools/setools-2.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-2.4.ebuild,v 1.6 2011/07/08 10:17:36 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X debug selinux"
-
-#S="${WORKDIR}/${PN}"
-
-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}"
-
-	epatch "${FILESDIR}/apol_tcl_fc.c.diff"
-
-	# enable debug if requested
-	use debug && sed -i -e '/^DEBUG/s/0/1/' "${S}/Makefile"
-
-	# dont do findcon, replcon, searchcon, or indexcon if USE=-selinux
-	if ! use 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"
-
-		# sechecker won't compile w/o libselinux
-		sed -i -e '/^all-nogui/s/sechecker//' "${S}/Makefile"
-		sed -i -r -e '/^install-sechecker/!s/install-sechecker//' "${S}/Makefile"
-	fi
-}
-
-src_compile() {
-	if use X; then
-		make all || die
-	else
-		make all-nogui || die
-	fi
-}
-
-src_install() {
-	# 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-3.3.4.ebuild b/app-admin/setools/setools-3.3.4.ebuild
deleted file mode 100644
index 7f1cf3ac46d9..000000000000
--- a/app-admin/setools/setools-3.3.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.4.ebuild,v 1.3 2011/03/29 12:10:02 angelos Exp $
-
-EAPI=1
-inherit java-pkg-opt-2
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${PN}-${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X debug java python"
-
-DEPEND=">=sys-libs/libsepol-1.16.3
-	sys-libs/libselinux
-	sys-devel/bison
-	sys-devel/flex
-	>=dev-db/sqlite-3.2:3
-	dev-libs/libxml2:2
-	dev-util/pkgconfig
-	java? (
-		>=dev-lang/swig-1.3.28
-		>=virtual/jdk-1.4
-	)
-	python? (
-		>=dev-lang/python-2.4
-		>=dev-lang/swig-1.3.28
-	)
-	X? (
-		>=dev-lang/tk-8.4.9
-		>=gnome-base/libglade-2.0
-		>=x11-libs/gtk+-2.8:2
-	)"
-
-RDEPEND=">=sys-libs/libsepol-1.16.3
-	sys-libs/libselinux
-	>=dev-db/sqlite-3.2:3
-	dev-libs/libxml2:2
-	java? ( >=virtual/jre-1.4 )
-	python? ( >=dev-lang/python-2.4 )
-	X? (
-		>=dev-lang/tk-8.4.9
-		>=dev-tcltk/bwidget-1.8
-		>=gnome-base/libglade-2.0
-		>=x11-libs/gtk+-2.8:2
-	)"
-
-src_compile() {
-	econf \
-		--with-java-prefix=${JAVA_HOME} \
-		--disable-selinux-check \
-		--disable-bwidget-check \
-		$(use_enable python swig-python) \
-		$(use_enable java swig-java) \
-		$(use_enable X swig-tcl) \
-		$(use_enable X gui) \
-		$(use_enable debug)
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed."
-}
diff --git a/app-admin/setools/setools-3.3.5.ebuild b/app-admin/setools/setools-3.3.5.ebuild
deleted file mode 100644
index 068dfa9116f2..000000000000
--- a/app-admin/setools/setools-3.3.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.5.ebuild,v 1.4 2011/03/29 12:10:03 angelos Exp $
-
-EAPI=1
-inherit java-pkg-opt-2
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${PN}-${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X debug java python"
-
-DEPEND=">=sys-libs/libsepol-1.16.3
-	sys-libs/libselinux
-	sys-devel/bison
-	sys-devel/flex
-	>=dev-db/sqlite-3.2:3
-	dev-libs/libxml2:2
-	dev-util/pkgconfig
-	java? (
-		>=dev-lang/swig-1.3.28
-		>=virtual/jdk-1.4
-	)
-	python? (
-		>=dev-lang/python-2.4
-		>=dev-lang/swig-1.3.28
-	)
-	X? (
-		>=dev-lang/tk-8.4.9
-		>=gnome-base/libglade-2.0
-		>=x11-libs/gtk+-2.8:2
-	)"
-
-RDEPEND=">=sys-libs/libsepol-1.16.3
-	sys-libs/libselinux
-	>=dev-db/sqlite-3.2:3
-	dev-libs/libxml2:2
-	java? ( >=virtual/jre-1.4 )
-	python? ( >=dev-lang/python-2.4 )
-	X? (
-		>=dev-lang/tk-8.4.9
-		>=dev-tcltk/bwidget-1.8
-		>=gnome-base/libglade-2.0
-		>=x11-libs/gtk+-2.8:2
-	)"
-
-src_compile() {
-	econf \
-		--with-java-prefix=${JAVA_HOME} \
-		--disable-selinux-check \
-		--disable-bwidget-check \
-		$(use_enable python swig-python) \
-		$(use_enable java swig-java) \
-		$(use_enable X swig-tcl) \
-		$(use_enable X gui) \
-		$(use_enable debug)
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed."
-}
diff --git a/app-admin/setools/setools-3.3.6.ebuild b/app-admin/setools/setools-3.3.6.ebuild
deleted file mode 100644
index a9a3d1d34ee9..000000000000
--- a/app-admin/setools/setools-3.3.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.6.ebuild,v 1.3 2011/03/29 12:10:03 angelos Exp $
-
-EAPI=1
-inherit java-pkg-opt-2 autotools
-
-DESCRIPTION="SELinux policy tools"
-HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
-SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${PN}-${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X debug java python"
-
-DEPEND=">=sys-libs/libsepol-2.0.37
-	sys-libs/libselinux
-	sys-devel/bison
-	sys-devel/flex
-	>=dev-db/sqlite-3.2:3
-	dev-libs/libxml2:2
-	dev-util/pkgconfig
-	java? (
-		>=dev-lang/swig-1.3.28
-		>=virtual/jdk-1.4
-	)
-	python? (
-		>=dev-lang/python-2.4
-		>=dev-lang/swig-1.3.28
-	)
-	X? (
-		>=dev-lang/tk-8.4.9
-		>=gnome-base/libglade-2.0
-		>=x11-libs/gtk+-2.8:2
-	)"
-
-RDEPEND=">=sys-libs/libsepol-2.0.37
-	sys-libs/libselinux
-	>=dev-db/sqlite-3.2:3
-	dev-libs/libxml2:2
-	java? ( >=virtual/jre-1.4 )
-	python? ( >=dev-lang/python-2.4 )
-	X? (
-		>=dev-lang/tk-8.4.9
-		>=dev-tcltk/bwidget-1.8
-		>=gnome-base/libglade-2.0
-		>=x11-libs/gtk+-2.8:2
-	)"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/setools-3.3.6-headers.diff"
-	eautomake
-}
-
-src_compile() {
-	econf \
-		--with-java-prefix=${JAVA_HOME} \
-		--disable-selinux-check \
-		--disable-bwidget-check \
-		$(use_enable python swig-python) \
-		$(use_enable java swig-java) \
-		$(use_enable X swig-tcl) \
-		$(use_enable X gui) \
-		$(use_enable debug)
-
-	# work around swig c99 issues.  it does not require
-	# c99 anyway.
-	sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed."
-}