gentoo resync : 01.08.2021

8 files changed, 17 insertions, 30 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ebd082a163f9..794575dbe7ef 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 7521d92fba53..fd1f9ca26ce8 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-m17n-1.4.4.tar.gz 490328 BLAKE2B e7b5c417d4cc16cea736dfadc504137218397ed1ce6318dc6edc48ec33b13051b43d2f7926a959aafe79025c2af1a35374a7dcb4cb4fee952df85b25b604d07a SHA512 df8be7ceaa2183ffb377e39f52b271f18825a8970f88972d0a43ed1fa2721d36bf564a20f89311541ffe19546441322fc568c4819e42e41bdff45ee137d6de80
 DIST ibus-m17n-1.4.5.tar.gz 493250 BLAKE2B a5fd4de169997dea78acf6273a7e44cefbc9ab4499cbee92c30f394ef7267c15fb1af42d45d227bc160150f35195477f9ec3d2534f9764bab4fa86c0fae046eb SHA512 64bed564d59b0992ebc8a931e0845f687c176e5336d7c7fbc1d575433eb276714615f8fee412a532ec2c8870e46d8d6c41636c984b666c92427dadbdc84838b5
-EBUILD ibus-m17n-1.4.4.ebuild 894 BLAKE2B e546c29fed4e3155af586f96836a8720427d272a3eccd432d92778b765dc7ec3347056168eb1decfa0166ede011225a95c80cefa28d68a11d69b30cda91f0590 SHA512 a7e6fd76f12992613c486857b0dd30471175bf56bc0ee5cc273bb21e999cd59a309e1922b204633dd113e18b220051dfc6bf1b6289e56f168b5302fe77fa2a38
-EBUILD ibus-m17n-1.4.5.ebuild 896 BLAKE2B a8a7a9cbf44d8325aa3f59c87ab7b2d1407ae9306c089aad54c7368f315be9bf83bc3b712b9e6e2f42b48e428af4af1431a4b51e24bc5861be6061bd06e47451 SHA512 f78da526515464797d8e98ed7af6879d53da7b61131ffd8332a3e7631d6b8f886b3d7aeb4dfc0a954d0603d2a1bb81d69864fe1742b52592644cc9e110aca12d
-MISC metadata.xml 679 BLAKE2B a374aafbf949a9cb71906396787329ea1cd31775b29bf1675b30c98098e1025ee5e96dcdce2e8324bd6d3bfc05e854f89b1120a2e9410834a4dab767db1336b0 SHA512 c07286ebfb6f8bcf82c4fe6b5d02cf0a49287c7609daa42a356b8bfe7b3c074558d39d987decbffd15b10a33d475630b5f7194ff9941c9762c87dbcbefada953
+DIST ibus-m17n-1.4.6.tar.gz 493592 BLAKE2B 1b9978277a008a4e72ffe03306d409532da7757d53cdb8bae9d6b5776b417e3b731fe432cb5f5c50f7f52d83ed9a2dd572a866111f9186ac42f5ce8afe511ad4 SHA512 d33c89735e5e6c93301a3c3985f46708e41d44b66e580b282e484a7497c0b9d2615c66931cdd7260b4a63d9e9af4d9ebbad5e23d4a3f8a7773dcab61a7600c57
+EBUILD ibus-m17n-1.4.5.ebuild 801 BLAKE2B ae98e47abf2b6a6df31f97e538132ff89550861bcb6e736f7cc626ded61eea34d7e7437119f67483b70a24190e16a26bb47345e7dc023bf8f0d88a0b1fd8341e SHA512 c4e4525aecd307997c3a7a497355fb91cbdf50eec1e1596ca812b7188e2de71b54626bf8efd33efaef28625a015e5aedd91c962409b521f59e05e739be5a41da
+EBUILD ibus-m17n-1.4.6.ebuild 803 BLAKE2B 407d381baf82ab7a97876f9539735575b68175e745d0f7e8b4a83d4bf89e1b8aebfd56dc0bc462c2a751e39e2677a8e3b25c7b2e3cc0c7d1d6d74ad1d3513110 SHA512 f8a64621c6d98ec52730f3fd9713245a8b9f47c076b67c786b291cfa39febd66bd51132845f4a2b205a00006488c83b4b83b9f43de633a37ac5e743768499899
+MISC metadata.xml 554 BLAKE2B c3d636f6ca66bf158aa6435c5c77b83be2a60a0b61b54bea1aff3ea80f85e4169179da60c854de6a4691d4b2eb7c6dc3e77f0242767b389e4b66538d79a5c3ea SHA512 10c6ed207eae7ab5ec04dba82c51a2f1f57b2ddec109d6ab108e6da1c14d599db5a9af9e674844383244b063bfaf2a3c47c9639f87f4c2b45b304465cb350796
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
index c8aebffadc30..8ec1183befae 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild
@@ -11,16 +11,12 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+KEYWORDS="amd64 x86"
+IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
 	dev-libs/m17n-lib
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
+	gtk? ( x11-libs/gtk+:3 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
@@ -30,7 +26,7 @@ BDEPEND="sys-devel/gettext
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+		$(use_with gtk gtk 3.0)
 }
 
 pkg_preinst() {
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild
index 79d7891abe84..1fabfb506072 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.4.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild
@@ -11,16 +11,12 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk2 nls"
-REQUIRED_USE="gtk2? ( gtk )"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
 	dev-libs/m17n-lib
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)
+	gtk? ( x11-libs/gtk+:3 )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
@@ -30,7 +26,7 @@ BDEPEND="sys-devel/gettext
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
+		$(use_with gtk gtk 3.0)
 }
 
 pkg_preinst() {
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 481dbcd8c9d1..b120c362d923 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -9,11 +9,6 @@
 		The M17N engine for IBus. It allows input of many languages using the input
 		table maps from <pkg>dev-libs/m17n-lib</pkg>.
 	</longdescription>
-	<use>
-		<flag name="gtk2">
-			Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
 		<remote-id type="github">ibus/ibus-m17n</remote-id>
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index e83c990e9aed..5e0bcfe41fc3 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-table-1.12.4.tar.gz 1371890 BLAKE2B e0d531bdd38e536ac9fc92465a651e971969278ab4826198d12399ebb1cd747d1f5d21713ecc86311ab3995b04a2842d230da8caed962045a959ba136f197cb1 SHA512 3e175dad8d9e12be91f6b6878b67301bbbf04c55e43d483162d3b10d2edbdcf1077d1f37beea2ef36323eb7de289a0c60cd3d055357a580e5d18bcc642bb907c
 DIST ibus-table-1.13.3.tar.gz 1408143 BLAKE2B fda380e284a996d34053f6bae543ebc2c072ffbd870a9421b76f18a3fa5e45ca6e687818f40bd1335791f1b92dc7ffa1ccc35c7cb55d1a6ade26bc958a2bf8d4 SHA512 2959b2f96c9a490032dafbce2b4164fcc07797ab73e735f26003156a891e1e3760e6a4f42713084b5ce1e408cbe21c3060d99615d898fe50b8d51405dcd42a3b
-EBUILD ibus-table-1.12.4.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
-EBUILD ibus-table-1.13.3.ebuild 1037 BLAKE2B ae710df21cae6d1efc385cb6dc2bac6cfc5dc899307a7b983f317d03160d0f7398afeebf2a5e040a422efba2fa98c508ff52fa38205f6b49c1d42191e5dc5c8c SHA512 8f1fa8e7a21ee39a7513413068f4a4e4c8e7e1f53249278b9db6a351caf763e401f70b1b51ef44efde28de9f88fa4116c1663f1de621ec84cf368e6b55768af2
+DIST ibus-table-1.14.0.tar.gz 1450310 BLAKE2B 72a655e378b39324ff849e6941dc28920760d030d748a5b4b0899e14b94874a52581d03ccbef2d72c5eaae51d20a0e19690bde5a1411960347fe49cf3137d21b SHA512 60e570b82c4f05200410e9e4e155089223a20ebcf66d1c039a783108005f63699e75bc528fc30cd370c1400b65e765ade0d069184bd2ab81e2eda9bade2e8ac9
+EBUILD ibus-table-1.13.3.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
+EBUILD ibus-table-1.14.0.ebuild 1037 BLAKE2B ae710df21cae6d1efc385cb6dc2bac6cfc5dc899307a7b983f317d03160d0f7398afeebf2a5e040a422efba2fa98c508ff52fa38205f6b49c1d42191e5dc5c8c SHA512 8f1fa8e7a21ee39a7513413068f4a4e4c8e7e1f53249278b9db6a351caf763e401f70b1b51ef44efde28de9f88fa4116c1663f1de621ec84cf368e6b55768af2
 MISC metadata.xml 314 BLAKE2B bf730195fa020f6a78881c37dcca2874ff8d055f92cbfdd5c8a051bae6e6e7ba79f3346962e9dba9b424e69e6c01dbaffd65b2ba27aa374bbb34d7569f360868 SHA512 9abb502029e18744eee84d9a362594222a10ae9efb9a4d42d9bab1fc04b57c1067051676b028b10304d10a3925b23ee8bb5542d289db071b1c189d19764f81ff
diff --git a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild b/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
index ff60ef200c5d..98017235346d 100644
--- a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.13.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-table/ibus-table-1.12.4.ebuild b/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
index 98017235346d..ff60ef200c5d 100644
--- a/app-i18n/ibus-table/ibus-table-1.12.4.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.14.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"