Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/, dev-lang/yasm/files/
Date: Tue, 18 Aug 2020 14:53:27
Message-Id: 1597762371.de7dba08c731211c04abf65bcd6a950e75278382.floppym@gentoo
1 commit: de7dba08c731211c04abf65bcd6a950e75278382
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 17 01:22:15 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 18 14:52:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de7dba08
7
8 dev-lang/yasm: remove old
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 dev-lang/yasm/Manifest | 2 -
13 .../yasm/files/yasm-1.2.0-fix_cython_check.patch | 23 ----------
14 dev-lang/yasm/yasm-1.2.0-r1.ebuild | 50 ----------------------
15 3 files changed, 75 deletions(-)
16
17 diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
18 index 2e698909466..8b3f187a1f9 100644
19 --- a/dev-lang/yasm/Manifest
20 +++ b/dev-lang/yasm/Manifest
21 @@ -1,3 +1 @@
22 -DIST yasm-1.2.0-x32.patch.xz 9656 BLAKE2B 61971f72941269e6f9eb30fe58978bdae546eedf8873111ee33f37d63e82135833d8787e23d1f7fb887bf205c1bc9035bb4c8c7f7f0ae13a0cf8b47a8ec9dc7d SHA512 93961d0690c0018a3645bc3d610b1f12172f5311609716fec0efcf8af5d70578a1fc74ab42fcc75f2b75ed8837fa03cbc66ddd6386baeb56a519e7639ff64874
23 -DIST yasm-1.2.0.tar.gz 1436502 BLAKE2B 7be4f0cb5bd687868451fa6051ce9a621847c4ec87281af2e8e9673a61653f1625b17d41c213b7559b947c3173f29c94c0e397e037e1b339055e06c19ee21fea SHA512 e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bffc9725d9f9742ae5f3a0bb23ee5b2a61153332fb3e286b77
24 DIST yasm-1.3.0.tar.gz 1492156 BLAKE2B e419a4f9912eb244e9503462dbf0c5e5c95bdfa49583ee205dc4708b42710df8dd2056b2e36e04de04474f4af900916cb64c14a623db1346c3e1cb46a8cc34a5 SHA512 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645
25
26 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
27 deleted file mode 100644
28 index c894f821a2a..00000000000
29 --- a/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch
30 +++ /dev/null
31 @@ -1,23 +0,0 @@
32 -http://tortall.lighthouseapp.com/projects/78676-yasm/tickets/249
33 -
34 ---- m4/cython.m4
35 -+++ m4/cython.m4
36 -@@ -2,13 +2,14 @@
37 - dnl be set before this function is called.
38 - dnl CYTHON_CHECK_VERSION([MIN-VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE])
39 - AC_DEFUN([CYTHON_CHECK_VERSION],
40 -- [prog="import sys
41 -+ [prog="import re, sys
42 - from Cython.Compiler.Version import version
43 - def get_int(arg):
44 -- try:
45 -- return int(arg)
46 -- except ValueError:
47 -+ matched = re.match(r'\d+', arg)
48 -+ if matched is None:
49 - return 0
50 -+ else:
51 -+ return int(matched.group(0))
52 - # split strings by '.' and convert to numeric. Append some zeros
53 - # because we need at least 4 digits for the hex conversion.
54 - ver = map(get_int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [[0, 0, 0]]
55
56 diff --git a/dev-lang/yasm/yasm-1.2.0-r1.ebuild b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
57 deleted file mode 100644
58 index 9cd5c98942f..00000000000
59 --- a/dev-lang/yasm/yasm-1.2.0-r1.ebuild
60 +++ /dev/null
61 @@ -1,50 +0,0 @@
62 -# Copyright 1999-2017 Gentoo Foundation
63 -# Distributed under the terms of the GNU General Public License v2
64 -
65 -EAPI=5
66 -
67 -PYTHON_COMPAT=( python2_7 )
68 -
69 -inherit autotools eutils python-r1
70 -
71 -DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
72 -HOMEPAGE="http://yasm.tortall.net/"
73 -SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz
74 - mirror://gentoo/${P}-x32.patch.xz"
75 -
76 -LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
77 -SLOT="0"
78 -KEYWORDS="-* amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
79 -IUSE="nls python"
80 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
81 -
82 -RDEPEND="
83 - nls? ( virtual/libintl )
84 - python? ( ${PYTHON_DEPS} )"
85 -DEPEND="
86 - ${RDEPEND}
87 - nls? ( sys-devel/gettext )
88 - python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )"
89 -
90 -src_prepare() {
91 - sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940
92 - epatch "${WORKDIR}"/${P}-x32.patch #435838
93 - chmod a+rx modules/objfmts/elf/tests/{gas,}x32/*_test.sh
94 - epatch "${FILESDIR}/${P}-fix_cython_check.patch"
95 - # ksh doesn't grok $(xxx), makes aclocal fail
96 - sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die
97 - eautoreconf
98 -}
99 -
100 -src_configure() {
101 - use python && python_setup
102 -
103 - econf \
104 - $(use_enable python) \
105 - $(use_enable python python-bindings) \
106 - $(use_enable nls)
107 -}
108 -
109 -src_test() {
110 - emake check
111 -}