Add 0.2.0-r1 with calchan's fix for bug #501868 and USE_BLAS64=0. paxmark m executables during build for Gentoo hardened. Tweak for multilib-strict.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

3 files changed, 125 insertions, 2 deletions

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index c8bf204783e3..282f0e6367b2 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/julia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.4 2014/02/26 03:37:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.5 2014/02/26 09:22:53 gienah Exp $
+
+*julia-0.2.0-r1 (26 Feb 2014)
+
+  26 Feb 2014; Mark Wright <gienah@gentoo.org> +julia-0.2.0-r1.ebuild:
+  Add 0.2.0-r1 with calchan's fix for bug #501868 and USE_BLAS64=0. paxmark m
+  executables during build for Gentoo hardened. Tweak for multilib-strict.
 
   26 Feb 2014; Patrick Lauer <patrick@gentoo.org> julia-0.2.0.ebuild:
   Revert changes that break build #501868
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 8129d14022eb..8a2c73324d19 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST double-conversion-1.1.1.tar.gz 7012946 SHA256 e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d SHA512 e116196eb60077565050995b060049747a3c72e743eea21c6c9fb68414adc533d456d19e1ca241f08895cca97a38511477bdc7d2e0cae38d149c83cb9d6896ad WHIRLPOOL d69604fbb6e1b5cac8d4dd0f8cf0af4621e32548e9e5061dcb843067a3f821c6f52e918e3e367988076b9ccf0be0ab68107cc6a21b02f4de424a1d98b399fc33
 DIST dsfmt-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899 SHA512 e59d54166dc2df9f6e6abd68658c3624082feabe445215256fead47a8944c41578d11c2b4ba57eac174587a45e445b2aabd867db24fd9e951842513cf914f60b WHIRLPOOL 986b24d8c302f21e305a6bbc6b33e42678c27018c71c566d3f052ce7600fd06c81d77375d08b2b40c0c4aa93ca74cad819a34d0350e33a61f5837f27de7cf193
 DIST julia-0.2.0.tar.bz2 4393404 SHA256 fecde7b4fbd26093dedd04564ce12b47a232525bf036c7b5f392f369ddc9a514 SHA512 3e0718c69936959dc717cf511f8fd7086eedb2fd4996519fcdb54a0b0c38d09b5b1c7d239e9e42234aab869446feec88bfd40b5419ae74c9f15bf523a757e898 WHIRLPOOL 265650e99028260d1dfe76c504468eca23bad0881790893d8b4b6cd98b0b5a936dc064ee1b661a04c762e2d78d4d23243158f594afef27001c8b4a0de259afff
+EBUILD julia-0.2.0-r1.ebuild 3748 SHA256 9316ad6ea0566d3624bd07506fe1554e9b17a6585c9c1d13a7759bf13f90900f SHA512 cf70aa2a810b89752127dbe92648525a4c0e5e88882b94e2a823f5385804c6715ef626b816feda8807b1f2032e3649ca1010d7ac06b8e0a0145ca211047e6b16 WHIRLPOOL 937d5627b9789987bc6607d281469dc29e89e541c43d00264c41e4ce4a20226632c95510d019cabaa08f4e490fa9045124b7dfac1a9a6388bf0de9fd5e807156
 EBUILD julia-0.2.0.ebuild 2619 SHA256 ae2c1cb1a8709cea9dfbc6ae68efde94d7ff481d15429339e59156759e2a7268 SHA512 045b4adfaf28d41b25c721c25150355cf9a99603c747e2cfc3534f4407b6ffca7bb31f368a1c6a96ead55b262471bdba443b4d546e50eda81ef5ba5db9ed7f9a WHIRLPOOL 27e21e72c22c1dc8022f62b6f5a7209e949e6daf090cef02db55cf3bb2720170be40fe5b1adfb8d8c33e89fea5db808cb7793c3c8257b5a6cb1426b2c92bca01
-MISC ChangeLog 728 SHA256 81ba98d908cbc69bda9c7f6a1f1ef2f8d6afc506775ef7f9d9258a63809dec0f SHA512 9cc8be1931abc97fb037e6cdb73b0db5ae47f4979c6ea233ae0536418ac3b23cf78d67a060a1049d81056c430e1eae8855c2a01da5063d5e17fbe6d07d886cf5 WHIRLPOOL 12d4782d1eb90d27c9aa04aac8f05110437af8dd4b358048aa9db03a5073828637471faacb5f3a9364ac6219411bc1edd6765013cd79afe0c39536eeb179295c
+MISC ChangeLog 983 SHA256 986b9d1f72f08b2c12205dcacdcac7f70803cae09ff394883dc8921e4859705d SHA512 3e6421470c130bfbaff6f89f0e0c737c82752a9e1da4fefe87189c2aec0491729d983bdd2e3a1f916e1bdc511b863032f5d710cc8645f7e8463e9bf49ac255cf WHIRLPOOL 8f45b432a9a150c203c54c52cefb2e186b953b607358abf72f88c5182fd7cbea3a4857bba094892b1b56543b922b565056bf8aeff7617e7cd12b24885f9b1dc1
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlMNsnQACgkQoBEVQmGOlx9FmgEAwg0qCH4c+AynhDfGkkPdg0j7
+uvXr7RkCCSSLv3+ls2sBANWHBr6sUquJFyM8YCikf8w5REH/U0B1/aTuGiBM2ZGN
+=VCrQ
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/julia/julia-0.2.0-r1.ebuild b/dev-lang/julia/julia-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..f18220d804fe
--- /dev/null
+++ b/dev-lang/julia/julia-0.2.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.0-r1.ebuild,v 1.1 2014/02/26 09:22:53 gienah Exp $
+EAPI=5
+
+inherit eutils multilib pax-utils
+
+DESCRIPTION="High-level, high-performance dynamic programming language for technical computing"
+
+HOMEPAGE="http://julialang.org/"
+
+# uses gfortran in some places, dependencies don't reflect that yet
+
+# tarball remade because upstream lacks submodules, so it's not able to build
+# soo ... they bundle a split out part of v8 that has no build system that makes sense
+# double-conversion nailed in to make build system happy
+# dSFMT is not meant to be packaged
+SRC_URI="http://gentooexperimental.org/~patrick/${P}.tar.bz2
+	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.tar.gz -> dsfmt-2.2.tar.gz
+	http://double-conversion.googlecode.com/files/double-conversion-1.1.1.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+S="${WORKDIR}"
+
+# Avoid fragile duplication - see compile and install phases
+JULIAMAKEARGS="QUIET_MAKE= USE_SYSTEM_LLVM=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBM=1 \
+		USE_SYSTEM_GMP=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1  USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 \
+		LLVM_CONFIG=/usr/bin/llvm-config USE_BLAS64=0"
+
+# Forcing use of 64-bit integers. If you want 64-bit integers then you need to use a BLAS implementation from the
+# science overlay and julia-9999 also from the science overlay.
+
+# scons is a dep of double-conversion
+DEPEND="
+	=sys-devel/llvm-3.3*
+	dev-lang/perl
+	sys-libs/readline
+	dev-libs/libpcre
+	dev-util/scons
+	dev-libs/gmp
+	sys-libs/libunwind
+	dev-util/patchelf
+	sci-libs/fftw
+	sys-libs/zlib
+	dev-libs/mpfr
+	sci-libs/suitesparse
+	sci-libs/arpack
+	virtual/lapack
+	virtual/blas
+	"
+RDEPEND="sys-libs/readline"
+
+src_prepare() {
+	#uurgh, no fetching in ebuild
+	sed -i -e 's~$(JLDOWNLOAD)~/bin/true~' deps/Makefile || die "Oopsie"
+	sed -i -e 's~git submodule~/bin/true~g' deps/Makefile || die "Ooopsie"
+	# and we need to build stuff, so ... let's just copy around and pray!
+	mkdir -p deps/random
+	cp "${DISTDIR}/dsfmt-2.2.tar.gz" deps/random/
+	cp "${DISTDIR}/double-conversion-1.1.1.tar.gz" deps/
+	# Detect what BLAS and LAPACK implementations are being used
+	local BLAS_LIB="$($(tc-getPKG_CONFIG) --libs blas | sed 's/ .*$//')"
+	local LAPACK_LIB="$($(tc-getPKG_CONFIG) --libs lapack | sed 's/ .*$//')"
+	sed -e "s|-lblas|${BLAS_LIB}|" -i Make.inc || die
+	sed -e "s|libblas|${BLAS_LIB/-l/lib}.so|" -i Make.inc || die
+	sed -e "s|-llapack|${LAPACK_LIB}|" -i Make.inc || die
+	sed -e "s|liblapack|${LAPACK_LIB/-l/lib}.so|" -i Make.inc || die
+	sed -e "s|JL_PRIVATE_LIBDIR = lib/julia|JL_PRIVATE_LIBDIR = $(get_libdir)/julia|" \
+		-e "s|JL_LIBDIR = lib|JL_LIBDIR = $(get_libdir)|"  \
+		-e "s|/usr/lib|/usr/$(get_libdir)|" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		-i Make.inc || die
+	# Set version to package version instead of git commit number
+	sed -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" -i Make.inc || die
+	sed -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	mkdir -p usr/$(get_libdir) || die
+	pushd usr || die
+	ln -s $(get_libdir) lib || die
+	popd
+	emake $JULIAMAKEARGS julia-release || die
+	for i in usr/bin/julia-*
+	do
+		if file ${i} | grep ELF >/dev/null; then
+			pax-mark m ${i}
+		fi
+	done
+	emake $JULIAMAKEARGS || die
+	# makefile weirdness - avoid compile in src_install
+	emake $JULIAMAKEARGS debug || die
+}
+
+src_install() {
+	# config goes to /usr/etc/ - should be fixed
+	emake $JULIAMAKEARGS PREFIX="${D}/usr" install || die
+}