gentoo resync : 29.08.2018

6 files changed, 142 insertions, 110 deletions

diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index 644b0b252bbc..511e35b84f23 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -8,7 +8,9 @@ AUX xinput-imhangul3y 61 BLAKE2B bc4e3c683e3ddc2f3174ddc7c1be36a8479d4584feef204
 AUX xinput-imhangulahn 53 BLAKE2B ed7e3dcf8c5108b833186f1acdaeb34c04d4d6682a3e747f1ce2bafc2e8e98d788610c8372257583e8e5031bd78ca5ef32a013b72fae34a36aca130e808d3e6d SHA512 3ac9858111de532b483c8fb209f2517651e821ecf4aa704118d9f227a9ab090ae85cbb5572e14e6a04dc49b938fdcf103604ab1c2370df257174f94be2de55d9
 AUX xinput-imhangulro 50 BLAKE2B 01b0a4e625348fc9221b2f52d10288befbbf71774e3406005df4365695c1d996643b3369703f9e8ce64d699f88ee616ae2a48fa24f0c648bf2bc28a9625a84fd SHA512 5d1f588fcda77e6d96cfa955f0057edf614fe01290c9541eae61f8be85a7da80a29246bd2c777f517ce544c094a01d13d73d91368be7296aae9639698add90c4
 DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
+DIST imhangul-2.1.1.tar.bz2 288452 BLAKE2B 14aba1fb582edd735d1469b2fc1c4b576c64f073f525b30a3c5dd681b82d07f7b2960a63c388dae47d93855f25abbfbb2a48b032e5509239325db1cd05ff6b5e SHA512 5db3843aec698bd6315e4c76f3d8ea374b5d985ff7ae8a3d05861afb1d564ffe274d56fa27e8f669884016c50d5fc1850984050d93fdee944c6f7c3c963c96f1
 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
-EBUILD imhangul-2.1.0.ebuild 2012 BLAKE2B 7ede0699e7810052d29de951a577a301fd2dc9e759b3a2ea5f681065dd6c25e0067fa3dd94214bdd4514d6abb612c19769c7a1a3cb4d48937a24f7e1394bf9c4 SHA512 cae04c16e0bbdfe53b1854d1a0e4fca5619e614abeb491c7bb7e035c9a2417a2343c4e3d59e56a4f535b3cad31f7770485f8f18dbe898382723b535059b1feb3
-EBUILD imhangul-3.1.1.ebuild 1701 BLAKE2B b27eb4b7843dfe27b3e553b348214cb760f1e34464d7f3a2c6d31aed969e4443ebebdbfadb6671c3df9f8abf9cfd88bb23b93b831bb1c2c899630e757b30cfb9 SHA512 783af5ebba46190fa5539f243c020d273d21ac57d44f68863e16f61387468830fd2a2657b033eca2c1dc3691ee1babc75271bcc68ec295b5cdf309aea21b1ced
-MISC metadata.xml 312 BLAKE2B 9e2c42462595f69a26248c0f4dd74565c43fc91ebb919aa9208f534dff815e9f41eb30bba9edac267c390d88770b7a2774bd4046de1418c712dd4698d7058b5d SHA512 ea7923a669ff35a1d8067bc6fa5d443db7cc77c9ac78ef7eae002e080d3fa308afb0cfd20027e2021a4ec4a6eac5f3fe1647b049b795c671da1fb4d64fd45e94
+EBUILD imhangul-2.1.0-r1.ebuild 1296 BLAKE2B ff57c2c12fdaa9fe943461bef88d9c46987fb17a9cd18eef0c70358bb46d663cb58449f91ec99019fdc5f427aae289121e8564f11f87304eb3cc473d42ef4c64 SHA512 25baa051bbf72f71b85983c365b9de92c70095dee6d29881c659309270bcea748e2986ff0e8acbfbd74e3a61d8cda7e710440ed1800b00fdec062daa9c396fc6
+EBUILD imhangul-2.1.1.ebuild 1299 BLAKE2B ea15e9375f93a5b05e621dbf29eb814c473194810b85d923426c6565c563ed9b4427c4c371d5da547fb483d7582f10501485b31c5ec12ef67901aab63f5c3d52 SHA512 d73ba627cefe9fed778a8d2b77476d4ab758e2645a50b00620aedd71ae4101e6d379de9c338c2b884ce95708e895dda8bbdc1e7f0dab84343b1d127a8ac1efda
+EBUILD imhangul-3.1.1.ebuild 1299 BLAKE2B 16ea4b4bdcbe78772f7232f381e24b22c633bab010df0490af248e55fca041815922c05449d5fbb7be4a5b02e76855aff63a1f1d394860a0f6958d9de004ddd3 SHA512 566e71123e3eb1ecd97a330f5da28a0654c830b2dbc281403ebf6106a81fd32c74b1634c9b5446838f77cb6a5bcb38c54392bb3a7ba53f7080c76c81e88c8956
+MISC metadata.xml 370 BLAKE2B 3376831ba7380688735a4e50c6e60dc545d34867163bb9191ea4ccd4dcbdae9d2e6e8eb0429195fb7fcafc920f95ff653553f4661e4a08d8d6f823838e89b2a9 SHA512 abd3a62a28dc9405ffa19aad3a8b213a906eef144f10ecb5bc5632d5b892eda73d600c70e126975299fffeeb59ccf38c03b4abdb36fb5e5870130b4453a27b39
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..be31caf2f266
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2-utils
+
+DESCRIPTION="GTK+ 2 Hangul Input Modules"
+HOMEPAGE="https://github.com/libhangul/imhangul"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="app-i18n/libhangul
+	x11-libs/gtk+:2
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	dodoc ${PN}.conf
+
+	local s
+	insinto /etc/X11/xinit/xinput.d
+	for s in 2{,y} 3{2,9,f,s,y} ahn ro; do
+		newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf
+	done
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+	elog
+	elog "If you want to use one of the module as a default input method, "
+	elog
+	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
+	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
+	elog
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/imhangul/imhangul-2.1.0.ebuild b/app-i18n/imhangul/imhangul-2.1.0.ebuild
deleted file mode 100644
index 5503848cb8b8..000000000000
--- a/app-i18n/imhangul/imhangul-2.1.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils multilib readme.gentoo-r1
-
-DESCRIPTION="Gtk+-2.0 Hangul Input Modules"
-HOMEPAGE="https://code.google.com/p/imhangul/"
-SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=app-i18n/libhangul-0.0.12
-	>=x11-libs/gtk+-2.2:2
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-If you want to use one of the module as a default input method,
-
-export GTK_IM_MODULE=hangul2  # 2 input type
-export GTK_IM_MODULE=hangul3f # 3 input type
-"
-
-get_gtk_confdir() {
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)}"
-	else
-		GTK2_CONFDIR="${GTK2_CONFDIR:=${EPREFIX}/etc/gtk-2.0}"
-	fi
-	echo ${GTK2_CONFDIR}
-}
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-2.0/immodules" \
-		--with-gtk-im-module-file="$(get_gtk_confdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	insinto /etc/X11/xinit/xinput.d
-	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf
-	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf
-	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf
-	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf
-	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf
-	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf
-	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf
-	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf
-	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf
-
-	dodoc imhangul.conf
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild
new file mode 100644
index 000000000000..296851718916
--- /dev/null
+++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2-utils
+
+DESCRIPTION="GTK+ 2 Hangul Input Modules"
+HOMEPAGE="https://github.com/libhangul/imhangul"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-i18n/libhangul
+	x11-libs/gtk+:2
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+	dodoc ${PN}.conf
+
+	local s
+	insinto /etc/X11/xinit/xinput.d
+	for s in 2{,y} 3{2,9,f,s,y} ahn ro; do
+		newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf
+	done
+}
+
+pkg_postinst() {
+	gnome2_query_immodules_gtk2
+	elog
+	elog "If you want to use one of the module as a default input method, "
+	elog
+	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
+	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
+	elog
+}
+
+pkg_postrm() {
+	gnome2_query_immodules_gtk2
+}
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
index 1cebdc2d5fc8..667c30d3e7f9 100644
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-DESCRIPTION="Gtk+-3.0 Hangul Input Modules"
-HOMEPAGE="https://code.google.com/p/imhangul/"
-SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2"
+inherit gnome2-utils
+
+DESCRIPTION="GTK+ 3 Hangul Input Modules"
+HOMEPAGE="https://github.com/libhangul/imhangul"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/libhangul-0.0.12
+RDEPEND="app-i18n/libhangul
 	x11-libs/gtk+:3
 	virtual/libintl"
 DEPEND="${RDEPEND}
@@ -21,41 +23,34 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-
-	# Drop DEPRECATED flags, bug #387825
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die
+	gnome2_environment_reset
+	gnome2_disable_deprecation_warning
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX}/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules"
+	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
 	default
-	dodoc imhangul.conf
+	find "${ED}" -name '*.la' -delete || die
+	dodoc ${PN}.conf
 
+	local s
 	insinto /etc/X11/xinit/xinput.d
-	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf
-	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf
-	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf
-	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf
-	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf
-	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf
-	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf
-	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf
-	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf
-
-	find "${D}" -name '*.la' -delete || die
+	for s in 2{,y} 3{2,9,f,s,y} ahn ro; do
+		newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf
+	done
 }
 
 pkg_postinst() {
 	gnome2_query_immodules_gtk3
-	elog ""
+	elog
 	elog "If you want to use one of the module as a default input method, "
-	elog ""
+	elog
 	elog "export GTK_IM_MODULE=hangul2  # 2 input type"
 	elog "export GTK_IM_MODULE=hangul3f # 3 input type"
-	elog ""
+	elog
 }
 
 pkg_postrm() {
diff --git a/app-i18n/imhangul/metadata.xml b/app-i18n/imhangul/metadata.xml
index da6b3414b7d8..20c10eff6410 100644
--- a/app-i18n/imhangul/metadata.xml
+++ b/app-i18n/imhangul/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">imhangul</remote-id>
+		<remote-id type="github">libhangul/imhangul</remote-id>
 	</upstream>
 </pkgmetadata>