gentoo resync : 08.06.2019

3 files changed, 2 insertions, 78 deletions

diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index d675e5549499..7932a2133a5b 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,5 +1,3 @@
-DIST qtchooser-0_p20170803.tar.xz 32012 BLAKE2B a0363ccebfd17c2ad514afbaf7ea80456826a42b88badff3a2ff4259745721f336a1b034f4a51831832f5b2dcd042c7c010c47e0f17b77ecacc5520f0c6f8d53 SHA512 320d898617ad52392fe24834e99ace685dac84e3a7edb1f6e6358baadb6658a51b02ae1af465ef5e081485a002c787c6884b6e1637ffd0406767fe7555fc32a7
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
-EBUILD qtchooser-0_p20170803.ebuild 1570 BLAKE2B c386764d8072ba9066f35a1948e173e7cf87bb24cf59853bd24c8b088c050ef620e9e2d34e24ababdd0baf639af3d1e561121f3dd48565ea5f11d9da49ef0096 SHA512 4650af4d9066f9b1ceadff18a02f38634e27ae974fbaa7c1c1894561d0d589900107517c167c2e624b9b5ea51a0c01f9e09c532e6b41da01eb763101f7f57ba3
-EBUILD qtchooser-66.ebuild 985 BLAKE2B 12ad0f8ce3b1cf5d307ab9b83e4f384f69dcb3d6ec6c28c9709e8360412a5a653ac747df25ec1f7e8889c28b317c82526009aa7cdac14fd97364b0e10019496c SHA512 58a5fb7d0dc956fecb87b7c55889ef2860c8d9a6358bb0b76cd573e3f840a08acae93f578ddeb91bf6b4d9fd6e95b7439bbd3e1842a946e2dbfa5d6ebbfd882a
+EBUILD qtchooser-66.ebuild 955 BLAKE2B be9828b1eca5e2baf9f7d2e414e48b4cb8ad41de80a3b00ca1f8bc8ecf195df3d65d8a7248efcb2716ad9d91a7a936642e7a0ed2d3886b30aab38dd534488d27 SHA512 975c6d8e366dadd9dfa46554d199d4a56e99dd8568e45110ba6cc1e89c622ed6bd402e245486a46114bab065a7596fb75f455b84da91d8fc035516774d5b08d2
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-qt/qtchooser/qtchooser-0_p20170803.ebuild b/dev-qt/qtchooser/qtchooser-0_p20170803.ebuild
deleted file mode 100644
index daf813fca12e..000000000000
--- a/dev-qt/qtchooser/qtchooser-0_p20170803.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils toolchain-funcs
-
-DESCRIPTION="Qt4/Qt5 version chooser"
-HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
-SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? (
-		dev-qt/qtcore:5
-		dev-qt/qttest:5
-	)"
-RDEPEND="
-	!<dev-qt/assistant-4.8.6:4
-	!<dev-qt/designer-4.8.6:4
-	!<dev-qt/linguist-4.8.6:4
-	!<dev-qt/pixeltool-4.8.6:4
-	!<dev-qt/qdbusviewer-4.8.6:4
-	!<dev-qt/qt3support-4.8.6:4
-	!<dev-qt/qtbearer-4.8.6:4
-	!<dev-qt/qtcore-4.8.6:4
-	!<dev-qt/qtdbus-4.8.6:4
-	!<dev-qt/qtdeclarative-4.8.6:4
-	!<dev-qt/qtdemo-4.8.6:4
-	!<dev-qt/qtgui-4.8.6:4
-	!<dev-qt/qthelp-4.8.6:4
-	!<dev-qt/qtmultimedia-4.8.6:4
-	!<dev-qt/qtopengl-4.8.6:4
-	!<dev-qt/qtopenvg-4.8.6:4
-	!<dev-qt/qtphonon-4.8.6:4
-	!<dev-qt/qtscript-4.8.6:4
-	!<dev-qt/qtsql-4.8.6:4
-	!<dev-qt/qtsvg-4.8.6:4
-	!<dev-qt/qttest-4.8.6:4
-	!<dev-qt/qtwebkit-4.8.6:4
-	!<dev-qt/qtxmlpatterns-4.8.6:4
-"
-
-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
-
-	keepdir /etc/xdg/qtchooser
-
-	# TODO: bash and zsh completion
-	# newbashcomp scripts/${PN}.bash ${PN}
-}
diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66.ebuild
index 43186bed90e6..704f1ef669e6 100644
--- a/dev-qt/qtchooser/qtchooser-66.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="test? (