diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-08-09 08:30:22 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-08-09 08:30:22 +0000 |
commit | dd4e81370d2e92996cfe447b2c91138668204615 (patch) | |
tree | fc75e240a9639882c4744d391d55e068e6c1d0e7 | |
parent | bump; drop py3.2 add py3.4, upgrade doc build (diff) | |
download | gentoo-2-dd4e81370d2e92996cfe447b2c91138668204615.tar.gz gentoo-2-dd4e81370d2e92996cfe447b2c91138668204615.tar.bz2 gentoo-2-dd4e81370d2e92996cfe447b2c91138668204615.zip |
Make USE=python mv/patch conditional again (bug #519464 by Takurou Kitagawa).
(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
-rw-r--r-- | app-i18n/nkf/ChangeLog | 5 | ||||
-rw-r--r-- | app-i18n/nkf/nkf-2.1.3.ebuild | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog index 965abd551ce0..cd1205a0b41c 100644 --- a/app-i18n/nkf/ChangeLog +++ b/app-i18n/nkf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-i18n/nkf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.60 2014/08/07 18:25:08 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.61 2014/08/09 08:30:22 jer Exp $ + + 09 Aug 2014; Jeroen Roovers <jer@gentoo.org> nkf-2.1.3.ebuild: + Make USE=python mv/patch conditional again (bug #519464 by Takurou Kitagawa). 07 Aug 2014; Mikle Kolyada <zlogene@gentoo.org> -nkf-2.0.7.ebuild, -nkf-2.1.2-r1.ebuild, -nkf-2.1.2-r2.ebuild, nkf-2.1.3.ebuild: diff --git a/app-i18n/nkf/nkf-2.1.3.ebuild b/app-i18n/nkf/nkf-2.1.3.ebuild index 1a405fde39d1..d1014361da30 100644 --- a/app-i18n/nkf/nkf-2.1.3.ebuild +++ b/app-i18n/nkf/nkf-2.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v 1.4 2014/08/07 18:25:08 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.3.ebuild,v 1.5 2014/08/09 08:30:22 jer Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -21,9 +21,11 @@ src_prepare() { -e '/^CFLAGS/{s|-g -O2||;s|=|+=|;}' \ -e '/-o nkf/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \ Makefile || die - - mv "${WORKDIR}/NKF.python" "${S}" || die - epatch "${FILESDIR}"/${P}-strip.patch + + if use python; then + mv "${WORKDIR}/NKF.python" "${S}" || die + epatch "${FILESDIR}"/${P}-strip.patch + fi } src_compile() { |