gentoo resync : 24.09.2020

4 files changed, 2 insertions, 74 deletions

diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index abc883822e3b..d6f07c72bc8e 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,8 +1,4 @@
-DIST uncrustify-0.66.1.tar.gz 1208142 BLAKE2B d642eb6c8e2a147aa17bd25f4ca0ee7e9471fa4f7d288c5e06e4814d0103032989e83349377d9d9a19371047fb82ad4d6e1aeec90bea3a068e8884ec4a698e0c SHA512 edfde1d46bded9febd47b77cbff86028e1d21c41fee6a46a8b43f0928bf937259be2f88fe4606f406f414601bb757e27eda373ca738606d1bb74b6cd27335f47
-DIST uncrustify-0.69.0.tar.gz 1600390 BLAKE2B 89f194679fe0601c866cb239c8fc900bd4ddf9f5ff23bdfe82df06e284f89f02bf8513153a908aa3bea4a075010bbb022aedee8ab7cd6df8b7922364d8d5cdeb SHA512 06eb985b941bd595c037c71becd277ed68298bebb56e9cdaba5da8315812a43a1455eba8635f370e2b039e665fa89891042f520933b7de5677bdcfb2dd69e6cb
 DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
-EBUILD uncrustify-0.66.1.ebuild 765 BLAKE2B f42a1a63aac961eea17b1ad905c8c4eb86aff8068cf84f2cae98ea8127e948c99671146ccbb31ce2c3fbed32379a242c12af114504886c325a253ee08c2d0a3b SHA512 20fa1b76422958c787555f8fed41e53d423f87fe3d0fed653665c3cf08ef9677dd9ab1961bd39b930be9e224fbe84f16cd15c39d97cd1139be0b2ddf3cff5223
-EBUILD uncrustify-0.69.0.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
-EBUILD uncrustify-0.71.0.ebuild 696 BLAKE2B 5b7ae61725234925279f7f894ea2200357e6a83748f548988baf48a5c2441dce39a500d6514c1bb6c9cf83b9c046407bc4b855cf9eb17860d410d215c96bda8f SHA512 deca6e91e73f52a1660621ecb1b542a7c1cbbf84fb83b7afc2dd735db395efc11c3ae6f165527595f55ff43cc191774d51b641a5fad028fc2789a4d3d069de66
+EBUILD uncrustify-0.71.0.ebuild 695 BLAKE2B 17b2350819cd413121b306772df5fb61e253add0154cb773e83e1b0844b1234c217a022a90f41fca9e4bb54da9ec6cdb43da40bcb19818fc9e3dbb137cebec5b SHA512 28ffbeb8d9669ca2f1680209f925798c24d93d43bbd7f1241f01183f46deb509b218204e6789ebfcb2522f7c237681e510e65bac52d29437d0702d3b50be715c
 EBUILD uncrustify-9999.ebuild 697 BLAKE2B fd0e10e65699f94e5832618baa4bfb69338d352ff348aaca442696235146d17f2f052959bac69549400fee95c4ca73ef0186bd4ffa80f7494f363e6196c345ca SHA512 9edf623f799b347a8cc0ae540c72e7ae9be6e7da940628109e1cee789af5a09319d15fb7e34cd39b3e0e03e1e78e7b9c2576e676afe3b524f43f807147bc0abb
 MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
diff --git a/dev-util/uncrustify/uncrustify-0.66.1.ebuild b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
deleted file mode 100644
index fa3c210d52ae..000000000000
--- a/dev-util/uncrustify/uncrustify-0.66.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	scm_eclass=git-r3
-else
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-0.69.0.ebuild b/dev-util/uncrustify/uncrustify-0.69.0.ebuild
deleted file mode 100644
index 85a400d29cc3..000000000000
--- a/dev-util/uncrustify/uncrustify-0.69.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	scm_eclass=git-r3
-else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-0.71.0.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
index 32359683b286..f53b1ddfba62 100644
--- a/dev-util/uncrustify/uncrustify-0.71.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -7,7 +7,7 @@ if [[ $PV == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	scm_eclass=git-r3
 else
-	KEYWORDS="~amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${P}
 fi