Stabilization of r3, and make r4 available for testing

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)

734 files changed, 6079 insertions, 733 deletions

diff --git a/sec-policy/selinux-abrt/ChangeLog b/sec-policy/selinux-abrt/ChangeLog
index 58a13e3e0456..ddf8d1fb2b8c 100644
--- a/sec-policy/selinux-abrt/ChangeLog
+++ b/sec-policy/selinux-abrt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-abrt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-abrt/ChangeLog,v 1.15 2014/05/29 20:23:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-abrt/ChangeLog,v 1.16 2014/08/01 21:04:35 swift Exp $
+
+*selinux-abrt-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-abrt-2.20140311-r4.ebuild, selinux-abrt-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-abrt-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r3.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r3.ebuild
index 130a1c18a017..bd9213fb10a0 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:35 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for abrt"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r4.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..621ca0f9677e
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-abrt/selinux-abrt-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="abrt"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for abrt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-accountsd/ChangeLog b/sec-policy/selinux-accountsd/ChangeLog
index b37022c522c2..baaa89f3dad7 100644
--- a/sec-policy/selinux-accountsd/ChangeLog
+++ b/sec-policy/selinux-accountsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-accountsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-accountsd/ChangeLog,v 1.6 2014/05/29 20:23:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-accountsd/ChangeLog,v 1.7 2014/08/01 21:04:20 swift Exp $
+
+*selinux-accountsd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-accountsd-2.20140311-r4.ebuild,
+  selinux-accountsd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-accountsd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r3.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r3.ebuild
index e933fc31a2ff..46db67e6d0a0 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:20 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for accountsd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r4.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1e1c3dc7b8b4
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-accountsd/selinux-accountsd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="accountsd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for accountsd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-acct/ChangeLog b/sec-policy/selinux-acct/ChangeLog
index fbcbc25af3d8..a4911ecb96d3 100644
--- a/sec-policy/selinux-acct/ChangeLog
+++ b/sec-policy/selinux-acct/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-acct
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/ChangeLog,v 1.39 2014/05/29 20:23:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/ChangeLog,v 1.40 2014/08/01 21:04:27 swift Exp $
+
+*selinux-acct-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-acct-2.20140311-r4.ebuild, selinux-acct-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-acct-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20140311-r3.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20140311-r3.ebuild
index 5373d14add84..2a1bfa7a4d87 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/selinux-acct-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/selinux-acct-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:27 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for acct"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20140311-r4.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..df0f4c0ee464
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acct/selinux-acct-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="acct"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ada/ChangeLog b/sec-policy/selinux-ada/ChangeLog
index 451626d7ca12..66c9f032d63b 100644
--- a/sec-policy/selinux-ada/ChangeLog
+++ b/sec-policy/selinux-ada/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ada
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/ChangeLog,v 1.39 2014/05/29 20:23:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/ChangeLog,v 1.40 2014/08/01 21:04:28 swift Exp $
+
+*selinux-ada-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ada-2.20140311-r4.ebuild, selinux-ada-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ada-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20140311-r3.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20140311-r3.ebuild
index e5c9935edd7c..c665605ee354 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/selinux-ada-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/selinux-ada-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:28 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ada"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20140311-r4.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5e6916a05ee9
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ada/selinux-ada-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ada"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-afs/ChangeLog b/sec-policy/selinux-afs/ChangeLog
index a85e53f84068..2a547c15bcff 100644
--- a/sec-policy/selinux-afs/ChangeLog
+++ b/sec-policy/selinux-afs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-afs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/ChangeLog,v 1.39 2014/05/29 20:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/ChangeLog,v 1.40 2014/08/01 21:04:38 swift Exp $
+
+*selinux-afs-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-afs-2.20140311-r4.ebuild, selinux-afs-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-afs-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20140311-r3.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20140311-r3.ebuild
index a3ea81814e7c..cd498090d9cb 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/selinux-afs-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/selinux-afs-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:38 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for afs"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20140311-r4.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5593a71e128a
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-afs/selinux-afs-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="afs"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-aide/ChangeLog b/sec-policy/selinux-aide/ChangeLog
index e0d461886c91..64334b3a4379 100644
--- a/sec-policy/selinux-aide/ChangeLog
+++ b/sec-policy/selinux-aide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-aide
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/ChangeLog,v 1.39 2014/05/29 20:23:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/ChangeLog,v 1.40 2014/08/01 21:04:04 swift Exp $
+
+*selinux-aide-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-aide-2.20140311-r4.ebuild, selinux-aide-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-aide-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20140311-r3.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20140311-r3.ebuild
index 6c8974efe818..f8972524a303 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/selinux-aide-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/selinux-aide-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:04 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for aide"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20140311-r4.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..71d997ecfcf6
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-aide/selinux-aide-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="aide"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-alsa/ChangeLog b/sec-policy/selinux-alsa/ChangeLog
index 178b00cbd060..ceed3c1cc1f3 100644
--- a/sec-policy/selinux-alsa/ChangeLog
+++ b/sec-policy/selinux-alsa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-alsa
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/ChangeLog,v 1.41 2014/05/29 20:23:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/ChangeLog,v 1.42 2014/08/01 21:04:35 swift Exp $
+
+*selinux-alsa-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-alsa-2.20140311-r4.ebuild, selinux-alsa-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-alsa-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r3.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r3.ebuild
index fc4277811cfc..ed12ffc859b8 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:35 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for alsa"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r4.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2e88b27722d5
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-alsa/selinux-alsa-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="alsa"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-amanda/ChangeLog b/sec-policy/selinux-amanda/ChangeLog
index 98300efc970b..1b2f22652000 100644
--- a/sec-policy/selinux-amanda/ChangeLog
+++ b/sec-policy/selinux-amanda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-amanda
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/ChangeLog,v 1.41 2014/05/29 20:23:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/ChangeLog,v 1.42 2014/08/01 21:04:18 swift Exp $
+
+*selinux-amanda-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-amanda-2.20140311-r4.ebuild, selinux-amanda-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-amanda-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r3.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r3.ebuild
index b4a7cf6bc6b0..27175ed3aa23 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:18 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amanda"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
 "
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r4.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2673fd8b596b
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amanda/selinux-amanda-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="amanda"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-amavis/ChangeLog b/sec-policy/selinux-amavis/ChangeLog
index fa804beb3e2f..1d4d01e25977 100644
--- a/sec-policy/selinux-amavis/ChangeLog
+++ b/sec-policy/selinux-amavis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-amavis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/ChangeLog,v 1.42 2014/05/29 20:23:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/ChangeLog,v 1.43 2014/08/01 21:03:59 swift Exp $
+
+*selinux-amavis-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-amavis-2.20140311-r4.ebuild, selinux-amavis-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-amavis-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r3.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r3.ebuild
index 4321f8f12475..28fab318bd5a 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:59 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for amavis"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r4.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..50354343c300
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-amavis/selinux-amavis-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:59 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="amavis"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-apache/ChangeLog b/sec-policy/selinux-apache/ChangeLog
index f6e1c1765bae..883c49b29f0e 100644
--- a/sec-policy/selinux-apache/ChangeLog
+++ b/sec-policy/selinux-apache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-apache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/ChangeLog,v 1.68 2014/05/29 20:23:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/ChangeLog,v 1.69 2014/08/01 21:04:45 swift Exp $
+
+*selinux-apache-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-apache-2.20140311-r4.ebuild, selinux-apache-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-apache-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20140311-r3.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20140311-r3.ebuild
index 414ae0f56054..16710ee16e1a 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:45 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apache"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
 "
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20140311-r4.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5d7beb3d9a23
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="apache"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-kerberos
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-apcupsd/ChangeLog b/sec-policy/selinux-apcupsd/ChangeLog
index 98046fc52878..d4a29933f635 100644
--- a/sec-policy/selinux-apcupsd/ChangeLog
+++ b/sec-policy/selinux-apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-apcupsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/ChangeLog,v 1.40 2014/05/29 20:23:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/ChangeLog,v 1.41 2014/08/01 21:04:36 swift Exp $
+
+*selinux-apcupsd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-apcupsd-2.20140311-r4.ebuild, selinux-apcupsd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-apcupsd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r3.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r3.ebuild
index b458f5c5f47b..c9c8d38c6bc5 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:36 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apcupsd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r4.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3efac98a09e6
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="apcupsd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-apm/ChangeLog b/sec-policy/selinux-apm/ChangeLog
index ce636be46d5a..4fef1b7bd771 100644
--- a/sec-policy/selinux-apm/ChangeLog
+++ b/sec-policy/selinux-apm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-apm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/ChangeLog,v 1.39 2014/05/29 20:23:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/ChangeLog,v 1.40 2014/08/01 21:04:01 swift Exp $
+
+*selinux-apm-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-apm-2.20140311-r4.ebuild, selinux-apm-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-apm-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20140311-r3.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20140311-r3.ebuild
index 68bf1fa4ffb8..b78dac53e1a4 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/selinux-apm-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/selinux-apm-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:01 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20140311-r4.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..c4830ab18453
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/selinux-apm-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:01 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="apm"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-arpwatch/ChangeLog b/sec-policy/selinux-arpwatch/ChangeLog
index 8b45ef4d0508..bba668787d71 100644
--- a/sec-policy/selinux-arpwatch/ChangeLog
+++ b/sec-policy/selinux-arpwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-arpwatch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.60 2014/05/29 20:22:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/ChangeLog,v 1.61 2014/08/01 21:04:10 swift Exp $
+
+*selinux-arpwatch-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-arpwatch-2.20140311-r4.ebuild, selinux-arpwatch-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-arpwatch-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r3.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r3.ebuild
index f21c85f6ba3b..173f4cffe213 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:10 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for arpwatch"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r4.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e4f8576f78d0
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="arpwatch"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-asterisk/ChangeLog b/sec-policy/selinux-asterisk/ChangeLog
index 7b4866aa2eb7..c9066004090c 100644
--- a/sec-policy/selinux-asterisk/ChangeLog
+++ b/sec-policy/selinux-asterisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-asterisk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.58 2014/05/29 20:23:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.59 2014/08/01 21:04:21 swift Exp $
+
+*selinux-asterisk-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-asterisk-2.20140311-r4.ebuild, selinux-asterisk-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-asterisk-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r3.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r3.ebuild
index cfc25485a4a4..0835b0b054e5 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:21 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r4.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d3817380e73e
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="asterisk"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-at/ChangeLog b/sec-policy/selinux-at/ChangeLog
index 99c945e4dc0a..dd1a5d1b3f7b 100644
--- a/sec-policy/selinux-at/ChangeLog
+++ b/sec-policy/selinux-at/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-at
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/ChangeLog,v 1.21 2014/05/29 20:23:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/ChangeLog,v 1.22 2014/08/01 21:04:21 swift Exp $
+
+*selinux-at-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-at-2.20140311-r4.ebuild, selinux-at-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-at-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-at/selinux-at-2.20140311-r3.ebuild b/sec-policy/selinux-at/selinux-at-2.20140311-r3.ebuild
index f25b79bdcd57..51ea77a6c784 100644
--- a/sec-policy/selinux-at/selinux-at-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/selinux-at-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/selinux-at-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:21 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for at"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-at/selinux-at-2.20140311-r4.ebuild b/sec-policy/selinux-at/selinux-at-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2dce2ab3c8f6
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-at/selinux-at-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="at"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-automount/ChangeLog b/sec-policy/selinux-automount/ChangeLog
index 9b76b5658a95..0b9a240261ef 100644
--- a/sec-policy/selinux-automount/ChangeLog
+++ b/sec-policy/selinux-automount/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-automount
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/ChangeLog,v 1.39 2014/05/29 20:23:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/ChangeLog,v 1.40 2014/08/01 21:04:07 swift Exp $
+
+*selinux-automount-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-automount-2.20140311-r4.ebuild,
+  selinux-automount-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-automount-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20140311-r3.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20140311-r3.ebuild
index 66946de99662..962c1cf0cb9b 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/selinux-automount-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/selinux-automount-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:07 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for automount"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20140311-r4.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..56893cc744d5
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/selinux-automount-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="automount"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-avahi/ChangeLog b/sec-policy/selinux-avahi/ChangeLog
index 1d1b33abf778..5eb78049d05f 100644
--- a/sec-policy/selinux-avahi/ChangeLog
+++ b/sec-policy/selinux-avahi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-avahi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/ChangeLog,v 1.51 2014/05/29 20:23:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/ChangeLog,v 1.52 2014/08/01 21:04:09 swift Exp $
+
+*selinux-avahi-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-avahi-2.20140311-r4.ebuild, selinux-avahi-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-avahi-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r3.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r3.ebuild
index 5ac12317c3e8..66ec95462047 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:08 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for avahi"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r4.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b01ff2449684
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-avahi/selinux-avahi-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="avahi"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-awstats/ChangeLog b/sec-policy/selinux-awstats/ChangeLog
index c90efd01d907..e645ee73a1bc 100644
--- a/sec-policy/selinux-awstats/ChangeLog
+++ b/sec-policy/selinux-awstats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-awstats
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/ChangeLog,v 1.40 2014/05/29 20:23:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/ChangeLog,v 1.41 2014/08/01 21:04:40 swift Exp $
+
+*selinux-awstats-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-awstats-2.20140311-r4.ebuild, selinux-awstats-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-awstats-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r3.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r3.ebuild
index 335cc8662488..1b19fe180da1 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:40 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for awstats"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r4.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0b9cb174a54a
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-awstats/selinux-awstats-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="awstats"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-backup/ChangeLog b/sec-policy/selinux-backup/ChangeLog
index 7c7207a4b44c..081afc3834c8 100644
--- a/sec-policy/selinux-backup/ChangeLog
+++ b/sec-policy/selinux-backup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-backup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-backup/ChangeLog,v 1.15 2014/05/29 20:23:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-backup/ChangeLog,v 1.16 2014/08/01 21:04:17 swift Exp $
+
+*selinux-backup-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-backup-2.20140311-r4.ebuild, selinux-backup-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-backup-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20140311-r3.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20140311-r3.ebuild
index a37ef02a20de..a1d0e941f256 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-backup/selinux-backup-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-backup/selinux-backup-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:17 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for generic backup applications"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20140311-r4.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..416c5ca7eeea
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-backup/selinux-backup-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="backup"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for generic backup applications"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-bacula/ChangeLog b/sec-policy/selinux-bacula/ChangeLog
index 6d986ede0be2..fd13b1e14402 100644
--- a/sec-policy/selinux-bacula/ChangeLog
+++ b/sec-policy/selinux-bacula/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bacula
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/ChangeLog,v 1.36 2014/05/29 20:23:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/ChangeLog,v 1.37 2014/08/01 21:04:04 swift Exp $
+
+*selinux-bacula-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bacula-2.20140311-r4.ebuild, selinux-bacula-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-bacula-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r3.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r3.ebuild
index f354cb5c41aa..77362a2ca9ba 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:04 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bacula"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r4.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b7b034e0f449
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bacula/selinux-bacula-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bacula"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index d11db88a1d5c..e04a973a63a2 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.144 2014/05/29 20:23:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.145 2014/08/01 21:04:44 swift Exp $
+
+*selinux-base-policy-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-base-policy-2.20140311-r4.ebuild,
+  selinux-base-policy-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-base-policy-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild
index f4ece4b97986..92b408beea02 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:44 swift Exp $
 EAPI="5"
 
 inherit eutils
@@ -16,7 +16,7 @@ PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
 DEPEND=""
 SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
 		http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${BASEPOL}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg"
 LICENSE="GPL-2"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b68d6042511f
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:44 swift Exp $
+EAPI="5"
+
+inherit eutils
+
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="+unconfined"
+BASEPOL="2.20140311-r4"
+
+RDEPEND=">=sec-policy/selinux-base-${PVR}"
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND=""
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+		http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${BASEPOL}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	# Patch the sources with the base patchbundle
+	if [[ -n ${BASEPOL} ]];
+	then
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	# Apply the additional patches refered to by the module ebuild.
+	# But first some magic to differentiate between bash arrays and strings
+	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
+	then
+		cd "${S}/refpolicy/policy/modules"
+		for POLPATCH in "${POLICY_PATCH[@]}";
+		do
+			epatch "${POLPATCH}"
+		done
+	else
+		if [[ -n ${POLICY_PATCH} ]];
+		then
+			cd "${S}/refpolicy/policy/modules"
+			for POLPATCH in ${POLICY_PATCH};
+			do
+				epatch "${POLPATCH}"
+			done
+		fi
+	fi
+
+	# Calling user patches
+	epatch_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		# Parallel builds are broken, so we need to force -j1 here
+		emake -j1 NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND
+	for i in ${MODS}; do
+		COMMAND="-i ${i}.pp ${COMMAND}"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+	done
+}
diff --git a/sec-policy/selinux-base/ChangeLog b/sec-policy/selinux-base/ChangeLog
index d3f60d82c8ec..c4389f33d85d 100644
--- a/sec-policy/selinux-base/ChangeLog
+++ b/sec-policy/selinux-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-base
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.44 2014/05/29 20:23:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/ChangeLog,v 1.45 2014/08/01 21:04:23 swift Exp $
+
+*selinux-base-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-base-2.20140311-r4.ebuild, selinux-base-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-base-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild
index 8333b86d5706..6d3955c1bcc1 100644
--- a/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:23 swift Exp $
 EAPI="5"
 
 inherit eutils
@@ -14,7 +14,7 @@ SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-apps/policycoreutils-2.1.10
 	virtual/udev
diff --git a/sec-policy/selinux-base/selinux-base-2.20140311-r4.ebuild b/sec-policy/selinux-base/selinux-base-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e5b5390ddf56
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20140311-r4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:23 swift Exp $
+EAPI="5"
+
+inherit eutils
+
+IUSE="+peer_perms +open_perms +ubac +unconfined doc"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+	http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-apps/policycoreutils-2.1.10
+	virtual/udev
+	!<=sec-policy/selinux-base-policy-2.20130424"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.1.8"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	# Apply the gentoo patches to the policy. These patches are only necessary
+	# for base policies, or for interface changes on modules.
+	EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	cd "${S}/refpolicy"
+	make bare
+	# Fix bug 257111 - Correct the initial sid for cron-started jobs in the
+	# system_r role
+	sed -i -e 's:system_crond_t:system_cronjob_t:g' \
+		"${S}/refpolicy/config/appconfig-standard/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mls/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
+
+	epatch_user
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy";
+	make conf || die "Make conf failed"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}"
+		cd "${S}/${i}";
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf"
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+		make base || die "${i} compile failed"
+		if use doc; then
+			make html || die
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+
+		make DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		make DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			dohtml doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	doman man/man8/*.8;
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
+	previous_less_than_r13=$?
+}
diff --git a/sec-policy/selinux-bind/ChangeLog b/sec-policy/selinux-bind/ChangeLog
index 4133d707d5e7..aa35799467c6 100644
--- a/sec-policy/selinux-bind/ChangeLog
+++ b/sec-policy/selinux-bind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.67 2014/05/29 20:23:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/ChangeLog,v 1.68 2014/08/01 21:04:38 swift Exp $
+
+*selinux-bind-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bind-2.20140311-r4.ebuild, selinux-bind-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-bind-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20140311-r3.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20140311-r3.ebuild
index ca54faf88cf2..a5fae68f4d8c 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/selinux-bind-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/selinux-bind-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:38 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bind"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20140311-r4.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4b54e6d4a64e
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bind/selinux-bind-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bind"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-bitlbee/ChangeLog b/sec-policy/selinux-bitlbee/ChangeLog
index a138cdaad82a..402c71d841b3 100644
--- a/sec-policy/selinux-bitlbee/ChangeLog
+++ b/sec-policy/selinux-bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-bitlbee
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/ChangeLog,v 1.38 2014/05/29 20:23:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/ChangeLog,v 1.39 2014/08/01 21:04:32 swift Exp $
+
+*selinux-bitlbee-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bitlbee-2.20140311-r4.ebuild, selinux-bitlbee-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-bitlbee-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r3.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r3.ebuild
index 1e19043cfada..e573aaeea1e5 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:32 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bitlbee"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
 "
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r4.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..581bd966f552
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bitlbee"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-bluetooth/ChangeLog b/sec-policy/selinux-bluetooth/ChangeLog
index 880af9afe624..7dbb852b6f38 100644
--- a/sec-policy/selinux-bluetooth/ChangeLog
+++ b/sec-policy/selinux-bluetooth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-bluetooth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/ChangeLog,v 1.39 2014/05/29 20:23:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/ChangeLog,v 1.40 2014/08/01 21:04:13 swift Exp $
+
+*selinux-bluetooth-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-bluetooth-2.20140311-r4.ebuild,
+  selinux-bluetooth-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-bluetooth-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r3.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r3.ebuild
index 2c5fa5130a4a..bc78ac9c8868 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:13 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for bluetooth"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r4.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2b607d4bcedc
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="bluetooth"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-brctl/ChangeLog b/sec-policy/selinux-brctl/ChangeLog
index 62cd03a3ed29..4b1aff7cb580 100644
--- a/sec-policy/selinux-brctl/ChangeLog
+++ b/sec-policy/selinux-brctl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-brctl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/ChangeLog,v 1.39 2014/05/29 20:23:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/ChangeLog,v 1.40 2014/08/01 21:04:23 swift Exp $
+
+*selinux-brctl-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-brctl-2.20140311-r4.ebuild, selinux-brctl-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-brctl-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r3.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r3.ebuild
index 1878bcd4f915..3d835bfcf445 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:23 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for brctl"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r4.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..83689d4474a2
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-brctl/selinux-brctl-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="brctl"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cachefilesd/ChangeLog b/sec-policy/selinux-cachefilesd/ChangeLog
index 71345d058577..5ed7e5cc4829 100644
--- a/sec-policy/selinux-cachefilesd/ChangeLog
+++ b/sec-policy/selinux-cachefilesd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-cachefilesd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/ChangeLog,v 1.7 2014/05/29 20:23:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/ChangeLog,v 1.8 2014/08/01 21:04:32 swift Exp $
+
+*selinux-cachefilesd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cachefilesd-2.20140311-r4.ebuild,
+  selinux-cachefilesd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cachefilesd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r3.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r3.ebuild
index 8bd3772529ca..55cf959333d1 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:32 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cachefilesd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r4.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..21df286e8eb9
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cachefilesd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-calamaris/ChangeLog b/sec-policy/selinux-calamaris/ChangeLog
index 653620121766..a8998e00ca3c 100644
--- a/sec-policy/selinux-calamaris/ChangeLog
+++ b/sec-policy/selinux-calamaris/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-calamaris
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/ChangeLog,v 1.39 2014/05/29 20:23:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/ChangeLog,v 1.40 2014/08/01 21:04:11 swift Exp $
+
+*selinux-calamaris-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-calamaris-2.20140311-r4.ebuild,
+  selinux-calamaris-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-calamaris-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild
index b831001d3b4a..d72a9f096ae1 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:11 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for calamaris"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r4.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..c73321971246
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-calamaris/selinux-calamaris-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="calamaris"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-canna/ChangeLog b/sec-policy/selinux-canna/ChangeLog
index 030d034cf00a..8d4c942538e1 100644
--- a/sec-policy/selinux-canna/ChangeLog
+++ b/sec-policy/selinux-canna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-canna
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/ChangeLog,v 1.39 2014/05/29 20:23:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/ChangeLog,v 1.40 2014/08/01 21:04:34 swift Exp $
+
+*selinux-canna-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-canna-2.20140311-r4.ebuild, selinux-canna-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-canna-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20140311-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20140311-r3.ebuild
index adf0142db9ec..7b1e4d57244a 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/selinux-canna-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/selinux-canna-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:34 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for canna"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20140311-r4.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0f9db495fa2b
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-canna/selinux-canna-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="canna"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ccs/ChangeLog b/sec-policy/selinux-ccs/ChangeLog
index 422d1c8670bb..ead0860bab91 100644
--- a/sec-policy/selinux-ccs/ChangeLog
+++ b/sec-policy/selinux-ccs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ccs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/ChangeLog,v 1.39 2014/05/29 20:23:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/ChangeLog,v 1.40 2014/08/01 21:04:35 swift Exp $
+
+*selinux-ccs-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ccs-2.20140311-r4.ebuild, selinux-ccs-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ccs-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r3.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r3.ebuild
index 5a83422b9a87..02371798a952 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:35 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ccs"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r4.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0ea6eae2d3d3
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ccs/selinux-ccs-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ccs"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cdrecord/ChangeLog b/sec-policy/selinux-cdrecord/ChangeLog
index 3ae81138ceec..a48bce2295e8 100644
--- a/sec-policy/selinux-cdrecord/ChangeLog
+++ b/sec-policy/selinux-cdrecord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cdrecord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/ChangeLog,v 1.39 2014/05/29 20:23:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/ChangeLog,v 1.40 2014/08/01 21:04:04 swift Exp $
+
+*selinux-cdrecord-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cdrecord-2.20140311-r4.ebuild, selinux-cdrecord-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cdrecord-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r3.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r3.ebuild
index 8378c0b184e6..4712dca9f46e 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:04 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cdrecord"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r4.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d8068975e579
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cdrecord"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cgroup/ChangeLog b/sec-policy/selinux-cgroup/ChangeLog
index cc752fbdabca..49947ea52767 100644
--- a/sec-policy/selinux-cgroup/ChangeLog
+++ b/sec-policy/selinux-cgroup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cgroup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/ChangeLog,v 1.39 2014/05/29 20:23:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/ChangeLog,v 1.40 2014/08/01 21:04:05 swift Exp $
+
+*selinux-cgroup-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cgroup-2.20140311-r4.ebuild, selinux-cgroup-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cgroup-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r3.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r3.ebuild
index 644ae86ed9ad..2b668dbcc6e3 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:05 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cgroup"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r4.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..42b0ac793cdf
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cgroup/selinux-cgroup-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cgroup"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-chromium/ChangeLog b/sec-policy/selinux-chromium/ChangeLog
index 803648cd3011..a557f86f8484 100644
--- a/sec-policy/selinux-chromium/ChangeLog
+++ b/sec-policy/selinux-chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/ChangeLog,v 1.28 2014/05/29 20:23:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/ChangeLog,v 1.29 2014/08/01 21:04:36 swift Exp $
+
+*selinux-chromium-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-chromium-2.20140311-r4.ebuild, selinux-chromium-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-chromium-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r3.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r3.ebuild
index bbb18b99c938..6e8fd7fec753 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:36 swift Exp $
 EAPI="5"
 
 IUSE="alsa"
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chromium"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r4.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e5df6a46b04f
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chromium/selinux-chromium-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:36 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="chromium"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-chronyd/ChangeLog b/sec-policy/selinux-chronyd/ChangeLog
index 9cf4b6f3081c..bce87ba1ca4d 100644
--- a/sec-policy/selinux-chronyd/ChangeLog
+++ b/sec-policy/selinux-chronyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-chronyd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/ChangeLog,v 1.39 2014/05/29 20:23:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/ChangeLog,v 1.40 2014/08/01 21:04:16 swift Exp $
+
+*selinux-chronyd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-chronyd-2.20140311-r4.ebuild, selinux-chronyd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-chronyd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r3.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r3.ebuild
index 1371fe7bbe33..5c2559170f1d 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:16 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for chronyd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r4.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e4c073d0e340
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-chronyd/selinux-chronyd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="chronyd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-clamav/ChangeLog b/sec-policy/selinux-clamav/ChangeLog
index f5a1087be0d4..782bf8f66c71 100644
--- a/sec-policy/selinux-clamav/ChangeLog
+++ b/sec-policy/selinux-clamav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-clamav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/ChangeLog,v 1.62 2014/05/29 20:23:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/ChangeLog,v 1.63 2014/08/01 21:03:58 swift Exp $
+
+*selinux-clamav-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-clamav-2.20140311-r4.ebuild, selinux-clamav-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-clamav-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r3.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r3.ebuild
index 66d9e1642083..dd137a12cba9 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:58 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clamav"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r4.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4a9ea0b844de
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clamav/selinux-clamav-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:58 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="clamav"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-clockspeed/ChangeLog b/sec-policy/selinux-clockspeed/ChangeLog
index b1bd807ce5bd..e774a751bb97 100644
--- a/sec-policy/selinux-clockspeed/ChangeLog
+++ b/sec-policy/selinux-clockspeed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-clockspeed
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/ChangeLog,v 1.66 2014/05/29 20:23:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/ChangeLog,v 1.67 2014/08/01 21:04:00 swift Exp $
+
+*selinux-clockspeed-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-clockspeed-2.20140311-r4.ebuild,
+  selinux-clockspeed-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-clockspeed-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r3.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r3.ebuild
index aaa900afbfff..939fc7c8935e 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:00 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for clockspeed"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r4.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..cec735982071
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:00 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="clockspeed"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-collectd/ChangeLog b/sec-policy/selinux-collectd/ChangeLog
index 34f9beb3d0fc..8462413ae374 100644
--- a/sec-policy/selinux-collectd/ChangeLog
+++ b/sec-policy/selinux-collectd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-collectd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-collectd/ChangeLog,v 1.2 2014/06/30 19:14:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-collectd/ChangeLog,v 1.3 2014/08/01 21:04:27 swift Exp $
+
+*selinux-collectd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-collectd-2.20140311-r4.ebuild, selinux-collectd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   30 Jun 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-collectd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r3.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r3.ebuild
index 63cbd596f6ca..d74759e8d5be 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r3.ebuild,v 1.1 2014/06/30 19:13:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:27 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for collectd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r4.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d8a318ec064f
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-collectd/selinux-collectd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="collectd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-consolekit/ChangeLog b/sec-policy/selinux-consolekit/ChangeLog
index 3f6278dc8162..665e15923746 100644
--- a/sec-policy/selinux-consolekit/ChangeLog
+++ b/sec-policy/selinux-consolekit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-consolekit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/ChangeLog,v 1.39 2014/05/29 20:23:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/ChangeLog,v 1.40 2014/08/01 21:04:31 swift Exp $
+
+*selinux-consolekit-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-consolekit-2.20140311-r4.ebuild,
+  selinux-consolekit-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-consolekit-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r3.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r3.ebuild
index c4989c762d38..496c4a662532 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:31 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for consolekit"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r4.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4cec97fcd534
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-consolekit/selinux-consolekit-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="consolekit"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-corosync/ChangeLog b/sec-policy/selinux-corosync/ChangeLog
index 56befb48ccde..5c946c921163 100644
--- a/sec-policy/selinux-corosync/ChangeLog
+++ b/sec-policy/selinux-corosync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-corosync
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/ChangeLog,v 1.39 2014/05/29 20:23:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/ChangeLog,v 1.40 2014/08/01 21:04:00 swift Exp $
+
+*selinux-corosync-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-corosync-2.20140311-r4.ebuild, selinux-corosync-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-corosync-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r3.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r3.ebuild
index c0af43f774c0..5cea448ee19f 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:00 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for corosync"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r4.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4aa97ff05b14
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-corosync/selinux-corosync-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:00 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="corosync"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-couchdb/ChangeLog b/sec-policy/selinux-couchdb/ChangeLog
index 14787b756661..79b069cd9f8a 100644
--- a/sec-policy/selinux-couchdb/ChangeLog
+++ b/sec-policy/selinux-couchdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-couchdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-couchdb/ChangeLog,v 1.7 2014/05/29 20:23:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-couchdb/ChangeLog,v 1.8 2014/08/01 21:04:38 swift Exp $
+
+*selinux-couchdb-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-couchdb-2.20140311-r4.ebuild, selinux-couchdb-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-couchdb-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r3.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r3.ebuild
index 3adc091885b6..c6d2689a9737 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:38 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for couchdb"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r4.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1e6a47d5d6d7
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-couchdb/selinux-couchdb-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="couchdb"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for couchdb"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-courier/ChangeLog b/sec-policy/selinux-courier/ChangeLog
index b4b447a78797..e8d5ed1a5d7d 100644
--- a/sec-policy/selinux-courier/ChangeLog
+++ b/sec-policy/selinux-courier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-courier
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/ChangeLog,v 1.43 2014/05/29 20:23:17 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/ChangeLog,v 1.44 2014/08/01 21:04:16 swift Exp $
+
+*selinux-courier-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-courier-2.20140311-r4.ebuild, selinux-courier-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-courier-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20140311-r3.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20140311-r3.ebuild
index 9f1b47cd72d4..34d10a0e8a8f 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/selinux-courier-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/selinux-courier-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:16 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for courier"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20140311-r4.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..ddcbde5fd09e
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-courier/selinux-courier-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="courier"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cpucontrol/ChangeLog b/sec-policy/selinux-cpucontrol/ChangeLog
index 115d23c78fe1..7053b3b66af2 100644
--- a/sec-policy/selinux-cpucontrol/ChangeLog
+++ b/sec-policy/selinux-cpucontrol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-cpucontrol
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/ChangeLog,v 1.39 2014/05/29 20:23:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/ChangeLog,v 1.40 2014/08/01 21:04:17 swift Exp $
+
+*selinux-cpucontrol-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cpucontrol-2.20140311-r4.ebuild,
+  selinux-cpucontrol-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cpucontrol-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r3.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r3.ebuild
index ac41dc56a128..42ab31db7945 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:17 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpucontrol"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r4.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..409f0ee9e0fe
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cpucontrol"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cpufreqselector/ChangeLog b/sec-policy/selinux-cpufreqselector/ChangeLog
index 175166ca4829..30f9483f5c09 100644
--- a/sec-policy/selinux-cpufreqselector/ChangeLog
+++ b/sec-policy/selinux-cpufreqselector/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-cpufreqselector
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/ChangeLog,v 1.39 2014/05/29 20:23:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/ChangeLog,v 1.40 2014/08/01 21:04:21 swift Exp $
+
+*selinux-cpufreqselector-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cpufreqselector-2.20140311-r4.ebuild,
+  selinux-cpufreqselector-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cpufreqselector-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r3.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r3.ebuild
index f8970ecd8d9d..8b737a736f28 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:21 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cpufreqselector"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r4.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..bb19d7231ced
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cpufreqselector"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-cups/ChangeLog b/sec-policy/selinux-cups/ChangeLog
index 10d03195caf9..08d5dec64738 100644
--- a/sec-policy/selinux-cups/ChangeLog
+++ b/sec-policy/selinux-cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/ChangeLog,v 1.50 2014/05/29 20:23:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/ChangeLog,v 1.51 2014/08/01 21:04:47 swift Exp $
+
+*selinux-cups-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cups-2.20140311-r4.ebuild, selinux-cups-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cups-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20140311-r3.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20140311-r3.ebuild
index 0a440ac28dfe..bc12f5c98603 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/selinux-cups-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/selinux-cups-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:47 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cups"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
 "
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20140311-r4.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1bcc18c47a6e
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/selinux-cups-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cups"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-lpd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-cvs/ChangeLog b/sec-policy/selinux-cvs/ChangeLog
index 747bc30f82c1..61c97e657e63 100644
--- a/sec-policy/selinux-cvs/ChangeLog
+++ b/sec-policy/selinux-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cvs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/ChangeLog,v 1.39 2014/05/29 20:23:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/ChangeLog,v 1.40 2014/08/01 21:04:34 swift Exp $
+
+*selinux-cvs-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cvs-2.20140311-r4.ebuild, selinux-cvs-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cvs-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r3.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r3.ebuild
index e5f153c2b4e6..587185f47e82 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:34 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cvs"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r4.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6522d0e9de89
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cvs/selinux-cvs-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cvs"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-cyphesis/ChangeLog b/sec-policy/selinux-cyphesis/ChangeLog
index c502680e23ad..7f4f9584eab5 100644
--- a/sec-policy/selinux-cyphesis/ChangeLog
+++ b/sec-policy/selinux-cyphesis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-cyphesis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/ChangeLog,v 1.39 2014/05/29 20:23:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/ChangeLog,v 1.40 2014/08/01 21:04:00 swift Exp $
+
+*selinux-cyphesis-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-cyphesis-2.20140311-r4.ebuild, selinux-cyphesis-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-cyphesis-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r3.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r3.ebuild
index 5dce07909725..a44de14b7b4a 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:00 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for cyphesis"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r4.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f84d48146522
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:00 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="cyphesis"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-daemontools/ChangeLog b/sec-policy/selinux-daemontools/ChangeLog
index 9661f1ffc693..c189f4eb6345 100644
--- a/sec-policy/selinux-daemontools/ChangeLog
+++ b/sec-policy/selinux-daemontools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-daemontools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/ChangeLog,v 1.73 2014/05/29 20:23:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/ChangeLog,v 1.74 2014/08/01 21:03:58 swift Exp $
+
+*selinux-daemontools-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-daemontools-2.20140311-r4.ebuild,
+  selinux-daemontools-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-daemontools-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r3.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r3.ebuild
index 60a2e78bd948..57e5f4706ef1 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:58 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for daemontools"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r4.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e4ab43a2a753
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-daemontools/selinux-daemontools-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:58 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="daemontools"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dante/ChangeLog b/sec-policy/selinux-dante/ChangeLog
index 9e78fb1214e5..4e9ed6ff00a9 100644
--- a/sec-policy/selinux-dante/ChangeLog
+++ b/sec-policy/selinux-dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dante
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/ChangeLog,v 1.63 2014/05/29 20:23:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/ChangeLog,v 1.64 2014/08/01 21:04:39 swift Exp $
+
+*selinux-dante-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dante-2.20140311-r4.ebuild, selinux-dante-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dante-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20140311-r3.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20140311-r3.ebuild
index ad0cbef42d61..07d662b642eb 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/selinux-dante-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/selinux-dante-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:39 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dante"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20140311-r4.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..29dc6ca70619
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dante/selinux-dante-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dante"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dbadm/ChangeLog b/sec-policy/selinux-dbadm/ChangeLog
index 46ba564ac89d..f438a626b355 100644
--- a/sec-policy/selinux-dbadm/ChangeLog
+++ b/sec-policy/selinux-dbadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dbadm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/ChangeLog,v 1.24 2014/05/29 20:23:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/ChangeLog,v 1.25 2014/08/01 21:04:14 swift Exp $
+
+*selinux-dbadm-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dbadm-2.20140311-r4.ebuild, selinux-dbadm-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dbadm-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r3.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r3.ebuild
index 2d494705c58e..b0b4114b1877 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:14 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbadm"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r4.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f2a28c2720c2
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbadm/selinux-dbadm-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dbadm"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dbskk/ChangeLog b/sec-policy/selinux-dbskk/ChangeLog
index 8d0e16ed6e9e..4ef9cd923709 100644
--- a/sec-policy/selinux-dbskk/ChangeLog
+++ b/sec-policy/selinux-dbskk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dbskk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/ChangeLog,v 1.40 2014/05/29 20:23:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/ChangeLog,v 1.41 2014/08/01 21:04:06 swift Exp $
+
+*selinux-dbskk-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dbskk-2.20140311-r4.ebuild, selinux-dbskk-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dbskk-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r3.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r3.ebuild
index faf6acbcc1fa..2745575cc8d7 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:06 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbskk"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
 "
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r4.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..adda29fe21c3
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbskk/selinux-dbskk-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dbskk"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dbus/ChangeLog b/sec-policy/selinux-dbus/ChangeLog
index cca4991de8a3..2bd313e0f41c 100644
--- a/sec-policy/selinux-dbus/ChangeLog
+++ b/sec-policy/selinux-dbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/ChangeLog,v 1.56 2014/05/29 20:23:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/ChangeLog,v 1.57 2014/08/01 21:04:22 swift Exp $
+
+*selinux-dbus-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dbus-2.20140311-r4.ebuild, selinux-dbus-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dbus-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r3.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r3.ebuild
index 94fda69a1827..881a3a49eac2 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:22 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r4.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1f22a944f824
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/selinux-dbus-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dbus"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dcc/ChangeLog b/sec-policy/selinux-dcc/ChangeLog
index 395b617b774a..b2b0f80c4d16 100644
--- a/sec-policy/selinux-dcc/ChangeLog
+++ b/sec-policy/selinux-dcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/ChangeLog,v 1.39 2014/05/29 20:23:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/ChangeLog,v 1.40 2014/08/01 21:04:00 swift Exp $
+
+*selinux-dcc-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dcc-2.20140311-r4.ebuild, selinux-dcc-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dcc-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r3.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r3.ebuild
index 4c4bd41fc3f2..a664fac75bc0 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:00 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dcc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r4.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d54248e89011
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dcc/selinux-dcc-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:00 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dcc"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ddclient/ChangeLog b/sec-policy/selinux-ddclient/ChangeLog
index cb6230c7d2c5..492236e72e58 100644
--- a/sec-policy/selinux-ddclient/ChangeLog
+++ b/sec-policy/selinux-ddclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ddclient
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/ChangeLog,v 1.39 2014/05/29 20:23:14 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/ChangeLog,v 1.40 2014/08/01 21:04:46 swift Exp $
+
+*selinux-ddclient-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ddclient-2.20140311-r4.ebuild, selinux-ddclient-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ddclient-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r3.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r3.ebuild
index 219ab1f21439..13ad66fe4ce9 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:46 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddclient"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r4.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7bee476d55d3
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddclient/selinux-ddclient-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ddclient"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ddcprobe/ChangeLog b/sec-policy/selinux-ddcprobe/ChangeLog
index 977ad6f540f3..f45bc4a58d78 100644
--- a/sec-policy/selinux-ddcprobe/ChangeLog
+++ b/sec-policy/selinux-ddcprobe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ddcprobe
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/ChangeLog,v 1.39 2014/05/29 20:23:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/ChangeLog,v 1.40 2014/08/01 21:04:37 swift Exp $
+
+*selinux-ddcprobe-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ddcprobe-2.20140311-r4.ebuild, selinux-ddcprobe-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ddcprobe-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r3.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r3.ebuild
index 2bec175a71e0..2a534cc9fdd7 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:37 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ddcprobe"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r4.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..fb37b10e154e
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ddcprobe"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-denyhosts/ChangeLog b/sec-policy/selinux-denyhosts/ChangeLog
index 9d50c35e66cf..f9f2f5425833 100644
--- a/sec-policy/selinux-denyhosts/ChangeLog
+++ b/sec-policy/selinux-denyhosts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-denyhosts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/ChangeLog,v 1.37 2014/05/29 20:23:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/ChangeLog,v 1.38 2014/08/01 21:04:28 swift Exp $
+
+*selinux-denyhosts-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-denyhosts-2.20140311-r4.ebuild,
+  selinux-denyhosts-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-denyhosts-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r3.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r3.ebuild
index 0c08cf7cfec1..1004068324f2 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:28 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for denyhosts"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r4.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..33d3e4f4a958
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="denyhosts"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-devicekit/ChangeLog b/sec-policy/selinux-devicekit/ChangeLog
index f9112fa342c5..d65a330e8e0b 100644
--- a/sec-policy/selinux-devicekit/ChangeLog
+++ b/sec-policy/selinux-devicekit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-devicekit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/ChangeLog,v 1.26 2014/05/29 20:23:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/ChangeLog,v 1.27 2014/08/01 21:04:21 swift Exp $
+
+*selinux-devicekit-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-devicekit-2.20140311-r4.ebuild,
+  selinux-devicekit-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-devicekit-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r3.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r3.ebuild
index eb14079021b1..9263f40c88a9 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:21 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for devicekit"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
 "
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r4.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..68adf42a406e
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-devicekit/selinux-devicekit-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:21 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="devicekit"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dhcp/ChangeLog b/sec-policy/selinux-dhcp/ChangeLog
index f7b005c01b1b..58ab87e562fe 100644
--- a/sec-policy/selinux-dhcp/ChangeLog
+++ b/sec-policy/selinux-dhcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dhcp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.76 2014/05/29 20:23:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/ChangeLog,v 1.77 2014/08/01 21:04:26 swift Exp $
+
+*selinux-dhcp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dhcp-2.20140311-r4.ebuild, selinux-dhcp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dhcp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r3.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r3.ebuild
index 37103186f57a..1bf9977e6d95 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:26 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dhcp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r4.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..89900eb38bc5
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dhcp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dictd/ChangeLog b/sec-policy/selinux-dictd/ChangeLog
index 89f22f010683..81bc8dc6c922 100644
--- a/sec-policy/selinux-dictd/ChangeLog
+++ b/sec-policy/selinux-dictd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dictd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/ChangeLog,v 1.39 2014/05/29 20:23:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/ChangeLog,v 1.40 2014/08/01 21:04:18 swift Exp $
+
+*selinux-dictd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dictd-2.20140311-r4.ebuild, selinux-dictd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dictd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r3.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r3.ebuild
index 3458549f6665..359244c3275f 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:18 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dictd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r4.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d965c69624b6
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dictd/selinux-dictd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dictd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dirsrv/ChangeLog b/sec-policy/selinux-dirsrv/ChangeLog
index 6da4f45c36ec..38b00d96d3f5 100644
--- a/sec-policy/selinux-dirsrv/ChangeLog
+++ b/sec-policy/selinux-dirsrv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dirsrv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/ChangeLog,v 1.21 2014/05/29 20:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/ChangeLog,v 1.22 2014/08/01 21:04:03 swift Exp $
+
+*selinux-dirsrv-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dirsrv-2.20140311-r4.ebuild, selinux-dirsrv-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dirsrv-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r3.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r3.ebuild
index 7e50cf8f5f25..3b11dbe6f318 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:03 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dirsrv"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r4.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..36559f47938d
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dirsrv"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-distcc/ChangeLog b/sec-policy/selinux-distcc/ChangeLog
index 5f19425a9396..a5559617b797 100644
--- a/sec-policy/selinux-distcc/ChangeLog
+++ b/sec-policy/selinux-distcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-distcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/ChangeLog,v 1.59 2014/05/29 20:23:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/ChangeLog,v 1.60 2014/08/01 21:04:29 swift Exp $
+
+*selinux-distcc-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-distcc-2.20140311-r4.ebuild, selinux-distcc-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-distcc-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r3.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r3.ebuild
index 7996b22df804..e3a13047e4d3 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:29 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for distcc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r4.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b02b12f29448
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-distcc/selinux-distcc-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="distcc"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-djbdns/ChangeLog b/sec-policy/selinux-djbdns/ChangeLog
index 7c1727624f64..4f7bc5660ae5 100644
--- a/sec-policy/selinux-djbdns/ChangeLog
+++ b/sec-policy/selinux-djbdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-djbdns
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/ChangeLog,v 1.64 2014/05/29 20:23:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/ChangeLog,v 1.65 2014/08/01 21:03:57 swift Exp $
+
+*selinux-djbdns-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-djbdns-2.20140311-r4.ebuild, selinux-djbdns-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-djbdns-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r3.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r3.ebuild
index c07e53ecc617..e298ecfef6c2 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:57 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for djbdns"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
 	sec-policy/selinux-ucspitcp
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r4.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..a590c1ae3561
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-djbdns/selinux-djbdns-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:57 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="djbdns"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dkim/ChangeLog b/sec-policy/selinux-dkim/ChangeLog
index b851e6694b57..6599504d1f96 100644
--- a/sec-policy/selinux-dkim/ChangeLog
+++ b/sec-policy/selinux-dkim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dkim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/ChangeLog,v 1.39 2014/05/29 20:23:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/ChangeLog,v 1.40 2014/08/01 21:04:11 swift Exp $
+
+*selinux-dkim-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dkim-2.20140311-r4.ebuild, selinux-dkim-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dkim-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r3.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r3.ebuild
index 90319e72045b..1ceb0e13ee95 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:11 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dkim"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-milter
 "
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r4.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e642fe66335e
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dkim/selinux-dkim-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dkim"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-milter
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-dmidecode/ChangeLog b/sec-policy/selinux-dmidecode/ChangeLog
index c6c4a8aca42c..84877c3f610c 100644
--- a/sec-policy/selinux-dmidecode/ChangeLog
+++ b/sec-policy/selinux-dmidecode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-dmidecode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/ChangeLog,v 1.39 2014/05/29 20:23:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/ChangeLog,v 1.40 2014/08/01 21:04:36 swift Exp $
+
+*selinux-dmidecode-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dmidecode-2.20140311-r4.ebuild,
+  selinux-dmidecode-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dmidecode-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r3.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r3.ebuild
index fe035fbe8298..dbeb047cca2f 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:36 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dmidecode"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r4.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..34a491d3a56e
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dmidecode"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dnsmasq/ChangeLog b/sec-policy/selinux-dnsmasq/ChangeLog
index 5c3725efdc68..8035fae11416 100644
--- a/sec-policy/selinux-dnsmasq/ChangeLog
+++ b/sec-policy/selinux-dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dnsmasq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/ChangeLog,v 1.48 2014/05/29 20:23:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/ChangeLog,v 1.49 2014/08/01 21:04:42 swift Exp $
+
+*selinux-dnsmasq-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dnsmasq-2.20140311-r4.ebuild, selinux-dnsmasq-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dnsmasq-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r3.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r3.ebuild
index ac645fee1ef1..1612ded021e3 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:42 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dnsmasq"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r4.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..27c78a45dcc9
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dnsmasq"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dovecot/ChangeLog b/sec-policy/selinux-dovecot/ChangeLog
index ed41d6f001d4..55ef0d01b5cf 100644
--- a/sec-policy/selinux-dovecot/ChangeLog
+++ b/sec-policy/selinux-dovecot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dovecot
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/ChangeLog,v 1.39 2014/05/29 20:23:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/ChangeLog,v 1.40 2014/08/01 21:04:30 swift Exp $
+
+*selinux-dovecot-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dovecot-2.20140311-r4.ebuild, selinux-dovecot-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dovecot-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r3.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r3.ebuild
index 9c3a07cdabec..94d2200a7f68 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:30 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dovecot"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r4.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7e74a25b0ab6
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dovecot/selinux-dovecot-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dovecot"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dpkg/ChangeLog b/sec-policy/selinux-dpkg/ChangeLog
index 016e63e718d2..5c5ca1bcd4b0 100644
--- a/sec-policy/selinux-dpkg/ChangeLog
+++ b/sec-policy/selinux-dpkg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dpkg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/ChangeLog,v 1.37 2014/05/29 20:23:17 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/ChangeLog,v 1.38 2014/08/01 21:03:58 swift Exp $
+
+*selinux-dpkg-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dpkg-2.20140311-r4.ebuild, selinux-dpkg-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dpkg-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r3.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r3.ebuild
index f42c811279f2..2f0e387a93c2 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:58 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dpkg"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r4.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3016a334d129
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/selinux-dpkg-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:58 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dpkg"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dracut/ChangeLog b/sec-policy/selinux-dracut/ChangeLog
index 9ffebcd02f2d..11b20c554170 100644
--- a/sec-policy/selinux-dracut/ChangeLog
+++ b/sec-policy/selinux-dracut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-dracut
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/ChangeLog,v 1.36 2014/05/29 20:23:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/ChangeLog,v 1.37 2014/08/01 21:04:46 swift Exp $
+
+*selinux-dracut-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dracut-2.20140311-r4.ebuild, selinux-dracut-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-dracut-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r3.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r3.ebuild
index 3385be7939f6..22bea8379deb 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:46 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dracut"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r4.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..18dbcca7503d
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dracut/selinux-dracut-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dracut"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dropbox/ChangeLog b/sec-policy/selinux-dropbox/ChangeLog
index 759ad345e170..5fb59aab0042 100644
--- a/sec-policy/selinux-dropbox/ChangeLog
+++ b/sec-policy/selinux-dropbox/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for sec-policy/selinux-dropbox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dropbox/ChangeLog,v 1.1 2014/06/07 19:39:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dropbox/ChangeLog,v 1.2 2014/08/01 21:04:42 swift Exp $
+
+*selinux-dropbox-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-dropbox-2.20140311-r4.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
 *selinux-dropbox-9999 (07 Jun 2014)
 
   07 Jun 2014; Sven Vermeulen <swift@gentoo.org> +selinux-dropbox-9999.ebuild,
   +metadata.xml:
   Initial policy ebuild for dropbox
-
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20140311-r4.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..466bbaf89e7e
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dropbox/selinux-dropbox-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="dropbox"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dropbox"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-entropyd/ChangeLog b/sec-policy/selinux-entropyd/ChangeLog
index 7fac5ca82cd6..8083e78ef663 100644
--- a/sec-policy/selinux-entropyd/ChangeLog
+++ b/sec-policy/selinux-entropyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-entropyd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/ChangeLog,v 1.36 2014/05/29 20:23:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/ChangeLog,v 1.37 2014/08/01 21:04:45 swift Exp $
+
+*selinux-entropyd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-entropyd-2.20140311-r4.ebuild, selinux-entropyd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-entropyd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r3.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r3.ebuild
index 2117917bca14..b40b30af0a78 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:45 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for entropyd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r4.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..614e9ab546b3
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/selinux-entropyd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="entropyd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-evolution/ChangeLog b/sec-policy/selinux-evolution/ChangeLog
index 1e0893184cb3..c1397181e278 100644
--- a/sec-policy/selinux-evolution/ChangeLog
+++ b/sec-policy/selinux-evolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-evolution
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/ChangeLog,v 1.40 2014/05/29 20:23:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/ChangeLog,v 1.41 2014/08/01 21:04:15 swift Exp $
+
+*selinux-evolution-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-evolution-2.20140311-r4.ebuild,
+  selinux-evolution-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-evolution-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r3.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r3.ebuild
index 7f8eedffbe4b..7f3e7549deb9 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:15 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for evolution"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
 "
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r4.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..57cf1c60456e
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-evolution/selinux-evolution-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="evolution"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-exim/ChangeLog b/sec-policy/selinux-exim/ChangeLog
index c56a3385c8bb..98616e67be4f 100644
--- a/sec-policy/selinux-exim/ChangeLog
+++ b/sec-policy/selinux-exim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-exim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/ChangeLog,v 1.39 2014/05/29 20:23:17 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/ChangeLog,v 1.40 2014/08/01 21:04:44 swift Exp $
+
+*selinux-exim-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-exim-2.20140311-r4.ebuild, selinux-exim-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-exim-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20140311-r3.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20140311-r3.ebuild
index 3fc34a90b777..1f25a8f0b4cd 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/selinux-exim-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/selinux-exim-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:44 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for exim"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20140311-r4.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..94057a33d723
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-exim/selinux-exim-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:44 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="exim"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fail2ban/ChangeLog b/sec-policy/selinux-fail2ban/ChangeLog
index 975154684327..653d942ec8ff 100644
--- a/sec-policy/selinux-fail2ban/ChangeLog
+++ b/sec-policy/selinux-fail2ban/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-fail2ban
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/ChangeLog,v 1.44 2014/05/29 20:23:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/ChangeLog,v 1.45 2014/08/01 21:04:13 swift Exp $
+
+*selinux-fail2ban-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-fail2ban-2.20140311-r4.ebuild, selinux-fail2ban-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-fail2ban-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r3.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r3.ebuild
index 72be585f3394..3aa683bc1120 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:13 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fail2ban"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r4.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..84351c8cea25
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="fail2ban"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fetchmail/ChangeLog b/sec-policy/selinux-fetchmail/ChangeLog
index dd4186de19f2..6c2114f0525b 100644
--- a/sec-policy/selinux-fetchmail/ChangeLog
+++ b/sec-policy/selinux-fetchmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-fetchmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/ChangeLog,v 1.39 2014/05/29 20:23:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/ChangeLog,v 1.40 2014/08/01 21:04:47 swift Exp $
+
+*selinux-fetchmail-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-fetchmail-2.20140311-r4.ebuild,
+  selinux-fetchmail-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-fetchmail-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r3.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r3.ebuild
index ec39402d98d1..dab4999a2c8b 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:47 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fetchmail"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r4.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..24d07bb8a913
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="fetchmail"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-finger/ChangeLog b/sec-policy/selinux-finger/ChangeLog
index 153e57760fc6..4454525c062a 100644
--- a/sec-policy/selinux-finger/ChangeLog
+++ b/sec-policy/selinux-finger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-finger
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/ChangeLog,v 1.39 2014/05/29 20:23:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/ChangeLog,v 1.40 2014/08/01 21:04:04 swift Exp $
+
+*selinux-finger-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-finger-2.20140311-r4.ebuild, selinux-finger-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-finger-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20140311-r3.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20140311-r3.ebuild
index 835564696784..50460192f72f 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/selinux-finger-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/selinux-finger-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:04 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for finger"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
 "
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20140311-r4.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0d854100bd1f
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-finger/selinux-finger-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="finger"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-flash/ChangeLog b/sec-policy/selinux-flash/ChangeLog
index 2c761fb227ef..312695c05188 100644
--- a/sec-policy/selinux-flash/ChangeLog
+++ b/sec-policy/selinux-flash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-flash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/ChangeLog,v 1.26 2014/05/29 20:23:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/ChangeLog,v 1.27 2014/08/01 21:04:24 swift Exp $
+
+*selinux-flash-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-flash-2.20140311-r4.ebuild, selinux-flash-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-flash-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20140311-r3.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20140311-r3.ebuild
index 7d4208a64102..fcfa02f5b0ab 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/selinux-flash-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/selinux-flash-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:24 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for flash"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20140311-r4.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..a73e62acebb3
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-flash/selinux-flash-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="flash"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-fprintd/ChangeLog b/sec-policy/selinux-fprintd/ChangeLog
index 9caaa2f84c1e..529eeb577086 100644
--- a/sec-policy/selinux-fprintd/ChangeLog
+++ b/sec-policy/selinux-fprintd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-fprintd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/ChangeLog,v 1.40 2014/05/29 20:23:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/ChangeLog,v 1.41 2014/08/01 21:04:44 swift Exp $
+
+*selinux-fprintd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-fprintd-2.20140311-r4.ebuild, selinux-fprintd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-fprintd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r3.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r3.ebuild
index 595e516e3d1e..658973bd2168 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:44 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for fprintd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
 "
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r4.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..aa714e55744f
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-fprintd/selinux-fprintd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:44 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="fprintd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-ftp/ChangeLog b/sec-policy/selinux-ftp/ChangeLog
index 3cb98a777642..3d6c9e922071 100644
--- a/sec-policy/selinux-ftp/ChangeLog
+++ b/sec-policy/selinux-ftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ftp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/ChangeLog,v 1.37 2014/05/29 20:23:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/ChangeLog,v 1.38 2014/08/01 21:04:41 swift Exp $
+
+*selinux-ftp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ftp-2.20140311-r4.ebuild, selinux-ftp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ftp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r3.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r3.ebuild
index 08d2615b6046..565191af5321 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:41 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ftp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r4.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6e3413be8e4f
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ftp/selinux-ftp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ftp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-games/ChangeLog b/sec-policy/selinux-games/ChangeLog
index a44a0e19010c..0d2b04d4ef51 100644
--- a/sec-policy/selinux-games/ChangeLog
+++ b/sec-policy/selinux-games/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-games
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/ChangeLog,v 1.48 2014/05/29 20:23:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/ChangeLog,v 1.49 2014/08/01 21:04:18 swift Exp $
+
+*selinux-games-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-games-2.20140311-r4.ebuild, selinux-games-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-games-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-games/selinux-games-2.20140311-r3.ebuild b/sec-policy/selinux-games/selinux-games-2.20140311-r3.ebuild
index d76e700b7b8f..42a8f6683abe 100644
--- a/sec-policy/selinux-games/selinux-games-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/selinux-games-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/selinux-games-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:18 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for games"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-games/selinux-games-2.20140311-r4.ebuild b/sec-policy/selinux-games/selinux-games-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..9e0cab9e8667
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-games/selinux-games-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="games"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gatekeeper/ChangeLog b/sec-policy/selinux-gatekeeper/ChangeLog
index 0143bee705d9..aa86e0d44808 100644
--- a/sec-policy/selinux-gatekeeper/ChangeLog
+++ b/sec-policy/selinux-gatekeeper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-gatekeeper
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/ChangeLog,v 1.39 2014/05/29 20:23:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/ChangeLog,v 1.40 2014/08/01 21:04:17 swift Exp $
+
+*selinux-gatekeeper-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gatekeeper-2.20140311-r4.ebuild,
+  selinux-gatekeeper-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gatekeeper-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r3.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r3.ebuild
index a47ec71c182a..0c2255e3c621 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:17 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gatekeeper"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r4.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..67d957d62368
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gatekeeper"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gift/ChangeLog b/sec-policy/selinux-gift/ChangeLog
index 070cb1ca6a55..e9e233ae4fd7 100644
--- a/sec-policy/selinux-gift/ChangeLog
+++ b/sec-policy/selinux-gift/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gift
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/ChangeLog,v 1.39 2014/05/29 20:23:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/ChangeLog,v 1.40 2014/08/01 21:03:59 swift Exp $
+
+*selinux-gift-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gift-2.20140311-r4.ebuild, selinux-gift-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gift-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20140311-r3.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20140311-r3.ebuild
index 11dcb72f6654..34da22668d7d 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/selinux-gift-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/selinux-gift-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:59 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gift"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20140311-r4.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..395500eba602
--- /dev/null
+++ b/sec-policy/selinux-gift/selinux-gift-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gift/selinux-gift-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:59 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gift"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gift"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gitosis/ChangeLog b/sec-policy/selinux-gitosis/ChangeLog
index 5c14ff73f193..dde3191ffeb9 100644
--- a/sec-policy/selinux-gitosis/ChangeLog
+++ b/sec-policy/selinux-gitosis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gitosis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/ChangeLog,v 1.39 2014/05/29 20:23:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/ChangeLog,v 1.40 2014/08/01 21:04:22 swift Exp $
+
+*selinux-gitosis-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gitosis-2.20140311-r4.ebuild, selinux-gitosis-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gitosis-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r3.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r3.ebuild
index f4ae4fc9088a..63980540ea81 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:22 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gitosis"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r4.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..396bba9efd8a
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gitosis/selinux-gitosis-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gitosis"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gnome/ChangeLog b/sec-policy/selinux-gnome/ChangeLog
index 2dd6c854be7f..d1a7d3b1a56f 100644
--- a/sec-policy/selinux-gnome/ChangeLog
+++ b/sec-policy/selinux-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/ChangeLog,v 1.39 2014/05/29 20:23:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/ChangeLog,v 1.40 2014/08/01 21:03:59 swift Exp $
+
+*selinux-gnome-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gnome-2.20140311-r4.ebuild, selinux-gnome-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gnome-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r3.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r3.ebuild
index bd8f07ccd7a4..b58f0f8744b0 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:59 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gnome"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r4.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5d584bf3b41e
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gnome/selinux-gnome-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:59 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gnome"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-googletalk/ChangeLog b/sec-policy/selinux-googletalk/ChangeLog
index fa9dd205a5f9..acd245312c53 100644
--- a/sec-policy/selinux-googletalk/ChangeLog
+++ b/sec-policy/selinux-googletalk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-googletalk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-googletalk/ChangeLog,v 1.20 2014/05/29 20:23:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-googletalk/ChangeLog,v 1.21 2014/08/01 21:04:10 swift Exp $
+
+*selinux-googletalk-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-googletalk-2.20140311-r4.ebuild,
+  selinux-googletalk-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-googletalk-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r3.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r3.ebuild
index 066f54573b22..20c5f852ff36 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:10 swift Exp $
 EAPI="5"
 
 IUSE="alsa"
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for googletalk"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r4.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..cceebfd7fef4
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-googletalk/selinux-googletalk-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:10 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="googletalk"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for googletalk"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gorg/ChangeLog b/sec-policy/selinux-gorg/ChangeLog
index fe59a1da5b69..805a90ce539d 100644
--- a/sec-policy/selinux-gorg/ChangeLog
+++ b/sec-policy/selinux-gorg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gorg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/ChangeLog,v 1.42 2014/05/29 20:23:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/ChangeLog,v 1.43 2014/08/01 21:04:39 swift Exp $
+
+*selinux-gorg-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gorg-2.20140311-r4.ebuild, selinux-gorg-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gorg-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r3.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r3.ebuild
index 318ae1c926e3..2257e13a397c 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:39 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gorg"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r4.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..88d31889a397
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gorg/selinux-gorg-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gorg"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpg/ChangeLog b/sec-policy/selinux-gpg/ChangeLog
index 1ae99c051230..489653635dfc 100644
--- a/sec-policy/selinux-gpg/ChangeLog
+++ b/sec-policy/selinux-gpg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gpg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/ChangeLog,v 1.44 2014/05/29 20:23:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/ChangeLog,v 1.45 2014/08/01 21:04:42 swift Exp $
+
+*selinux-gpg-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gpg-2.20140311-r4.ebuild, selinux-gpg-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gpg-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r3.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r3.ebuild
index a9c7e47278dd..b19af176c826 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:42 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpg"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r4.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e44b6522a1a3
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpg/selinux-gpg-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gpg"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpm/ChangeLog b/sec-policy/selinux-gpm/ChangeLog
index fbee9b562a83..23adbf25d0a6 100644
--- a/sec-policy/selinux-gpm/ChangeLog
+++ b/sec-policy/selinux-gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gpm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.59 2014/05/29 20:23:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/ChangeLog,v 1.60 2014/08/01 21:04:13 swift Exp $
+
+*selinux-gpm-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gpm-2.20140311-r4.ebuild, selinux-gpm-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gpm-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r3.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r3.ebuild
index 2b7b2e1a25da..6a79a5eede54 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:13 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpm"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r4.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..a59b8cd28314
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpm/selinux-gpm-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gpm"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-gpsd/ChangeLog b/sec-policy/selinux-gpsd/ChangeLog
index 4e82a7bb1277..a8ddd5ca0a74 100644
--- a/sec-policy/selinux-gpsd/ChangeLog
+++ b/sec-policy/selinux-gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-gpsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/ChangeLog,v 1.39 2014/05/29 20:23:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/ChangeLog,v 1.40 2014/08/01 21:04:44 swift Exp $
+
+*selinux-gpsd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-gpsd-2.20140311-r4.ebuild, selinux-gpsd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-gpsd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r3.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r3.ebuild
index c937d428bae2..9c0ce3172d08 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:44 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for gpsd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r4.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..9a9500ddfadd
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-gpsd/selinux-gpsd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:44 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="gpsd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-hddtemp/ChangeLog b/sec-policy/selinux-hddtemp/ChangeLog
index ad44e37a84e1..2b44c2e09a1a 100644
--- a/sec-policy/selinux-hddtemp/ChangeLog
+++ b/sec-policy/selinux-hddtemp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-hddtemp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/ChangeLog,v 1.39 2014/05/29 20:23:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/ChangeLog,v 1.40 2014/08/01 21:04:41 swift Exp $
+
+*selinux-hddtemp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-hddtemp-2.20140311-r4.ebuild, selinux-hddtemp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-hddtemp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r3.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r3.ebuild
index b616a6bf5c8b..bcc5ec93912a 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:41 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for hddtemp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r4.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1409b7427c09
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="hddtemp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-howl/ChangeLog b/sec-policy/selinux-howl/ChangeLog
index c2b8c7c19ea1..5d643c9e0128 100644
--- a/sec-policy/selinux-howl/ChangeLog
+++ b/sec-policy/selinux-howl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-howl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/ChangeLog,v 1.37 2014/05/29 20:23:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/ChangeLog,v 1.38 2014/08/01 21:03:58 swift Exp $
+
+*selinux-howl-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-howl-2.20140311-r4.ebuild, selinux-howl-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-howl-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20140311-r3.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20140311-r3.ebuild
index 814d187aa344..53fcb87d2fed 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/selinux-howl-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/selinux-howl-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:58 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for howl"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20140311-r4.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..55dfdbe648a6
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/selinux-howl-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:58 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="howl"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-icecast/ChangeLog b/sec-policy/selinux-icecast/ChangeLog
index a90a9dc657b5..7956850ee349 100644
--- a/sec-policy/selinux-icecast/ChangeLog
+++ b/sec-policy/selinux-icecast/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-icecast
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/ChangeLog,v 1.39 2014/05/29 20:23:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/ChangeLog,v 1.40 2014/08/01 21:04:15 swift Exp $
+
+*selinux-icecast-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-icecast-2.20140311-r4.ebuild, selinux-icecast-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-icecast-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r3.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r3.ebuild
index 39712f606dbe..fb9fad0755cd 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:15 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for icecast"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r4.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..569ce5f99b5c
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-icecast/selinux-icecast-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="icecast"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ifplugd/ChangeLog b/sec-policy/selinux-ifplugd/ChangeLog
index 5c2de673f7e9..8e1cbceab0ad 100644
--- a/sec-policy/selinux-ifplugd/ChangeLog
+++ b/sec-policy/selinux-ifplugd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ifplugd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/ChangeLog,v 1.39 2014/05/29 20:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/ChangeLog,v 1.40 2014/08/01 21:04:08 swift Exp $
+
+*selinux-ifplugd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ifplugd-2.20140311-r4.ebuild, selinux-ifplugd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ifplugd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r3.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r3.ebuild
index 8aebd4dc271a..12574f013051 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:08 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ifplugd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r4.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..fe94e823090e
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ifplugd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-imaze/ChangeLog b/sec-policy/selinux-imaze/ChangeLog
index 13652a386f8e..378b3f759d26 100644
--- a/sec-policy/selinux-imaze/ChangeLog
+++ b/sec-policy/selinux-imaze/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-imaze
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/ChangeLog,v 1.39 2014/05/29 20:22:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/ChangeLog,v 1.40 2014/08/01 21:04:12 swift Exp $
+
+*selinux-imaze-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-imaze-2.20140311-r4.ebuild, selinux-imaze-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-imaze-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r3.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r3.ebuild
index b9feba01be87..5351951d9048 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:12 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for imaze"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r4.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f37f19150a64
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-imaze/selinux-imaze-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="imaze"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-inetd/ChangeLog b/sec-policy/selinux-inetd/ChangeLog
index 0627fa82c761..c4d7745b2920 100644
--- a/sec-policy/selinux-inetd/ChangeLog
+++ b/sec-policy/selinux-inetd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-inetd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/ChangeLog,v 1.53 2014/05/29 20:23:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/ChangeLog,v 1.54 2014/08/01 21:04:19 swift Exp $
+
+*selinux-inetd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-inetd-2.20140311-r4.ebuild, selinux-inetd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-inetd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r3.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r3.ebuild
index cd8d60184d0a..41b8be664337 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:19 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inetd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r4.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5da23469a83a
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/selinux-inetd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="inetd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-inn/ChangeLog b/sec-policy/selinux-inn/ChangeLog
index be25bc91549e..f69738702f05 100644
--- a/sec-policy/selinux-inn/ChangeLog
+++ b/sec-policy/selinux-inn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-inn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/ChangeLog,v 1.40 2014/05/29 20:23:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/ChangeLog,v 1.41 2014/08/01 21:04:02 swift Exp $
+
+*selinux-inn-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-inn-2.20140311-r4.ebuild, selinux-inn-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-inn-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20140311-r3.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20140311-r3.ebuild
index ff7e4b48bbca..435c2f75a41a 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/selinux-inn-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/selinux-inn-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:02 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for inn"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20140311-r4.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..ef564083c060
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inn/selinux-inn-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:02 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="inn"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ipsec/ChangeLog b/sec-policy/selinux-ipsec/ChangeLog
index 32320c838972..3fba67fa5e60 100644
--- a/sec-policy/selinux-ipsec/ChangeLog
+++ b/sec-policy/selinux-ipsec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ipsec
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/ChangeLog,v 1.37 2014/05/29 20:23:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/ChangeLog,v 1.38 2014/08/01 21:04:19 swift Exp $
+
+*selinux-ipsec-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ipsec-2.20140311-r4.ebuild, selinux-ipsec-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ipsec-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r3.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r3.ebuild
index 518c98e38706..df1db22ececa 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:45 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:19 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ipsec"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r4.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..57a1908f69eb
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ipsec/selinux-ipsec-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ipsec"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-irc/ChangeLog b/sec-policy/selinux-irc/ChangeLog
index 5d7d19ea4582..66695bf7ff16 100644
--- a/sec-policy/selinux-irc/ChangeLog
+++ b/sec-policy/selinux-irc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-irc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/ChangeLog,v 1.35 2014/05/29 20:22:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/ChangeLog,v 1.36 2014/08/01 21:04:01 swift Exp $
+
+*selinux-irc-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-irc-2.20140311-r4.ebuild, selinux-irc-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-irc-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20140311-r3.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20140311-r3.ebuild
index fe0aa543ca0e..3ab67f39f20b 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/selinux-irc-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/selinux-irc-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:01 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20140311-r4.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..75a13227383d
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irc/selinux-irc-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:01 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="irc"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ircd/ChangeLog b/sec-policy/selinux-ircd/ChangeLog
index 24eedaa01378..3724dfa9a2a9 100644
--- a/sec-policy/selinux-ircd/ChangeLog
+++ b/sec-policy/selinux-ircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ircd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/ChangeLog,v 1.39 2014/05/29 20:23:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/ChangeLog,v 1.40 2014/08/01 21:04:07 swift Exp $
+
+*selinux-ircd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ircd-2.20140311-r4.ebuild, selinux-ircd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ircd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r3.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r3.ebuild
index 6c42ca33bf0b..54dff36616fe 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:07 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ircd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r4.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e804eaf8184d
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ircd/selinux-ircd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ircd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-irqbalance/ChangeLog b/sec-policy/selinux-irqbalance/ChangeLog
index 03f6f292d91f..00d83762f22e 100644
--- a/sec-policy/selinux-irqbalance/ChangeLog
+++ b/sec-policy/selinux-irqbalance/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-irqbalance
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/ChangeLog,v 1.39 2014/05/29 20:23:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/ChangeLog,v 1.40 2014/08/01 21:04:26 swift Exp $
+
+*selinux-irqbalance-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-irqbalance-2.20140311-r4.ebuild,
+  selinux-irqbalance-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-irqbalance-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r3.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r3.ebuild
index 5a2fe08ab143..70cd0d33214f 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:26 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for irqbalance"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r4.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6ed4455a1dcb
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="irqbalance"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-jabber/ChangeLog b/sec-policy/selinux-jabber/ChangeLog
index 4e3bb85e2b9d..05fe060c423f 100644
--- a/sec-policy/selinux-jabber/ChangeLog
+++ b/sec-policy/selinux-jabber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-jabber
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/ChangeLog,v 1.36 2014/05/29 20:23:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/ChangeLog,v 1.37 2014/08/01 21:04:14 swift Exp $
+
+*selinux-jabber-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-jabber-2.20140311-r4.ebuild, selinux-jabber-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-jabber-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r3.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r3.ebuild
index ed1bbbffd770..3561f230006e 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:14 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for jabber"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r4.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..66a5e9d7fbbf
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-jabber/selinux-jabber-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="jabber"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-java/ChangeLog b/sec-policy/selinux-java/ChangeLog
index 230309e75274..e20be48ad2a3 100644
--- a/sec-policy/selinux-java/ChangeLog
+++ b/sec-policy/selinux-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-java
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/ChangeLog,v 1.42 2014/05/29 20:23:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/ChangeLog,v 1.43 2014/08/01 21:04:11 swift Exp $
+
+*selinux-java-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-java-2.20140311-r4.ebuild, selinux-java-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-java-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-java/selinux-java-2.20140311-r3.ebuild b/sec-policy/selinux-java/selinux-java-2.20140311-r3.ebuild
index 49f67f417f7d..2e962a107f46 100644
--- a/sec-policy/selinux-java/selinux-java-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/selinux-java-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/selinux-java-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:11 swift Exp $
 EAPI="5"
 
 IUSE="alsa"
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for java"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-java/selinux-java-2.20140311-r4.ebuild b/sec-policy/selinux-java/selinux-java-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2671e6646df2
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-java/selinux-java-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:11 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="java"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kdump/ChangeLog b/sec-policy/selinux-kdump/ChangeLog
index cefba1ae8357..27541d41b8a9 100644
--- a/sec-policy/selinux-kdump/ChangeLog
+++ b/sec-policy/selinux-kdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kdump
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/ChangeLog,v 1.39 2014/05/29 20:23:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/ChangeLog,v 1.40 2014/08/01 21:04:24 swift Exp $
+
+*selinux-kdump-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kdump-2.20140311-r4.ebuild, selinux-kdump-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-kdump-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r3.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r3.ebuild
index 77827dc13c93..7908becf7730 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:24 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kdump"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r4.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d4f19bd7b905
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kdump/selinux-kdump-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kdump"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kerberos/ChangeLog b/sec-policy/selinux-kerberos/ChangeLog
index 1054119ed2ae..1bf979451174 100644
--- a/sec-policy/selinux-kerberos/ChangeLog
+++ b/sec-policy/selinux-kerberos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kerberos
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/ChangeLog,v 1.55 2014/05/29 20:23:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/ChangeLog,v 1.56 2014/08/01 21:04:25 swift Exp $
+
+*selinux-kerberos-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kerberos-2.20140311-r4.ebuild, selinux-kerberos-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-kerberos-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r3.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r3.ebuild
index 2df359f4e649..a379148f5a6f 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:25 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerberos"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r4.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..800aa63cf34b
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerberos/selinux-kerberos-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kerberos"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kerneloops/ChangeLog b/sec-policy/selinux-kerneloops/ChangeLog
index aa8091d6f53b..467eebd6bb03 100644
--- a/sec-policy/selinux-kerneloops/ChangeLog
+++ b/sec-policy/selinux-kerneloops/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-kerneloops
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/ChangeLog,v 1.39 2014/05/29 20:23:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/ChangeLog,v 1.40 2014/08/01 21:04:43 swift Exp $
+
+*selinux-kerneloops-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kerneloops-2.20140311-r4.ebuild,
+  selinux-kerneloops-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-kerneloops-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r3.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r3.ebuild
index 9e1696ee36d8..5ef18d4f0fda 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:43 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kerneloops"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r4.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..89eca3608a13
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:43 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kerneloops"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kismet/ChangeLog b/sec-policy/selinux-kismet/ChangeLog
index 8366dda69bd2..461f896646dc 100644
--- a/sec-policy/selinux-kismet/ChangeLog
+++ b/sec-policy/selinux-kismet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kismet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/ChangeLog,v 1.39 2014/05/29 20:23:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/ChangeLog,v 1.40 2014/08/01 21:04:05 swift Exp $
+
+*selinux-kismet-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kismet-2.20140311-r4.ebuild, selinux-kismet-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-kismet-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r3.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r3.ebuild
index 117233bb5ea9..6f36cd8727f1 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:05 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kismet"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r4.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3962b6ef3dea
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kismet/selinux-kismet-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kismet"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ksmtuned/ChangeLog b/sec-policy/selinux-ksmtuned/ChangeLog
index 97512ea03dfa..14e9b45f29f8 100644
--- a/sec-policy/selinux-ksmtuned/ChangeLog
+++ b/sec-policy/selinux-ksmtuned/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ksmtuned
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/ChangeLog,v 1.39 2014/05/29 20:23:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/ChangeLog,v 1.40 2014/08/01 21:04:01 swift Exp $
+
+*selinux-ksmtuned-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ksmtuned-2.20140311-r4.ebuild, selinux-ksmtuned-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ksmtuned-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r3.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r3.ebuild
index 9413eacb0a08..f8d5bc7d928e 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:01 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ksmtuned"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r4.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..ea9179f78da7
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:01 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ksmtuned"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-kudzu/ChangeLog b/sec-policy/selinux-kudzu/ChangeLog
index b8e8d412df51..270fbadb6c56 100644
--- a/sec-policy/selinux-kudzu/ChangeLog
+++ b/sec-policy/selinux-kudzu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-kudzu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/ChangeLog,v 1.39 2014/05/29 20:23:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/ChangeLog,v 1.40 2014/08/01 21:04:19 swift Exp $
+
+*selinux-kudzu-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-kudzu-2.20140311-r4.ebuild, selinux-kudzu-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-kudzu-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r3.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r3.ebuild
index daca30cde1ed..f1a823417f64 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:19 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for kudzu"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r4.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..885f3a914e86
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-kudzu/selinux-kudzu-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="kudzu"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ldap/ChangeLog b/sec-policy/selinux-ldap/ChangeLog
index 5afeda8ad3d3..2623f5b03286 100644
--- a/sec-policy/selinux-ldap/ChangeLog
+++ b/sec-policy/selinux-ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/ChangeLog,v 1.40 2014/05/29 20:23:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/ChangeLog,v 1.41 2014/08/01 21:04:46 swift Exp $
+
+*selinux-ldap-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ldap-2.20140311-r4.ebuild, selinux-ldap-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ldap-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r3.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r3.ebuild
index 39b615027f06..0b22f03c86b5 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:46 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ldap"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r4.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7bf2a948a75b
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ldap/selinux-ldap-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ldap"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-links/ChangeLog b/sec-policy/selinux-links/ChangeLog
index bedc992e1a90..db0a7d71fc7d 100644
--- a/sec-policy/selinux-links/ChangeLog
+++ b/sec-policy/selinux-links/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-links
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/ChangeLog,v 1.39 2014/05/29 20:23:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/ChangeLog,v 1.40 2014/08/01 21:04:27 swift Exp $
+
+*selinux-links-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-links-2.20140311-r4.ebuild, selinux-links-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-links-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-links/selinux-links-2.20140311-r3.ebuild b/sec-policy/selinux-links/selinux-links-2.20140311-r3.ebuild
index feefcbcd8d9d..7e6cbce3d921 100644
--- a/sec-policy/selinux-links/selinux-links-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/selinux-links-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/selinux-links-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:27 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for links"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-links/selinux-links-2.20140311-r4.ebuild b/sec-policy/selinux-links/selinux-links-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..a6e3df27c07e
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-links/selinux-links-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="links"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lircd/ChangeLog b/sec-policy/selinux-lircd/ChangeLog
index 6fe13f493847..520030caacbc 100644
--- a/sec-policy/selinux-lircd/ChangeLog
+++ b/sec-policy/selinux-lircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-lircd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/ChangeLog,v 1.39 2014/05/29 20:23:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/ChangeLog,v 1.40 2014/08/01 21:04:46 swift Exp $
+
+*selinux-lircd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-lircd-2.20140311-r4.ebuild, selinux-lircd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-lircd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r3.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r3.ebuild
index 8a139cccb028..f544b435151c 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:46 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lircd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r4.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3fadcb84093d
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lircd/selinux-lircd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="lircd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-loadkeys/ChangeLog b/sec-policy/selinux-loadkeys/ChangeLog
index 276eed3485d8..25af541b893c 100644
--- a/sec-policy/selinux-loadkeys/ChangeLog
+++ b/sec-policy/selinux-loadkeys/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-loadkeys
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/ChangeLog,v 1.39 2014/05/29 20:23:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/ChangeLog,v 1.40 2014/08/01 21:04:15 swift Exp $
+
+*selinux-loadkeys-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-loadkeys-2.20140311-r4.ebuild, selinux-loadkeys-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-loadkeys-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r3.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r3.ebuild
index 3989f2df18d1..1df30c587dcc 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:15 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for loadkeys"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r4.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b5338461c74c
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="loadkeys"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lockdev/ChangeLog b/sec-policy/selinux-lockdev/ChangeLog
index 2f8c93fe38da..2dd7f9d47b25 100644
--- a/sec-policy/selinux-lockdev/ChangeLog
+++ b/sec-policy/selinux-lockdev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-lockdev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/ChangeLog,v 1.39 2014/05/29 20:23:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/ChangeLog,v 1.40 2014/08/01 21:04:29 swift Exp $
+
+*selinux-lockdev-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-lockdev-2.20140311-r4.ebuild, selinux-lockdev-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-lockdev-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r3.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r3.ebuild
index 0a34af036db3..d280ad2d071d 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:29 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lockdev"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r4.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e95cd2a3ff80
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lockdev/selinux-lockdev-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="lockdev"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logrotate/ChangeLog b/sec-policy/selinux-logrotate/ChangeLog
index ae72259d3b9e..c35bd8485043 100644
--- a/sec-policy/selinux-logrotate/ChangeLog
+++ b/sec-policy/selinux-logrotate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-logrotate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/ChangeLog,v 1.65 2014/05/29 20:23:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/ChangeLog,v 1.66 2014/08/01 21:04:30 swift Exp $
+
+*selinux-logrotate-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-logrotate-2.20140311-r4.ebuild,
+  selinux-logrotate-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-logrotate-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r3.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r3.ebuild
index 88d1c00d6e74..72bbb109678d 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:30 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logrotate"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r4.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d3e50d7f89a1
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logrotate/selinux-logrotate-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="logrotate"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logsentry/ChangeLog b/sec-policy/selinux-logsentry/ChangeLog
index ef66fc8c04d6..db6f68b4821f 100644
--- a/sec-policy/selinux-logsentry/ChangeLog
+++ b/sec-policy/selinux-logsentry/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-logsentry
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/ChangeLog,v 1.23 2014/05/29 20:23:14 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/ChangeLog,v 1.24 2014/08/01 21:04:07 swift Exp $
+
+*selinux-logsentry-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-logsentry-2.20140311-r4.ebuild,
+  selinux-logsentry-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-logsentry-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r3.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r3.ebuild
index ead020df918b..efa2ac73b601 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:07 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logsentry"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r4.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5b7d62e4cfdd
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logsentry/selinux-logsentry-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="logsentry"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-logwatch/ChangeLog b/sec-policy/selinux-logwatch/ChangeLog
index 17ee7fd8b948..1b98c6432de6 100644
--- a/sec-policy/selinux-logwatch/ChangeLog
+++ b/sec-policy/selinux-logwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-logwatch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/ChangeLog,v 1.39 2014/05/29 20:23:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/ChangeLog,v 1.40 2014/08/01 21:04:32 swift Exp $
+
+*selinux-logwatch-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-logwatch-2.20140311-r4.ebuild, selinux-logwatch-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-logwatch-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r3.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r3.ebuild
index 1673f82aec71..8f180cd4ea6b 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:32 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for logwatch"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r4.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..556b4fc3545c
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-logwatch/selinux-logwatch-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="logwatch"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-lpd/ChangeLog b/sec-policy/selinux-lpd/ChangeLog
index abc4192b9f12..c02089eff4de 100644
--- a/sec-policy/selinux-lpd/ChangeLog
+++ b/sec-policy/selinux-lpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-lpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/ChangeLog,v 1.48 2014/05/29 20:23:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/ChangeLog,v 1.49 2014/08/01 21:04:38 swift Exp $
+
+*selinux-lpd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-lpd-2.20140311-r4.ebuild, selinux-lpd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-lpd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r3.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r3.ebuild
index 5a9492e93c9d..78bed66590a8 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:38 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for lpd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r4.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5869ebccf3c6
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-lpd/selinux-lpd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="lpd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mailman/ChangeLog b/sec-policy/selinux-mailman/ChangeLog
index 0789166b9007..f70f6a339c6f 100644
--- a/sec-policy/selinux-mailman/ChangeLog
+++ b/sec-policy/selinux-mailman/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mailman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/ChangeLog,v 1.40 2014/05/29 20:23:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/ChangeLog,v 1.41 2014/08/01 21:04:23 swift Exp $
+
+*selinux-mailman-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mailman-2.20140311-r4.ebuild, selinux-mailman-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mailman-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r3.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r3.ebuild
index ad5dd770af73..01aef540db3d 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:23 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mailman"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r4.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..fadaadeb144d
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mailman/selinux-mailman-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mailman"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-makewhatis/ChangeLog b/sec-policy/selinux-makewhatis/ChangeLog
index b9bce5fe5387..5a7d5d123a99 100644
--- a/sec-policy/selinux-makewhatis/ChangeLog
+++ b/sec-policy/selinux-makewhatis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-makewhatis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/ChangeLog,v 1.23 2014/05/29 20:23:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/ChangeLog,v 1.24 2014/08/01 21:04:15 swift Exp $
+
+*selinux-makewhatis-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-makewhatis-2.20140311-r4.ebuild,
+  selinux-makewhatis-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-makewhatis-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r3.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r3.ebuild
index 7ea4b37d8c19..25870aa3dafa 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:15 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for makewhatis"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r4.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f7883b2d31ea
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="makewhatis"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mandb/ChangeLog b/sec-policy/selinux-mandb/ChangeLog
index 342ae4a79f63..fddd673b8c8a 100644
--- a/sec-policy/selinux-mandb/ChangeLog
+++ b/sec-policy/selinux-mandb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mandb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mandb/ChangeLog,v 1.8 2014/05/29 20:23:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mandb/ChangeLog,v 1.9 2014/08/01 21:04:12 swift Exp $
+
+*selinux-mandb-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mandb-2.20140311-r4.ebuild, selinux-mandb-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mandb-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r3.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r3.ebuild
index d9838cbb0fa6..c01221d0da8c 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:12 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mandb"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r4.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..24813cf298cf
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mandb/selinux-mandb-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mandb"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mandb"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mcelog/ChangeLog b/sec-policy/selinux-mcelog/ChangeLog
index 3480eda043e9..98773f458154 100644
--- a/sec-policy/selinux-mcelog/ChangeLog
+++ b/sec-policy/selinux-mcelog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mcelog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/ChangeLog,v 1.39 2014/05/29 20:23:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/ChangeLog,v 1.40 2014/08/01 21:04:40 swift Exp $
+
+*selinux-mcelog-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mcelog-2.20140311-r4.ebuild, selinux-mcelog-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mcelog-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r3.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r3.ebuild
index a66633ca284b..1cfbf7159454 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:40 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mcelog"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r4.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..91965e46d40b
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mcelog/selinux-mcelog-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mcelog"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-memcached/ChangeLog b/sec-policy/selinux-memcached/ChangeLog
index 108a9a061c10..adc5970e6a47 100644
--- a/sec-policy/selinux-memcached/ChangeLog
+++ b/sec-policy/selinux-memcached/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-memcached
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/ChangeLog,v 1.39 2014/05/29 20:23:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/ChangeLog,v 1.40 2014/08/01 21:04:32 swift Exp $
+
+*selinux-memcached-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-memcached-2.20140311-r4.ebuild,
+  selinux-memcached-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-memcached-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r3.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r3.ebuild
index 2e2c0874a20a..299fcd67e8b0 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:32 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for memcached"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r4.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2a62c0bf4e1d
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-memcached/selinux-memcached-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="memcached"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-milter/ChangeLog b/sec-policy/selinux-milter/ChangeLog
index dc36ef8db88b..92dc586363d8 100644
--- a/sec-policy/selinux-milter/ChangeLog
+++ b/sec-policy/selinux-milter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-milter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/ChangeLog,v 1.39 2014/05/29 20:23:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/ChangeLog,v 1.40 2014/08/01 21:04:10 swift Exp $
+
+*selinux-milter-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-milter-2.20140311-r4.ebuild, selinux-milter-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-milter-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20140311-r3.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20140311-r3.ebuild
index 7c58664d6b22..5db49a555563 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/selinux-milter-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/selinux-milter-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:10 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for milter"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20140311-r4.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..023902b65661
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-milter/selinux-milter-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="milter"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-modemmanager/ChangeLog b/sec-policy/selinux-modemmanager/ChangeLog
index dccad27336de..32512f2ca880 100644
--- a/sec-policy/selinux-modemmanager/ChangeLog
+++ b/sec-policy/selinux-modemmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-modemmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/ChangeLog,v 1.39 2014/05/29 20:23:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/ChangeLog,v 1.40 2014/08/01 21:04:24 swift Exp $
+
+*selinux-modemmanager-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-modemmanager-2.20140311-r4.ebuild,
+  selinux-modemmanager-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-modemmanager-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r3.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r3.ebuild
index b95f243a6112..0587a43a610a 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:24 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for modemmanager"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
 	sec-policy/selinux-networkmanager
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r4.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..bd699f5c6fbf
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="modemmanager"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+	sec-policy/selinux-networkmanager
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mono/ChangeLog b/sec-policy/selinux-mono/ChangeLog
index aa951386e501..af6dc5cfca34 100644
--- a/sec-policy/selinux-mono/ChangeLog
+++ b/sec-policy/selinux-mono/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mono
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/ChangeLog,v 1.39 2014/05/29 20:23:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/ChangeLog,v 1.40 2014/08/01 21:04:34 swift Exp $
+
+*selinux-mono-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mono-2.20140311-r4.ebuild, selinux-mono-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mono-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20140311-r3.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20140311-r3.ebuild
index 34e4e99ceb22..37cd0b8cf530 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/selinux-mono-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/selinux-mono-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:34 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mono"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20140311-r4.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6368794f544f
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mono/selinux-mono-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mono"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mozilla/ChangeLog b/sec-policy/selinux-mozilla/ChangeLog
index 383785f1e67b..5b2f21588b72 100644
--- a/sec-policy/selinux-mozilla/ChangeLog
+++ b/sec-policy/selinux-mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mozilla
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.57 2014/05/29 20:23:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.58 2014/08/01 21:04:21 swift Exp $
+
+*selinux-mozilla-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mozilla-2.20140311-r4.ebuild, selinux-mozilla-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mozilla-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r3.ebuild
index 98723b136a7d..d2288a7b70a3 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:21 swift Exp $
 EAPI="5"
 
 IUSE="alsa"
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
 "
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r4.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..70ce2fbf3a47
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:21 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="mozilla"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mpd/ChangeLog b/sec-policy/selinux-mpd/ChangeLog
index a31ab6dd4814..edfb1a4b921a 100644
--- a/sec-policy/selinux-mpd/ChangeLog
+++ b/sec-policy/selinux-mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/ChangeLog,v 1.37 2014/05/29 20:23:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/ChangeLog,v 1.38 2014/08/01 21:03:56 swift Exp $
+
+*selinux-mpd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mpd-2.20140311-r4.ebuild, selinux-mpd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mpd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r3.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r3.ebuild
index c0fda690ad21..6b42ae187747 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:56 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mpd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r4.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7287f4ed8ee2
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/selinux-mpd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:56 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mpd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mplayer/ChangeLog b/sec-policy/selinux-mplayer/ChangeLog
index 41d0e92a4320..3a2b952ef845 100644
--- a/sec-policy/selinux-mplayer/ChangeLog
+++ b/sec-policy/selinux-mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/ChangeLog,v 1.41 2014/05/29 20:23:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/ChangeLog,v 1.42 2014/08/01 21:04:15 swift Exp $
+
+*selinux-mplayer-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mplayer-2.20140311-r4.ebuild, selinux-mplayer-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mplayer-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r3.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r3.ebuild
index d6fff31392a0..28c748f6d50f 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:15 swift Exp $
 EAPI="5"
 
 IUSE="alsa"
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mplayer"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r4.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5fb61890857d
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mplayer/selinux-mplayer-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:15 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="mplayer"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mrtg/ChangeLog b/sec-policy/selinux-mrtg/ChangeLog
index c073e28e49f4..49cd7609e923 100644
--- a/sec-policy/selinux-mrtg/ChangeLog
+++ b/sec-policy/selinux-mrtg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mrtg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/ChangeLog,v 1.39 2014/05/29 20:23:14 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/ChangeLog,v 1.40 2014/08/01 21:04:09 swift Exp $
+
+*selinux-mrtg-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mrtg-2.20140311-r4.ebuild, selinux-mrtg-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mrtg-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r3.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r3.ebuild
index 50335f82efa3..27587c4bc27c 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:09 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mrtg"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r4.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0f6261ea746f
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mrtg/selinux-mrtg-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mrtg"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-munin/ChangeLog b/sec-policy/selinux-munin/ChangeLog
index aab852a9cf65..f36eeead3763 100644
--- a/sec-policy/selinux-munin/ChangeLog
+++ b/sec-policy/selinux-munin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-munin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/ChangeLog,v 1.50 2014/05/29 20:23:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/ChangeLog,v 1.51 2014/08/01 21:04:31 swift Exp $
+
+*selinux-munin-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-munin-2.20140311-r4.ebuild, selinux-munin-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-munin-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20140311-r3.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20140311-r3.ebuild
index b583bc52d01e..d039875b4844 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/selinux-munin-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/selinux-munin-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:31 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for munin"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20140311-r4.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..190065ba7344
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-munin/selinux-munin-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="munin"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-mutt/ChangeLog b/sec-policy/selinux-mutt/ChangeLog
index 85b8d38f32d0..96fade019cb5 100644
--- a/sec-policy/selinux-mutt/ChangeLog
+++ b/sec-policy/selinux-mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mutt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/ChangeLog,v 1.45 2014/05/29 20:23:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/ChangeLog,v 1.46 2014/08/01 21:04:33 swift Exp $
+
+*selinux-mutt-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mutt-2.20140311-r4.ebuild, selinux-mutt-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mutt-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r3.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r3.ebuild
index 81658003c9e4..303f229e1660 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:33 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mutt"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r4.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3ab54be2692e
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mutt/selinux-mutt-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mutt"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mysql/ChangeLog b/sec-policy/selinux-mysql/ChangeLog
index 1fa7d99db6c9..43b39d4bb647 100644
--- a/sec-policy/selinux-mysql/ChangeLog
+++ b/sec-policy/selinux-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.72 2014/05/29 20:23:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/ChangeLog,v 1.73 2014/08/01 21:04:40 swift Exp $
+
+*selinux-mysql-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-mysql-2.20140311-r4.ebuild, selinux-mysql-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-mysql-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r3.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r3.ebuild
index ec517fdacc83..b82b25cb2b9b 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:40 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mysql"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r4.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e1666db2df0b
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mysql/selinux-mysql-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="mysql"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nagios/ChangeLog b/sec-policy/selinux-nagios/ChangeLog
index be92f1e2abe2..4f8bef01fc20 100644
--- a/sec-policy/selinux-nagios/ChangeLog
+++ b/sec-policy/selinux-nagios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nagios
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/ChangeLog,v 1.43 2014/05/29 20:23:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/ChangeLog,v 1.44 2014/08/01 21:04:13 swift Exp $
+
+*selinux-nagios-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nagios-2.20140311-r4.ebuild, selinux-nagios-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-nagios-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild
index 64f66c77d911..ed56ae4fd096 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:13 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nagios"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2ff966bba5eb
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nagios/selinux-nagios-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nagios"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-ncftool/ChangeLog b/sec-policy/selinux-ncftool/ChangeLog
index 8f9e73969dc4..b0fe1ce1a12d 100644
--- a/sec-policy/selinux-ncftool/ChangeLog
+++ b/sec-policy/selinux-ncftool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ncftool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/ChangeLog,v 1.37 2014/05/29 20:23:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/ChangeLog,v 1.38 2014/08/01 21:04:10 swift Exp $
+
+*selinux-ncftool-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ncftool-2.20140311-r4.ebuild, selinux-ncftool-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ncftool-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r3.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r3.ebuild
index ef64b7a9a38d..3a510a03cafd 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:10 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ncftool"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r4.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1ba60a38a473
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/selinux-ncftool-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ncftool"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nessus/ChangeLog b/sec-policy/selinux-nessus/ChangeLog
index 8c831728f056..329d2c6117d3 100644
--- a/sec-policy/selinux-nessus/ChangeLog
+++ b/sec-policy/selinux-nessus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nessus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/ChangeLog,v 1.40 2014/05/29 20:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/ChangeLog,v 1.41 2014/08/01 21:04:39 swift Exp $
+
+*selinux-nessus-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nessus-2.20140311-r4.ebuild, selinux-nessus-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-nessus-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r3.ebuild
index 1bd0581f86ba..8c985c584d93 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:39 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nessus"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r4.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6184fbbe8df3
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nessus/selinux-nessus-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nessus"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-networkmanager/ChangeLog b/sec-policy/selinux-networkmanager/ChangeLog
index 044af95a0dc0..11e328bc2b37 100644
--- a/sec-policy/selinux-networkmanager/ChangeLog
+++ b/sec-policy/selinux-networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-networkmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/ChangeLog,v 1.44 2014/05/29 20:23:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/ChangeLog,v 1.45 2014/08/01 21:04:28 swift Exp $
+
+*selinux-networkmanager-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-networkmanager-2.20140311-r4.ebuild,
+  selinux-networkmanager-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-networkmanager-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r3.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r3.ebuild
index be1704e0720d..c72fb5ca7bb1 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:28 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for networkmanager"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r4.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..99b843308acb
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="networkmanager"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nginx/ChangeLog b/sec-policy/selinux-nginx/ChangeLog
index 7eebe1324183..acbd1a51238c 100644
--- a/sec-policy/selinux-nginx/ChangeLog
+++ b/sec-policy/selinux-nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nginx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/ChangeLog,v 1.39 2014/05/29 20:23:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/ChangeLog,v 1.40 2014/08/01 21:04:06 swift Exp $
+
+*selinux-nginx-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nginx-2.20140311-r4.ebuild, selinux-nginx-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-nginx-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r3.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r3.ebuild
index c7df3369b7f6..d400ab84798b 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:06 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nginx"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r4.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..8e4515a5847e
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nginx"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-nslcd/ChangeLog b/sec-policy/selinux-nslcd/ChangeLog
index 55bba499a53e..a48b64e7d5d0 100644
--- a/sec-policy/selinux-nslcd/ChangeLog
+++ b/sec-policy/selinux-nslcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nslcd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/ChangeLog,v 1.28 2014/05/29 20:23:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/ChangeLog,v 1.29 2014/08/01 21:04:12 swift Exp $
+
+*selinux-nslcd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nslcd-2.20140311-r4.ebuild, selinux-nslcd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-nslcd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r3.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r3.ebuild
index 2f1aea8e4a84..c10b923426a4 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:12 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nslcd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r4.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6493a46a4354
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nslcd/selinux-nslcd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nslcd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ntop/ChangeLog b/sec-policy/selinux-ntop/ChangeLog
index cabbf20dea3e..b89e10686b79 100644
--- a/sec-policy/selinux-ntop/ChangeLog
+++ b/sec-policy/selinux-ntop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ntop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/ChangeLog,v 1.59 2014/05/29 20:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/ChangeLog,v 1.60 2014/08/01 21:04:05 swift Exp $
+
+*selinux-ntop-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ntop-2.20140311-r4.ebuild, selinux-ntop-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ntop-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r3.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r3.ebuild
index aab4522a769d..17e540264aab 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:05 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntop"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r4.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1b4b3f62c66b
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntop/selinux-ntop-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ntop"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ntp/ChangeLog b/sec-policy/selinux-ntp/ChangeLog
index 2679ac1afbfb..0a2aec5e03d6 100644
--- a/sec-policy/selinux-ntp/ChangeLog
+++ b/sec-policy/selinux-ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ntp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.73 2014/05/29 20:23:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/ChangeLog,v 1.74 2014/08/01 21:04:13 swift Exp $
+
+*selinux-ntp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ntp-2.20140311-r4.ebuild, selinux-ntp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ntp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r3.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r3.ebuild
index 17b111beac48..f70ebb9d0a1b 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:13 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ntp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r4.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7423ea489a98
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ntp/selinux-ntp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:13 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ntp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-nut/ChangeLog b/sec-policy/selinux-nut/ChangeLog
index 4490f862b2d7..a9668025e9ee 100644
--- a/sec-policy/selinux-nut/ChangeLog
+++ b/sec-policy/selinux-nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nut
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/ChangeLog,v 1.40 2014/05/29 20:23:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/ChangeLog,v 1.41 2014/08/01 21:04:29 swift Exp $
+
+*selinux-nut-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nut-2.20140311-r4.ebuild, selinux-nut-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-nut-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20140311-r3.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20140311-r3.ebuild
index eb28e9440133..271ac9064a15 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/selinux-nut-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/selinux-nut-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:29 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nut"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20140311-r4.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..33be048a7336
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/selinux-nut-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nut"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-nx/ChangeLog b/sec-policy/selinux-nx/ChangeLog
index 3e7376618118..5d016b209116 100644
--- a/sec-policy/selinux-nx/ChangeLog
+++ b/sec-policy/selinux-nx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/ChangeLog,v 1.39 2014/05/29 20:23:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/ChangeLog,v 1.40 2014/08/01 21:04:15 swift Exp $
+
+*selinux-nx-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nx-2.20140311-r4.ebuild, selinux-nx-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-nx-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20140311-r3.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20140311-r3.ebuild
index f48c3daa77df..0e61e2ba6a69 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/selinux-nx-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/selinux-nx-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:15 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for nx"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20140311-r4.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4deaf1c246be
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nx/selinux-nx-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:15 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nx"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-oddjob/ChangeLog b/sec-policy/selinux-oddjob/ChangeLog
index c7cf78f9563c..b258384499bb 100644
--- a/sec-policy/selinux-oddjob/ChangeLog
+++ b/sec-policy/selinux-oddjob/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-oddjob
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/ChangeLog,v 1.37 2014/05/29 20:23:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/ChangeLog,v 1.38 2014/08/01 21:04:07 swift Exp $
+
+*selinux-oddjob-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-oddjob-2.20140311-r4.ebuild, selinux-oddjob-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-oddjob-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r3.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r3.ebuild
index 7a143140fcdd..0a163359c0b8 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:07 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oddjob"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r4.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f1f7cef2c540
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oddjob/selinux-oddjob-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="oddjob"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-oident/ChangeLog b/sec-policy/selinux-oident/ChangeLog
index ed1b48be5097..a58b4064b146 100644
--- a/sec-policy/selinux-oident/ChangeLog
+++ b/sec-policy/selinux-oident/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-oident
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/ChangeLog,v 1.37 2014/05/29 20:23:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/ChangeLog,v 1.38 2014/08/01 21:04:29 swift Exp $
+
+*selinux-oident-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-oident-2.20140311-r4.ebuild, selinux-oident-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-oident-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20140311-r3.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20140311-r3.ebuild
index 94a3e21f1e0a..888ecb7fdf96 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/selinux-oident-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:46 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/selinux-oident-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:29 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for oident"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20140311-r4.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..df3d0f766bd5
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-oident/selinux-oident-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="oident"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openct/ChangeLog b/sec-policy/selinux-openct/ChangeLog
index 20fe767e19c4..bbfd378f577c 100644
--- a/sec-policy/selinux-openct/ChangeLog
+++ b/sec-policy/selinux-openct/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-openct
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/ChangeLog,v 1.39 2014/05/29 20:23:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/ChangeLog,v 1.40 2014/08/01 21:04:27 swift Exp $
+
+*selinux-openct-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-openct-2.20140311-r4.ebuild, selinux-openct-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-openct-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20140311-r3.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20140311-r3.ebuild
index 96c9ab234c58..17c0a0287eb2 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/selinux-openct-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/selinux-openct-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:27 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openct"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20140311-r4.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..ace71f67f16b
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openct/selinux-openct-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="openct"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openrc/ChangeLog b/sec-policy/selinux-openrc/ChangeLog
index 33f66031b41a..f6473e585ad9 100644
--- a/sec-policy/selinux-openrc/ChangeLog
+++ b/sec-policy/selinux-openrc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-openrc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/ChangeLog,v 1.21 2014/05/29 20:23:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/ChangeLog,v 1.22 2014/08/01 21:04:03 swift Exp $
+
+*selinux-openrc-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-openrc-2.20140311-r4.ebuild, selinux-openrc-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-openrc-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r3.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r3.ebuild
index 625579416504..eef03cebc00f 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:03 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openrc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r4.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6aa81a84505d
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openrc/selinux-openrc-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="openrc"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-openvpn/ChangeLog b/sec-policy/selinux-openvpn/ChangeLog
index 9d1b04c68103..bb1dbf2342fe 100644
--- a/sec-policy/selinux-openvpn/ChangeLog
+++ b/sec-policy/selinux-openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-openvpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/ChangeLog,v 1.56 2014/05/29 20:23:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/ChangeLog,v 1.57 2014/08/01 21:04:14 swift Exp $
+
+*selinux-openvpn-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-openvpn-2.20140311-r4.ebuild, selinux-openvpn-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-openvpn-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r3.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r3.ebuild
index 15df5a675532..f0e16e3eba37 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:14 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for openvpn"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r4.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..8184a70735d0
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-openvpn/selinux-openvpn-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="openvpn"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pan/ChangeLog b/sec-policy/selinux-pan/ChangeLog
index f92b546ac472..0b3d225425bb 100644
--- a/sec-policy/selinux-pan/ChangeLog
+++ b/sec-policy/selinux-pan/ChangeLog
@@ -1,4 +1,10 @@
 
+*selinux-pan-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pan-2.20140311-r4.ebuild, selinux-pan-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
+
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-pan-2.20140311-r2.ebuild:
   Stabilize 2.20140311-r2
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20140311-r3.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20140311-r3.ebuild
index 01133cbaaac6..f2790079010f 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pan/selinux-pan-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pan/selinux-pan-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:05 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
 "
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20140311-r4.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1d7b75124e76
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pan/selinux-pan-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pan"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-pcmcia/ChangeLog b/sec-policy/selinux-pcmcia/ChangeLog
index 6bd82b7b54f6..4609eabc0f83 100644
--- a/sec-policy/selinux-pcmcia/ChangeLog
+++ b/sec-policy/selinux-pcmcia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pcmcia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/ChangeLog,v 1.51 2014/05/29 20:23:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/ChangeLog,v 1.52 2014/08/01 21:04:02 swift Exp $
+
+*selinux-pcmcia-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pcmcia-2.20140311-r4.ebuild, selinux-pcmcia-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-pcmcia-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r3.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r3.ebuild
index 2516ff45dcda..d42dcf922bde 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:02 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcmcia"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r4.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..755310578114
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:02 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pcmcia"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pcscd/ChangeLog b/sec-policy/selinux-pcscd/ChangeLog
index 980891cc5c20..b0e3cb12041a 100644
--- a/sec-policy/selinux-pcscd/ChangeLog
+++ b/sec-policy/selinux-pcscd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pcscd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcscd/ChangeLog,v 1.8 2014/05/29 20:23:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcscd/ChangeLog,v 1.9 2014/08/01 21:03:58 swift Exp $
+
+*selinux-pcscd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pcscd-2.20140311-r4.ebuild, selinux-pcscd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-pcscd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r3.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r3.ebuild
index 72e26508ef19..982ba5c4f7b7 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:58 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pcscd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r4.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7ee60a3045a9
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pcscd/selinux-pcscd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:58 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pcscd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcscd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-perdition/ChangeLog b/sec-policy/selinux-perdition/ChangeLog
index fbb1035000c3..6d7306346d69 100644
--- a/sec-policy/selinux-perdition/ChangeLog
+++ b/sec-policy/selinux-perdition/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-perdition
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/ChangeLog,v 1.39 2014/05/29 20:23:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/ChangeLog,v 1.40 2014/08/01 21:04:26 swift Exp $
+
+*selinux-perdition-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-perdition-2.20140311-r4.ebuild,
+  selinux-perdition-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-perdition-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r3.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r3.ebuild
index 58d34da5abb0..380ace66880f 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:26 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for perdition"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r4.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..67eb832f0017
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-perdition/selinux-perdition-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="perdition"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-phpfpm/ChangeLog b/sec-policy/selinux-phpfpm/ChangeLog
index 18f0c56d1db8..a8710f05c476 100644
--- a/sec-policy/selinux-phpfpm/ChangeLog
+++ b/sec-policy/selinux-phpfpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-phpfpm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/ChangeLog,v 1.30 2014/05/29 20:22:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/ChangeLog,v 1.31 2014/08/01 21:04:33 swift Exp $
+
+*selinux-phpfpm-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-phpfpm-2.20140311-r4.ebuild, selinux-phpfpm-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-phpfpm-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r3.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r3.ebuild
index 38bf2452169f..593f1d1ac8bd 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:33 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for phpfpm"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r4.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..8499153b3c3f
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="phpfpm"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-plymouthd/ChangeLog b/sec-policy/selinux-plymouthd/ChangeLog
index 2a569619e857..b6a5c255b96f 100644
--- a/sec-policy/selinux-plymouthd/ChangeLog
+++ b/sec-policy/selinux-plymouthd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-plymouthd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/ChangeLog,v 1.37 2014/05/29 20:23:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/ChangeLog,v 1.38 2014/08/01 21:04:31 swift Exp $
+
+*selinux-plymouthd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-plymouthd-2.20140311-r4.ebuild,
+  selinux-plymouthd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-plymouthd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r3.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r3.ebuild
index d71b0ac50ca5..78e59991e841 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:31 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for plymouthd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r4.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..ce56946b6b82
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="plymouthd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-podsleuth/ChangeLog b/sec-policy/selinux-podsleuth/ChangeLog
index 73b1c742fb1e..21f87a3b4094 100644
--- a/sec-policy/selinux-podsleuth/ChangeLog
+++ b/sec-policy/selinux-podsleuth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-podsleuth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/ChangeLog,v 1.39 2014/05/29 20:23:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/ChangeLog,v 1.40 2014/08/01 21:04:23 swift Exp $
+
+*selinux-podsleuth-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-podsleuth-2.20140311-r4.ebuild,
+  selinux-podsleuth-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-podsleuth-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r3.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r3.ebuild
index 106bbe78e545..2979c52f4030 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:23 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for podsleuth"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r4.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4e70c6be7112
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="podsleuth"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-policykit/ChangeLog b/sec-policy/selinux-policykit/ChangeLog
index 5a322e001d4b..e11aec7eeb53 100644
--- a/sec-policy/selinux-policykit/ChangeLog
+++ b/sec-policy/selinux-policykit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-policykit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/ChangeLog,v 1.39 2014/05/29 20:23:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/ChangeLog,v 1.40 2014/08/01 21:04:17 swift Exp $
+
+*selinux-policykit-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-policykit-2.20140311-r4.ebuild,
+  selinux-policykit-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-policykit-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r3.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r3.ebuild
index c5a64451c154..36f6e6ca95d4 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:17 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for policykit"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r4.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4aeaf2ce32d2
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-policykit/selinux-policykit-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:17 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="policykit"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-portmap/ChangeLog b/sec-policy/selinux-portmap/ChangeLog
index 481f26e07d70..f35f9b30f013 100644
--- a/sec-policy/selinux-portmap/ChangeLog
+++ b/sec-policy/selinux-portmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-portmap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/ChangeLog,v 1.61 2014/05/29 20:23:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/ChangeLog,v 1.62 2014/08/01 21:04:25 swift Exp $
+
+*selinux-portmap-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-portmap-2.20140311-r4.ebuild, selinux-portmap-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-portmap-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r3.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r3.ebuild
index d6479476b759..e40917d8f6c7 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:25 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for portmap"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r4.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..8a4ace9b5794
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-portmap/selinux-portmap-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="portmap"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postfix/ChangeLog b/sec-policy/selinux-postfix/ChangeLog
index f5c4ee2da142..ee3165d2df09 100644
--- a/sec-policy/selinux-postfix/ChangeLog
+++ b/sec-policy/selinux-postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postfix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.75 2014/05/29 20:23:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/ChangeLog,v 1.76 2014/08/01 21:04:31 swift Exp $
+
+*selinux-postfix-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-postfix-2.20140311-r4.ebuild, selinux-postfix-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-postfix-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r3.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r3.ebuild
index 220858421a39..a977f91d30df 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:31 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postfix"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r4.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..8e44bdb27a41
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postfix/selinux-postfix-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:31 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="postfix"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postgresql/ChangeLog b/sec-policy/selinux-postgresql/ChangeLog
index f9ff5ede14a6..b3439a561b95 100644
--- a/sec-policy/selinux-postgresql/ChangeLog
+++ b/sec-policy/selinux-postgresql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-postgresql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.69 2014/05/29 20:23:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/ChangeLog,v 1.70 2014/08/01 21:04:32 swift Exp $
+
+*selinux-postgresql-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-postgresql-2.20140311-r4.ebuild,
+  selinux-postgresql-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-postgresql-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r3.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r3.ebuild
index ceba9245d462..83bb04306e38 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:32 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgresql"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r4.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..773116d2cf85
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgresql/selinux-postgresql-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:32 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="postgresql"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-postgrey/ChangeLog b/sec-policy/selinux-postgrey/ChangeLog
index a32cbe7da188..28a0562e77b4 100644
--- a/sec-policy/selinux-postgrey/ChangeLog
+++ b/sec-policy/selinux-postgrey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-postgrey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/ChangeLog,v 1.39 2014/05/29 20:23:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/ChangeLog,v 1.40 2014/08/01 21:04:41 swift Exp $
+
+*selinux-postgrey-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-postgrey-2.20140311-r4.ebuild, selinux-postgrey-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-postgrey-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r3.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r3.ebuild
index e891c0b1ad7a..6b2f412f1291 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:41 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for postgrey"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r4.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..12c3660ee1ff
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-postgrey/selinux-postgrey-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="postgrey"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ppp/ChangeLog b/sec-policy/selinux-ppp/ChangeLog
index 81af8b1ba925..6d00c6bdf5ae 100644
--- a/sec-policy/selinux-ppp/ChangeLog
+++ b/sec-policy/selinux-ppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ppp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/ChangeLog,v 1.49 2014/05/29 20:23:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/ChangeLog,v 1.50 2014/08/01 21:04:36 swift Exp $
+
+*selinux-ppp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ppp-2.20140311-r4.ebuild, selinux-ppp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ppp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r3.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r3.ebuild
index 6755db28f14a..434927511d48 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:36 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ppp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r4.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..bb8980862d7e
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ppp/selinux-ppp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ppp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-prelink/ChangeLog b/sec-policy/selinux-prelink/ChangeLog
index ec7c1ce76934..873f91f82080 100644
--- a/sec-policy/selinux-prelink/ChangeLog
+++ b/sec-policy/selinux-prelink/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-prelink
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/ChangeLog,v 1.39 2014/05/29 20:23:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/ChangeLog,v 1.40 2014/08/01 21:04:24 swift Exp $
+
+*selinux-prelink-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-prelink-2.20140311-r4.ebuild, selinux-prelink-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-prelink-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r3.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r3.ebuild
index 2dc725b205c0..4fe15e4ff376 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:24 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelink"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r4.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..260cd9c32fbd
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelink/selinux-prelink-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="prelink"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-prelude/ChangeLog b/sec-policy/selinux-prelude/ChangeLog
index 6ec501f4c048..40da6b7184c3 100644
--- a/sec-policy/selinux-prelude/ChangeLog
+++ b/sec-policy/selinux-prelude/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-prelude
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/ChangeLog,v 1.40 2014/05/29 20:23:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/ChangeLog,v 1.41 2014/08/01 21:04:25 swift Exp $
+
+*selinux-prelude-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-prelude-2.20140311-r4.ebuild, selinux-prelude-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-prelude-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r3.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r3.ebuild
index 8992d6e5168a..944780c9f0a6 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:25 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for prelude"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r4.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..fa2b233dfcc3
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-prelude/selinux-prelude-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="prelude"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-privoxy/ChangeLog b/sec-policy/selinux-privoxy/ChangeLog
index ba233cc1d626..c4c4bee27e5a 100644
--- a/sec-policy/selinux-privoxy/ChangeLog
+++ b/sec-policy/selinux-privoxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-privoxy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/ChangeLog,v 1.56 2014/05/29 20:23:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/ChangeLog,v 1.57 2014/08/01 21:04:33 swift Exp $
+
+*selinux-privoxy-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-privoxy-2.20140311-r4.ebuild, selinux-privoxy-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-privoxy-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r3.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r3.ebuild
index 23db349789c7..37741a703f8e 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:33 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for privoxy"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r4.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1cea59b367f7
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-privoxy/selinux-privoxy-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="privoxy"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-procmail/ChangeLog b/sec-policy/selinux-procmail/ChangeLog
index 22b4eb19f085..271b993775df 100644
--- a/sec-policy/selinux-procmail/ChangeLog
+++ b/sec-policy/selinux-procmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-procmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.64 2014/05/29 20:23:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/ChangeLog,v 1.65 2014/08/01 21:04:16 swift Exp $
+
+*selinux-procmail-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-procmail-2.20140311-r4.ebuild, selinux-procmail-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-procmail-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r3.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r3.ebuild
index dcf4a55c0921..fb5f6e543b79 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:16 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for procmail"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r4.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..c1130484152f
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-procmail/selinux-procmail-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="procmail"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-psad/ChangeLog b/sec-policy/selinux-psad/ChangeLog
index fc5ed7d67977..58b5e4d11a88 100644
--- a/sec-policy/selinux-psad/ChangeLog
+++ b/sec-policy/selinux-psad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-psad
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/ChangeLog,v 1.39 2014/05/29 20:23:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/ChangeLog,v 1.40 2014/08/01 21:04:01 swift Exp $
+
+*selinux-psad-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-psad-2.20140311-r4.ebuild, selinux-psad-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-psad-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20140311-r3.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20140311-r3.ebuild
index 8843470d8b41..80e4dbbc554b 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/selinux-psad-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/selinux-psad-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:01 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for psad"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20140311-r4.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0da3fe2b9de7
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-psad/selinux-psad-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:01 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="psad"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-publicfile/ChangeLog b/sec-policy/selinux-publicfile/ChangeLog
index 00a54bfbcad9..b345e6d684f3 100644
--- a/sec-policy/selinux-publicfile/ChangeLog
+++ b/sec-policy/selinux-publicfile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-publicfile
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/ChangeLog,v 1.62 2014/05/29 20:23:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/ChangeLog,v 1.63 2014/08/01 21:04:08 swift Exp $
+
+*selinux-publicfile-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-publicfile-2.20140311-r4.ebuild,
+  selinux-publicfile-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-publicfile-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r3.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r3.ebuild
index 00e24f44ffc8..cc3445e5a164 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:43 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:08 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for publicfile"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r4.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..33b02b89665b
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-publicfile/selinux-publicfile-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="publicfile"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pulseaudio/ChangeLog b/sec-policy/selinux-pulseaudio/ChangeLog
index 285d3417c924..62d9276da691 100644
--- a/sec-policy/selinux-pulseaudio/ChangeLog
+++ b/sec-policy/selinux-pulseaudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-pulseaudio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/ChangeLog,v 1.39 2014/05/29 20:23:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/ChangeLog,v 1.40 2014/08/01 21:04:45 swift Exp $
+
+*selinux-pulseaudio-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pulseaudio-2.20140311-r4.ebuild,
+  selinux-pulseaudio-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-pulseaudio-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r3.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r3.ebuild
index d84d125ba074..e1ac62ce1202 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:45 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pulseaudio"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r4.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b94d05766d66
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pulseaudio"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-puppet/ChangeLog b/sec-policy/selinux-puppet/ChangeLog
index c6978f28fa90..f912fdab8afc 100644
--- a/sec-policy/selinux-puppet/ChangeLog
+++ b/sec-policy/selinux-puppet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-puppet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/ChangeLog,v 1.42 2014/05/29 20:23:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/ChangeLog,v 1.43 2014/08/01 21:04:03 swift Exp $
+
+*selinux-puppet-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-puppet-2.20140311-r4.ebuild, selinux-puppet-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-puppet-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r3.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r3.ebuild
index a90a453e1361..2abdf40bad54 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:03 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for puppet"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r4.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..80c550228b52
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-puppet/selinux-puppet-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="puppet"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pyicqt/ChangeLog b/sec-policy/selinux-pyicqt/ChangeLog
index 34d8192e1501..4a21e11b0e51 100644
--- a/sec-policy/selinux-pyicqt/ChangeLog
+++ b/sec-policy/selinux-pyicqt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pyicqt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/ChangeLog,v 1.39 2014/05/29 20:22:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/ChangeLog,v 1.40 2014/08/01 21:04:11 swift Exp $
+
+*selinux-pyicqt-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pyicqt-2.20140311-r4.ebuild, selinux-pyicqt-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-pyicqt-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r3.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r3.ebuild
index 9a5c7e9f00b4..f90a6924a443 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:11 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyicqt"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r4.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f1afdd1f41ac
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pyicqt"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-pyzor/ChangeLog b/sec-policy/selinux-pyzor/ChangeLog
index 1cc4bfe234ce..bde761885d31 100644
--- a/sec-policy/selinux-pyzor/ChangeLog
+++ b/sec-policy/selinux-pyzor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-pyzor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/ChangeLog,v 1.48 2014/05/29 20:23:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/ChangeLog,v 1.49 2014/08/01 21:04:12 swift Exp $
+
+*selinux-pyzor-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-pyzor-2.20140311-r4.ebuild, selinux-pyzor-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-pyzor-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r3.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r3.ebuild
index 4c73585b20ab..6e4bdab4f971 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:12 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pyzor"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r4.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1cf4ea2f48be
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pyzor/selinux-pyzor-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="pyzor"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-qemu/ChangeLog b/sec-policy/selinux-qemu/ChangeLog
index cda5ffc34671..4ec217bc130f 100644
--- a/sec-policy/selinux-qemu/ChangeLog
+++ b/sec-policy/selinux-qemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-qemu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/ChangeLog,v 1.45 2014/05/29 20:23:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/ChangeLog,v 1.46 2014/08/01 21:04:27 swift Exp $
+
+*selinux-qemu-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-qemu-2.20140311-r4.ebuild, selinux-qemu-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-qemu-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r3.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r3.ebuild
index f4445c286c3f..677e1a2a8034 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:27 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qemu"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
 "
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r4.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b3b7cf07a213
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/selinux-qemu-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="qemu"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-virt
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-qmail/ChangeLog b/sec-policy/selinux-qmail/ChangeLog
index d1aa8287d49a..243011b858e4 100644
--- a/sec-policy/selinux-qmail/ChangeLog
+++ b/sec-policy/selinux-qmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-qmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/ChangeLog,v 1.63 2014/05/29 20:23:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/ChangeLog,v 1.64 2014/08/01 21:04:42 swift Exp $
+
+*selinux-qmail-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-qmail-2.20140311-r4.ebuild, selinux-qmail-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-qmail-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r3.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r3.ebuild
index bdff89f14559..ad4dfaed6f86 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:42 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for qmail"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r4.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4d3046876a95
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qmail/selinux-qmail-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:42 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="qmail"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-quota/ChangeLog b/sec-policy/selinux-quota/ChangeLog
index 3f918546376f..6b88e95ed7d3 100644
--- a/sec-policy/selinux-quota/ChangeLog
+++ b/sec-policy/selinux-quota/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-quota
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/ChangeLog,v 1.39 2014/05/29 20:23:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/ChangeLog,v 1.40 2014/08/01 21:04:37 swift Exp $
+
+*selinux-quota-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-quota-2.20140311-r4.ebuild, selinux-quota-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-quota-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20140311-r3.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20140311-r3.ebuild
index 7ed694657c92..7afdcd048fe0 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/selinux-quota-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/selinux-quota-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:37 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for quota"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20140311-r4.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..672f88b59c01
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-quota/selinux-quota-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="quota"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-radius/ChangeLog b/sec-policy/selinux-radius/ChangeLog
index 937979767b72..f94c54484a86 100644
--- a/sec-policy/selinux-radius/ChangeLog
+++ b/sec-policy/selinux-radius/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-radius
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/ChangeLog,v 1.39 2014/05/29 20:23:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/ChangeLog,v 1.40 2014/08/01 21:04:24 swift Exp $
+
+*selinux-radius-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-radius-2.20140311-r4.ebuild, selinux-radius-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-radius-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20140311-r3.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20140311-r3.ebuild
index 98a7501fa929..5c96f1072090 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/selinux-radius-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:56 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/selinux-radius-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:24 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radius"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20140311-r4.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d8cd433b5653
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radius/selinux-radius-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:24 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="radius"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-radvd/ChangeLog b/sec-policy/selinux-radvd/ChangeLog
index 80660074fb03..c00e309acc01 100644
--- a/sec-policy/selinux-radvd/ChangeLog
+++ b/sec-policy/selinux-radvd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-radvd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/ChangeLog,v 1.39 2014/05/29 20:23:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/ChangeLog,v 1.40 2014/08/01 21:03:59 swift Exp $
+
+*selinux-radvd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-radvd-2.20140311-r4.ebuild, selinux-radvd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-radvd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r3.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r3.ebuild
index 3d9cf4622e2b..12844a0bfbbf 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:28 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:59 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for radvd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r4.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..20b3df63aae0
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-radvd/selinux-radvd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:59 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="radvd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-razor/ChangeLog b/sec-policy/selinux-razor/ChangeLog
index f0f9ea09b2ea..8467e59d000e 100644
--- a/sec-policy/selinux-razor/ChangeLog
+++ b/sec-policy/selinux-razor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-razor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/ChangeLog,v 1.48 2014/05/29 20:23:17 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/ChangeLog,v 1.49 2014/08/01 21:04:09 swift Exp $
+
+*selinux-razor-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-razor-2.20140311-r4.ebuild, selinux-razor-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-razor-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20140311-r3.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20140311-r3.ebuild
index 66f153bb5b17..324048a21d25 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/selinux-razor-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/selinux-razor-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:09 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for razor"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20140311-r4.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..9423d94542c7
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-razor/selinux-razor-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="razor"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-remotelogin/ChangeLog b/sec-policy/selinux-remotelogin/ChangeLog
index 72aa7325ad9c..56b2b6b6c638 100644
--- a/sec-policy/selinux-remotelogin/ChangeLog
+++ b/sec-policy/selinux-remotelogin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-remotelogin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/ChangeLog,v 1.37 2014/05/29 20:23:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/ChangeLog,v 1.38 2014/08/01 21:04:30 swift Exp $
+
+*selinux-remotelogin-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-remotelogin-2.20140311-r4.ebuild,
+  selinux-remotelogin-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-remotelogin-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r3.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r3.ebuild
index 67eb28ca0517..a0111d05255c 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:30 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for remotelogin"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r4.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e4e160f9fdb5
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="remotelogin"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rgmanager/ChangeLog b/sec-policy/selinux-rgmanager/ChangeLog
index 9b6f8fce4bbe..d510566fe4d9 100644
--- a/sec-policy/selinux-rgmanager/ChangeLog
+++ b/sec-policy/selinux-rgmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-rgmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/ChangeLog,v 1.40 2014/05/29 20:23:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/ChangeLog,v 1.41 2014/08/01 21:04:25 swift Exp $
+
+*selinux-rgmanager-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rgmanager-2.20140311-r4.ebuild,
+  selinux-rgmanager-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rgmanager-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r3.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r3.ebuild
index ace617fa1696..33510fad2232 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:25 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rgmanager"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r4.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..a07de269bff7
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rgmanager"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rngd/ChangeLog b/sec-policy/selinux-rngd/ChangeLog
index 698bc17a575e..883c988e5156 100644
--- a/sec-policy/selinux-rngd/ChangeLog
+++ b/sec-policy/selinux-rngd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rngd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rngd/ChangeLog,v 1.7 2014/05/29 20:23:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rngd/ChangeLog,v 1.8 2014/08/01 21:04:09 swift Exp $
+
+*selinux-rngd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rngd-2.20140311-r4.ebuild, selinux-rngd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rngd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r3.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r3.ebuild
index a8896a228d2e..4486d98940ca 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:09 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rngd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r4.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..110d5e5422ac
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rngd/selinux-rngd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rngd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rngd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-roundup/ChangeLog b/sec-policy/selinux-roundup/ChangeLog
index af63cd7007c8..59dd38cc1375 100644
--- a/sec-policy/selinux-roundup/ChangeLog
+++ b/sec-policy/selinux-roundup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-roundup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/ChangeLog,v 1.39 2014/05/29 20:23:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/ChangeLog,v 1.40 2014/08/01 21:04:08 swift Exp $
+
+*selinux-roundup-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-roundup-2.20140311-r4.ebuild, selinux-roundup-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-roundup-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r3.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r3.ebuild
index 6cb247585d8d..efc42e8fa040 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:08 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for roundup"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r4.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..39d21d3d723f
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-roundup/selinux-roundup-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="roundup"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpc/ChangeLog b/sec-policy/selinux-rpc/ChangeLog
index 1b68f69f5733..fe4b1ddf2d61 100644
--- a/sec-policy/selinux-rpc/ChangeLog
+++ b/sec-policy/selinux-rpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rpc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/ChangeLog,v 1.43 2014/05/29 20:23:09 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/ChangeLog,v 1.44 2014/08/01 21:04:41 swift Exp $
+
+*selinux-rpc-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rpc-2.20140311-r4.ebuild, selinux-rpc-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rpc-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r3.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r3.ebuild
index 1ece9b22e833..55c239889a3c 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:41 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r4.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..a13cf09a51f7
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpc/selinux-rpc-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rpc"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpcbind/ChangeLog b/sec-policy/selinux-rpcbind/ChangeLog
index 8ec52dcb1cd6..fe23c582bbd8 100644
--- a/sec-policy/selinux-rpcbind/ChangeLog
+++ b/sec-policy/selinux-rpcbind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rpcbind
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/ChangeLog,v 1.39 2014/05/29 20:23:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/ChangeLog,v 1.40 2014/08/01 21:04:22 swift Exp $
+
+*selinux-rpcbind-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rpcbind-2.20140311-r4.ebuild, selinux-rpcbind-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rpcbind-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r3.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r3.ebuild
index 075e0dd231db..08e7933324a9 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:22 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpcbind"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r4.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..8df046e735ef
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rpcbind"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpm/ChangeLog b/sec-policy/selinux-rpm/ChangeLog
index 50354ab02831..77fc88066823 100644
--- a/sec-policy/selinux-rpm/ChangeLog
+++ b/sec-policy/selinux-rpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rpm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/ChangeLog,v 1.38 2014/05/29 20:23:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/ChangeLog,v 1.39 2014/08/01 21:04:03 swift Exp $
+
+*selinux-rpm-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rpm-2.20140311-r4.ebuild, selinux-rpm-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rpm-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r3.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r3.ebuild
index b01cda42a9bc..5063ba6379d6 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:03 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rpm"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r4.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7d740d04538e
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/selinux-rpm-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rpm"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rssh/ChangeLog b/sec-policy/selinux-rssh/ChangeLog
index d2e90759db6b..b5dfe2892b4b 100644
--- a/sec-policy/selinux-rssh/ChangeLog
+++ b/sec-policy/selinux-rssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/ChangeLog,v 1.39 2014/05/29 20:23:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/ChangeLog,v 1.40 2014/08/01 21:04:18 swift Exp $
+
+*selinux-rssh-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rssh-2.20140311-r4.ebuild, selinux-rssh-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rssh-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r3.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r3.ebuild
index a665da601673..dfe4a7dfa573 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:18 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rssh"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r4.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..63ef6f0d8ffe
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rssh/selinux-rssh-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rssh"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rtkit/ChangeLog b/sec-policy/selinux-rtkit/ChangeLog
index 5cf0be53159a..fcf81c0a7229 100644
--- a/sec-policy/selinux-rtkit/ChangeLog
+++ b/sec-policy/selinux-rtkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rtkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/ChangeLog,v 1.40 2014/05/29 20:23:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/ChangeLog,v 1.41 2014/08/01 21:04:06 swift Exp $
+
+*selinux-rtkit-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rtkit-2.20140311-r4.ebuild, selinux-rtkit-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rtkit-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r3.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r3.ebuild
index ea8c561d7b29..2ce0ddb98437 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:06 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtkit"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
 "
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r4.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..af6f405bb2fd
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtkit/selinux-rtkit-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rtkit"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-rtorrent/ChangeLog b/sec-policy/selinux-rtorrent/ChangeLog
index 2358d5bf9307..97960278b3f1 100644
--- a/sec-policy/selinux-rtorrent/ChangeLog
+++ b/sec-policy/selinux-rtorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-rtorrent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/ChangeLog,v 1.24 2014/05/29 20:22:59 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/ChangeLog,v 1.25 2014/08/01 21:04:03 swift Exp $
+
+*selinux-rtorrent-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-rtorrent-2.20140311-r4.ebuild, selinux-rtorrent-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-rtorrent-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r3.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r3.ebuild
index eb70fc0a75e4..6b0ff4813224 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:03 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for rtorrent"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r4.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5b0f17990bb7
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:03 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="rtorrent"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-samba/ChangeLog b/sec-policy/selinux-samba/ChangeLog
index 959a89b59209..5528d4801265 100644
--- a/sec-policy/selinux-samba/ChangeLog
+++ b/sec-policy/selinux-samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-samba
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/ChangeLog,v 1.64 2014/05/29 20:23:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/ChangeLog,v 1.65 2014/08/01 21:04:29 swift Exp $
+
+*selinux-samba-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-samba-2.20140311-r4.ebuild, selinux-samba-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-samba-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20140311-r3.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20140311-r3.ebuild
index 47773d3f0622..684253402e3b 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/selinux-samba-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/selinux-samba-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:29 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for samba"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20140311-r4.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..be2fa62d67e2
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-samba/selinux-samba-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:29 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="samba"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sasl/ChangeLog b/sec-policy/selinux-sasl/ChangeLog
index 5a80b185d91d..a45ec6ce1de4 100644
--- a/sec-policy/selinux-sasl/ChangeLog
+++ b/sec-policy/selinux-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sasl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/ChangeLog,v 1.39 2014/05/29 20:23:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/ChangeLog,v 1.40 2014/08/01 21:04:08 swift Exp $
+
+*selinux-sasl-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sasl-2.20140311-r4.ebuild, selinux-sasl-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-sasl-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r3.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r3.ebuild
index cb85a989344d..734a15c796dd 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:08 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sasl"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r4.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..69300de8ff77
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sasl/selinux-sasl-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:08 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sasl"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-screen/ChangeLog b/sec-policy/selinux-screen/ChangeLog
index 59f90769327e..8795f6ff623b 100644
--- a/sec-policy/selinux-screen/ChangeLog
+++ b/sec-policy/selinux-screen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-screen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/ChangeLog,v 1.57 2014/05/29 20:23:13 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/ChangeLog,v 1.58 2014/08/01 21:04:02 swift Exp $
+
+*selinux-screen-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-screen-2.20140311-r4.ebuild, selinux-screen-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-screen-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20140311-r3.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20140311-r3.ebuild
index 72fe852fa56a..01298dc20c03 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/selinux-screen-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/selinux-screen-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:02 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for screen"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20140311-r4.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..740cce2a4f6e
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-screen/selinux-screen-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:02 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="screen"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sendmail/ChangeLog b/sec-policy/selinux-sendmail/ChangeLog
index aedc4e617c2e..bd673a0f956c 100644
--- a/sec-policy/selinux-sendmail/ChangeLog
+++ b/sec-policy/selinux-sendmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sendmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/ChangeLog,v 1.39 2014/05/29 20:23:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/ChangeLog,v 1.40 2014/08/01 21:03:57 swift Exp $
+
+*selinux-sendmail-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sendmail-2.20140311-r4.ebuild, selinux-sendmail-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-sendmail-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r3.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r3.ebuild
index 5dae8346e693..376a4e828558 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:57 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sendmail"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r4.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2823504aac3d
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sendmail/selinux-sendmail-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:57 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sendmail"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sensord/ChangeLog b/sec-policy/selinux-sensord/ChangeLog
index 07f58e1b3709..eaab943c49c7 100644
--- a/sec-policy/selinux-sensord/ChangeLog
+++ b/sec-policy/selinux-sensord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sensord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sensord/ChangeLog,v 1.11 2014/05/29 20:23:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sensord/ChangeLog,v 1.12 2014/08/01 21:04:19 swift Exp $
+
+*selinux-sensord-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sensord-2.20140311-r4.ebuild, selinux-sensord-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-sensord-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r3.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r3.ebuild
index 34f160c1fd94..be04e80fa194 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:19 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sensord"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r4.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0774745bbd23
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sensord/selinux-sensord-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:19 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sensord"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sensord"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-shorewall/ChangeLog b/sec-policy/selinux-shorewall/ChangeLog
index 35044037ffd1..7c6f90e7eeac 100644
--- a/sec-policy/selinux-shorewall/ChangeLog
+++ b/sec-policy/selinux-shorewall/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-shorewall
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/ChangeLog,v 1.39 2014/05/29 20:23:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/ChangeLog,v 1.40 2014/08/01 21:04:34 swift Exp $
+
+*selinux-shorewall-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-shorewall-2.20140311-r4.ebuild,
+  selinux-shorewall-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-shorewall-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r3.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r3.ebuild
index dbe0a8b648ae..54f72ff41ba9 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:34 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shorewall"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r4.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5691f698ad52
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shorewall/selinux-shorewall-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:34 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="shorewall"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-shutdown/ChangeLog b/sec-policy/selinux-shutdown/ChangeLog
index 85b05c39918c..3a9b5226448a 100644
--- a/sec-policy/selinux-shutdown/ChangeLog
+++ b/sec-policy/selinux-shutdown/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-shutdown
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/ChangeLog,v 1.39 2014/05/29 20:23:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/ChangeLog,v 1.40 2014/08/01 21:04:28 swift Exp $
+
+*selinux-shutdown-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-shutdown-2.20140311-r4.ebuild, selinux-shutdown-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-shutdown-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r3.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r3.ebuild
index 305b43894d74..fb90780e3643 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:28 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for shutdown"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r4.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..adfbbed7b5f1
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-shutdown/selinux-shutdown-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="shutdown"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-skype/ChangeLog b/sec-policy/selinux-skype/ChangeLog
index 91496d450bb3..7ed563b68826 100644
--- a/sec-policy/selinux-skype/ChangeLog
+++ b/sec-policy/selinux-skype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-skype
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/ChangeLog,v 1.48 2014/05/29 20:23:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/ChangeLog,v 1.49 2014/08/01 21:04:45 swift Exp $
+
+*selinux-skype-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-skype-2.20140311-r4.ebuild, selinux-skype-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-skype-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20140311-r3.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20140311-r3.ebuild
index 6112435f16fa..5fa8520fb59b 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/selinux-skype-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/selinux-skype-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:45 swift Exp $
 EAPI="5"
 
 IUSE="alsa"
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
 "
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20140311-r4.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6b514e2152c7
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/selinux-skype-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:45 swift Exp $
+EAPI="5"
+
+IUSE="alsa"
+MODS="skype"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-slocate/ChangeLog b/sec-policy/selinux-slocate/ChangeLog
index 945ad4d2aa23..d82fe1ee212e 100644
--- a/sec-policy/selinux-slocate/ChangeLog
+++ b/sec-policy/selinux-slocate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-slocate
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/ChangeLog,v 1.39 2014/05/29 20:23:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/ChangeLog,v 1.40 2014/08/01 21:04:28 swift Exp $
+
+*selinux-slocate-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-slocate-2.20140311-r4.ebuild, selinux-slocate-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-slocate-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r3.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r3.ebuild
index 70f55723f20f..b28f697152d3 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:28 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slocate"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r4.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..daf0c8dd9559
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slocate/selinux-slocate-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:28 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="slocate"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-slrnpull/ChangeLog b/sec-policy/selinux-slrnpull/ChangeLog
index df17ab796a23..b04182fc3293 100644
--- a/sec-policy/selinux-slrnpull/ChangeLog
+++ b/sec-policy/selinux-slrnpull/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-slrnpull
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/ChangeLog,v 1.39 2014/05/29 20:23:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/ChangeLog,v 1.40 2014/08/01 21:04:30 swift Exp $
+
+*selinux-slrnpull-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-slrnpull-2.20140311-r4.ebuild, selinux-slrnpull-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-slrnpull-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r3.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r3.ebuild
index b9bb2263870e..7157347c3a9c 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:51 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:30 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for slrnpull"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r4.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b939355a00d1
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="slrnpull"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-smartmon/ChangeLog b/sec-policy/selinux-smartmon/ChangeLog
index 722aae9e1a92..7dafde626092 100644
--- a/sec-policy/selinux-smartmon/ChangeLog
+++ b/sec-policy/selinux-smartmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-smartmon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/ChangeLog,v 1.39 2014/05/29 20:23:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/ChangeLog,v 1.40 2014/08/01 21:04:45 swift Exp $
+
+*selinux-smartmon-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-smartmon-2.20140311-r4.ebuild, selinux-smartmon-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-smartmon-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r3.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r3.ebuild
index 63e2afb001e0..142de061b90f 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:45 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smartmon"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r4.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0a5c5a0be2b0
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smartmon/selinux-smartmon-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:45 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="smartmon"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-smokeping/ChangeLog b/sec-policy/selinux-smokeping/ChangeLog
index 304cfc87f562..1654b19ad82b 100644
--- a/sec-policy/selinux-smokeping/ChangeLog
+++ b/sec-policy/selinux-smokeping/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-smokeping
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/ChangeLog,v 1.40 2014/05/29 20:23:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/ChangeLog,v 1.41 2014/08/01 21:04:05 swift Exp $
+
+*selinux-smokeping-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-smokeping-2.20140311-r4.ebuild,
+  selinux-smokeping-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-smokeping-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r3.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r3.ebuild
index ad86f1cea807..ac18d944a3a3 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:05 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for smokeping"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r4.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..85f72eb61f07
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-smokeping/selinux-smokeping-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:05 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="smokeping"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-snmp/ChangeLog b/sec-policy/selinux-snmp/ChangeLog
index 97ada0b5470d..44b349e9d4ce 100644
--- a/sec-policy/selinux-snmp/ChangeLog
+++ b/sec-policy/selinux-snmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-snmp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/ChangeLog,v 1.37 2014/05/29 20:23:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/ChangeLog,v 1.38 2014/08/01 21:04:06 swift Exp $
+
+*selinux-snmp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-snmp-2.20140311-r4.ebuild, selinux-snmp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-snmp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r3.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r3.ebuild
index 8ba2e3c6ffbc..958d7aa9f1c4 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:06 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snmp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r4.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..716cbeefe8eb
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snmp/selinux-snmp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="snmp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-snort/ChangeLog b/sec-policy/selinux-snort/ChangeLog
index b93500daa440..645b1b584bc0 100644
--- a/sec-policy/selinux-snort/ChangeLog
+++ b/sec-policy/selinux-snort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-snort
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.62 2014/05/29 20:23:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/ChangeLog,v 1.63 2014/08/01 21:04:14 swift Exp $
+
+*selinux-snort-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-snort-2.20140311-r4.ebuild, selinux-snort-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-snort-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20140311-r3.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20140311-r3.ebuild
index c836cf4d5e7c..4b665847f717 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:14 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for snort"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20140311-r4.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..9080b3828ee2
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-snort/selinux-snort-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="snort"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-soundserver/ChangeLog b/sec-policy/selinux-soundserver/ChangeLog
index 08356666861b..52a751c87943 100644
--- a/sec-policy/selinux-soundserver/ChangeLog
+++ b/sec-policy/selinux-soundserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-soundserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/ChangeLog,v 1.39 2014/05/29 20:23:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/ChangeLog,v 1.40 2014/08/01 21:04:47 swift Exp $
+
+*selinux-soundserver-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-soundserver-2.20140311-r4.ebuild,
+  selinux-soundserver-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-soundserver-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r3.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r3.ebuild
index 4a2dfa6ae865..513c2e9e74b4 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:47 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for soundserver"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r4.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..043e8792909c
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-soundserver/selinux-soundserver-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:47 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="soundserver"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-spamassassin/ChangeLog b/sec-policy/selinux-spamassassin/ChangeLog
index e75de60386cd..b4ee1b56e998 100644
--- a/sec-policy/selinux-spamassassin/ChangeLog
+++ b/sec-policy/selinux-spamassassin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-spamassassin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.67 2014/05/29 20:23:17 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/ChangeLog,v 1.68 2014/08/01 21:04:11 swift Exp $
+
+*selinux-spamassassin-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-spamassassin-2.20140311-r4.ebuild,
+  selinux-spamassassin-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-spamassassin-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r3.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r3.ebuild
index 61edd5b55f79..3a0582ee7ff4 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:11 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for spamassassin"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r4.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..16e98486a360
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:11 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="spamassassin"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-speedtouch/ChangeLog b/sec-policy/selinux-speedtouch/ChangeLog
index 6c97d030d4c4..a92ceedf9fff 100644
--- a/sec-policy/selinux-speedtouch/ChangeLog
+++ b/sec-policy/selinux-speedtouch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-speedtouch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/ChangeLog,v 1.39 2014/05/29 20:23:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/ChangeLog,v 1.40 2014/08/01 21:04:35 swift Exp $
+
+*selinux-speedtouch-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-speedtouch-2.20140311-r4.ebuild,
+  selinux-speedtouch-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-speedtouch-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r3.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r3.ebuild
index c4a6d1e17f27..9b7e4e83490a 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:35 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for speedtouch"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r4.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..95705a3cdcac
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="speedtouch"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-squid/ChangeLog b/sec-policy/selinux-squid/ChangeLog
index 51c12d0cdbe3..4af00e834b65 100644
--- a/sec-policy/selinux-squid/ChangeLog
+++ b/sec-policy/selinux-squid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-squid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.73 2014/05/29 20:23:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/ChangeLog,v 1.74 2014/08/01 21:04:38 swift Exp $
+
+*selinux-squid-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-squid-2.20140311-r4.ebuild, selinux-squid-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-squid-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20140311-r3.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20140311-r3.ebuild
index 0f8a5b3932c2..94b4aebfcf72 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:38 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for squid"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
 "
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20140311-r4.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6002bc114ce3
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-squid/selinux-squid-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="squid"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-sssd/ChangeLog b/sec-policy/selinux-sssd/ChangeLog
index 57e12cf88bcb..750257211fcf 100644
--- a/sec-policy/selinux-sssd/ChangeLog
+++ b/sec-policy/selinux-sssd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sssd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/ChangeLog,v 1.33 2014/05/29 20:23:14 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/ChangeLog,v 1.34 2014/08/01 21:04:22 swift Exp $
+
+*selinux-sssd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sssd-2.20140311-r4.ebuild, selinux-sssd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-sssd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r3.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r3.ebuild
index bfb3bc4f2648..aa37a66924ba 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:22 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sssd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r4.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..6b9e5c6f6b44
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sssd/selinux-sssd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sssd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-stunnel/ChangeLog b/sec-policy/selinux-stunnel/ChangeLog
index d5a481e1dce3..67727f432d5a 100644
--- a/sec-policy/selinux-stunnel/ChangeLog
+++ b/sec-policy/selinux-stunnel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-stunnel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/ChangeLog,v 1.61 2014/05/29 20:23:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/ChangeLog,v 1.62 2014/08/01 21:04:36 swift Exp $
+
+*selinux-stunnel-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-stunnel-2.20140311-r4.ebuild, selinux-stunnel-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-stunnel-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r3.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r3.ebuild
index 25eafbfe0578..aa59a9c0eeac 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:36 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for stunnel"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r4.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7007bbf377be
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-stunnel/selinux-stunnel-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:36 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="stunnel"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sudo/ChangeLog b/sec-policy/selinux-sudo/ChangeLog
index 2d1fae69dd1d..0d77270b123e 100644
--- a/sec-policy/selinux-sudo/ChangeLog
+++ b/sec-policy/selinux-sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sudo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/ChangeLog,v 1.64 2014/05/29 20:23:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/ChangeLog,v 1.65 2014/08/01 21:04:06 swift Exp $
+
+*selinux-sudo-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sudo-2.20140311-r4.ebuild, selinux-sudo-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-sudo-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r3.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r3.ebuild
index 45ce31e7c6f0..94d2ba51817f 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:06 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sudo"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r4.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3f71651c62f9
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sudo/selinux-sudo-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:06 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sudo"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sxid/ChangeLog b/sec-policy/selinux-sxid/ChangeLog
index 95e3cb986348..1c7b7264891a 100644
--- a/sec-policy/selinux-sxid/ChangeLog
+++ b/sec-policy/selinux-sxid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sxid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/ChangeLog,v 1.40 2014/05/29 20:23:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/ChangeLog,v 1.41 2014/08/01 21:04:39 swift Exp $
+
+*selinux-sxid-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sxid-2.20140311-r4.ebuild, selinux-sxid-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-sxid-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r3.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r3.ebuild
index c832b28cb677..4717dc73d949 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:39 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sxid"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r4.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..388c887c3cd9
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sxid/selinux-sxid-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sxid"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-sysstat/ChangeLog b/sec-policy/selinux-sysstat/ChangeLog
index 57c8882d27e6..9e36282968c7 100644
--- a/sec-policy/selinux-sysstat/ChangeLog
+++ b/sec-policy/selinux-sysstat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-sysstat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/ChangeLog,v 1.40 2014/05/29 20:23:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/ChangeLog,v 1.41 2014/08/01 21:03:57 swift Exp $
+
+*selinux-sysstat-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-sysstat-2.20140311-r4.ebuild, selinux-sysstat-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-sysstat-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r3.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r3.ebuild
index bf26502c7161..32f7cae81d07 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:57 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for sysstat"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r4.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..bb2e2d57e7f4
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-sysstat/selinux-sysstat-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:57 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="sysstat"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tcpd/ChangeLog b/sec-policy/selinux-tcpd/ChangeLog
index 308fc5bdacb9..b35ba0fab39a 100644
--- a/sec-policy/selinux-tcpd/ChangeLog
+++ b/sec-policy/selinux-tcpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tcpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/ChangeLog,v 1.48 2014/05/29 20:23:14 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/ChangeLog,v 1.49 2014/08/01 21:04:20 swift Exp $
+
+*selinux-tcpd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tcpd-2.20140311-r4.ebuild, selinux-tcpd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-tcpd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r3.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r3.ebuild
index 3deeb5d22977..409a3f2427d6 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:20 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcpd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
 "
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r4.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2012cc9b0e3e
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcpd/selinux-tcpd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tcpd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-tcsd/ChangeLog b/sec-policy/selinux-tcsd/ChangeLog
index 7baed9995e81..c8cfc3117f92 100644
--- a/sec-policy/selinux-tcsd/ChangeLog
+++ b/sec-policy/selinux-tcsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tcsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcsd/ChangeLog,v 1.2 2014/07/04 15:03:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcsd/ChangeLog,v 1.3 2014/08/01 21:04:14 swift Exp $
+
+*selinux-tcsd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tcsd-2.20140311-r4.ebuild, selinux-tcsd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   04 Jul 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-tcsd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r3.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r3.ebuild
index 36ac78417232..9d3e2b1b19a1 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r3.ebuild,v 1.1 2014/07/04 15:02:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:14 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tcsd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r4.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..00c281dacac5
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tcsd/selinux-tcsd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:14 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tcsd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcsd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-telnet/ChangeLog b/sec-policy/selinux-telnet/ChangeLog
index 5f911113500b..dc40f5a59736 100644
--- a/sec-policy/selinux-telnet/ChangeLog
+++ b/sec-policy/selinux-telnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-telnet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/ChangeLog,v 1.42 2014/05/29 20:23:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/ChangeLog,v 1.43 2014/08/01 21:04:16 swift Exp $
+
+*selinux-telnet-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-telnet-2.20140311-r4.ebuild, selinux-telnet-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-telnet-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r3.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r3.ebuild
index 7b7ea778f82d..4ddd3f05cd8e 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:16 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for telnet"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r4.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..04317419ea29
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-telnet/selinux-telnet-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="telnet"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-remotelogin
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-tftp/ChangeLog b/sec-policy/selinux-tftp/ChangeLog
index d8f6ae689c6d..91e4e120dabf 100644
--- a/sec-policy/selinux-tftp/ChangeLog
+++ b/sec-policy/selinux-tftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tftp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/ChangeLog,v 1.36 2014/05/29 20:23:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/ChangeLog,v 1.37 2014/08/01 21:04:46 swift Exp $
+
+*selinux-tftp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tftp-2.20140311-r4.ebuild, selinux-tftp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-tftp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r3.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r3.ebuild
index 3683c57a869c..9387281cba23 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:46 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tftp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r4.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2753935e94b9
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tftp/selinux-tftp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tftp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tgtd/ChangeLog b/sec-policy/selinux-tgtd/ChangeLog
index 3a265f03183e..deb67a7ee1e9 100644
--- a/sec-policy/selinux-tgtd/ChangeLog
+++ b/sec-policy/selinux-tgtd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tgtd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/ChangeLog,v 1.39 2014/05/29 20:23:12 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/ChangeLog,v 1.40 2014/08/01 21:04:37 swift Exp $
+
+*selinux-tgtd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tgtd-2.20140311-r4.ebuild, selinux-tgtd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-tgtd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r3.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r3.ebuild
index d55198a28837..836fd344f974 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:37 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tgtd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r4.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..231818d758c6
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tgtd/selinux-tgtd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tgtd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-thunderbird/ChangeLog b/sec-policy/selinux-thunderbird/ChangeLog
index e0ba068aa447..504d2c8c0e4c 100644
--- a/sec-policy/selinux-thunderbird/ChangeLog
+++ b/sec-policy/selinux-thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-thunderbird
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/ChangeLog,v 1.40 2014/05/29 20:23:30 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/ChangeLog,v 1.41 2014/08/01 21:04:37 swift Exp $
+
+*selinux-thunderbird-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-thunderbird-2.20140311-r4.ebuild,
+  selinux-thunderbird-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-thunderbird-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r3.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r3.ebuild
index 2f2aa1761a41..2023f9a68415 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:37 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for thunderbird"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
 "
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r4.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b05132fd0897
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:37 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="thunderbird"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-timidity/ChangeLog b/sec-policy/selinux-timidity/ChangeLog
index 916e4ad0003a..07ed2a6955ed 100644
--- a/sec-policy/selinux-timidity/ChangeLog
+++ b/sec-policy/selinux-timidity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-timidity
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/ChangeLog,v 1.39 2014/05/29 20:23:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/ChangeLog,v 1.40 2014/08/01 21:04:12 swift Exp $
+
+*selinux-timidity-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-timidity-2.20140311-r4.ebuild, selinux-timidity-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-timidity-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r3.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r3.ebuild
index 5ce70c9e5aad..d9fd1f4a6f5d 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:12 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for timidity"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r4.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f91fe14ef127
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-timidity/selinux-timidity-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:12 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="timidity"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tmpreaper/ChangeLog b/sec-policy/selinux-tmpreaper/ChangeLog
index cd896a2fcdd7..6f9b66fb9fac 100644
--- a/sec-policy/selinux-tmpreaper/ChangeLog
+++ b/sec-policy/selinux-tmpreaper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-tmpreaper
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/ChangeLog,v 1.39 2014/05/29 20:23:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/ChangeLog,v 1.40 2014/08/01 21:04:25 swift Exp $
+
+*selinux-tmpreaper-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tmpreaper-2.20140311-r4.ebuild,
+  selinux-tmpreaper-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-tmpreaper-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r3.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r3.ebuild
index 91998f192083..7e29df5d29d4 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:25 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tmpreaper"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r4.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..aee591ab0f31
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tmpreaper"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tor/ChangeLog b/sec-policy/selinux-tor/ChangeLog
index 350c488d3199..0c2eed42f17e 100644
--- a/sec-policy/selinux-tor/ChangeLog
+++ b/sec-policy/selinux-tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/ChangeLog,v 1.39 2014/05/29 20:23:20 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/ChangeLog,v 1.40 2014/08/01 21:04:02 swift Exp $
+
+*selinux-tor-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tor-2.20140311-r4.ebuild, selinux-tor-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-tor-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20140311-r3.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20140311-r3.ebuild
index 362f0621e40b..99b6a8e86497 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/selinux-tor-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/selinux-tor-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:02 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tor"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20140311-r4.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b3e0c3f6ce89
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tor/selinux-tor-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:02 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tor"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-tripwire/ChangeLog b/sec-policy/selinux-tripwire/ChangeLog
index 35eee73712c6..1e200171b39a 100644
--- a/sec-policy/selinux-tripwire/ChangeLog
+++ b/sec-policy/selinux-tripwire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-tripwire
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/ChangeLog,v 1.39 2014/05/29 20:23:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/ChangeLog,v 1.40 2014/08/01 21:04:26 swift Exp $
+
+*selinux-tripwire-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-tripwire-2.20140311-r4.ebuild, selinux-tripwire-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-tripwire-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r3.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r3.ebuild
index 2407c0913ead..e7fb9b9f40ad 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:26 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for tripwire"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r4.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..93734c7d4b51
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-tripwire/selinux-tripwire-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:26 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="tripwire"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ucspitcp/ChangeLog b/sec-policy/selinux-ucspitcp/ChangeLog
index 981204635a0c..276e0378e193 100644
--- a/sec-policy/selinux-ucspitcp/ChangeLog
+++ b/sec-policy/selinux-ucspitcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ucspitcp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/ChangeLog,v 1.38 2014/05/29 20:23:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/ChangeLog,v 1.39 2014/08/01 21:04:38 swift Exp $
+
+*selinux-ucspitcp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ucspitcp-2.20140311-r4.ebuild, selinux-ucspitcp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ucspitcp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r3.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r3.ebuild
index 83227e2af113..4e02ba2ad2e9 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:38 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ucspitcp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r4.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..4506f5134981
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:38 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ucspitcp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ulogd/ChangeLog b/sec-policy/selinux-ulogd/ChangeLog
index 25c4d3029a68..883c855a82c9 100644
--- a/sec-policy/selinux-ulogd/ChangeLog
+++ b/sec-policy/selinux-ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-ulogd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/ChangeLog,v 1.39 2014/05/29 20:23:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/ChangeLog,v 1.40 2014/08/01 21:04:16 swift Exp $
+
+*selinux-ulogd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-ulogd-2.20140311-r4.ebuild, selinux-ulogd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-ulogd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r3.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r3.ebuild
index e59c55d8d1c4..230dde8950ff 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:16 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for ulogd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r4.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..99a0ea141733
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ulogd/selinux-ulogd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:16 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="ulogd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uml/ChangeLog b/sec-policy/selinux-uml/ChangeLog
index e84c7e12d828..45cc06db6d0c 100644
--- a/sec-policy/selinux-uml/ChangeLog
+++ b/sec-policy/selinux-uml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/ChangeLog,v 1.39 2014/05/29 20:23:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/ChangeLog,v 1.40 2014/08/01 21:04:33 swift Exp $
+
+*selinux-uml-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uml-2.20140311-r4.ebuild, selinux-uml-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-uml-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20140311-r3.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20140311-r3.ebuild
index f2616fe2cbea..381029bec7e1 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/selinux-uml-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/selinux-uml-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:33 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uml"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20140311-r4.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..b8f53e01352e
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uml/selinux-uml-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uml"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-unconfined/ChangeLog b/sec-policy/selinux-unconfined/ChangeLog
index 5580fd1d0930..5c4d91076f93 100644
--- a/sec-policy/selinux-unconfined/ChangeLog
+++ b/sec-policy/selinux-unconfined/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-unconfined
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/ChangeLog,v 1.34 2014/05/29 20:23:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/ChangeLog,v 1.35 2014/08/01 21:04:46 swift Exp $
+
+*selinux-unconfined-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-unconfined-2.20140311-r4.ebuild,
+  selinux-unconfined-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-unconfined-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r3.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r3.ebuild
index 6d8a70a14e19..4bca78bc66d3 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:46 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for unconfined"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r4.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..04938a095708
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-unconfined/selinux-unconfined-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:46 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="unconfined"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uptime/ChangeLog b/sec-policy/selinux-uptime/ChangeLog
index 3af01b8fcd70..b0402623167d 100644
--- a/sec-policy/selinux-uptime/ChangeLog
+++ b/sec-policy/selinux-uptime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uptime
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/ChangeLog,v 1.39 2014/05/29 20:23:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/ChangeLog,v 1.40 2014/08/01 21:04:27 swift Exp $
+
+*selinux-uptime-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uptime-2.20140311-r4.ebuild, selinux-uptime-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-uptime-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r3.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r3.ebuild
index 901e3c1d0bfc..ff7901452074 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:42 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:27 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uptime"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r4.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..207035de0508
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uptime/selinux-uptime-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:27 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uptime"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-usbmuxd/ChangeLog b/sec-policy/selinux-usbmuxd/ChangeLog
index 3d60326aded7..69a3ec052742 100644
--- a/sec-policy/selinux-usbmuxd/ChangeLog
+++ b/sec-policy/selinux-usbmuxd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-usbmuxd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/ChangeLog,v 1.39 2014/05/29 20:23:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/ChangeLog,v 1.40 2014/08/01 21:04:04 swift Exp $
+
+*selinux-usbmuxd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-usbmuxd-2.20140311-r4.ebuild, selinux-usbmuxd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-usbmuxd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r3.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r3.ebuild
index d223e95aea7a..ceed619ea852 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:04 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for usbmuxd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r4.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2bc5e112d717
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:04 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="usbmuxd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uucp/ChangeLog b/sec-policy/selinux-uucp/ChangeLog
index 2c09cadfd8ad..e3cb85f86d45 100644
--- a/sec-policy/selinux-uucp/ChangeLog
+++ b/sec-policy/selinux-uucp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uucp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/ChangeLog,v 1.38 2014/05/29 20:23:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/ChangeLog,v 1.39 2014/08/01 21:04:33 swift Exp $
+
+*selinux-uucp-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uucp-2.20140311-r4.ebuild, selinux-uucp-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-uucp-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r3.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r3.ebuild
index 23b65942d445..18cf302e920f 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:33 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uucp"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
 "
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r4.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5f01857a9dd0
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/selinux-uucp-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uucp"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-uwimap/ChangeLog b/sec-policy/selinux-uwimap/ChangeLog
index 7d7bffef79e7..6adda86c246b 100644
--- a/sec-policy/selinux-uwimap/ChangeLog
+++ b/sec-policy/selinux-uwimap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-uwimap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/ChangeLog,v 1.36 2014/05/29 20:23:07 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/ChangeLog,v 1.37 2014/08/01 21:04:09 swift Exp $
+
+*selinux-uwimap-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-uwimap-2.20140311-r4.ebuild, selinux-uwimap-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-uwimap-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r3.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r3.ebuild
index 623e8af88be8..06fabf91992b 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:09 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for uwimap"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r4.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..8dd9bf53c7ec
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uwimap/selinux-uwimap-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:09 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="uwimap"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-varnishd/ChangeLog b/sec-policy/selinux-varnishd/ChangeLog
index a2c3e65eef18..7b010c499923 100644
--- a/sec-policy/selinux-varnishd/ChangeLog
+++ b/sec-policy/selinux-varnishd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-varnishd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/ChangeLog,v 1.39 2014/05/29 20:23:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/ChangeLog,v 1.40 2014/08/01 21:04:35 swift Exp $
+
+*selinux-varnishd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-varnishd-2.20140311-r4.ebuild, selinux-varnishd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-varnishd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r3.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r3.ebuild
index fcc5a8d5e81a..85bad8682bc6 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:35 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for varnishd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r4.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..969df77f71e8
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-varnishd/selinux-varnishd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:35 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="varnishd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vbetool/ChangeLog b/sec-policy/selinux-vbetool/ChangeLog
index acca6e2f78bc..6ca4124381de 100644
--- a/sec-policy/selinux-vbetool/ChangeLog
+++ b/sec-policy/selinux-vbetool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vbetool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/ChangeLog,v 1.39 2014/05/29 20:23:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/ChangeLog,v 1.40 2014/08/01 21:04:00 swift Exp $
+
+*selinux-vbetool-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vbetool-2.20140311-r4.ebuild, selinux-vbetool-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-vbetool-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r3.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r3.ebuild
index 40abfb4f6f90..70ffd4d68701 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:00 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vbetool"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r4.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..48b20d59ca60
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vbetool/selinux-vbetool-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:00 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vbetool"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vdagent/ChangeLog b/sec-policy/selinux-vdagent/ChangeLog
index 4b73e05014f8..7353a11a7cb3 100644
--- a/sec-policy/selinux-vdagent/ChangeLog
+++ b/sec-policy/selinux-vdagent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vdagent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/ChangeLog,v 1.26 2014/05/29 20:23:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/ChangeLog,v 1.27 2014/08/01 21:04:44 swift Exp $
+
+*selinux-vdagent-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vdagent-2.20140311-r4.ebuild, selinux-vdagent-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-vdagent-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r3.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r3.ebuild
index d8230d15d05a..87e2f3d6981b 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:44 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vdagent"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r4.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1a345e591fc4
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vdagent/selinux-vdagent-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:44 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vdagent"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vde/ChangeLog b/sec-policy/selinux-vde/ChangeLog
index 2b98b5d0a46b..95fe8c36daad 100644
--- a/sec-policy/selinux-vde/ChangeLog
+++ b/sec-policy/selinux-vde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vde
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/ChangeLog,v 1.42 2014/05/29 20:23:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/ChangeLog,v 1.43 2014/08/01 21:04:39 swift Exp $
+
+*selinux-vde-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vde-2.20140311-r4.ebuild, selinux-vde-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-vde-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20140311-r3.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20140311-r3.ebuild
index 97d33f84bf07..ea8e4177c859 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/selinux-vde-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/selinux-vde-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:39 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vde"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20140311-r4.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..9733eca21691
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vde/selinux-vde-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:39 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vde"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-virt/ChangeLog b/sec-policy/selinux-virt/ChangeLog
index 41c9374a49aa..56d606c16465 100644
--- a/sec-policy/selinux-virt/ChangeLog
+++ b/sec-policy/selinux-virt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-virt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/ChangeLog,v 1.42 2014/05/29 20:23:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/ChangeLog,v 1.43 2014/08/01 21:04:30 swift Exp $
+
+*selinux-virt-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-virt-2.20140311-r4.ebuild, selinux-virt-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-virt-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20140311-r3.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20140311-r3.ebuild
index c9badfcb508a..c7301c7f6dff 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/selinux-virt-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/selinux-virt-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:30 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for virt"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20140311-r4.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..0209c9a937c6
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-virt/selinux-virt-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:30 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="virt"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vlock/ChangeLog b/sec-policy/selinux-vlock/ChangeLog
index 9af6baa267eb..85f064a5b61d 100644
--- a/sec-policy/selinux-vlock/ChangeLog
+++ b/sec-policy/selinux-vlock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vlock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/ChangeLog,v 1.39 2014/05/29 20:23:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/ChangeLog,v 1.40 2014/08/01 21:04:18 swift Exp $
+
+*selinux-vlock-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vlock-2.20140311-r4.ebuild, selinux-vlock-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-vlock-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r3.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r3.ebuild
index 5b6b27075ace..87b2fbb15ef3 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:23 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:18 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vlock"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r4.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d1245dfaf354
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vlock/selinux-vlock-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vlock"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vmware/ChangeLog b/sec-policy/selinux-vmware/ChangeLog
index bbc28eafd8f6..5ae22002b2ea 100644
--- a/sec-policy/selinux-vmware/ChangeLog
+++ b/sec-policy/selinux-vmware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vmware
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/ChangeLog,v 1.41 2014/05/29 20:23:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/ChangeLog,v 1.42 2014/08/01 21:04:23 swift Exp $
+
+*selinux-vmware-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vmware-2.20140311-r4.ebuild, selinux-vmware-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-vmware-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r3.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r3.ebuild
index 47ffc3c1181b..f9e135622b31 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:26 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:23 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vmware"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
 "
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r4.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..a69f15338ebc
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vmware/selinux-vmware-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vmware"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-vnstatd/ChangeLog b/sec-policy/selinux-vnstatd/ChangeLog
index a7bd87b7b625..0efc824ae374 100644
--- a/sec-policy/selinux-vnstatd/ChangeLog
+++ b/sec-policy/selinux-vnstatd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vnstatd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/ChangeLog,v 1.37 2014/05/29 20:23:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/ChangeLog,v 1.38 2014/08/01 21:04:33 swift Exp $
+
+*selinux-vnstatd-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vnstatd-2.20140311-r4.ebuild, selinux-vnstatd-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-vnstatd-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r3.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r3.ebuild
index f635506e401a..58316771c939 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:25 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:33 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vnstatd"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r4.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2c5b6ef46065
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:33 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vnstatd"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vpn/ChangeLog b/sec-policy/selinux-vpn/ChangeLog
index b83d221e0722..706342229b92 100644
--- a/sec-policy/selinux-vpn/ChangeLog
+++ b/sec-policy/selinux-vpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-vpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/ChangeLog,v 1.39 2014/05/29 20:23:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/ChangeLog,v 1.40 2014/08/01 21:04:22 swift Exp $
+
+*selinux-vpn-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-vpn-2.20140311-r4.ebuild, selinux-vpn-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-vpn-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r3.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r3.ebuild
index fd653d3b91d2..f4eb09ce6ffa 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:22 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for vpn"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r4.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5729266624f1
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vpn/selinux-vpn-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:22 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="vpn"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-watchdog/ChangeLog b/sec-policy/selinux-watchdog/ChangeLog
index ef9c432941d1..e488540830d6 100644
--- a/sec-policy/selinux-watchdog/ChangeLog
+++ b/sec-policy/selinux-watchdog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-watchdog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/ChangeLog,v 1.39 2014/05/29 20:23:01 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/ChangeLog,v 1.40 2014/08/01 21:04:20 swift Exp $
+
+*selinux-watchdog-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-watchdog-2.20140311-r4.ebuild, selinux-watchdog-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-watchdog-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r3.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r3.ebuild
index 3ffee83fb801..8a83d5b09a25 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:20 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for watchdog"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r4.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..f4e0784c66b1
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-watchdog/selinux-watchdog-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="watchdog"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-webalizer/ChangeLog b/sec-policy/selinux-webalizer/ChangeLog
index 40d52afaf123..474e7bbf664b 100644
--- a/sec-policy/selinux-webalizer/ChangeLog
+++ b/sec-policy/selinux-webalizer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-webalizer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/ChangeLog,v 1.40 2014/05/29 20:23:35 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/ChangeLog,v 1.41 2014/08/01 21:04:20 swift Exp $
+
+*selinux-webalizer-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-webalizer-2.20140311-r4.ebuild,
+  selinux-webalizer-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-webalizer-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r3.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r3.ebuild
index 3420915caf58..dcf2b512eee7 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:20 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -14,4 +14,4 @@ DESCRIPTION="SELinux policy for webalizer"
 DEPEND="sec-policy/selinux-apache"
 RDEPEND="${DEPEND}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r4.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..1bf7437e70cd
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-webalizer/selinux-webalizer-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="webalizer"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+DEPEND="sec-policy/selinux-apache"
+RDEPEND="${DEPEND}"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wine/ChangeLog b/sec-policy/selinux-wine/ChangeLog
index 0c78f93edfdc..fd52f9a89a0c 100644
--- a/sec-policy/selinux-wine/ChangeLog
+++ b/sec-policy/selinux-wine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-wine
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/ChangeLog,v 1.39 2014/05/29 20:23:17 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/ChangeLog,v 1.40 2014/08/01 21:04:20 swift Exp $
+
+*selinux-wine-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-wine-2.20140311-r4.ebuild, selinux-wine-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-wine-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20140311-r3.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20140311-r3.ebuild
index 56d05a67b223..c494197a3c3b 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/selinux-wine-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:34 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/selinux-wine-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:20 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wine"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20140311-r4.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..7158582d1bb5
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wine/selinux-wine-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="wine"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wireshark/ChangeLog b/sec-policy/selinux-wireshark/ChangeLog
index 7fb195548ac1..7a2f87185280 100644
--- a/sec-policy/selinux-wireshark/ChangeLog
+++ b/sec-policy/selinux-wireshark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-wireshark
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/ChangeLog,v 1.50 2014/05/29 20:23:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/ChangeLog,v 1.51 2014/08/01 21:04:20 swift Exp $
+
+*selinux-wireshark-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-wireshark-2.20140311-r4.ebuild,
+  selinux-wireshark-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-wireshark-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r3.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r3.ebuild
index 2f2467746b7f..89dd03cd6166 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:55 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:20 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wireshark"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r4.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5e6c637b904b
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wireshark/selinux-wireshark-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:20 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="wireshark"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wm/ChangeLog b/sec-policy/selinux-wm/ChangeLog
index 5b86c6b5c067..936dec463e43 100644
--- a/sec-policy/selinux-wm/ChangeLog
+++ b/sec-policy/selinux-wm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-wm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/ChangeLog,v 1.37 2014/05/29 20:23:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/ChangeLog,v 1.38 2014/08/01 21:03:57 swift Exp $
+
+*selinux-wm-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-wm-2.20140311-r4.ebuild, selinux-wm-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-wm-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20140311-r3.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20140311-r3.ebuild
index ea8aebfbe143..873664d3fed2 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/selinux-wm-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/selinux-wm-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:57 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for wm"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20140311-r4.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..d025ca129240
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/selinux-wm-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:57 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="wm"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xen/ChangeLog b/sec-policy/selinux-xen/ChangeLog
index 4307b10b0a27..3052473601f6 100644
--- a/sec-policy/selinux-xen/ChangeLog
+++ b/sec-policy/selinux-xen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xen
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/ChangeLog,v 1.40 2014/05/29 20:23:21 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/ChangeLog,v 1.41 2014/08/01 21:04:18 swift Exp $
+
+*selinux-xen-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xen-2.20140311-r4.ebuild, selinux-xen-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-xen-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20140311-r3.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20140311-r3.ebuild
index 1645396d1ad3..4bbd90e60367 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/selinux-xen-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/selinux-xen-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:18 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xen"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20140311-r4.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..efbb3965fa0f
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xen/selinux-xen-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:18 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xen"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xfs/ChangeLog b/sec-policy/selinux-xfs/ChangeLog
index 44a655aa0ee3..8d2fd3e515cb 100644
--- a/sec-policy/selinux-xfs/ChangeLog
+++ b/sec-policy/selinux-xfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/ChangeLog,v 1.39 2014/05/29 20:23:04 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/ChangeLog,v 1.40 2014/08/01 21:04:10 swift Exp $
+
+*selinux-xfs-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xfs-2.20140311-r4.ebuild, selinux-xfs-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-xfs-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r3.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r3.ebuild
index e2202f694808..d2e8b052743c 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:58:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:10 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xfs"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r4.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..e34ebb122021
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xfs/selinux-xfs-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:10 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xfs"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xprint/ChangeLog b/sec-policy/selinux-xprint/ChangeLog
index 67ec712800cc..5341aac2e755 100644
--- a/sec-policy/selinux-xprint/ChangeLog
+++ b/sec-policy/selinux-xprint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xprint
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/ChangeLog,v 1.37 2014/05/29 20:23:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/ChangeLog,v 1.38 2014/08/01 21:03:57 swift Exp $
+
+*selinux-xprint-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xprint-2.20140311-r4.ebuild, selinux-xprint-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-xprint-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r3.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r3.ebuild
index 14a97efe727a..20702436fe1f 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:38 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:03:57 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xprint"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r4.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3079029373a9
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/selinux-xprint-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:03:57 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xprint"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xscreensaver/ChangeLog b/sec-policy/selinux-xscreensaver/ChangeLog
index c0cf2a944149..1ea0a76d7469 100644
--- a/sec-policy/selinux-xscreensaver/ChangeLog
+++ b/sec-policy/selinux-xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sec-policy/selinux-xscreensaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/ChangeLog,v 1.40 2014/05/29 20:23:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/ChangeLog,v 1.41 2014/08/01 21:04:07 swift Exp $
+
+*selinux-xscreensaver-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xscreensaver-2.20140311-r4.ebuild,
+  selinux-xscreensaver-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-xscreensaver-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r3.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r3.ebuild
index b8f81ce83d7d..1e578ea1253c 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:07 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xscreensaver"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
 "
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r4.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..3ca32483ba59
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:07 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xscreensaver"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${DEPEND}"
diff --git a/sec-policy/selinux-xserver/ChangeLog b/sec-policy/selinux-xserver/ChangeLog
index aad7bf92f718..2cea5dca8fa4 100644
--- a/sec-policy/selinux-xserver/ChangeLog
+++ b/sec-policy/selinux-xserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-xserver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/ChangeLog,v 1.46 2014/05/29 20:23:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/ChangeLog,v 1.47 2014/08/01 21:04:40 swift Exp $
+
+*selinux-xserver-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-xserver-2.20140311-r4.ebuild, selinux-xserver-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-xserver-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r3.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r3.ebuild
index 7c9c61be2a13..35c28cf85c55 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:48 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:40 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for xserver"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r4.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..2c8b8a0b8086
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xserver/selinux-xserver-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:40 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="xserver"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-zabbix/ChangeLog b/sec-policy/selinux-zabbix/ChangeLog
index 5d7c0428714c..5e8e0be0cd5c 100644
--- a/sec-policy/selinux-zabbix/ChangeLog
+++ b/sec-policy/selinux-zabbix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-zabbix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/ChangeLog,v 1.40 2014/05/29 20:23:36 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/ChangeLog,v 1.41 2014/08/01 21:04:41 swift Exp $
+
+*selinux-zabbix-2.20140311-r4 (01 Aug 2014)
+
+  01 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-zabbix-2.20140311-r4.ebuild, selinux-zabbix-2.20140311-r3.ebuild:
+  Stabilization of r3, and make r4 available for testing
 
   29 May 2014; Sven Vermeulen <swift@gentoo.org>
   selinux-zabbix-2.20140311-r2.ebuild:
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r3.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r3.ebuild
index bea4e3fa2572..f011feac43f9 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r3.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r3.ebuild,v 1.1 2014/05/29 18:57:52 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r3.ebuild,v 1.2 2014/08/01 21:04:41 swift Exp $
 EAPI="5"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for zabbix"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r4.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r4.ebuild
new file mode 100644
index 000000000000..5879e0a5d443
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-zabbix/selinux-zabbix-2.20140311-r4.ebuild,v 1.1 2014/08/01 21:04:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="zabbix"
+BASEPOL="2.20140311-r4"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+KEYWORDS="~amd64 ~x86"