dev-util/emscripten: version bump to 1.36.7 (#657)

Package manager: portage-2.2.28

8 files changed, 187 insertions, 0 deletions

diff --git a/dev-util/emscripten-fastcomp/Manifest b/dev-util/emscripten-fastcomp/Manifest
index 350ec0e80..0e80110ee 100644
--- a/dev-util/emscripten-fastcomp/Manifest
+++ b/dev-util/emscripten-fastcomp/Manifest
@@ -1,6 +1,8 @@
 DIST emscripten-fastcomp-1.34.11.tar.gz 20193336 SHA256 476b9b3bb6e88cf31c66a6618b1174a7b770b0c02703f8ddc37ba350c63f2f2e SHA512 53b2f91ea0c923f582300e6e73f1c9f9c830b74db165a1e01a660e0110da2229029d3283a9b38aa6a55658c492ce8e632e233ae0e3a154842fd41fcd68eebb47 WHIRLPOOL ebd3e6c833c65b0d365fd11bd668cc5d61656ae357d6ba62bd0f4eda772589241e4ad90351f343edda5659c2d957784c28f118bb502ea86e3f7549b87216cfd5
 DIST emscripten-fastcomp-1.35.2.tar.gz 21566912 SHA256 3bbc7990138381b0cbdac39f83afee76fa143efe81dba4939c1f514dccc307a3 SHA512 589844960a43f9ba70f1e073751bb9eea5b31f954fe798138e00a5ca0100472d6e0f32f08d4e04f2dc9f0c9bb422d36e7fcdb0a4981b876807d04ff4424c6b93 WHIRLPOOL a08adbed097ff2a8f2115ebcd768258a99266734432c1742c8499b53736546733b214ca0e5c00a51048d0f979cbf83017954ee52ca1348717343ceb5dbeeb818
 DIST emscripten-fastcomp-1.36.4.tar.gz 24187515 SHA256 77652f758271a61edc42631a00d1458042e5a3ec94f8544cc76a0df3532a9957 SHA512 2a6c0503f3a6a8defc8f0c60d45cf516d1f10cc8a61f6b50f4dada5565456944267d44654b657bab399bfdfe5f1f257d4fd807a0ec260e9fd4100c12beec3239 WHIRLPOOL d93c37d8ed91307db41a1e7245d547a4b8493a576999e27355dce69847988b999e502cceefe2ab1e1fcf0c15d7433d663c1b5b0bd6f0e81f6ecb56dc0e3b642e
+DIST emscripten-fastcomp-1.36.7.tar.gz 26566562 SHA256 e26d0b6c2fda9251dcac14b539aea1b82fda2ba72d466a32d60aa3b82f88fd06 SHA512 cfaba1f83c50e1ee1a2b9d0c53813a02d2e0f0ed112a80300241ac459233f744782c9e6d01c653d3df55ef76994580928f982d6917fc20f019e715f8e38d201d WHIRLPOOL 7085b61636cc636f115b5593d43ce4560d1a5c036cb905d85fe099d325f9bcb4e0f5ecb08ea8afab261ab9331b207ea1d0146e4bcc9b48563faade4b1f9d9c40
 DIST emscripten-fastcomp-clang-1.34.11.tar.gz 12055966 SHA256 4a453a90212eb8ae9ab90ea055f7072642aca4b5343ff9c33ff28d3f17759241 SHA512 2e69cc41d8ca1a632c36406a5ab42e316a09befbd5390f05ab9852b50fa38b22b719bf41e100e14c63d11d9a4848ac3f6cae4371dfb69f63a93cadbff178aca6 WHIRLPOOL 7f9bda2449bda31b030c1f582f7fde7390873fd5a2a1fb3904de883b990802c2b617e90b5d41dfae1936e7992e60f64dcd05e8647c7f05676c180c1832418ba4
 DIST emscripten-fastcomp-clang-1.35.2.tar.gz 12505548 SHA256 5f7090fe66b9462e172cb7a889d9044aa301ffc946072293dd2b269973f358ce SHA512 1dd57ebd4c87251b99a9dd03c7f0d34762e39717523c50338262d1d95e5a9fd826a8cc2e9a46f0389510bd372da59a8163b2995007e81e5a6a6bcdd66e993b4b WHIRLPOOL dca22b5d38eb517a2e39b69bc2d6c3b1e966f3e6b7d5a4c05fe9fa28e917cee0fbd6dcdda116e73e1cb1a54b747a9d7d74549cc48f37187c48cfd7ac025da973
 DIST emscripten-fastcomp-clang-1.36.4.tar.gz 13140527 SHA256 dac149b0053d6231873531489a2a29472ddc270064b1724719b02b3aa0f9c643 SHA512 061a53b44a44b6cee1ff33a88a3df490337824278b3fd8f1a2024ac0ce62ca54b05c4c7b80b2b2276c320fdabba826f30c87aef717fa038729022e8b137fa16d WHIRLPOOL f0976be8a739c039e4a1409b4e0fdcd24a0f3114d42516ff13112b338af02672780dda3cc4f8701f1d3a55742907f0a8c092428cab5336d54fd4fbd47f366c96
+DIST emscripten-fastcomp-clang-1.36.7.tar.gz 14348426 SHA256 5bb5ba117df2c4fcce9eabe05d7f6cda4c740fc585c366cd38f7841b9adc4335 SHA512 c94ee1da3a9fec454af2b99a6eb4216df2f0c35e3ed125982412497bdc29ec334b5fa140b7b0321be4c0d55ce47bf4084cbc897e88f407e159e51696fa5bac5f WHIRLPOOL 725c80909dafbda4f27dad9525188bfde0ddb447c2e113df2e10e4032b231aaf7299acc6f296657eea5ed51e1a3a1c4d1118dd4a525ab8db2e2725a51406487f
diff --git a/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.36.7.ebuild b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.36.7.ebuild
new file mode 100644
index 000000000..33146efc8
--- /dev/null
+++ b/dev-util/emscripten-fastcomp/emscripten-fastcomp-1.36.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Emscripten LLVM backend - Fastcomp is the default compiler core for Emscripten"
+HOMEPAGE="http://emscripten.org/"
+SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/kripken/${PN}-clang/archive/${PV}.tar.gz -> ${PN}-clang-${PV}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="UoI-NCSA"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+MY_DEPEND="${PYTHON_DEPS}
+	>=net-libs/nodejs-0.12.6"
+DEPEND="${MY_DEPEND}
+	>=dev-util/cmake-3.4.3"
+RDEPEND="${MY_DEPEND}
+	>=virtual/jre-1.5"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PV}/CMakeLists.txt.patch"
+	cd "${S}/../${PN}-clang-${PV}" || \
+		die "Could not change to directory '${S}/../${PN}-clang-${PV}'"
+	eapply "${FILESDIR}/${PV}/Version.cpp.patch"
+	cd "${S}" || die "Could not change to directory '${S}'"
+	eapply_user
+}
+
+src_configure() {
+	# create symlink to tools/clang
+	ln -s "${WORKDIR}/${PN}-clang-${PV}/" "${WORKDIR}/${P}/tools/clang" \
+		|| die "Could not create symlink to tools/clang"
+	local mycmakeargs=(
+		# avoid clashes with sys-devel/llvm
+		-DCMAKE_INSTALL_PREFIX="/usr/share/${P}"
+		-DLLVM_TARGETS_TO_BUILD="X86;JSBackend"
+		-DLLVM_INCLUDE_EXAMPLES=OFF
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DCLANG_INCLUDE_EXAMPLES=OFF
+		-DCLANG_INCLUDE_TESTS=OFF
+		-DCLANG_INCLUDE_DOCS=OFF
+		-DLLVM_INCLUDE_DOCS=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/emscripten-fastcomp/files/1.36.7/CMakeLists.txt.patch b/dev-util/emscripten-fastcomp/files/1.36.7/CMakeLists.txt.patch
new file mode 100644
index 000000000..d053132a3
--- /dev/null
+++ b/dev-util/emscripten-fastcomp/files/1.36.7/CMakeLists.txt.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt.orig       2016-05-12 13:26:02.739443914 +0200
++++ b/CMakeLists.txt    2016-05-12 13:26:26.448733236 +0200
+@@ -175,7 +175,7 @@
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+
+ if (CMAKE_BUILD_TYPE AND
+-    NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
++    NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|GENTOO)$")
+   message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+ endif()
diff --git a/dev-util/emscripten-fastcomp/files/1.36.7/Version.cpp.patch b/dev-util/emscripten-fastcomp/files/1.36.7/Version.cpp.patch
new file mode 100644
index 000000000..291a1ea6d
--- /dev/null
+++ b/dev-util/emscripten-fastcomp/files/1.36.7/Version.cpp.patch
@@ -0,0 +1,14 @@
+--- a/lib/Basic/Version.cpp       2016-03-17 23:31:35.160129074 +0100
++++ b/lib/Basic/Version.cpp       2016-03-17 23:32:07.722127712 +0100
+@@ -135,9 +135,9 @@
+
+   // XXX EMSCRIPTEN: show our versions
+   OS <<  " (emscripten "
+-#include "../../../../emscripten-version.txt"
++#include "../../emscripten-version.txt"
+          " : "
+-#include "../../../../tools/clang/emscripten-version.txt"
++#include "../../emscripten-version.txt"
+          ")";
+
+   return OS.str();
diff --git a/dev-util/emscripten/Manifest b/dev-util/emscripten/Manifest
index bd7e7b664..2e06b1493 100644
--- a/dev-util/emscripten/Manifest
+++ b/dev-util/emscripten/Manifest
@@ -1,3 +1,4 @@
 DIST emscripten-1.34.11.tar.gz 31637704 SHA256 4b2790279372ea016dbe64eda95cfde3f2a695e369c5f7cd9a62e2f69991ceb7 SHA512 8ecd3972b6ea3ccf27a8ab2532716910cf1d0425e3708a3a4b9808182c2662591b6389cbf27bc98a2b96ecb8948fc1e0bc3204cb3c88bb349f29c0ba55758088 WHIRLPOOL 266782cdbc44c3ccb036ea8f02dafc2d7fe3f5d1ea1aa5fe8d2deff30c73b08a95dd1d22251df9d4f666277ea73da5bc88ade3b5ce1531b7158b112be05e3b2e
 DIST emscripten-1.35.2.tar.gz 31758712 SHA256 56feaa3037ec72e2d5299b0a92d7e3b9e1da164db32338c1fe02fe3ca68d8adb SHA512 a7391424a8a0845062360c0ccecda30030e32cb6732009b83a781baef0f7cfd6890fe1ad95531380221b728d707cb315157f2717597e1ca74aedc5e8a73e64e6 WHIRLPOOL 092f8d98d2571b18422a2fde48802520b74739be9ad9402ff317176a3260f72695cee5e84eef9644e9659bc503c9d8b75b5a510f67a71f4b78545fc5c45db4b3
 DIST emscripten-1.36.4.tar.gz 31955402 SHA256 bb4b224467829bc14e26ec7f5603e36312e2edb8a4a33267dde67c6f0e33e260 SHA512 3e68b557ac941f63fcb8dd01bf87d0f656fa3f7494172175de2a66352b1161e080a0c8c952930e1a65e56fb40797e2b5efa9008f7374db07373cda67530dd96b WHIRLPOOL 2d7c1a710b0782844b3e4593e43b02c4ad81449423289efaa4179b08661f6a97828d6aa3f03cdeb7d5a4f7739199306cb24c2a56056c8474ccee53fa6a43deba
+DIST emscripten-1.36.7.tar.gz 31986467 SHA256 62848a2d1b0618c63f2c1d7295803204a7a07637c3a91623e3b1f1ebe459abe4 SHA512 8381f1531b6439a3ede86d98a1488f6b4d05734d637a45ea04285e7c2551ce59cf625f5867e7faf611aa71af3194eb34bd702528ea2655c70d39272c311e9e48 WHIRLPOOL 67ac47b2365bf072f89919d225ecdcd3d3d5c11df5b9dbe76576a7e548c75c1c44f5ae8e0c8da00b21a17561e274d7dfd599ea2b458945056b5ea8a831b41137
diff --git a/dev-util/emscripten/emscripten-1.36.7.ebuild b/dev-util/emscripten/emscripten-1.36.7.ebuild
new file mode 100644
index 000000000..e3734db1b
--- /dev/null
+++ b/dev-util/emscripten/emscripten-1.36.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="LLVM-to-JavaScript Compiler"
+HOMEPAGE="http://emscripten.org/"
+SRC_URI="https://github.com/kripken/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="UoI-NCSA"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	~dev-util/emscripten-fastcomp-${PV}
+	>=net-libs/nodejs-0.12.6"
+RDEPEND="${DEPEND}"
+
+DEST="/usr/share/"
+TEST="${WORKDIR}/test/"
+
+prepare_file() {
+	cp "${FILESDIR}/${1}" "${S}/" || die "could not copy '${1}'"
+	sed -i "s/\${PV}/${PV}/g" "${S}/${1}" || \
+		die "could not adjust path for '${1}'"
+}
+
+src_prepare() {
+	prepare_file "99emscripten"
+	prepare_file "emscripten.config"
+	eapply "${FILESDIR}/${PV}/emcc.patch"
+	eapply "${FILESDIR}/${PV}/emcmake.patch"
+	eapply_user
+}
+
+src_test() {
+	mkdir "${TEST}" || die "Could not create test directory!"
+	cp "${FILESDIR}/hello_world.cpp" "${TEST}" || die "Could not copy example file"
+	cp "${S}/emscripten.config" "${TEST}" || die "Could not copy config file"
+	sed -i -e "/^EMSCRIPTEN_ROOT/s|/usr/share/|${S}|" \
+		"${TEST}/emscripten.config" || die "Could not adjust path for testing"
+	export EM_CONFIG="${TEST}/emscripten.config" || die "Could not export variable"
+	../"${P}/emcc" "${TEST}/hello_world.cpp" -o "${TEST}/hello_world.js" || \
+		die "Error during executing emcc!"
+	test -f "${TEST}/hello_world.js" || die "Could not find '${TEST}/hello_world.js'"
+	OUT=$(/usr/bin/node "${TEST}/hello_world.js") || \
+		die "Could not execute /usr/bin/node"
+	EXP=$(echo -e -n 'Hello World!\n') || die "Could not create expected string"
+	if [ "${OUT}" != "${EXP}" ]; then
+		die "Expected '${EXP}' but got '${OUT}'!"
+	fi
+	rm -r "${TEST}" || die "Could not clean-up '${TEST}'"
+}
+
+src_install() {
+	dodir ${DEST}/${P}
+	cp -R "${S}/" "${D}/${DEST}" || die "Could not install files"
+	dosym ../share/${P}/emcc /usr/bin/emcc
+	dosym ../share/${P}/emcmake /usr/bin/emcmake
+	doenvd 99emscripten
+	ewarn "If you consider using emscripten in an active shell,"\
+		"please execute 'source /etc/profile'"
+}
+
+pkg_postinst() {
+	elog "Running emscripten initialization, may take a few seconds..."
+	export EM_CONFIG="${DEST}/${P}/emscripten.config" || die "Could not export variable"
+	/usr/bin/emcc -v || die "Could not run emcc initialization"
+}
diff --git a/dev-util/emscripten/files/1.36.7/emcc.patch b/dev-util/emscripten/files/1.36.7/emcc.patch
new file mode 100644
index 000000000..49bf9fd0b
--- /dev/null
+++ b/dev-util/emscripten/files/1.36.7/emcc.patch
@@ -0,0 +1,16 @@
+--- a/emcc.orig	2016-05-13 02:59:24.977645718 +0200
++++ b/emcc	2016-05-13 03:00:22.778643301 +0200
+@@ -4,6 +4,7 @@
+ 
+ 
+ import sys
++import os
+ 
+ 
+ 
+@@ -14,4 +15,4 @@
+ else:
+   import os, subprocess
+   if __name__ == '__main__':
+-    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcc.py')] + sys.argv[1:]))
++    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcc.py')] + sys.argv[1:]))
diff --git a/dev-util/emscripten/files/1.36.7/emcmake.patch b/dev-util/emscripten/files/1.36.7/emcmake.patch
new file mode 100644
index 000000000..02ce70321
--- /dev/null
+++ b/dev-util/emscripten/files/1.36.7/emcmake.patch
@@ -0,0 +1,16 @@
+--- a/emcmake.orig	2016-05-13 02:59:31.244645456 +0200
++++ b/emcmake	2016-05-13 03:03:54.995634425 +0200
+@@ -4,6 +4,7 @@
+ 
+ 
+ import sys
++import os
+ 
+ 
+ 
+@@ -14,4 +15,4 @@
+ else:
+   import os, subprocess
+   if __name__ == '__main__':
+-    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(__file__), 'emcmake.py')] + sys.argv[1:]))
++    sys.exit(subprocess.call(['python2', os.path.join(os.path.dirname(os.environ['EM_CONFIG']), 'emcmake.py')] + sys.argv[1:]))