gentoo resync : 25.08.2020

5 files changed, 76 insertions, 99 deletions

diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index aa0ccf2f9d69..027943ff1304 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -1,8 +1,5 @@
-AUX yasm-1.2.0-fix_cython_check.patch 790 BLAKE2B 7f3c64676a711c327e4fee6cf1acc75ff6e9d28ebd53e7a5688f85e98e467b6e33a950422ff82a522acd9ec163513b06083e2f7daaf155f6fd81860279bfd142 SHA512 5055949c13c5b4e24863f302f379831fcb26edbcfef48b3f3ee4fe742a95c0db85487a82d72a7e9fc96ad4c9fbeee0423d79032269900aeaf380cc9848ccb07b
-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
-EBUILD yasm-1.2.0-r1.ebuild 1297 BLAKE2B 58304a9a89220672a1bbee4bf1dbc5e9a06d224aadfd57c6d8a6d76c4a8f446f1525c0e99fd028d1e89dcdf0e349a0105a59da6d41a50717a9c4c62adb55df79 SHA512 d2b6f99c3daae13679c27a5cac1d247b55d233edfb6b9e2105659f2f83ae688425c6b2454532c219b29fbe54bbdb5158d6c0b0f97967aaa58723d1317a7154da
+EBUILD yasm-1.3.0-r1.ebuild 1229 BLAKE2B ff9472b50f5a4c7d7d4d67fcff061234d29cf72d2682bc1192f249f2a4989d5a027650fb4d7e1af264a8ae410b6633861d90348f72ae0f846fcbbc1d4859774e SHA512 ffdd0066ec2f101881c248817464daa5dd3c3cab3f89f5eb8beff7f45b7a791484ecfece37fa079aac07c34d70bcf01d3c73fce91e6f768f28c1f163c27b47e5
 EBUILD yasm-1.3.0.ebuild 1128 BLAKE2B c8afc041ff08d9cf748c6801b8e4469361c4eb71181f603aca185e154c7bdea3fe3c7de455d53bab6e6481220a07c97f53ea7af402e1e9762467fa21faf2a1f0 SHA512 e7a239a4b2ed31a3eff8ddd00cfa7af7a8abc7147624094d433b9ba409d9df8acf217388a7ec51382aa685b54cd93e93daa0aba2d6e2e91c771450117df8e810
-EBUILD yasm-9999.ebuild 1519 BLAKE2B 09dcf4de46a7015d90b6ebd3427afaed532a49d41c9c9158dd84b1334fece3c64e2e0aec79744b46e87fabf2f9f62553e62c8f8e6652bbe2b43c46eb288220d0 SHA512 a06e1eb56d5ec599be4c9d17c8bd0e439e9a11944e63b89c8c9b42360530d6623a8a1d8304caabdabbd1ad456ba9812b7537db4e6f21fcffb377b5ca2b5c883e
+EBUILD yasm-9999.ebuild 1229 BLAKE2B ff9472b50f5a4c7d7d4d67fcff061234d29cf72d2682bc1192f249f2a4989d5a027650fb4d7e1af264a8ae410b6633861d90348f72ae0f846fcbbc1d4859774e SHA512 ffdd0066ec2f101881c248817464daa5dd3c3cab3f89f5eb8beff7f45b7a791484ecfece37fa079aac07c34d70bcf01d3c73fce91e6f768f28c1f163c27b47e5
 MISC metadata.xml 261 BLAKE2B c5880d50c9def415b65cade7de2e9f4d5f46c98e4d60cde4c85b45cd0c2b1c65b695b85c6533fb018dc545fbc562284485818cf0b2db3109b088310dc7be53f7 SHA512 d37f5f4f82ac36f200f1df58e8caf7e8bcad7f4d479ad37e0c059d657c50984f44463e765e9cb867c04a2081928f3d603d362930de1f9d326ed4c237a1b0bb0c
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
-}
diff --git a/dev-lang/yasm/yasm-1.3.0-r1.ebuild b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..ffd88e2bc667
--- /dev/null
+++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~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"
+HOMEPAGE="http://yasm.tortall.net/"
+
+LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	nls? ( virtual/libintl )
+"
+RDEPEND="${DEPEND}
+"
+
+if [[ ${PV} == 9999* ]]; then
+	BDEPEND+="
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/python
+	"
+fi
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]]; then
+		eautoreconf
+		python modules/arch/x86/gen_x86_insn.py || die
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		CCLD_FOR_BUILD="$(tc-getBUILD_CC)"
+		--disable-warnerror
+		--disable-python
+		--disable-python-bindings
+		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# https://bugs.gentoo.org/718870
+	emake -j1 check
+}
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
index ccd86bc00909..ffd88e2bc667 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)
 	)