gentoo resync : 25.09.2021

4 files changed, 88 insertions, 6 deletions

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
+}