gentoo resync : 24.09.2020

4 files changed, 4 insertions, 118 deletions

diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index 2e0c2dc861f2..64a74007bd07 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -1,5 +1,3 @@
 DIST yasm-1.3.0.tar.gz 1492156 BLAKE2B e419a4f9912eb244e9503462dbf0c5e5c95bdfa49583ee205dc4708b42710df8dd2056b2e36e04de04474f4af900916cb64c14a623db1346c3e1cb46a8cc34a5 SHA512 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645
-EBUILD yasm-1.3.0-r1.ebuild 1235 BLAKE2B 57b0595802bfe7fa230d0b7be769d2e8f09bff67f43ce41bced1bb07c7a4d8c8b581d2a574de2ef4044886a578eb2b399f7d01b83d2a70ed35e3285846a7f6e4 SHA512 62bff24d84ccdc0b1e2199e225385a8f107afba49901ffe015c91f77c19b048f87a5a97b7d4315bbd001d2e66baed13348a98711ef10f6745a4eec8baf5d404e
-EBUILD yasm-1.3.0.ebuild 1128 BLAKE2B c8afc041ff08d9cf748c6801b8e4469361c4eb71181f603aca185e154c7bdea3fe3c7de455d53bab6e6481220a07c97f53ea7af402e1e9762467fa21faf2a1f0 SHA512 e7a239a4b2ed31a3eff8ddd00cfa7af7a8abc7147624094d433b9ba409d9df8acf217388a7ec51382aa685b54cd93e93daa0aba2d6e2e91c771450117df8e810
-EBUILD yasm-9999.ebuild 1236 BLAKE2B 5af3ba7c81c766444a9e2ace1938399e72f7f996184fa8e3e2ec92ccce45ba4b5900a56c9083221c3055ab7daf469faf5e35842a3454ac40273bca07a99c3133 SHA512 601b2f56e59eea059f0dcd627217763cd3c83d3710ff0c410c1d781fff2ff002e5303fc4f1999b8a41a7159b44d2074fac09a6fb28bc0488b002fafc8e953176
+EBUILD yasm-1.3.0-r1.ebuild 1236 BLAKE2B 643940574e4749c9653970c6abfea8a5f5b4ebbbc23fe72a5e22fabed88c18f699e47ccea2304f0e70ac433c821951806bd05c2d6c87ac0a57fea16789dd56c1 SHA512 373b6d9ea1fdbfd224732e64a3687faed63110d79936eccff27d080ae23d7233c4db4613270b0ef0cb92553b11d48321982a40f5edee18dbc4d811a3eb51ae0c
 MISC metadata.xml 261 BLAKE2B c5880d50c9def415b65cade7de2e9f4d5f46c98e4d60cde4c85b45cd0c2b1c65b695b85c6533fb018dc545fbc562284485818cf0b2db3109b088310dc7be53f7 SHA512 d37f5f4f82ac36f200f1df58e8caf7e8bcad7f4d479ad37e0c059d657c50984f44463e765e9cb867c04a2081928f3d603d362930de1f9d326ed4c237a1b0bb0c
diff --git a/dev-lang/yasm/yasm-1.3.0-r1.ebuild b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
index 78e1068772bd..5d0209b792f0 100644
--- a/dev-lang/yasm/yasm-1.3.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
@@ -9,12 +9,12 @@ 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 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="https://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 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/"
+HOMEPAGE="https://yasm.tortall.net/"
 
 LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
 SLOT="0"
diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild
deleted file mode 100644
index 7104a751fd07..000000000000
--- a/dev-lang/yasm/yasm-1.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
-
-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"
-
-LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~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? ( $(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
-
-	XMLTO=: \
-	econf \
-		CC_FOR_BUILD=$(tc-getBUILD_CC) \
-		CCLD_FOR_BUILD=$(tc-getBUILD_CC) \
-		$(use_enable python) \
-		$(use_enable python python-bindings) \
-		$(use_enable nls)
-}
-
-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
deleted file mode 100644
index 05fea044d20c..000000000000
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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 ~ppc64 ~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
-}