gentoo resync : 09.06.2018

6 files changed, 3 insertions, 72 deletions

diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index b0e8b563b959..85f561a6c3ae 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -1,23 +1,14 @@
-DIST patchbundle-selinux-base-policy-2.20170204-r1.tar.bz2 327838 BLAKE2B 8b8f6241636c0aaa472df3b4ad035d3f6ed8bafa25f9d5b2106f41e6e9e589cd3105f91fbcb9a5972998b6deda3eaf034755bcb13b57cd51957b473a60dfcbfe SHA512 727dd11bc5a777388199fb1da67add940a6051cca874456cdc4bb65f567216481e70b92fcf37ac59cc48d907fbe87b67e97c3813c4c97d5f31b7c66b7246f166
-DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 BLAKE2B 9296ea072f27774e7e6b055be9c24ba5717a1502cb2b20f57768231d2fdc267cc2e340ff9e301e072a199e80434f5f5caeed6151ea424b52380665a9927c23d6 SHA512 ac907590cefdc69638fce25de481d3dce625f0f1511e0fa3d0bcc78b2a18c57c0bea392c225d314645b1aec5abbcedf67bfc50b66be8580447bbcac7223ea66d
-DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 BLAKE2B 4b4fb4d495f9507152ef05815273bc3d09927f9cdb3e63aa6050a620a061c133519b503dc6dbdb658c04a81a0917a7a4872668ee3fef8c2a049e0006e1c103de SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130
-DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 BLAKE2B cb291e14e181c68d95c77dc07185ba6d186d4a7f2bf163cbe32670d54cdf29e32ecfac49d449d8631df7df67992499e2bec6b39f6096f4d9e9394a87f2b24654 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04f364195eb8627153647118eb23812a610db63a40d50819b42c19fc20ffd0a36cd5c1959a764eab2109bd2e5317f74fd3a5cc1c7ddd17d8c85be05579a5 SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
-DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
 DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
+DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-EBUILD selinux-canna-2.20170204-r1.ebuild 282 BLAKE2B 1f32b3225dfb6c3ac4c5b4b2da7c20e00791eb86583ddb70f4aefa186c944d28b82dbcacd0dab795ba600d0602452ae8e56dbeba399a66b1627fd90f81bb2610 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c
-EBUILD selinux-canna-2.20170204-r2.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
-EBUILD selinux-canna-2.20170204-r3.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
-EBUILD selinux-canna-2.20170204-r4.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
 EBUILD selinux-canna-2.20170805-r2.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
 EBUILD selinux-canna-2.20170805-r3.ebuild 280 BLAKE2B 94e7982cb8712c8c42f40c4e6f9d92b53b7b648596d32cd992a73439d47a8c6688497615b20de3eb6967cc7792a65f923e46320eacd84b1a68494e4c03f76b04 SHA512 77789ec8872f8e47ee1c1401a91dee93312b371740e95273beb730a22f83ac17af64e638d400c41d09d419a43413740416503f8a358de48a339fc4a6b8ea64d5
-EBUILD selinux-canna-2.20170805-r4.ebuild 282 BLAKE2B 1f32b3225dfb6c3ac4c5b4b2da7c20e00791eb86583ddb70f4aefa186c944d28b82dbcacd0dab795ba600d0602452ae8e56dbeba399a66b1627fd90f81bb2610 SHA512 9212bab3d830a0c4bf5d7209176882dca0d22c335c6aa6f08ba521d94405853971ebe08bd27f245614401ecb7e04e073e0293ccf8157b6df3cddcc338df03f1c
 EBUILD selinux-canna-2.20180114-r1.ebuild 280 BLAKE2B ad564675d7be4f22a700e406a43048dbb0f9d5f781f0adcd965b1c93abc64c639d816bfd9a2c10ef7c27a78d60b8a514bb1c5b59f2e666c5c0c1465a2e1dca7d SHA512 7311537e732176504ed77322c3c95dd68deaa6edfc44cc9465a592b802fa6dba238ccd3c887c6687af9c51c89950b27c3d183a36f07d50d8d18f81b60b334502
 EBUILD selinux-canna-2.20180114-r2.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
+EBUILD selinux-canna-2.20180114-r3.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 EBUILD selinux-canna-9999.ebuild 282 BLAKE2B cd6c33c5d85f105506462f16f427bff4f23a36bb6c7a42f4450c6e6dd93cb4fdf0e8e10e1b4ff9afe3556575c94af075b390dd12a4a4651b541a36d83a825a61 SHA512 3611c6a33c1bbbcfea8aeaa63e43e0dff5c39409fcbac66b33cff84ffd95a75078416de12c2c383b0b57a7c927dc4d77c5481105b8c9c35e5b3613e86aaa5df8
 MISC metadata.xml 315 BLAKE2B 675fbadeb697d9af143ccec9b334e5f7f44effe1a0f6a05e1f05b9a5f6d763e13930c294169a8ff912f324ff463d218a0737a49b36facace2fdb4b8b07f388c5 SHA512 e769ff18487231316820a744d1567208e4ed3d329e1eb7ddabdaece562292189ac0486732261c737339d40687019319baccc52ddfa2a99b2a75cde4a4b450ee9
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild
deleted file mode 100644
index 2c5275adcd00..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170805-r4.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20170805-r4.ebuild
deleted file mode 100644
index 82d4746419dd..000000000000
--- a/sec-policy/selinux-canna/selinux-canna-2.20170805-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="canna"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for canna"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20180114-r3.ebuild
index 82d4746419dd..33f018f5f6ce 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20180114-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"