gentoo resync : 16.11.2017

4 files changed, 46 insertions, 4 deletions

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 4b1459fceee6..ab82a7416811 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -3,11 +3,13 @@ DIST fcitx-qt5-1.0.5.tar.xz 53584 SHA256 8cef90024ca84c3f607943b91f6bfe63fd07750
 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 SHA256 d8cb4ee5dc2b7228a6960af1baf075585437c4fc630eb8749c4fcbb9ff2b473e SHA512 08f085874b6e2681846ba6abc3a88f8d21e13e009197e3b2955f920f74f8c6a5778d565ca5d8ec8a0ffcda130b4620b3c7b05f068704493f33a583fce366fb8c WHIRLPOOL afee0f3252f99a044bd7c54852f0b6ec976c05d63a3dcf5fc89b019dd7d93e415a5aea0beff8f1d39d3447ec822a9c090a6b2426a4b62da67acb38f1d94029f2
 EBUILD fcitx-qt5-1.0.6.ebuild 818 SHA256 0a296833bba8c1c01fea77e443b3e792d1c92201cf189ea1fbf2b9205769aa7b SHA512 47626df5ea35a0ed011d12589a95aaf71ef0c59f6070efcf310e64c0de8a3ff5fa77e014e6cfac2cad6694ace40a7fcb313de6d51cd92b83b3e44ba8fcfbd824 WHIRLPOOL 1970b80b93ab02f093998af92b1efc4f004b4382f0c102b86f0818b8cb4ea9bb5384c105a951def436429d45e89067c1f71858d6e9739d0896c6b4c39d6858a8
 EBUILD fcitx-qt5-1.1.0.ebuild 816 SHA256 2c8b0cd85dc0f4805fe1e608d15379ef980fdb42f83a31ec17f2a0e5a1972a22 SHA512 d25fb2bfb7706cba12f36a8cd40b420d94c01cfbd5f177b1dee41e8ad3d259fdefe4da1dd0aed40dd8016f9ebf7ec4364812f21678678ad07d8c771bb8e3dcee WHIRLPOOL 4af6e879bef817f5ff376eced3d7b97d32e3bc98ba339ed45600bb5f7597ec5301f9c78bce5dd05c6306ec7c28fcfd615058de4c9163b3bbdc4a44b30a678038
-EBUILD fcitx-qt5-1.1.1.ebuild 836 SHA256 7a565c4c21b9d96419aba412cdbeef3345b4729009cbe3f7bb91bbfdcbd4a6cd SHA512 d7cd3032b3894e1bf7620a439168388c5aa4a5d44d196ba88e9a264888de443aa9238d2845469958cb61a7d4e179fcd698a90a4818b6e03d28b431d5fcb97c94 WHIRLPOOL cde9831ec92eada24ddc01753d099c5efb3a444bfe48afa025429bde81f6d217068a857204a15c4a3a32b533a73a44afe300c3c09cc41266960e2baecd4cb96a
-EBUILD fcitx-qt5-4.9999.ebuild 837 SHA256 a9538b9ec41a62169f0fa9b1931ebd1e7d34761ab34fadc7d2fa5edea5e37ba9 SHA512 587dae1dba3bbcdfa09329348d8eaed38aa277a8fa84c288bf958a668133f16650a5fc9900ea364fc1b8cd6b8c35d64640c1eea9f59d2b7bd340822e2cd23498 WHIRLPOOL c2492f8558ae8aa8116b9c671f17b72b0cddd75bd5c499ece1de990a11b8fecf4d3912361f3f10c0caa3c52c26d9ecdfd950d3250d53100976ba794c892d0c78
+EBUILD fcitx-qt5-1.1.1.ebuild 843 SHA256 5751ba3704096cbceb334eecf15bea8f42cb2b729aaae08b4b52c2a45d8b3d34 SHA512 75723caad817aa2da06d63f5c9609406be07f33bd7acf60f997562cf748ce7322d6f0a4efcee151b539520b9b852f5b1c7eeac390d62388046e039be8d4f7094 WHIRLPOOL fbf0815e87b388b50113d1fd1468ab5f0f3507afd7e55c12f5095ae90dd3e4c587d17d6fe4d1350e3a5d0e599169138af1ade4df50eb841367ea52d2dc3514f9
+EBUILD fcitx-qt5-1.2.0.ebuild 872 SHA256 a929f70f8c39c7d07915b4c6eedf92542e446268ed54ed57ca3be28206ba4971 SHA512 93a1876b5b9684f9c624dca1e50b980e37017714cd5bdd24625c51a2a0bff4dcb265a1e7175325ce6faefe509460cc99440d5d6b6928741eb20ace4f39426af2 WHIRLPOOL c9bf329cefb4ca551b9e65d9d5c9ba5facb90fa6ebc3302ad7dfb13f2089b48ec54ad3e2a3b3bc9a6ea9320c8c79715e8672f560f2bb3eb87112e7ee94a2dc4b
+EBUILD fcitx-qt5-4.9999.ebuild 848 SHA256 78cd823bf4f824b9c324d8b3c8b10122883a5e8e53130c4351c8c81200571344 SHA512 2b13a220dbf44f0acd6872961930dd9f01374bcd4c54c1b668dd49dc1129039a87a620e37cbc04c091a6fdb06837fb75ef8b7c171e030457ee239201dd4426fe WHIRLPOOL 00dddddc2ee509a6e6d82edc6540d50dff96c8d742c1e5ebaa14f5f11d2ad8c433dd20dd719e8295356677c3102a350de27b021dd4bb4b4443f3fc99cf6bf422
 MISC ChangeLog 4384 SHA256 261f8d3d58fa4dbf1d6ab5855c99b16dd16a4debd289a01ec3c7a197fd03eb1e SHA512 fb76c92b2cb205d781b12b3e11b80104fcf4cabd4c38e953f15ed4eb4bd4e659d7fb5a65748fe2a2e9fe512ce73e0b36eda2dc3dd6fe5be8fde94a356426821d WHIRLPOOL 9f93b04594daeaf416b2093b12ae5d39844968e7ef0d46a0645d688ba1e500973f87541c6cb7ee2a3a4535d137ff6eec905bfe088cf2e84c2f6ad1e9c916087f
 MISC ChangeLog-2015 843 SHA256 e89e001966ce223ad3334738870444dca20664da57c0b0d64b11de32fc26f3cb SHA512 714b955d8a859889a2af1d47882c3d06e5a056a8011a11b191c867997c91f90a8fcffc65bcc891b452a34d04feea31d75c8cb16ff9bff837ee6adab3bf648407 WHIRLPOOL 0e9661f71dfaaf03bf5b68167c5f8442112fc0d7f94b6c82f1cdb5ef0eb1e82a5ed81fd44dd859827fe61f83278b157c50cf4cbf9e840da9cc8d8c15bd38916b
 MISC metadata.xml 448 SHA256 51d64c2dd912603ad14ae9e3fc20014911082ebec23f27468f06c2d0a39ef05a SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4 WHIRLPOOL f521d77d9953ee344937204f7be001e5eccc201b7fe8b9be6139728367aa64b0665877ee706e9df989576ac6faa64480da0b068dae1fec7066bf431a86ddd6bc
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
index fd45e226e6b5..e90aca2684c4 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+ LGPL-2+"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
 KEYWORDS="amd64 ~hppa ~ppc64 x86"
 IUSE=""
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.0.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.0.ebuild
new file mode 100644
index 000000000000..39a4fc5f78f1
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# 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="BSD GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE=""
+
+# Private headers of dev-qt/qtgui:5 used.
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5
+	virtual/libintl
+	x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
index 5b544d18cff9..a0b099a0108e 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
 fi
 
-LICENSE="GPL-2+ LGPL-2+"
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
 SLOT="4"
 KEYWORDS=""
 IUSE=""