diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-04-24 13:13:08 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-04-24 13:13:20 -0400 |
| commit | db43f1380900143b4091f85b289d156620f4cf08 (patch) | |
| tree | 98a53b7a4639b87297c53047a1c92cf867560178 /dev-lang/yasm | |
| parent | dev-python/matterhook: remove myself from list of maintainers. (diff) | |
| download | gentoo-db43f1380900143b4091f85b289d156620f4cf08.tar.gz gentoo-db43f1380900143b4091f85b289d156620f4cf08.tar.bz2 gentoo-db43f1380900143b4091f85b289d156620f4cf08.zip | |
dev-lang/yasm: EAPI=7
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-lang/yasm')
| -rw-r--r-- | dev-lang/yasm/yasm-9999.ebuild | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild index df73fec26ad3..5be4c7a9719b 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() { |