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/
Date: Wed, 13 May 2020 23:11:36
Message-Id: 1589411487.a969cbebb113718e1a9860143b94c8aa0558b51e.floppym@gentoo
1 commit: a969cbebb113718e1a9860143b94c8aa0558b51e
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 13 23:11:27 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed May 13 23:11:27 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a969cbeb
7
8 dev-lang/yasm: remove obsolete hacks from src_prepare
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 dev-lang/yasm/yasm-9999.ebuild | 14 +++-----------
13 1 file changed, 3 insertions(+), 11 deletions(-)
14
15 diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
16 index 5be4c7a9719..cf48d28e862 100644
17 --- a/dev-lang/yasm/yasm-9999.ebuild
18 +++ b/dev-lang/yasm/yasm-9999.ebuild
19 @@ -4,11 +4,11 @@
20 EAPI=7
21 PYTHON_COMPAT=( python2_7 )
22
23 -inherit autotools eutils python-single-r1
24 +inherit python-single-r1
25
26 if [[ ${PV} == 9999* ]] ; then
27 EGIT_REPO_URI="https://github.com/yasm/yasm.git"
28 - inherit git-r3
29 + inherit autotools git-r3
30 else
31 SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
32 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
33 @@ -50,16 +50,8 @@ pkg_setup() {
34 src_prepare() {
35 default
36
37 - if ! [[ ${PV} == 9999* ]]; then
38 - sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940
39 - fi
40 -
41 - # ksh doesn't grok $(xxx), makes aclocal fail
42 - sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die
43 -
44 - eautoreconf
45 -
46 if [[ ${PV} == 9999* ]]; then
47 + eautoreconf
48 ./modules/arch/x86/gen_x86_insn.py || die
49 fi
50 }