gentoo resync : 29.08.2018

5 files changed, 95 insertions, 48 deletions

diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index c3f9a139704e..0c4a61caba90 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-hangul-1.5.0.tar.gz 505707 BLAKE2B 4dd630d7ed83ff4913e87c4d77f951845714697500a87ae337d898fe674d29e9421d5d506c2beb3acef859864d655f20d92f6a0cc5620f293a8a7623c4bd3158 SHA512 a9bef9ad887d1b41555af12e7589a9c4c69ddf4f61890907d90cbab6b9bf4cb6df4739c54d34ee1b2507486a1cb568f826bb4641e9ccee8ccfa11ff2d7e962bb
-EBUILD ibus-hangul-1.5.0.ebuild 935 BLAKE2B f0636e7f313db22213e2b6653f5ebdd958814b8b14f749419e46d55cf59a6fe8127fc5d6edb9439989b363db7c35d01eb13b55727c907ecd925d143c9443fcb5 SHA512 09b7c95e19af3dc76168b94d2a610eea1dcad3d72b4bb203cf2b785fdcc780e1b09e21118b1a7d6dd28c0932b83e9c28f977d15c220dc8e118585f577037cf87
-MISC metadata.xml 488 BLAKE2B 041bd1fd85e70d4c68feb85d9af3bc2d526f34852003568851d247c2f0ed70063cb77cbc3ba6bd14c7cd876ebc68840dbbedae4db64ea9897ef6b4c2cfb52fe1 SHA512 e46e56035a8bd336671564f460a30d5de6951ff53f6bd2567b4a17fb1fb661644caf4c4a40b7cd237cb57a19a71f174f243dea5e16eca490bda9116ce14ebd22
+DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
+EBUILD ibus-hangul-1.5.0-r1.ebuild 942 BLAKE2B e2df71bb4f867e955910ba19c8d32d5d4b0fbea2a5ce81119ade5e9524b79fa067e56d3708b6be85bbef658326048d01a2bf75f96c52e490ecd31b9dfd5c6b44 SHA512 b6f32af0d9b72bee3a2eb460f0f8c43e0f61b35d0226031f16532770ea9f2651b49312f851a0b03f108f15f685a7df655733772f486f144f99e5831d7421db29
+EBUILD ibus-hangul-1.5.1.ebuild 890 BLAKE2B 17c644c67c9ea41e25ef9aff14172e54a00c95b0cd8f933acc7ed22c81d0fe7dcce220222bfd95b341fa092ab8c5457aef840a78c4ef8959f8ae57502e1cf333 SHA512 23f6465a3547f9837f205cbfde7652727fb56472c713b245fa4a0f5fdb1879bbf2e2c4487266f3f488a9caa30ff29d45260b4610e23e60f10671f94674db6724
+MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..7b61f434638f
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="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}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i "s/@PYTHON@/${EPYTHON}/" setup/${PN/-/-setup-}.in
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild
deleted file mode 100644
index 38435562f840..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="The Hangul engine for IBus input platform"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/choehwanjin/ibus-hangul/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.4[python,${PYTHON_USEDEP}]
-	=dev-python/pygobject-2*[${PYTHON_USEDEP}]
-	=dev-python/pygtk-2*[${PYTHON_USEDEP}]
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		>=sys-devel/gettext-0.17
-		)"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	sed -ie "s:python:${EPYTHON}:" \
-		setup/ibus-setup-hangul.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
new file mode 100644
index 000000000000..0c0401cb2c0b
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="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}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_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/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index 7f550752e704..13995a6450cd 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -5,9 +5,11 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<longdescription lang="en">The Hangul engine for IBus platform. It provides Korean input method from libhangul.</longdescription>
+	<longdescription lang="en">
+		The Hangul engine for IBus. It provides Korean input method from
+		<pkg>app-i18n/libhangul</pkg>.
+	</longdescription>
 	<upstream>
-		<remote-id type="google-code">ibus</remote-id>
-		<remote-id type="github">ibus/ibus</remote-id>
+		<remote-id type="github">libhangul/ibus-hangul</remote-id>
 	</upstream>
 </pkgmetadata>