8 files changed, 9 insertions, 89 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 26290b60d918..aac79f4fc3ee 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 79a54dcc1ccb..afdbed564acf 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-m17n-1.3.2.tar.gz 414324 BLAKE2B de477d8d0ec8e6498946799d2369755ec4b82856df7be91b426535290442dcffc43538b06b9e9aaffc6f1eae794a232b86935230bb3590f165a91bda9e4a1629 SHA512 6cbff2bf08043eb46d5e97c9303ebbb795c69b77c14d113c22fee2111eaee04ba8bc27bbd44b6640be02dd43f4b3711aba1b02fcbb350b8bca8d90dd20b4ba54
 DIST ibus-m17n-1.3.4.tar.gz 436687 BLAKE2B 66c1138101b1c3634ebeef4657ef9d4accb30e9db0047d7232d1c25a5d061e705fb1f1bd2800c951baadeddf999a4eb24a581d59e261df4fd68d23b29ef3c530 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4
-EBUILD ibus-m17n-1.3.2.ebuild 786 BLAKE2B a92836eb5643ae50d6cbeb7b142185b97ffd89e93c503157573b6698a74fd6c586f8b8e896c308b75506c648ea9ffbf6382524463b74b3fc1ec6f7e05fdfdfda SHA512 24e5d2b978273e517b5994aa410a31ff4fb1fb9207b6bdc4be03e32d5ec0cc4e70a1158dba7201aa3f25b666bff3d764fd71a4ba209b4bceabd710237a917fb6
-EBUILD ibus-m17n-1.3.4.ebuild 788 BLAKE2B 9cbcd8552b54e0a74544cc5d87d63061884be6c1a6acc3ae54ad8b04cf69df06d62cadf57e05d6ed91a305c9fb898b0e95394ff64c83e75e608e074d9e6d1b09 SHA512 abe0df5253b4c10af86f88179cdd309edd92e3462dcdb88bad85e892e85ffa74354df5fa903bdaae8655102884e207fe755ee170df76ac9067e1b6bc31b532e3
+EBUILD ibus-m17n-1.3.2.ebuild 754 BLAKE2B adca146317671d3468f9f00a037deb7a9a3390b5ad1dd0828c0164d9cc57f08387fbcff645777ee17dd9d5fed8966c4422ed4c9a3b33d89cf42a6605ae30a518 SHA512 37eb35f1dfc5bdb06eff61e91c0ee319b0ecc2f670e8e7b9daf8eac381a4b67eb56b0bd1542581e7f0b67405fbe9c00ab51855bce9c76459ab4006b844c48eef
+EBUILD ibus-m17n-1.3.4.ebuild 756 BLAKE2B 6a17aecbbaa5d68a57378bc5b63e0e315779e0ce93670b4d0a18ae0d98ef2e94c41369915d20f683362295ab24bccfc93945654a1c6f18ee0c7ae32d2c9057cc SHA512 61dd652c11acdb6f0040fbfa2723b63014d1b408b88556d1ad73d3b2748d5cb780350040d4f8970824002a3cb8add59234349e75dc7eafd796254ade315ec782
 MISC metadata.xml 706 BLAKE2B 26b96ef11039182056e63f34f5bfa5f105e3eff9cd996aabaf0fde26bc650b51e1a176f700c7189cc568310c1ea6f8ef15c0316801526b3556142a0473731736 SHA512 b5da8f8cf77fe9028b052e0a546667342116e16c79ef044032443f30ff2814c5e534ee70b99419fbb509db2d4d755d570f8a8900a139594518eb7b6a5971b0f2
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
index 066a33f3d85d..d6b31d987ab6 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.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"
@@ -20,10 +20,7 @@ CDEPEND="app-i18n/ibus
 	)
 	nls? ( virtual/libintl )"
 RDEPEND="${CDEPEND}
-	|| (
-		>=dev-db/m17n-db-1.7
-		dev-db/m17n-contrib
-	)"
+	>=dev-db/m17n-db-1.7"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
index 43b97a705ace..b69cce49a38c 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.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"
@@ -20,10 +20,7 @@ CDEPEND="app-i18n/ibus
 	)
 	nls? ( virtual/libintl )"
 RDEPEND="${CDEPEND}
-	|| (
-		>=dev-db/m17n-db-1.7
-		dev-db/m17n-contrib
-	)"
+	>=dev-db/m17n-db-1.7"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 7229c0cc0eda..78fe5aa38678 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-typing-booster-1.5.32.tar.gz 5114796 BLAKE2B bc9d95b9f2da1cbb7eeb6fa07a528e29eae55a2283248bb0b94c09136571f9f29e4ad0af724f3fc621e2357c28efe97005b9d77365d6a349fbf5c17d6ee75a55 SHA512 0027d5b569577e3508a2af98c45929f63fea95369e6d502a42b3e3f61d28fb2c575ac42f5ae69c388d13a5740d35cbcda78ef01144679dc201bcbf384639290e
-EBUILD ibus-typing-booster-1.5.32.ebuild 892 BLAKE2B e46917516494c5d9cf726c7dc2a54442cf00c68a93ac3509301a067490c1091e674900222f14579c96615ed377cbaadb0e1086441d000f12fa99a46730c33f62 SHA512 337d8a78c9fb87cfe46fbe5e043722c52c2d2b7cc62039220f444f9a26936b726fad670910f69e52c66b7f771ff95872bd01d091fe281f4a27287cd4e6495182
+EBUILD ibus-typing-booster-1.5.32.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.32.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.32.ebuild
index 94e882bf44d5..b4bb8048b30d 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.32.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-1.5.32.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"
@@ -26,10 +26,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	|| (
-		>=dev-db/m17n-db-1.7
-		dev-db/m17n-contrib
-	)"
+	>=dev-db/m17n-db-1.7"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 75aae3bc442b..18ab05721d55 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -3,6 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r2.ebuild 1601 BLAKE2B 210f94b60e94d65fb761a4a92007cbe76f5612450ac115c76c9952e1cb611965004324ee487c72d6480ccc6f4a0bb78f889a33b4dd398ff09b083efbe732ef73 SHA512 1c2fad47b395478bd0a9e200a84af14ffb61598022c6655dac28fcdd008cd8ccdd0e88ed9b51cfbf9145857368fae8945a8ec1eabe33b82d7f88fb1cd2c036cf
 EBUILD tomoe-0.6.0-r3.ebuild 2143 BLAKE2B 341ed2eb5e7408e054f9578f62c1cffc5d4eac8dd0577b1fc0a686a39c8e29bae7fa49f4de54ca044a71f1b8000c33a58c69900ef28db7e329ef886b45aaa08e SHA512 8404db587e1776a864801d9a9ff7396a2c4a63bd0f780821f8a3a1857d74bb6c2fc3edfe13f2989bdcc5b597a481316ba363c53045d025b383beccac7dfd63d4
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
deleted file mode 100644
index 6fe794e094ed..000000000000
--- a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools ltprune python-single-r1
-
-DESCRIPTION="Japanese handwriting recognition engine"
-HOMEPAGE="http://tomoe.osdn.jp/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="hyperestraier mysql python ruby static-libs subversion"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-	hyperestraier? ( app-text/hyperestraier )
-	mysql? ( virtual/libmysqlclient )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)
-	ruby? ( dev-ruby/ruby-glib2 )
-	subversion? ( dev-vcs/subversion )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-export-symbols.patch
-	"${FILESDIR}"/${PN}-glib-2.32.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
-		-e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
-		configure.ac
-
-	sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ruby dict-ruby) \
-		$(use_enable static-libs static) \
-		$(use_with python python "") \
-		$(use_with ruby) \
-		--with-svn-include="${EPREFIX}"/usr/include \
-		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}