Revert "dev-lang/yasm: update to 1.3.0-r1 to fix Github URL protocol"

This reverts commit ea28ab385dfffa6b0cbd7267b557764e35f7b060.

sdk_container/src/third_party/portage-stable/dev-lang/yasm/Manifest

@@ -1 +1,10 @@
-DIST yasm-1.3.0.tar.gz 1492156 BLAKE2B e419a4f9912eb244e9503462dbf0c5e5c95bdfa49583ee205dc4708b42710df8dd2056b2e36e04de04474f4af900916cb64c14a623db1346c3e1cb46a8cc34a5 SHA512 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645
+AUX yasm-1.2.0-fix_cython_check.patch 790 SHA256 1d44a5ea34426c84556e93d3f5774912ca8530c582ad6f1bf738850b515d977c SHA512 5055949c13c5b4e24863f302f379831fcb26edbcfef48b3f3ee4fe742a95c0db85487a82d72a7e9fc96ad4c9fbeee0423d79032269900aeaf380cc9848ccb07b WHIRLPOOL 8810880f15c5c44cbf457ede3e0d19ef64ba68ae2cb3f595b04be1614b39f36d7803c617d29e3a2fe7248ac76285056f1ea4f1870a28b75c1da8c851827b9e22
+DIST yasm-1.2.0-x32.patch.xz 9656 SHA256 d5a623243b1b2a73b4b25d9395a5be1483adca38cec8f50a7f1e4e9107cd9d83 SHA512 93961d0690c0018a3645bc3d610b1f12172f5311609716fec0efcf8af5d70578a1fc74ab42fcc75f2b75ed8837fa03cbc66ddd6386baeb56a519e7639ff64874 WHIRLPOOL 410c940995fc31b2e12f9eec67b6873f1f4629fcdf8a58c2165ab3d9721f21e295901e8917cfd613b30ea319594aeaff21d38ec4e9bd2b693e6e3230e9d637d9
+DIST yasm-1.2.0.tar.gz 1436502 SHA256 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 SHA512 e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bffc9725d9f9742ae5f3a0bb23ee5b2a61153332fb3e286b77 WHIRLPOOL 2a1fd73beeea8128c67e0172684e3dac9d0c16b9e35e905a5e313948d685da9ace15a2b18001c02c0aff9113fec9059af5984aeacf8e4ae5e8bbe91dd00d9d9e
+DIST yasm-1.3.0.tar.gz 1492156 SHA256 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f SHA512 572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645 WHIRLPOOL 025454780e4e7ccc443fc604e49a5cc9b8489eaff9d50a443786c462604dc16890a07fba6985e2cc53c1076b23fda472aedb6c1cf9c8adcac6c05f90fdf696a7
+EBUILD yasm-1.2.0-r1.ebuild 1325 SHA256 3292065a3a6ee32d8d7b2e63f2c239401585cd67b7fa0ef798e1569e906e6e69 SHA512 a73339713257e8e8b05ae7eda671a0a7ec8a83ff284d03102f383f829f40f7aa81836aab19b71e5f3a4dafce0453b20c4f64350d8701b9e853c20a6b0c4fde18 WHIRLPOOL d0908f3a9d796219b063b275c45e078ae9c6466892aedef4ae614f95cc12e8c6308e17387f41a7148c9a64f793e0658133e6a9428dc5d0b16d190f59657cc7af
+EBUILD yasm-1.3.0.ebuild 946 SHA256 974f0ca8cb7fa050cdfc8052eda7b266a5f72beee04ad2adcef0228a909c8636 SHA512 9fbb8eaaa15e1e45750cb2f0c4031370fa391d405f17066583f86791b568b145e09c066ccc5c418db63b2a39a6d577dca4348417aee2cf48b88bf9747551f891 WHIRLPOOL 58c4b52c3c5cf4d512f39a39d333852aef747b4abc61a5b2fab3e9bfcd63f27300076d94333f2d7a0c62fa6f7753fdb46f832604bb9b6cca8e92d3d0f5b3235a
+EBUILD yasm-9999.ebuild 1558 SHA256 4ddc07ddcc404606f65b921cc67b4312f178b5ed811af2d72105da84febbc5d5 SHA512 b389debe05ca02e44e5d2442c5560c8326de5cbf0ff10fa3eb63f5b43d7d0908f298d39ee7534014e6c2b9c51ae265b902cbd63138c68920940d5e9174a46e5d WHIRLPOOL 3c75b56407225d4fab456cf7962e73f23e4f0551636619c96bc4a076d5c1f4d88d07525f323e7cd58bbff13e0fae24388664afa9f79ce2c4a658c556df228995
+MISC ChangeLog 2787 SHA256 7d4c5ca973505c35863ac3f5a70a41dfcfc92d282dd6c07d6cb260d63ebba0a9 SHA512 8e5cc5c9f1c084524640ce19aa87eb6247eb6d9cc4fd3740edace28daa6d2845377175bf4a110236485c032f23e40cd3ad7f265edb1d9cf9d6de00894afa5fc4 WHIRLPOOL cac35ebb879b646c5f25de0c691f7f84d4b36398a9848baa50f9ebdeae3a86780a3e18f1594b07e0452fe585be2627380d3244a4b0279d9442106fad0c4398f4
+MISC ChangeLog-2015 8842 SHA256 9afa257c4aa9a624fed04e18d1f5e1fca076093b1c099307a6363b506f676b01 SHA512 511d9a4b1b7da6f08ae9b18f5c44ad69d7170d006123de411eef5587ae2a7402887e4b7b9e9b5ee46d715a209cef5a4dbc2f1f212b7a595d1708fcab6fd6f806 WHIRLPOOL c5b6cc3a39918d7944793464df5b558529ca9bd691c32c668516987eb2319689b1f4b4d2a724c147e135caded121444d8e28838369a077d25bef742503ba16cb
+MISC metadata.xml 261 SHA256 254d983e670eec6ed511873092d6d221fa8f9ad0b8c1a102c4fdf834cc0bfcb1 SHA512 d37f5f4f82ac36f200f1df58e8caf7e8bcad7f4d479ad37e0c059d657c50984f44463e765e9cb867c04a2081928f3d603d362930de1f9d326ed4c237a1b0bb0c WHIRLPOOL 8fea7f86fcbb79795e8c50016801babd045a40286d4e83b8f9b00ac6717f60f412436135637c79091bc2b9724cb7314ab871b5d217b3f273b23dc9ef651527ea

sdk_container/src/third_party/portage-stable/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch

@@ -0,0 +1,23 @@
+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]]

sdk_container/src/third_party/portage-stable/dev-lang/yasm/metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
     <email>base-system@gentoo.org</email>

sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-1.2.0-r1.ebuild

@@ -0,0 +1,50 @@
+# 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-fbsd ~x86-fbsd ~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_export_best
+
+	econf \
+		$(use_enable python) \
+		$(use_enable python python-bindings) \
+		$(use_enable nls)
+}
+
+src_test() {
+	emake check
+}

sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-1.3.0-r1.ebuild

@@ -1,65 +0,0 @@
-# Copyright 1999-2021 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="https://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
-HOMEPAGE="https://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
-}

sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-1.3.0.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit 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"
+
+LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="-* amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~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? ( >=dev-python/cython-0.14[${PYTHON_USEDEP}] )"
+
+src_configure() {
+	use python && python_export_best
+
+	XMLTO=: \
+	econf \
+		$(use_enable python) \
+		$(use_enable python python-bindings) \
+		$(use_enable nls)
+}
+
+src_test() {
+	emake check
+}

sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-9999.ebuild

@@ -0,0 +1,67 @@
+# 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
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="git://github.com/yasm/yasm.git"
+	inherit git-2
+else
+	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~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 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}] )"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} ${PYTHON_DEPS} app-text/xmlto app-text/docbook-xml-dtd:4.1.2"
+fi
+
+src_prepare() {
+	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
+		./modules/arch/x86/gen_x86_insn.py || die
+	fi
+}
+
+src_configure() {
+	if [[ ${PV} == 9999* ]]; then
+		python_export_best
+	else
+		use python && python_export_best
+	fi
+
+	econf \
+		--disable-warnerror \
+		$(use_enable python) \
+		$(use_enable python python-bindings) \
+		$(use_enable nls)
+}
+
+src_test() {
+	emake check
+}