gentoo resync : 12.08.2018

29 files changed, 183 insertions, 424 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index b55ec6e53254..2db4058fdc61 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index 1599e95fe5d7..7a4ce9315f92 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,3 +1,4 @@
-DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
-EBUILD ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild 1080 BLAKE2B 4403780f922c47cdda854d49666869696e88b6641af9db951c62eef14fba97acf824761bee5485c1e1075ce43ae17bce1174a63d9d13d136bbc11d699a9d0b56 SHA512 e76aefc9199e00ced36d430bf40b82dcdd44de91786a6283f7712efd7fe0c505ba71b5744b427226b38555e989867ec57a918b0069112be83b2ecc7079922577
-MISC metadata.xml 313 BLAKE2B e3d71fcea434a51c92b8194791283c33981d3c4b44bda0df1e70b561517c228daebdc713327171192e1523b7ac2f91116a030bb729eb143606810e6ef5522ce4 SHA512 61d943d4f8b8ab912ced89b69be51ad2792ba67672e969f4e32fba373f7133181c1080ba9a2603e3f7623ebac42e32eb3e0e429d66846ab4c7e13afbc0b05974
+AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD ibus-sunpinyin-3.0.0_rc1.ebuild 1287 BLAKE2B aa4e01e681c5bedcbb6e5502bfd5c1868293dd0223fd7f1ada3ad03eababd4311e651a88f6c0af854fef1517fc9a978da2554220d0361d35e18f1ab5f2990c30 SHA512 76a496271a1c0078fde67c988b418fd67316901266062d265af124182fb7ade521fee0eae33973fbb4353442f36cb384b4163577558fa515854d8289d13cb704
+MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch
new file mode 100644
index 000000000000..07f4699680ef
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch
@@ -0,0 +1,16 @@
+--- a/wrapper/ibus/setup/main.py
++++ b/wrapper/ibus/setup/main.py
+@@ -37,8 +37,11 @@
+ import sys
+ import os
+ from os import path
+-import gtk
+-import ibus
++from gi import require_version as gi_require_version
++gi_require_version('Gtk', '3.0')
++gi_require_version('IBus', '1.0')
++from gi.repository import Gtk as gtk
++from gi.repository import IBus as ibus
+ import gettext
+ import locale
+ 
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
deleted file mode 100644
index 77a59d469623..000000000000
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20130108-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="The SunPinYin IMEngine for IBus Framework"
-HOMEPAGE="https://sunpinyin.googlecode.com/"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/sunpinyin-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+nls"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python,${PYTHON_USEDEP}]
-	~app-i18n/sunpinyin-${PV}:=
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die
-}
-
-src_prepare() {
-	sed -i -e "s/python/${EPYTHON}/" wrapper/ibus/setup/ibus-setup-sunpinyin.in || die
-}
-
-src_configure() {
-	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libexecdir="${EPREFIX}"/usr/libexec
-	)
-}
-
-src_compile() {
-	escons -C wrapper/ibus
-}
-
-src_install() {
-	escons -C wrapper/ibus --install-sandbox="${ED}" install
-}
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..695603734e1d
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PLOCALES="zh_CN"
+PYTHON_COMPAT=( python2_7 )
+
+inherit l10n python-single-r1 scons-utils toolchain-funcs vcs-snapshot
+
+MY_P="${P#*-}"
+
+DESCRIPTION="SunPinyin engine for IBus"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python,${PYTHON_USEDEP}]
+	~app-i18n/sunpinyin-${PV}:=
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
+
+src_prepare() {
+	sed -i "/^locales/s/'.*'/$(l10n_get_locales | sed "s/\([^[:space:]]\+\)/\'\1\',/g")/" wrapper/ibus/SConstruct
+	sed -i "s/python/${EPYTHON}/" wrapper/ibus/setup/${PN/-/-setup-}.in
+
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	escons -C wrapper/ibus \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libexecdir="${EPREFIX}"/usr/libexec
+}
+
+src_install() {
+	escons -C wrapper/ibus --install-sandbox="${D}" install
+	dodoc wrapper/ibus/README
+}
diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml
index 583f6476f8be..271ef4abaa80 100644
--- a/app-i18n/ibus-sunpinyin/metadata.xml
+++ b/app-i18n/ibus-sunpinyin/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">sunpinyin</remote-id>
+		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 9d60cf325bdb..6298381104bb 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-1.5.38.tar.gz 6408096 BLAKE2B a4559044a4cd06c5dcf69d77d5ec3d8163d564702ff88d3ed11b8c073f5272e2cfab446de548a29887b74767f4318db98fb898dc4d15488fd4c9963cea151009 SHA512 67b81a47501ae4e885d2a79b122799b78dcdd044ad8e36a140d4c6587a23072d08e3e025f755c191cee82c3ab81ea1a974a5a0f6438e7203ba2d63d7e1cd4eff
 DIST ibus-typing-booster-2.0.0.tar.gz 5689495 BLAKE2B a3ee39faf206c4681d10989d4e438cffc0b78d9339973523af61310482b3ec13c7935e9e49403a3359e0f32d087b72afb27ae7975dcd3abd427b9a0f5f0ba581 SHA512 140044be13b47590a0835bb4b8da7311cdb92e8134a88a7b999ea6f530298950c4f8ce9ff3462394e4b52de0c56e3072671da85c99b448a91f442fdc460c608b
-EBUILD ibus-typing-booster-1.5.38.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+DIST ibus-typing-booster-2.1.0.tar.gz 6054311 BLAKE2B c0eef436e89e1de56d47713b2c5685d15cddc08d744926b69e6d0d1d7bd7548614009f489d6ae2579482d4d770b62e51cc76734ab3866451ec4fd4d51c84d59b SHA512 7d1b8d0761bdd71a3c72a60d59e0f7f1c94c8c8863b2a1cfb4ed7742060482500d43d7f71bc328a50628a9c116297695813651d7712b88cf7e8594118c4b339f
 EBUILD ibus-typing-booster-2.0.0.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
+EBUILD ibus-typing-booster-2.1.0.ebuild 860 BLAKE2B 7b813a51e80a378e694d3b9d6c3268e7d32d497d9fd62fa78f5239dbe1025dc79ccbfa958d2fdfc7e73be9dbe8bbb75efa29e4a12e41ec679b2efafd94a8e065 SHA512 fa03b6fb55e7505dd13e4aaf830444ea8f25c19089901528c4646611193f8002a0e860f09ba0bc5ca44c5e5cacbde1c3002220ee7e323239ca7c580c5216be2e
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.38.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.1.0.ebuild
index b4bb8048b30d..b4bb8048b30d 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.38.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.1.0.ebuild
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index df0e9310fade..55675dafd68a 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -4,6 +4,6 @@ DIST poedit-2.0.9.tar.gz 2567156 BLAKE2B 29e616256a19430cb3efd3db5d6c2cc45015500
 DIST poedit-2.1.1.tar.gz 2722379 BLAKE2B 3e5102ab9b2b6b6701abd3f44dab846d6989e5abdbcadf924cf7032d725fa1b405425cefa37eb0230d3de68ea0c60ec05e7bfe84f906cdec0230d8c1284f5779 SHA512 0b5e13c3e59c9bde78b95b45aa8765c16c03d12ca9fbabe4448e409ff4cd627676d1b77c011c75a54dc0e10acda23ceb49ca063e76a29154344dc5fdb9e5f8a8
 EBUILD poedit-2.0.6.ebuild 1273 BLAKE2B 9f2a627317290fb4ac7acb8b80f29297ec20c2a8c31b8f38bf995f461e7518bc767d49fed66c5953d2dbe4ffbe5dd1c981189601aaed8516ce7059aa372f9f7c SHA512 97cbb993e0b2583277d2ba88accf36e4bcf4b113d95b87140d80b3c07b705a0f38eb85721b81e1aced2b27e24ec6905308a916d3caa6b2ab7ad494957adcc0a5
 EBUILD poedit-2.0.7.ebuild 1278 BLAKE2B 345e579a3447a333c4633cee6f1742f64082549aeef84dcbcb32407e219a7edd68aeef53d883ae6269a464b6e6a41cd124d6403fce8645c7f95c44a55da34ada SHA512 c1b7cddd4c5051e142bf1e663cf4df22543f16168ab4413fcba9a56ec9c1ef5ec507d462dd46e773bd92d89e1a9c51ebe0d9ed536cc4b111cfd6314f67993e84
-EBUILD poedit-2.0.9.ebuild 1366 BLAKE2B 10a8cdf19541aa51f48eb897ac97de93f5621c11b46d016e71e19b27e090e841ed6d48b46786eaace52869cef2fcdaa7ac8b58365e5eb6354fe7120f0060f0f7 SHA512 25ec435d0d14169165c88ef494d5c26e93025669ad9c8c2d9672d3bf16e063c645b68f5041fc0d938c9c9fb252794e03d7d06290847f27b10622eadd1fc69deb
+EBUILD poedit-2.0.9.ebuild 1365 BLAKE2B 93c8532afa34a886b753b01bb86636c990bc417cff101cb6371c4811bb61dd4f1ec628e624122d60c8cccad1a07c9c234991cd592208ed065f1e512793dfdffb SHA512 8b4752f34950dc08d11ab5caa016c7d8809a8f1cc3852a52b5686ae82bee93c2c84b7a6591863d2965d7c703760514a0832d2384a079753a1a3c7aadd1cd5ec9
 EBUILD poedit-2.1.1.ebuild 1396 BLAKE2B 0d06059500fde6a51bde8921f34f92d8831183eb9171639be4baa4324578bf121db69f04e093c2c841328c5aee5f50144873a33f9f52c28fa1bc755caa450350 SHA512 ac7960ebf68c7d0e795c7c805745122c3cfa84a8c348e2024892dc5f52d3103585cbed94a644fda1ad6691e69a2429ab8b9dbf75859fd92bd9cd31b463f654c9
 MISC metadata.xml 611 BLAKE2B 7eda7aaa83b70b383879068c765a142c5e18bb79865a88c325c0a4ab8aa7f6ca00b197030f7a73baa4bbcb87dbb14097dd218d30dd6475705552500d6d0fb4f7 SHA512 96dfc2db0caf0915cca3997cff6fc021a3c196f4b7a5b9f2007c6284d9dfecfc66c1d5e0f44928a98810f6a23a7d5c6fc9db2ee3b24ce7ff7b9cb42afafd5f2f
diff --git a/app-i18n/poedit/poedit-2.0.9.ebuild b/app-i18n/poedit/poedit-2.0.9.ebuild
index a05878652aae..49c570046a6d 100644
--- a/app-i18n/poedit/poedit-2.0.9.ebuild
+++ b/app-i18n/poedit/poedit-2.0.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GUI gettext translations editor"
 HOMEPAGE="https://poedit.net"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz"
 
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest
index dd92a2ab18c2..4846e3017f17 100644
--- a/app-i18n/scim-sunpinyin/Manifest
+++ b/app-i18n/scim-sunpinyin/Manifest
@@ -1,4 +1,3 @@
-AUX scim-sunpinyin-2.0.3-force-switch.patch 947 BLAKE2B 0abc3eaa4f217ad33af87a7b2fa3d0c2bab90ea8540d61faa915fd0c673dbf49905d661da1128330aef16b84925fb9da2a25f75342c233fd364151625da09501 SHA512 8a3600507534dda5854465569127a7863fcbcd318542d319e814634e8fea10f7105469717e7141f831385c5e64a910aee0d442d7eb663e0cb46e9c6b9464ca7f
-DIST scim-sunpinyin-2.0.3.tar.gz 33072 BLAKE2B 06d9bff2eb35b06a49f6be60c8cd5d257f6ca724f03acc01b29b01fd32c2d95bab87c4737448a448a42a58d070f6b254bcf52e6d0c8b98ff10718d2265e43509 SHA512 f983d40972c5792a4a27fdf699cffc7f6882c84060cfe3e260cdc3f587743b0f71339ccdb7067b393f88a69b74d999fba70c4d9bc8016b9b217b3c11667a2986
-EBUILD scim-sunpinyin-2.0.3-r2.ebuild 639 BLAKE2B 8641ce645f95d0ccf073d47edcd0a182295676f614d905b7b3233ea8ec093621a621b6b55b59649755d017c1fe684a96cd0df3577b585e1036d83e1ed8dfd933 SHA512 868c215144512f3e91b05fb94d23bf9b81163fed23b79e9f0c782e3e50c8c0f5f22a7468206006c093a5677f65a4b01f86b74da7d4f3b4d96359110b83a910f8
-MISC metadata.xml 313 BLAKE2B e3d71fcea434a51c92b8194791283c33981d3c4b44bda0df1e70b561517c228daebdc713327171192e1523b7ac2f91116a030bb729eb143606810e6ef5522ce4 SHA512 61d943d4f8b8ab912ced89b69be51ad2792ba67672e969f4e32fba373f7133181c1080ba9a2603e3f7623ebac42e32eb3e0e429d66846ab4c7e13afbc0b05974
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD scim-sunpinyin-3.0.0_rc1.ebuild 910 BLAKE2B 455568a0c21627c509a562ef3a97608d0e78cce4ea38dbf2c72a0b170236cdb6a291a741af155f614636e534a501378c6b6ffb059b3961c64fdc7eea3f9f53ac SHA512 04cd0eb615f9411c2558537f8c10bdf869b50d36081979364f047cd509d76f6607f5cfeca213766166185e5dd557b4ce3432315f0aefd8a0f8bf4c3254d2e33f
+MISC metadata.xml 406 BLAKE2B 55aef3d62cc43c2efd86bf7d304a43fa5e5f71cc59e61f1c056e4c18a262c7e1ab8c81adb145ca0e278cb305ca226bee14d6be8704daf1acac04a558a848bd9b SHA512 b3b071ec496cd0a107862810a3b65f31838111dc8be01d2050428043ac11ff5e4fb5950e8ac7fe7d7036879146c14ec182d685451f73b4d2dbbb49386cb82db1
diff --git a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch b/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
deleted file mode 100644
index a0089ac11502..000000000000
--- a/app-i18n/scim-sunpinyin/files/scim-sunpinyin-2.0.3-force-switch.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/wrapper/scim/SConstruct b/wrapper/scim/SConstruct
-index 7739300..ef7c69b 100644
---- a/wrapper/scim/SConstruct
-+++ b/wrapper/scim/SConstruct
-@@ -3,7 +3,7 @@ import SCons.Tool.textfile
- 
- locales = []
- 
--cflags = '-O2 -g -pipe'
-+cflags = '-O2 -g -pipe '
- version = '2.0.3'
- 
- AddOption('--prefix', dest='prefix', metavar='DIR',
-@@ -51,9 +51,6 @@ if GetOption('datadir') is not None:
- 
- opts.Save('configure.conf', env)
- 
--if GetOption('rpath') is not None:
--    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
--
- envvar = [('CC', 'CC'),
-           ('CXX', 'CXX'),
-           ('CFLAGS', 'CFLAGS'),
-@@ -75,6 +72,10 @@ extra_cflags += ' -Isrc'
- env.Append(CFLAGS=extra_cflags)
- env.Append(CXXFLAGS=extra_cflags)
- env.Replace(SHLIBPREFIX = '')
-+
-+if GetOption('rpath') is not None:
-+    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
-+
- #
- #==============================configure================================
- #
diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml
index 583f6476f8be..20533d05e2c3 100644
--- a/app-i18n/scim-sunpinyin/metadata.xml
+++ b/app-i18n/scim-sunpinyin/metadata.xml
@@ -5,7 +5,10 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<use>
+		<flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+	</use>
 	<upstream>
-		<remote-id type="google-code">sunpinyin</remote-id>
+		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
deleted file mode 100644
index 0f2475440219..000000000000
--- a/app-i18n/scim-sunpinyin/scim-sunpinyin-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils
-
-DESCRIPTION="The SunPinyin IMEngine for Smart Common Input Method (SCIM)"
-HOMEPAGE="https://sunpinyin.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-i18n/scim
-	~app-i18n/sunpinyin-2.0.3
-	x11-libs/gtk+:2 "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-force-switch.patch"
-}
-
-src_compile() {
-	escons --prefix="/usr"
-}
-
-src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
-}
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..ed668fa02f72
--- /dev/null
+++ b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
+
+MY_P="${P#*-}"
+
+DESCRIPTION="SunPinyin IMEngine for SCIM"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3"
+
+RDEPEND="app-i18n/scim[gtk3=]
+	~app-i18n/sunpinyin-${PV}:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	escons -C wrapper/scim \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libexecdir="${EPREFIX}"/usr/libexec
+}
+
+src_install() {
+	escons -C wrapper/scim --install-sandbox="${D}" install
+	dodoc wrapper/scim/README
+}
diff --git a/app-i18n/skktools/Manifest b/app-i18n/skktools/Manifest
index ed62008efd9a..29c989f04ff8 100644
--- a/app-i18n/skktools/Manifest
+++ b/app-i18n/skktools/Manifest
@@ -1,6 +1,6 @@
 AUX 50skktools-gentoo.el 91 BLAKE2B 290cc5542c31bd9c3cd0095162928c80548db2800fc0a6293a8d6cc65caf3f567be725c17a3592f66554a90bd8f86f13641cf3c51dbf6331fc5d5ccce55e9f55 SHA512 f4376f1146586604bc9ef1ea080e5df79f721a245b89ae76dfa2aee38876e38edb804f9201d9eb751a879d017ed929fa18d1b38b307879fa607d086a404d0612
-DIST skktools-1.3.3_p20150901.tar.gz 483005 BLAKE2B 6db22c59276aee007ed4a457b8b66750d792596855ddfdd98310b14741cd20fe8594672626022dafc17c31d06f3292026e6bba35ea1fa001f4a224e7439eb082 SHA512 dbb15068239158c31a706da2fd5afcb8514d088854bdd4f0d05bb8b9e10947cbdce584ff3698571d601e3b357a1ba11b4608f0457615062016862ac89fb91b83
 DIST skktools-1.3.3_p20170305.tar.gz 483715 BLAKE2B 0de2cb906e8433f66e706f0aa4dd8c4900343b48bfb9bb24aee4927f583650f54132c2a3bb607c17cefb0f0e686bcf8a0f4bd6ac07b6a9a71c0bd870eda587a7 SHA512 f6e9041fecf8c28a84c3996ca120371528c034eeca3695cb224b4cf225e8dab9e69969d7fb955112cd1e9c1e80c2ba8e2aef4f0eb81f55374dd626402482c235
-EBUILD skktools-1.3.3_p20150901.ebuild 1197 BLAKE2B 1e0c6fd56c3b9eaaa51bafc14d53e8ff461cafcfc6aedf2229cffadbba6c8c64586733e052867dba0f3eb2e1ba8e70876de48d917ef8ea4f6d71b486a9befb3f SHA512 d4488f9affe3f2e4fe0125b486db5700ab22c490c25ebab9618720a1f78ee1b72c05e7e6f2394add4c3b61453f92b79bd4cb44740f43363c299e45bf88420c08
-EBUILD skktools-1.3.3_p20170305.ebuild 1199 BLAKE2B 2050af6201a54ba5e96e3b5b153f0bd624666ef3c8e71df996cbf636c0a8793dc6bdeac0ca171c2a2bccbdcafdd52195ed72d72dfc212131094ec45bc6c192cd SHA512 51410c23d7efb2f2cef0d71f6844e6fc28f07eaec4c45441994bdbd0268f1d7ffe48486ed5d7e365bb772a1a93c800b7edefeea71dd91b3f2828245e5ba0f15d
+DIST skktools-1.3.4.tar.gz 482860 BLAKE2B f9e822531f8f715291e55ec6dec0eeb31683dc72efc7ba73621cfd0c29f0c5147cbef8256d44848792b8a1601c1878321b2dc0260df9d32d0e5e18eb65220987 SHA512 8749dfc4f18474db860d8b7cd85fadfc00327b199addb31a339aa78dd66cb98032429664bdad4b47176b5b64b156b7264bc35a284861f6b9ec8cc9979d4d5ce1
+EBUILD skktools-1.3.3_p20170305.ebuild 1197 BLAKE2B 417e30a68889f6ea49b8511edece026d1e04bcda6fc18410b0650242f2a6e7a66deeae5601b41427d21d134e6a900b72f6c8610fe36d7ceb02c8de03c13e6230 SHA512 b5cdbe1fd05946477044276c30b69c69e1e467efd6a73e9407caa7b12694e6011f449801537a9219efab3e7b3fb5fcf48615830dfb839e8c184a1ce303a31dfb
+EBUILD skktools-1.3.4.ebuild 1109 BLAKE2B aec68fe21ab4fd1c0176283c95cd9f33422e9841a24207dfd4bfe3f6d00a1b3af6f0502da436f61b29c71e42612d857cddcc58868b58f222e2b4ff06ed140025 SHA512 b4ac462a44c4cc2d155ebd11618b4c23fe87396becaac822592573a82f51ac7247dc2594c1a38f0eded12a7e5fe0ae7bc7aa86790a18198d6acfd07449925c94
 MISC metadata.xml 325 BLAKE2B 2d57ed82902d3daf56c670eb02e451104a56374c00f64ffcabc34b85b1bd3666c982624424f7a3e1da5f79a40c336ac16f7b1d62ddf81f2465b790fa3cdfba8f SHA512 aff23e906c8b6f0dbdc293aa4138b51497d32760f0c77307e11d9f7797bffd0d1363e0d8dd5639f8b9838838737afd05dab5d6e0a4f9c8596effdfef733af75b
diff --git a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
index 0e1c1f93783d..bf622beb43df 100644
--- a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
+++ b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/skk-dev/skktools/archive/${EGIT_COMMIT}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="emacs"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-i18n/skktools/skktools-1.3.3_p20150901.ebuild b/app-i18n/skktools/skktools-1.3.4.ebuild
index 3ed4d6a6582c..31dc8f2d8b1a 100644
--- a/app-i18n/skktools/skktools-1.3.3_p20150901.ebuild
+++ b/app-i18n/skktools/skktools-1.3.4.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit elisp-common vcs-snapshot
 
-EGIT_COMMIT="28e36bac97dc8ed089bac409bef15f1831b6adde"
-
 DESCRIPTION="SKK utilities to manage dictionaries"
 HOMEPAGE="http://openlab.jp/skk/"
-SRC_URI="https://github.com/skk-dev/skktools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/skk-dev/skktools/archive/${P//./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="emacs"
 
 RDEPEND="dev-libs/glib:2
@@ -22,7 +20,6 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-DOCS=( ChangeLog README.md )
 SITEFILE="50${PN}-gentoo.el"
 
 src_configure() {
@@ -48,7 +45,7 @@ src_install() {
 	done
 
 	insinto /usr/share/${PN}
-	doins *.awk *.scm
+	doins *.{awk,scm}
 	rm -rf convert2skk/obsolete
 	doins -r convert2skk filters
 
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index 8b071569e419..8e136a764a42 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,13 +1,7 @@
-AUX sunpinyin-2.0.3-force-switch.patch 979 BLAKE2B 9274064e2966330c461f062316256e9d905217d5fbfd2dfd55cd881a5021fc5de747689709f58284f7674f78fabc81b7a8c635cac984e10be7832788eca7c4c7 SHA512 0782895b4a718f218f447fba66253ff38916dacf3168d6ff47e8186e39cdc968c467e74431105a8795cb04176309d5ce333e712a3aab2840094bbdd169853b3e
-AUX sunpinyin-2.0.3-gcc-4.7.patch 1275 BLAKE2B 9dc9fbc1b63f59fcdd853a8c99e9bfbf021540672729991cab67ea67b82e9d530963b33a34ce378af7309d9b749e0a831b6d1cd0393f3a7c182ca29d9411b27c SHA512 48d7e5ab52395467f3b282b73bb3ca5b2cd27c76ac1b454c0e248a9cfb13d8d628fbdf93b82a57404109d288c46d70456bb4aaf4f2899e3dd6e047140cdfc7c0
 AUX sunpinyin-2.0.4-gcc-6.patch 959 BLAKE2B 72e027a928bd9f684dbecc7ce50074df6d915b9e699de661853012961454bce48008bff50fd2de135ef828f08e84647b624bd844b9baafb2e929480171a44f63 SHA512 7093542613a2c15c6e1dc7e500bc38f65061d927d3f89f281973f401f19f0e151f0ef438c2a1c21d102bd56b23c81d206b6a524d77b04ae4e0b79f0b97691b96
 AUX sunpinyin-2.0.4-pod2man.patch 406 BLAKE2B debbbd0c004625c3e9dc73e07876774d12d3514757ea1d5a8ad9a978868f85175d0fa92e0e46541e00c208498b7bae9ac7257491de50f6d0829616c68decbcd5 SHA512 7a0b48e4b0270b1c60844b91df42dd8f59460c9a5725c5492fd4886b77d8e993dbe2c8efc464da271d51d19d17c3c94573c57c0dd7f28414336138212911e387
-DIST dict.utf8.tar.bz2 1598995 BLAKE2B 4cb990b6bbb440218c6af695369bdccf97b820da9aa10d118043a7bda1c602e53d0c63c4a460db2c64530e69ac1d98619e1a2efa2113a292063b422fc1b3d32c SHA512 04ec55e4af4b58d29b1141a824b5c3de5dbaaab0133d88e477d9183db738fc63543b4004bf071e611c6ea0d4b4c161b73849a64ab75f4df5bb5116d7f52d8e34
-DIST lm_sc.t3g.arpa.tar.bz2 25098718 BLAKE2B a7cd87d4e786a7dfe854b33c5c70019075ec99b02fd6cb33f91f89babdd2b255b6d157fff30c22b5372e74908483b814cc9698fd84caa3e56c61e76a59dbea04 SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98
-DIST sunpinyin-2.0.3.tar.gz 169394 BLAKE2B d93472c0c208da2a7aab99b1d514fa01acf67e69bdddc2c0e15f40af7a2abaf8860f8e792c2bd286bd1ec3a24124b0284d28295115c8dff1051f5df3c2314bb7 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
-EBUILD sunpinyin-2.0.3-r2.ebuild 1627 BLAKE2B e6868f2e9f3ca8bd1947d2eccf40e221afeab10046f493e6ed674a7e0ebe75994c8d801edecbab9529d21322068ac888fe36c6dc816e270e8b6684d1b9fb5997 SHA512 84ef99fd67b79b2bc0bc9ea8a8e2e110465a5b0103096364f142e98539262d42594c427761f2e0ce82761e4a3b9f49a331200891fe3f2641ccc1482739e4f4f9
 EBUILD sunpinyin-2.0.4_pre20130108-r2.ebuild 969 BLAKE2B 3a4fed1810722b8d0f74282add5b5298c120b373c083fab1f1289285435915a12be3b8cfd3c44514c5f0d085231ffe933d5fab0ba3a2522d1422b71447bb0da8 SHA512 588f5bf39e30b91ecea1550c28c6ab2fca113fbbcc999f12ebaa335abccb214d4d2f4f6d28dbbdf728561b6ccecd9177f518134b0d39dd9c36a19428cab70ebf
 EBUILD sunpinyin-3.0.0_rc1.ebuild 918 BLAKE2B e5220cd1829a49aa2155ab92e5b9c2ea82ca281bff4743935f24b2072a8237f064905f979feccca99007d653877728430108c45793286eeb41d3668832b39859 SHA512 065897821edeed4dece2aff5061f7d97fcf634a544a7d1d6cf614b4215e05808459c7940953e8ae6f0319f3803d36630cb520b2b97da1284289e5d447da9a3e3
 MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
deleted file mode 100644
index de85e82c1d5e..000000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -180,12 +180,6 @@ libdir = env['LIBDIR']
- libdatadir = env['LIBDATADIR'] + '/sunpinyin/data'
- headersdir = env['PREFIX'] + '/include/sunpinyin-2.0'
- 
--if GetOS() != 'Darwin':
--    env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major])
--
--if GetOption('rpath') is not None and GetOS() != 'Darwin':
--    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
--
- # pass through environmental variables
- envvar = [('CC', 'CC'),
-           ('CXX', 'CXX'),
-@@ -202,6 +196,12 @@ extra_cflags=' -DHAVE_CONFIG_H -DSUNPINYIN_DATA_DIR=\'"%s"\'' % libdatadir
- env.Append(CFLAGS=extra_cflags)
- env.Append(CXXFLAGS=extra_cflags)
- 
-+if GetOS() != 'Darwin':
-+    env.Append(LINKFLAGS=' -Wl,-soname=libsunpinyin.so.%d' % abi_major)
-+
-+if GetOption('rpath') is not None and GetOS() != 'Darwin':
-+    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
-+
- #
- #==============================configure================================
- #
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch
deleted file mode 100644
index c523449ef514..000000000000
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3d35aa0370d9c7bd455098caa9ba22ebe1f82968 Mon Sep 17 00:00:00 2001
-From: Yong Sun <mail@yongsun.me>
-Date: Wed, 4 Apr 2012 18:41:39 +0800
-Subject: [PATCH] Integrated patch from YunQiang Su, fixed FTBFS with gcc-4.7
-
----
- SConstruct        |    3 ++-
- src/portability.h |    5 ++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 97abf47..354fd19 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -313,7 +313,8 @@ def DoConfigure():
-     conf.CheckCHeader('sys/param.h')
-     conf.CheckCHeader('sys/stat.h')
-     conf.CheckCHeader('sys/types.h')
--    conf.CheckCHeader('unistd.h')
-+    if conf.CheckCHeader('unistd.h'):
-+        conf.Define('DHAVE_UNISTD_H', 1)
-     conf.CheckCHeader('wchar.h')
- 
-     # add essential package requirements
-diff --git a/src/portability.h b/src/portability.h
-index 949d4f2..cf43bd0 100644
---- a/src/portability.h
-+++ b/src/portability.h
-@@ -44,15 +44,14 @@
- #include <string>
- #include <cstring>
- 
--#if defined(sun)
-+#if defined(HAVE_UNISTD_H)
- #include <unistd.h>
- #ifdef __cplusplus
- #include <algorithm>
- #else
- #include <sys/ddi.h>
- #endif //__cpluscplus
--#endif //defined(sun)
--
-+#endif //defined(HAVE_UNISTD_H)
- 
- #ifndef HOST_OS_GNUC_2
-     #if defined(DEBUG) && !defined(NDEBUG)
--- 
-1.7.8.5
-
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
deleted file mode 100644
index c79fd710b993..000000000000
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="A Statistical Language Model based Chinese input method library"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz
-		https://open-gram.googlecode.com/files/dict.utf8.tar.bz2
-		https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-force-switch.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	ln -s "${DISTDIR}"/dict.utf8.tar.bz2 "${S}"/raw/ || die "dict file not found"
-	ln -s "${DISTDIR}"/lm_sc.t3g.arpa.tar.bz2 "${S}"/raw/ || die "dict file not found"
-}
-
-src_prepare() {
-	default
-	tc-export CXX
-}
-
-src_compile() {
-	escons \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libdatadir="${EPREFIX}"/usr/lib
-}
-
-src_install() {
-	escons --install-sandbox="${D}" install
-}
-
-pkg_postinst() {
-	elog ""
-	elog "If you have already installed former version of ${PN}"
-	elog "and any wrapper, please remerge the wrapper to make it work with"
-	elog "the new version."
-	elog ""
-	elog "To use any wrapper for ${PN}, please merge any of the following"
-	elog "packages: "
-	elog "emerge app-i18n/fcitx-sunpinyin"
-	elog "emerge app-i18n/ibus-sunpinyin"
-	elog "emerge app-i18n/scim-sunpinyin"
-	elog "emerge app-i18n/xsunpinyin"
-	elog ""
-}
diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest
index ce47974e0a66..7a715785d9a0 100644
--- a/app-i18n/xsunpinyin/Manifest
+++ b/app-i18n/xsunpinyin/Manifest
@@ -1,7 +1,3 @@
-AUX README.gentoo 164 BLAKE2B 38860db416a64e3acfa7900c3a97c612df73109b414d9b666f5170d306771218b39c81ef34c24c019dcc8baea191febf314101f32e60cfc999028422a98901e9 SHA512 4793b665af505a5b33ed27b99aa236bc9e1ce4e4bfaa12e2fa7fe5e275cde71759e893a30f28fff1c79b2a02e0d4979a0c84319518c487751156b683fab2436e
-AUX xsunpinyin-2.0.3-force-switch.patch 1328 BLAKE2B c61eb697aa9214c1bc603b7a8d210e629e67ba57141fe6c1daa28e27066e8adfb1c3065f520442c163671e2eb4a600e7c083db524aae162adc7b7d872dbfd7c4 SHA512 fcc2110c2b1e0b4dda4995688e360bee7f0e26582bb212875e41e22b208168d0a18d5a2a1a4cdf93935a43bef11bdb0a6fd45a9506675165c1a2a1aeedd2ad5e
-DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
-DIST xsunpinyin-2.0.3.tar.gz 128835 BLAKE2B b8f3dd0b7efd0e40d54ee15085e4f1e7e2fff0d4f22845d7e043012f761e358e97843d1f3a26b85e49303afa86fb4a8263974f6f761d192b44bd88a1a0eef18f SHA512 71bc1677d545ecbd8572c9ba1877d091a2a58154eb326623ed240701f98a70ec29245e98d684a30aad46445e6c461359663ba3778e7f5c42469f0bea6e2bc419
-EBUILD xsunpinyin-2.0.3-r3.ebuild 629 BLAKE2B ba3693a7f3eeb42793333d40f272f02a0a9ad0fa10d592e057075d0562f21a255c37f420125899af207d5c6f7e46e123f3c1689d14771c2b696c94224d14a019 SHA512 0a0916bb06034a2f0585911be41e92007a785d40e9e5c95cce5ce010de15c980f4a14fedbec846570f344484d77e1657e76ec386b683b8c07bc0513f80650db0
-EBUILD xsunpinyin-2.0.4_pre20130108.ebuild 836 BLAKE2B 66d779b1ece649ee371c02e5161b32076b8ce0a55ca55372982682a0dce10d14c97f0d679c026c5c3011ee4512e4dc1a0f30944591b1acf1d8057b3c759f12f5 SHA512 a89e6c8c09595dd5e0ead3435c3618e3e2279e1b403e2abd4f6711025aeca1897560dd17d84381ddd18ae05e23e5bb0ddcf33250f67558dfea71ab798bf58977
-MISC metadata.xml 323 BLAKE2B cb36295be070944db054e52bd199f502dd1136e35d27e7eb9a0caac66798393c12d19fa9b7a421c9e3561023474a01d0788da1a333b34f15fc576862272955ee SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
+EBUILD xsunpinyin-3.0.0_rc1.ebuild 838 BLAKE2B da1adbb00714726eedd65cd1ccfe144ed469265dce54afb0e64ba2f8ffe72cab2eaa6f99a44375164d28fbabe2315296318a1c8916aff579ecb53d7b48542a37 SHA512 f44f42d1a03aa89d9c2ab128f4a8d40823546029a053910f1b5b28ad3a48a9b951ea83bb15f6301a361ad0c0efa72b83d8f855d2fced666d5588d6fa0f330cf4
+MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/xsunpinyin/files/README.gentoo b/app-i18n/xsunpinyin/files/README.gentoo
deleted file mode 100644
index 7de1985c1f32..000000000000
--- a/app-i18n/xsunpinyin/files/README.gentoo
+++ /dev/null
@@ -1,5 +0,0 @@
-To use sunpinyin with XIM, you should use the following in your user startup
-scripts such as .xinitrc or .xprofile:
-
-XMODIFIERS=@im=xsunpinyin ; export XMODIFIERS
-
diff --git a/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch b/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
deleted file mode 100644
index 04f70e2d2aad..000000000000
--- a/app-i18n/xsunpinyin/files/xsunpinyin-2.0.3-force-switch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/wrapper/xim/SConstruct b/wrapper/xim/SConstruct
-index 9d1cafd..495871d 100644
---- a/wrapper/xim/SConstruct
-+++ b/wrapper/xim/SConstruct
-@@ -32,7 +32,7 @@ imdkit_sources = ['IMdkit/FrameMgr.c',
-                   'IMdkit/IMValues.c']
- 
- 
--cflags='-O2 -g -pipe'
-+cflags='-O2 -g -pipe '
- 
- # options
- AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store',
-@@ -52,7 +52,6 @@ def PassVariables(envvar, env):
- 
- env = Environment(ENV=os.environ,
-                   CFLAGS=cflags, CXXFLAGS=cflags,
--                  LINKFLAGS=['-export-dynamic'],
-                   CPPPATH=['.', 'IMdkit'])
- opts.Update(env)
- 
-@@ -62,11 +61,6 @@ if GetOption('prefix') is not None:
- 
- opts.Save('configure.conf', env)
- 
--
--# set rpath
--if GetOption('rpath') is not None:
--    env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
--
- envvar = [('CC', 'CC'),
-           ('CXX', 'CXX'),
-           ('CFLAGS', 'CFLAGS'),
-@@ -83,7 +77,11 @@ extra_cflags += ' -DSUNPINYIN_XIM_SETTING_DIR=\\"%s\\"' % data_dir
- 
- env.Append(CFLAGS=extra_cflags)
- env.Append(CXXFLAGS=extra_cflags)
-+env.Append(LINKFLAGS=' -export-dynamic')
- 
-+# set rpath
-+if GetOption('rpath') is not None:
-+    env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath'))
- 
- #
- #==============================configure================================
diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/xsunpinyin/metadata.xml
index 11bbcd490ca1..271ef4abaa80 100644
--- a/app-i18n/xsunpinyin/metadata.xml
+++ b/app-i18n/xsunpinyin/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">sunpinyin</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild
deleted file mode 100644
index 44ee7e7f2fbe..000000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.3-r3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils
-
-DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
-HOMEPAGE="https://sunpinyin.googlecode.com"
-SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~app-i18n/sunpinyin-2.0.3
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-force-switch.patch"
-}
-
-src_compile() {
-	escons --prefix="/usr"
-}
-
-src_install() {
-	escons --prefix="/usr" --install-sandbox="${D}" install
-}
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
deleted file mode 100644
index 108302b49c3b..000000000000
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo scons-utils toolchain-funcs
-
-DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
-HOMEPAGE="https://sunpinyin.googlecode.com/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="~app-i18n/sunpinyin-${PV}:=
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die
-}
-
-src_configure() {
-	tc-export CXX
-	myesconsargs=( --prefix="${EPREFIX}/usr" )
-}
-
-src_compile() {
-	pushd "${S}"/wrapper/xim
-	escons
-	popd
-}
-
-src_install() {
-	pushd "${S}"/wrapper/xim
-	escons --install-sandbox="${D}" install
-	popd
-	readme.gentoo_create_doc
-}
diff --git a/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild b/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..c87c83f85db7
--- /dev/null
+++ b/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
+
+MY_P="${P:1}"
+
+DESCRIPTION="A standalone XIM server for SunPinyin"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-i18n/sunpinyin-${PV}:=
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	escons -C wrapper/xim \
+		--prefix="${EPREFIX}"/usr
+}
+
+src_install() {
+	escons -C wrapper/xim --install-sandbox="${D}" install
+	dodoc wrapper/xim/README
+}