gentoo resync : 01.12.2017

3 files changed, 2 insertions, 132 deletions

diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index b34031169efb..7ddb3d2840be 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -1,10 +1,6 @@
-DIST kcm-fcitx-0.4.3.tar.xz 56864 SHA256 b7e9ad4569c0940f9654d58de1f13281fcbcab56febbd346951edcfa0a86e208 SHA512 d311699a5d99f75d353899b7fba0a950491ee8b891724b855033449900ec4b3db9408bb1b80e60ceb0dbb0ce91072162062261a497f83a2a683214b71c3f4713 WHIRLPOOL 04aec049436a120362d02ba900a0d8639feb359b4cc6b99a871c7ffa8d9660270c321828b8660c718890a7f0ea308ea584711ed712762aab712fe8d7e72a205a
-DIST kcm-fcitx-0.5.3.tar.xz 57488 SHA256 f2de5fa4e31a96fea059e4d390c6f1d6fdc98af572c19a0e84cf6181da7c2935 SHA512 19d172cbf1d2a13f289b64b67488ddc5ba83a9d26503438045271c85df3775715614951652dc6f8da52a3b9d692d6e2138a760fc51d1e7f0f8bb0bd467265496 WHIRLPOOL 7be5cfb389bfcf5f451b5619c0818afeaa7b88199375b2f5d85bdcc21b1259008a3653f1cd26e33689a9f18130bc53269dceb20fca5b64aaa8f619e06f2d413e
-DIST kcm-fcitx-0.5.4.tar.xz 59744 SHA256 ebf81446bd7f9478b421c4ab8b8e050d13a15327a3b6cde93cf62ed09a697402 SHA512 349fe50303e027f44b53d954c088e441450aad07dac3a1162a5dcf9c445ca9d04bd3c36475c17dab91ed2df9c3c71031d7582e39b85ad0465a816f7fc24ac0bd WHIRLPOOL e7d9bcad0e1fbe1cb576f69a82e26b4e910e930003b51940cafc5ddcef65eaab0b4c608c8ba878b12a101aad811e74cf9546be129f833b3c7cd33c3597b00fbd
-DIST kcm-fcitx-0.5.5.tar.xz 63364 SHA256 fe6ff7fe4df1e6bdbeb53699cfbd654b7b8c8e7bb299f6b8af86618f873a77ba SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e WHIRLPOOL e23eaae17de906000f808b9a21f46c9b8ea529a13a97c0e832dc708ad130e4668852c46ba92bb16e0f956664932ba38dd650eefcf8fd1f128a4e9de87a36f4c7
+DIST kcm-fcitx-0.4.3.tar.xz 56864 BLAKE2B 29fd64075273b08f4bf36d7f5c63b3548dbbb5ad408f0e48920b6665c7389c408aa3d4b3a88d9299bd29b26fcf06562a21dd739444a444ed4d7bfb56edf3715a SHA512 d311699a5d99f75d353899b7fba0a950491ee8b891724b855033449900ec4b3db9408bb1b80e60ceb0dbb0ce91072162062261a497f83a2a683214b71c3f4713
+DIST kcm-fcitx-0.5.5.tar.xz 63364 BLAKE2B e3b185468a4587c510e47bee4d7260d5d9ed27032174e3928ed3f008a68e8a4b9d124bda14a75348d65c41ddff2e39bb91d8a4f3663a81788850e5fb33740c8a SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e
 EBUILD kcm-fcitx-0.4.3.ebuild 949 BLAKE2B bf1f10dcf2fb80320e58a6ea6d617ad791a9506621e5773e11a3e5bf8b9602eb0f141f610c8bfd3870b0d081bde048225c7d949e42a5479443317825028f96f5 SHA512 1946700c9e48bfc4dec9c2e7268cbb72e712a7cf7f9ef6f1eb565105215e0063deaf40c231536301dfb29d8272a7decf6b77adbc0a007b79978a9289965f3cd0
-EBUILD kcm-fcitx-0.5.3.ebuild 1312 BLAKE2B e9c42c8f486338dff218618da956c78bb413db405246a1579b2eb8775e965593ddc436bbe09d672b4a5dcd69b0a8dad6a04a8fb04fd615f9342fa5072ae85766 SHA512 1f2536c137ea7cadb169563e86e01a2ec4454bfb1bf3cfcbe65c054b1cad3b48e4655b2b5ea2295625c637080d7093b3d476e821095fe7a076032c0131608861
-EBUILD kcm-fcitx-0.5.4.ebuild 1606 BLAKE2B ca7e8d528bf1124bd43ef0d41324afab949efadc6ebc8acc0f9565f05c138c5f3ccf4834c78006341093a75e3518c9b5900d97cd739018963ac06458cd642762 SHA512 5a268c18e1095cfb588fc251e8e5282748e419167ab78d8d92c784b954bf7937e8a42520f65c103930bc80f910d60b444acd3e3a8d873b4ca427728e191b5806
 EBUILD kcm-fcitx-0.5.5.ebuild 1199 BLAKE2B 9186ce35d1f594c8ead460c3c366452c276803df7c41d95cd8c7c90d31a20fb6a4d3b1c7e2766803ac7f33c51b82b924020497af6ef3538b38ddc56cd8e6a6c6 SHA512 8d708bbde38f28ab3305f9a8a6a4add691c8b54842f5fd2c74b4bf55d56d2c6ec288a4d29a06aeee05cd8dbb4830138f6b801bbce9c4f711bce170e4bf6eb52a
 EBUILD kcm-fcitx-4.4.9999.ebuild 928 BLAKE2B 93cf37311f6ab5d6a33430d767f1c8ddc37ca4e719540fd34ba0e758a918b2749c3bdaad4502cf65f96c10b609ff2cdcc9369876aac61480ca836aac45545c63 SHA512 e061c93dade243b11773f8d5fc2b1925de4c10a42b3f7f2349982348a4b4b5e4ffb7156b658781d49c877811ff572a6048cb2859bc1de5c35c741b5d99922f33
 EBUILD kcm-fcitx-4.5.9999.ebuild 1190 BLAKE2B 9a433e8e24730b407c8062109bbf47b75253a06ac6707073486bb177453f5955b83f0dbc0afc7a54b1e071914a9a6f3ee1d15b7c903ff192755324c573c3bdd8 SHA512 abf541143ab31d64a6e8ef13cdf4cc03704d0d568fd696cd02928249ceeef378ed89b396807172bbcc0a518f8a0770d08d118e3a73780e9c51d33c2dddba6b72
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild
deleted file mode 100644
index 98f3ec001e9b..000000000000
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
-fi
-
-DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4-plasma5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	app-i18n/fcitx-qt5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kcmutils:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kitemviews:5
-	kde-frameworks/knewstuff:5
-	kde-frameworks/kwidgetsaddons:5
-	virtual/libintl
-	!${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5.
-	sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
deleted file mode 100644
index 5b2b210ad03a..000000000000
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
-fi
-
-DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4-plasma5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	>=app-i18n/fcitx-qt5-1.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde-frameworks/kcompletion:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kitemviews:5
-	kde-frameworks/knewstuff:5
-	kde-frameworks/kwidgetsaddons:5
-	virtual/libintl
-	!${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	# x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5.
-	sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt
-
-	# Adjust dependencies to match actual usage.
-	# https://github.com/fcitx/kcm-fcitx/issues/12
-	sed -e "s/KCMUtils/Completion\n    ConfigWidgets/" -i CMakeLists.txt
-	sed -e "s/KF5::KCMUtils/KF5::Completion\n  KF5::ConfigWidgets/" -i src/CMakeLists.txt
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
-	)
-
-	cmake-utils_src_configure
-}