gentoo resync : 30.05.2020

3 files changed, 16 insertions, 54 deletions

diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 26ba9cd6754c..36c06a89af65 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD ibus-hangul-1.5.1-r1.ebuild 921 BLAKE2B 0b9f3d9c07594dd3598c3a04eda66ecfbabbbb000ea801fc1d46ec964a18bd1d1160a71cc24f8a5cadd483ff26499dce9ca3528c99244262b2501d17828af02d SHA512 c88bbf13ee0a04602d805cf0115db5bc9e1c0ed7dc96f024b6608d9ba71b008d73ee99deb89d9dd70119b141b577c1409461025cf2589eec9e0af60232abe393
-EBUILD ibus-hangul-1.5.3.ebuild 908 BLAKE2B a1039fa2a166dbecb6b104b7e3b3adc58b2107d66a44d0a19f314f3d3f8f294d7b907620ad08388175899b69d9ced68e6bc28f0cff0af47811dd4fd297c8cffd SHA512 05bf2c00cbee52ea4b57fd4ed74effd97c68210957456794c25a30f533238a1ab923a8b01e5ad1e77f45c31c553a99c94fcee73fee412c3d657674e65b0fbbae
+EBUILD ibus-hangul-1.5.3-r1.ebuild 1001 BLAKE2B 7d007bf60bb77d245c2121e987e72e87037527b60060dc89bbb23b500c9fc0d06d0c6005a16207fc7a2cb01d321a34f0d3b17e07b9a086ed664ac51a43865c06 SHA512 d400092fc0c62f43064227fca1d815a4ea19b66588c92d3294f3dda9465b59fff8997ea2a70f47df3230fd13e4defe0c990a777a896a0d81e0484a9e95cde5c4
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
index 87d78aa62e74..6d04d1fec63d 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit gnome2-utils python-single-r1
+inherit gnome2-utils python-single-r1 xdg
 
 DESCRIPTION="Korean Hangul engine for IBus"
 HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
@@ -23,10 +23,9 @@ RDEPEND="${PYTHON_DEPS}
 	')
 	>=app-i18n/libhangul-0.1
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
 
 src_configure() {
 	econf \
@@ -34,10 +33,17 @@ src_configure() {
 		--with-python=${EPYTHON}
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	gnome2_schemas_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
-}