Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/files/, dev-lang/julia/
Date: Sat, 24 Sep 2016 21:26:07
Message-Id: 1474751936.8a5e6558802794a78eec6c23b6d4912343c3ead3.tamiko@gentoo
1 commit: 8a5e6558802794a78eec6c23b6d4912343c3ead3
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 24 17:06:23 2016 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 24 21:18:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5e6558
7
8 dev-lang/julia: drop old versions 0.4.3, 0.4.6
9
10 Package-Manager: portage-2.2.28
11
12 dev-lang/julia/Manifest | 4 -
13 .../julia/files/julia-0.4.3-fix_build_system.patch | 140 ----------------
14 dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch | 56 -------
15 dev-lang/julia/julia-0.4.3.ebuild | 185 --------------------
16 dev-lang/julia/julia-0.4.6.ebuild | 186 ---------------------
17 5 files changed, 571 deletions(-)
18
19 diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
20 index aa23d93..c91190d 100644
21 --- a/dev-lang/julia/Manifest
22 +++ b/dev-lang/julia/Manifest
23 @@ -1,6 +1,2 @@
24 -DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
25 -DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33
26 -DIST julia-0.4.6-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
27 -DIST julia-0.4.6.tar.gz 5548248 SHA256 e5d12b5a8ddff0131e460612ecf222ddf16014fc64c4fc3d8b021da7ebbd9a9f SHA512 744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6f7e9e667f52e5a33879032b2d02d76b00fab59f81ba6552f1fd4165953da WHIRLPOOL 3403364fc13bd8012da1ee333cc51fd0a957e94920bbd3f951fad4a689469f514e19a661bf2bdfdd29afbcadac1c9d6948638fd9d4201780a1aa7c0fd2995dee
28 DIST julia-0.5.0-bundled.tar.gz 3461547 SHA256 3f4887fc2c0112666eb28b99f86bd8f7bd50615325e03135c546127885d46fbf SHA512 f8df589edf7d6b0e1e6553583c81d26fd256a79cacd79fbdd0ea1a9eea46b2466e3cbf055b5b7aa2d5c08318a5c35b9c09a30ac46a48689cc5c7245954b615c8 WHIRLPOOL b0137b2ed55aef7dc2c1a8693043ce63305bd2bbb5c2f959b2752fdb68189a506b027b467bfc0bb443fa4202f3735dd9410a257adec08302dfcaa0c9e4bfed98
29 DIST julia-0.5.0.tar.gz 6326490 SHA256 bb62a14806e58f079ecd4941d4a18d1f1c1d89ab33c826d3a58a2244e364112e SHA512 6d76c5050da5050cd541c8407c35c8ecd60ad2ba61c4defcc5c084aaeb09e82ffed09be79a3453000bdf88efe56039948335bab21c8389389ffb8b29806568de WHIRLPOOL 7f0066cc7fa912fe7ce5b6bf43449d828b0b9dcf2ab57df6c13a0df17ee53351c6deb30e7b998dc00ff53c548074d79ed6288bc79507afebc4fd827b3e3c032f
30
31 diff --git a/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
32 deleted file mode 100644
33 index c83f043..00000000
34 --- a/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
35 +++ /dev/null
36 @@ -1,140 +0,0 @@
37 -diff --git a/Make.inc b/Make.inc
38 -index da01e38..c751607 100644
39 ---- a/Make.inc
40 -+++ b/Make.inc
41 -@@ -297,7 +297,7 @@ JCFLAGS = -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
42 - JCPPFLAGS =
43 - JCXXFLAGS = -pipe $(fPIC) -fno-rtti
44 - DEBUGFLAGS = -O0 -ggdb3 -DJL_DEBUG_BUILD -fstack-protector-all
45 --SHIPFLAGS = -O3 -ggdb3 -falign-functions
46 -+SHIPFLAGS = GENTOOCFLAGS
47 - endif
48 -
49 - ifeq ($(USECLANG),1)
50 -@@ -307,7 +307,7 @@ JCFLAGS = -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
51 - JCPPFLAGS =
52 - JCXXFLAGS = -pipe $(fPIC) -fno-rtti
53 - DEBUGFLAGS = -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
54 --SHIPFLAGS = -O3 -g
55 -+SHIPFLAGS = GENTOOCFLAGS
56 - ifeq ($(OS), Darwin)
57 - ifeq ($(USE_LIBCPP), 1)
58 - CC += -stdlib=libc++ -mmacosx-version-min=10.7
59 -@@ -334,7 +334,7 @@ JCFLAGS = -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -
60 - JCPPFLAGS =
61 - JCXXFLAGS = -pipe $(fPIC) -fno-rtti
62 - DEBUGFLAGS = -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
63 --SHIPFLAGS = -O3 -g -falign-functions
64 -+SHIPFLAGS = GENTOOCFLAGS
65 - endif
66 -
67 - ifeq ($(USECCACHE), 1)
68 -diff --git a/deps/Makefile b/deps/Makefile
69 -index 051b23d..881ba68 100644
70 ---- a/deps/Makefile
71 -+++ b/deps/Makefile
72 -@@ -862,7 +862,7 @@ OPENSPECFUN_TAR_URL = https://api.github.com/repos/JuliaLang/openspecfun/tarball
73 - $(eval $(call git-external,openspecfun,OPENSPECFUN,Makefile,libopenspecfun.$(SHLIB_EXT)))
74 -
75 - # issue 8799
76 --OPENSPECFUN_CFLAGS = -O3 -std=c99
77 -+OPENSPECFUN_CFLAGS = GENTOOCFLAGS -std=c99
78 - ifeq ($(USEICC),1)
79 - OPENSPECFUN_CFLAGS += -fp-model precise
80 - endif
81 -@@ -902,7 +902,7 @@ DSFMT_OBJ_SOURCE = dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT)
82 -
83 - DSFMT_CFLAGS = $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES
84 - ifneq ($(USEMSVC), 1)
85 --DSFMT_CFLAGS += -O3 -finline-functions -fomit-frame-pointer -fno-strict-aliasing \
86 -+DSFMT_CFLAGS += GENTOOCFLAGS -finline-functions -fno-strict-aliasing \
87 - --param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -shared
88 - else
89 - DSFMT_CFLAGS += -Wl,-dll,-def:../libdSFMT.def
90 -@@ -1181,7 +1181,7 @@ endif
91 - endif
92 -
93 - libgfortblas.$(SHLIB_EXT): gfortblas.c gfortblas.alias
94 -- $(CC) -Wall -O3 $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
95 -+ $(CC) -Wall GENTOOCFLAGS $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
96 - -Wl,-reexport_framework,Accelerate -Wl,-alias_list,gfortblas.alias
97 - $(build_shlibdir)/libgfortblas.$(SHLIB_EXT): libgfortblas.$(SHLIB_EXT)
98 - cp -f $< $@
99 -@@ -1607,10 +1607,10 @@ install-suitesparse: $(SUITESPARSE_OBJ_TARGET) install-suitesparse-wrapper
100 - # SUITESPARSE WRAPPER
101 -
102 - ifeq ($(USE_SYSTEM_SUITESPARSE), 1)
103 --SUITESPARSE_INC = -I /usr/include/suitesparse
104 -+
105 - SUITESPARSE_LIB = -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
106 - else
107 --SUITESPARSE_INC = -I SuiteSparse-$(SUITESPARSE_VER)/CHOLMOD/Include -I SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse_config -I SuiteSparse-$(SUITESPARSE_VER)/SPQR/Include
108 -+
109 - SUITESPARSE_LIB = -L$(build_shlibdir) -lcholmod -lumfpack -lspqr $(RPATH_ORIGIN)
110 - $(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT): $(SUITESPARSE_OBJ_TARGET)
111 - endif
112 -diff --git a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512 b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
113 -index 6a64d44..6bbeb34 100644
114 ---- a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
115 -+++ b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
116 -@@ -1 +1 @@
117 --1dd94eca05bc06c3f33e8be5087d3b1742d01c8b38588e0fa79b8f6b9998760bca21bee1b65873825c4dde2d994a8271166bc21f670a34810fa9db598473a887
118 -+15da0b3ff16113d5ad44c7ec42a1c8e260973883dd85ee174b3526f01137a94136cb03d4bbecb9267b7ca20d5ffc10670496d589cf60b86930f869a9fe219794
119 -diff --git a/doc/Makefile b/doc/Makefile
120 -index 08ba8dd..078d725 100644
121 ---- a/doc/Makefile
122 -+++ b/doc/Makefile
123 -@@ -56,7 +56,7 @@ help:
124 - @echo " doctest to run all doctests embedded in the documentation (if enabled)"
125 -
126 - clean:
127 -- -rm -rf _build/*
128 -+ @echo "Do not clean doc/_build/html. Just use it..."
129 -
130 - cleanall: clean
131 -
132 -diff --git a/src/Makefile b/src/Makefile
133 -index 98fa704..b566791 100644
134 ---- a/src/Makefile
135 -+++ b/src/Makefile
136 -@@ -26,15 +26,8 @@ endif
137 -
138 - # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
139 - # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
140 --LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs 2> /dev/null)
141 --ifeq ($(USE_LLVM_SHLIB),1)
142 --ifeq ($(LLVM_USE_CMAKE),1)
143 --LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
144 --else
145 --LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
146 --endif
147 -+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
148 - FLAGS += -DLLVM_SHLIB
149 --endif
150 -
151 - COMMON_LIBS = -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
152 - DEBUG_LIBS = $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
153 -diff --git a/ui/Makefile b/ui/Makefile
154 -index c9b5d0e..557a38c 100644
155 ---- a/ui/Makefile
156 -+++ b/ui/Makefile
157 -@@ -20,15 +20,10 @@ OBJS = $(SRCS:%=%.o)
158 - DOBJS = $(SRCS:%=%.dbg.obj)
159 - DEBUGFLAGS += $(FLAGS)
160 - SHIPFLAGS += $(FLAGS)
161 --ifeq ($(USE_LLVM_SHLIB),1)
162 --ifeq ($(LLVM_USE_CMAKE),1)
163 --LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
164 --else
165 --LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
166 --endif
167 --else
168 --LLVMLINK =
169 --endif
170 -+
171 -+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
172 -+FLAGS += -DLLVM_SHLIB
173 -+
174 - JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(OSLIBS) $(LLVMLINK) $(RPATH)
175 -
176 - ifeq ($(USE_SYSTEM_LIBM),0)
177
178 diff --git a/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch b/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch
179 deleted file mode 100644
180 index c301f96..00000000
181 --- a/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch
182 +++ /dev/null
183 @@ -1,56 +0,0 @@
184 -Description: LLVM 3.8 compatibility
185 - These fixes come straight from upstream's git.
186 -Origin: Upstream, https://github.com/JuliaLang/julia/commit/b67609b988febe062e6709d8972c4f869c82cfc0
187 -Origin: Upstream, https://github.com/JuliaLang/julia/commit/3f6abadc9d12bb9d59ec775db4277b3841395d0b
188 -Origin: Upstream, https://github.com/JuliaLang/julia/commit/caf3c74426696d43101d9607b1a2cd3a5e05bc0f
189 -Author: Graham Inggs <ginggs@××××××.org>
190 -Last-Update: 2016-02-03
191 ---- a/src/cgutils.cpp
192 -+++ b/src/cgutils.cpp
193 -@@ -219,7 +219,11 @@
194 - }
195 - }
196 -
197 -+#ifdef LLVM38
198 -+ virtual Value *materializeDeclFor(Value *V)
199 -+#else
200 - virtual Value *materializeValueFor (Value *V)
201 -+#endif
202 - {
203 - Function *F = dyn_cast<Function>(V);
204 - if (F) {
205 -@@ -492,7 +496,11 @@
206 -
207 - // now copy the module, since PM.run may modify it
208 - ValueToValueMapTy VMap;
209 -+#ifdef LLVM38
210 -+ Module *clone = CloneModule(shadow_module, VMap).release();
211 -+#else
212 - Module *clone = CloneModule(shadow_module, VMap);
213 -+#endif
214 - #ifdef LLVM37
215 - // Reset the target triple to make sure it matches the new target machine
216 - clone->setTargetTriple(TM->getTargetTriple().str());
217 ---- a/src/intrinsics.cpp
218 -+++ b/src/intrinsics.cpp
219 -@@ -780,12 +780,20 @@
220 - jl_options.fast_math == JL_OPTIONS_FAST_MATH_ON)) {
221 - FastMathFlags fmf;
222 - fmf.setUnsafeAlgebra();
223 -+#ifdef LLVM38
224 -+ builder.setFastMathFlags(fmf);
225 -+#else
226 - builder.SetFastMathFlags(fmf);
227 -+#endif
228 - }
229 - }
230 - IRBuilder<>& operator()() const { return builder; }
231 - ~math_builder() {
232 -+#ifdef LLVM38
233 -+ builder.setFastMathFlags(old_fmf);
234 -+#else
235 - builder.SetFastMathFlags(old_fmf);
236 -+#endif
237 - }
238 - };
239 -
240
241 diff --git a/dev-lang/julia/julia-0.4.3.ebuild b/dev-lang/julia/julia-0.4.3.ebuild
242 deleted file mode 100644
243 index 8d648df..00000000
244 --- a/dev-lang/julia/julia-0.4.3.ebuild
245 +++ /dev/null
246 @@ -1,185 +0,0 @@
247 -# Copyright 1999-2016 Gentoo Foundation
248 -# Distributed under the terms of the GNU General Public License v2
249 -# $Id$
250 -
251 -EAPI=5
252 -
253 -RESTRICT="test"
254 -
255 -inherit elisp-common eutils multilib pax-utils toolchain-funcs
256 -
257 -DESCRIPTION="High-performance programming language for technical computing"
258 -HOMEPAGE="http://julialang.org/"
259 -SRC_URI="
260 - https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
261 - https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
262 -"
263 -
264 -LICENSE="MIT"
265 -SLOT="0"
266 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
267 -IUSE="emacs"
268 -
269 -RDEPEND="
270 - dev-lang/R:0=
271 - dev-libs/double-conversion:0=
272 - dev-libs/gmp:0=
273 - dev-libs/libgit2:0=
274 - dev-libs/mpfr:0=
275 - dev-libs/openspecfun
276 - sci-libs/arpack:0=
277 - sci-libs/camd:0=
278 - sci-libs/cholmod:0=
279 - sci-libs/fftw:3.0=[threads]
280 - sci-libs/openlibm:0=
281 - sci-libs/spqr:0=
282 - sci-libs/umfpack:0=
283 - sci-mathematics/glpk:0=
284 - >=sys-devel/llvm-3.5:0=
285 - >=sys-libs/libunwind-1.1:7=
286 - sys-libs/readline:0=
287 - sys-libs/zlib:0=
288 - virtual/blas
289 - virtual/lapack
290 - emacs? ( app-emacs/ess )"
291 -
292 -DEPEND="${RDEPEND}
293 - dev-util/patchelf
294 - virtual/pkgconfig"
295 -
296 -PATCHES=(
297 - "${FILESDIR}"/${P}-fix_build_system.patch
298 -)
299 -
300 -src_prepare() {
301 - mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die
302 - mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die
303 - mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die
304 - mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die
305 - mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die
306 - rmdir "${WORKDIR}"/bundled || die
307 -
308 - epatch "${PATCHES[@]}"
309 -
310 - # Sledgehammer:
311 - # - prevent fetching of bundled stuff in compile and install phase
312 - # - respect CFLAGS
313 - # - respect EPREFIX and Gentoo specific paths
314 - # - fix BLAS and LAPACK link interface
315 -
316 - sed -i \
317 - -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
318 - -e 's|git submodule|${EPREFIX}/bin/true|g' \
319 - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
320 - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
321 - deps/Makefile || die
322 -
323 - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
324 - libblas="${libblas%% *}"
325 - libblas="lib${libblas#-l}"
326 - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
327 - liblapack="${liblapack%% *}"
328 - liblapack="lib${liblapack#-l}"
329 -
330 - sed -i \
331 - -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
332 - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
333 - -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
334 - -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
335 - -e "s|/usr/include|${EPREFIX}/usr/include|" \
336 - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
337 - -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
338 - -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
339 - -e "s|= libblas|= ${libblas}|" \
340 - -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
341 - -e "s|= liblapack|= ${liblapack}|" \
342 - Make.inc || die
343 -
344 - sed -i \
345 - -e "s|,lib)|,$(get_libdir))|g" \
346 - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
347 - Makefile || die
348 -
349 - sed -i \
350 - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
351 - src/Makefile || die
352 -}
353 -
354 -src_configure() {
355 - # julia does not play well with the system versions of
356 - # dsfmt, libuv, pcre2 and utf8proc
357 - cat <<-EOF > Make.user
358 - USE_SYSTEM_DSFMT=0
359 - USE_SYSTEM_LIBUV=0
360 - USE_SYSTEM_PCRE=0
361 - USE_SYSTEM_RMATH=0
362 - USE_SYSTEM_UTF8PROC=0
363 - USE_LLVM_SHLIB=1
364 - USE_SYSTEM_ARPACK=1
365 - USE_SYSTEM_BLAS=1
366 - USE_SYSTEM_FFTW=1
367 - USE_SYSTEM_GMP=1
368 - USE_SYSTEM_GRISU=1
369 - USE_SYSTEM_LAPACK=1
370 - USE_SYSTEM_LIBGIT2=1
371 - USE_SYSTEM_LIBM=1
372 - USE_SYSTEM_LIBUNWIND=1
373 - USE_SYSTEM_LLVM=1
374 - USE_SYSTEM_MPFR=1
375 - USE_SYSTEM_OPENLIBM=1
376 - USE_SYSTEM_OPENSPECFUN=1
377 - USE_SYSTEM_PATCHELF=1
378 - USE_SYSTEM_READLINE=1
379 - USE_SYSTEM_SUITESPARSE=1
380 - USE_SYSTEM_ZLIB=1
381 - VERBOSE=1
382 - EOF
383 -
384 -}
385 -
386 -src_compile() {
387 - emake cleanall
388 - emake julia-release \
389 - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
390 - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
391 - emake
392 - use emacs && elisp-compile contrib/julia-mode.el
393 -}
394 -
395 -src_test() {
396 - emake test
397 -}
398 -
399 -src_install() {
400 - emake install \
401 - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
402 - cat > 99julia <<-EOF
403 - LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
404 - EOF
405 - doenvd 99julia
406 -
407 - if use emacs; then
408 - elisp-install "${PN}" contrib/julia-mode.el
409 - elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
410 - fi
411 - dodoc README.md
412 -
413 - mv "${ED}"/usr/etc/julia "${ED}"/etc || die
414 - rmdir "${ED}"/usr/etc || die
415 - rmdir "${ED}"/usr/libexec || die
416 - mv "${ED}"/usr/share/doc/julia/{examples,html} \
417 - "${ED}"/usr/share/doc/${P} || die
418 - rmdir "${ED}"/usr/share/doc/julia || die
419 - if [[ $(get_libdir) != lib ]]; then
420 - mkdir -p "${ED}"/usr/$(get_libdir) || die
421 - mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
422 - fi
423 -}
424 -
425 -pkg_postinst() {
426 - use emacs && elisp-site-regen
427 -}
428 -
429 -pkg_postrm() {
430 - use emacs && elisp-site-regen
431 -}
432
433 diff --git a/dev-lang/julia/julia-0.4.6.ebuild b/dev-lang/julia/julia-0.4.6.ebuild
434 deleted file mode 100644
435 index 6f10200..00000000
436 --- a/dev-lang/julia/julia-0.4.6.ebuild
437 +++ /dev/null
438 @@ -1,186 +0,0 @@
439 -# Copyright 1999-2016 Gentoo Foundation
440 -# Distributed under the terms of the GNU General Public License v2
441 -# $Id$
442 -
443 -EAPI=5
444 -
445 -RESTRICT="test"
446 -
447 -inherit elisp-common eutils multilib pax-utils toolchain-funcs
448 -
449 -DESCRIPTION="High-performance programming language for technical computing"
450 -HOMEPAGE="http://julialang.org/"
451 -SRC_URI="
452 - https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
453 - https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
454 -"
455 -
456 -LICENSE="MIT"
457 -SLOT="0"
458 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
459 -IUSE="emacs"
460 -
461 -RDEPEND="
462 - dev-lang/R:0=
463 - dev-libs/double-conversion:0=
464 - dev-libs/gmp:0=
465 - dev-libs/libgit2:0=
466 - dev-libs/mpfr:0=
467 - dev-libs/openspecfun
468 - sci-libs/arpack:0=
469 - sci-libs/camd:0=
470 - sci-libs/cholmod:0=
471 - sci-libs/fftw:3.0=[threads]
472 - sci-libs/openlibm:0=
473 - sci-libs/spqr:0=
474 - sci-libs/umfpack:0=
475 - sci-mathematics/glpk:0=
476 - >=sys-devel/llvm-3.5:0=
477 - >=sys-libs/libunwind-1.1:7=
478 - sys-libs/readline:0=
479 - sys-libs/zlib:0=
480 - virtual/blas
481 - virtual/lapack
482 - emacs? ( app-emacs/ess )"
483 -
484 -DEPEND="${RDEPEND}
485 - dev-util/patchelf
486 - virtual/pkgconfig"
487 -
488 -PATCHES=(
489 - "${FILESDIR}"/${PN}-0.4.3-fix_build_system.patch
490 - "${FILESDIR}"/${P}-llvm-3.8.patch
491 -)
492 -
493 -src_prepare() {
494 - mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die
495 - mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die
496 - mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die
497 - mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die
498 - mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die
499 - rmdir "${WORKDIR}"/bundled || die
500 -
501 - epatch "${PATCHES[@]}"
502 -
503 - # Sledgehammer:
504 - # - prevent fetching of bundled stuff in compile and install phase
505 - # - respect CFLAGS
506 - # - respect EPREFIX and Gentoo specific paths
507 - # - fix BLAS and LAPACK link interface
508 -
509 - sed -i \
510 - -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
511 - -e 's|git submodule|${EPREFIX}/bin/true|g' \
512 - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
513 - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
514 - deps/Makefile || die
515 -
516 - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
517 - libblas="${libblas%% *}"
518 - libblas="lib${libblas#-l}"
519 - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
520 - liblapack="${liblapack%% *}"
521 - liblapack="lib${liblapack#-l}"
522 -
523 - sed -i \
524 - -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
525 - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
526 - -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
527 - -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
528 - -e "s|/usr/include|${EPREFIX}/usr/include|" \
529 - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
530 - -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
531 - -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
532 - -e "s|= libblas|= ${libblas}|" \
533 - -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
534 - -e "s|= liblapack|= ${liblapack}|" \
535 - Make.inc || die
536 -
537 - sed -i \
538 - -e "s|,lib)|,$(get_libdir))|g" \
539 - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
540 - Makefile || die
541 -
542 - sed -i \
543 - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
544 - src/Makefile || die
545 -}
546 -
547 -src_configure() {
548 - # julia does not play well with the system versions of
549 - # dsfmt, libuv, pcre2 and utf8proc
550 - cat <<-EOF > Make.user
551 - USE_SYSTEM_DSFMT=0
552 - USE_SYSTEM_LIBUV=0
553 - USE_SYSTEM_PCRE=0
554 - USE_SYSTEM_RMATH=0
555 - USE_SYSTEM_UTF8PROC=0
556 - USE_LLVM_SHLIB=1
557 - USE_SYSTEM_ARPACK=1
558 - USE_SYSTEM_BLAS=1
559 - USE_SYSTEM_FFTW=1
560 - USE_SYSTEM_GMP=1
561 - USE_SYSTEM_GRISU=1
562 - USE_SYSTEM_LAPACK=1
563 - USE_SYSTEM_LIBGIT2=1
564 - USE_SYSTEM_LIBM=1
565 - USE_SYSTEM_LIBUNWIND=1
566 - USE_SYSTEM_LLVM=1
567 - USE_SYSTEM_MPFR=1
568 - USE_SYSTEM_OPENLIBM=1
569 - USE_SYSTEM_OPENSPECFUN=1
570 - USE_SYSTEM_PATCHELF=1
571 - USE_SYSTEM_READLINE=1
572 - USE_SYSTEM_SUITESPARSE=1
573 - USE_SYSTEM_ZLIB=1
574 - VERBOSE=1
575 - EOF
576 -
577 -}
578 -
579 -src_compile() {
580 - emake cleanall
581 - emake julia-release \
582 - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
583 - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
584 - emake
585 - use emacs && elisp-compile contrib/julia-mode.el
586 -}
587 -
588 -src_test() {
589 - emake test
590 -}
591 -
592 -src_install() {
593 - emake install \
594 - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
595 - cat > 99julia <<-EOF
596 - LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
597 - EOF
598 - doenvd 99julia
599 -
600 - if use emacs; then
601 - elisp-install "${PN}" contrib/julia-mode.el
602 - elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
603 - fi
604 - dodoc README.md
605 -
606 - mv "${ED}"/usr/etc/julia "${ED}"/etc || die
607 - rmdir "${ED}"/usr/etc || die
608 - rmdir "${ED}"/usr/libexec || die
609 - mv "${ED}"/usr/share/doc/julia/{examples,html} \
610 - "${ED}"/usr/share/doc/${P} || die
611 - rmdir "${ED}"/usr/share/doc/julia || die
612 - if [[ $(get_libdir) != lib ]]; then
613 - mkdir -p "${ED}"/usr/$(get_libdir) || die
614 - mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
615 - fi
616 -}
617 -
618 -pkg_postinst() {
619 - use emacs && elisp-site-regen
620 -}
621 -
622 -pkg_postrm() {
623 - use emacs && elisp-site-regen
624 -}