gentoo resync : 04.08.2018

3 files changed, 3 insertions, 39 deletions

diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index afdbed564acf..5aced37d4416 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,3 @@
-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 754 BLAKE2B adca146317671d3468f9f00a037deb7a9a3390b5ad1dd0828c0164d9cc57f08387fbcff645777ee17dd9d5fed8966c4422ed4c9a3b33d89cf42a6605ae30a518 SHA512 37eb35f1dfc5bdb06eff61e91c0ee319b0ecc2f670e8e7b9daf8eac381a4b67eb56b0bd1542581e7f0b67405fbe9c00ab51855bce9c76459ab4006b844c48eef
-EBUILD ibus-m17n-1.3.4.ebuild 756 BLAKE2B 6a17aecbbaa5d68a57378bc5b63e0e315779e0ce93670b4d0a18ae0d98ef2e94c41369915d20f683362295ab24bccfc93945654a1c6f18ee0c7ae32d2c9057cc SHA512 61dd652c11acdb6f0040fbfa2723b63014d1b408b88556d1ad73d3b2748d5cb780350040d4f8970824002a3cb8add59234349e75dc7eafd796254ade315ec782
+EBUILD ibus-m17n-1.3.4.ebuild 754 BLAKE2B 6564070e8d07b4ea14b9272785c12610d061ef05c88c3427fe37b4dbb2a6ff4c0bf6216d77453cc3789d4f7349a7d2a8106d66f4cb9b160aefd84a03492123df SHA512 ee3ae78bc8aede6146d9d5460ee053711927db126f7cdcbf090f73c41bc840aaae455e5be683222a5ec95b50cde3e67125c3a8da6c204c302099efd6e2e2bc46
 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
deleted file mode 100644
index d6b31d987ab6..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk2 nls"
-
-CDEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
-	nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
-	>=dev-db/m17n-db-1.7"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-REQUIRED_USE="gtk2? ( gtk )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
-}
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 b69cce49a38c..c17acb485e0b 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.4.ebuild
@@ -9,8 +9,9 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk gtk2 nls"
+REQUIRED_USE="gtk2? ( gtk )"
 
 CDEPEND="app-i18n/ibus
 	dev-libs/m17n-lib
@@ -25,7 +26,6 @@ DEPEND="${CDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-REQUIRED_USE="gtk2? ( gtk )"
 
 src_configure() {
 	econf \