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 B82611382C5 for ; Sat, 16 May 2020 14:48:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3376E09F0; Sat, 16 May 2020 14:48:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 A1404E09F0 for ; Sat, 16 May 2020 14:48:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5777234F403 for ; Sat, 16 May 2020 14:48:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B6A6244 for ; Sat, 16 May 2020 14:48:11 +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: <1589640465.fc44b576f81ef08320480c9b4c1cfe00f842bee9.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-r2.ebuild app-i18n/nkf/nkf-2.1.4.ebuild X-VCS-Directories: app-i18n/nkf/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: fc44b576f81ef08320480c9b4c1cfe00f842bee9 X-VCS-Branch: master Date: Sat, 16 May 2020 14:48:11 +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: 2367409e-5998-403f-b5e4-31c926d298ec X-Archives-Hash: 3db181bd51141fcc732c9f4285940f59 commit: fc44b576f81ef08320480c9b4c1cfe00f842bee9 Author: Akinori Hattori gentoo org> AuthorDate: Sat May 16 14:32:02 2020 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sat May 16 14:47:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc44b576 app-i18n/nkf: fix build with USE=python Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Akinori Hattori gentoo.org> app-i18n/nkf/nkf-2.1.3-r2.ebuild | 19 +++++++++++++++++++ app-i18n/nkf/nkf-2.1.4.ebuild | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/app-i18n/nkf/nkf-2.1.3-r2.ebuild b/app-i18n/nkf/nkf-2.1.3-r2.ebuild index 5aebc9371fa..6c07e5dae6e 100644 --- a/app-i18n/nkf/nkf-2.1.3-r2.ebuild +++ b/app-i18n/nkf/nkf-2.1.3-r2.ebuild @@ -3,6 +3,8 @@ EAPI="6" PYTHON_COMPAT=( python2_7 ) +DISTUTILS_OPTIONAL="1" +DISTUTILS_USE_SETUPTOOLS="no" inherit distutils-r1 perl-module toolchain-funcs @@ -16,6 +18,15 @@ LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos" IUSE="perl python l10n_ja" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + )" +DEPEND="${RDEPEND}" src_prepare() { sed -i \ @@ -28,6 +39,9 @@ src_prepare() { if use python; then mv "${WORKDIR}"/NKF.python . || die eapply "${FILESDIR}"/${P}-strip.patch + cd NKF.python + distutils-r1_src_prepare + cd - >/dev/null fi default @@ -40,6 +54,11 @@ src_configure() { perl-module_src_configure cd - >/dev/null fi + if use python; then + cd NKF.python + distutils-r1_src_configure + cd - >/dev/null + fi } src_compile() { diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild index 0e5fcaa2bbe..e229db43399 100644 --- a/app-i18n/nkf/nkf-2.1.4.ebuild +++ b/app-i18n/nkf/nkf-2.1.4.ebuild @@ -3,6 +3,8 @@ EAPI="7" PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_OPTIONAL="1" +DISTUTILS_USE_SETUPTOOLS="no" inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot @@ -18,6 +20,15 @@ LICENSE="ZLIB python? ( BSD )" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos" IUSE="perl python l10n_ja" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + )" +DEPEND="${RDEPEND}" src_unpack() { use python && vcs-snapshot_src_unpack || default @@ -31,6 +42,9 @@ src_prepare() { if use python; then mv "${WORKDIR}"/${PY_P} NKF.python || die eapply "${FILESDIR}"/${P}-python.patch + cd NKF.python + distutils-r1_src_prepare + cd - >/dev/null fi default @@ -43,6 +57,11 @@ src_configure() { perl-module_src_configure cd - >/dev/null fi + if use python; then + cd NKF.python + distutils-r1_src_configure + cd - >/dev/null + fi } src_compile() {