gentoo resync : 01.12.2017

4 files changed, 37 insertions, 49 deletions

diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest
index 3839b310ae3d..e591d8d3e5df 100644
--- a/app-i18n/fcitx-cloudpinyin/Manifest
+++ b/app-i18n/fcitx-cloudpinyin/Manifest
@@ -1,8 +1,6 @@
-DIST fcitx-cloudpinyin-0.3.1.tar.xz 19296 SHA256 2c919bf7979964bef861b432b821fc43fa94824e82372b03c653219b0fc05f6e SHA512 fda8501d8c132b3810f70d984f77652cefad5a052580c6607f893efdfed132a05053c6edf3ea8ba829e33abc237808eac6ca3521c6616ad2cfa5e3c4e0045297 WHIRLPOOL bcd8aae0339ecdc3db58a950c475e81133a90b08f9294dfea224d38ec7b6e2f929fff2d389761f2c90ee1553b9bd02fd8bf93ab9ef7c23101affebfff7b76d33
-DIST fcitx-cloudpinyin-0.3.4.tar.xz 20796 SHA256 c131e8cfd4d171f7749c2934f13092dcdffcf3d4ff1cefde7ed67daed74b7d90 SHA512 ecfab0e45387793986fc75f24372d69910552d6168c9dd63f258bf05bfa397350bfea2a6fc419ab067fc5a7737a3e8c39d4b8ae5d0501871e3365c8a07553b09 WHIRLPOOL 7dbecb3f5ec38c50364abddeb5c44318503fdf40783b6efd5c8ece029f0cd56f750057b547a25fa6836458ed15646d5923e09c4fc33d927f9d1a40e5332577c7
-DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 SHA256 2515fe35d1f9d377a997ce8095425ad71d0c76e3fcba2e1fffefc2ba46b765a3 SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e WHIRLPOOL bf05a4c882d14a9ac3a52bd2d3faf87ee67aea583199d7c5888f425db0f080bd6bc73a8fd3a2236f69a65f40ceef9bf2882dd24838f7dbba8407eafc8695235a
-EBUILD fcitx-cloudpinyin-0.3.1.ebuild 494 BLAKE2B 9f0b71a00bfa7b44360fdb1969e9d7349cf3763fe733e25553d0a97017a93e7f512586176883ddffe24211474e46a30d047878bc6c3683f54835a2fb8cfa2503 SHA512 a4048142501cc6683b4427127c7c0fa188c99f3e33dfd04783007ccc87a967e86923a8ec17cdfe835d53184bd3628e482ac0f52e75d12af2e5e1ada09ff569aa
-EBUILD fcitx-cloudpinyin-0.3.4.ebuild 495 BLAKE2B 8593294d88b203eca293965d4e3356a7f6af1e5ea46875185c98792ef6577b30a3c9ab33ab97e07fc3205f5b0850120d4daa393e42c32c4ee499919ab2013b85 SHA512 37d21184dbba30e7a33c802f8bd22077d97608d882b55f441e273a568bfff2fe0dcd60c6794a93d0595b767555dafbc1e52f9f56ab4e7ccf6344b276554cb7c0
+DIST fcitx-cloudpinyin-0.3.5.tar.xz 22424 BLAKE2B 9f44bf3a16681d994a8f202c7b9ba5bcb14a77c70e6e854626df675f647582632b6b4c110cf315fe376a6dd876607fe815d57d07361e219ddc11222ad1a95d6c SHA512 b56cde4955fab02d204cfe937b46aeb5b6adf9e4eb4fead6e7b8e0b5cd1ebce06a0de3f9d477a1cb58eb077655f17975b7e13951074d1766b283b86eeb5b276e
+DIST fcitx-cloudpinyin-0.3.6.tar.xz 22596 BLAKE2B e53f64dc999eb1ffb1d3c37b6ed75272da9a76d196df681b71876281ded778f83c73eef2f9100233f580a389e36bfc8681cd7be5e23ce4d9c27c26384062cf9a SHA512 d3a05fc48659db64a0a827c9b75cfb8b33f7cdb48bd936a2ba33f49469e29558a7da0f58cb7e6929b1265d451d23b0a37d87b7b69752599656c94049077d9914
 EBUILD fcitx-cloudpinyin-0.3.5.ebuild 735 BLAKE2B 8bdc4639220467f736b4279261d6503672eaa47cb0503b17d45c9e238c00d252a42e29cdc75ab0bd00a2f1b35bb4d4ba870aeaf0bc6bf8ccfc22570d822a3659 SHA512 f49bd32b4d8131934d4e7b48568fe22f6d981e35f15d52f11d20fb9673465d3ff2199dccc30e1625ea49e40f2ca94ebd84e1f5f2f0aaced9382aba590e98bd5c
+EBUILD fcitx-cloudpinyin-0.3.6.ebuild 739 BLAKE2B 78e9ecbea0f2b4389b5af0dcaa9ce1b5015db5afe6734171fbe8870f1cb1c04c33497844bdd10fd30771031e74a1367d0ffefda092d50ab291ffe8dab78dce83 SHA512 c55e0be75dfd53744d1012e084d6d0839644025fd092d97bbe04f356f59401f557bb216e1ea151c55e79ec9b3d115d438005f89fa4a6417af041a01d69e04cb7
 EBUILD fcitx-cloudpinyin-4.9999.ebuild 716 BLAKE2B 3d539d407c980eb098ab9465118f5887e9c7fc1a2422f1313d2726aaa7de250074b125a8f6a1d687e482fbce2f09efdfa4151a16327f4355ebbe9591185533a5 SHA512 fb16336058eda6ebd85001efa3f515eadc7dae11d0c0009015fa59a25ce51261cd005dd96b01004a1528e8f31430a39e73bc378035fa188ea30db310e8a33338
 MISC metadata.xml 456 BLAKE2B e7aea5104a7beb0c6d879e801dd4988557759cc89cb48331dfe64b5cb336da07eb5ca0db77fd07f70e2b035a556b41327a1a619a12fd1a80480e0be40373c227 SHA512 d101b830ffa54146258fa424d14129c3693abe3e64582a3fecae2add16d0928d4d18642ff5c5816227cd458862dde6778d679a9cdf8605187862c657060f63ca
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild
deleted file mode 100644
index 2a6d5f8ceccb..000000000000
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A fcitx module to look up pinyin candidate words on the internet"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.7
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig"
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild
deleted file mode 100644
index 3b0a7938c0be..000000000000
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A fcitx module to look up pinyin candidate words on the internet"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig"
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
new file mode 100644
index 000000000000..8991ceab3f88
--- /dev/null
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -0,0 +1,34 @@
+# 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-cloudpinyin"
+fi
+
+DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
+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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+	net-misc/curl:=
+	virtual/libiconv
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=()