gentoo resync : 31.10.2017

4 files changed, 2 insertions, 68 deletions

diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index a3b32fe77c4f..e2e385965342 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/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 qttranslations-opensource-src-5.6.2.tar.xz 1204148 SHA256 7d793b447c1673206e0c5512883ad1435554dbaebf2152475b6d4a7ba6efa421 SHA512 7b2cf7cc1560866a8172ca6478f94b3f737e5b71d60afe1b4dbe302c7f589a42a4156bb886bedc1d9339de7d70e71a28ab96785ba597d050161aac28d16e40a8 WHIRLPOOL e35729644293235e22c1607651ae46e0840d380737a7bba43d958f85ee1e8d8f82842b8124108a64240ecdf5271c9bed2f8ef7d1543ab74457b506316eb015b0
 DIST qttranslations-opensource-src-5.7.1.tar.xz 1206116 SHA256 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 SHA512 8d7705d1fb2569f90bb7fbb9bdfe7ffdbf7a8746ee4da634f66fb7f70c14b91f7257165b6ac041cbe4918b88e6ec344c8e554f1e7339257e7e1b9a06e78ba837 WHIRLPOOL 61486e72f2ff43649e61cda6f8ab98f8c85636f4e96ea6c648dc204fdb998f0a60114faa2a75e7f6b2e5bc45a8ef2205923a62436b11616fb8fe2d2693104d30
 DIST qttranslations-opensource-src-5.9.2.tar.xz 1412128 SHA256 5df16ddf9da0f42a3040aef2a92ad7da67381e2e4c132632fddf3a7a8026d12f SHA512 e84e9741cc6f938556c4fd423fef4852b039ebe4afc12db8570a6540717297541f632a07d750ee25c46eea9ae858a78fba18be49597c47cb8c9165b961e0ee94 WHIRLPOOL 1ccf4921c795053aaf86d89dda9f995a3708de8344250256d5557dcc471a5083540b0166fdf4f3f900c10fe2b38031b79011711fe7b9b871d853632c44f704e0
-EBUILD qttranslations-4.8.6-r1.ebuild 830 SHA256 3e0143c4404716ded9f002d7180a90bef3cbd5ef1a363373703dac857159cf27 SHA512 2e837553720c7cc376d9dc38579d61549d1a6565afb5c042a5b3fe7ec73f34c92380039d5263b8732975fe4702244da3e7926f8af2e9566825e529a31bdec7b6 WHIRLPOOL 28a149e0755b4801775d8bb0932d649c967d884b4f54b99d3234caae82edaaa3c92fcda86676fbcc53abda46aaba4715870b972d233f564124e81d8302547c42
-EBUILD qttranslations-4.8.7.ebuild 772 SHA256 342eb78058bf9d362ae46b46ef8496c069242b5f486f69566de6960d7b26fad1 SHA512 85e9692f0d861c014bb012bf4a735c5d1a9449469d104eda5e77c0240a2f5f9d55deec4db172c016875845f02790c114180d6f179bacf29c43444d3a643a64ab WHIRLPOOL 829d04e287cff9baba0fbaf0da8a01a50267347736440c608e04ca2d8dedfa99a5456a2d0013c50395c8c7e8e935a48a8fd181a67d569bd514f084afb5850cf4
-EBUILD qttranslations-5.6.2.ebuild 361 SHA256 486530f0926dc885e45f94a1fddb2d8ea7bc1f2ef1facd192b856b44c38729c9 SHA512 77141b58204d678f603d5a840b4136029076179333fef0a46c1d2625a8e7d9c46995af68ad0f0d002cbb4fc32412c6e92a4067326bfb61258aedadbb2a2fef73 WHIRLPOOL 228a00379b8c3c4cd9d0e56401d5e38df31ef882098a4cf8e47b0a7de8fe66e25c8965a9f7a6179ed0fbf3497fee24b8c120af268b52bd6c9b87c48d30b08197
+EBUILD qttranslations-4.8.7.ebuild 773 SHA256 e15b26b0722d6391cd741573492d476ab7be5a15f7c937e318b86dfbbc97a314 SHA512 1f833bde8f1dcdbd7838cee55c193738203bf74d0ef55865bfe511e3f5749675d216669af2476530e3b27e3b12ef481e092e7866e6fffafe9d8bfba75d3a52ab WHIRLPOOL a33035882c26184954510b6bae08b750adf4dbffa1e3957e941c49d7b40bca32a9e56bb81f581df1130da96dd1525e5189e98a22d3ee911464e76d72ad8b8b17
 EBUILD qttranslations-5.7.1.ebuild 362 SHA256 140f89aa368785e60d60b52f0cd134094166d1cd4085bcd557a3d37ceb536dc4 SHA512 f5e75b59fc5457b491084946657acd1268f1fc64b723f5a91564b4a21606569ab45137913618ab3501a58fefea59793a298c241f0be462279a857ad836ae34e1 WHIRLPOOL 3eb4c7d25954d0ab99e9b34bcb7f1cc78f774572ec03ac195c334e94afa503dde510474448b241a97fe2bc1f4c315e23e8e299b9958ad9617542fb0e4db7d9a1
 EBUILD qttranslations-5.9.2.ebuild 367 SHA256 f4a7dc0d43f18022b28daa651cdbe4f96643a588302ee7ef3ec67f72379da828 SHA512 5fee74bf66f818592d441d46dc379f391d50097f530e04d9e3bce8288d4f221d56632473e6bfd86974bc342a833206e1c27c15bbda31fee36f6bb829df494415 WHIRLPOOL 9b3d026244f2f41a3d434cd7c18fd4db152cacedfa5bb5f544dfe093cfddfd7721187de85e18874c225f0a1f12cc4aae208fc3d8cf6af57fc37f6f2a6c745d48
 MISC ChangeLog 7390 SHA256 de68fe02fec180799c5ece3752ba3384b218a9cfa0f71ca9d6adf3f0bc4af08e SHA512 b3ae0fdd3144290c493390f96ea4b682d24b5ca083a584eba0c2d35215aed748b548e568d73ce8e2c9b3741153cbe08505bd98df60c569ad6cba5f593f5a6752 WHIRLPOOL b528994f10e5a485a54bbb0172474952d360dd0cb8f797f7c357261ca925b2e5f86d6db8904684f10917f784b462e0c483be42fe222e6de98fa0d5c29700f992
diff --git a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild b/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
deleted file mode 100644
index 2567a4f77fa7..000000000000
--- a/dev-qt/qttranslations/qttranslations-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="Translation files for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm ~arm64 hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
-
-QT4_TARGET_DIRECTORIES="translations"
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		qt4_prepare_env
-		qt4_symlink_tools_to_build_dir
-		qt4_foreach_target_subdir qt4_qmake
-	fi
-}
-
-multilib_src_compile() {
-	multilib_is_native_abi && qt4_multilib_src_compile
-}
-
-multilib_src_test() {
-	:
-}
-
-multilib_src_install() {
-	multilib_is_native_abi && qt4_multilib_src_install
-}
diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
index 10a440278223..11907196f693 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Translation files 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=""
diff --git a/dev-qt/qttranslations/qttranslations-5.6.2.ebuild b/dev-qt/qttranslations/qttranslations-5.6.2.ebuild
deleted file mode 100644
index 97090e269867..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.6.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""