[gentoo-commits] proj/sci:master commit in: dev-lang/julia/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2012-12-19  7:26 Guillaume Horel
  0 siblings, 0 replies; 20+ messages in thread
From: Guillaume Horel @ 2012-12-19  7:26 UTC (permalink / raw
  To: gentoo-commits

commit:     e6cf966ce6188365a0032e9ab74ef16c5f66f10a
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Dec 19 07:25:47 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Dec 19 07:25:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e6cf966c

dev-lang/julia new ebuild

---
 dev-lang/julia/ChangeLog         |   11 ++++
 dev-lang/julia/julia-9999.ebuild |   99 ++++++++++++++++++++++++++++++++++++++
 dev-lang/julia/metadata.xml      |   23 +++++++++
 3 files changed, 133 insertions(+), 0 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
new file mode 100644
index 0000000..e7069c8
--- /dev/null
+++ b/dev-lang/julia/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for dev-lang/julia
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*julia-9999 (19 Dec 2012)
+
+  19 Dec 2012; Guillaume Horel <guillaume.horel@gmail.com> +julia-9999.ebuild,
+  +metadata.xml:
+  Initial import. Ebuild written with help from Nicolas Bigaouette and 
+  Sébastien Fabbro.
+

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
new file mode 100644
index 0000000..9d503b4
--- /dev/null
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
+
+inherit git-2 elisp-common eutils multilib
+
+DESCRIPTION="High-performance dynamic language for technical computing"
+HOMEPAGE="http://julialang.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc emacs notebook"
+
+RDEPEND=">=sys-devel/llvm-3.0
+	sys-libs/readline
+	emacs? ( !app-emacs/ess )
+	>=sci-libs/suitesparse-4.0
+	sci-libs/arpack
+	sci-libs/fftw
+	dev-libs/gmp
+	sys-libs/libunwind
+	dev-libs/libpcre
+	sci-mathematics/glpk
+	sys-libs/zlib
+	virtual/blas
+	virtual/lapack
+	notebook? ( www-servers/lighttpd )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Folder /usr/include/suitesparse does not exists, everything should be in /usr/include
+	sed -e "s|SUITESPARSE_INC = -I /usr/include/suitesparse|SUITESPARSE_INC = |g" \
+	-i deps/Makefile
+
+	blasname=$($(tc-getPKG_CONFIG) --libs blas | \
+		sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
+	lapackname=$($(tc-getPKG_CONFIG) --libs lapack | \
+		sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
+
+	sed -i \
+			-e 's|\(USE_SYSTEM_.*\)=.*|\1=1|g' \
+			-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+			-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+			-e "s|liblapack|${lapackname}|" \
+			-e "s|libblas|${blasname}|" Make.inc || die
+
+	# do not set the RPATH	
+	sed -e "/RPATH = /d" -e "/RPATH_ORIGIN = /d" -i Make.inc
+}
+
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+	if use notebook; then
+		emake -C ui/webserver
+		sed -e "s|etc|/share/julia/etc|" \
+		-i usr/bin/launch-julia-webserver ||die
+	fi
+	use emacs && elisp-compile contrib/julia-mode.el
+}
+
+src_install() {
+	emake -j1 install PREFIX="${D}/usr"
+	cat > 99julia <<-EOF
+		LDPATH=/usr/$(get_libdir)/julia
+	EOF
+	doenvd 99julia
+	if use notebook; then
+		cp -R ui/website "${D}/usr/share/julia"
+		insinto /usr/share/julia/etc
+		doins deps/lighttpd.conf
+	fi
+	if use emacs; then
+		elisp-install "${PN}" contrib/julia-mode.el
+		elisp-site-file-install "${FILESDIR}"/63-julia-gentoo.el
+	fi
+	use doc && dodoc -r doc/_build/html
+	dodoc README.md
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+src_test() {
+	emake -C test || die "Running tests failed"
+}

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
new file mode 100644
index 0000000..03a8600
--- /dev/null
+++ b/dev-lang/julia/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>guillaume.horel@gmail.com</email>
+		<name>Guillaume Horel</name>
+	</maintainer>
+	<longdescription>
+	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. More
+	libraries continue to be added over time. Julia programs are organized
+	around defining functions, and overloading them for different combinations
+	of argument types (which can also be user-defined).
+	</longdescription>
+<use>
+  <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/lighttpd</pkg></flag>
+</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2013-01-06 15:53 Guillaume Horel
  0 siblings, 0 replies; 20+ messages in thread
From: Guillaume Horel @ 2013-01-06 15:53 UTC (permalink / raw
  To: gentoo-commits

commit:     65679945a606fba5ea81fd924760f96c478e4844
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Jan  6 15:52:10 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Jan  6 15:52:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=65679945

dev-lang/julia update dependencies

---
 dev-lang/julia/julia-9999.ebuild |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 9d503b4..bde9d48 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,13 +8,13 @@ EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
 
 inherit git-2 elisp-common eutils multilib
 
-DESCRIPTION="High-performance dynamic language for technical computing"
+DESCRIPTION="The Julia Language: a fresh approach to technical computing"
 HOMEPAGE="http://julialang.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs notebook"
 
 RDEPEND=">=sys-devel/llvm-3.0
@@ -24,7 +24,7 @@ RDEPEND=">=sys-devel/llvm-3.0
 	sci-libs/arpack
 	sci-libs/fftw
 	dev-libs/gmp
-	sys-libs/libunwind
+	>=sys-libs/libunwind-0.11
 	dev-libs/libpcre
 	sci-mathematics/glpk
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2013-01-06 15:56 Guillaume Horel
  0 siblings, 0 replies; 20+ messages in thread
From: Guillaume Horel @ 2013-01-06 15:56 UTC (permalink / raw
  To: gentoo-commits

commit:     8964c9dfcd4ca70c1e382e60cd461c345ad9892a
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Sun Jan  6 15:56:16 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Jan  6 15:56:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8964c9df

dev-lang/julia fix version in previous update

---
 dev-lang/julia/julia-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index bde9d48..53b026c 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=sys-devel/llvm-3.0
 	sci-libs/arpack
 	sci-libs/fftw
 	dev-libs/gmp
-	>=sys-libs/libunwind-0.11
+	>=sys-libs/libunwind-1.1
 	dev-libs/libpcre
 	sci-mathematics/glpk
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2013-01-07  2:49 Guillaume Horel
  0 siblings, 0 replies; 20+ messages in thread
From: Guillaume Horel @ 2013-01-07  2:49 UTC (permalink / raw
  To: gentoo-commits

commit:     49ef0d051777c72d3ee990f60b7bce0ab7b11e5b
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Mon Jan  7 02:49:16 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon Jan  7 02:49:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=49ef0d05

dev-lang/julia fix emacs filename

---
 dev-lang/julia/julia-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 53b026c..c6f774e 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -80,7 +80,7 @@ src_install() {
 	fi
 	if use emacs; then
 		elisp-install "${PN}" contrib/julia-mode.el
-		elisp-site-file-install "${FILESDIR}"/63-julia-gentoo.el
+		elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
 	fi
 	use doc && dodoc -r doc/_build/html
 	dodoc README.md


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2013-05-15  9:11 Kacper Kowalik
  0 siblings, 0 replies; 20+ messages in thread
From: Kacper Kowalik @ 2013-05-15  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     89c62b63e661a1fbd01b8ad89153e312946e1226
Author:     Kacper Kowalik (Xarthisius) <xarthisius <AT> gentoo <DOT> org>
AuthorDate: Wed May 15 09:11:56 2013 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Wed May 15 09:11:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=89c62b63

[dev-lang/julia] Drop python herd from metadata

---
 dev-lang/julia/metadata.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index afa3d53..05dd57b 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+	<herd>sci</herd>
 	<longdescription>
 	Julia is a high-level, high-performance dynamic programming language for
 	technical computing, with syntax that is familiar to users of other


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
  2013-06-14 11:21 [gentoo-commits] proj/sci:fixing " Justin Lecher
@ 2013-06-14 11:21 ` Justin Lecher
  0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2013-06-14 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a7dec4afa8f913586ead3c63c398538ac3d8b739
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 11:07:17 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 11:07:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a7dec4af

dev-lang/julia: Drop KEYWORDS of live ebuilds

Package-Manager: portage-2.2.0_alpha179

---
 dev-lang/julia/ChangeLog         | 5 ++++-
 dev-lang/julia/julia-9999.ebuild | 2 +-
 dev-lang/julia/metadata.xml      | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 71d4b42..4bc1c8e 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-lang/julia
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2013; Justin Lecher <jlec@gentoo.org> julia-9999.ebuild, metadata.xml:
+  Drop KEYWORDS of live ebuilds
+
   19 Dec 2012; Guillaume Horel <guillaume.horel@gmail.com>
   +files/63julia-gentoo.el:
   Add emacs julia mode file

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index c066870..9cbbb8b 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -14,7 +14,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="doc emacs"
 
 RDEPEND=">=sys-devel/llvm-3.0

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 05dd57b..a073a33 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription>
+  <herd>sci</herd>
+  <longdescription>
 	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,


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2013-07-03  3:19 Guillaume Horel
  0 siblings, 0 replies; 20+ messages in thread
From: Guillaume Horel @ 2013-07-03  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f4608f0bfa70eb0e930c0603fa997c097e2dbec2
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Jul  3 03:17:47 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Jul  3 03:17:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f4608f0b

dev-lang/julia update ebuild so that it builds

---
 dev-lang/julia/julia-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 9cbbb8b..99aa27a 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -27,6 +27,7 @@ RDEPEND=">=sys-devel/llvm-3.0
 	>=dev-libs/double-conversion-1.1.1
 	>=sys-libs/libunwind-1.1
 	dev-libs/libpcre
+	sci-libs/openlibm
 	sci-mathematics/glpk
 	sys-libs/zlib
 	virtual/blas
@@ -36,7 +37,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}/julia-nopatchelf.patch"
+	#epatch "${FILESDIR}/julia-nopatchelf.patch"
 	# Folder /usr/include/suitesparse does not exists, everything should be in /usr/include
 	sed -e "s|SUITESPARSE_INC = -I /usr/include/suitesparse|SUITESPARSE_INC = |g" \
 	-i deps/Makefile
@@ -48,6 +49,8 @@ src_prepare() {
 
 	sed -i \
 			-e 's|\(USE_SYSTEM_.*\)=.*|\1=1|g' \
+			-e 's|\(USE_SYSTEM_LIBUV\)=.*|\1=0|g' \
+			-e 's|\(USE_SYSTEM_LIBM\)=.*|\1=0|g' \
 			-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
 			-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
 			-e "s|liblapack|${lapackname}|" \


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2013-07-15 13:57 Sebastien Fabbro
  0 siblings, 0 replies; 20+ messages in thread
From: Sebastien Fabbro @ 2013-07-15 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     f0e3fc0d944d7ebce0d88bec12fcdaf2edd1b811
Author:     James Cloos <cloos <AT> jhcloos <DOT> com>
AuthorDate: Sun Jul 14 18:05:23 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 18:05:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f0e3fc0d

dev-lang/julia: Use git-2.eclass’ submodule support.

Using the eclass’ submodule support permits it to store the submodule
repositories in egit-src.  Otherwise, julia’s make has to re-clone each
of the sub-repos from scratch every emerge.

Signed-off-by: James Cloos <cloos <AT> jhcloos.com>

---
 dev-lang/julia/ChangeLog         | 3 +++
 dev-lang/julia/julia-9999.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 4bc1c8e..be886b3 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jul 2013; James Cloos <cloos@jhcloos.com> julia-9999.ebuild:
+  Julia uses submodules, so set EGIT_HAS_SUBMODULES=yes
+  
   14 Jun 2013; Justin Lecher <jlec@gentoo.org> julia-9999.ebuild, metadata.xml:
   Drop KEYWORDS of live ebuilds
 

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 99aa27a..23d97d8 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
+EGIT_HAS_SUBMODULES=yes
 
 inherit git-2 elisp-common eutils multilib
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2013-07-17 17:59 Sebastien Fabbro
  0 siblings, 0 replies; 20+ messages in thread
From: Sebastien Fabbro @ 2013-07-17 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     cf87a8f5940a064d968a411bc54102c98ee9ab27
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 17:58:57 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 17:58:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cf87a8f5

dev-lang/julia: Small fixes and cleanup, use system patchelf

Package-Manager: portage-2.2.01.22124-prefix

---
 dev-lang/julia/ChangeLog         |  5 ++-
 dev-lang/julia/julia-9999.ebuild | 78 ++++++++++++++++++++++------------------
 dev-lang/julia/metadata.xml      | 26 +++++++-------
 3 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index be886b3..623d31a 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> julia-9999.ebuild,
+  metadata.xml:
+  dev-lang/julia: Small fixes and cleanup, use system patchelf
+
   14 Jul 2013; James Cloos <cloos@jhcloos.com> julia-9999.ebuild:
   Julia uses submodules, so set EGIT_HAS_SUBMODULES=yes
   
@@ -18,4 +22,3 @@
   +metadata.xml:
   Initial import. Ebuild written with help from Nicolas Bigaouette and 
   Sébastien Fabbro.
-

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 23d97d8..ca85ef1 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -9,68 +9,82 @@ EGIT_HAS_SUBMODULES=yes
 
 inherit git-2 elisp-common eutils multilib
 
-DESCRIPTION="The Julia Language: a fresh approach to technical computing"
+DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="http://julialang.org/"
 SRC_URI=""
 
-LICENSE="GPL-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc emacs"
 
-RDEPEND=">=sys-devel/llvm-3.0
-	sys-libs/readline
-	emacs? ( !app-emacs/ess )
-	>=sci-libs/suitesparse-4.0
-	sci-libs/arpack
-	sci-libs/fftw
+RDEPEND="
+	dev-libs/double-conversion
 	dev-libs/gmp
-	>=dev-libs/double-conversion-1.1.1
-	>=sys-libs/libunwind-1.1
 	dev-libs/libpcre
+	dev-util/patchelf
+	sci-libs/arpack
+	sci-libs/fftw
 	sci-libs/openlibm
+	>=sci-libs/suitesparse-4.0
 	sci-mathematics/glpk
+	>=sys-devel/llvm-3.0
+	>=sys-libs/libunwind-1.1
+	sys-libs/readline
 	sys-libs/zlib
 	virtual/blas
-	virtual/lapack"
+	virtual/lapack
+	emacs? ( !app-emacs/ess )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	#epatch "${FILESDIR}/julia-nopatchelf.patch"
-	# Folder /usr/include/suitesparse does not exists, everything should be in /usr/include
-	sed -e "s|SUITESPARSE_INC = -I /usr/include/suitesparse|SUITESPARSE_INC = |g" \
-	-i deps/Makefile
-
-	blasname=$($(tc-getPKG_CONFIG) --libs blas | \
+	# /usr/include/suitesparse is for debian only
+	# respect prefix, flags
+	sed -i \
+		-e 's|^\(SUITESPARSE_INC\s*=\).*||g' \
+		-e 's|/usr/bin/||g' \
+		-e "s|/usr/include|${EROOT%/}/usr/include|g" \
+		-e "s|-O3|${CFLAGS}|g" \
+		deps/Makefile || die
+
+	# mangle Make.inc for system libraries
+	# do not set the RPATH
+	local blasname=$($(tc-getPKG_CONFIG) --libs blas | \
 		sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
-	lapackname=$($(tc-getPKG_CONFIG) --libs lapack | \
+	local lapackname=$($(tc-getPKG_CONFIG) --libs lapack | \
 		sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
 
 	sed -i \
-			-e 's|\(USE_SYSTEM_.*\)=.*|\1=1|g' \
-			-e 's|\(USE_SYSTEM_LIBUV\)=.*|\1=0|g' \
-			-e 's|\(USE_SYSTEM_LIBM\)=.*|\1=0|g' \
-			-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-			-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-			-e "s|liblapack|${lapackname}|" \
-			-e "s|libblas|${blasname}|" Make.inc || die
-
-	# do not set the RPATH	
-	sed -e "/RPATH = /d" -e "/RPATH_ORIGIN = /d" -i Make.inc
+		-e 's|\(USE_QUIET\s*\)=.*|\1=0|g' \
+		-e 's|\(USE_SYSTEM_.*\)=.*|\1=1|g' \
+		-e 's|\(USE_SYSTEM_LIBUV\)=.*|\1=0|g' \
+		-e 's|\(USE_SYSTEM_LIBM\)=.*|\1=0|g' \
+		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+		-e "s|liblapack|${lapackname}|" \
+		-e "s|libblas|${blasname}|" \
+		-e 's|\(JULIA_EXECUTABLE = \)\($(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=$(BUILD)/lib \2|' \
+		-e "s|-O3|${CFLAGS}|g" \
+		Make.inc || die
 }
 
 src_compile() {
+	emake cleanall
 	emake
 	use doc && emake -C doc html
 	use emacs && elisp-compile contrib/julia-mode.el
 }
 
+src_test() {
+	emake test
+}
+
 src_install() {
 	emake install PREFIX="${D}/usr"
 	cat > 99julia <<-EOF
-		LDPATH=/usr/$(get_libdir)/julia
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF
 	doenvd 99julia
 
@@ -78,7 +92,7 @@ src_install() {
 		elisp-install "${PN}" contrib/julia-mode.el
 		elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
 	fi
-	use doc && dohtml -r doc/_build/html/
+	use doc && dohtml -r doc/_build/html/*
 	dodoc README.md
 }
 
@@ -89,7 +103,3 @@ pkg_postinst() {
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
-
-src_test() {
-	emake -C test || die "Running tests failed"
-}

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index a073a33..523edd5 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription>
-	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. More
-	libraries continue to be added over time. Julia programs are organized
-	around defining functions, and overloading them for different combinations
-	of argument types (which can also be user-defined).
-	</longdescription>
+<herd>sci</herd>
+<longdescription>
+  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. More
+  libraries continue to be added over time. Julia programs are organized
+  around defining functions, and overloading them for different combinations
+  of argument types (which can also be user-defined).
+</longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-01-06 19:27 Justin Lecher
  0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2014-01-06 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     5ca223e0bb43b638243928b7a30d51df5b147f60
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 19:11:27 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 19:11:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5ca223e0

dev-lang/julia: Switch from git-2 to git-r3

Package-Manager: portage-2.2.8

---
 dev-lang/julia/ChangeLog         | 5 ++++-
 dev-lang/julia/julia-9999.ebuild | 9 +++------
 dev-lang/julia/metadata.xml      | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 623d31a..839011b 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-lang/julia
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> julia-9999.ebuild, metadata.xml:
+  Switch from git-2 to git-r3
+
   17 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> julia-9999.ebuild,
   metadata.xml:
   dev-lang/julia: Small fixes and cleanup, use system patchelf

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index ca85ef1..b210668 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
-EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
-EGIT_HAS_SUBMODULES=yes
-
-inherit git-2 elisp-common eutils multilib
+inherit git-r3 elisp-common eutils multilib
 
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="http://julialang.org/"
 SRC_URI=""
+EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
 
 LICENSE="MIT"
 SLOT="0"
@@ -35,7 +33,6 @@ RDEPEND="
 	virtual/blas
 	virtual/lapack
 	emacs? ( !app-emacs/ess )"
-
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 523edd5..1cc4211 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription>
+  <herd>sci</herd>
+  <longdescription>
   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,


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-01-18  4:35 Mark Wright
  0 siblings, 0 replies; 20+ messages in thread
From: Mark Wright @ 2014-01-18  4:35 UTC (permalink / raw
  To: gentoo-commits

commit:     407081b9327fe2df7191533f6e4503718c8cd23d
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 04:33:13 2014 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 04:33:13 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=407081b9

paxmark julia-readline and julia-basic for gentoo hardened

---
 dev-lang/julia/julia-9999.ebuild | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index b210668..9684183 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit git-r3 elisp-common eutils multilib
+inherit git-r3 elisp-common eutils multilib pax-utils
 
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="http://julialang.org/"
@@ -62,13 +62,27 @@ src_prepare() {
 		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
 		-e "s|liblapack|${lapackname}|" \
 		-e "s|libblas|${blasname}|" \
-		-e 's|\(JULIA_EXECUTABLE = \)\($(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=$(BUILD)/lib \2|' \
+		-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)|" \
 		Make.inc || die
+
+	sed -i \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
+		-e "s|\$(JL_LIBDIR),lib|\$(JL_LIBDIR),$(get_libdir)|" \
+		-e "s|\$(JL_PRIVATE_LIBDIR),lib|\$(JL_PRIVATE_LIBDIR),$(get_libdir)|" \
+		Makefile || die
 }
 
 src_compile() {
 	emake cleanall
+	mkdir -p usr/$(get_libdir) || die
+	pushd usr || die
+	ln -s $(get_libdir) lib || die
+	popd
+	emake julia-release
+	pax-mark m usr/bin/julia-readline
+	pax-mark m usr/bin/julia-basic
 	emake
 	use doc && emake -C doc html
 	use emacs && elisp-compile contrib/julia-mode.el


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-01-27  3:00 Guillaume Horel
  0 siblings, 0 replies; 20+ messages in thread
From: Guillaume Horel @ 2014-01-27  3:00 UTC (permalink / raw
  To: gentoo-commits

commit:     8b12b4ffbdca16a9f2ff8161280bde0e94c77613
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Sun Jan 26 19:14:06 2014 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Sun Jan 26 19:14:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8b12b4ff

Add missing dependency for utf8proc

Package-Manager: portage-2.2.7

---
 dev-lang/julia/ChangeLog         | 3 +++
 dev-lang/julia/julia-9999.ebuild | 1 +
 2 files changed, 4 insertions(+)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 839011b..29a086a 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jan 2014;  <xhochy@gentoo.org> julia-9999.ebuild:
+  Add missing dependency for utf8proc
+
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> julia-9999.ebuild, metadata.xml:
   Switch from git-2 to git-r3
 

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 9684183..d45a198 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-libs/double-conversion
 	dev-libs/gmp
 	dev-libs/libpcre
+	dev-libs/utf8proc
 	dev-util/patchelf
 	sci-libs/arpack
 	sci-libs/fftw


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-02-10  4:14 Sebastien Fabbro
  0 siblings, 0 replies; 20+ messages in thread
From: Sebastien Fabbro @ 2014-02-10  4:14 UTC (permalink / raw
  To: gentoo-commits

commit:     559498b5acf86397b05fbaaa2a2d00bb90830f66
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Sat Feb  8 21:34:56 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 21:36:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=559498b5

[dev-lang/julia] PREFIX is now prefix

Package-Manager: portage-2.2.7

---
 dev-lang/julia/ChangeLog         | 3 +++
 dev-lang/julia/julia-9999.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 29a086a..27a9af5 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Feb 2014;  <xhochy@gentoo.org> julia-9999.ebuild:
+  PREFIX is now prefix
+
   26 Jan 2014;  <xhochy@gentoo.org> julia-9999.ebuild:
   Add missing dependency for utf8proc
 

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index d45a198..7a22eed 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -94,7 +94,7 @@ src_test() {
 }
 
 src_install() {
-	emake install PREFIX="${D}/usr"
+	emake install prefix="${D}/usr"
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-04-02 23:05 Sebastien Fabbro
  0 siblings, 0 replies; 20+ messages in thread
From: Sebastien Fabbro @ 2014-04-02 23:05 UTC (permalink / raw
  To: gentoo-commits

commit:     428c0744c493315742822d62de35bcccdab80ddd
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  2 23:04:49 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Apr  2 23:04:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=428c0744

various consistent fixes for main tree

Package-Manager: portage-2.2.8-prefix

---
 dev-lang/julia/ChangeLog         |   4 ++
 dev-lang/julia/julia-9999.ebuild | 119 ++++++++++++++++++++++++---------------
 dev-lang/julia/metadata.xml      |   4 +-
 3 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 27a9af5..b725a62 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Apr 2014; Sebastien Fabbro <fabbros@gentoo.org> julia-9999.ebuild,
+  metadata.xml:
+  various consistent fixes for main tree
+
   08 Feb 2014;  <xhochy@gentoo.org> julia-9999.ebuild:
   PREFIX is now prefix
 

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 7a22eed..32d93f3 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit git-r3 elisp-common eutils multilib pax-utils
+inherit git-r3 elisp-common eutils multilib pax-utils toolchain-funcs
 
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="http://julialang.org/"
@@ -17,73 +17,102 @@ KEYWORDS=""
 IUSE="doc emacs"
 
 RDEPEND="
-	dev-libs/double-conversion
-	dev-libs/gmp
-	dev-libs/libpcre
-	dev-libs/utf8proc
-	dev-util/patchelf
-	sci-libs/arpack
-	sci-libs/fftw
-	sci-libs/openlibm
-	>=sci-libs/suitesparse-4.0
-	sci-mathematics/glpk
-	>=sys-devel/llvm-3.0
-	>=sys-libs/libunwind-1.1
-	sys-libs/readline
-	sys-libs/zlib
+	dev-lang/R:0=
+	dev-libs/double-conversion:0=
+	dev-libs/gmp:0=
+	dev-libs/libpcre:3=
+	dev-libs/mpfr:0=
+	dev-libs/utf8proc: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 )"
+	emacs? ( app-emacs/ess )"
+
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
 
 src_prepare() {
+	# sadlib keep fetching in ebuild to make sure live build works
 	# /usr/include/suitesparse is for debian only
 	# respect prefix, flags
 	sed -i \
 		-e 's|^\(SUITESPARSE_INC\s*=\).*||g' \
-		-e 's|/usr/bin/||g' \
-		-e "s|/usr/include|${EROOT%/}/usr/include|g" \
 		-e "s|-O3|${CFLAGS}|g" \
+		-e 's|/usr/bin/||g' \
+		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
 		deps/Makefile || die
 
-	# mangle Make.inc for system libraries
-	# do not set the RPATH
-	local blasname=$($(tc-getPKG_CONFIG) --libs blas | \
-		sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
-	local lapackname=$($(tc-getPKG_CONFIG) --libs lapack | \
-		sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
-
 	sed -i \
-		-e 's|\(USE_QUIET\s*\)=.*|\1=0|g' \
-		-e 's|\(USE_SYSTEM_.*\)=.*|\1=1|g' \
-		-e 's|\(USE_SYSTEM_LIBUV\)=.*|\1=0|g' \
-		-e 's|\(USE_SYSTEM_LIBM\)=.*|\1=0|g' \
-		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-		-e "s|liblapack|${lapackname}|" \
-		-e "s|libblas|${blasname}|" \
-		-e 's|\(JULIA_EXECUTABLE = \)\($(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=$(BUILD)/$(get_libdir) \2|' \
+		-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|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
-		-e "s|\$(JL_LIBDIR),lib|\$(JL_LIBDIR),$(get_libdir)|" \
-		-e "s|\$(JL_PRIVATE_LIBDIR),lib|\$(JL_PRIVATE_LIBDIR),$(get_libdir)|" \
+		-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_OPENSPECFUN=0
+		USE_SYSTEM_PCRE=1
+		USE_SYSTEM_READLINE=1
+		USE_SYSTEM_RMATH=1
+		USE_SYSTEM_SUITESPARSE=1
+		USE_SYSTEM_UTF8PROC=1
+		USE_SYSTEM_ZLIB=1
+		VERBOSE=1
+	EOF
 }
 
 src_compile() {
 	emake cleanall
-	mkdir -p usr/$(get_libdir) || die
-	pushd usr || die
-	ln -s $(get_libdir) lib || die
-	popd
+	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 usr/bin/julia-readline
-	pax-mark m usr/bin/julia-basic
+	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
 	emake
 	use doc && emake -C doc html
 	use emacs && elisp-compile contrib/julia-mode.el
@@ -94,7 +123,7 @@ src_test() {
 }
 
 src_install() {
-	emake install prefix="${D}/usr"
+	emake install PREFIX="${D}/usr"
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 1cc4211..523edd5 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription>
+<herd>sci</herd>
+<longdescription>
   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,


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-07-03 22:23 Sebastien Fabbro
  0 siblings, 0 replies; 20+ messages in thread
From: Sebastien Fabbro @ 2014-07-03 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     7cb81db9514e5c8ca9b5dab85f3f39e84a6acc6d
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  3 22:23:29 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jul  3 22:23:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7cb81db9

More prefix fixes, add missing dep

Package-Manager: portage-2.2.10.1-prefix

---
 dev-lang/julia/ChangeLog         |  2 +-
 dev-lang/julia/julia-9999.ebuild | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index b725a62..3816f2c 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -21,7 +21,7 @@
 
   14 Jul 2013; James Cloos <cloos@jhcloos.com> julia-9999.ebuild:
   Julia uses submodules, so set EGIT_HAS_SUBMODULES=yes
-  
+
   14 Jun 2013; Justin Lecher <jlec@gentoo.org> julia-9999.ebuild, metadata.xml:
   Drop KEYWORDS of live ebuilds
 

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 32d93f3..ae77b70 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -24,13 +24,14 @@ RDEPEND="
 	dev-libs/mpfr:0=
 	dev-libs/utf8proc:0=
 	sci-libs/arpack:0=
+	sci-libs/camd: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-devel/llvm-3.3*
 	>=sys-libs/libunwind-1.1:7=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
@@ -62,6 +63,7 @@ src_prepare() {
 		-e "s|/usr/include|${EPREFIX}/usr/include|" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
 		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+		-e '/MARCH = /d' \
 		Make.inc || die
 
 	sed -i \
@@ -103,17 +105,17 @@ src_configure() {
 		USE_SYSTEM_ZLIB=1
 		VERBOSE=1
 	EOF
-}
-
-src_compile() {
-	emake cleanall
+	emake -j1 cleanall
 	if [[ $(get_libdir) != lib ]]; then
 		mkdir -p usr/$(get_libdir) || die
 		ln -s $(get_libdir) usr/lib || die
 	fi
-	emake julia-release
+}
+
+src_compile() {
+	emake -j1 julia-release
 	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake
+	emake -j1
 	use doc && emake -C doc html
 	use emacs && elisp-compile contrib/julia-mode.el
 }
@@ -123,7 +125,7 @@ src_test() {
 }
 
 src_install() {
-	emake install PREFIX="${D}/usr"
+	emake install PREFIX="${ED}/usr"
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-08-27  3:54 Francois Bissey
  0 siblings, 0 replies; 20+ messages in thread
From: Francois Bissey @ 2014-08-27  3:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d166beaefa32ee96bba9d3e4c3fca9c3e680d7ab
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Wed Aug 27 03:52:41 2014 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Wed Aug 27 03:52:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d166beae

Few fixes: julia wants threaded fftw; multilib-strict install; Added USE_BLAS64=0 to Make.user, some proprietary blas/lapack may be
suitable for the other setting but we cannot count on julia to recognize support just based on name.

Package-Manager: portage-2.2.10

---
 dev-lang/julia/ChangeLog         | 7 +++++++
 dev-lang/julia/julia-9999.ebuild | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 3816f2c..9a0ecfe 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Aug 2014; François Bissey <francois.bissey@canterbury.ac.nz>
+  julia-9999.ebuild:
+  Few fixes: julia wants threaded fftw; multilib-strict install; Added
+  USE_BLAS64=0 to Make.user, some proprietary blas/lapack may be  suitable for
+  the other setting but we cannot count on julia to recognize support just based
+  on name.
+
   02 Apr 2014; Sebastien Fabbro <fabbros@gentoo.org> julia-9999.ebuild,
   metadata.xml:
   various consistent fixes for main tree

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index ae77b70..bac01db 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
 	sci-libs/cholmod:0=
-	sci-libs/fftw:3.0=
+	sci-libs/fftw:3.0=[threads]
 	sci-libs/openlibm:0=
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
@@ -58,7 +58,7 @@ src_prepare() {
 	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|libdir = \$(prefix)/lib|libdir = \$(prefix)/$(get_libdir)|" \
 		-e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
@@ -83,6 +83,7 @@ src_configure() {
 		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_BLAS64=0
 		USE_LLVM_SHLIB=1
 		USE_SYSTEM_ARPACK=1
 		USE_SYSTEM_BLAS=1
@@ -125,7 +126,7 @@ src_test() {
 }
 
 src_install() {
-	emake install PREFIX="${ED}/usr"
+	emake install prefix="${ED}/usr"
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
 	EOF


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-08-27  4:33 Francois Bissey
  0 siblings, 0 replies; 20+ messages in thread
From: Francois Bissey @ 2014-08-27  4:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e04237a3380a5df2fbe4a71e4aee1f11588e3319
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Wed Aug 27 04:32:39 2014 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Wed Aug 27 04:32:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e04237a3

Bump dependency on llvm as in 0.3

Package-Manager: portage-2.2.10

---
 dev-lang/julia/ChangeLog         | 4 ++++
 dev-lang/julia/julia-9999.ebuild | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 9a0ecfe..c53e175 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -4,6 +4,10 @@
 
   27 Aug 2014; François Bissey <francois.bissey@canterbury.ac.nz>
   julia-9999.ebuild:
+  Bump dependency on llvm as in 0.3
+
+  27 Aug 2014; François Bissey <francois.bissey@canterbury.ac.nz>
+  julia-9999.ebuild:
   Few fixes: julia wants threaded fftw; multilib-strict install; Added
   USE_BLAS64=0 to Make.user, some proprietary blas/lapack may be  suitable for
   the other setting but we cannot count on julia to recognize support just based

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index bac01db..69bff79 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
-	=sys-devel/llvm-3.3*
+	=sys-devel/llvm-3.4*
 	>=sys-libs/libunwind-1.1:7=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2014-10-06  5:56 Justin Lecher
  0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2014-10-06  5:56 UTC (permalink / raw
  To: gentoo-commits

commit:     014553d7ae962484f4a71db928cc5b0a2df007ce
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 13 04:10:58 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:40:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=014553d7

Add int64 use flag to julia-9999.ebuild. Depend on >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?]. Fixes dev-lang/julia wont compile against openblas #102.

---
 dev-lang/julia/ChangeLog         |  5 ++++
 dev-lang/julia/julia-9999.ebuild | 59 ++++++++++++++++++++++++++++++----------
 dev-lang/julia/metadata.xml      |  8 ++++--
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index c53e175..347e2fb 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Sep 2014; Mark Wright <gienah@gentoo.org> julia-9999.ebuild:
+  Add int64 use flag to julia-9999.ebuild. Depend on
+  >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?]. Fixes
+  dev-lang/julia wont compile against openblas -int64 #102.
+
   27 Aug 2014; François Bissey <francois.bissey@canterbury.ac.nz>
   julia-9999.ebuild:
   Bump dependency on llvm as in 0.3

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 69bff79..b54ecfa 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc emacs"
+IUSE="doc emacs int64"
 
 RDEPEND="
 	dev-lang/R:0=
@@ -26,6 +26,7 @@ RDEPEND="
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
 	sci-libs/cholmod:0=
+	sci-libs/fdlibm:0=
 	sci-libs/fftw:3.0=[threads]
 	sci-libs/openlibm:0=
 	sci-libs/spqr:0=
@@ -35,10 +36,9 @@ RDEPEND="
 	>=sys-libs/libunwind-1.1:7=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
-	virtual/blas
-	virtual/lapack
+	>=virtual/blas-2.1-r2[int64?]
+	>=virtual/lapack-3.5-r2[int64?]
 	emacs? ( app-emacs/ess )"
-
 DEPEND="${RDEPEND}
 	dev-util/patchelf
 	virtual/pkgconfig
@@ -55,35 +55,64 @@ src_prepare() {
 		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
 		deps/Makefile || die
 
+	local blasprofname=$(usex int64 "blas-int64" "blas")
+	local lapackprofname=$(usex int64 "lapack-int64" "lapack")
+	local blasname=$($(tc-getPKG_CONFIG) --libs-only-l "${blasprofname}" | \
+		sed -e "s/-l\([^ \t]*\).*/lib\1/")
+	local lapackname=$($(tc-getPKG_CONFIG) --libs-only-l "${lapackprofname}" | \
+		sed -e "s/-l\([^ \t]*\).*/lib\1/")
 	sed -i \
-		-e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
 		-e "s|-O3|${CFLAGS}|g" \
 		-e "s|libdir = \$(prefix)/lib|libdir = \$(prefix)/$(get_libdir)|" \
+		-e "s|build_libdir = \$(build_prefix)/lib|build_libdir = \$(build_prefix)/$(get_libdir)|" \
+		-e "s|build_private_libdir = \$(build_prefix)/lib/julia|build_private_libdir = \$(build_prefix)/$(get_libdir)/julia|" \
 		-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}|" \
+		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs-only-l ${blasprofname})|" \
+		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs-only-l ${lapackprofname})|" \
+		-e "s|liblapack|${lapackname}|g" \
+		-e "s|libblas|${blasname}|g" \
+		-e "s|-O3|${CFLAGS}|g" \
+		-e "s|JCFLAGS = |JCFLAGS = $($(tc-getPKG_CONFIG) --cflags "${lapackprofname}") ${CFLAGS} |g" \
+		-e "s|JCXXCFLAGS = |JCXXFLAGS = $($(tc-getPKG_CONFIG) --cflags "${lapackprofname}") ${CXXFLAGS} |g" \
+		-e "s|JFFLAGS = |JFFLAGS = ${FFLAGS} |g" \
 		-e '/MARCH = /d' \
 		Make.inc || die
 
 	sed -i \
 		-e "s|,lib)|,$(get_libdir))|g" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		-e "s|\$(JL_LIBDIR),lib|\$(JL_LIBDIR),$(get_libdir)|" \
+		-e "s|\$(JL_PRIVATE_LIBDIR),lib|\$(JL_PRIVATE_LIBDIR),$(get_libdir)|" \
 		Makefile || die
 
 	sed -i \
 		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		-e "s|LLVMLINK = -lLLVM-\$(LLVM_VER)|LLVMLINK = $(llvm-config --libs) $(llvm-config --ldflags)|" \
 		src/Makefile || die
+
+	sed -e "s|libopenblas|${blasname}|g" \
+		-i base/util.jl \
+		-i test/perf/micro/Makefile || die
+
+	# Occasional test suite failure due to ARPACK #6162 https://github.com/JuliaLang/julia/issues/6162
+	sed -e 's|"arpack", ||' \
+		-i test/runtests.jl || die
 }
 
 src_configure() {
 	# libuv is an incompatible fork from upstream, so don't use system one
+	local blasprofname=$(usex int64 "blas-int64" "blas")
+	local lapackprofname=$(usex int64 "lapack-int64" "lapack")
 	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_BLAS64=0
+		LIBBLAS=$($(tc-getPKG_CONFIG) --libs ${blasprofname})
+		LIBBLASNAME=$($(tc-getPKG_CONFIG) --libs-only-l ${blasprofname} | sed -e "s/-l\([a-z0-9_]*\).*/lib\1/")
+		LIBLAPACK=$($(tc-getPKG_CONFIG) --libs-only-l ${lapackprofname})
+		LIBLAPACKNAME=$($(tc-getPKG_CONFIG) --libs-only-l ${lapackprofname} | sed -e "s/-l\([a-z0-9_]*\).*/lib\1/")
+		LIBM=-lfdlibm
+		LIBMNAME=libfdlibm
+		USE_BLAS64=$(usex int64 "1" "0")
 		USE_LLVM_SHLIB=1
 		USE_SYSTEM_ARPACK=1
 		USE_SYSTEM_BLAS=1
@@ -91,7 +120,7 @@ src_configure() {
 		USE_SYSTEM_GMP=1
 		USE_SYSTEM_GRISU=1
 		USE_SYSTEM_LAPACK=1
-		USE_SYSTEM_LIBM=1
+		USE_SYSTEM_LIBM=0
 		USE_SYSTEM_LIBUNWIND=1
 		USE_SYSTEM_LIBUV=0
 		USE_SYSTEM_LLVM=1
@@ -114,9 +143,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 julia-release
-	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake -j1
+	emake julia-release
+	pax-mark m $(file usr/bin/julia* | awk -F : '/ELF/ {print $1}')
+	emake
 	use doc && emake -C doc html
 	use emacs && elisp-compile contrib/julia-mode.el
 }

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 523edd5..0957660 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription>
+  <herd>sci</herd>
+  <longdescription>
   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,
@@ -14,4 +14,8 @@
   around defining functions, and overloading them for different combinations
   of argument types (which can also be user-defined).
 </longdescription>
+<use>
+  <flag name="int64">Build with 64 bits integer blas and lapack (needs
+  <pkg>sci-libs/openblas</pkg> and <pkg>sci-libs/lapack-reference</pkg>)</flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2015-03-08 18:08 Justin Lecher
  0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2015-03-08 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     4ce349c16ee3b3887ed85b327c115133caa2c3c2
Author:     zcj <ustcscgy <AT> 163 <DOT> com>
AuthorDate: Sun Mar  8 11:07:55 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  8 11:07:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4ce349c1

dev-lang/julia: Add new dependency, fix build.

 dev-lang/julia/ChangeLog         | 5 ++++-
 dev-lang/julia/julia-9999.ebuild | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index 347e2fb..a95ff5a 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-lang/julia
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Mar 2015; zcj <ustcscgy@163.com> julia-9999.ebuild:
+  dev-lang/julia: Add new dependency, fix build.
+
   13 Sep 2014; Mark Wright <gienah@gentoo.org> julia-9999.ebuild:
   Add int64 use flag to julia-9999.ebuild. Depend on
   >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?]. Fixes

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index b54ecfa..fddb70c 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,6 +21,7 @@ RDEPEND="
 	dev-libs/double-conversion:0=
 	dev-libs/gmp:0=
 	dev-libs/libpcre:3=
+	>=dev-libs/libgit2-0.21
 	dev-libs/mpfr:0=
 	dev-libs/utf8proc:0=
 	sci-libs/arpack:0=
@@ -32,7 +33,7 @@ RDEPEND="
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
-	=sys-devel/llvm-3.4*
+	>=sys-devel/llvm-3.4
 	>=sys-libs/libunwind-1.1:7=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
@@ -120,6 +121,7 @@ src_configure() {
 		USE_SYSTEM_GMP=1
 		USE_SYSTEM_GRISU=1
 		USE_SYSTEM_LAPACK=1
+		USE_SYSTEM_LIBGIT2=1
 		USE_SYSTEM_LIBM=0
 		USE_SYSTEM_LIBUNWIND=1
 		USE_SYSTEM_LIBUV=0


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/
@ 2015-09-23 12:48 Justin Lecher
  0 siblings, 0 replies; 20+ messages in thread
From: Justin Lecher @ 2015-09-23 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     aba06ded6467ed9b50abaffc71614a2bc5637c31
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 12:23:39 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 12:23:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=aba06ded

dev-lang/julia: Use default functions

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-lang/julia/julia-9999.ebuild | 6 +-----
 dev-lang/julia/metadata.xml      | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 03d3bb0..e86777c 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -147,15 +147,11 @@ src_configure() {
 src_compile() {
 	emake julia-release
 	pax-mark m $(file usr/bin/julia* | awk -F : '/ELF/ {print $1}')
-	emake
+	default
 	use doc && emake -C doc html
 	use emacs && elisp-compile contrib/julia-mode.el
 }
 
-src_test() {
-	emake test
-}
-
 src_install() {
 	emake install prefix="${ED}/usr"
 	cat > 99julia <<-EOF

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 0957660..abfa1f5 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -14,8 +14,8 @@
   around defining functions, and overloading them for different combinations
   of argument types (which can also be user-defined).
 </longdescription>
-<use>
-  <flag name="int64">Build with 64 bits integer blas and lapack (needs
+  <use>
+    <flag name="int64">Build with 64 bits integer blas and lapack (needs
   <pkg>sci-libs/openblas</pkg> and <pkg>sci-libs/lapack-reference</pkg>)</flag>
-</use>
+  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2015-09-23 12:48 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-27  3:54 [gentoo-commits] proj/sci:master commit in: dev-lang/julia/ Francois Bissey
  -- strict thread matches above, loose matches on Subject: below --
2015-09-23 12:48 Justin Lecher
2015-03-08 18:08 Justin Lecher
2014-10-06  5:56 Justin Lecher
2014-08-27  4:33 Francois Bissey
2014-07-03 22:23 Sebastien Fabbro
2014-04-02 23:05 Sebastien Fabbro
2014-02-10  4:14 Sebastien Fabbro
2014-01-27  3:00 Guillaume Horel
2014-01-18  4:35 Mark Wright
2014-01-06 19:27 Justin Lecher
2013-07-17 17:59 Sebastien Fabbro
2013-07-15 13:57 Sebastien Fabbro
2013-07-03  3:19 Guillaume Horel
2013-06-14 11:21 [gentoo-commits] proj/sci:fixing " Justin Lecher
2013-06-14 11:21 ` [gentoo-commits] proj/sci:master " Justin Lecher
2013-05-15  9:11 Kacper Kowalik
2013-01-07  2:49 Guillaume Horel
2013-01-06 15:56 Guillaume Horel
2013-01-06 15:53 Guillaume Horel
2012-12-19  7:26 Guillaume Horel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox