[gentoo-commits] repo/gentoo:master commit in: app-i18n/scim-hangul/files/, app-i18n/scim-hangul/

[David Seifert]

commit:     b3214cf6db11cdd542cc3db5487e49adc8fad485
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 10:03:03 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 11:14:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3214cf6

app-i18n/scim-hangul: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../scim-hangul/files/scim-hangul-0.4.0+gtk.patch  |  4 +--
 app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild      | 31 +++++++++++-----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
index bc1fd4b673e..82d9f8ee10b 100644
--- a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
+++ b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch
@@ -1,5 +1,5 @@
---- src/scim_hangul_imengine_setup.cpp.orig	2012-07-08 07:52:07.000000000 -0400
-+++ src/scim_hangul_imengine_setup.cpp	2012-11-02 14:13:14.000000000 -0400
+--- a/src/scim_hangul_imengine_setup.cpp
++++ b/src/scim_hangul_imengine_setup.cpp
 @@ -346,7 +346,7 @@
      for (i = 0; i < n; i++) {
  	const char* name = hangul_ic_get_keyboard_name(i);

diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
index 13eba035c1c..aa37d7ea868 100644
--- a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
+++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils
+EAPI=6
 
 DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul"
 HOMEPAGE="http://www.scim-im.org/"
@@ -14,7 +12,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
+RDEPEND="
+	>=app-i18n/scim-0.99.8
 	>=app-i18n/libhangul-0.0.4
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -22,23 +21,23 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.3.2+gcc-4.3.patch"
-	"${FILESDIR}/${PN}-0.3.2+gcc-4.7.patch"
-	"${FILESDIR}/${PN}-0.4.0+gtk.patch" )
-
-DOCS=(AUTHORS NEWS)
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.3.patch
+	"${FILESDIR}"/${PN}-0.3.2+gcc-4.7.patch
+	"${FILESDIR}"/${PN}-0.4.0+gtk.patch
+)
 
 src_configure() {
-	local myeconfargs=(
-		--disable-skim-support
+	econf \
+		--disable-skim-support \
 		$(use_enable nls)
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-	dodoc ChangeLog* README*
+	default
+	dodoc ChangeLog*
+
+	# plugin module, no point in .la files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {