gentoo resync : 31.10.2017

4 files changed, 2 insertions, 70 deletions

diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 885fcc2973c1..41de443e6fd1 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,11 +1,7 @@
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
-EBUILD qttest-4.8.6-r1.ebuild 976 SHA256 dd226f587d04b98dc5d9ad03f51df2ba1fb1b85b0324b1dddd77a36981be2b09 SHA512 379df69a87f71cdd24e647a8b0f2e17d91a158b9eed535fd252296211d0ee276d2e2d907d3cbb2734c3bd0608ca2ef48e6732b7009bedd31d5b36b4d210a9808 WHIRLPOOL c1b6fa32ce12051a31c61ecb5120e60cd57816314a922a6bd6e2ecf7b280c3e660053be3916a09fc6d2770fc41a803590d46d445a12174003c1e366f44e7eecf
-EBUILD qttest-4.8.7.ebuild 932 SHA256 a50e9ec29857ce58ce68a96e9d28195ee0d82f5d79dbcb098f3ebad234e9b396 SHA512 16694b6dbec76437444ec6056185f3fc92fce2ee16b775430db84e83f38ac45ab85f274addef4620ca9add95f478394035703cf3b3acf81ba19f4f2985c58874 WHIRLPOOL f233551f56ebcd63997fe272c638b2cfbdb470f3af43c30b65a3a182a82f23d707e53900302347dcfea85cc1c345ce27ae645d28300d025f8f67558eb7453bab
-EBUILD qttest-5.6.2.ebuild 490 SHA256 1a9c04d821bd8084660f034c7eec6a91ba706f97223b781fddbae86258255656 SHA512 a8d5f9d0581b5cf5003ea97c657a77820f3feeef0002c8232185cdda429b4035ad83ff8d9de4392a1c02d85ae64da02b51f3f5edb505521cf30844da750ad14c WHIRLPOOL a3418004f3bbe8e52b7b5a10ec534bf1197ad59c035fe8f524fb8d10d7b08254a1d83ddfb8ccb201489ebcbc2cb55f0490135a5ecea4c051e4dc2272b94bb25a
+EBUILD qttest-4.8.7.ebuild 933 SHA256 99e1077337f840f5990f21fe1c42138d42fa746ada617bcf93b5636f46d4570f SHA512 7d2f377603287d0aff165aac7017622e0b8e4445103696911d6784c108cb4d9f1f04200c1baaf6aaaebb865c5038ce0d393240c91e6da06968c91171d93568e8 WHIRLPOOL dc872856e27ba1cab416b4bdf53de97a3a74bea9102aee9d94c937d1dee1e0a1c185cba73b83eca95d1d7cf1bcf600e0b05eb89b87d9b25557491f1e1dea3280
 EBUILD qttest-5.7.1.ebuild 491 SHA256 09704326e73d84cca16563542993d98fe833610bf7bbe7c8a2baf562a1bc20ba SHA512 8709179f307e0c8a179fb13d947762807db80fdd81ad4fefd54fc88d95b98fa4efca98e41a6deaca734e99df4e581705e36bbb0d92a0a5c357e01e7efcc878d6 WHIRLPOOL 51ae419b7fede3415b3f24a4899ce1985f0b4c1cc010dc288a6307dfb799883b21c98cb2f28d3aad49b4faa67ffd711c30a1952c1ab28b685625e3d1e01165ec
 EBUILD qttest-5.9.2.ebuild 496 SHA256 253f77368ce8b73601866cae4a20db035f8b80643e20929e7084577e49ef338f SHA512 9404b0261e85b73b653b6b7a673fcda3b28472682273befe5dd81d2003aa029143ca476b3e274461ecc3c2d3cce3a88482061944800332b8ce100f25d109db5d WHIRLPOOL 78b7b99477adc3bb325b22720afe0ab92e74038bcdf3232d9cda2457bdfa8e8ff57abdd433585e06ddb5303b61697561aac6b089ba909153843269e47fd9120f
 MISC ChangeLog 6942 SHA256 a14729ebe432b69802f0dde8aa73f231df8c62daf1dc0bb336a51fb291576cb2 SHA512 8d2be5ebec38ffae86c845c5bba52f29ab8ae23a8180c256040167d9a76a504a79f8eb9ad956b40064bec4d5ec2f50273da10046626e084d364f081749588558 WHIRLPOOL e7df4408e647d103c8726303e8e5f8ca2e5dea4f79ba0aed2c150e0ac3094382d8e04dd64a1525ca8e99a3fe686b5d299a1d3e3c2ffdf0463279ac69232aadd7
diff --git a/dev-qt/qttest/qttest-4.8.6-r1.ebuild b/dev-qt/qttest/qttest-4.8.6-r1.ebuild
deleted file mode 100644
index 4d831d92e2b8..000000000000
--- a/dev-qt/qttest/qttest-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/testlib"
-
-multilib_src_configure() {
-	local myconf=(
-		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
-		-no-xinerama -no-xshape -no-sm -no-opengl
-		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-		-no-accessibility -no-fontconfig -no-glib -no-svg
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild
index 2562d388b384..c9adac525eb4 100644
--- a/dev-qt/qttest/qttest-4.8.7.ebuild
+++ b/dev-qt/qttest/qttest-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.6.2.ebuild b/dev-qt/qttest/qttest-5.6.2.ebuild
deleted file mode 100644
index aaf977397d03..000000000000
--- a/dev-qt/qttest/qttest-5.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)