From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F3991382C5 for ; Mon, 19 Mar 2018 01:01:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 474FEE089B; Mon, 19 Mar 2018 01:01:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 04DF9E089B for ; Mon, 19 Mar 2018 01:01:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68653335D4F for ; Mon, 19 Mar 2018 01:01:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99B8D25B for ; Mon, 19 Mar 2018 01:01:22 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1521421256.95ac7c5fdb6fab6da4714aaeba19fe38f9fec00e.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/julia/Manifest dev-lang/julia/julia-0.6.1-r2.ebuild X-VCS-Directories: dev-lang/julia/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 95ac7c5fdb6fab6da4714aaeba19fe38f9fec00e X-VCS-Branch: master Date: Mon, 19 Mar 2018 01:01:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5ea79398-e2e9-47c2-87c8-7ebd2248bdcb X-Archives-Hash: c3c68a5ce78b816b5047386e9e054e9c commit: 95ac7c5fdb6fab6da4714aaeba19fe38f9fec00e Author: Matthias Maier gentoo org> AuthorDate: Sun Mar 18 22:16:56 2018 +0000 Commit: Matthias Maier gentoo org> CommitDate: Mon Mar 19 01:00:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ac7c5f dev-lang/julia: drop 0.6.1-r1 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-lang/julia/Manifest | 2 - dev-lang/julia/julia-0.6.1-r2.ebuild | 194 ----------------------------------- 2 files changed, 196 deletions(-) diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index afcb36f8484..5ddfad23e3c 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,4 +1,2 @@ -DIST julia-0.6.1-bundled.tar.gz 2097663 BLAKE2B 4f16b636e10cbaf9ebd8394d0341c16d7cd7244b6e1467f264150cee64dd8f33aba7381670b7f66f822dd06eaa55d18b0ed04b38931a1943a8212275c1854c26 SHA512 50581da3628930b2d1b89d226f3551fa7b18ca23c322b7e93d1227cc0c3428f255a6087f9859ff2c592014407d53238e01a3847a727a87287fb8c7f679b022d1 -DIST julia-0.6.1.tar.gz 5587691 BLAKE2B b230e717bf4a4f63319883b87bae5b51a2dd2d0be61ffc15eb89304fe6394df67416ed11d40f258a13d7f3ce4272452cfbe1bd482c368d70cb0d3eea9512d8f9 SHA512 8e7b14e8bba1eae1d2a7f43a114dc42e1870d2e692d8892a09475f48839c9b596eb8aaa24b111d3bac6836282a4d7ab64d10c4481c8193f1574cabcf2541db6e DIST julia-0.6.2-bundled.tar.gz 3508868 BLAKE2B b5b3f52d8036e5603b62606cd096f22f8a975f9cab2f9baad902c0208a81868359005e82a17e513a7705ec717750702cdc12ab476ffac3c1c38158f06d80ae99 SHA512 3a9a6cc43aab2eae6c57812287958e3a1ac1718d6fdf08e5ce7c8e8e8a62231fb4d7b6f064e2d6941ac750d8924f5cb37ae3ac4e2d18f366a82c94bdc9e6abe4 DIST julia-0.6.2.tar.gz 5592907 BLAKE2B d6d25f43cd650f6a079c4ba6fe533e6bdbf6a1123255d7651460e297ed3d35a832688e19efddf41c780fbda2eb861bc8ed5f7c59ea7efb5fdf490eb2e7a47f5d SHA512 679050463ed5825d34c477bd44cd91cfecc7d1735a2f52cc70b509afd9883cb60902861643266ecac5ba6cbb03f8fcdd12fc2e87dc41b9ed0eef813fa40610f1 diff --git a/dev-lang/julia/julia-0.6.1-r2.ebuild b/dev-lang/julia/julia-0.6.1-r2.ebuild deleted file mode 100644 index b625513a86a..00000000000 --- a/dev-lang/julia/julia-0.6.1-r2.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -inherit llvm pax-utils toolchain-funcs - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/" -SRC_URI=" - https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz - https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -# julia 0.6* is compatible with llvm-4 -RDEPEND=" - sys-devel/llvm:4= - sys-devel/clang:4=" -LLVM_MAX_SLOT=4 - -RDEPEND+=" - dev-libs/double-conversion:0= - dev-libs/gmp:0= - dev-libs/libgit2:0= - dev-libs/mpfr:0= - dev-libs/openspecfun - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/cholmod:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - >=dev-libs/libpcre2-10.23:0=[jit] - sci-libs/umfpack:0= - sci-mathematics/glpk:0= - >=sys-libs/libunwind-1.1:7= - =virtual/blas-3.6 - virtual/lapack" - -DEPEND="${RDEPEND} - dev-vcs/git - dev-util/patchelf - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.0-fix_build_system.patch -) - -S="${WORKDIR}/julia" - -src_prepare() { - mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die - mkdir deps/srccache || die - mv "${WORKDIR}"/bundled/* deps/srccache || die - rmdir "${WORKDIR}"/bundled || die - - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - # - fix BLAS and LAPACK link interface - - sed -i \ - -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \ - -e 's|git submodule|${EPREFIX}/bin/true|g' \ - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ - deps/Makefile || die - - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" - libblas="${libblas%% *}" - libblas="lib${libblas#-l}" - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" - liblapack="${liblapack%% *}" - liblapack="lib${liblapack#-l}" - - sed -i \ - -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \ - -e "s|GENTOOCFLAGS|${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}|" \ - -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ - -e "s|= libblas|= ${libblas}|" \ - -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \ - -e "s|= liblapack|= ${liblapack}|" \ - Make.inc || die - - sed -i \ - -e "s|,lib)|,$(get_libdir))|g" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \ - Makefile || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - # julia does not play well with the system versions of dsfmt, libuv, - # and utf8proc - - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - USE_SYSTEM_DSFMT=0 - USE_SYSTEM_LIBUV=0 - USE_SYSTEM_PCRE=1 - USE_SYSTEM_RMATH=0 - USE_SYSTEM_UTF8PROC=0 - 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_LIBGIT2=1 - USE_SYSTEM_LIBM=0 - USE_SYSTEM_LIBUNWIND=1 - USE_SYSTEM_LLVM=1 - USE_SYSTEM_MPFR=1 - USE_SYSTEM_OPENLIBM=1 - USE_SYSTEM_OPENSPECFUN=1 - USE_SYSTEM_PATCHELF=1 - USE_SYSTEM_READLINE=1 - USE_SYSTEM_SUITESPARSE=1 - USE_SYSTEM_ZLIB=1 - VERBOSE=1 - libdir="${EROOT}/usr/$(get_libdir)" - EOF - -} - -src_compile() { - - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - emake cleanall - emake VERBOSE=1 julia-release \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') - emake -} - -src_test() { - emake test -} - -src_install() { - # Julia is special. It tries to find a valid git repository (that would - # normally be cloned during compilation/installation). Just make it - # happy... - git init && \ - git config --local user.email "whatyoudoing@example.com" && \ - git config --local user.name "Whyyyyyy" && \ - git commit -a --allow-empty -m "initial" || die "git failed" - - emake install \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - cat > 99julia <<-EOF - LDPATH=${EROOT%/}/usr/$(get_libdir)/julia - EOF - doenvd 99julia - - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/{examples,html} \ - "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/share/doc/julia || die - if [[ $(get_libdir) != lib ]]; then - mkdir -p "${ED}"/usr/$(get_libdir) || die - mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die - fi -}