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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C3331581E7 for ; Sun, 28 Apr 2024 06:16:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26C23E2A11; Sun, 28 Apr 2024 06:16:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 025E4E2A11 for ; Sun, 28 Apr 2024 06:16:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DBACF343019 for ; Sun, 28 Apr 2024 06:16:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02B4B1746 for ; Sun, 28 Apr 2024 06:16:26 +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: <1714284516.ea791c26b4451ffb6276dcdfc5c29126519a409e.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/cmigemo/cmigemo-1.3c-r3.ebuild app-text/cmigemo/cmigemo-1.3c-r4.ebuild X-VCS-Directories: app-text/cmigemo/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: ea791c26b4451ffb6276dcdfc5c29126519a409e X-VCS-Branch: master Date: Sun, 28 Apr 2024 06:16:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98a8b3a6-ed3c-4cea-9d2b-520cd3ab7190 X-Archives-Hash: cd3abcb9e40c05a66800516941649375 commit: ea791c26b4451ffb6276dcdfc5c29126519a409e Author: Akinori Hattori gentoo org> AuthorDate: Sun Apr 28 06:08:36 2024 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sun Apr 28 06:08:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea791c26 app-text/cmigemo: update to EAPI 8 Signed-off-by: Akinori Hattori gentoo.org> ...igemo-1.3c-r3.ebuild => cmigemo-1.3c-r4.ebuild} | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild similarity index 62% rename from app-text/cmigemo/cmigemo-1.3c-r3.ebuild rename to app-text/cmigemo/cmigemo-1.3c-r4.ebuild index 4c38d653a795..3a03e2143a77 100644 --- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild +++ b/app-text/cmigemo/cmigemo-1.3c-r4.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" + inherit flag-o-matic toolchain-funcs MY_P="${P}-MIT" + DESCRIPTION="Migemo library implementation in C" HOMEPAGE="https://www.kaoriya.net/software/cmigemo/" SRC_URI="mirror://gentoo/${MY_P}.tar.bz2" @@ -14,34 +16,34 @@ SLOT="0" KEYWORDS="~alpha amd64 ppc x86" IUSE="unicode vim-syntax" -DEPEND=">=app-dicts/migemo-dict-200812[unicode=] +RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]" +DEPEND="${RDEPEND}" +BDEPEND="app-i18n/nkf dev-lang/perl || ( net-misc/curl net-misc/wget www-client/fetch - ) - app-i18n/nkf" -RDEPEND="${DEPEND}" - + )" S="${WORKDIR}/${MY_P}" PATCHES=( - # Bug #246953 + # bug #246953 "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-ldflags.patch ) +DOCS=( doc/{README_j,TODO_j,vimigemo}.txt ) src_prepare() { default touch dict/SKK-JISYO.L || die - if use unicode ; then - sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die + if use unicode; then + sed -i "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die fi - # Bug #255813 - sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die + # bug #255813 + sed -i "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die } src_compile() { @@ -57,24 +59,23 @@ src_compile() { src_install() { # parallel make b0rked emake -j1 \ - prefix="${D}/usr" \ - libdir="${D}/usr/$(get_libdir)" \ + prefix="${ED}/usr" \ + libdir="${ED}/usr/$(get_libdir)" \ gcc-install + einstalldocs local encoding - if use unicode ; then + if use unicode; then encoding="utf-8" else encoding="euc-jp" fi - mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/" || die - rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8} || die + mv "${ED}"/usr/share/migemo/${encoding}/*.dat "${ED}"/usr/share/migemo || die + rm -rf "${ED}"/usr/share/migemo/{cp932,euc-jp,utf-8} - if use vim-syntax ; then + if use vim-syntax; then insinto /usr/share/vim/vimfiles/plugin doins tools/migemo.vim fi - - dodoc doc/{README_j,TODO_j,vimigemo}.txt }