5 files changed, 8 insertions, 32 deletions
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 518ede34fe16..7e99fba442fe 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -1,10 +1,8 @@
-DIST patchbundle-selinux-base-policy-2.20231002-r2.tar.bz2 436443 BLAKE2B f481e661b4afadd15f786a5d69d975d79e5d9a378c7bca279282d59215a02897a9587cbd56f7a2d95fd8152f931c0a8d469927033910e8fe214ee4494f4e6e49 SHA512 8545592130d7d10f7d6411a356e79f9cb2689138a7eb69a5f7bcd630203019c61336f1e3bdbc95dea31efceb41c9bce2e7ff42ced6a51a9b7482e991864fec05
-DIST patchbundle-selinux-base-policy-2.20240226-r1.tar.bz2 430565 BLAKE2B 2d552f868375c240e71e987542a3026970f1d375d7d1e65f11386ce1b07aae84911ded2379fc768ff4bff664eb98dc3361a7392467fed3feb4916477eb957f58 SHA512 f22245ad8759d88ddbf26b71443e4ba8c804fc80d69383120ed98b7887d08a7034b8125e4d15e695b26776ef4ac1a933e14a1a382d5be90aa942358842cc6c77
 DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268
-DIST refpolicy-2.20231002.tar.bz2 600458 BLAKE2B 254d6d3d6b95f21e1f8e1df5822520ccaeade427053fb172079427cf70bd33f8ced87a9e09e1d36ec5f7b33f0bac8d730020d91996c6d25eafdcec66ebe35bb3 SHA512 029cd2225ce57d96f681720f24828e962320af41832ad2dc95d4d41d00dbde20bb08d91fa8b964b592812a9fedd908c261734b77ad72cccfde2de541b9c2c74d
+DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3
 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9
-EBUILD selinux-apcupsd-2.20231002-r2.ebuild 375 BLAKE2B 6467cb6498178f076fc85821c6af6493563d2576efe7018e2b034010240d7589732abac7ab26d7b6cd83dc75252227c2993758d69189abe738350274b89840b6 SHA512 aadd92839fae73f4245e48fd9baaf99fc1c5bdfbd127759886068b91a4440c692bdbba99555da0ea6ca2e89770f458dafe9f9e0a5711678319c7dab5c781592f
-EBUILD selinux-apcupsd-2.20240226-r1.ebuild 375 BLAKE2B 79c806d09b7b6a89a03ba23fe5054d0bd0189c474b763b04dfdae70e0374cd83806f8c518469f88a041d6ffaa0f55bb07c0f2a831d8f9d37e6abd332162b8e43 SHA512 540f9dc6c55ea998ed723b8b788806d100bd1c5a9d53c16ab06eb1bb5c08116f2d9672edc062fbd0a4feb783326ab3e3305fea5f22bf6abf940edcd0ba718c33
-EBUILD selinux-apcupsd-2.20240226-r2.ebuild 371 BLAKE2B c76318afd203e9a13e9cca6e17e2b5157ad3372b44b0cd70cb19d02b9b0182e14b19d9a775312def6a45ccdf26186538c43cb996ba505cbeb99dcdc355ea01f2 SHA512 818e70654c2af1ee3492d9f15ab61805c2399a943d4d0f999a75a41a66503e15c243676877478ffd805fc34d68ea434a16c14364ada0f11ee076ff786e2a8022
-EBUILD selinux-apcupsd-9999.ebuild 371 BLAKE2B c76318afd203e9a13e9cca6e17e2b5157ad3372b44b0cd70cb19d02b9b0182e14b19d9a775312def6a45ccdf26186538c43cb996ba505cbeb99dcdc355ea01f2 SHA512 818e70654c2af1ee3492d9f15ab61805c2399a943d4d0f999a75a41a66503e15c243676877478ffd805fc34d68ea434a16c14364ada0f11ee076ff786e2a8022
+DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064
+EBUILD selinux-apcupsd-2.20240226-r2.ebuild 361 BLAKE2B 0f54efdd67d9ca56204f920b390d0a35580bd705d0c4ca8700df85b398dbe07da41b79c5ab8c4f8f702d8881bf2e4dd70f62a45e3e7073bdd2f9c0e50c94c788 SHA512 d15f4ade1423f827c22eba92f716c64840c0d783af5f3b8600411450e10d6a39a58c5d252335b3521bb431bb91ff558bbbed48c7ed716de85e3d3917f2e27eb5
+EBUILD selinux-apcupsd-2.20240916-r1.ebuild 361 BLAKE2B 0f54efdd67d9ca56204f920b390d0a35580bd705d0c4ca8700df85b398dbe07da41b79c5ab8c4f8f702d8881bf2e4dd70f62a45e3e7073bdd2f9c0e50c94c788 SHA512 d15f4ade1423f827c22eba92f716c64840c0d783af5f3b8600411450e10d6a39a58c5d252335b3521bb431bb91ff558bbbed48c7ed716de85e3d3917f2e27eb5
+EBUILD selinux-apcupsd-9999.ebuild 365 BLAKE2B 1928933bc2095e6d9c6914eb431ff21ce7e794bfd85b5f7d225f26d9b02aaf95f04dd6c259c3738fb6b8a88b4c2cbaf41d1333dbb0728413f7c714a8ddd638b5 SHA512 5e00c156ad4ed98aa636ad356df4b0d4945453f5bbd87b9f1aa93d9022efebc1e1be9dea0c010589a7c68675ecc5a06f40480f2c475fdea101b090b535f983c7
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20231002-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20231002-r2.ebuild
deleted file mode 100644
index 1263ba33d9e4..000000000000
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20231002-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-IUSE=""
-MODS="apcupsd"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for apcupsd"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-DEPEND="${DEPEND}
-	sec-policy/selinux-apache
-"
-RDEPEND="${RDEPEND}
-	sec-policy/selinux-apache
-"
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild
index 8cce79082c01..f77f7e15b576 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r2.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r1.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240916-r1.ebuild
index 2bcbd7b4b5dd..f77f7e15b576 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240226-r1.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20240916-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI="7"
 
-IUSE=""
 MODS="apcupsd"
 
 inherit selinux-policy-2
@@ -11,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 arm arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
index 8cce79082c01..67a0003f7e38 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-9999.ebuild
@@ -10,7 +10,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for apcupsd"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache