gentoo resync : 18.08.2019

4 files changed, 2 insertions, 94 deletions

diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index df53b24d8c94..0bb07002a929 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,10 +1,6 @@
-DIST secilc-2.7.tar.gz 175733 BLAKE2B dfad83618f3dd14f4a710d27b6ff3dbe188c9e1eecabe29dd16d9b0ba35a2aa2c5777d999fb378159624f7b7af9af152592e69f9212d2ae6dc6e52dbefcba056 SHA512 cd828ad34e80151951f94414d27246b480cd4831d1d57cb35d5958ce23c30fe74f26ec1c4b29b51fe382bf03ec3144311b35ca645ffc6b914b7abfe677684c06
 DIST secilc-2.8.tar.gz 175893 BLAKE2B d1e588c82d8be68efb66abbcedf28b3f99ac58edf58df238d970243b7a9c94109fcfc6958907fd4f614381e9ee4e248796b556a37a283d6f0e602a98349c1dd9 SHA512 70b92802af8bdfbeb458ccaaed74e00e8a1edfcdbb48a0b422cf1e98ce467db1a586c800574ae61b0fbf006330c603b44d022091d7bcb6b0963ef1b1c6e547c1
-DIST secilc-2.9-rc1.tar.gz 175895 BLAKE2B d89eebc1c71663c35f880f264d79e17da477261403cf4394ebf5017d86c64ada12c8d8fd92651e2ca33a0a4d90a4835a846221cab34564167fae66a76c962ebb SHA512 5aeb099fc8afad5dce5c55c171db8ca1e1326bd670f84debdeb679b3e81e3f9943c68bcbbb3beaa9c9c3aa3aceb691f6cf8a13081f0bf28eb921d7b139dfb814
 DIST secilc-2.9.tar.gz 175885 BLAKE2B 0a5fd0adb70ce80574148ac035dcb8c5c80f6779a6a0c696eaba26cb6c4441e58eb161600034102dcb34c87099357bfc66015d245cf2fd49b56e65d782fc8aac SHA512 c552ce65fc23bef1a93b3dc485369d64ad19a3f30707b95d0dd488d1766ab9f5e75884b79e6464997eaafee119193a1fdd5ff8228aee0fa902e426eefa14a4ee
-EBUILD secilc-2.7.ebuild 922 BLAKE2B 0316d98a09d332cc1781f25776e6408fcac8cc4b3d3fa76ed0f1e897a7aa1bd7dcde16ac55f200a04e941d5dec63e6cc8f6c319ae0f2f96d6b828e5ea63b898b SHA512 dc913463e0a5d9c3367712c4e4d7a096b0ae84d0e188086f3328a66d081a92e45f2f12df86e8d5e7e175e9196ac6c3a3acbcf29870ca04f5e23aa8aa46715b28
 EBUILD secilc-2.8.ebuild 922 BLAKE2B 6a6a35a5da397a04f27c69f9f709961290a10c83c544db6ce42e9b5339e80b98ec9e92ec0e6c1dd3c54ac26e767060e07d79eb042d9abe5d064bf2559ce00308 SHA512 67d657753cbe856e9c6afda6fbb1928366acae73d81af547f5bc2838dacd94d3e5bd451f67e79113100049fe13fe6fd0219e3fc5095bb34a4f5751df9d69b28d
-EBUILD secilc-2.9.ebuild 904 BLAKE2B 6ac9759cceb0cfebae9471c7caa39dbabdee53331863bf602dcc63f509e715311cc55854657a0998b5fd1c371c05f7d40b79552d29287ac0ec7afd85fbb295ab SHA512 24577cd2ced50ce9d4203e6219bc74b73a0bbe62eccac4c698264431eef6a43daa165054e01da94c1b8bf7bc2ccbb919e43dbfe1bad4c7fd7f766e1683ae6f46
-EBUILD secilc-2.9_rc1.ebuild 904 BLAKE2B 05f135ebf8b4f9585e67742aea681b4f9fd9e4585074ded6a040db09463a9d42741fc85a8148791a6c5bc38f6bb89479b1d7ce05d68d1032a5133be2b07298cf SHA512 ee0899e6a8265fac11d6d94776e2b8cefcc0c8d47befa896b0003c5992d2ac5693dea24343ad0abbf5d593a7ce743c1eb6b1014bb6b1f309d96f332f0b9ab0bc
+EBUILD secilc-2.9.ebuild 902 BLAKE2B d21e16c113f24dcde2db43a79ea5c6618f55e5ee24e8bfba4006b44b092760ad9b3240d72b8847e1dbe2a3cad581a9a0d08540c9bac70528ac7cfad14f6b7578 SHA512 77304add0be53344872bbd68e91da6e1d5747b58d1b5af4ce47a42377f82e02bcc3df46477dbb169a1bd053a2f0a5548a30dc46bb74fbd6e636caec970eb6363
 EBUILD secilc-9999.ebuild 904 BLAKE2B 6ac9759cceb0cfebae9471c7caa39dbabdee53331863bf602dcc63f509e715311cc55854657a0998b5fd1c371c05f7d40b79552d29287ac0ec7afd85fbb295ab SHA512 24577cd2ced50ce9d4203e6219bc74b73a0bbe62eccac4c698264431eef6a43daa165054e01da94c1b8bf7bc2ccbb919e43dbfe1bad4c7fd7f766e1683ae6f46
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-2.7.ebuild b/sys-apps/secilc/secilc-2.7.ebuild
deleted file mode 100644
index 0990b3608558..000000000000
--- a/sys-apps/secilc/secilc-2.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20170804"
-
-SEPOL_VER="${PV}"
-
-DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/xmlto
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-RDEPEND="
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_compile() {
-	tc-export CC
-	default
-}
diff --git a/sys-apps/secilc/secilc-2.9.ebuild b/sys-apps/secilc/secilc-2.9.ebuild
index aead3f36a435..238190a3f6ae 100644
--- a/sys-apps/secilc/secilc-2.9.ebuild
+++ b/sys-apps/secilc/secilc-2.9.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/secilc/secilc-2.9_rc1.ebuild b/sys-apps/secilc/secilc-2.9_rc1.ebuild
deleted file mode 100644
index d7ad1e7fe883..000000000000
--- a/sys-apps/secilc/secilc-2.9_rc1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-MY_P="${P//_/-}"
-MY_RELEASEDATE="20190125"
-
-SEPOL_VER="${PV}"
-
-DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	S="${WORKDIR}/${MY_P}/${PN}"
-else
-	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/xmlto
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-RDEPEND="
-	>=sys-libs/libsepol-${SEPOL_VER}
-	"
-
-# tests are not meant to be run outside of the
-# full SELinux userland repo
-RESTRICT="test"
-
-src_compile() {
-	tc-export CC
-	default
-}