commit: 0be5422b1aa70798c1856edb9b3a62ca5dda2b07 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Aug 18 14:48:03 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Aug 18 14:52:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be5422b
dev-lang/yasm: drop python support Bug: https://bugs.gentoo.org/702364 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../{yasm-9999.ebuild => yasm-1.3.0-r1.ebuild} | 30 +++++++--------------- dev-lang/yasm/yasm-9999.ebuild | 30 +++++++--------------- 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-1.3.0-r1.ebuild similarity index 59% copy from dev-lang/yasm/yasm-9999.ebuild copy to dev-lang/yasm/yasm-1.3.0-r1.ebuild index ccd86bc0090..ffd88e2bc66 100644 --- a/dev-lang/yasm/yasm-9999.ebuild +++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild @@ -2,16 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 toolchain-funcs +inherit toolchain-funcs if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="https://github.com/yasm/yasm.git"; inherit autotools git-r3 else SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"; - KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" + KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="An assembler for x86 and x86_64 instruction sets" @@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"; LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )" SLOT="0" -IUSE="nls python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="nls" BDEPEND=" nls? ( sys-devel/gettext ) - 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 BDEPEND+=" app-text/xmlto app-text/docbook-xml-dtd:4.1.2 + dev-lang/python " fi -pkg_setup() { - : # Avoid python-single-r1_pkg_setup -} - src_prepare() { default if [[ ${PV} == 9999* ]]; then eautoreconf - ./modules/arch/x86/gen_x86_insn.py || die + python modules/arch/x86/gen_x86_insn.py || die fi } src_configure() { - use python && python_setup - local myconf=( - CC_FOR_BUILD=$(tc-getBUILD_CC) \ - CCLD_FOR_BUILD=$(tc-getBUILD_CC) \ + CC_FOR_BUILD="$(tc-getBUILD_CC)" + CCLD_FOR_BUILD="$(tc-getBUILD_CC)" --disable-warnerror - $(use_enable python) - $(use_enable python python-bindings) + --disable-python + --disable-python-bindings $(use_enable nls) ) diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild index ccd86bc0090..ffd88e2bc66 100644 --- a/dev-lang/yasm/yasm-9999.ebuild +++ b/dev-lang/yasm/yasm-9999.ebuild @@ -2,16 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 toolchain-funcs +inherit toolchain-funcs if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="https://github.com/yasm/yasm.git"; inherit autotools git-r3 else SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"; - KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" + KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="An assembler for x86 and x86_64 instruction sets" @@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"; LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )" SLOT="0" -IUSE="nls python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="nls" BDEPEND=" nls? ( sys-devel/gettext ) - 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 BDEPEND+=" app-text/xmlto app-text/docbook-xml-dtd:4.1.2 + dev-lang/python " fi -pkg_setup() { - : # Avoid python-single-r1_pkg_setup -} - src_prepare() { default if [[ ${PV} == 9999* ]]; then eautoreconf - ./modules/arch/x86/gen_x86_insn.py || die + python modules/arch/x86/gen_x86_insn.py || die fi } src_configure() { - use python && python_setup - local myconf=( - CC_FOR_BUILD=$(tc-getBUILD_CC) \ - CCLD_FOR_BUILD=$(tc-getBUILD_CC) \ + CC_FOR_BUILD="$(tc-getBUILD_CC)" + CCLD_FOR_BUILD="$(tc-getBUILD_CC)" --disable-warnerror - $(use_enable python) - $(use_enable python python-bindings) + --disable-python + --disable-python-bindings $(use_enable nls) )
