public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/files/, dev-lang/julia/
@ 2012-12-19  7:29 Guillaume Horel
  0 siblings, 0 replies; 2+ messages in thread
From: Guillaume Horel @ 2012-12-19  7:29 UTC (permalink / raw
  To: gentoo-commits

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

dev-lang/julia add emacs config file

---
 dev-lang/julia/ChangeLog               |    4 ++++
 dev-lang/julia/files/63julia-gentoo.el |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index e7069c8..71d4b42 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  +files/63julia-gentoo.el:
+  Add emacs julia mode file
+
 *julia-9999 (19 Dec 2012)
 
   19 Dec 2012; Guillaume Horel <guillaume.horel@gmail.com> +julia-9999.ebuild,

diff --git a/dev-lang/julia/files/63julia-gentoo.el b/dev-lang/julia/files/63julia-gentoo.el
new file mode 100644
index 0000000..6b60749
--- /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))


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

* [gentoo-commits] proj/sci:master commit in: dev-lang/julia/files/, dev-lang/julia/
@ 2013-04-02  1:35 Guillaume Horel
  0 siblings, 0 replies; 2+ messages in thread
From: Guillaume Horel @ 2013-04-02  1:35 UTC (permalink / raw
  To: gentoo-commits

commit:     500c722f1fd50cea00f491d23346744131ff7a06
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Apr  2 01:34:56 2013 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Apr  2 01:34:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=500c722f

dev-lang/julia update dependency and remove useflag

---
 dev-lang/julia/files/julia-nopatchelf.patch |   14 +++++++++++++
 dev-lang/julia/julia-9999.ebuild            |   28 +++++++++-----------------
 dev-lang/julia/metadata.xml                 |    8 +------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/dev-lang/julia/files/julia-nopatchelf.patch b/dev-lang/julia/files/julia-nopatchelf.patch
new file mode 100644
index 0000000..2ac5a80
--- /dev/null
+++ b/dev-lang/julia/files/julia-nopatchelf.patch
@@ -0,0 +1,14 @@
+diff -urN julia-9999-orig/deps/Makefile julia-9999/deps/Makefile
+--- julia-9999-orig/deps/Makefile	2013-04-01 19:43:13.868529747 -0400
++++ julia-9999/deps/Makefile	2013-04-01 19:45:35.261543816 -0400
+@@ -37,10 +37,6 @@
+ endif
+ endif
+ 
+-ifeq ($(OS), Linux)
+-STAGE1_DEPS += patchelf
+-endif
+-
+ WGET = $(abspath .)/jldownload
+ WGET_DASH_O = $(WGET)
+ 

diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index c6f774e..c066870 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
 
@@ -15,7 +15,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs notebook"
+IUSE="doc emacs"
 
 RDEPEND=">=sys-devel/llvm-3.0
 	sys-libs/readline
@@ -24,18 +24,19 @@ RDEPEND=">=sys-devel/llvm-3.0
 	sci-libs/arpack
 	sci-libs/fftw
 	dev-libs/gmp
+	>=dev-libs/double-conversion-1.1.1
 	>=sys-libs/libunwind-1.1
 	dev-libs/libpcre
 	sci-mathematics/glpk
 	sys-libs/zlib
 	virtual/blas
-	virtual/lapack
-	notebook? ( www-servers/lighttpd )"
+	virtual/lapack"
 
 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
@@ -57,32 +58,23 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -j1
+	emake
 	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"
+	emake 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}"/63julia-gentoo.el
 	fi
-	use doc && dodoc -r doc/_build/html
+	use doc && dohtml -r doc/_build/html/
 	dodoc README.md
 }
 

diff --git a/dev-lang/julia/metadata.xml b/dev-lang/julia/metadata.xml
index 03a8600..afa3d53 100644
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@@ -1,10 +1,7 @@
 <?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>
+	<herd>python</herd>
 	<longdescription>
 	Julia is a high-level, high-performance dynamic programming language for
 	technical computing, with syntax that is familiar to users of other
@@ -17,7 +14,4 @@
 	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] 2+ messages in thread

end of thread, other threads:[~2013-04-02  1:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-19  7:29 [gentoo-commits] proj/sci:master commit in: dev-lang/julia/files/, dev-lang/julia/ Guillaume Horel
  -- strict thread matches above, loose matches on Subject: below --
2013-04-02  1:35 Guillaume Horel

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