gentoo resync : 01.12.2017

5 files changed, 10 insertions, 182 deletions

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index a1f29e482908..16af65089723 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,13 +1,8 @@
-AUX fcitx-qt5-1.0.5-ucs4.patch 3776 BLAKE2B 25ff6c08814ea0cc174ecb2a0b454ad66dfd2fbe6ef74b88d5bb6b612c847cf405a76662de6a66b8f6027d4ae49069780f5ba04bb65ab9db4db73ff1435a7415 SHA512 8c604f95ab49e99cbbc701a5dff619d5940b3e7dceadad93ca16998f8d87eba9995f4ef55c51df2ba2894e4b38575c751617481d3de310da15f6398af53f61d5
-DIST fcitx-qt5-1.0.5.tar.xz 53584 SHA256 8cef90024ca84c3f607943b91f6bfe63fd077507bbe100e5a1936464095841de SHA512 f4da9ede8918cef7aa0dbacea534ab81024e3c6d812bedd287c4c4c9a8b9ca994d4708489c602967f3504ce057ec6e118674503f5d796883f1890e8ecc11c501 WHIRLPOOL 764190a5f523fc40ca5f937704d5bc1a7018232284f50b9b1b6a36b5dd41dfbebda5db337bdc49b08e601e94f51935f2a70d96dddbd4091744ec8c89a77f26b0
-DIST fcitx-qt5-1.0.6.tar.xz 53892 SHA256 a2aea7b49a9508e68d087ac5c9f3d1d1d414318e1aca14fed92a2f8a7e8848c8 SHA512 ea816a3bc324b838d77d7ee67a05853f7f07cbc3c0c1e0a3809fe72084f7e0db8e98623499299712b8b496922e46acb06cf3a1cbd3ff2ef1de92ca5a74d540da WHIRLPOOL aae4029ad2bd5120cd7910fa0a2644dca346acbf47da22d54d7fd3bdb70fab9bdbcf40207e8870f1bebee48de07d9c4a39d44ef04a56eb8472e31087cf6326d3
-DIST fcitx-qt5-1.1.0.tar.xz 55944 SHA256 9be3205e9bb730a23f28bf742d8c41a5035fcd8d91b51aaef875d888c12c0c65 SHA512 1f11c13162483957f0ff29dc8d05e8c781bfcc6f60d938037b94ae825be9c1bc47f594540a2d1d3ffa7185abcc9fd734522a64e36813d3116ec394b52f98135c WHIRLPOOL bbac0393b3e697d48b8bde3acec54a1f8d3daade53c31b8775418067c450c3960820c6ce2e2ec1583d1aa2263a7f7f13cf08d7b32deb1c1a851fc892e367f4e2
-DIST fcitx-qt5-1.1.1.tar.xz 56352 SHA256 4b062869dae011747ff257e6976debd1d69fb13e6121318ce725c0c240291b02 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c WHIRLPOOL 385566104e215309dae5742ee4ed360b4b5a23b282fe64a4e50ac13a710478998262f2022320ceda2c4f423406292e7ded48dd2adec7e7b532d5e4bb8b524776
-DIST fcitx-qt5-1.2.0.tar.xz 134224 SHA256 59e9ff57d04bf82d117d5df9c330b63e2086386976052aac79364575ddfa7dea SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915 WHIRLPOOL 10877bafe4ce31bb276e1a24f73b81dd87e9611341790b84ae881bcb6cddf30f01236422a64c0ca09b922f8e13ee86a99f703ef0ae16084f3a6ae49ab52e4a33
-EBUILD fcitx-qt5-1.0.5.ebuild 860 BLAKE2B ee13a63fb2e97a53158c65665c4bca11c1b30c359d072bf4ea451aecdd96d97d8478261570b624d82a5814d278fa654df7699192e556a158f47256ea186b9829 SHA512 08f085874b6e2681846ba6abc3a88f8d21e13e009197e3b2955f920f74f8c6a5778d565ca5d8ec8a0ffcda130b4620b3c7b05f068704493f33a583fce366fb8c
-EBUILD fcitx-qt5-1.0.6.ebuild 818 BLAKE2B 48028485bd784b2283d370f1c7eac0d064a8b8aafdfb31fc6f8be9590cc3160b7592224ca8fcdc944b091f9d9e469b86a7940c848eafd789c8db62e3354fee3f SHA512 47626df5ea35a0ed011d12589a95aaf71ef0c59f6070efcf310e64c0de8a3ff5fa77e014e6cfac2cad6694ace40a7fcb313de6d51cd92b83b3e44ba8fcfbd824
-EBUILD fcitx-qt5-1.1.0.ebuild 816 BLAKE2B 7f837ec5701c7d707725976f6e795fe6f21c116a7c724ed54a99c05c2d49a38e4b2d8fedcbe1d3ab947d3d46bf938b5fc4130f387592da5a087b170630e5b586 SHA512 d25fb2bfb7706cba12f36a8cd40b420d94c01cfbd5f177b1dee41e8ad3d259fdefe4da1dd0aed40dd8016f9ebf7ec4364812f21678678ad07d8c771bb8e3dcee
+DIST fcitx-qt5-1.1.1.tar.xz 56352 BLAKE2B 1fea4484f79fa9f9bcd52ac59b4e64cb9947a2cdc46e3df3c3729ef37d136c4fcf787d7a8abd946e5a0d02f909c0a94b6d19b98a93cf9dc2ec49d172a5f19550 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c
+DIST fcitx-qt5-1.2.0.tar.xz 134224 BLAKE2B 8358ec0b1cf95534f15536dd9529d4f7da47e6c08c050cc93503db958348ce4d940eb1903be8f161fec8adeca58c03838f021e36ecf39908361cddee40d806d4 SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915
+DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd SHA512 0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
 EBUILD fcitx-qt5-1.1.1.ebuild 846 BLAKE2B 2473b95b1dac058ab06d279c79de3cbf8d211439173ff31faaa2cfbef1f4050e257903f47f99b08aab01f7541600dc3ba2e6db393635e60a395db799d5202f52 SHA512 1fdcacc24874adc4ffd7e110265fc029eaf3c2a6e5ef4a427d161f091081e5e8f76d1b9e03f3b3e873ac2e7f2852fecf3e7e0572556e8de23493ee46b2daa4a7
 EBUILD fcitx-qt5-1.2.0.ebuild 872 BLAKE2B b7a400a699a427eecfe044c5aaf0a2521e959ca26b1fe7be59a75c1295d9408ccfdc8f717ef85ec955e7c7af054a9af15292c723388944ec8965ab695cb4bc57 SHA512 93a1876b5b9684f9c624dca1e50b980e37017714cd5bdd24625c51a2a0bff4dcb265a1e7175325ce6faefe509460cc99440d5d6b6928741eb20ace4f39426af2
+EBUILD fcitx-qt5-1.2.1.ebuild 877 BLAKE2B 2da08645fa891ce19efbc3fc69049c19bd9e9d547604c3e23e66484e7a87e3ee067eddd0d07215c6d2ea3046e940d5e4eb9359bc1c484718037f7910a49520ae SHA512 947a7cd11661dcb1aa5e55724e8808d20300ffe49e5653ca19b2ca98c6c52fc32cd705173b20fe014ead0eecd076a1affaf33db1509ab4dea51f42bfb7c1db58
 EBUILD fcitx-qt5-4.9999.ebuild 848 BLAKE2B 9dcd52abba77d2b9679721edc4c5d4614182739cd59912d4a058d2ed56cd34478b934f783aa03d4bdc2912047fb269859d298b91d7f943053c43dd0524948ca0 SHA512 2b13a220dbf44f0acd6872961930dd9f01374bcd4c54c1b668dd49dc1129039a87a620e37cbc04c091a6fdb06837fb75ef8b7c171e030457ee239201dd4426fe
 MISC metadata.xml 448 BLAKE2B 5ce33f3716f2b2d13353f7393c8c406d4025e03c7c6856cf6aae6d3337b566c70fa1bd90be5c8f6e34b940c55dad1803639101b8266b9b91d405611742698f12 SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild
deleted file mode 100644
index 7e1852577c1f..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild
+++ /dev/null
@@ -1,39 +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/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild
deleted file mode 100644
index 8668783c73fe..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +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/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ~ppc64 x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
index 4c3c996c6d6f..a7aa45d5e1dd 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit cmake-utils
 
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
@@ -13,19 +13,19 @@ fi
 
 DESCRIPTION="Fcitx input method module for Qt 5"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+"
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
-KEYWORDS="amd64 ~hppa ~ppc64 x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 # Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.8
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5=
@@ -33,11 +33,8 @@ RDEPEND=">=app-i18n/fcitx-4.2.8
 	virtual/libintl
 	x11-libs/libxkbcommon"
 DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
 	kde-frameworks/extra-cmake-modules:5
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-ucs4.patch"
-)
-
 DOCS=()
diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch
deleted file mode 100644
index 28cf78efc9c1..000000000000
--- a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://github.com/fcitx/fcitx-qt5/commit/31ecc9f2f9c8eb77082044944bbb6740d35ae7c3
-https://github.com/fcitx/fcitx-qt5/commit/8fc110e6125d85d3c50112bc20a6ed36395b2b21
-
---- /platforminputcontext/qfcitxplatforminputcontext.cpp
-+++ /platforminputcontext/qfcitxplatforminputcontext.cpp
-@@ -254,6 +254,12 @@
-                     anchor = var2.toInt();
-                 else
-                     anchor = cursor;
-+
-+                // adjust it to real character size
-+                QVector<uint> tempUCS4 = text.leftRef(cursor).toUcs4();
-+                cursor = tempUCS4.size();
-+                tempUCS4 = text.leftRef(anchor).toUcs4();
-+                anchor = tempUCS4.size();
-                 if (data.surroundingText != text) {
-                     data.surroundingText = text;
-                     proxy->SetSurroundingText(text, cursor, anchor);
-@@ -388,6 +394,7 @@
-             delete data.proxy;
-         }
-         data.proxy = new FcitxQtInputContextProxy(m_connection->serviceName(), path, *m_connection->connection(), this);
-+        data.proxy->setProperty("icData", qVariantFromValue(static_cast<void*>(&data)));
-         connect(data.proxy, SIGNAL(CommitString(QString)), this, SLOT(commitString(QString)));
-         connect(data.proxy, SIGNAL(ForwardKey(uint, uint, int)), this, SLOT(forwardKey(uint, uint, int)));
-         connect(data.proxy, SIGNAL(UpdateFormattedPreedit(FcitxQtFormattedPreeditList,int)), this, SLOT(updateFormattedPreedit(FcitxQtFormattedPreeditList,int)));
-@@ -480,15 +487,56 @@
-     update(Qt::ImCursorRectangle);
- }
- 
--void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint nchar)
-+void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint _nchar)
- {
-     QObject *input = qApp->focusObject();
-     if (!input)
-         return;
- 
-     QInputMethodEvent event;
--    event.setCommitString("", offset, nchar);
--    QCoreApplication::sendEvent(input, &event);
-+
-+    FcitxQtInputContextProxy *proxy = qobject_cast<FcitxQtInputContextProxy*>(sender());
-+    if (!proxy) {
-+        return;
-+    }
-+
-+    FcitxQtICData *data = static_cast<FcitxQtICData*>(proxy->property("icData").value<void *>());
-+    QVector<uint> ucsText = data->surroundingText.toUcs4();
-+
-+    int cursor = data->surroundingCursor;
-+    // make nchar signed so we are safer
-+    int nchar = _nchar;
-+    // Qt's reconvert semantics is different from gtk's. It doesn't count the current
-+    // selection. Discard selection from nchar.
-+    if (data->surroundingAnchor < data->surroundingCursor) {
-+        nchar -= data->surroundingCursor - data->surroundingAnchor;
-+        offset += data->surroundingCursor - data->surroundingAnchor;
-+        cursor = data->surroundingAnchor;
-+    } else if (data->surroundingAnchor > data->surroundingCursor) {
-+        nchar -= data->surroundingAnchor - data->surroundingCursor;
-+        cursor = data->surroundingCursor;
-+    }
-+
-+    // validates
-+    if (nchar >= 0 && cursor + offset >= 0 && cursor + offset + nchar < ucsText.size()) {
-+        // order matters
-+        QVector<uint> replacedChars = ucsText.mid(cursor + offset, nchar);
-+        nchar = QString::fromUcs4(replacedChars.data(), replacedChars.size()).size();
-+
-+        int start, len;
-+        if (offset >= 0) {
-+            start = cursor;
-+            len = offset;
-+        } else {
-+            start = cursor;
-+            len = -offset;
-+        }
-+
-+        QVector<uint> prefixedChars = ucsText.mid(start, len);
-+        offset = QString::fromUcs4(prefixedChars.data(), prefixedChars.size()).size() * (offset >= 0 ? 1 : -1);
-+        event.setCommitString("", offset, nchar);
-+        QCoreApplication::sendEvent(input, &event);
-+    }
- }
- 
- void QFcitxPlatformInputContext::forwardKey(uint keyval, uint state, int type)