Version bump. Refactored ebuild to use more system dependencies, cleanup, add emacs support, readline-6.3 patch, better prefix support. Add sci as herd and longdescription.

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

6 files changed, 214 insertions, 7 deletions

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 3e14fd1944fc..8862d4c959e2 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2014/03/14 19:53:58 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.8 2014/04/02 23:03:34 bicatali Exp $
+
+*julia-0.2.1 (02 Apr 2014)
+
+  02 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +files/63julia-gentoo.el,
+  +files/julia-0.2.1-readline63.patch, +julia-0.2.1.ebuild, metadata.xml:
+  Version bump. Refactored ebuild to use more system dependencies, cleanup, add
+  emacs support, readline-6.3 patch, better prefix support. Add sci as herd and
+  longdescription.
 
   14 Mar 2014; Denis Dupeyron <calchan@gentoo.org> julia-0.2.0-r1.ebuild:
   Fixed confusing comment, bug #502482.
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index d311f08b4b20..6014863b7935 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,7 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 63julia-gentoo.el 94 SHA256 20445070d924ecc8adbd242c032bcb7ef080898f8bca5533356be459d8f151f8 SHA512 03bcee53dc4064e9bee51ffeffd5de78cb6ae6acdbfb145933ee687a31684ced2ca39cb8d6c4543c638c18b1da52accfcca8b05bde71847dddfdb8923ceef99c WHIRLPOOL 57fe5f96d8b45f343b0245cca9623415eddbb61961ba495336cb209d3d8184169e0e4c424954633fb8b0a330107b449b47bcce0949a3b186b79c3cf5e6187349
+AUX julia-0.2.1-readline63.patch 653 SHA256 42d48deaec290dcf377dd5af30abd587be094fdbf3bd36eac1a5c800676ec307 SHA512 56f3d4f3602e199998dd6ba4a0c21d6fcf3ad6f9111c86103fd9dbd5e16b91926df32275395c6f09e68f783ad5c58c299bcc9caa9ba2a8da6c1e77c574c49b0d WHIRLPOOL 37e67d377b5b7142506bebaeea2f91426b534fc0250972c19b37281e7ec8f9e9e96acf3fa82af44fa9a12f49fb106819b4697882a5e4dd1e0607fcab858f02dc
+DIST dSFMT-src-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899 SHA512 e59d54166dc2df9f6e6abd68658c3624082feabe445215256fead47a8944c41578d11c2b4ba57eac174587a45e445b2aabd867db24fd9e951842513cf914f60b WHIRLPOOL 986b24d8c302f21e305a6bbc6b33e42678c27018c71c566d3f052ce7600fd06c81d77375d08b2b40c0c4aa93ca74cad819a34d0350e33a61f5837f27de7cf193
 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
+DIST julia-0.2.1.tar.gz 1899534 SHA256 be07283635b1bd73085f0152d3433762c1aaf115faa0e663a94d63f09c34f1b0 SHA512 67f89d88b2fca355482b2c979d50b865c9a772883bcec3b5cb82d0e096e168153972ada517d078fca1c13352b118ce9f031da162432308025f4437340d5d6635 WHIRLPOOL 22c12397e7bd217b628c3ba4e99f5e252011af1106c12abb4f796bcae544972e2d548f4858b30c7c5dfb6ef935fbc4181e3d5dbe3cc8a4bcac922f0b52d75fb3
+DIST libuv-julia-0.2.1.tar.gz 652078 SHA256 60a98962ab7e10c924604ccd3373083e8c376a01fcac4bf568058b1f6b026f81 SHA512 73cc9903d1d9d8b8aa8c02543058f4c407aa6b125eb26506f55115cab212bcb7c1af0d215c2b9ca771f135d3913c1490a510294d658bf8d5a6dbee3dd397226f WHIRLPOOL 42b204b8cb071919b796ed745150b848fabe94668d7fb92a39505c86fefa98f52812ac2bec05821214c7e2c7120b06a47eb66e4a1a2a3acc209264244773faa3
 EBUILD julia-0.2.0-r1.ebuild 3766 SHA256 ed96cbc5f376221c80e48f24d49e1e0d5d9994684883883ad6eda4569cfc537c SHA512 a6b92526aba9398e64c902c4cf75302057280298833b3bf9f39a1e1117320665cd7b81d6422e04118fa797d7ba4843885e32cbdd9521eb2cd4b7cd9932cd110c WHIRLPOOL cdac069b446c5b89696b1782d765005b3f3c1d3f5c74cd9cba02672a9783fbc3e16431ec81e95ecf2805e4051cc79fffe18b28473d99122cc8cc89b2451a784b
 EBUILD julia-0.2.0.ebuild 2619 SHA256 ae2c1cb1a8709cea9dfbc6ae68efde94d7ff481d15429339e59156759e2a7268 SHA512 045b4adfaf28d41b25c721c25150355cf9a99603c747e2cfc3534f4407b6ffca7bb31f368a1c6a96ead55b262471bdba443b4d546e50eda81ef5ba5db9ed7f9a WHIRLPOOL 27e21e72c22c1dc8022f62b6f5a7209e949e6daf090cef02db55cf3bb2720170be40fe5b1adfb8d8c33e89fea5db808cb7793c3c8257b5a6cb1426b2c92bca01
-MISC ChangeLog 1231 SHA256 370014665cd990bd305e7344bedc62e263bf045cae834f78ca1ef81d17d678dc SHA512 b6c30cd1092f932e7ad9b8961f089c2e7c252033345d561035324830f6db16bd5e214757d7082993ff1816f3a5ddd45849d0f6e737da0d3abe130ec832f6d64d WHIRLPOOL 5ac717259a9b65422d972a3ff8aa8731f212fda59678ca97487b28001b1f91c123fa10738b22231aca0dfe6a9010d7a08ea5ae0a0a1e260eda5e052ed6110af4
-MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+EBUILD julia-0.2.1.ebuild 3852 SHA256 9746345da05d2cbb73b98f354ce5579f5f309ba5f5121f32b373ed033bf370ad SHA512 6dcf31988d6b46ae557b2365acad3dde8c6fbcde2f754f4953751cc8dc7079988321dc61bec2abbe584e00060ac5c4ec4e7572a8cde7d550825d74bd2a0b1a10 WHIRLPOOL 24f05dac2874726cc101784573160079da0ed9be62a57070157ce67c6fb7489cbc9879386cbdd9450711021ac8948f8d95ce70364b6dda012c7785d22121ef43
+MISC ChangeLog 1595 SHA256 ec723967ca6bc93b967449f5429a71716c2d132413b5857bd573d1dd69377b09 SHA512 bbc98a346349fa4210710ede32b208d48ffb935c12916fb3e946d9677a2fd03983b233856a2bc5010a784c616ae8882cd575e7e6058aebbc5bb55af222788d53 WHIRLPOOL 6876f8727ee3e2c42865c2312236eb2316ac1c43931a7b1a7cf92a110e988729bcc3952555741f1a36787c859945990a1da0493e18bc402a8715d7611b3ec63f
+MISC metadata.xml 966 SHA256 06b0900a193cc1f8970498e492d47c6405800cdfc38593fa1d459553694ba4ad SHA512 c631a08f34edbf4ec104f2d35ab2469227998b2afc19ae65047a2e93beec001b23c14ce7c91e91c1446c65722c94d60ea6c63924bdc5e9f5f73d44a629db07bd WHIRLPOOL 21044035a2912143121cb01ef8e2f2048d7b0a601b9b13703389fea44883691d6f3a37c8c312c7534fe908ab2bbf39576230104cfc31e6f99a7ac5eb4ace5bea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlM8l0cACgkQ1ycZbhPLE2B0YACdHCYr19LscywsB2yIg2Sx9DWU
+bQcAnjxUNUwYPMgPND7ifUdvku+cwoFw
+=tm46
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/julia/files/63julia-gentoo.el b/dev-lang/julia/files/63julia-gentoo.el
new file mode 100644
index 000000000000..6b60749020ca
--- /dev/null
+++ b/dev-lang/julia/files/63julia-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.jl$" . julia-mode))
diff --git a/dev-lang/julia/files/julia-0.2.1-readline63.patch b/dev-lang/julia/files/julia-0.2.1-readline63.patch
new file mode 100644
index 000000000000..cc9ede53f392
--- /dev/null
+++ b/dev-lang/julia/files/julia-0.2.1-readline63.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBFS against readline 6.3
+Origin: backport, https://github.com/JuliaLang/julia/commit/d2552e0f03d1dc23d6bb0c89c39da3d73c7aa4e5
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741824
+Last-Update: 2014-03-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/ui/repl-readline.c
++++ b/ui/repl-readline.c
+@@ -831,7 +831,7 @@ void jl_init_repl(int history)
+     rl_instream = fopen("/dev/null","r");
+     prompt_length = 7;  // == strlen("julia> ")
+     init_history();
+-    rl_startup_hook = (Function*)init_rl;
++    rl_startup_hook = (rl_hook_func_t*)init_rl;
+ }
+ 
+ static char *prompt_string=NULL;
diff --git a/dev-lang/julia/julia-0.2.1.ebuild b/dev-lang/julia/julia-0.2.1.ebuild
new file mode 100644
index 000000000000..17c0f96d6d84
--- /dev/null
+++ b/dev-lang/julia/julia-0.2.1.ebuild
@@ -0,0 +1,151 @@
+# 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.1.ebuild,v 1.1 2014/04/02 23:03:34 bicatali Exp $
+
+EAPI=5
+
+inherit elisp-common eutils multilib pax-utils toolchain-funcs
+
+PDSFMT=dSFMT-src-2.2
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="http://julialang.org/"
+SRC_URI="
+	https://github.com/JuliaLang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/${PDSFMT}.tar.gz
+	http://dev.gentoo.org/~bicatali/distfiles/libuv-${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+RDEPEND="${CDEPEND}
+	dev-lang/R:0=
+	dev-libs/double-conversion:0=
+	dev-libs/gmp:0=
+	dev-libs/libpcre:3=
+	dev-libs/mpfr:0=
+	sci-libs/arpack:0=
+	sci-libs/cholmod:0=
+	sci-libs/fftw:3.0=
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sci-mathematics/glpk:0=
+	>=sys-devel/llvm-3.3
+	>=sys-libs/libunwind-1.1:7=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	virtual/blas
+	virtual/lapack
+	emacs? ( app-emacs/ess )"
+
+DEPEND="${RDEPEND}
+	dev-util/patchelf
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-readline63.patch
+
+	ln -s "${DISTDIR}"/${PDSFMT}.tar.gz deps/random/dsfmt-2.2.tar.gz || die
+	rmdir deps/libuv && ln -s "${WORKDIR}"/libuv deps/libuv
+	# no fetching in ebuild
+	# /usr/include/suitesparse is for debian only
+	# respect prefix, flags
+	sed -i \
+		-e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
+		-e 's|git submodule|${EPREFIX}/bin/true|g' \
+		-e 's|^\(SUITESPARSE_INC\s*=\).*||g' \
+		-e "s|-O3|${CFLAGS}|g" \
+		-e 's|/usr/bin/||g' \
+		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		deps/Makefile || die
+
+	sed -i \
+		-e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
+		-e "s|-O3|${CFLAGS}|g" \
+		-e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
+		-e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
+		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|,lib)|,$(get_libdir))|g" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		Makefile || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+}
+
+src_configure() {
+	# libuv is an incompatible fork from upstream, so don't use system one
+	cat <<-EOF > Make.user
+		LIBBLAS=$($(tc-getPKG_CONFIG) --libs blas)
+		LIBBLASNAME=$($(tc-getPKG_CONFIG) --libs blas | sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
+		LIBLAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
+		LIBLAPACKNAME=$($(tc-getPKG_CONFIG) --libs lapack | sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
+		USE_LLVM_SHLIB=1
+		USE_SYSTEM_ARPACK=1
+		USE_SYSTEM_BLAS=1
+		USE_SYSTEM_FFTW=1
+		USE_SYSTEM_GMP=1
+		USE_SYSTEM_GRISU=1
+		USE_SYSTEM_LAPACK=1
+		USE_SYSTEM_LIBM=1
+		USE_SYSTEM_LIBUNWIND=1
+		USE_SYSTEM_LIBUV=0
+		USE_SYSTEM_LLVM=1
+		USE_SYSTEM_MPFR=1
+		USE_SYSTEM_OPENLIBM=1
+		USE_SYSTEM_PCRE=1
+		USE_SYSTEM_READLINE=1
+		USE_SYSTEM_RMATH=1
+		USE_SYSTEM_SUITESPARSE=1
+		USE_SYSTEM_ZLIB=1
+		VERBOSE=1
+	EOF
+}
+
+src_compile() {
+	emake cleanall
+	if [[ $(get_libdir) != lib ]]; then
+		mkdir -p usr/$(get_libdir) || die
+		ln -s $(get_libdir) usr/lib || die
+	fi
+	emake julia-release
+	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+	emake
+	use emacs && elisp-compile contrib/julia-mode.el
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake install PREFIX="${D}/usr"
+	cat > 99julia <<-EOF
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+	EOF
+	doenvd 99julia
+
+	if use emacs; then
+		elisp-install "${PN}" contrib/julia-mode.el
+		elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
+	fi
+	dodoc README.md
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 24cbb90cf0c4..77fd3240ae7d 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+<maintainer>
+  <email>patrick@gentoo.org</email>
+  <name>Patrick Lauer</name>
+</maintainer>
+<herd>sci</herd>
+<longdescription lang="en">
+  Julia is a high-level, high-performance dynamic programming language for
+  technical computing, with syntax that is familiar to users of other
+  technical computing environments. It provides a sophisticated
+  compiler, distributed parallel execution, numerical accuracy, and an
+  extensive mathematical function library. The library, mostly written
+  in Julia itself, also integrates mature, best-of-breed C and Fortran
+  libraries for linear algebra, random number generation, FFTs, and
+  string processing. Julia programs are organized around defining
+  functions, and overloading them for different combinations of
+  argument types (which can also be user-defined).
+</longdescription>
 </pkgmetadata>