[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-rime/

[Akinori Hattori]

commit:     b2f8161cd32140be77e415361bc7892d2a5e25f9
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 27 13:55:30 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 13:59:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f8161c

app-i18n/ibus-rime: update to EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-i18n/ibus-rime/ibus-rime-1.2.ebuild | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
index 81810d970e6..84362d2576b 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
-DESCRIPTION="Rime Input Method Engine for IBus Framework"
+DESCRIPTION="Rime Input Method Engine for IBus"
 HOMEPAGE="http://rime.im/"
 SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
 
@@ -12,17 +12,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="app-i18n/ibus
+CDEPEND="app-i18n/ibus
 	app-i18n/librime
 	x11-libs/libnotify"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${CDEPEND}
 	app-i18n/rime-data"
-
-S=${WORKDIR}/${PN}
+DEPEND="${CDEPEND}
+	dev-util/cmake
+	virtual/pkgconfig"
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	sed -i -e "/^libexecdir/s:/lib:/libexec:" Makefile || die
-	sed -i -e "/exec/s:/usr/lib:/usr/libexec:" rime.xml || die
+	sed -i \
+		-e "/^libexecdir/s:/lib:/libexec:" \
+		-e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \
+		-e "s/ make/ \$(MAKE)/" \
+		Makefile
+	sed -i "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml
+
+	default
 }