gentoo resync : 31.10.2017

4 files changed, 2 insertions, 83 deletions

diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 845612c43783..d6a03364e5a9 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,12 +1,8 @@
 AUX 4.8.6-javascriptcore-x32.patch 1826 SHA256 d6568064e1f4ac9d67354f66e090b74dd6fb917830961ca63359a4cdf58e2cfc SHA512 9b93ebdb9c474ad4e4d09de9d99d97351022863ae3a58fb0b03d1cd103dd012d0a12643f6e00f60cf0a9a4ac24db98039e87d5dd9a1afcf8dc65696b4bcd4efb WHIRLPOOL ed0536fcd9fbe280bd4c77556f216320fdc1e8cf13193dab21e96651bfe70095e0840c7ba133c16bac58ae3993996e0df778a97e0565753026d3d73b236bef18
-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 qtscript-opensource-src-5.6.2.tar.xz 2587484 SHA256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e SHA512 3636b214f0573e471a1e44cf33097adcd104df7b74e5abedbc75fd9c44e804bb47172b6ab4c41513e8162e27850bf64067ca11196396b60c3bd2c968e15d3113 WHIRLPOOL 1375ddaac79ef2a99a0193696a64f3c16d03c404231ed641a45692e4be8cf26d65b9c199cf73fb8b2152486355ca8279b64d723b94dbb504fc585011c969c795
 DIST qtscript-opensource-src-5.7.1.tar.xz 2608180 SHA256 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 SHA512 6bde4add16745475d42c0fda0d3451a77717b14dca12b40a4e3cebc9e2b6edb04da23ebf9af46010135066524dd8ea0453a07420cf42228fd7ed5249b633a95c WHIRLPOOL 971db46b5f469a123e2727318017f42726db53251d5637e0804ce35905d1006322681362fe0f1d8f92f15f2f5f88e9a85862374a97256fe797223d2cabc55636
 DIST qtscript-opensource-src-5.9.2.tar.xz 2611900 SHA256 47807db5c2684609a0252601fda0a153530a2c97abb8c96df30f4e7897cd40f1 SHA512 3ce2e57a0a6b2382614f689edca0deed87afe944c1c41decb3b9f420449fa59f2b79e6330e78e01a950761a95903113eaa7fbf261886361114acf5015d93254c WHIRLPOOL 6c7c1d4eb25a3bc8e4c4a47512788d1e7183eb7c3928ab2c892f8cfe7b7ed9e7ef1bc7f93e5e3be1ecd23635e6b118ae008270e6b8877e5746980e5492bfd9c3
-EBUILD qtscript-4.8.6-r2.ebuild 1122 SHA256 aec6842a2d20322154cccecc3cd56debff3e866a244da8bc016c5a216a14e186 SHA512 b19d49f1ea1400dc2ac0ff905c26c7aa47e32b7ddd7fbe8e397784feb8079b5dec64f6c448ee8db72f56835b58f2e80544e371453e3715b0caf1e366af6e8938 WHIRLPOOL 1516487e0352c6ed479c83c352bf75c957d71234ac62e0c8449d8aa5811c4489e9cf5fae0ed73e1631a51de52119a4dcb9b5546eafb6074658ff6b29f8e45588
-EBUILD qtscript-4.8.7.ebuild 1071 SHA256 8708b7abac9ba20465a99b40f9bcecf0234d47e5441efc6ceec2f66fd7e9aeca SHA512 96d65f72b7e56f2ca95527ef0eb057384ea8d3107f8ac06c297759cb29143fe529b30ad8a0c2858e786a45b2969ee1ceb45c33896d61dae36bf5dd1306534fbe WHIRLPOOL 6288043d07b5866ac63953e0595136196867756b7e9854f3bcaa2d80789b26481e6f4b37c8da4d5956c503b3ef9b2a1e1144658c1305098469f92737a5d8c877
-EBUILD qtscript-5.6.2.ebuild 663 SHA256 aa168b7de5ee353b7c6036b41a594423fa7357ea5d36ef4315702c95a24fbb08 SHA512 bde5326cddd6b9a7eb68a3ed440f1247a2cf504a2bcff726d55af998c8450129fd193ebd631bebe511ce78deae2589dddfe71c616571b1d12fd72570b326d205 WHIRLPOOL 393ac03e8ca1d87885bd262ee6c096d4d201115c0fdcd9c2399014488e41e61d5e18454e16463fc1526bb761cb936a2bd3f3d1109ae7fbdedd69414743ab2420
+EBUILD qtscript-4.8.7.ebuild 1072 SHA256 0c8eee8ff0f4d3e2f26d58dcebe5eddd2daa722ce3048e050ea1ecb88e82b626 SHA512 c3b6a2933cbf054228051ae4eddc50940915a269aa5130dccdb9bbfc895678632cbdb3935f061565eed532faa48aa661c194549b62fb1c83c11057512afad8e5 WHIRLPOOL 243736100a038b7faa21920f1f5912ead0b4d947095913b9f22c3d12bf36c84887905df4f002f6ad65defeb9a9aec742485eb0c67de8de3578a5c7205d4c407a
 EBUILD qtscript-5.7.1.ebuild 664 SHA256 2e862f8f6ecf13f51d6369c1d4317174cf332d99e9d9e0e930ef65c425c0912e SHA512 d068ca8ac446cfef1c8b6e4421b243f2f0e4476baa2003ef1487b46a1989284ddcd2bb806d381e2c87de49de094fdec750699cbf4138c7d0f44fb2043b77df49 WHIRLPOOL a97d58686f06199f456d816fd84fb44d8edd45789db13701635aaaf87bb5de64d9713e7b4f3536e83c23154c7affa8de858b5e7dcaa263b274266313a45d2573
 EBUILD qtscript-5.9.2.ebuild 674 SHA256 de3eb53d2e16e34fb0aa441851a1870226e259773a6d1db9d5a72dd94c440f78 SHA512 a183c06e6c4268195d2100fc404a941b559c7b6e6154d2ec36d7b391a59135563c29d96f159e14c6d334cdbc7ce170c475e9259fb6ad033b317ced1748bee101 WHIRLPOOL b2344fd060a1c698e67c595ed98132c0af3b0a2e4831e35b6b62658854fcc73f6e11da063650fd3ca9c624c302b10f0c5852df3c347ab90bbe45d2f02be60753
 MISC ChangeLog 8112 SHA256 0b411ba33865660e65d341e156ffb88aa462c458923e376b4fd23137581d0af8 SHA512 b57d770ffaf115c7eb36f3aa21e526feb9e4c44c5401d9f795f047b91790234016102e46821de4e80f8b639961c45eb6dea11bfc854edef66b2e30d4e6cd2fe7 WHIRLPOOL d0b841e0d72622a1c65fc023a721d58a3e255d5eff27fd0ec5e7645d6aec432cad375e93bfa2473dab622c3607fd4044fb0b152bd8a91280b9644dbfd9e86019
diff --git a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild b/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
deleted file mode 100644
index 4521eb08bb4d..000000000000
--- a/dev-qt/qtscript/qtscript-4.8.6-r2.ebuild
+++ /dev/null
@@ -1,41 +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 QtScript module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE="+jit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="src/script"
-
-QCONFIG_ADD="script"
-QCONFIG_DEFINE="QT_SCRIPT"
-
-PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" )
-
-multilib_src_configure() {
-	local myconf=(
-		$(qt_use jit javascript-jit)
-		-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-opengl -no-svg
-		-no-gtkstyle
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
index e5acb7448823..ce3c8d0893c2 100644
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtScript module for the Qt toolkit"
 
 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="+jit"
diff --git a/dev-qt/qtscript/qtscript-5.6.2.ebuild b/dev-qt/qtscript/qtscript-5.6.2.ebuild
deleted file mode 100644
index f605ec022dd4..000000000000
--- a/dev-qt/qtscript/qtscript-5.6.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex jit '' JAVASCRIPTCORE_JIT=no)
-	)
-	qt5-build_src_configure
-}