From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1039813-garchives=archives.gentoo.org@lists.gentoo.org>
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 9E4E0138334
for <garchives@archives.gentoo.org>; Tue, 31 Jul 2018 12:34:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8EEACE0920;
Tue, 31 Jul 2018 12:34:04 +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 46A56E0920
for <gentoo-commits@lists.gentoo.org>; Tue, 31 Jul 2018 12:34:04 +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 DFC29335C99
for <gentoo-commits@lists.gentoo.org>; Tue, 31 Jul 2018 12:34:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 461CB379
for <gentoo-commits@lists.gentoo.org>; Tue, 31 Jul 2018 12:33:59 +0000 (UTC)
From: "Akinori Hattori" <hattya@gentoo.org>
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" <hattya@gentoo.org>
Message-ID: <1533039532.0a34c1def507077e7e937442941ee2e06b14626f.hattya@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/nkf/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-i18n/nkf/nkf-2.1.3-r1.ebuild
X-VCS-Directories: app-i18n/nkf/
X-VCS-Committer: hattya
X-VCS-Committer-Name: Akinori Hattori
X-VCS-Revision: 0a34c1def507077e7e937442941ee2e06b14626f
X-VCS-Branch: master
Date: Tue, 31 Jul 2018 12:33:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9ec0d618-6d3c-4be3-9fc3-7916915f137d
X-Archives-Hash: a2171baf13b1eb4ec439c5b88407a7b0
commit: 0a34c1def507077e7e937442941ee2e06b14626f
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 31 12:18:52 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 12:18:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a34c1de
app-i18n/nkf: update to EAPI 6
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-i18n/nkf/nkf-2.1.3-r1.ebuild | 60 +++++++++++++++++++++++-----------------
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
index 240a559e772..23f6161b389 100644
--- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 perl-module toolchain-funcs
+
+inherit distutils-r1 perl-module toolchain-funcs
DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="mirror://sourceforge.jp/nkf/59912/${P}.tar.gz
- l10n_ja? ( https://dev.gentoo.org/~naota/files/nkf.1j )
+SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz
+ l10n_ja? ( https://dev.gentoo.org/~naota/files/${PN}.1j )
python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
LICENSE="ZLIB"
@@ -18,56 +19,63 @@ IUSE="perl python l10n_ja"
src_prepare() {
sed -i \
- -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \
- -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
- Makefile || die
-
+ -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \
+ -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \
+ Makefile
if use l10n_ja; then
- cp "${DISTDIR}"/nkf.1j "${S}" || die
+ cp "${DISTDIR}"/${PN}.1j ${PN}.ja.1 || die
fi
-
if use python; then
- mv "${WORKDIR}/NKF.python" "${S}" || die
- epatch "${FILESDIR}"/${P}-strip.patch
+ mv "${WORKDIR}"/NKF.python . || die
+ eapply "${FILESDIR}"/${P}-strip.patch
fi
+
+ default
}
src_compile() {
- emake CC="$(tc-getCC)" nkf || die
+ emake CC="$(tc-getCC)"
if use perl; then
- cd "${S}/NKF.mod"
+ cd NKF.mod
perl-module_src_compile
+ cd - >/dev/null
fi
if use python; then
- cd "${S}/NKF.python"
+ cd NKF.python
distutils-r1_src_compile
+ cd - >/dev/null
fi
}
src_test() {
- emake test || die
+ default
if use perl; then
- cd "${S}/NKF.mod"
+ cd NKF.mod
perl-module_src_test
+ cd - >/dev/null
fi
}
src_install() {
- dobin nkf || die
- doman nkf.1
+ dobin ${PN}
+ doman ${PN}.1
if use l10n_ja; then
- ./nkf -e nkf.1j > nkf.1
- doman -i18n=ja nkf.1
+ doman ${PN}.ja.1
fi
- dodoc nkf.doc
+ dodoc ${PN}.doc
if use perl; then
- cd "${S}/NKF.mod"
+ cd NKF.mod
+ docinto perl
perl-module_src_install
+ cd - >/dev/null
fi
if use python; then
- cd "${S}/NKF.python"
- distutils-r1_src_install
+ cd NKF.python
+ docinto python
+ DOCS= distutils-r1_src_install
+ dodoc README
+ cd - >/dev/null
fi
}