gentoo resync : 28.12.2017

4 files changed, 22 insertions, 22 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 5272a8a6801d..60d9dc9282ba 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index be0703b04080..d1311f11719a 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -11,6 +11,6 @@ DIST imhangul-2.0.0.tar.bz2 255591 BLAKE2B c8908eb36ef71665f9b7c5a670f569e9b1ce2
 DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
 EBUILD imhangul-2.0.0.ebuild 2371 BLAKE2B a2938b7c3cb5d1b092efb16bfb71303a8332529e891c963d94fa769dd85722c6ea561eda5f932a0e69d954a85831c7dffd8becea54820e9e5c4452d7fce61015 SHA512 da1a2172d6a9cfdda2680eae9a51051c64207fe1be9ab9e28e213f68621cab5d12f9a5c102e14fe99ac6437e48976947b0033b2b8fd162fd372158d585e6a513
-EBUILD imhangul-2.1.0.ebuild 2014 BLAKE2B a91ece7af404befcdfdb524b58c589173fce0b4c0c446d85d4dc225c170acae45c5e5fb4cb2a6253394028c67e1bc30ee7dd8b7ddf8fa18a00eb3916004a33d2 SHA512 a57d52d8e8428ce45d5faa3837baa42c305f1d8dc6f603e780da6e34e670391d786f4168a86070ce7a6e31a50df860d0ff24f31dce44b72db9e9a4f2bd487dba
-EBUILD imhangul-3.1.1.ebuild 1860 BLAKE2B 3afb28649ac75755f14fcfba72fd6ea7e03092237e171bc329c823206ed23cf595c4e82330bcd00e46cf8ae83736c39eccb6bfd24875f27a05263615a061af9d SHA512 c8bdec1aa62dd5c9484fdcef92bf90ab389c5209f6bee33be0920248c793088d4f3c35770abdac618773370a6ab3b077266c5ccea549f0cf9a21403f48aecf32
+EBUILD imhangul-2.1.0.ebuild 2013 BLAKE2B f2def12069cb407a76fcf79af39a2348933f16bb75f3de3054575f091d6de6917e9b17eb89c35d406c233e8e0d2316876c74ea9919dba8b436480c0dc73d9892 SHA512 4825cf450397a867adf8c2c02079997738febc44593f78ff6a41c7628f38a4c1f3884285c7b7381e8c598fb5fa95adff73202863bd33974c419fd88f1ab1df2a
+EBUILD imhangul-3.1.1.ebuild 1701 BLAKE2B b27eb4b7843dfe27b3e553b348214cb760f1e34464d7f3a2c6d31aed969e4443ebebdbfadb6671c3df9f8abf9cfd88bb23b93b831bb1c2c899630e757b30cfb9 SHA512 783af5ebba46190fa5539f243c020d273d21ac57d44f68863e16f61387468830fd2a2657b033eca2c1dc3691ee1babc75271bcc68ec295b5cdf309aea21b1ced
 MISC metadata.xml 312 BLAKE2B 9e2c42462595f69a26248c0f4dd74565c43fc91ebb919aa9208f534dff815e9f41eb30bba9edac267c390d88770b7a2774bd4046de1418c712dd4698d7058b5d SHA512 ea7923a669ff35a1d8067bc6fa5d443db7cc77c9ac78ef7eae002e080d3fa308afb0cfd20027e2021a4ec4a6eac5f3fe1647b049b795c671da1fb4d64fd45e94
diff --git a/app-i18n/imhangul/imhangul-2.1.0.ebuild b/app-i18n/imhangul/imhangul-2.1.0.ebuild
index 94b027c43f55..9848fa751567 100644
--- a/app-i18n/imhangul/imhangul-2.1.0.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://imhangul.googlecode.com/files/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
index 6d32c1184876..1cebdc2d5fc8 100644
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
-inherit multilib
+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"
 
-SLOT="3"
 LICENSE="LGPL-2.1"
+SLOT="3"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
@@ -21,31 +20,32 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
+	default
+
 	# Drop DEPRECATED flags, bug #387825
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' Makefile.am Makefile.in || die
 }
 
 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" || die
+	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() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name "*.la" -type f -delete || die
+	default
+	dodoc imhangul.conf
 
 	insinto /etc/X11/xinit/xinput.d
-	newins "${FILESDIR}/xinput-imhangul2" imhangul2.conf || die
-	newins "${FILESDIR}/xinput-imhangul2y" imhangul2y.conf || die
-	newins "${FILESDIR}/xinput-imhangul32" imhangul32.conf || die
-	newins "${FILESDIR}/xinput-imhangul39" imhangul39.conf || die
-	newins "${FILESDIR}/xinput-imhangul3f" imhangul3f.conf || die
-	newins "${FILESDIR}/xinput-imhangul3s" imhangul3s.conf || die
-	newins "${FILESDIR}/xinput-imhangul3y" imhangul3y.conf || die
-	newins "${FILESDIR}/xinput-imhangulahn" imhangulahn.conf || die
-	newins "${FILESDIR}/xinput-imhangulro" imhangulro.conf || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO imhangul.conf || die
+	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
 }
 
 pkg_postinst() {