gentoo resync : 12.05.2022

3 files changed, 2 insertions, 76 deletions

diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index 33e2187977c0..8333f03043c8 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,5 +1,4 @@
 AUX qtchooser-66-qt-5.15.3-compat.patch 470 BLAKE2B cba1de76db2f6399e51ac6face26056b43e15d6089a828a24eb7705715f590ba2860c09fff493066062ec39ef54e990e80af2c45512eef24e56106d807085fbf SHA512 a833d589a706800d136dc9491b795906a7a34e4cd50b0faac017d4d622408420087e1a9a5cc1ef4dbe69ae9c73571de0abaa5958a527b40b62b3de931571c08e
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
-EBUILD qtchooser-66-r1.ebuild 1469 BLAKE2B ed5257a4134828f864229b04020171fa471bbfa6b4e9ac874b59027df4dbc2e6ad794a80a758cb2a7031d8a3754f1c867138dcf7959eb7ef271bf43920c004df SHA512 9bc54b406129e04df48a2bff185024c559622d1c793c4842c4ce8d64ec0af210ea18f1e6d6ac730bbeb5c1e8968823dfb0aa7ec69da1bafeb667a5e4e034c95f
-EBUILD qtchooser-66-r2.ebuild 1524 BLAKE2B 2881e8dcfd46e7d901fd9c3a75514a705554106e6767280ab64cd5bb82e1a5855056fd38b110a52b7e853fe0352df8b95993abe8cd53df699e3d0d290b5d94a9 SHA512 942591b2a963a9fc21e294777802daa4fc0ca2773516b58d157a2d6b4e5703475bfa1ff92acde72c4c2c1aa1fcf392de8d4091f2ba27b1c227d60d16a7406661
+EBUILD qtchooser-66-r2.ebuild 1522 BLAKE2B d8152c7211fa15c4eca48919f11c24316eccdc573d920f744b76679d3145c150cefcccd19a192fe603703283c4e6507979475a1bcd8cef576108c219e2c8847e SHA512 da61fea88adc57aaf6f86b302597065373da75251c38767cfc705c0f192a3f52abac5b1b1d46708cd96226823ff9d055ba8ed45144e67e4c6e48919990913e4b
 MISC metadata.xml 248 BLAKE2B 51adf67bdc3e6c30f18cb7c177694882c71c1207bf4e6b88aa0eb8d5f6fdbaea0c364777967125219ba8ea4be4a9ad3eb41269a7139cb211ce26f2985ac103ac SHA512 c2976d1256f14d4dcf6ea53ed248a43e9b76530c19eefb0e586d64b1080b75d1f4ac17171c6c27a491ce6623d34e9318fcba5ce3f78039f21ccaabbebf209345
diff --git a/dev-qt/qtchooser/qtchooser-66-r1.ebuild b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
deleted file mode 100644
index e25d60437642..000000000000
--- a/dev-qt/qtchooser/qtchooser-66-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils toolchain-funcs
-
-DESCRIPTION="Tool to quickly switch between multiple Qt installations"
-HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git"
-	inherit git-r3
-else
-	SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-qt/qtcore:5
-		dev-qt/qttest:5
-	)"
-RDEPEND="
-	!<dev-qt/qtcore-5.15.2-r10:5
-"
-
-qtchooser_make() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		LFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		"$@"
-}
-
-src_compile() {
-	qtchooser_make
-}
-
-src_test() {
-	pushd tests/auto >/dev/null || die
-	eqmake5
-	popd >/dev/null || die
-
-	qtchooser_make check
-}
-
-src_install() {
-	qtchooser_make INSTALL_ROOT="${D}" install
-
-	# install configuration file
-	cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
-		$(qt5_get_bindir)
-		$(qt5_get_libdir)
-	_EOF_
-
-	(
-		insinto /etc/xdg/qtchooser
-		doins "${T}/qt5-${CHOST}.conf"
-	)
-
-	# convenience symlinks
-	dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
-	dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
-	dosym qt5.conf /etc/xdg/qtchooser/default.conf
-
-	# TODO: bash and zsh completion
-	# newbashcomp scripts/${PN}.bash ${PN}
-}
diff --git a/dev-qt/qtchooser/qtchooser-66-r2.ebuild b/dev-qt/qtchooser/qtchooser-66-r2.ebuild
index d3bd301309df..5893c9538fda 100644
--- a/dev-qt/qtchooser/qtchooser-66-r2.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://download.qt.io/official_releases/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"