summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2007-02-02 05:11:39 +0000
committerChris PeBenito <pebenito@gentoo.org>2007-02-02 05:11:39 +0000
commita9aa9b8298d585660d106cb0f10fa6c75b4c562a (patch)
tree92f9258a8a876921aff9c8b53693148fd4ca3357
parentallow hppa in want_nptl() now ... patches are coming (diff)
downloadgentoo-2-a9aa9b8298d585660d106cb0f10fa6c75b4c562a.tar.gz
gentoo-2-a9aa9b8298d585660d106cb0f10fa6c75b4c562a.tar.bz2
gentoo-2-a9aa9b8298d585660d106cb0f10fa6c75b4c562a.zip
Fix bug #156752.
(Portage version: 2.1.2-r5)
-rw-r--r--app-admin/setools/ChangeLog7
-rw-r--r--app-admin/setools/setools-3.0.ebuild22
2 files changed, 12 insertions, 17 deletions
diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 69c4db961d27..7472a99eb60d 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/setools
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.48 2006/10/18 03:28:01 pebenito Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.49 2007/02/02 05:11:39 pebenito Exp $
+
+ 02 Feb 2007; Chris PeBenito <pebenito@gentoo.org> setools-3.0.ebuild:
+ Fix bug #156752.
*setools-3.0 (18 Oct 2006)
diff --git a/app-admin/setools/setools-3.0.ebuild b/app-admin/setools/setools-3.0.ebuild
index b121e9e796d4..32c252b4c000 100644
--- a/app-admin/setools/setools-3.0.ebuild
+++ b/app-admin/setools/setools-3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.0.ebuild,v 1.2 2006/10/18 23:13:33 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.0.ebuild,v 1.3 2007/02/02 05:11:39 pebenito Exp $
inherit autotools
@@ -11,21 +11,22 @@ 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"
+IUSE="X debug"
DEPEND=">=sys-libs/libsepol-1.12.27
+ sys-libs/libselinux
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 )
+RDEPEND=">=sys-libs/libsepol-1.12.27
+ sys-libs/libselinux
+ dev-libs/libxml2
X? (
dev-lang/tk
>=dev-tcltk/bwidget-1.4.1
@@ -36,15 +37,6 @@ src_unpack() {
unpack ${A}
cd ${S}
- # 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
-
eautoreconf
}