Fix bug #156752.

Package-Manager: portage-2.1.2-r5

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 69c4db961d2751d87f91b267e8aa9774aff43cbd..7472a99eb60d8f01b9d9704e2a3c10a3a1dbe8f4 100644 (file)
--- 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/Manifest b/app-admin/setools/Manifest
index 153a71bc1c997198a21f575536f033ab6d6027db..947d892ba51d527ae9effba5218932ad03a2ae47 100644 (file)
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX apol_tcl_fc.c.diff 1077 RMD160 1db09fde3eb402aa9fe92c0740568bdef7b7586d SHA1 350110b8beb653b6c7b5052530de3d34ae88fc1e SHA256 3457cbba134699babd6882655cfc1957fb0768591690736c4a67c71310ac09b9
 MD5 88bfa9c3aaf1cce7cc0a98a7e40187e2 files/apol_tcl_fc.c.diff 1077
 RMD160 1db09fde3eb402aa9fe92c0740568bdef7b7586d files/apol_tcl_fc.c.diff 1077
@@ -11,14 +8,14 @@ EBUILD setools-2.4.ebuild 1813 RMD160 4b064ecf873502f919ed3cc1307f79740faa9978 S
 MD5 db1dc75c55b3988442d3db962c5b1b45 setools-2.4.ebuild 1813
 RMD160 4b064ecf873502f919ed3cc1307f79740faa9978 setools-2.4.ebuild 1813
 SHA256 e491874af3d2788e5458241bff10e281d68bcab2ed8bf2140b5347d2bacfb243 setools-2.4.ebuild 1813
-EBUILD setools-3.0.ebuild 1478 RMD160 853911e8968699af694e41867b80b33ea19d4d64 SHA1 7ec2261072b52eb0e39b3e0beb3c5d43e191d5af SHA256 14cf97e81fee7bf4fa13890d3ea25de0094001c67c00dcb5f06330e795b5edfc
-MD5 94e38f343079a07bbd1d4feeec23b704 setools-3.0.ebuild 1478
-RMD160 853911e8968699af694e41867b80b33ea19d4d64 setools-3.0.ebuild 1478
-SHA256 14cf97e81fee7bf4fa13890d3ea25de0094001c67c00dcb5f06330e795b5edfc setools-3.0.ebuild 1478
-MISC ChangeLog 6359 RMD160 d3f370c3dd3bea51395dbca62adcc19e5c21c213 SHA1 17971cee1d57161e3d88d149e7e471f155bd828c SHA256 c37d7cfa4e46c4961db81a974d2f47af0d76d7adc789bb858e70a130e1bda3cc
-MD5 74578f677d2e70c5b54abcd578e2c14d ChangeLog 6359
-RMD160 d3f370c3dd3bea51395dbca62adcc19e5c21c213 ChangeLog 6359
-SHA256 c37d7cfa4e46c4961db81a974d2f47af0d76d7adc789bb858e70a130e1bda3cc ChangeLog 6359
+EBUILD setools-3.0.ebuild 1160 RMD160 215828a012837f8c45fa566fa47a2cc441ec1bdf SHA1 654aa0987e63a331eafd617015cf86a6642ca9f6 SHA256 494a66e4a9918b8a088b3bd39e7c73516c7c44f0fad2777375f2cf820950fe4c
+MD5 c5961b735405c2022b5f22c32f6787b9 setools-3.0.ebuild 1160
+RMD160 215828a012837f8c45fa566fa47a2cc441ec1bdf setools-3.0.ebuild 1160
+SHA256 494a66e4a9918b8a088b3bd39e7c73516c7c44f0fad2777375f2cf820950fe4c setools-3.0.ebuild 1160
+MISC ChangeLog 6451 RMD160 18d39bb3c3506f078193e13d62cec41dec2deaa5 SHA1 c8a9f1912d9b6b0167ac65c122e5715136d4274c SHA256 c37ac9443d7219d057b1c58600eef5aadf2afeec56c92e28f07c7a786f2ff918
+MD5 73500c056c2f0f9e34ec62701b93ed37 ChangeLog 6451
+RMD160 18d39bb3c3506f078193e13d62cec41dec2deaa5 ChangeLog 6451
+SHA256 c37ac9443d7219d057b1c58600eef5aadf2afeec56c92e28f07c7a786f2ff918 ChangeLog 6451
 MISC metadata.xml 369 RMD160 c37d0796a65a30cccd5d520514223758d68cff47 SHA1 47f913e33c294a7287f04669b9c5279009be7fdf SHA256 58f5b1ba9b602226f7a76b1ebd8edc824e3488f5c9bce9cc53fc2b9dcf2ef84f
 MD5 f5d096116ff7743b040148ced68e4f7b metadata.xml 369
 RMD160 c37d0796a65a30cccd5d520514223758d68cff47 metadata.xml 369
@@ -29,10 +26,3 @@ SHA256 811243990123214e2538e8eb6c76563a12ef88783ce20336b5d1c96f9c46272c files/di
 MD5 c3a9743b5ad229df6bf46ac20f479478 files/digest-setools-3.0 241
 RMD160 4bc05401c4a793054b53e46110482e8d4a2e049e files/digest-setools-3.0 241
 SHA256 f62a98d3000dec0af1d46cb5335c8927d26066bc81bd8196be4ce77eb399f18d files/digest-setools-3.0 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFNrUX3gmyzsILbxIRAtqQAJ9qWidVUfNtJqvRl5+4ohetD5R2aACeJyvM
-n60+jlHpPMnUf9wsE/V1uHM=
-=Pzng
------END PGP SIGNATURE-----

diff --git a/app-admin/setools/setools-3.0.ebuild b/app-admin/setools/setools-3.0.ebuild
index b121e9e796d4987aa94f9cbaea29881316997b6b..32c252b4c0009ffdc8a935b337fb8ded4309aa77 100644 (file)
--- 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
 }