From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD5E5138334 for ; Fri, 27 Jul 2018 14:00:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6FCEE0871; Fri, 27 Jul 2018 14:00:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8CA10E0871 for ; Fri, 27 Jul 2018 14:00:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C32EC335CC8 for ; Fri, 27 Jul 2018 14:00:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35CD9377 for ; Fri, 27 Jul 2018 14:00:01 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1532699949.b2f8161cd32140be77e415361bc7892d2a5e25f9.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-rime/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/ibus-rime/ibus-rime-1.2.ebuild X-VCS-Directories: app-i18n/ibus-rime/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: b2f8161cd32140be77e415361bc7892d2a5e25f9 X-VCS-Branch: master Date: Fri, 27 Jul 2018 14:00:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eb00c428-5144-4741-84bd-219b4e976003 X-Archives-Hash: 975eace746ea5a5a138bf6a8a23543e9 commit: b2f8161cd32140be77e415361bc7892d2a5e25f9 Author: Akinori Hattori gentoo org> AuthorDate: Fri Jul 27 13:55:30 2018 +0000 Commit: Akinori Hattori gentoo 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 }