gentoo resync : 25.04.2020

3 files changed, 48 insertions, 27 deletions

diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index cd12b86d8af6..c8d5c15b02d3 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -3,6 +3,6 @@ DIST yasm-1.2.0-x32.patch.xz 9656 BLAKE2B 61971f72941269e6f9eb30fe58978bdae546ee
 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.ebuild 918 BLAKE2B 58da4ac81e4eee2ecbdaf82c85cb09dbb60d77c0de6a8c6ac2a8fdb00b636e578d171213d190df0fce6c3d309ef004d2455e29959eda7f1ff642f37f5fd7013e SHA512 9c9f525cd726b1aa6b85ff4e6399d322e6621e94e8953572f8a0320de56261812b9e58438c772daf18de34e8a3a238dccbbea01fae92156476525ae76409f89c
-EBUILD yasm-9999.ebuild 1527 BLAKE2B 8951e684d2d24b9689df80bf132418e0bf4a51c1780462839824779bedffc1fb92aa47fb517ec376ac3dc42374296abcc17a4b3816f0badad787cc2103f30e73 SHA512 2aba50b8db7dc4f0a09e7679ee6cc2c4db7562efcbd022ac68ec5258e4f2e6fb4ee6165cd01cc449001e0f8025b51fa0c37dd0fbc25b3d97b79018150aa5db2d
+EBUILD yasm-1.3.0.ebuild 1040 BLAKE2B 9f3fac954020ac8c4c04e49f38bacda09e44566f41b906befb3a81aa1e02128554d114acda6d21e75b20b5a53341ed9e7e9f2ca1c436ba38401156681645c271 SHA512 a77af8925e65478ed791a98b36c3d673f2d4109bf25c10044b735d53f93d1458c7be345bd6aad99e26170b8b7998a1d5ca439490e9972ef72e934dc0d4c3c1b7
+EBUILD yasm-9999.ebuild 1645 BLAKE2B 72b9dcd4960fb779dbf206e7b75a7e0280a148e8e0acabdf130e0d4a41200cdab3335097cba2c024097467e0c0f705431fcb0e2741e6a39eb24e8f744a3e8b93 SHA512 67c02a85e172a296e386603f38496b2105ae5ac11de3edda0f2a17b4a227d58c7d9a51261cdcde7cab61a3a69c802258bc5e275248aea1c42eb612fae38659e0
 MISC metadata.xml 261 BLAKE2B c5880d50c9def415b65cade7de2e9f4d5f46c98e4d60cde4c85b45cd0c2b1c65b695b85c6533fb018dc545fbc562284485818cf0b2db3109b088310dc7be53f7 SHA512 d37f5f4f82ac36f200f1df58e8caf7e8bcad7f4d479ad37e0c059d657c50984f44463e765e9cb867c04a2081928f3d603d362930de1f9d326ed4c237a1b0bb0c
diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild
index e1ef59791ee0..fab7341fef10 100644
--- a/dev-lang/yasm/yasm-1.3.0.ebuild
+++ b/dev-lang/yasm/yasm-1.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-r1
+inherit python-single-r1
 
 DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
 HOMEPAGE="http://yasm.tortall.net/"
@@ -23,7 +23,11 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
-	python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )"
+	python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )"
+
+pkg_setup() {
+	: # Avoid python-single-r1_pkg_setup
+}
 
 src_configure() {
 	use python && python_setup
@@ -36,5 +40,6 @@ src_configure() {
 }
 
 src_test() {
-	emake check
+	# 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 1dc81bc993d4..5be4c7a9719b 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils python-r1
+inherit autotools eutils python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/yasm/yasm.git"
@@ -23,24 +22,41 @@ SLOT="0"
 IUSE="nls python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
-	nls? ( virtual/libintl )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="
-	${RDEPEND}
+BDEPEND="
 	nls? ( sys-devel/gettext )
-	python? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )"
+	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
-	DEPEND="${DEPEND} ${PYTHON_DEPS} app-text/xmlto app-text/docbook-xml-dtd:4.1.2"
+	BDEPEND+="
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+	"
 fi
 
+pkg_setup() {
+	: # Avoid python-single-r1_pkg_setup
+}
+
 src_prepare() {
+	default
+
 	if ! [[ ${PV} == 9999* ]]; then
 		sed -i -e 's:xmlto:&dIsAbLe:' configure.ac || die #459940
 	fi
+
 	# ksh doesn't grok $(xxx), makes aclocal fail
 	sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die
+
 	eautoreconf
 
 	if [[ ${PV} == 9999* ]]; then
@@ -49,19 +65,19 @@ src_prepare() {
 }
 
 src_configure() {
-	if [[ ${PV} == 9999* ]]; then
-		python_setup
-	else
-		use python && python_setup
-	fi
+	use python && python_setup
 
-	econf \
-		--disable-warnerror \
-		$(use_enable python) \
-		$(use_enable python python-bindings) \
+	local myconf=(
+		--disable-warnerror
+		$(use_enable python)
+		$(use_enable python python-bindings)
 		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_test() {
-	emake check
+	# https://bugs.gentoo.org/718870
+	emake -j1 check
 }