gentoo resync : 25.09.2021

11 files changed, 94 insertions, 62 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index c3ab31fad32d..4ed47f4f8c71 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-fbterm/Manifest b/app-i18n/ibus-fbterm/Manifest
index 05d464a20200..5f2d5ed7dd4c 100644
--- a/app-i18n/ibus-fbterm/Manifest
+++ b/app-i18n/ibus-fbterm/Manifest
@@ -1,3 +1,5 @@
+AUX ibus-fbterm-clang.patch 1206 BLAKE2B 48992d5fd5f3b7ee998df58c13c44aa9d496e08f0c64f0d8570b9d1f92591e61ab65f16951c85b4b3243d7bdbaf1fa4d5a0f55559928d0fa65f6a9a965cede7e SHA512 58464675ee60245655eaf6fd8d12c84800c41be3ca29aecdcb71eff1b98c21ee15871e7cf2a369d19612ae6c7fca65c649b59f25d522c80b55f8ab4fc21e99b5
+AUX ibus-fbterm-man.patch 452 BLAKE2B 1684d85fa0040ebdf97f776463a21cdaa3aed5470a2ff36ad7167d02958256ca607bd91b3354cfb8ab38fc6543d6bd7b67dbcd45af063e501d73eaa925577d13 SHA512 4c465678272f0610dc9eeb7fae1978c5b528213fd2016fb7ed42e0c0d28ae4448b567ace0a0a9614eaeb35d393be00ba30392d182bbecbf280c6aa81a28380c1
 DIST ibus-fbterm-1.0.1.tar.gz 244979 BLAKE2B f92836e0f3675ee18003b96a4518172d50b1d8bf3253459920c4fdb1dd8c432da21ca2e63fd1156f58751f9ba47d37c1b7c2b550c3e97e796acfe40e6b84ba14 SHA512 6900a37444f15820cf383dd928107fd900f1677d8da5b4cc318e97b1227d412e098e8d476194da77fd4968b296729dff79a9c51d289b82e3b9a9485a05754f04
-EBUILD ibus-fbterm-1.0.1.ebuild 443 BLAKE2B f8b1ac404fe0d72356a8fd6a838fecfaacd7061a054ed893d91bbb319a070d544b2a5a82630fdbc39f76eb141dc0e7b9249a9366105622ead96849892b4e059b SHA512 597127d164b9e9e6b1eb6d721e3c4a76e2d6225602ca7afbdd7820d303583791cb898b4258939ffc09471eff1b48cf49adcc5a662f6d049f22896b0aaa038a17
+EBUILD ibus-fbterm-1.0.1.ebuild 602 BLAKE2B a63e13d5b83d41fc51d9a3c61026c67d8f4813c0f7572ccd0f9578ae640d81aefeead73b3fa9759e5411315ea4befe43e6675bbf3e2a551649443c4c34ce6248 SHA512 c62226b9cb6a04e6eb4949937149128070683efd3f2fdad8f234732c206c7572baaa0faf656fdabc19897407a0ed82e4ace107a30dbe659c1fee513760c3d31c
 MISC metadata.xml 331 BLAKE2B 5be2c446bb877753dfa803eaa5f96e238c52940be34852733efcb104a0b58d6bb5bfe700c7db1747cade7508bb886953c8073bedc30fa67fa720cdd8a27f891b SHA512 907a5699fa494f2ee9c837d0f4eb1beaf8c3651232af9e31fd6212c2204f7217b1a24cc2dd43decf2cc569bb363500e21a25f50d2a23ae97a4e29e5d6d9761fd
diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch
new file mode 100644
index 000000000000..797592c3240b
--- /dev/null
+++ b/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch
@@ -0,0 +1,48 @@
+--- a/backend/fbio.c
++++ b/backend/fbio.c
+@@ -204,7 +204,7 @@
+ int
+ fb_io_get_fd (FbIo *io)
+ {
+-    g_return_if_fail (FB_IS_IO (io));
++    g_return_val_if_fail (FB_IS_IO (io), -1);
+     return io->priv->fd;
+ }
+ 
+--- a/backend/fbshell.c
++++ b/backend/fbshell.c
+@@ -17,11 +17,11 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+-#include <glib.h>
+-
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 600
+ #define __USE_XOPEN
+ 
++#include <glib.h>
++
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <pty.h>
+--- a/backend/fbshellman.c
++++ b/backend/fbshellman.c
+@@ -81,7 +81,7 @@
+     FbShellManagerPrivate *priv;
+     int index, temp, i;
+ 
+-    g_return_if_fail (FB_IS_SHELL_MANAGER (shell_manager));
++    g_return_val_if_fail (FB_IS_SHELL_MANAGER (shell_manager), NR_SHELLS);
+ 
+ #define STEP() do { \
+     if (forward) temp++; \
+@@ -267,7 +267,7 @@
+ FbShell *
+ fb_shell_manager_active_shell (FbShellManager *shell_manager)
+ {
+-    g_return_if_fail (FB_IS_SHELL_MANAGER (shell_manager));
++    g_return_val_if_fail (FB_IS_SHELL_MANAGER (shell_manager), NULL);
+ 
+     return shell_manager->priv->active_shell;
+ }
diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch
new file mode 100644
index 000000000000..f3da1dd4ac6d
--- /dev/null
+++ b/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,14 +4,12 @@
+ 
+ man_one_in_files = ibus-fbterm.1.in
+ man_one_files = $(man_one_in_files:.1.in=.1)
+-man_one_DATA =$(man_one_files:.1=.1.gz)
++man_one_DATA =$(man_one_files)
+ man_onedir = $(mandir)/man1
+ %.1: %.1.in
+ 	$(AM_V_GEN) sed \
+ 	    -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+ 	    mv $@.tmp $@
+-%.1.gz: %.1
+-	$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+ 
+ dist-hook:
+ 	if test -d .git ; then \
diff --git a/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
index 81fd871b7bf2..148fb8ed4756 100644
--- a/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
+++ b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+
+inherit autotools
 
 DESCRIPTION="IBus client for FbTerm"
 HOMEPAGE="https://github.com/fujiwarat/ibus-fbterm"
 SRC_URI="https://github.com/fujiwarat/${PN}/releases/download/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -15,5 +17,17 @@ IUSE=""
 RDEPEND="app-i18n/ibus
 	app-i18n/fbterm
 	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-clang.patch
+	"${FILESDIR}"/${PN}-man.patch
+)
+
+AT_M4DIR="m4"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 89c1cf503a26..50ec65bb64ae 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,7 +1,5 @@
-DIST ibus-typing-booster-2.11.5.tar.gz 9485824 BLAKE2B 41d9aa2ba310e2db725e7809a67988fa69fee117b560d945a3cd935e7b2bbc372f448a531ed4ebd2a131dc1ffe3cb7d86b7d10fdbce56a2e241157f08a84ca69 SHA512 a30c81903b3d99f23a606f7f083615283ba64a0e62ac54183327447c33f6f7212472742036634522d36776a45ac72ce7874bcada624361f930785e2823652f0c
-DIST ibus-typing-booster-2.14.0.tar.gz 10048272 BLAKE2B 638978811e6c7f4fa6607a7925aaf89636390391359c3e312a40ab759fff81066ea980995a3ec33f51dcb6fed5009d11bb90409c37b65c8f005b9769333e0cfb SHA512 5db5791e25caba4fa845c33198c20365c1e07cbbbfd6fe2d1d3145771b16031cc9baa55f950870fc11d4079ce04dac246603e45285550e856fc403342ae51676
+DIST ibus-typing-booster-2.14.12.tar.gz 10226257 BLAKE2B 5dae530a7ec425e8bd3c6009d0bdb9b8d321c8670769ddf80ba7f706d6b5140f21f184f877603de3cc6f425a4a1953c645eb177c9fa8183ecfd091ccfb32353a SHA512 09d1898c3ac8a1dc79768df7a44c33862a0b0fbb2122d184f1e8a839b8c3c71191fe5ef932f9e649ac715c8093a5c277d5783594f8defc06ecc13727b851ffa5
 DIST ibus-typing-booster-2.14.4.tar.gz 10053545 BLAKE2B d0f941b937c1230ed9a947730fdc1bf9c3b5a255b1d3a63071fbe6c0595cf2d016aecaad4480770df34d1380c23b9db297fc57911dfb65e57952678593b2c05b SHA512 c8ab41fbc2bb401e342b317b0b20e0e9cd5c6ba529d0389b2b025db4295568b6f4ccadd639f622bd25078b6c2b8d5e336145c5397c580fb13012d4072333f523
-EBUILD ibus-typing-booster-2.11.5.ebuild 1067 BLAKE2B a880c11bdd9d4d8ff1a1bfb707e0a7e17f490fab6e36a80c8c442d65aacd46303f7920e1f6a8fb1b2aac4b66dd5f9f577097d99334adf2db1108111624a0e775 SHA512 724c53725bf813dd05d956863f9672725459bc506aaaef30e2336562e41d47df1890cca6af2c1adbb76988eba82a2e9b9299288aa9daaaa85fc981f1d1f809d7
-EBUILD ibus-typing-booster-2.14.0.ebuild 1069 BLAKE2B 7ddc93761c9e1007c0f4d9e09ccf8693d956d7f04a759b42187cfadb67b8f3de369dac596f4a0979caeb149f842565f633653d154675bc2bc7000941bb07176d SHA512 762f465a512bf1b62eba82dc0b6ccf494987ec12afa24c13f2a7a950cfa139977b9b7a2e37044c396cdd52bd34469cc1883a59b2ffa40b5f264060e4b49fb6d2
-EBUILD ibus-typing-booster-2.14.4.ebuild 1069 BLAKE2B 7ddc93761c9e1007c0f4d9e09ccf8693d956d7f04a759b42187cfadb67b8f3de369dac596f4a0979caeb149f842565f633653d154675bc2bc7000941bb07176d SHA512 762f465a512bf1b62eba82dc0b6ccf494987ec12afa24c13f2a7a950cfa139977b9b7a2e37044c396cdd52bd34469cc1883a59b2ffa40b5f264060e4b49fb6d2
+EBUILD ibus-typing-booster-2.14.12.ebuild 1069 BLAKE2B 7ddc93761c9e1007c0f4d9e09ccf8693d956d7f04a759b42187cfadb67b8f3de369dac596f4a0979caeb149f842565f633653d154675bc2bc7000941bb07176d SHA512 762f465a512bf1b62eba82dc0b6ccf494987ec12afa24c13f2a7a950cfa139977b9b7a2e37044c396cdd52bd34469cc1883a59b2ffa40b5f264060e4b49fb6d2
+EBUILD ibus-typing-booster-2.14.4.ebuild 1067 BLAKE2B a880c11bdd9d4d8ff1a1bfb707e0a7e17f490fab6e36a80c8c442d65aacd46303f7920e1f6a8fb1b2aac4b66dd5f9f577097d99334adf2db1108111624a0e775 SHA512 724c53725bf813dd05d956863f9672725459bc506aaaef30e2336562e41d47df1890cca6af2c1adbb76988eba82a2e9b9299288aa9daaaa85fc981f1d1f809d7
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild
deleted file mode 100644
index 60292db609e9..000000000000
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Completion input method for IBus"
-HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
-SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/m17n-lib
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-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-typing-booster/ibus-typing-booster-2.14.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12.ebuild
index 4e8cb0ffc7f7..4e8cb0ffc7f7 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.12.ebuild
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.4.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.4.ebuild
index 4e8cb0ffc7f7..60292db609e9 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.4.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest
index 2f6452bf6d16..b47d31df4e88 100644
--- a/app-i18n/uchardet/Manifest
+++ b/app-i18n/uchardet/Manifest
@@ -1,4 +1,4 @@
 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f
-EBUILD uchardet-0.0.7.ebuild 1015 BLAKE2B 4a136a4430d0d3d166dfb403ce698e459888285e21e9bad2af22b8ae937de91e984c88d76cab55f3fca979f76f689da98d54d277f6f06012eec63ce8a84fea24 SHA512 310fad81f208924e54ea0b1f96c813eda0237232f6f688b99809791c204f3832adb80b34c0fdf8b80d555c5e45de22351b9179a816ff248c56ec382bf74d46f7
+EBUILD uchardet-0.0.7.ebuild 1021 BLAKE2B d8f48aa69694c5b1cc5fdcfacba4fdc50386bf87997d1d5d49a21110de673edf631f6d37f72e3c97123bb1d004042e66463077e67278836426d556284260f031 SHA512 77746c41dec4dde1062480f559225aae537b6222c5618692746acb7d1ffa8633c01353d681dc3f08c3203db72c7a83804d50a05a2fbd53605f60ed867a733755
 EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04
 MISC metadata.xml 702 BLAKE2B 3b67f36feec5c70a40227cd126db36e234fefe38b3bdb7677aee88c48577a33f6dd05dd276e01af3f2988ce3bcb994d02dba84f97dbea7ed6ba7ac31a2966beb SHA512 2e9a019076f74c00332585856e17e2d39495c770b8ae1f572d66e94044cac64162db6c8e1eea30fd42bc5c570fc363a1e2daaaba26677e3765cabe4381a4150f
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
index 5f8e8c095fc5..f49961e7549f 100644
--- a/app-i18n/uchardet/uchardet-0.0.7.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
 
 LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 static-libs test"
 RESTRICT="!test? ( test )"