commit: 1348200690ff829d9e909c71bf30375b19461472 Author: nilburn <nilburn+gentoo-bugs <AT> gmail <DOT> com> AuthorDate: Wed Aug 26 07:03:15 2015 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Tue Jul 31 12:31:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13482006
app-i18n/nkf: fix install with USE=perl Closes: https://bugs.gentoo.org/558784 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../{nkf-2.1.3-r1.ebuild => nkf-2.1.3-r2.ebuild} | 11 +++- app-i18n/nkf/nkf-2.1.3.ebuild | 68 ---------------------- 2 files changed, 10 insertions(+), 69 deletions(-) diff --git a/app-i18n/nkf/nkf-2.1.3-r1.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild similarity index 88% rename from app-i18n/nkf/nkf-2.1.3-r1.ebuild rename to app-i18n/nkf/nkf-2.1.3-r2.ebuild index 23f6161b389..21daf284bc4 100644 --- a/app-i18n/nkf/nkf-2.1.3-r1.ebuild +++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/59912/${P}.tar.gz LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-macos" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos" IUSE="perl python l10n_ja" src_prepare() { @@ -33,6 +33,15 @@ src_prepare() { default } +src_configure() { + default + if use perl; then + cd NKF.mod + perl-module_src_configure + cd - >/dev/null + fi +} + src_compile() { emake CC="$(tc-getCC)" if use perl; then diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild deleted file mode 100644 index 4c6a6142c01..00000000000 --- a/app-i18n/nkf/nkf-2.1.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) -inherit eutils 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 - python? ( https://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-macos" -IUSE="perl python l10n_ja" - -src_prepare() { - sed -i \ - -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \ - -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \ - Makefile || die - - if use python; then - mv "${WORKDIR}/NKF.python" "${S}" || die - epatch "${FILESDIR}"/${P}-strip.patch - fi -} - -src_compile() { - emake CC="$(tc-getCC)" nkf || die - if use perl; then - cd "${S}/NKF.mod" - perl-module_src_compile - fi - if use python; then - cd "${S}/NKF.python" - distutils-r1_src_compile - fi -} - -src_test() { - emake test || die - if use perl; then - cd "${S}/NKF.mod" - perl-module_src_test - fi -} - -src_install() { - dobin nkf || die - doman nkf.1 - - if use l10n_ja; then - ./nkf -e nkf.1j > nkf.1 - doman -i18n=ja nkf.1 - fi - dodoc nkf.doc - - if use perl; then - cd "${S}/NKF.mod" - perl-module_src_install - fi - if use python; then - cd "${S}/NKF.python" - distutils-r1_src_install - fi -}
