gentoo resync : 14.07.2018

6 files changed, 196 insertions, 0 deletions

diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
new file mode 100644
index 000000000000..01583d2d7b58
--- /dev/null
+++ b/dev-lang/yasm/Manifest
@@ -0,0 +1,8 @@
+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 1325 BLAKE2B f9ed79c51ce0ce88b90b38d5971c325836f0de762e9930da5ab1f65239760f6c32e8a12b6e7f281a5225848d51a4bff46e604b911319a99a247ec5ce08d54e3e SHA512 a73339713257e8e8b05ae7eda671a0a7ec8a83ff284d03102f383f829f40f7aa81836aab19b71e5f3a4dafce0453b20c4f64350d8701b9e853c20a6b0c4fde18
+EBUILD yasm-1.3.0.ebuild 946 BLAKE2B c630f4395bae5c78214d5b91d765e7a0a891999ef38a551630447533cdf7eb66609b77843eac1669a33dad81455e78ae640ee92f409e2f803a39dbafe51d868e SHA512 9fbb8eaaa15e1e45750cb2f0c4031370fa391d405f17066583f86791b568b145e09c066ccc5c418db63b2a39a6d577dca4348417aee2cf48b88bf9747551f891
+EBUILD yasm-9999.ebuild 1561 BLAKE2B 5ff52a01570720e5489e350d456f99297a2414222a75f64affa567318a305477691d26452f523c95c483b1c1c5100afc3c6c098867a333a6e73dd0187fea3b04 SHA512 4449eee53c652bb6f57912e0d3b42a80b3055a9a8cb5e7889c724ce1dad80029bc8cee26bf78351c1669ba0eb8cee096f4645b5eb79aa5848b43971490717830
+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
new file mode 100644
index 000000000000..c894f821a2aa
--- /dev/null
+++ b/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]]
diff --git a/dev-lang/yasm/metadata.xml b/dev-lang/yasm/metadata.xml
new file mode 100644
index 000000000000..d50bc759d0bb
--- /dev/null
+++ b/dev-lang/yasm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+    <email>base-system@gentoo.org</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-lang/yasm/yasm-1.2.0-r1.ebuild b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..008d10fb17b1
--- /dev/null
+++ b/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
+}
diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild
new file mode 100644
index 000000000000..04266e13156d
--- /dev/null
+++ b/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
+}
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
new file mode 100644
index 000000000000..19cd65988740
--- /dev/null
+++ b/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="https://github.com/yasm/yasm.git"
+	inherit git-r3
+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
+}