gentoo resync : 05.12.2021

3 files changed, 2 insertions, 49 deletions

diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 2314326a2a04..54df6aade9a0 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-m17n-1.4.7.tar.gz 493889 BLAKE2B 48a9b2ff1590d790d763014c0c9e5c08bf7ba84361a922aa71ab9cdb5b5e4c69fc5608a27c19eadc83578fdaafc3375c5bcedc1d81e2743a994d622042ffd436 SHA512 b011d4ee63a538a51f67012932d872fc2d527c6f3e5dd1642b7e70d3a32164532bc2ab69fb794eb985617b2698074af9079dac7991b5a2a30828595b129cce40
 DIST ibus-m17n-1.4.8.tar.gz 494516 BLAKE2B ec4cb36d465e25a6e0e334243e7df83444846f9109ef2142daea4949ddaa7cdf5290fc2749a978f7b8fb6d49bb080b2b826726fdc97e26bc722b019c93f13882 SHA512 3e808ffc3b7d03a745be1009a58c8d03ecabe15478f7bf36d70b777d342ad04d0f5574bb78743bcb67ab36674d316aef3cd7070d48ef9e11d07f960d75597aec
-EBUILD ibus-m17n-1.4.7.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
-EBUILD ibus-m17n-1.4.8.ebuild 803 BLAKE2B 407d381baf82ab7a97876f9539735575b68175e745d0f7e8b4a83d4bf89e1b8aebfd56dc0bc462c2a751e39e2677a8e3b25c7b2e3cc0c7d1d6d74ad1d3513110 SHA512 f8a64621c6d98ec52730f3fd9713245a8b9f47c076b67c786b291cfa39febd66bd51132845f4a2b205a00006488c83b4b83b9f43de633a37ac5e743768499899
+EBUILD ibus-m17n-1.4.8.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
 MISC metadata.xml 555 BLAKE2B b9dd5e7d4f230dde589a7e73333d14d52dae05d0e549dbde75332807434fc7c73ee7fe468dd919762527ac65f16c7a484b8d8b5c629c24dbe695c19c96b9abba SHA512 311891667bea4f2d4797440920ba2779a7f54766d3967edb25cb65b30800164a33192babdf7aadaa9adfeade385852d7d8d2a9a039b7c4ecbd2e9ed0a553fe89
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
deleted file mode 100644
index 8ec1183befae..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 3.0)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
index 1fabfb506072..8ec1183befae 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus