gentoo resync : 28.04.2019

3 files changed, 34 insertions, 18 deletions

diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index 4b2844394a75..10b542a1361b 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -6,6 +6,6 @@ AUX mozc-2.23.2815.102-system_libraries.patch 9064 BLAKE2B 0cdf732a1bbf16d4af1d6
 DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
-EBUILD mozc-2.23.2815.102.ebuild 9372 BLAKE2B 41e035e68e63f9306b821d9730fe7a327da3d8371e3b5260854a95e6a6058aeea847ff7dd125c0e2c40810bd270eebee1a473b23dc402419ab8dd8b3af609e91 SHA512 b2941a9bd7433af0ccb07276aac42c8039d605aa323500274eed340057bc692542cfed7dbc9129328b691e7e1919ced561f3194e50e96b0eae131646904c0abc
-EBUILD mozc-9999.ebuild 9212 BLAKE2B 94f5437f7b87ddb8afc9bb8ba5001c1ec416108536cb91a7ad206d85e45a0e4278fc02d3616eba1dd97361595fd2a23d265a1142a3e4d64f333551c10aaf0157 SHA512 a3efe0ce36f0f3bd2453f87005b8923a9123a47272a3b3ee80719da430459e2d35b3c05972b9c44ca611dc8ef4d1ef836e39deff10785f96aeee570217c93c9d
+EBUILD mozc-2.23.2815.102.ebuild 9527 BLAKE2B 61829c224c0025620af5603466c7a235804a04b50476996eec2ffba60c96df72e6b056a1617b319fcae9afc14193e24bf6ea2fd96e4bbab759255bf8d7f22647 SHA512 dbae8bf0241aca3b0fafb3af24945de4e78381bd65f6cc816a117a8ba5016969cf761d14a295e0a8c5ae5b931712a3ea116c537dc2083bfc2aa0461ad8495ee1
+EBUILD mozc-9999.ebuild 9367 BLAKE2B b37c588da2242e2a79b5c98d3fec80d40d912be681730b3f1d7bc9e8fc0c0761eee2cc0044bffe94b42435bccf6896463899c79d86364b526e10e265fb99f149 SHA512 8a343d5c717821994f8c4072c0546b4bd4961f0eaf197cc909b37563266ba049be119a73742a413970f8228c8f9ef72b9d3e4724abad8c9fa78ef67548b95bf1
 MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 73baeb4cc28b..21a1291f1ea5 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=(python2_7)
 
 inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
@@ -38,9 +38,19 @@ KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
 REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
 
+BDEPEND="${PYTHON_DEPS}
+	>=dev-libs/protobuf-3.0.0
+	dev-util/gyp
+	dev-util/ninja
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	fcitx4? ( sys-devel/gettext )"
 RDEPEND=">=dev-libs/protobuf-3.0.0:=
 	emacs? ( virtual/emacs )
-	fcitx4? ( app-i18n/fcitx:4 )
+	fcitx4? (
+		app-i18n/fcitx:4
+		virtual/libintl
+	)
 	gui? (
 		app-i18n/zinnia
 		dev-qt/qtcore:5
@@ -61,10 +71,6 @@ RDEPEND=">=dev-libs/protobuf-3.0.0:=
 		x11-libs/pango
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gyp
-	dev-util/ninja
-	virtual/pkgconfig
 	test? (
 		>=dev-cpp/gtest-1.8.0
 		dev-libs/jsoncpp
@@ -319,5 +325,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
+	if use emacs; then
+		elisp-site-regen
+	fi
 }
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index b51359f01fb3..7876d9ed3783 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=(python2_7)
 
 inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
@@ -38,9 +38,19 @@ KEYWORDS=""
 IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
 REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
 
+BDEPEND="${PYTHON_DEPS}
+	>=dev-libs/protobuf-3.0.0
+	dev-util/gyp
+	dev-util/ninja
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	fcitx4? ( sys-devel/gettext )"
 RDEPEND=">=dev-libs/protobuf-3.0.0:=
 	emacs? ( virtual/emacs )
-	fcitx4? ( app-i18n/fcitx:4 )
+	fcitx4? (
+		app-i18n/fcitx:4
+		virtual/libintl
+	)
 	gui? (
 		app-i18n/zinnia
 		dev-qt/qtcore:5
@@ -61,10 +71,6 @@ RDEPEND=">=dev-libs/protobuf-3.0.0:=
 		x11-libs/pango
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gyp
-	dev-util/ninja
-	virtual/pkgconfig
 	test? (
 		>=dev-cpp/gtest-1.8.0
 		dev-libs/jsoncpp
@@ -318,5 +324,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
+	if use emacs; then
+		elisp-site-regen
+	fi
 }