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/, profiles/, dev-lang/julia/files/
Date: Sun, 24 Feb 2019 03:12:16
Message-Id: 1550977903.ba775c9a6c9a6519cbc864b5516369729873d8be.tamiko@gentoo
1 commit: ba775c9a6c9a6519cbc864b5516369729873d8be
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 24 02:08:26 2019 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 24 03:11:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba775c9a
7
8 dev-lang/julia: drop old
9
10 Package-Manager: Portage-2.3.61, Repoman-2.3.12
11 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
12
13 dev-lang/julia/Manifest | 2 -
14 .../julia/files/julia-1.0.3-fix_build_system.patch | 87 ---------
15 dev-lang/julia/julia-1.0.3.ebuild | 199 ---------------------
16 profiles/package.mask | 5 -
17 4 files changed, 293 deletions(-)
18
19 diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
20 index f102e3c0a1e..90b6da15ca5 100644
21 --- a/dev-lang/julia/Manifest
22 +++ b/dev-lang/julia/Manifest
23 @@ -1,8 +1,6 @@
24 -DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d
25 DIST julia-1.1.0.tar.gz 7681396 BLAKE2B 2038901132bab1ae5ea634e15de2e18771e250c77e967228858f078a6e44e3f1900c1ea464b5db762842f65c4ad8590b70ba6b0b267bf955e86fa7f16a812696 SHA512 da546430df5a9207926faa3fe7b1d2c193a1223a379ce1ff25219c6f4f2d650497d1b0e9091f1cd542fa19bfcf7bf1ee74a52f7d45a06fd8ab4441a5ac4d4a46
26 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
27 DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
28 -DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
29 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
30 DIST julia-llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
31 DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55
32
33 diff --git a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch
34 deleted file mode 100644
35 index 98f4fc5c754..00000000000
36 --- a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch
37 +++ /dev/null
38 @@ -1,87 +0,0 @@
39 -diff --git a/Make.inc b/Make.inc
40 -index e5c102f..c4c6640 100644
41 ---- a/Make.inc
42 -+++ b/Make.inc
43 -@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1
44 - # Directories where said libraries get installed to
45 - prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
46 - bindir := $(prefix)/bin
47 --libdir := $(prefix)/lib
48 -+libdir := $(prefix)/GENTOOLIBDIR
49 - libexecdir := $(prefix)/libexec
50 - datarootdir := $(prefix)/share
51 - docdir := $(datarootdir)/doc/julia
52 -@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT)
53 - JCXXFLAGS += -pedantic
54 - endif
55 - DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
56 --SHIPFLAGS := -O3 -ggdb2 -falign-functions
57 -+SHIPFLAGS := GENTOOCFLAGS
58 - endif
59 -
60 - ifeq ($(USECLANG),1)
61 -@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
62 - JCPPFLAGS := -fasynchronous-unwind-tables
63 - JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
64 - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
65 --SHIPFLAGS := -O3 -g
66 -+SHIPFLAGS := GENTOOCFLAGS
67 - ifeq ($(OS), Darwin)
68 - ifeq ($(USE_LIBCPP), 1)
69 - MACOSX_VERSION_MIN := 10.8
70 -@@ -453,7 +453,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
71 - JCPPFLAGS :=
72 - JCXXFLAGS := -pipe $(fPIC) -fno-rtti
73 - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
74 --SHIPFLAGS := -O3 -g -falign-functions
75 -+SHIPFLAGS := GENTOOCFLAGS
76 - endif
77 -
78 - ifeq ($(USECCACHE), 1)
79 -diff --git a/base/Makefile b/base/Makefile
80 -index 21c7ad4..737e40d 100644
81 ---- a/base/Makefile
82 -+++ b/base/Makefile
83 -@@ -207,7 +207,6 @@ $(build_private_libdir)/libLLVM.dylib:
84 - ln -sf "$$REALPATH" "$@"
85 - ifneq ($(USE_SYSTEM_LLVM),0)
86 - ifneq ($(USE_LLVM_SHLIB),0)
87 --SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
88 - endif
89 - endif
90 -
91 -diff --git a/doc/Makefile b/doc/Makefile
92 -index 3d07733..8bd3bc0 100644
93 ---- a/doc/Makefile
94 -+++ b/doc/Makefile
95 -@@ -29,7 +29,7 @@ deps: UnicodeData.txt
96 - $(JLCHECKSUM) UnicodeData.txt
97 -
98 - clean:
99 -- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt
100 -+ @echo "Do not clean doc/_build/html. Just use it..."
101 -
102 - cleanall: clean
103 -
104 -diff --git a/src/Makefile b/src/Makefile
105 -index 20da34d..84eae21 100644
106 ---- a/src/Makefile
107 -+++ b/src/Makefile
108 -@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h
109 - endif
110 - PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
111 -
112 --ifeq ($(JULIACODEGEN),LLVM)
113 --# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
114 --# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
115 --ifneq ($(USE_LLVM_SHLIB),1)
116 --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
117 --else
118 --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
119 --FLAGS += -DLLVM_SHLIB
120 --endif # USE_LLVM_SHLIB == 1
121 --endif
122 -+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
123 -
124 - COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
125 - DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
126
127 diff --git a/dev-lang/julia/julia-1.0.3.ebuild b/dev-lang/julia/julia-1.0.3.ebuild
128 deleted file mode 100644
129 index 1194c900964..00000000000
130 --- a/dev-lang/julia/julia-1.0.3.ebuild
131 +++ /dev/null
132 @@ -1,199 +0,0 @@
133 -# Copyright 1999-2019 Gentoo Authors
134 -# Distributed under the terms of the GNU General Public License v2
135 -
136 -EAPI=6
137 -
138 -RESTRICT="test"
139 -
140 -inherit llvm pax-utils toolchain-funcs
141 -
142 -MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
143 -MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
144 -MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
145 -MY_DSFMT_V="2.2.3"
146 -
147 -DESCRIPTION="High-performance programming language for technical computing"
148 -HOMEPAGE="https://julialang.org/"
149 -SRC_URI="
150 - https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
151 - https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
152 - https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
153 - https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
154 - http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
155 -"
156 -
157 -LICENSE="MIT"
158 -SLOT="0"
159 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
160 -IUSE=""
161 -
162 -# julia 0.7* needs a patched llvm-6
163 -RDEPEND="
164 - =sys-devel/llvm-6*:=
165 - =sys-devel/clang-6*:="
166 -LLVM_MAX_SLOT=6
167 -
168 -RDEPEND+="
169 - dev-libs/double-conversion:0=
170 - dev-libs/gmp:0=
171 - dev-libs/libgit2:0=
172 - >=dev-libs/libpcre2-10.23:0=[jit]
173 - dev-libs/mpfr:0=
174 - dev-libs/openspecfun
175 - sci-libs/amd:0=
176 - sci-libs/arpack:0=
177 - sci-libs/camd:0=
178 - sci-libs/ccolamd:0=
179 - sci-libs/cholmod:0=
180 - sci-libs/colamd:0=
181 - sci-libs/fftw:3.0=[threads]
182 - sci-libs/openlibm:0=
183 - sci-libs/spqr:0=
184 - sci-libs/umfpack:0=
185 - sci-mathematics/glpk:0=
186 - >=sys-libs/libunwind-1.1:7=
187 - sys-libs/readline:0=
188 - sys-libs/zlib:0=
189 - >=virtual/blas-3.6
190 - virtual/lapack"
191 -
192 -DEPEND="${RDEPEND}
193 - dev-vcs/git
194 - dev-util/patchelf
195 - virtual/pkgconfig"
196 -
197 -PATCHES=(
198 - "${FILESDIR}"/${PN}-1.0.3-fix_build_system.patch
199 -)
200 -
201 -src_unpack() {
202 - tounpack=(${A})
203 - # the main source tree, followed by deps
204 - unpack "${A/%\ */}"
205 -
206 - mkdir -p "${S}/deps/srccache/"
207 - for i in "${tounpack[@]:1}"; do
208 - cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
209 - done
210 -}
211 -
212 -src_prepare() {
213 - default
214 -
215 - # Sledgehammer:
216 - # - prevent fetching of bundled stuff in compile and install phase
217 - # - respect CFLAGS
218 - # - respect EPREFIX and Gentoo specific paths
219 - # - fix BLAS and LAPACK link interface
220 -
221 - sed -i \
222 - -e 's|git submodule|${EPREFIX}/bin/true|g' \
223 - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
224 - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
225 - deps/Makefile || die
226 -
227 - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
228 - libblas="${libblas%% *}"
229 - libblas="lib${libblas#-l}"
230 - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
231 - liblapack="${liblapack%% *}"
232 - liblapack="lib${liblapack#-l}"
233 -
234 - sed -i \
235 - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
236 - -e "s|GENTOOLIBDIR|$(get_libdir)|" \
237 - -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
238 - -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
239 - -e "s|= libblas|= ${libblas}|" \
240 - -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
241 - -e "s|= liblapack|= ${liblapack}|" \
242 - Make.inc || die
243 -
244 - sed -i \
245 - -e "s|,lib)|,$(get_libdir))|g" \
246 - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
247 - Makefile || die
248 -
249 - sed -i \
250 - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
251 - src/Makefile || die
252 -
253 - # disable doc install starting git fetching
254 - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
255 -}
256 -
257 -src_configure() {
258 - # julia does not play well with the system versions of dsfmt, libuv,
259 - # and utf8proc
260 -
261 - # USE_SYSTEM_LIBM=0 implies using external openlibm
262 - cat <<-EOF > Make.user
263 - USE_SYSTEM_ARPACK:=1
264 - USE_SYSTEM_BLAS:=1
265 - USE_SYSTEM_DSFMT:=0
266 - USE_SYSTEM_GMP:=1
267 - USE_SYSTEM_GRISU:=1
268 - USE_SYSTEM_LAPACK:=1
269 - USE_SYSTEM_LIBGIT2:=1
270 - USE_SYSTEM_LIBM:=0
271 - USE_SYSTEM_LIBUNWIND:=1
272 - USE_SYSTEM_LIBUV:=0
273 - USE_SYSTEM_LLVM:=1
274 - USE_LLVM_SHLIB:=1
275 - USE_SYSTEM_MPFR:=1
276 - USE_SYSTEM_OPENLIBM:=1
277 - USE_SYSTEM_OPENSPECFUN:=1
278 - USE_SYSTEM_PATCHELF:=1
279 - USE_SYSTEM_PCRE:=1
280 - USE_SYSTEM_READLINE:=1
281 - USE_SYSTEM_RMATH:=0
282 - USE_SYSTEM_SUITESPARSE:=1
283 - USE_SYSTEM_UTF8PROC:=0
284 - USE_SYSTEM_ZLIB=1
285 - VERBOSE=1
286 - libdir="${EROOT}/usr/$(get_libdir)"
287 - EOF
288 -
289 -}
290 -
291 -src_compile() {
292 -
293 - # Julia accesses /proc/self/mem on Linux
294 - addpredict /proc/self/mem
295 -
296 - emake cleanall
297 - emake julia-release \
298 - prefix="${EPREFIX}/usr" DESTDIR="${D}" \
299 - CC="$(tc-getCC)" CXX="$(tc-getCXX)"
300 - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
301 - emake
302 -}
303 -
304 -src_test() {
305 - emake test
306 -}
307 -
308 -src_install() {
309 - # Julia is special. It tries to find a valid git repository (that would
310 - # normally be cloned during compilation/installation). Just make it
311 - # happy...
312 - git init && \
313 - git config --local user.email "whatyoudoing@×××××××.com" && \
314 - git config --local user.name "Whyyyyyy" && \
315 - git commit -a --allow-empty -m "initial" || die "git failed"
316 -
317 - emake install \
318 - prefix="${EPREFIX}/usr" DESTDIR="${D}" \
319 - CC="$(tc-getCC)" CXX="$(tc-getCXX)"
320 - cat > 99julia <<-EOF
321 - LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
322 - EOF
323 - doenvd 99julia
324 -
325 - dodoc README.md
326 -
327 - mv "${ED}"/usr/etc/julia "${ED}"/etc || die
328 - rmdir "${ED}"/usr/etc || die
329 - mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
330 - rmdir "${ED}"/usr/share/doc/julia || die
331 -}
332
333 diff --git a/profiles/package.mask b/profiles/package.mask
334 index 13483b2ea5c..9b8ca8ef6ae 100644
335 --- a/profiles/package.mask
336 +++ b/profiles/package.mask
337 @@ -244,11 +244,6 @@ dev-db/pgadmin3
338 ~net-libs/libnsl-0
339 ~net-libs/rpcsvc-proto-0
340
341 -# Matthias Maier <tamiko@g.o> (1 Sep 2018)
342 -# Mask 0.7.0 and 1.0.1 for the time being until a compatible LLVM version
343 -# made it into the tree, bug #665192
344 -~dev-lang/julia-1.0.3
345 -
346 # Bernard Cafarelli <voyageur@g.o> (13 Aug 2018)
347 # Beta release with new features, masked for testing
348 =app-text/tesseract-4.0.0_beta*