Add x32 support from upstream #435838 by Alphat-PC.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 68 insertions, 15 deletions

diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog
index 0a18d3700564..3089693b0fed 100644
--- a/dev-lang/yasm/ChangeLog
+++ b/dev-lang/yasm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/yasm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.58 2013/01/15 02:41:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.59 2013/01/15 17:31:52 vapier Exp $
+
+*yasm-1.2.0-r1 (15 Jan 2013)
+
+  15 Jan 2013; Mike Frysinger <vapier@gentoo.org> +yasm-1.2.0-r1.ebuild:
+  Add x32 support from upstream #435838 by Alphat-PC.
 
   15 Jan 2013; Mike Frysinger <vapier@gentoo.org> yasm-1.2.0.ebuild,
   yasm-9999.ebuild:
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index bfa048307710..7c42af29773b 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 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
+EBUILD yasm-1.2.0-r1.ebuild 1313 SHA256 cb373c7e0763735170a33c81da9557f555c948321c07478185a6789f1559bcb6 SHA512 78fd2ece5e6cfd71f9d1f496be8a0ee0385570792cfc9c04e276fe047fc4c1c893b469579ac089d8b1432ab7bca6ac605a74e34dbd590934dbfd174b2db75f3c WHIRLPOOL 184043a583309f6f962e660b42c49bbfc41711e55faaf74657cd774c7a2c6a407cdb218f1b19466bf4c1ebb41a7b85a967dd08785bca256f7d58063a97b21437
 EBUILD yasm-1.2.0.ebuild 1171 SHA256 d881b284ddabf55d8915e0bcdf48e95c2cc43a80a20f49ad43778265c538b15e SHA512 c198a3b1d8506f8cadb14880cc265d4977b18f8884a9fafd7ce01a262e70269da8cedc981ba0582bc20631ce982e42487d4d8940dce695ebac0e6069380753f0 WHIRLPOOL b5718cb617dd4997ca4fcfa02cc047cef3884a02d2ab35eb3a00f0fbb2b785897b16a069253d7a19a86c3df067bcd9cfd45cfd93a90c5277ea60032289c6f426
 EBUILD yasm-9999.ebuild 1464 SHA256 359da6c0965c06c95af6f8dad3b9708056b1bed91f5b1313d80fc82db7de9bf8 SHA512 f08e0d86cc320ec38288af54a10e6d1bd55a3d0487ab96e0fce4770df7b239152ae535179784ccfba41cba3df91e7f3fed4fdfddb3cbd5caa6d40bfc7c4e099e WHIRLPOOL d69e5f535580dcfeabb0f8b3a733cb17920c5ff583c34b35a3466803f93cca4300bf832b9fab6f883200abac41a33b0f7481d68393fcac8cf94d68bdb542c7a6
-MISC ChangeLog 7396 SHA256 cc34307f7c30ecb4b72ec89c774830bdf2324bee3a501d99a0af79ad2673c0b2 SHA512 adb1849613cc93ad3dc655e45d008e39e7625a663fd2ebb1215d7f6d3f24758619b92f74d43ae449b0001f441f5166ee2b8402c890760504a38675263b5af90a WHIRLPOOL 178fded0c11b0691296200a0052414d45ce51b9ca54bff3c6a7d526c473fd7bc762bd25b53951c96e9067aef3f5924a54bc492648d1f35e92dfa781fe0f389ad
+MISC ChangeLog 7554 SHA256 3060b43b195ed5ec88cc14031eed2b0d1b4c1973abc50e6fd99e006b711f36b9 SHA512 26a378168d4c1e150098d5d6ce40a1803a887cf26ad8261744275a818c482cc12c59293c7b95c5194ad2c74daba9fdc489834d30b23aa3ce490f412a604d09ee WHIRLPOOL 540fabffd9d8201984326ea95352524450f48ed38d3afc39781d3fd46611ea83ee5a204197f73fa8c545b1059945f2f7632016ff8f5793453e527fee9a1242df
 MISC metadata.xml 263 SHA256 65aa9b1d10c37c41fcc4d03760cde2debbcd2027700193303184a7ee93ff0609 SHA512 a2c7955346b240c428417f11deebba06f63f4973e5f18a539e1744bcdec7326bdb272621fb4c70bb7ea763d24b175ad71d79e88f6847de77eb215ad21ca2cc11 WHIRLPOOL c21bb668c36d7460619e998fdf18dea54cd71335259b14f1f733f847f1018be963e04440483d43a625ed354ab79a6c848024657944a85bd75b65bdec91fdbd9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9MKpAAoJELEHsLL7fEFWF9YP/0sRvQfTSW/S9UWUYv9JjqYz
-uXuwFAU5BOfZ6BqdyX57ljbcSBJtg00BO6z8AolO3I69r04VRS3gTzp0PcBDKMn+
-ZwbeBmocNtWnQdKtu0mfUQ46cXhp/R2GPM8/MnUkZU4s1FMVqpswXW8oFi30ZmP8
-YVYgmgkgaFcNBuFyLpk/if06YBq8N+gGkJTEfoqD3HwHFbpaUGqpGuPBWLqmGp6C
-q3S5EDYoV7XYcmyfJbPDYAMO0FFsWqHYzATUQ+i4NV92qrY2pGOE4llvoHDbCUUx
-yj8QNEt4jkesQF5iZNbFlCBQZPSqPOffTc+Qz8mzaiqoAQT0F9IbkxxOIBlr4hF2
-PiHIL8CXCASB93jFa292R02vUCFFG0MWpLlNx7U7jvHysjpLNaGMuR5WV43hEKO0
-Dtpuo5eFwPfKgqYqlS8/tUqRJ2/3Po2xa1lqQyKvKShdi0US9Y5Erw+x+eDlEthc
-8OrWQgcnJ77gQYMU+42WUwZlFhJMXcFHNM0NPyaZ/Rj58jDmwF7xsQG7lEaGnL+f
-++gvOImvP6EmtLEDuJUiCglFhcVZ3/pro4a2Z2zHIqMQJGE5aiJNpPPa8bnBz0MT
-VpKF7+cR0BM+t633TS8JV9WB+WcR3mZFaXBz35ldxfWiXdMtUljr9NmGbG3OALoh
-qZvBf5P4oaq6CNfTJgYL
-=WS8p
+iQIcBAEBCAAGBQJQ9ZNQAAoJELEHsLL7fEFWR2IP/iSTe7bNsCMHp8u2DlsQxXNl
+unnJ2bg4MzLpR5zGNeUW5u8Nt7CCZZcjTxFaun57fqr8mAzvbzMTK8fVlXfFjoRJ
+tsz/NnKDw8MnwJVU1m/8CFOOfXCc1teXNE0v4T9rI599BcqXbgrYZIkgjjUdUXCI
+liK6JsGJVtcBTmGBRMa3zNvhV+JzFr8azCpnIm9ynEhTmjwYKJCdi0boDs9qaY5z
+9KA7JfGx4Qjy4eN7oyJJY3loA5nzXYzFNO0uVPSd5IqPEK2lxFzgAawdu8dAcBcN
+HqsBko/kjgySRhTw0SLPZB2jgv0lkPmzstU3JxhhQhOgwu5V0yneyjPX+d46QKwQ
+Klxlcqxl5aG+mXlWcsXOPVV0jMs9Xwpn4BJxMxsImcPhLPXEVeNKRgXis+ama4Z4
+0kAHQAPSjQ/DlqylheY0VnP4LTad+UwWcyDNUd7B2vR4EI7LJcVRevWdjZhd2m96
+0PGg165A9e+LybrwXK0RJzoCO0avhjnN0A6rMHFRK7gbCM6pH/RJ5dZXKrlO4q5O
+XOHrjt8GlMFcWx9JuFGq2ce0mFC7idRmr3vTEmEWKKmnJ+oJ+T9HsLf9OIhB8q7a
+veuUPRD5sv1O8Q8gXy3mstDqrhmf9ggKi1dhPXSpxgMnYDh4NPPXYEQg5+9eH/rI
+CX5aKG+AHHiCPN2G7jWi
+=svaY
 -----END PGP SIGNATURE-----
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..75de13347ceb
--- /dev/null
+++ b/dev-lang/yasm/yasm-1.2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0-r1.ebuild,v 1.1 2013/01/15 17:31:52 vapier Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.7"
+inherit autotools eutils python
+
+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 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="nls python"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )
+	python? ( >=dev-python/cython-0.14 )"
+
+DOCS=( AUTHORS )
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	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() {
+	econf \
+		$(use_enable python) \
+		$(use_enable python python-bindings) \
+		$(use_enable nls)
+}