gentoo resync : 20.10.2021

5 files changed, 57 insertions, 98 deletions

diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index 150bff575efc..2c1674c8a1d1 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1,6 +1,5 @@
-AUX ibus-chewing-test.patch 1700 BLAKE2B 6cc7fa0fe7bbdb49f89adc5e0f2509bfd34222d3d7ab16e39effe98e973582120bcb90e7d00e859121fd1c16f41df3ade9750ed879e88269230d4984109f64a4 SHA512 124042ccebc509116661dd732b4bbb237a3962518a273701da7d4a20ec0109a3f5b850380c712e457df947e146c189a2606976262915d3973211b70b7464c061
-DIST ibus-chewing-1.5.1-Source.tar.gz 177044 BLAKE2B b188c7ea2c12fd1ccf64a70355da0a6f8a47976f141c8a0a7edcc7a5ccd6b959f73cad2cd1137874f965967780691fe920b44b3141cc6fa4e631921f4c4a2582 SHA512 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633
-DIST ibus-chewing-1.6.1.tar.gz 111103 BLAKE2B c9b22b0fe4b164d02a1782479e139e04e3113299fb3ccebdba24eaa9d15964eca34d381f45f0c313bb53bc0b8c7f7b649ff4c0179c712f6d880e3d92a9d02692 SHA512 b093db79c656433614b9f72719a2b0768a30c2fb6fa066eda1e79cc9932ce1836f7f1e5611612fb44f260fe80a9baa9e18fdc9754b285e8a5f12a87c376cbd39
-EBUILD ibus-chewing-1.5.1-r1.ebuild 1450 BLAKE2B e2e8ee3f2dc2e805da44ccb7535e9b548f4f4bb6d32ec2d5f439776d17c9db75d9efa5ae4b3354d6ca8737c0e82a41e0bd67aa001427855e523ede0515c369c3 SHA512 69b31323aaee9f7c00a263c09169f69faf934fe605e7de0eef5a472fb56a52ccb6a6ac4c75c21dbe8b5bb0cffe91de56eb3522ced09e13e8ab8c814a387f9957
-EBUILD ibus-chewing-1.6.1.ebuild 1430 BLAKE2B 3b2c28285abc9d559961a16d1d7543118dd10c7c728d1ae123b74c1b776f25c890962f959167120aeb8ad12996804f6438729c6aff69db14764ceff0d1b1c2f0 SHA512 6631ce3998047f196dd6b8deef3570b39b937c7fd85facdfa1b720be773c87cafe5a36f8c1da7ad0458cdeee23591be0ddd621a0e0ebf93188cd7f1785b3d56f
-MISC metadata.xml 425 BLAKE2B 3d316bb5e0e46c4fb91e042eec905fb162abe1258796d1e31a029d272f413c8ef0266883ce4605d56d14910b319c1f14750e392f79fe807b19647ae79bc5b921 SHA512 e0c893b0d30b186f6c0f0043e1babbdf0f245f664dde4cf74d0a97367c94e975bb8d6874eddff69875f0a7741282aa118b34ff76f475aa2ada86fad9b93f594f
+AUX ibus-chewing-test.patch 2777 BLAKE2B cb7f3c8246ff80a6b7781a72aa27f0a5804d7dcfedd51001888c7833d6eb6790b5a931412d3bfad28c1711578799b48b5c39ce4760ebf96b03282bee2b233312 SHA512 245f907e51ffd4c7efd291055322e976eebf948f3f86b1e23a9f187f97ae91e20a41c6faf1a0396ebc097f09ba71e123940878c5211d2bf7f49ecce770a7a2cf
+DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6
+DIST ibus-chewing-gob2.patch.xz 11760 BLAKE2B 929c6f09ddc22efa47eb53fd9bd5833a5a5105e9e8c6251009699548b4b3a1bf124f335f9d963c42efe00a9f9276f4df303a087632d894237ee3f69f5c08b74e SHA512 4317f5e807d6114f9d1057421db9c032670578ca83898c7495a27bf76aaa0fee88649a5df9f16df74e7961129cfe2029eda66dcea9407263344add7670de088c
+EBUILD ibus-chewing-1.6.1_p20210117.ebuild 1577 BLAKE2B 7c6fde9cf845f13fd5391f96e61ff7517def1c52ecfe6bffc5eb702dbe7af3478cb3fa4239dd813fe526dd993c569f4a0175a3a05080dc798a4cfebc152ad6ad SHA512 ba5f4c24b13d9bcfb32f389d6aec842b6210fb61c9a94cd23c4fafc77bcf45888345628f743d809eeac955d4685e1fce0d468b84b94aa7b52fe7c1db4f9cdfd3
+MISC metadata.xml 411 BLAKE2B 39bf10c1dbb59f5213f9250b3780bb1a91bc7a13f6681eb996a64344779775247859b38d4a55c42b030ed15fa7d408ea387cd28c200740a76fd70383814cb016 SHA512 57eca3e6c4d055f23021ace5573124be9a826de6227391d024701faeea31c2e280633523ee509565c2c2223faa7d0a92c12f92b70b83bdfbc444b604066db481
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
index abed91d377d3..0d4ddc7a7838 100644
--- a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
@@ -1,6 +1,26 @@
+--- a/test/IBusChewingPreEdit-test.c
++++ b/test/IBusChewingPreEdit-test.c
+@@ -514,7 +514,7 @@ void process_key_down_arrow_test()
+     key_press_from_key_sym(IBUS_KEY_Down, 0);
+     key_press_from_key_sym(IBUS_KEY_Down, 0);
+     key_press_from_string("4");
+-    assert_pre_edit_substring("世", 1, 1);
++    assert_pre_edit_substring("勢", 1, 1);
+ 
+     ibus_chewing_pre_edit_clear(self);
+     assert_outgoing_pre_edit("", "");
+@@ -752,7 +752,7 @@ void test_arrow_keys_buffer_empty()
+     key_press_from_key_sym(IBUS_KEY_Page_Up, 0);
+     g_assert(chewing_cand_CurrentPage(self->context) == 0);
+     key_press_from_key_sym(IBUS_KEY_Up, 0);
+-    g_assert(!ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
++    g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
+ 
+     key_press_from_string("`");
+     g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
 --- a/test/MakerDialogBackend-test.c
 +++ b/test/MakerDialogBackend-test.c
-@@ -126,7 +126,7 @@
+@@ -132,7 +132,7 @@ gboolean mkdg_g_value_is_equal(GValue * value1, GValue * value2)
  void backup_key_to_g_value(const gchar * key, GType gType, GValue * value)
  {
      g_value_init(value, gType);
@@ -8,8 +28,8 @@
 +    mkdg_backend_read(backend, value, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
  }
  
- void change_new_value_from_orig_value(GValue * newValue,
-@@ -169,7 +169,7 @@
+ void change_new_value_from_orig_value(GValue * newValue, GValue * origValue)
+@@ -175,7 +175,7 @@ void assert_new_value_is_written(const gchar * key, GValue * newValue)
  {
      GValue storedGValue = { 0 };
      g_value_init(&storedGValue, G_VALUE_TYPE(newValue));
@@ -18,7 +38,7 @@
      g_assert(mkdg_g_value_is_equal(newValue, &storedGValue));
      g_value_unset(&storedGValue);
  }
-@@ -219,7 +219,7 @@
+@@ -225,7 +225,7 @@ void int_w_test()
  #define GCONF_KEY "max-chi-symbol-len"
      GValue origValue = { 0 };
      g_value_init(&origValue, G_TYPE_BOOLEAN);
@@ -27,7 +47,7 @@
  
      GValue newValue = { 0 };
      g_value_init(&newValue, G_TYPE_BOOLEAN);
-@@ -229,13 +229,13 @@
+@@ -235,13 +235,13 @@ void int_w_test()
  
      GValue storedValue = { 0 };
      g_value_init(&storedValue, G_TYPE_BOOLEAN);
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
deleted file mode 100644
index c1924f9c8119..000000000000
--- a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils gnome2-utils virtualx
-
-MY_P="${P}-Source"
-
-DESCRIPTION="Chinese Chewing engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gconf nls"
-
-RDEPEND="app-i18n/ibus
-	app-i18n/libchewing
-	dev-libs/glib:2
-	dev-util/gob:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	gconf? ( gnome-base/gconf )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
-DOCS=( AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE )
-
-src_configure() {
-	local mycmakeargs=(
-		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
-		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
-
-	export GSETTINGS_BACKEND="memory"
-	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
-	virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	use gconf && gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
index 94525afb3ed4..85e9e8c0e864 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils gnome2-utils virtualx
+inherit cmake gnome2-utils vcs-snapshot virtualx
+
+EGIT_COMMIT="8e17848d3fe3bd7de052a1c26b4161092ba1df9f"
 
 DESCRIPTION="Chinese Chewing engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~hattya/distfiles/${PN}-gob2.patch.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gconf nls"
@@ -18,17 +21,19 @@ IUSE="gconf nls"
 RDEPEND="app-i18n/ibus
 	app-i18n/libchewing
 	dev-libs/glib:2
-	dev-util/gob:2
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	gconf? ( gnome-base/gconf )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/cmake-fedora
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake-fedora
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+	"${WORKDIR}"/${PN}-gob2.patch
+	"${FILESDIR}"/${PN}-test.patch
+)
 DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
 
 src_configure() {
@@ -37,15 +42,15 @@ src_configure() {
 		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
 	)
 	use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	"${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
+	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
 
 	export GSETTINGS_BACKEND="memory"
 	export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
-	virtx cmake-utils_src_test
+	virtx cmake_src_test -j1
 }
 
 pkg_preinst() {
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index 0889e6335dbe..cf7f054fe39e 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">definite/ibus-chewing</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">definite/ibus-chewing</remote-id>
+	</upstream>
 </pkgmetadata>