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 132CD138350 for ; Fri, 24 Apr 2020 17:14:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5502AE0932; Fri, 24 Apr 2020 17:14:19 +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 3EADBE0932 for ; Fri, 24 Apr 2020 17:14:19 +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 540BF34F154 for ; Fri, 24 Apr 2020 17:14:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B61E31F0 for ; Fri, 24 Apr 2020 17:14:15 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1587748400.db43f1380900143b4091f85b289d156620f4cf08.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/yasm/yasm-9999.ebuild X-VCS-Directories: dev-lang/yasm/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: db43f1380900143b4091f85b289d156620f4cf08 X-VCS-Branch: master Date: Fri, 24 Apr 2020 17:14:15 +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: d8b9d54b-d37d-40ed-b9d3-455ee4f1372f X-Archives-Hash: 71d0c9ad5beb8168d6c095cd483f362e commit: db43f1380900143b4091f85b289d156620f4cf08 Author: Mike Gilbert gentoo org> AuthorDate: Fri Apr 24 17:13:08 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Apr 24 17:13:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db43f138 dev-lang/yasm: EAPI=7 Signed-off-by: Mike Gilbert gentoo.org> dev-lang/yasm/yasm-9999.ebuild | 47 ++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild index df73fec26ad..5be4c7a9719 100644 --- a/dev-lang/yasm/yasm-9999.ebuild +++ b/dev-lang/yasm/yasm-9999.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - +EAPI=7 PYTHON_COMPAT=( python2_7 ) inherit autotools eutils python-single-r1 @@ -23,16 +22,25 @@ SLOT="0" IUSE="nls python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=" - nls? ( virtual/libintl ) - python? ( ${PYTHON_DEPS} )" -DEPEND=" - ${RDEPEND} +BDEPEND=" nls? ( sys-devel/gettext ) - python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )" + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') + ) +" +DEPEND=" + nls? ( virtual/libintl ) +" +RDEPEND="${DEPEND} + python? ( ${PYTHON_DEPS} ) +" if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} ${PYTHON_DEPS} app-text/xmlto app-text/docbook-xml-dtd:4.1.2" + BDEPEND+=" + app-text/xmlto + app-text/docbook-xml-dtd:4.1.2 + " fi pkg_setup() { @@ -40,11 +48,15 @@ pkg_setup() { } src_prepare() { + default + if ! [[ ${PV} == 9999* ]]; then sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940 fi + # ksh doesn't grok $(xxx), makes aclocal fail sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die + eautoreconf if [[ ${PV} == 9999* ]]; then @@ -53,17 +65,16 @@ src_prepare() { } src_configure() { - if [[ ${PV} == 9999* ]]; then - python_setup - else - use python && python_setup - fi + use python && python_setup - econf \ - --disable-warnerror \ - $(use_enable python) \ - $(use_enable python python-bindings) \ + local myconf=( + --disable-warnerror + $(use_enable python) + $(use_enable python python-bindings) $(use_enable nls) + ) + + econf "${myconf[@]}" } src_test() {