diff options
| -rw-r--r-- | dev-lang/yasm/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch | 23 | ||||
| -rw-r--r-- | dev-lang/yasm/yasm-1.2.0-r1.ebuild | 50 |
3 files changed, 0 insertions, 75 deletions
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest index 2e6989094666..8b3f187a1f95 100644 --- a/dev-lang/yasm/Manifest +++ b/dev-lang/yasm/Manifest @@ -1,3 +1 @@ -DIST yasm-1.2.0-x32.patch.xz 9656 BLAKE2B 61971f72941269e6f9eb30fe58978bdae546eedf8873111ee33f37d63e82135833d8787e23d1f7fb887bf205c1bc9035bb4c8c7f7f0ae13a0cf8b47a8ec9dc7d SHA512 93961d0690c0018a3645bc3d610b1f12172f5311609716fec0efcf8af5d70578a1fc74ab42fcc75f2b75ed8837fa03cbc66ddd6386baeb56a519e7639ff64874 -DIST yasm-1.2.0.tar.gz 1436502 BLAKE2B 7be4f0cb5bd687868451fa6051ce9a621847c4ec87281af2e8e9673a61653f1625b17d41c213b7559b947c3173f29c94c0e397e037e1b339055e06c19ee21fea SHA512 e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bffc9725d9f9742ae5f3a0bb23ee5b2a61153332fb3e286b77 DIST yasm-1.3.0.tar.gz 1492156 BLAKE2B e419a4f9912eb244e9503462dbf0c5e5c95bdfa49583ee205dc4708b42710df8dd2056b2e36e04de04474f4af900916cb64c14a623db1346c3e1cb46a8cc34a5 SHA512 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645 diff --git a/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch b/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch deleted file mode 100644 index c894f821a2aa..000000000000 --- a/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://tortall.lighthouseapp.com/projects/78676-yasm/tickets/249 - ---- m4/cython.m4 -+++ m4/cython.m4 -@@ -2,13 +2,14 @@ - dnl be set before this function is called. - dnl CYTHON_CHECK_VERSION([MIN-VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE]) - AC_DEFUN([CYTHON_CHECK_VERSION], -- [prog="import sys -+ [prog="import re, sys - from Cython.Compiler.Version import version - def get_int(arg): -- try: -- return int(arg) -- except ValueError: -+ matched = re.match(r'\d+', arg) -+ if matched is None: - return 0 -+ else: -+ return int(matched.group(0)) - # split strings by '.' and convert to numeric. Append some zeros - # because we need at least 4 digits for the hex conversion. - ver = map(get_int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [[0, 0, 0]] diff --git a/dev-lang/yasm/yasm-1.2.0-r1.ebuild b/dev-lang/yasm/yasm-1.2.0-r1.ebuild deleted file mode 100644 index 9cd5c98942fb..000000000000 --- a/dev-lang/yasm/yasm-1.2.0-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils python-r1 - -DESCRIPTION="An assembler for x86 and x86_64 instruction sets" -HOMEPAGE="http://yasm.tortall.net/" -SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz - mirror://gentoo/${P}-x32.patch.xz" - -LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )" -SLOT="0" -KEYWORDS="-* amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="nls python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - nls? ( virtual/libintl ) - python? ( ${PYTHON_DEPS} )" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) - python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )" - -src_prepare() { - sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940 - epatch "${WORKDIR}"/${P}-x32.patch #435838 - chmod a+rx modules/objfmts/elf/tests/{gas,}x32/*_test.sh - epatch "${FILESDIR}/${P}-fix_cython_check.patch" - # ksh doesn't grok $(xxx), makes aclocal fail - sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die - eautoreconf -} - -src_configure() { - use python && python_setup - - econf \ - $(use_enable python) \ - $(use_enable python python-bindings) \ - $(use_enable nls) -} - -src_test() { - emake check -} |