gentoo resync : 08.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-08 20:11:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-08 20:11:47 +0100
commit: f625b9919a60a30f1bd860f7d1b2eac183ced593 (patch)
tree: 7543f00925ff7277e31881de0a87801681f6f92f /app-i18n
parent: e3872864be25f7421015bef2732fa57c0c9fb726 (diff)
34 files changed, 245 insertions, 555 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ddfa9f0a4f7b..b55ec6e53254 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-qt/Manifest b/app-i18n/ibus-qt/Manifest
deleted file mode 100644
index 7362ac7d8c59..000000000000
--- a/app-i18n/ibus-qt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ibus-qt-doc.patch 215 BLAKE2B 9895e1c72fac56052c6d7ef1bbf9702f5e89f4f9ef0afcb1682e41c51978aa1e8ff904039de0f1540177c44c071ef8e31791ce1312cba2b653e3df76797211cf SHA512 c6c46e8eb23bd9d6b21587f7f976a4bfc8f750e9135c8297224edf8ccfa3e97779144bcba661f4aa5a76226f59c1fc59da9e565a4b0b6d4285ac66f8ba0919c9
-DIST ibus-qt-1.3.3.tar.gz 141523 BLAKE2B 641ec53005ccb3b14646986bb0df4b091b88bcd4a181c82050d596f1840361d49451fcc1382d3fab1f54e463c9b0426b4f8bfd86b8f53224cb9c04dd298d5c87 SHA512 825a32fec51f10f466efd4255743a12ae98af63bacd07d5dc04e18fab6b830501b04491146c1f8bc92edd93dbf8eaeb68cf71062ffdbf25c2970d807b655c80a
-EBUILD ibus-qt-1.3.3.ebuild 989 BLAKE2B 9da6ca6e68818ad018b81ea5d831f0f22c11905c9c73764a4f0e29fd48aed35bdbc8acdd91f57c9a301f8b2f67dbf28e54c8b4077cb69da58d2843bd5db2a103 SHA512 af46f25f1e6ec3b0142bd88d53371541ba90404f6017fd64c9bd2e97f3f22f322c3e4f241675ca244ddd5f7282304b49977f9505a42653fecec5c6796089fd76
-MISC metadata.xml 427 BLAKE2B 9156e686bc1365dd3762c7550a07957a8b0320437c45a409e0127fb952bbc4c3cc0524437880cde421ff3e69fb232ddf16a65d2058da49c83f19fd1b74354372 SHA512 d8b71cd16b59609569170069a1cfd27bb09f5f6dce812e57550602fc5afc51eec23b9f646fe29145b0bdf3ae258868d4aead053444c290684696f344308a36ec
diff --git a/app-i18n/ibus-qt/files/ibus-qt-doc.patch b/app-i18n/ibus-qt/files/ibus-qt-doc.patch
deleted file mode 100644
index dbc1e9251369..000000000000
--- a/app-i18n/ibus-qt/files/ibus-qt-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,7 @@
- pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.3.7)
- 
- # check doxygen
--find_package(Doxygen REQUIRED)
-+find_package(Doxygen)
- 
- # =====
- # Define variables
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
deleted file mode 100644
index 0ed171d32907..000000000000
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="app-i18n/ibus
-	dev-libs/icu:=
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	sys-apps/dbus
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${PN}-doc.patch )
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DLIBDIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	if use doc; then
-		HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml
deleted file mode 100644
index 4346ded0668a..000000000000
--- a/app-i18n/ibus-qt/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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>
-  <longdescription lang="en">
-    The Qt client for IBus. It provides a Qt immodule.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">ibus/ibus-qt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index c6650d90b9fe..9cce5b734554 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,9 +1,7 @@
 DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
-DIST ibus-1.5.17.tar.gz 2522960 BLAKE2B a0d19eaae809549d678b42394e76107b8869232c90932bfaa5072621598e83db0569084e931c51c15b7179d9d8e0a2ce144b726229dae81a009665a5de87afc4 SHA512 8a7e4fabbcb2096e647b1fb7487c92882bd320a4d777f2765817378abec2e60cafd63364c881fefc2805ff2baa6b28b15ee0710587662a3e65eeb60ead19496c
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
-EBUILD ibus-1.5.12.ebuild 3695 BLAKE2B b22d441277f55324c4d5ecc6d592f3057900a46e0f4bed4ccc90c14ec10890fa26bab18c5ded5649f9bb83c3485899bcea8e9d0fc80410e55199ad97b51f2009 SHA512 2593129b58c41301ea94f7b7761cc40e13f3b6458230478067d6a0a1c6a23ad8aa5f225d4203259ad54eb38d87b3bbac1a029a4de5282aee82147891b3c2b394
-EBUILD ibus-1.5.16.ebuild 3976 BLAKE2B 6bede6434d30b0fe6f07bb5f447b783dd0ac4a999d34afced1dd37039e949d1da06d3eadd1e08180bafdba274253d188099c3dd4747389a5f1fcc1009fbe3b04 SHA512 706833bf159c29c8045f686f2a11a4daa1672ab69c5925bc70952b3bacad641a61175c6898bec036fb7eb26b3d8b9fbf520ed2e9e5fcf32bac228992e6506e97
-EBUILD ibus-1.5.17.ebuild 4015 BLAKE2B 5112e3ca412d252307a5eb924ec66a69d60cef61aac7d9768fe9941a57eca109e89fb5a2c65abbec4a11bbc2d637cac627faba86f448245ead64ea7dfb3543df SHA512 3b3a1e0ab69c28c86ff92d6a5cbe4bed0b8b9c97e33b1e6fe776e091ae93b2bf451475c5e89f771042b2b42cd567d078c7823870f1986d3df7478776a7b498ca
-EBUILD ibus-1.5.18.ebuild 4277 BLAKE2B c2b16db2256a7503a631e336d83c8c719250808cc559e47a19c9a4cb5afd4dd7475398876275f0fcbd5c9625b3da9c5b1fb96c2f6d11dfc5fcdcdd7b1db854f9 SHA512 c6aee07fb6fcf380fe73b3c07bccd7d584865218652339bc6f347c09452e1fb8f4e89c62f6fc886d7dd8b931f59abe3da28ae72b610ea2be21ea8f8175c05b11
+EBUILD ibus-1.5.12.ebuild 3725 BLAKE2B d851008dd04bc0131c13cc79056061cd4a9d6484e3b29a1d87a8e6f149c9f5fe22a46171a4e4df7229309e1e1bf63c6da7ac69eb41f8c11347835ef25f92d0ef SHA512 5a04b1bcc9687e567cadf7429d01c80911200031359854c630856e47573885a28e2548c2fb91e5ffd8cbce3da85a519b790aa2b2feb948eb98f55ceed0f0127b
+EBUILD ibus-1.5.16.ebuild 4006 BLAKE2B 46b44039cae41cd693372b94586fc17a9b2678895b84f5177aead172f62ae7f50ff7b331b4aecce697a303024ba7ad587c2ffd26e0ce0f789cfb6eb456471908 SHA512 7861b4ea5f207e6d3c014687e07af74a4a34afefaa79abf718815a3e4a92981f2e3f62d17b872eea8de5813cfd9200c4b30c60aa121d6443e643d59bed6ca5b2
+EBUILD ibus-1.5.18.ebuild 4271 BLAKE2B 08c1e5ac33927c935922c070dea574d2ac5650c6ec0e89fce32e2007ea0b0407929b1e460f95beca0d755295a37016c583677c0894ac98e0277cb974c2b35509 SHA512 26d0ecd660cd1a0059f3d3b166e34a34606f23116e12c972b3cd5f7757e8812f597f2d28b5d5ed5e1e8f0ad01c68ae3b8b7175ebe4ef7a0fb574cae674ea778b
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
index a8413c59fff3..b3d6a397f2ce 100644
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -19,7 +19,6 @@ REQUIRED_USE="gtk2? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )
@@ -87,6 +86,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {
@@ -123,7 +123,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {
diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
index 4dcb90a62639..b84815cfa142 100644
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
@@ -21,7 +21,6 @@ REQUIRED_USE="emoji? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )
@@ -98,6 +97,7 @@ src_prepare() {
 
 	default
 	eautoreconf
+	xdg_environment_reset
 }
 
 src_configure() {
@@ -139,7 +139,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 
 	if use python; then
 		python_install() {
diff --git a/app-i18n/ibus/ibus-1.5.17.ebuild b/app-i18n/ibus/ibus-1.5.17.ebuild
deleted file mode 100644
index 10bd3f700de7..000000000000
--- a/app-i18n/ibus/ibus-1.5.17.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 gnome2-utils ltprune python-r1 vala virtualx xdg-utils
-
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
-REQUIRED_USE="emoji? ( gtk )
-	gtk2? ( gtk )
-	kde? ( gtk )
-	libnotify? ( gtk )
-	python? (
-		${PYTHON_REQUIRED_USE}
-		gtk
-		introspection
-	)
-	test? ( gtk )
-	vala? ( introspection )"
-
-CDEPEND="app-text/iso-codes
-	dev-libs/glib:2
-	gnome-base/dconf
-	gnome-base/librsvg:2
-	sys-apps/dbus[X?]
-	X? (
-		x11-libs/libX11
-		!gtk? ( x11-libs/gtk+:2 )
-	)
-	gconf? ( gnome-base/gconf:2 )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/libXi
-		gtk2? ( x11-libs/gtk+:2 )
-	)
-	introspection? ( dev-libs/gobject-introspection )
-	kde? ( dev-qt/qtgui:5 )
-	libnotify? ( x11-libs/libnotify )
-	nls? ( virtual/libintl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)"
-RDEPEND="${CDEPEND}
-	python? (
-		gtk? (
-			x11-libs/gtk+:3[introspection]
-		)
-	)"
-DEPEND="${CDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	emoji? (
-		app-i18n/unicode-cldr
-		app-i18n/unicode-emoji
-	)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare --ignore-use
-	if ! use emoji; then
-		touch \
-			tools/main.vala \
-			ui/gtk3/panel.vala
-	fi
-	if ! use kde; then
-		touch ui/gtk3/panel.vala
-	fi
-	if ! use libnotify; then
-		touch ui/gtk3/panel.vala
-	fi
-	# for multiple Python implementations
-	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
-	# fix for parallel install
-	sed -i \
-		-e "/^py2_compile/,/^$/d" \
-		-e "/^install-data-hook/,/^$/d" \
-		bindings/pygobject/Makefile.am
-	# require user interaction
-	sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
-
-	sed -i "/^bash_completion/d" tools/Makefile.am
-
-	default
-	eautoreconf
-	xdg_environment_reset
-}
-
-src_configure() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local python_conf=()
-	if use python; then
-		python_setup
-		python_conf+=(
-			$(use_enable gtk setup)
-			--with-python=${EPYTHON}
-		)
-	else
-		python_conf+=( --disable-setup )
-	fi
-
-	econf \
-		$(use_enable X xim) \
-		$(use_enable emoji emoji-dict) \
-		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
-		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
-		$(use_enable gconf) \
-		$(use_enable gtk gtk3) \
-		$(use_enable gtk ui) \
-		$(use_enable gtk2) \
-		$(use_enable introspection) \
-		$(use_enable kde appindicator) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_enable wayland) \
-		"${python_conf[@]}"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	virtx emake -j1 check
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	if use python; then
-		python_install() {
-			emake -C bindings/pygobject \
-				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl python_install
-	fi
-
-	keepdir /usr/share/ibus/engine
-
-	newbashcomp tools/${PN}.bash ${PN}
-
-	insinto /etc/X11/xinit/xinput.d
-	newins xinput-${PN} ${PN}.conf
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	dconf update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_query_immodules_gtk3
-	use gtk2 && gnome2_query_immodules_gtk2
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index 077b31aa412a..d32b42660caf 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -22,7 +22,6 @@ REQUIRED_USE="emoji? ( gtk )
 	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
-		gtk
 		introspection
 	)
 	test? ( gtk )
diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest
index 4f58cb427e03..df0e9310fade 100644
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@@ -1,7 +1,9 @@
 DIST poedit-2.0.6.tar.gz 2511777 BLAKE2B f28e8940310e80ee15fc70f10492e061097f88b62938f8a85194170fd107100c739dbfd1c1cf12516e6fe3d2a9b282986a4368615cf8fcb2ac889075fe64cc6b SHA512 e7beceeb4cd9e4e0269666d634e48622f175a7788219288ba6349a5b15f8360a929018480372e3eecb664d7d2e3093d6788640651696323d6dda0f0780aa5cd2
 DIST poedit-2.0.7.tar.gz 2558220 BLAKE2B e4a958e516a5c4b56331b6f9f37d9fa627072a4a161f17b9e809df86af7ab86130c704b9f41d081a86dbc2dc3b24acf62615e843b73f78874c42730bd46f9b55 SHA512 7b8b41b5f55252b1845c452edbdad56dc841c507c4fb7a24267bd2af8490610f5f3eb72f31ed4d062fdaef939ef4ecd9c30ddc85a5dad3a792ac5857567dac71
 DIST poedit-2.0.9.tar.gz 2567156 BLAKE2B 29e616256a19430cb3efd3db5d6c2cc450155009e30ee056f6be712bac9e631e5aa20b0758262e9fbe00937eedf6ac777cd8e7407a3060f04503e3fa4d9cd6d0 SHA512 9981339ae0c3f11f972ed2f25e0c96e5c0cc0210771cc44d163e219c32eb951fa4180c8a03acdd7f0232a5e4b535f3202dda703b57ccfb02773eb24e6a1eb02d
+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 1367 BLAKE2B 3f950048558ad4e6278992fefa9c92c62a66738910685983f9d0558b67283021d96ab836b41276e4c4e1af8b1a4ba37e1af51540ca395e61d9848c64df520cd7 SHA512 99a1ca30977f737d58cc3ca7b0b4561ab464bb989b2ec166dee7e9948d1d74b83e24cdb3cf68e11ce09c1c975aec7a39a11370f3c45ba5aed04e46889db0d58f
+EBUILD poedit-2.0.9.ebuild 1366 BLAKE2B 10a8cdf19541aa51f48eb897ac97de93f5621c11b46d016e71e19b27e090e841ed6d48b46786eaace52869cef2fcdaa7ac8b58365e5eb6354fe7120f0060f0f7 SHA512 25ec435d0d14169165c88ef494d5c26e93025669ad9c8c2d9672d3bf16e063c645b68f5041fc0d938c9c9fb252794e03d7d06290847f27b10622eadd1fc69deb
+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 d048d558b434..a05878652aae 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/poedit/poedit-2.1.1.ebuild b/app-i18n/poedit/poedit-2.1.1.ebuild
new file mode 100644
index 000000000000..2f30b7de1dc4
--- /dev/null
+++ b/app-i18n/poedit/poedit-2.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW"
+WX_GTK_VER=3.0-gtk3
+
+inherit gnome2-utils l10n wxwidgets xdg
+
+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"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	app-text/gtkspell:3
+	x11-libs/gtk+:3
+	>=dev-cpp/lucene++-3.0.5
+	>=dev-libs/pugixml-1.9
+	dev-libs/boost:=[nls]
+	dev-libs/icu:=
+	>=x11-libs/wxGTK-3.0.3:${WX_GTK_VER}[X]
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die
+		rm "locales/${1}.mo" || die
+	}
+
+	l10n_find_plocales_changes 'locales' '' '.mo'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	setup-wxwidgets
+	xdg_src_prepare
+}
+
+src_configure() {
+	# CLD2 and C++ Rest are not available in Gentoo
+	local myeconfargs=(
+		--without-cld2
+		--without-cpprest
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/qimhangul/Manifest b/app-i18n/qimhangul/Manifest
deleted file mode 100644
index cdec7698ae1a..000000000000
--- a/app-i18n/qimhangul/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qimhangul-0.2.0.tar.gz 336566 BLAKE2B ecc5f2cd5f2f2815590e80e38c2e3f022c2a3fad6be8bee36abcc7284c5dc621be8987459576e05d962d74c7e3abe3df60dca73fe6c3468e82153fc47549a1ee SHA512 0871dddf48211841be36facde39cd215c247a5b89c1167baadd33b839eff084b7c39185804e1e62a7acc001178b56751d4f0301e327e1e0709b4340b7a003d0e
-EBUILD qimhangul-0.2.0.ebuild 385 BLAKE2B 27979f7759b484fd8dd44a77939c60426c5a2659c1d1027f57cb5f02b76bae600f578da126b0172f23ba9d7e2506a39f6167c4da941286c2750198ee9a209e81 SHA512 d578c43c201eaf8e892578b6d1a57d337ed651479a147ae97ac3d0f45d8b9eb8dc8a122994df4e78a57e38b302f7710539ed826761876729d8493a737756ce80
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/qimhangul/metadata.xml b/app-i18n/qimhangul/metadata.xml
deleted file mode 100644
index c921b96adf6c..000000000000
--- a/app-i18n/qimhangul/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/app-i18n/qimhangul/qimhangul-0.2.0.ebuild b/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
deleted file mode 100644
index 44a23c251b42..000000000000
--- a/app-i18n/qimhangul/qimhangul-0.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="a qt-based imhangul"
-HOMEPAGE="https://code.google.com/p/qimhangul/"
-SRC_URI="https://qimhangul.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=app-i18n/libhangul-0.0.12
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index 46562c393ffc..cfc1550cdd29 100644
--- a/app-i18n/sunpinyin-data/Manifest
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -1,7 +1,7 @@
-AUX SLM-inst.mk 1847 BLAKE2B aab982dc7c1f93db8c4ac9b77b793fbe4304ab70d62d3c18741e87c91dc6fd876e0f9a8f346b1e621f7ce11669eb335dcd9082894130f4d7b0c1c4c5812df588 SHA512 fcbc2e7f18d02dc7ae13ceb9926018d8e83ff955eacae69d664842a84cc4aac2c6f9070e1a33ca6b9b68b4d3ca3ef1ec2e8863f82a8eea1183e7b02d5b665470
-DIST dict.utf8-20120830.tar.bz2 652472 BLAKE2B bd31553027e25261e2d69a4f1a82d2c1f18b424f16f1b62a817151892b0d012be7cf1f2b7f7fbbfda98dbc40c21186eaccdca2453d139f0e50aaf3d793d64671 SHA512 4400bc2a54cbf828e1d34f8240d8915a29171d6def125fecf4aa13b442dc2442d9ea591e4451cf030d22d974fbdba09adde4112c08acae9ae023823311ae8535
 DIST dict.utf8-20130220.tar.bz2 652859 BLAKE2B 9e0cdefc0db519b0e12dd2cb2621ef500e0ed5a0ff9a0eea76d6f64eac1cdb455f2d3c8a806fe7aa8c50cbc369c0ef6d937fdf01fecbc349773b12375bb419f3 SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8
+DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b
+DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
 DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97
-EBUILD sunpinyin-data-20121025.ebuild 910 BLAKE2B dbf1f2e6a9f4b3a8dc3497eaa3dc0f29f0d47c65231c5cab27ae896d4cd981acacdd5f03ba8765cb13cd05aa0e72b330205f97cc4f4aa11c9c2a042437666738 SHA512 6fcf7bc0d142f966c42c0ea54627d677649db74b1c93e6630ab708438cf22a29f33cd8d4f88fe154c6712d647880deaf5a5cac197ebea2376b810b36a9df8d7c
-EBUILD sunpinyin-data-20130220.ebuild 906 BLAKE2B 705fa18d72412168875820721be68a59f59ff63fca0759cb6fc8cc35c5ea263e44b862f8ec03a5f4c1810f5563a5f01831629ca156460c0daaf328c0c60c4a34 SHA512 8786ad78957d1e23896af0c68d83a1a1eab158b59a60a158be32a88942e453178e626fa74f0464b61f6dc504c5c9ff428c8b35f0b5a2a86f77671197da23b4b8
-MISC metadata.xml 323 BLAKE2B cb36295be070944db054e52bd199f502dd1136e35d27e7eb9a0caac66798393c12d19fa9b7a421c9e3561023474a01d0788da1a333b34f15fc576862272955ee SHA512 b91630bdda4510f930c9b114a77859e6350c16cfd41c8b585895d4f40a9d8d7ce4a02dd6f46be41ecc7ba6ad2ce6846b143d1745ac9e1385821e403419df9a39
+EBUILD sunpinyin-data-20130220.ebuild 984 BLAKE2B fdce14f8c0249901c821f913a793273dfd6c1be537656323ec28b428bec3758e45f065b89e5b62bd2066ab204410c81f61d5fdceb7bd51aebef32d54747926d4 SHA512 b58d6e341b56027aebe84fc5144a3b1da3c83feeabf4392a4c39e77f88b8a9d4c1ae7ec0075d822ac24be031c13cc72b5be530a1678fcf87b87ba4fb79b2d559
+EBUILD sunpinyin-data-20140820.ebuild 1021 BLAKE2B 29fe8b3174cb786e2f3bd169440031b126f00bc21b86cd943cc7f31cca730fbaaa3751e74bb035ea0cad2fda8ee86f27b4af9f2ad0b5ed51f90dfb0bf57bc913 SHA512 fe35e205be1a079abf43b8b3e4b793e7fc3207d95498a32dd9fbe95e87fcf3e4ffed08501f7e26dd5f1a25b4cf4326352f1968844391a0e93dc89a622c812087
+MISC metadata.xml 328 BLAKE2B fe394bf1f33b3b39d476a8e8a0ce7a58c071646be7455b102c5b298ae22afc9e2b6a2571e3ca52024f46d7675a6568313dde549576d17d117e1feb01a6559e78 SHA512 43f6f1fc7c0a311ae6e0d5712e570a43a3530173231f054eb939a36f7c4bc117e026678a837dd11b3fd10945d7a476a38f2d10f55501884bb53a29895fab9e01
diff --git a/app-i18n/sunpinyin-data/files/SLM-inst.mk b/app-i18n/sunpinyin-data/files/SLM-inst.mk
deleted file mode 100644
index 9216a941ad1c..000000000000
--- a/app-i18n/sunpinyin-data/files/SLM-inst.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; indent-tabs-mode: t -*- vim:noet:ts=4
-# Sample Makefile for lexicon generation and installation.
-
-# Little endian platforms: alpha amd64 arm hurd-i386 i386 ia64 mipsel sh3 sh4
-# Big endian platforms: hppa m68k mips powerpc ppc64 sparc s390
-ifndef ENDIANNESS
-	ENDIANNESS = le
-endif
-
-DICT_FILE = dict.utf8
-
-SLM_TARGET = lm_sc
-TSLM2_TEXT_FILE = ${SLM_TARGET}.t2g.arpa
-TSLM2_ORIG_FILE = ${SLM_TARGET}.t2g.orig
-TSLM2_DIST_FILE = ${SLM_TARGET}.t2g
-TSLM3_TEXT_FILE = ${SLM_TARGET}.t3g.arpa
-TSLM3_ORIG_FILE = ${SLM_TARGET}.t3g.orig
-TSLM3_DIST_FILE = ${SLM_TARGET}.t3g
-
-PYTRIE_FILE = pydict_sc.bin
-PYTRIE_LOG_FILE = pydict_sc.log
-
-SYSTEM_DATA_DIR = ${DESTDIR}/usr/share/sunpinyin
-
-all: slm3_dist
-install: slm3_install
-
-tslm2_orig: ${TSLM2_ORIG_FILE}
-${TSLM2_ORIG_FILE}: ${DICT_FILE} ${TSLM2_TEXT_FILE}
-	tslmpack ${TSLM2_TEXT_FILE} ${DICT_FILE} $@
-
-tslm2_dist: ${TSLM2_DIST_FILE}
-${TSLM2_DIST_FILE}: ${TSLM2_ORIG_FILE}
-	tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon2: ${DICT_FILE} ${TSLM2_ORIG_FILE}
-	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM2_ORIG_FILE} \
-		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-tslm3_orig: ${TSLM3_ORIG_FILE}
-${TSLM3_ORIG_FILE}: ${DICT_FILE} ${TSLM3_TEXT_FILE}
-	tslmpack ${TSLM3_TEXT_FILE} ${DICT_FILE} $@
-
-tslm3_dist: ${TSLM3_DIST_FILE}
-${TSLM3_DIST_FILE}: ${TSLM3_ORIG_FILE}
-	tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon3: ${DICT_FILE} ${TSLM3_ORIG_FILE}
-	genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM3_ORIG_FILE} \
-		-l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-slm2_dist: ${TSLM2_DIST_FILE} lexicon2
-slm2_install: ${TSLM2_DIST_FILE} ${PYTRIE_FILE}
-	install -d ${SYSTEM_DATA_DIR}
-	install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
-slm3_dist: ${TSLM3_DIST_FILE} lexicon3
-slm3_install: ${TSLM3_DIST_FILE} ${PYTRIE_FILE}
-	install -d ${SYSTEM_DATA_DIR}
-	install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
index 11bbcd490ca1..3ce0e2257d3e 100644
--- a/app-i18n/sunpinyin-data/metadata.xml
+++ b/app-i18n/sunpinyin-data/metadata.xml
@@ -6,6 +6,6 @@
     <name>Cjk</name>
   </maintainer>
   <upstream>
-    <remote-id type="google-code">sunpinyin</remote-id>
+    <remote-id type="github">sunpinyin/open-gram</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
deleted file mode 100644
index fa390bb7a465..000000000000
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DICT_VERSION="20120830"
-LM_VERSION="${PV}"
-
-DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
-	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${S}" || die
-	mv "${WORKDIR}"/dict.utf8 "${S}" || die
-	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
-	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
-}
-
-src_compile() {
-	# we don't have any big-endian architectures keyworded yet, so hardcode
-	emake ENDIANNESS=le
-}
-
-src_install() {
-	emake ENDIANNESS=le DESTDIR="${D}" install
-}
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
index 9b450e30a2e9..81a424941c72 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
 DICT_VERSION="${PV}"
 LM_VERSION="20121025"
 
 DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
-	https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+	mirror://sourceforge/open-gram/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
+DEPEND="=app-i18n/sunpinyin-2.0.4*"
 
 src_unpack() {
 	default
 	mkdir "${S}" || die
 	mv "${WORKDIR}"/dict.utf8 "${S}" || die
 	mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
-	cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
 }
 
 src_compile() {
-	# we don't have any big-endian architectures keyworded yet, so hardcode
-	emake ENDIANNESS=le
+	# lm_sc.t3g
+	echoit tslmpack lm_sc.t3g.arpa dict.utf8 lm_sc.t3g.orig
+	echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+	# lexicon3
+	echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+	echo "${@}"
+	"${@}"
 }
 
 src_install() {
-	emake ENDIANNESS=le DESTDIR="${D}" install
+	insinto /usr/share/${PN/-data}
+	doins lm_sc.t3g pydict_sc.bin
 }
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
new file mode 100644
index 000000000000..c35487a14eac
--- /dev/null
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DICT_VERSION="20131214"
+LM_VERSION="${PV}"
+
+DESCRIPTION="Data sets for Sunpinyin"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+	mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=app-i18n/sunpinyin-3*"
+
+src_unpack() {
+	default
+	mkdir "${S}" || die
+	mv "${WORKDIR}"/dict.utf8 "${S}" || die
+	mv "${WORKDIR}"/lm_sc.3gm.arpa "${S}" || die
+}
+
+src_compile() {
+	# lm_sc.t3g
+	echoit slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm
+	echoit slmthread lm_sc.3gm lm_sc.t3g.orig
+	echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+	# lexicon3
+	echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+	echo "${@}"
+	"${@}"
+}
+
+src_install() {
+	insinto /usr/share/${PN/-data}
+	doins lm_sc.t3g pydict_sc.bin
+}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index aa88043cc401..8b071569e419 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -1,11 +1,13 @@
-AUX sunpinyin-2.0.3-force-switch.patch 1046 BLAKE2B 786ff56100b308cbcd0bc7bb4a16d7e5691e0dae5778639f9b3d04f4eae531b44164262256443b62e191f72a4aa85a039c08cc0608b97796f76e7ae0f074f45c SHA512 abae0d760ecb93c6317483f3b14ee21670f1a42799ffc15a5dcfcf7f0838f0809731953bf6377a52a9647ace8172025bff5049859ac55db989d9f61904fa38ae
+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-pod2man.patch 469 BLAKE2B 5fab9d9a4cdb88189dfe0b8146f42effa9a48df8ce98e510a85c2cd55b92260803fb2350d921fa2a7e2a49e61ffbe82d2873397426c29ace1a50ba5c1d2c25b5 SHA512 1cc36f21dd11c802365fd770e7eefb324a3200e6570d7b585179778c8385dc694b214ad1339ac266f0adfa9d1f1ebca87b7847544069e25cfb563b0cb5bd8172
-AUX sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch 1010 BLAKE2B 3d34ca402e1504880e1abea8e2afc5fd5e342762020c450300ce01301f60d2c8cc527fdecb420eadf682fc1e086fef15b085518618c3803195d3afe4fd147d98 SHA512 8aaba439c49fac48c9523471bdbbac52feb594f61da6e3ba3747e3e6a08498817f06a8af8bcaa35d6b25ce0d31af3faac24faa57e15e3cae446f37dac5a30337
+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
-EBUILD sunpinyin-2.0.3-r2.ebuild 1608 BLAKE2B cd4e7cbbb893e1dc9867e9c0d88628a2264ec60759550409e6c8437224495124749b3efeeb75c7ca5177bafff2121655376b3f7087e00f59b99c19e3b61cf5b6 SHA512 e4e06b77ac463074ea01211e754e7a3a90e4c0d7026b7bb321d18f79105d7bfca635e5a82e06f956ceb0b4d8febe5a1497cbbc8ec48ef2c994f1b00d90f66a57
-EBUILD sunpinyin-2.0.4_pre20130108-r1.ebuild 1057 BLAKE2B 0bd5fe2b7ac7af8b635bd45c3a28c7f79f8a4212830b939501c9c94dc67972ce3b6333beb937e57c2886aba33cd8ad86b916a26d1ea1c7d4881846c97d597e3f SHA512 594ea06940263db5afa0cb87631074417a05999863b0d64793b6567732bf4ebf37b8c7f02c14ab3f91e18755f7b6bebce325d1d0578c191d5f70d2af75ca5a36
+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
index f2f6b389ba09..de85e82c1d5e 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
@@ -1,5 +1,3 @@
-diff --git a/SConstruct b/SConstruct
-index 68cd365..9bb6ebc 100644
 --- a/SConstruct
 +++ b/SConstruct
 @@ -180,12 +180,6 @@ libdir = env['LIBDIR']
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
index 77fe2831c7d8..0bceb38318b3 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
@@ -1,5 +1,9 @@
---- sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h.old	2016-09-20 02:54:15.046257131 -0400
-+++ sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h	2016-09-20 02:55:48.041124978 -0400
+https://bugs.gentoo.org/553796
+
+Author: Peter Levine <plevine457@gmail.com>
+
+--- a/src/slm/tslmpack/common.h
++++ b/src/slm/tslmpack/common.h
 @@ -53,10 +53,10 @@
  typedef std::map<float, int> RealIndexMap;  // map real values to their indices
  typedef std::map<std::string, unsigned int> TLexicon; // map word to wid
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
index 54831df21220..36e69d2deda3 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
@@ -1,9 +1,8 @@
-From: Guo Yixuan <culu.gyx@gmail.com>
-Bug: https://code.google.com/archive/p/sunpinyin/issues/327
-Gentoo-Bug: 553796
+https://bugs.debian.org/790287
+https://code.google.com/p/sunpinyin/issues/detail?id=327
+
+Author: Guo Yixuan <culu.gyx@gmail.com>
 
-diff --git a/man/SConscript b/man/SConscript
-index f3ebd03..e1551eb 100644
 --- a/man/SConscript
 +++ b/man/SConscript
 @@ -1,7 +1,7 @@
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
index 8ef0101da1e5..c79fd710b993 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
 
-inherit scons-utils toolchain-funcs
+inherit python-any-r1 scons-utils toolchain-funcs
 
-DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
-HOMEPAGE="https://sunpinyin.googlecode.com"
+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"
@@ -18,35 +19,34 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+	${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"
+	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() {
-	eapply "${FILESDIR}/${P}-force-switch.patch"
-	eapply "${FILESDIR}/${P}-gcc-4.7.patch"
 	default
-}
-
-src_configure() {
 	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--libdatadir="${EPREFIX}"/usr/lib
-	)
 }
 
 src_compile() {
-	escons || die
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libdatadir="${EPREFIX}"/usr/lib
 }
 
 src_install() {
-	escons --install-sandbox="${ED}" install || die
+	escons --install-sandbox="${D}" install
 }
 
 pkg_postinst() {
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
index 84ef8dcc2cb4..34f908fd9808 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1 scons-utils toolchain-funcs
+
+inherit python-any-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="A Statistical Language Model based Chinese input method library"
 HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
@@ -20,28 +21,26 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-PDEPEND="app-i18n/sunpinyin-data"
+PDEPEND="<=app-i18n/sunpinyin-data-20130220"
+
+PATCHES=(
+	"${FILESDIR}"/${P/_pre*}-gcc-6.patch
+	"${FILESDIR}"/${P/_pre*}-pod2man.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch
-	epatch "${FILESDIR}"/${P}-gcc6-use-float.patch
-	epatch_user
-}
+	sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
 
-src_configure() {
+	default
 	tc-export CXX
-	myesconsargs=(
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-	)
 }
 
 src_compile() {
-	escons
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_install() {
 	escons --install-sandbox="${D}" install
-	rm -rf "${D}"/usr/share/doc/${PN} || die
-	dodoc doc/{README,SLM-inst.mk,SLM-train.mk}
 }
diff --git a/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..386c1694c1a2
--- /dev/null
+++ b/app-i18n/sunpinyin/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
+
+DESCRIPTION="A Statistical Language Model based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+PDEPEND=">=app-i18n/sunpinyin-data-20140820"
+
+src_prepare() {
+	sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
+
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	escons \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	escons --install-sandbox="${D}" install
+}
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index 1c1312af0ca7..ecde08600287 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,10 +1,7 @@
-AUX tagainijisho-1.0.3-sqlite.patch 425 BLAKE2B 0d14c8619933ca9218ccae185c21d57453b95ec96d7ce7fcd64b0596fd6746df8f9f5d98429c799a9e5a00795875ca7ea0d029b0a888969681f13a2ba0800498 SHA512 aca8593bc860f3bb640134e49898106414ff57b1cd6a39be5371151ed32e8bdb45a0747535f5f0d4710367919cf329fc2c308df38731b3c94be16f4992d7d174
 DIST JMdict-2018-06-12.gz 18306650 BLAKE2B 3ddb29bf631567717085912b1fa21c701e6183c94907f64121daedf358303df09a754bcdf51f24f0d7c95bf1bfe4ea13779f5e3532bd19a3f99a33751259a893 SHA512 cd8e0a737ccd1ccbe7c53ab0affb5d4ca068656966c75f0abbc184ffcdc69d8a1dbe0f096a16f0b59ecaed40371a29e566ee5076a7e80e3f51796e32798bed3e
 DIST kanjidic2-2018-06-12.xml.gz 1482391 BLAKE2B c6f1d18f17b2107937fe07b77d6aa297d156d9c250cdc480000aeb7f8c9cd27a94e2cce1df80e4612d1bcadc94d92d5d013cfc8d923c5ceaba9ed5b0a692ae78 SHA512 700aba18e18ab271dbc583f1a1cc16dd7209e4aa48417201f0b51723d35f5aedcff299ed1503cb743151abce37c94c0facbab09dd0a46126131bb54f2004aa23
 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
-DIST tagainijisho-1.0.3.tar.gz 24816175 BLAKE2B fbe9e671675b2a938aa13aaae87af7f076f4f20c6024d90fa70f2c86f5e1964998d83047b69473e4f9a43e46eacde6b61bc6620b5cfb13c1b4d12a3b1317a280 SHA512 3afd75cc27e8701d93df54a2244b83090770cc80ac20ab8fb843d2ab925ab575f73d731a2ce736179fb7361af68e94694ec91f813d186c87e730368c41535c53
 DIST tagainijisho-1.2.0_pre20180610092832.tar.gz 3634107 BLAKE2B f5cb75f45fced30c64f615147c3eb7e4d473e81dd734517710bcfdf390d1a34a1780196b6dbbb7a6d297df0bb8d73933d09a76eb6b8dd13d1c0759c562e81695 SHA512 3b17ff6972e3cfd35f4f9e8c575153a4c2021a66a238f631616452a16a151d604106586d438cdc574211bff54118d89e492f9460da4b25fef88a2354b0bd8555
-EBUILD tagainijisho-1.0.3-r1.ebuild 1751 BLAKE2B 98b42350d471ef3f42ee092b6a2952e6eda8347efb229447666a00bbc0f195e1d366de08857864d4e7df18558a7202abfcffcb16b7f59ba20bbba3124eb908bf SHA512 2d664fc8ab217d57fabde412368b368fd02b1e04918fe3aa7d6f348035bc29583956c07d295549b32b1d0abc60cdd572b16efa74e0184e9f6861cf40ea584161
 EBUILD tagainijisho-1.2.0_pre20180610092832.ebuild 6180 BLAKE2B ac53048f5508366e943275fdf19ce7dfc7e5ccc4d228608d57828098911a5219ac89b0f4f5450cfba87dadd06fcde209438834e4264286b257cf98dba6e26bad SHA512 8ed6439eae16cea8e714fe8a5de659286414bbaffccc6b3c9a0c79d33a36534039b6a56a5e8fa936556a9264c2e4b164841ced3c3805f21da82928621198baab
 EBUILD tagainijisho-9999.ebuild 6109 BLAKE2B 0d10127700103382266b6606877e92de3205bac43a795a93bb30ed1c4d89c9f6bf2612a51e4e3bf3d92e611f3b1d1959c56cf2f5f34214220a80eb21fe72a5c6 SHA512 55c11b49c483b7654539a5627e44ee65111569be3fdc45c10f0db4600e09c0eef02c2f800337449f77a53b1c51ce01790d3c18b41945499d518b4f5a28883d32
 MISC metadata.xml 1133 BLAKE2B 863fcd0cbb85b715cf7666210c74a9e88423b0e982b3e05b4333036b607e4d2cf73b35dc6b8f5e549a35a6d8e2cc107f110f3500762d49065bd1ed2097dd6338 SHA512 cde2818f44f02091ac994ca049a25b90519b62b669b7923a52043df23a0de7f3e1f657d3080e574048556dbacd5521995addd35267ec9d1357360f473222cef7
diff --git a/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch b/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch
deleted file mode 100644
index bf1d443395b6..000000000000
--- a/app-i18n/tagainijisho/files/tagainijisho-1.0.3-sqlite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/Gnurou/tagainijisho/issues/163
-
---- src/sqlite/sqlite3ext.cc
-+++ src/sqlite/sqlite3ext.cc
-@@ -118,6 +118,10 @@
- 	sqlite3_stmt *pStmt;
- 	const char *zSql = "SELECT fts3_tokenizer(?, ?)";
- 
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+	sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+#endif
-+
- 	rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
- 	if( rc!=SQLITE_OK ){
- 		return rc;
diff --git a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
deleted file mode 100644
index b89dc7ed279b..000000000000
--- a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
-HOMEPAGE="https://www.tagaini.net/"
-SRC_URI="https://github.com/Gnurou/tagainijisho/releases/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-3+ public-domain"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	>=dev-db/sqlite-3.11:3"
-RDEPEND="${DEPEND}"
-
-pkg_langs=( ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr vi )
-IUSE+=" ${pkg_langs[@]/#/l10n_}"
-
-PATCHES=( "${FILESDIR}"/${P}-sqlite.patch )
-
-src_configure() {
-	# GUI linguae
-	# en is not optional, and build fails if none other then en is set, so adding ja as non-optional too
-	# linguae undeclared in IUSE will trigger an error, which is a handy check
-	local lang use_lang
-	for lang in i18n/*.ts; do
-		lang=${lang#i18n/tagainijisho_}
-		lang=${lang%.ts}
-		case ${lang} in
-			fa_IR|fi_FI) use_lang=${lang%%_*} ;; # use generic tags instead
-			*) use_lang=${lang} ;;
-		esac
-		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
-			rm i18n/tagainijisho_${lang}.ts || die
-		fi
-	done
-
-	# Dictionary linguae
-	# en is not optional here either, but nothing special needs to be done
-	# here too, linguae undeclared in IUSE will trigger an error
-	local cmake_langs
-	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
-		if use l10n_${lang}; then
-			cmake_langs+=";${lang}"
-		fi
-	done
-	mycmakeargs=( -DDICT_LANG="${cmake_langs};" )
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index fd105b9c79f0..c063e5a85878 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -12,5 +12,5 @@ DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452
 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
 EBUILD uim-1.8.6-r1.ebuild 5052 BLAKE2B 67f7e600a86a2f74ee49def7684bed41182946a6f0591892ef3b79609a5ae0002514ea941eeae6dca13ce93627fce28efbf1c9fb84f3fec805d301a347309edc SHA512 521d6bb0c8e40cf4a8b2a8c7ecbf650bbb24d6143ecfb4fa2e6ab3b0aa1df2d6e243345bb6bee9412c3fd5af8cfe20b88a05fb4ab3e048406ac3f674ac587aab
 EBUILD uim-1.8.6-r2.ebuild 5157 BLAKE2B 87909b8657beb68f9148b937ccdbaf97cc515d556fd7bbd97b9c5e08a202d7e3f1b835a0d1394dba7d98236642cf3eb94199ae764f45435cb769961d0b537672 SHA512 405dc2308abd24708c3b4fb68e866b83300a48909d5b60c1c21127235e2a7d69e984fda7e4131774de3c86da1c442cac36010569bf9d573ea89a79ee298522b0
-EBUILD uim-1.8.8.ebuild 5330 BLAKE2B 49c5eacb304c025502ef1ff2348de4fc270809f8855db29d6fc209a9a9797073f7d2c8f34bd113f1a59b361cdd5e59e1e78a41de864fc04e7286f4b10aeefd36 SHA512 a470b4e4907072dbc98a9b0d0505e895ad7c1ecc665b030fe5b9ba0131412ecabd3472fe8fdb86a92f50afb5f28d76f23351bad99daa9fb68bcd2e9aa3caf9cd
+EBUILD uim-1.8.8.ebuild 5465 BLAKE2B 698873dbcb9bb0a4ff2088a5a03031feecddc8d5959d18be447ee4ff1da3f7178006818260046a84672d4453a689a062a3e4dc2a0b3efc353ebdd8b65987181a SHA512 3866ce1524a5730e334abde0151cfe2b9a8a70f226d3901a5d8d421e88efe644ee49081b3ee7c8638c13dc77c3d3027ad3ae3cda5c54b3a7872f3d84dda4e2a5
 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index fc0e9ef744ea..ca02176189d4 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit autotools elisp-common gnome2-utils
+inherit autotools elisp-common flag-o-matic gnome2-utils
 
 DESCRIPTION="A multilingual input method framework"
 HOMEPAGE="https://github.com/uim/uim"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86"
 IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
@@ -95,6 +95,8 @@ src_prepare() {
 	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
 	# fix build with >=dev-scheme/chicken-4, bug #656852
 	touch scm/json-parser-expanded.scm
+	# fix build with "-march=pentium4 -O2", bug #661806
+	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
 
 	eautoreconf
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-08 20:11:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-08 20:11:47 +0100
commit	f625b9919a60a30f1bd860f7d1b2eac183ced593 (patch)
tree	7543f00925ff7277e31881de0a87801681f6f92f /app-i18n
parent	e3872864be25f7421015bef2732fa57c0c9fb726 (diff)