Bluez is no SELinux module, point to bluetooth

6 files changed, 18 insertions, 12 deletions

diff --git a/sec-policy/selinux-bluetooth/ChangeLog b/sec-policy/selinux-bluetooth/ChangeLog
index 4b275c6f..1ab0b7d3 100644
--- a/sec-policy/selinux-bluetooth/ChangeLog
+++ b/sec-policy/selinux-bluetooth/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/ChangeLog,v 1.2 2011/06/02 12:07:47 blueness Exp $
 
+  13 Aug 2011; <swift@gentoo.org> selinux-bluetooth-2.20110726.ebuild:
+  Block on bluez
+
   02 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   selinux-bluetooth-2.20101213.ebuild:
   Stable amd64 x86
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 6f7d2df6..9a2962dc 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -1,4 +1,4 @@
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
-EBUILD selinux-bluetooth-2.20110726.ebuild 249 RMD160 c5ba362164cbde117ab935c92fae22ede1c34946 SHA1 10d54838e3eb4bcf329c3d44965c517f95c3b8a1 SHA256 54ebcd86be13f5a87d8752a7e1b97a67d3c2a26106fa932e3b1295081822f155
-MISC ChangeLog 441 RMD160 f8933fa3a30a540dcd399645d2580ff2ca8024a7 SHA1 919fe62b89d2704c914f6347bd3c665cacab1238 SHA256 cc724b3ae2df22eb57b8a52ea376a92622cd18480c562e5a882437e8ae324678
+EBUILD selinux-bluetooth-2.20110726.ebuild 343 RMD160 281aa2802ef25d8f1700458c4d183071a0b92cf9 SHA1 a335503b3d06c802cebdc5b334f5be50271241d8 SHA256 b1fe5bff4306d3f344e6e942d5eebab19bc08307e36f0bebdb7fc32b8f738f11
+MISC ChangeLog 530 RMD160 c380715795ba7b38f252222424d0c52aa253e4ae SHA1 4b87d21e2d1d1485b7d07607f37705b5bff507a1 SHA256 eb9b4d0ca6aa7952579f2c31859367086e52a3668c0b9be8e75d8ca9aa95c146
 MISC metadata.xml 233 RMD160 36fb40fd09a35e1acad0b1a07b33fcb6851f5e4b SHA1 6c8724d42b0ea99776f4142f43caf4023c04721e SHA256 0d257adf51bd6d77def690ece4e1ef7388e345dcfef34e6dc398a83a95c73db4
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20110726.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20110726.ebuild
index b52f54fe..eca6b0b8 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20110726.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20110726.ebuild
@@ -9,5 +9,6 @@ MODS="bluetooth"
 inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
-
+DEPEND=">=sec-policy/selinux-base-policy-2.20110726-r1
+	!<sec-policy/selinux-bluez-2.20110726"
 KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-bluez/ChangeLog b/sec-policy/selinux-bluez/ChangeLog
index b5c9f3c2..6348180c 100644
--- a/sec-policy/selinux-bluez/ChangeLog
+++ b/sec-policy/selinux-bluez/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluez/ChangeLog,v 1.14 2011/06/04 16:12:48 blueness Exp $
 
+  13 Aug 2011; <swift@gentoo.org> selinux-bluez-2.20110726.ebuild:
+  Bluez is no module, bluetooth is
+
   04 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   -selinux-bluez-2.20090730.ebuild, -selinux-bluez-2.20091215.ebuild,
   -selinux-bluez-20080525.ebuild:
diff --git a/sec-policy/selinux-bluez/Manifest b/sec-policy/selinux-bluez/Manifest
index 12d4ffcb..87f964d5 100644
--- a/sec-policy/selinux-bluez/Manifest
+++ b/sec-policy/selinux-bluez/Manifest
@@ -1,4 +1,3 @@
-DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
-EBUILD selinux-bluez-2.20110726.ebuild 241 RMD160 613b307beec4fa2e9e4dbfe964dbd88cb95a2e0a SHA1 180820b3b956725d85b1205fa6987202a1e28fc9 SHA256 7e0ade9c25659b4f9da4729acbfc1d752073dac5b9511a77911f662dfbf9fe46
-MISC ChangeLog 2289 RMD160 670429bfe0b491ae08c974ce22e4c7796eef89b4 SHA1 5be904e01d5e50898735a8c62c8bca913589fcaf SHA256 06fcff724824ca2947503affd62e2564495280a44a11235ec75cff22eb45d1ea
+EBUILD selinux-bluez-2.20110726.ebuild 360 RMD160 6256c0c94eaf43e7e9c4546326ee5fc1f093ad1b SHA1 cf2929d54800d4ffe503b58f3b790f0ccd9c7f2f SHA256 4e029e90082d8b11a1d9ee09f8bdfc1362d5543a321c7ec7f5b6dfa893c685a0
+MISC ChangeLog 2392 RMD160 08075c5e1eade04c188aaebddf73c2d0da035230 SHA1 6d903de0f15acef1d53c71ac0032f7d056ca77e3 SHA256 fe65ee938aa401237ed6f307a801844fbc436b1c669ce57b8bc526d7db32cccb
 MISC metadata.xml 229 RMD160 d076f45d1fe3dec70f7a608efdcb93de937be0e8 SHA1 3289ca1c10bd374d8d46ace7dc1eae7641f0054d SHA256 13a492a3402eff44d0530722b9d073f58506eea3becdeb6b4847dfc80952ab1f
diff --git a/sec-policy/selinux-bluez/selinux-bluez-2.20110726.ebuild b/sec-policy/selinux-bluez/selinux-bluez-2.20110726.ebuild
index b64fd91c..8dfda55a 100644
--- a/sec-policy/selinux-bluez/selinux-bluez-2.20110726.ebuild
+++ b/sec-policy/selinux-bluez/selinux-bluez-2.20110726.ebuild
@@ -3,11 +3,11 @@
 # $Header: $
 EAPI="4"
 
-IUSE=""
-MODS="bluez"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for bluez"
+DEPEND=">=sec-policy/selinux-bluetooth-2.20110726"
 
+IUSE=""
+DESCRIPTION="SELinux policy for Bluez (meta-package for bluetooth)"
+HOMEPAGE="http://hardened.gentoo.org/selinux"
 KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="public-domain"