6 files changed, 82 insertions, 92 deletions
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 919c47339056..45b735f1b8ce 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,2 +1 @@
-DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
-DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
+DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
diff --git a/app-i18n/ibus-hangul/files/ibus-hangul-test.patch b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch
new file mode 100644
index 000000000000..7a6ef479f0ee
--- /dev/null
+++ b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch
@@ -0,0 +1,20 @@
+--- a/tests/ibus-hangul.c
++++ b/tests/ibus-hangul.c
+@@ -261,6 +261,7 @@
+                       G_CALLBACK (window_inserted_text_cb), entry);
+     gtk_container_add (GTK_CONTAINER (window), entry);
+     gtk_widget_show_all (window);
++    gtk_window_present (window);
+ }
+ 
+ static void
+--- a/tests/runtest
++++ b/tests/runtest
+@@ -7,7 +7,6 @@
+ : ${DISABLE_GUI_TESTS:=''}
+ 
+ ibus-daemon --xim --panel disable --config disable &
+-sleep 30
+ 
+ tst=$1
+ 
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
deleted file mode 100644
index 87d78aa62e74..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-python=${EPYTHON}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild
deleted file mode 100644
index 393fcb686cec..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-python=${EPYTHON}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
new file mode 100644
index 000000000000..d93d65dad6a2
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome2-utils python-single-r1 xdg virtualx
+
+DESCRIPTION="Korean Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+src_test() {
+	"${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${S}"/data || die
+
+	export GSETTINGS_BACKEND="memory"
+	export GSETTINGS_SCHEMA_DIR="${S}/data"
+	virtx default
+}
+
+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-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index 13995a6450cd..1b693a0e7f7c 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<longdescription lang="en">
-		The Hangul engine for IBus. It provides Korean input method from
-		<pkg>app-i18n/libhangul</pkg>.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">libhangul/ibus-hangul</remote-id>
 	</upstream>