gentoo resync : 15.09.2018

4 files changed, 2 insertions, 61 deletions

diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index f992158e4f21..a7ba239f1222 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,7 +1,3 @@
-DIST glep63-check-4.tar.gz 5898 BLAKE2B b28dd0843138bb54c81142959a28b121b043b7da4e3dc797b8ad3ebabfde6f850a11c40e94e3d20b9cf152b2138165733ba36754859081eb59bbbd5e99f2b98e SHA512 65a40ce097937df0517f86d1b32fd47e23d39abc6a49fa45dfa9075e7f7a163c2c2e25f6e39538a5e47c295bfdb2390bc4909e14a06b21f2bf14edf8cf43f199
-DIST glep63-check-5.tar.gz 61234 BLAKE2B 15b2e38e00ec044c963f4aaea9be4bf0659441a94ba9958aa1e70ecd425cc9f3dada31ab194092abdf9953ca10d711aa0cdd615365a6e78761b07fb0739fadd5 SHA512 d79a2e2a92dc4f123fbfa73df501fb9a0829a879e0d3674e8d6a854b8a2b437698b77793d92c6862d646a58ef302638cb9e5d152f60e634c9ec06e804dea79b4
 DIST glep63-check-6.tar.gz 61318 BLAKE2B 9310a70556deabf90003c154c326480e7a5fb58992bf79201100c21fbbeb17ebfdb560d861586d1c206a8d4ed3e64500a8eca4d99dacd072dce121736cdb2d3e SHA512 f0729683095222f60243923bcb7d9c1b984eb10cb0d8a0da2ec756b40a11c3f4f3de466fa533a66d4f645a2de09137a12a47eda5e80d7d5d562b0926a30b1a72
-EBUILD glep63-check-4.ebuild 603 BLAKE2B b062189a109fb0227031fba2c627065b8badf676f9b2db60d8e1b847dc59e3e801ea392a47c2d67e7eb801b44df689f3dc486cef33496c62baaeb387f4821e59 SHA512 65ec1371049758b84c7f50f3afc3042df99ead045cfeafd4e61beae02ba36bab4802b1ffce8ee94ccdf32bf7c993b4d1f9f1b872d631640549e0be449e64c72d
-EBUILD glep63-check-5.ebuild 643 BLAKE2B 72915256273a72d0f55c1a7b8ffa0cf778304ebcdeca731ecef29669f051193cf86927bd79bc3aea45d7382afaffe05e01f71cfcb008fb02f75b917cf81dbefd SHA512 24bbf7e9b7589c6cdd3de5c6bf4000d4464f539943e84398524331f26e873a3b04d722aae65bf528cf94a105fd4a8b3651c9f449af9c48810620507bd4411dce
-EBUILD glep63-check-6.ebuild 665 BLAKE2B bee30971b92dfd8f54b3ed5e97accaab4fd5b90f5ac6304c389e3b3279402042d13c9499e646d2b3f007121927edd9bc8a7e9eaf8e7eef2a1ef5ea58491507a5 SHA512 b9c90d5f74e37de3ffaf0c1da2d5b80c368aead33b7036fd6530e39b774ca8f801f04a08e9976fe9774214032d139a84fdfc9df2f7d88276ae7d4e5da5d97e2b
+EBUILD glep63-check-6.ebuild 663 BLAKE2B 542b4dcfd5756bb0b4afa6cd26d5b58a9eff9eb51c3a937716235111e0670ebb858550faf6ed4aa17bfb6db2383f72c908110ba9db52d55e260a6d32d9ffc2b8 SHA512 07d47d7bc0c08a32f383b3e5b679ee5bbe615f5b94473c60fc45be5a2a0a2bdc89acee0eeab5ecedb23af92d24af95ed0470e149dbd836fbc6ccec9ca5ed55f9
 MISC metadata.xml 513 BLAKE2B dc5036a6556ebfefbbfc1ad01f436b9793c5c0c51e7cbda49ee896ff364a30761f92ec63531317b4bd55bb9cc018d6ee62d07776a61ba75d7d1245c3d0c1339a SHA512 44aac823dedeb848696d166e28d151449b59d30a7dd87a0c2c339c044e2704908a1882e3b818ad7007822b5fd2efc52ad81564fad953862851b44480d61642fe
diff --git a/app-crypt/glep63-check/glep63-check-4.ebuild b/app-crypt/glep63-check/glep63-check-4.ebuild
deleted file mode 100644
index 58a8418fc785..000000000000
--- a/app-crypt/glep63-check/glep63-check-4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
-HOMEPAGE="https://github.com/mgorny/glep63-check/"
-SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-crypt/gnupg"
-
-src_compile() {
-	python_fix_shebang glep63-check
-}
-
-src_install() {
-	dobin glep63-check
-}
diff --git a/app-crypt/glep63-check/glep63-check-5.ebuild b/app-crypt/glep63-check/glep63-check-5.ebuild
deleted file mode 100644
index b1ee063dd914..000000000000
--- a/app-crypt/glep63-check/glep63-check-5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
-HOMEPAGE="https://github.com/mgorny/glep63-check/"
-SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="test? ( ${RDEPEND} )"
-
-python_test() {
-	"${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/app-crypt/glep63-check/glep63-check-6.ebuild b/app-crypt/glep63-check/glep63-check-6.ebuild
index 0719917e3491..5ab0f5494960 100644
--- a/app-crypt/glep63-check/glep63-check-6.ebuild
+++ b/app-crypt/glep63-check/glep63-check-6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"