diff options
38 files changed, 677 insertions, 274 deletions
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index bdc69d0b4f66..f258e9ff1a0b 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1,3 +1,4 @@ DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734 DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56 DIST efl-1.23.1.tar.xz 77466768 BLAKE2B a8507777f84ee356bb53982d2b102eb6413ab274ce98dbd87b62a11b6a89eb7d12e0d858b5dfcbbe3da0e1bcc753c338d4c4b7060c569ee621e71afa2477397d SHA512 9c81f28bb0d87e1a3e5d2204c0e2401d9b3f6dcc34f47cb2b41711ef033b3134f4cd283e87a216a0ce4ee903f721a1f8c2f003577444c5781e7f47ce827201e6 +DIST efl-1.23.2.tar.xz 77492124 BLAKE2B cfd77a9fa75baa12d1e6aeb9b08168ebe13ed720830bd86572d5deb3c72dbb76a51ecf32fb4dddafe0dea56266cb09a3d24cbbfa27cd98618a912e341d3b409f SHA512 59e9bedd9402c204c511a88bc6a697551dd552ddab9bc5e8a30ce1e2095d7452bca1606929693e9e706809e28bc19f039858253b1690ecd1fd2a229aa5b1b3ed diff --git a/dev-libs/efl/efl-1.23.2.ebuild b/dev-libs/efl/efl-1.23.2.ebuild new file mode 100644 index 000000000000..14721b4005ef --- /dev/null +++ b/dev-libs/efl/efl-1.23.2.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson xdg-utils + +DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" +HOMEPAGE="https://www.enlightenment.org" +SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~x86" +IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig + fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl + lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd + pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd + tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm + xpresent zeroconf" + +REQUIRED_USE=" + ?? ( elogind systemd ) + ?? ( gles2 opengl ) + ^^ ( lua luajit ) + ssl + gles2? ( || ( wayland X ) ) + pulseaudio? ( sound ) + wayland? ( gles2 !opengl ) + xim? ( X ) + xpresent? ( X ) +" + +# Requires everything to be enabled unconditionally. +RESTRICT="test" + +RDEPEND=" + dev-libs/check + net-misc/curl + media-libs/giflib:= + media-libs/libpng:0= + sys-apps/dbus + sys-libs/zlib + virtual/jpeg:0= + X? ( + media-libs/freetype + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + wayland? ( x11-libs/libxkbcommon[X] ) + ) + connman? ( net-misc/connman ) + drm? ( + dev-libs/libinput + dev-libs/wayland + media-libs/mesa[gbm] + x11-libs/libdrm + x11-libs/libxkbcommon + ) + elogind? ( + sys-auth/elogind + virtual/libudev + ) + fontconfig? ( media-libs/fontconfig ) + fribidi? ( dev-libs/fribidi ) + gles2? ( + media-libs/mesa[egl,gles2] + virtual/opengl + ) + glib? ( dev-libs/glib:2 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + hyphen? ( dev-libs/hyphen ) + ibus? ( app-i18n/ibus ) + jpeg2k? ( media-libs/openjpeg:= ) + json? ( >=media-libs/rlottie-0.0.1_pre20191101 ) + lua? ( dev-lang/lua:* ) + luajit? ( dev-lang/luajit:* ) + mono? ( dev-lang/mono ) + opengl? ( virtual/opengl ) + pdf? ( app-text/poppler:=[cxx] ) + physics? ( sci-physics/bullet:= ) + postscript? ( app-text/libspectre ) + pulseaudio? ( media-sound/pulseaudio ) + raw? ( media-libs/libraw:= ) + scim? ( app-i18n/scim ) + sdl? ( media-libs/libsdl2 ) + sound? ( media-libs/libsndfile ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + ) + svg? ( gnome-base/librsvg ) + system-lz4? ( app-arch/lz4 ) + systemd? ( sys-apps/systemd:= ) + tiff? ( media-libs/tiff:0= ) + tslib? ( x11-libs/tslib:= ) + unwind? ( sys-libs/libunwind ) + v4l? ( media-libs/libv4l ) + vlc? ( media-video/vlc ) + vnc? ( net-libs/libvncserver ) + wayland? ( + dev-libs/wayland + media-libs/mesa[gles2,wayland] + x11-libs/libxkbcommon + ) + webp? ( media-libs/libwebp:= ) + xine? ( media-libs/xine-lib ) + xpm? ( x11-libs/libXpm ) + xpresent? ( x11-libs/libXpresent ) + zeroconf? ( net-dns/avahi ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext )" + +src_configure() { + local emesonargs=( + --buildtype=release + + -D buffer=false + -D cocoa=false + -D drm-deprecated=false + -D g-mainloop=false + -D install-eo-files=false + -D mono-beta=false + -D pixman=false + -D wl-deprecated=false + -D xgesture=false + + -D edje-sound-and-video=true + -D eeze=true + -D libmount=true + -D native-arch-optimization=true + -D xinput2=true + -D xinput22=true + + $(meson_use X x11) + $(meson_use debug debug-threads) + $(meson_use drm) + $(meson_use elogind) + $(meson_use examples build-examples) + $(meson_use fbcon fb) + $(meson_use fontconfig) + $(meson_use fribidi) + $(meson_use glib) + $(meson_use gstreamer) + $(meson_use harfbuzz) + $(meson_use hyphen) + $(meson_use luajit elua) + $(meson_use nls) + $(meson_use physics) + $(meson_use pulseaudio) + $(meson_use sdl) + $(meson_use sound audio) + $(meson_use systemd) + $(meson_use tslib) + $(meson_use v4l v4l2) + $(meson_use vnc vnc-server) + $(meson_use wayland wl) + $(meson_use xpresent) + $(meson_use zeroconf avahi) + + $(meson_use !system-lz4 embedded-lz4) + ) + + if use opengl; then + emesonargs+=( -D opengl=full ) + elif use gles2; then + emesonargs+=( -D opengl=es-egl ) + else + emesonargs+=( -D opengl=none ) + fi + + if use gnutls; then + emesonargs+=( -D crypto=gnutls ) + else + emesonargs+=( -D crypto=openssl ) + fi + + if use connman; then + emesonargs+=( -D network-backend=connman ) + else + emesonargs+=( -D network-backend=none ) + fi + + if use static-libs; then + emesonargs+=( -D evas-modules=static ) + else + emesonargs+=( -D evas-modules=shared ) + fi + + local disabledEvasLoaders="" + ! use bmp && disabledEvasLoaders+="bmp,wbmp," + ! use dds && disabledEvasLoaders+="dds," + ! use eet && disabledEvasLoaders+="eet," + ! use gstreamer && disabledEvasLoaders+="gst," + ! use ico && disabledEvasLoaders+="ico," + ! use jpeg2k && disabledEvasLoaders+="jp2k," + ! use json && disabledEvasLoaders+="json," + ! use pdf && disabledEvasLoaders+="pdf," + ! use pmaps && disabledEvasLoaders+="pmaps," + ! use postscript && disabledEvasLoaders+="ps," + ! use psd && disabledEvasLoaders+="psd," + ! use raw && disabledEvasLoaders+="raw," + ! use svg && disabledEvasLoaders+="rsvg,svg," + ! use tga && disabledEvasLoaders+="tga," + ! use tgv && disabledEvasLoaders+="tgv," + ! use tiff && disabledEvasLoaders+="tiff," + ! use webp && disabledEvasLoaders+="webp," + ! use xcf && disabledEvasLoaders+="xcf," + ! use xpm && disabledEvasLoaders+="xpm," + [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1} + emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" ) + + local disabledImfLoaders="" + ! use ibus && disabledImfLoaders+="ibus," + ! use scim && disabledImfLoaders+="scim," + ! use xim && disabledImfLoaders+="xim," + [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1} + emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" ) + + local disabledEmotionLoaders="gstreamer," + ! use gstreamer && disabledEmotionLoaders+="gstreamer1," + ! use vlc && disabledEmotionLoaders+="libvlc," + ! use xine && disabledEmotionLoaders+="xine," + disabledEmotionLoaders=${disabledEmotionLoaders::-1} + emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" ) + + local disabledGenericEmotionLoaders="" + ! use vlc && disabledGenericEmotionLoaders+="vlc" + emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" ) + + local bindingsList="cxx," + use luajit && bindingsList+="luajit," + use mono && bindingsList+="mono," + [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1} + emesonargs+=( -D bindings="${bindingsList}" ) + + local luaChoice="" + if use luajit; then + luaChoice+="luajit" + else + luaChoice+="lua" + fi + emesonargs+=( -D lua-interpreter="${luaChoice}" ) + + meson_src_configure +} + +src_compile() { + meson_src_compile + + if use doc; then + cd doc/ || die "Failed to switch into doc/ dir." + doxygen . || die "Doxygen failed to run." + fi +} + +src_install() { + use doc && local HTML_DOCS=( "${S}"/doc/html/. ) + meson_src_install + + if use examples; then + dodoc -r "${BUILD_DIR}"/src/examples/ + fi +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest index af1e1f9445fa..25b636a3aed2 100644 --- a/dev-libs/libvoikko/Manifest +++ b/dev-libs/libvoikko/Manifest @@ -1 +1,2 @@ DIST libvoikko-4.2.tar.gz 653769 BLAKE2B 6c0e665d7b5eca394b49dbebf38a0815b1fe1ea328efa305e9d1574b551c633be6b2326b5b402bbc454557a559a821a28c668a1845b21a71c378d0e97103ca53 SHA512 483d3c259a52ae772d52f708789c3df39a4857188c7b9035ce5db8b16bfa4ef144e2ffd557dd6a0655e4c9a6984529784e4098bc949a1bc8a0a50529fee49656 +DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988 diff --git a/dev-libs/libvoikko/libvoikko-4.3.ebuild b/dev-libs/libvoikko/libvoikko-4.3.ebuild new file mode 100644 index 000000000000..7bdff963650d --- /dev/null +++ b/dev-libs/libvoikko/libvoikko-4.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{5..7}} ) + +inherit python-r1 + +DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language" +HOMEPAGE="https://voikko.puimula.org/" +SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz" +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="+expvfst +hfst" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +DEPEND="${PYTHON_DEPS} + hfst? ( >=dev-util/hfstospell-0.5.0 )" +RDEPEND="${DEPEND}" + +src_configure() { + local myconf=( + --prefix=/usr + --with-dictionary-path=/usr/share/voikko + $(use_enable expvfst) + ) + + if ! use hfst ; then + myconf+=( --disable-hfst ) + fi + + econf "${myconf[@]}" +} + +src_install() { + python_setup + default + + python_foreach_impl python_domodule python/libvoikko.py +} diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild index b0d581bd9ff5..664c0aa44847 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild @@ -13,8 +13,8 @@ inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/llvm # Keep in sync with sys-devel/llvm ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR ) @@ -53,6 +53,11 @@ pkg_setup() { python-any-r1_pkg_setup } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' llvm +} + src_prepare() { # Python is needed to run tests using lit python_setup diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild index ea47038cb443..d47587faed9b 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.9999.ebuild @@ -13,9 +13,9 @@ inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="OCaml bindings for LLVM" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/llvm # Keep in sync with sys-devel/llvm ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 @@ -52,6 +52,11 @@ pkg_setup() { python-any-r1_pkg_setup } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' llvm +} + src_prepare() { # Python is needed to run tests using lit python_setup diff --git a/dev-python/clang-python/clang-python-10.0.0.9999.ebuild b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild index 5a65d445f01f..24e14b038ecf 100644 --- a/dev-python/clang-python/clang-python-10.0.0.9999.ebuild +++ b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild @@ -9,10 +9,8 @@ inherit git-r3 python-r1 DESCRIPTION="Python bindings for sys-devel/clang" HOMEPAGE="https://llvm.org/" SRC_URI="" -S=${WORKDIR}/${P}/bindings/python - -EGIT_REPO_URI="https://git.llvm.org/git/clang.git - https://github.com/llvm-mirror/clang.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/clang/bindings/python LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -32,7 +30,7 @@ DEPEND="${RDEPEND}" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' bindings/python + git-r3_checkout '' '' '' clang/bindings/python } python_test() { diff --git a/dev-python/clang-python/clang-python-9.0.1.9999.ebuild b/dev-python/clang-python/clang-python-9.0.1.9999.ebuild index d1c47b42ebfc..45d2a38e5e59 100644 --- a/dev-python/clang-python/clang-python-9.0.1.9999.ebuild +++ b/dev-python/clang-python/clang-python-9.0.1.9999.ebuild @@ -9,11 +9,9 @@ inherit git-r3 python-r1 DESCRIPTION="Python bindings for sys-devel/clang" HOMEPAGE="https://llvm.org/" SRC_URI="" -S=${WORKDIR}/${P}/bindings/python - -EGIT_REPO_URI="https://git.llvm.org/git/clang.git - https://github.com/llvm-mirror/clang.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/clang/bindings/python LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -33,7 +31,7 @@ DEPEND="${RDEPEND}" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' bindings/python + git-r3_checkout '' '' '' clang/bindings/python } python_test() { diff --git a/dev-python/lit/lit-10.0.0.9999.ebuild b/dev-python/lit/lit-10.0.0.9999.ebuild index 32320b7920e1..05acb219e329 100644 --- a/dev-python/lit/lit-10.0.0.9999.ebuild +++ b/dev-python/lit/lit-10.0.0.9999.ebuild @@ -9,10 +9,8 @@ inherit distutils-r1 git-r3 multiprocessing DESCRIPTION="A stand-alone install of the LLVM suite testing tool" HOMEPAGE="https://llvm.org/" SRC_URI="" -S=${WORKDIR}/${P}/utils/lit - -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/llvm/utils/lit LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -31,7 +29,7 @@ BDEPEND=" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' utils/lit + git-r3_checkout '' '' '' llvm/utils/lit } python_test() { diff --git a/dev-python/lit/lit-9.0.1.9999.ebuild b/dev-python/lit/lit-9.0.1.9999.ebuild index c9fb8cb28154..ca1cce6c00b2 100644 --- a/dev-python/lit/lit-9.0.1.9999.ebuild +++ b/dev-python/lit/lit-9.0.1.9999.ebuild @@ -9,11 +9,9 @@ inherit distutils-r1 git-r3 multiprocessing DESCRIPTION="A stand-alone install of the LLVM suite testing tool" HOMEPAGE="https://llvm.org/" SRC_URI="" -S=${WORKDIR}/${P}/utils/lit - -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/llvm/utils/lit LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -32,7 +30,7 @@ BDEPEND=" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' utils/lit + git-r3_checkout '' '' '' llvm/utils/lit } python_test() { diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild index 81f32e23229d..63bc879c8b92 100644 --- a/dev-util/lldb/lldb-10.0.0.9999.ebuild +++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild @@ -14,8 +14,8 @@ inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/lldb.git - https://github.com/llvm-mirror/lldb.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/lldb LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -49,18 +49,10 @@ pkg_setup() { } src_unpack() { - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi + local dirs=( lldb ) + use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest - fi - git-r3_checkout + git-r3_checkout '' '' '' "${dirs[@]}" } src_configure() { @@ -90,7 +82,7 @@ src_configure() { -DLLDB_TEST_C_COMPILER="$(type -P clang)" -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" ) diff --git a/dev-util/lldb/lldb-9.0.1.9999.ebuild b/dev-util/lldb/lldb-9.0.1.9999.ebuild index 9389776f49b5..2b8872f4261c 100644 --- a/dev-util/lldb/lldb-9.0.1.9999.ebuild +++ b/dev-util/lldb/lldb-9.0.1.9999.ebuild @@ -14,9 +14,9 @@ inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \ DESCRIPTION="The LLVM debugger" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/lldb.git - https://github.com/llvm-mirror/lldb.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/lldb LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -50,18 +50,10 @@ pkg_setup() { } src_unpack() { - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi + local dirs=( lldb ) + use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest - fi - git-r3_checkout + git-r3_checkout '' '' '' "${dirs[@]}" } src_configure() { @@ -90,7 +82,7 @@ src_configure() { -DLLDB_TEST_C_COMPILER="$(type -P clang)" -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" ) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index f8f51ecb694a..549dd5f2e56e 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -692,7 +692,7 @@ python_optimize() { if [[ ${f} == /* && -d ${D%/}${f} ]]; then set -- "${D%/}${f}" "${@}" fi - done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))' || die) + done < <("${PYTHON}" -c 'import sys; print("".join(x + "\0" for x in sys.path))' || die) debug-print "${FUNCNAME}: using sys.path: ${*/%/;}" fi diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest index 0a8e05f4f999..83d307c1e78d 100644 --- a/media-libs/rlottie/Manifest +++ b/media-libs/rlottie/Manifest @@ -1 +1,2 @@ DIST rlottie-0.0.1_pre20190920.tar.gz 7891127 BLAKE2B bc9e37e74f21f681fffae3e6140662782ebce7bee58c4205cdb9f927f5246aedc83efc516adecf6c61fb5fc06aff58d1c65bfe3cca18d02bf4e9f2d71890869e SHA512 8d903e877cb83fd0af8cb7b6dd96e09a423201c0b88b2c8c733e54bb873a7b48377e5eb8eeefa620e284c2d1b61fcfe0aa309d180c88428aaccdb0f1ac4a48ed +DIST rlottie-0.0.1_pre20191101.tar.gz 7896379 BLAKE2B 2361415074af71340c80b91595edab0b53e85ce704400ba5574e1efc19e6bc2cd7dff8b0e2d32b9f0666889c4d8bd2abbffa943f551b4ee3e4787aa94cfbbe01 SHA512 c4c4dae0f0da4d0bd4b3ea63066335794111f1bd4a33f8844494b9b9e79de46cd994b5e9d185b175cba19d1665ef1fdb0d89babfd71cf7dd0fbf0535ba83ab96 diff --git a/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild b/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild new file mode 100644 index 000000000000..37f6c9638e02 --- /dev/null +++ b/media-libs/rlottie/rlottie-0.0.1_pre20191101.ebuild @@ -0,0 +1,39 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +MY_COMMIT="ddf0f149aaee7625f8cde1ae15f0605e57274445" + +DESCRIPTION="A platform independent standalone library that plays Lottie Animations" +HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie" +SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD FTL LGPL-2.1 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" + +S="${WORKDIR}/rlottie-${MY_COMMIT}" + +PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch ) + +src_configure() { + local emesonargs=( + -D example=false + $(meson_use test) + ) + + meson_src_configure +} + +src_test() { + cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR." + eninja test +} diff --git a/metadata/install-qa-check.d/60python-pyc b/metadata/install-qa-check.d/60python-pyc new file mode 100644 index 000000000000..ef668aed9950 --- /dev/null +++ b/metadata/install-qa-check.d/60python-pyc @@ -0,0 +1,84 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# QA check: ensure that Python modules are compiled after installing +# Maintainer: Python project <python@gentoo.org> + +inherit python-utils-r1 + +python_pyc_check() { + local impl missing=() outdated=() + for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do + python_export "${impl}" EPYTHON PYTHON + [[ -x ${PYTHON} ]] || continue + local sitedir=$(python_get_sitedir "${impl}") + + if [[ -d ${D}${sitedir} ]]; then + local suffixes=() subdir= + case ${EPYTHON} in + python2*) + suffixes=( .py{c,o} ) + ;; + pypy) + suffixes=( .pyc ) + ;; + python3*|pypy3*) + local tag=$("${PYTHON}" -c 'import sys; print(sys.implementation.cache_tag)') + suffixes=( ".${tag}"{,.opt-{1,2}}.pyc ) + subdir=__pycache__/ + ;; + *) + # skip testing unknown impl + continue + ;; + esac + + einfo "Verifying compiled files in ${sitedir}" + local f s + while read -d $'\0' -r f; do + local dir=${f%/*} + local basename=${f##*/} + basename=${basename%.py} + + for s in "${suffixes[@]}"; do + local cache=${dir}/${subdir}${basename}${s} + if [[ ! -f ${cache} ]]; then + missing+=( "${cache}" ) + elif [[ ${f} -nt ${cache} ]]; then + outdated+=( "${cache}" ) + fi + done + done < <(find "${D}${sitedir}" -name '*.py' -print0) + fi + done + + if [[ ${missing[@]} ]]; then + eqawarn + eqawarn "This package installs one or more Python modules that are not byte-compiled." + eqawarn "The following files are missing:" + eqawarn + eqatag -v python-pyc.missing "${missing[@]#${D}}" + fi + + if [[ ${outdated[@]} ]]; then + eqawarn + eqawarn "This package installs one or more compiled Python modules that have older" + eqawarn "timestamps than the corresponding source files:" + eqawarn + eqatag -v python-pyc.outdated "${outdated[@]#${D}}" + fi + + if [[ ${missing[@]} || ${outdated[@]} ]]; then + eqawarn + eqawarn "Please either fix the upstream build system to byte-compile Python modules" + eqawarn "correctly, or call python_optimize after installing them. For more" + eqawarn "information, see:" + eqawarn "https://wiki.gentoo.org/wiki/Project:Python/Byte_compiling" + eqawarn + fi +} + +python_pyc_check +: # guarantee successful exit + +# vim:ft=ebuild diff --git a/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild index d1ce28354dec..6b707e3d41ff 100644 --- a/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild +++ b/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild @@ -8,8 +8,8 @@ inherit bash-completion-r1 git-r3 DESCRIPTION="Common files shared between multiple slots of clang" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/clang.git - https://github.com/llvm-mirror/clang.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/clang LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -20,7 +20,7 @@ PDEPEND="sys-devel/clang:*" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' utils/bash-autocomplete.sh + git-r3_checkout '' '' '' clang/utils/bash-autocomplete.sh } src_configure() { :; } diff --git a/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild b/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild index cc703baf0c50..eecb0ff749dc 100644 --- a/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild +++ b/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild @@ -8,9 +8,9 @@ inherit bash-completion-r1 git-r3 DESCRIPTION="Common files shared between multiple slots of clang" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/clang.git - https://github.com/llvm-mirror/clang.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/clang LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -21,7 +21,7 @@ PDEPEND="sys-devel/clang:*" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' utils/bash-autocomplete.sh + git-r3_checkout '' '' '' clang/utils/bash-autocomplete.sh } src_configure() { :; } diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild index aa2c3a2ba5d8..7213d45d1617 100644 --- a/sys-devel/clang/clang-10.0.0.9999.ebuild +++ b/sys-devel/clang/clang-10.0.0.9999.ebuild @@ -14,11 +14,9 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" SRC_URI="" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" # We need extra level of indirection for CLANG_RESOURCE_DIR -S=${WORKDIR}/x/y/${P} - -EGIT_REPO_URI="https://git.llvm.org/git/clang.git - https://github.com/llvm-mirror/clang.git" +S=${WORKDIR}/x/${P}/clang # Keep in sync with sys-devel/llvm ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR ) @@ -82,26 +80,16 @@ pkg_setup() { src_unpack() { # create extra parent dir for CLANG_RESOURCE_DIR - mkdir -p x/y || die - cd x/y || die - - git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git - https://github.com/llvm-mirror/clang-tools-extra.git" - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi - git-r3_fetch + mkdir -p x || die - git-r3_checkout https://llvm.org/git/clang-tools-extra.git \ - "${S}"/tools/extra - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' \ - lib/Testing/Support utils/{lit,llvm-lit,unittest} - fi - git-r3_checkout "${EGIT_REPO_URI}" "${S}" + local dirs=( clang clang-tools-extra ) + use test && dirs+=( + llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest} + ) + git-r3_fetch + git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/x/${P}" '' "${dirs[@]}" + mv "${WORKDIR}/x/${P}/clang-tools-extra" \ + "${WORKDIR}/x/${P}/clang/tools/extra" || die } check_distribution_components() { @@ -258,7 +246,7 @@ multilib_src_configure() { -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) ) use test && mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/${P}/llvm" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" ) diff --git a/sys-devel/clang/clang-9.0.1.9999.ebuild b/sys-devel/clang/clang-9.0.1.9999.ebuild index 848de712e241..788ba009941a 100644 --- a/sys-devel/clang/clang-9.0.1.9999.ebuild +++ b/sys-devel/clang/clang-9.0.1.9999.ebuild @@ -14,12 +14,10 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" SRC_URI="" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" # We need extra level of indirection for CLANG_RESOURCE_DIR -S=${WORKDIR}/x/y/${P} - -EGIT_REPO_URI="https://git.llvm.org/git/clang.git - https://github.com/llvm-mirror/clang.git" -EGIT_BRANCH="release_90" +S=${WORKDIR}/x/${P}/clang # Keep in sync with sys-devel/llvm ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 @@ -90,26 +88,16 @@ pkg_setup() { src_unpack() { # create extra parent dir for CLANG_RESOURCE_DIR - mkdir -p x/y || die - cd x/y || die - - git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git - https://github.com/llvm-mirror/clang-tools-extra.git" - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi - git-r3_fetch + mkdir -p x || die - git-r3_checkout https://llvm.org/git/clang-tools-extra.git \ - "${S}"/tools/extra - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' \ - lib/Testing/Support utils/{lit,llvm-lit,unittest} - fi - git-r3_checkout "${EGIT_REPO_URI}" "${S}" + local dirs=( clang clang-tools-extra ) + use test && dirs+=( + llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest} + ) + git-r3_fetch + git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/x/${P}" '' "${dirs[@]}" + mv "${WORKDIR}/x/${P}/clang-tools-extra" \ + "${WORKDIR}/x/${P}/clang/tools/extra" || die } multilib_src_configure() { @@ -143,7 +131,7 @@ multilib_src_configure() { -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) ) use test && mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/${P}/llvm" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" ) diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.0.9999.ebuild index 9d1c88d828d3..c0a2e884c80d 100644 --- a/sys-devel/lld/lld-10.0.0.9999.ebuild +++ b/sys-devel/lld/lld-10.0.0.9999.ebuild @@ -13,8 +13,8 @@ inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/lld.git - https://github.com/llvm-mirror/lld.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/lld LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -39,18 +39,10 @@ pkg_setup() { } src_unpack() { - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi + local dirs=( lld ) + use test && dirs+=( llvm/utils/{lit,unittest} ) git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' utils/{lit,unittest} - fi - git-r3_checkout + git-r3_checkout '' '' '' "${dirs[@]}" } src_configure() { @@ -61,7 +53,7 @@ src_configure() { ) use test && mycmakeargs+=( -DLLVM_BUILD_TESTS=ON - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" ) diff --git a/sys-devel/lld/lld-9.0.1.9999.ebuild b/sys-devel/lld/lld-9.0.1.9999.ebuild index 6935200f15c6..07ffc6f41c97 100644 --- a/sys-devel/lld/lld-9.0.1.9999.ebuild +++ b/sys-devel/lld/lld-9.0.1.9999.ebuild @@ -13,9 +13,9 @@ inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/lld.git - https://github.com/llvm-mirror/lld.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/lld LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -40,18 +40,10 @@ pkg_setup() { } src_unpack() { - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi + local dirs=( lld ) + use test && dirs+=( llvm/utils/{lit,unittest} ) git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' utils/{lit,unittest} - fi - git-r3_checkout + git-r3_checkout '' '' '' "${dirs[@]}" } src_configure() { @@ -62,7 +54,7 @@ src_configure() { ) use test && mycmakeargs+=( -DLLVM_BUILD_TESTS=ON - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" ) diff --git a/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild index 11a022242bd0..7edf27153de4 100644 --- a/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild +++ b/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild @@ -8,8 +8,8 @@ inherit git-r3 DESCRIPTION="Common files shared between multiple slots of LLVM" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/llvm LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -20,7 +20,7 @@ RDEPEND="!sys-devel/llvm:0" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' utils/vim + git-r3_checkout '' '' '' llvm/utils/vim } src_configure() { :; } diff --git a/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild index ae78e1164ce5..b3b79ac4e6c6 100644 --- a/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild +++ b/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild @@ -8,9 +8,9 @@ inherit git-r3 DESCRIPTION="Common files shared between multiple slots of LLVM" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/llvm LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -21,7 +21,7 @@ RDEPEND="!sys-devel/llvm:0" src_unpack() { git-r3_fetch - git-r3_checkout '' '' '' utils/vim + git-r3_checkout '' '' '' llvm/utils/vim } src_configure() { :; } diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild index 77a6c8423834..c5cd658cd7b0 100644 --- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild @@ -14,8 +14,8 @@ inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \ DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/llvm # Those are in lib/Targets, without explicit CMakeLists.txt mention ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR ) @@ -91,6 +91,11 @@ python_check_deps() { has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' llvm +} + check_live_ebuild() { local prod_targets=( $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \ diff --git a/sys-devel/llvm/llvm-9.0.1.9999.ebuild b/sys-devel/llvm/llvm-9.0.1.9999.ebuild index 5ff9e20d7e12..45e29fba1c7b 100644 --- a/sys-devel/llvm/llvm-9.0.1.9999.ebuild +++ b/sys-devel/llvm/llvm-9.0.1.9999.ebuild @@ -14,9 +14,9 @@ inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \ DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/llvm # Keep in sync with CMakeLists.txt ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 @@ -88,6 +88,11 @@ python_check_deps() { has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' llvm +} + src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild index a2a2f1e49bf9..0ef9de1da9b2 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild @@ -14,8 +14,8 @@ inherit check-reqs cmake-utils flag-o-matic git-r3 llvm \ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git - https://github.com/llvm-mirror/compiler-rt.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/compiler-rt LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -60,18 +60,10 @@ pkg_setup() { } src_unpack() { - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi + local dirs=( compiler-rt ) + use test && dirs+=( llvm/lib/Testing/Support llvm/utils/unittest ) git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' utils/unittest - fi - git-r3_checkout + git-r3_checkout '' '' '' "${dirs[@]}" } src_prepare() { @@ -88,7 +80,7 @@ src_prepare() { src_configure() { # pre-set since we need to pass it to cmake - BUILD_DIR=${WORKDIR}/${P}_build + BUILD_DIR=${WORKDIR}/${P}/compiler-rt_build if use clang; then local -x CC=${CHOST}-clang @@ -113,7 +105,7 @@ src_configure() { ) if use test; then mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild index f147105624d8..ffb67b0bddf6 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.9999.ebuild @@ -14,9 +14,9 @@ inherit check-reqs cmake-utils flag-o-matic git-r3 llvm \ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git - https://github.com/llvm-mirror/compiler-rt.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/compiler-rt LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -61,18 +61,10 @@ pkg_setup() { } src_unpack() { - if use test; then - # needed for patched gtest - git-r3_fetch "https://git.llvm.org/git/llvm.git - https://github.com/llvm-mirror/llvm.git" - fi + local dirs=( compiler-rt ) + use test && dirs+=( llvm/utils/unittest ) git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm '' utils/unittest - fi - git-r3_checkout + git-r3_checkout '' '' '' "${dirs[@]}" } src_prepare() { @@ -89,7 +81,7 @@ src_prepare() { src_configure() { # pre-set since we need to pass it to cmake - BUILD_DIR=${WORKDIR}/${P}_build + BUILD_DIR=${WORKDIR}/${P}/compiler-rt_build if use clang; then local -x CC=${CHOST}-clang @@ -114,7 +106,7 @@ src_configure() { ) if use test; then mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild index 13a5397acde0..fe9fd52093ac 100644 --- a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild @@ -14,8 +14,8 @@ inherit cmake-utils flag-o-matic git-r3 llvm multiprocessing \ DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git - https://github.com/llvm-mirror/compiler-rt.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/compiler-rt LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -49,6 +49,11 @@ pkg_setup() { python-any-r1_pkg_setup } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' compiler-rt +} + test_compiler() { $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild index 88bfd8aa0ad2..898c8d917487 100644 --- a/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.9999.ebuild @@ -14,9 +14,9 @@ inherit cmake-utils flag-o-matic git-r3 llvm multiprocessing \ DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git - https://github.com/llvm-mirror/compiler-rt.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/compiler-rt LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" @@ -50,6 +50,11 @@ pkg_setup() { python-any-r1_pkg_setup } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' compiler-rt +} + test_compiler() { $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild index 83d8eeaa8c40..9c722cc33620 100644 --- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild @@ -16,8 +16,8 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \ DESCRIPTION="New implementation of the C++ standard library, targeting C++11" HOMEPAGE="https://libcxx.llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git - https://github.com/llvm-mirror/libcxx.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/libcxx LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -73,6 +73,11 @@ pkg_setup() { fi } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' libcxx +} + test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild index 5a84e2f5f998..f70527cd308e 100644 --- a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild +++ b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild @@ -16,9 +16,9 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \ DESCRIPTION="New implementation of the C++ standard library, targeting C++11" HOMEPAGE="https://libcxx.llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git - https://github.com/llvm-mirror/libcxx.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/libcxx LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -74,6 +74,11 @@ pkg_setup() { fi } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' libcxx +} + test_compiler() { $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ <<<'int main() { return 0; }' &>/dev/null diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild index edc18f6fea90..8a1fd469ee76 100644 --- a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild @@ -13,8 +13,8 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/libcxxabi.git - https://github.com/llvm-mirror/libcxxabi.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/libcxxabi LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -49,14 +49,9 @@ pkg_setup() { } src_unpack() { - # we need the headers - git-r3_fetch "https://git.llvm.org/git/libcxx.git - https://github.com/llvm-mirror/libcxx.git" git-r3_fetch - - git-r3_checkout https://llvm.org/git/libcxx.git \ - "${WORKDIR}"/libcxx '' - git-r3_checkout + # we always need libcxx for the headers + git-r3_checkout '' '' '' libcxx{,abi} } multilib_src_configure() { @@ -68,7 +63,7 @@ multilib_src_configure() { -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include @@ -89,7 +84,7 @@ multilib_src_configure() { build_libcxx() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxx + local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( -DLIBCXX_LIBDIR_SUFFIX= diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild index 70fcb998c05d..591bf45eca84 100644 --- a/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.9999.ebuild @@ -13,9 +13,9 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/libcxxabi.git - https://github.com/llvm-mirror/libcxxabi.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/libcxxabi LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -50,14 +50,9 @@ pkg_setup() { } src_unpack() { - # we need the headers - git-r3_fetch "https://git.llvm.org/git/libcxx.git - https://github.com/llvm-mirror/libcxx.git" git-r3_fetch - - git-r3_checkout https://llvm.org/git/libcxx.git \ - "${WORKDIR}"/libcxx '' - git-r3_checkout + # we always need libcxx for the headers + git-r3_checkout '' '' '' libcxx{,abi} } multilib_src_configure() { @@ -69,7 +64,7 @@ multilib_src_configure() { -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include # upstream is omitting standard search path for this # probably because gcc & clang are bundling their own unwind.h -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include @@ -90,7 +85,7 @@ multilib_src_configure() { build_libcxx() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxx + local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( -DLIBCXX_LIBDIR_SUFFIX= diff --git a/sys-libs/libomp/libomp-10.0.0.9999.ebuild b/sys-libs/libomp/libomp-10.0.0.9999.ebuild index 107506fa8c8a..905a345680bd 100644 --- a/sys-libs/libomp/libomp-10.0.0.9999.ebuild +++ b/sys-libs/libomp/libomp-10.0.0.9999.ebuild @@ -13,8 +13,8 @@ inherit cmake-multilib git-r3 linux-info multiprocessing python-any-r1 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" HOMEPAGE="https://openmp.llvm.org" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/openmp.git - https://github.com/llvm-mirror/openmp.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/openmp LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -71,6 +71,11 @@ pkg_setup() { use test && python-any-r1_pkg_setup } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' openmp +} + multilib_src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( diff --git a/sys-libs/libomp/libomp-9.0.1.9999.ebuild b/sys-libs/libomp/libomp-9.0.1.9999.ebuild index 024defb5b3be..df9c8ea5a367 100644 --- a/sys-libs/libomp/libomp-9.0.1.9999.ebuild +++ b/sys-libs/libomp/libomp-9.0.1.9999.ebuild @@ -13,9 +13,9 @@ inherit cmake-multilib git-r3 linux-info multiprocessing python-any-r1 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" HOMEPAGE="https://openmp.llvm.org" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/openmp.git - https://github.com/llvm-mirror/openmp.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/openmp LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -72,6 +72,11 @@ pkg_setup() { use test && python-any-r1_pkg_setup } +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' openmp +} + multilib_src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild index 4f882571235f..15c2cd25376a 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild @@ -12,8 +12,8 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/libunwind.git - https://github.com/llvm-mirror/libunwind.git" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +S=${WORKDIR}/${P}/libunwind LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -32,6 +32,13 @@ BDEPEND=" # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo +src_unpack() { + local dirs=( libunwind ) + use test && dirs+=( libcxx{,abi} ) + git-r3_fetch + git-r3_checkout '' '' '' "${dirs[@]}" +} + python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -40,24 +47,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - if use test; then - git-r3_fetch "https://git.llvm.org/git/libcxx.git - https://github.com/llvm-mirror/libcxx.git" - git-r3_fetch "https://git.llvm.org/git/libcxxabi.git - https://github.com/llvm-mirror/libcxxabi.git" - fi - git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/libcxx.git \ - "${WORKDIR}"/libcxx - git-r3_checkout https://llvm.org/git/libcxxabi.git \ - "${WORKDIR}"/libcxxabi - fi - git-r3_checkout -} - multilib_src_configure() { local libdir=$(get_libdir) @@ -80,7 +69,7 @@ multilib_src_configure() { mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/${P}/libcxx" ) fi @@ -89,7 +78,7 @@ multilib_src_configure() { build_libcxxabi() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi + local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxxabi local BUILD_DIR=${BUILD_DIR}/libcxxabi local mycmakeargs=( -DLIBCXXABI_LIBDIR_SUFFIX= @@ -98,7 +87,7 @@ build_libcxxabi() { -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_INCLUDE_TESTS=OFF - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include ) @@ -108,7 +97,7 @@ build_libcxxabi() { build_libcxx() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxx + local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( -DLIBCXX_LIBDIR_SUFFIX= @@ -117,7 +106,7 @@ build_libcxx() { -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}/${P}"/libcxxabi/include -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild index 1e3f2baa716b..273869021e64 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.9999.ebuild @@ -12,9 +12,9 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" SRC_URI="" -EGIT_REPO_URI="https://git.llvm.org/git/libunwind.git - https://github.com/llvm-mirror/libunwind.git" -EGIT_BRANCH="release_90" +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" +EGIT_BRANCH="release/9.x" +S=${WORKDIR}/${P}/libunwind LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" @@ -33,6 +33,13 @@ BDEPEND=" # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo +src_unpack() { + local dirs=( libunwind ) + use test && dirs+=( libcxx{,abi} ) + git-r3_fetch + git-r3_checkout '' '' '' "${dirs[@]}" +} + python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -41,24 +48,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - if use test; then - git-r3_fetch "https://git.llvm.org/git/libcxx.git - https://github.com/llvm-mirror/libcxx.git" - git-r3_fetch "https://git.llvm.org/git/libcxxabi.git - https://github.com/llvm-mirror/libcxxabi.git" - fi - git-r3_fetch - - if use test; then - git-r3_checkout https://llvm.org/git/libcxx.git \ - "${WORKDIR}"/libcxx - git-r3_checkout https://llvm.org/git/libcxxabi.git \ - "${WORKDIR}"/libcxxabi - fi - git-r3_checkout -} - multilib_src_configure() { local libdir=$(get_libdir) @@ -81,7 +70,7 @@ multilib_src_configure() { mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/${P}/libcxx" ) fi @@ -90,7 +79,7 @@ multilib_src_configure() { build_libcxxabi() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxxabi + local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxxabi local BUILD_DIR=${BUILD_DIR}/libcxxabi local mycmakeargs=( -DLIBCXXABI_LIBDIR_SUFFIX= @@ -99,7 +88,7 @@ build_libcxxabi() { -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_INCLUDE_TESTS=OFF - -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}/${P}"/libcxx/include -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include ) @@ -109,7 +98,7 @@ build_libcxxabi() { build_libcxx() { local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" - local CMAKE_USE_DIR=${WORKDIR}/libcxx + local CMAKE_USE_DIR=${WORKDIR}/${P}/libcxx local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( -DLIBCXX_LIBDIR_SUFFIX= @@ -118,7 +107,7 @@ build_libcxx() { -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF -DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}/${P}"/libcxxabi/include -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) -DLIBCXX_HAS_GCC_S_LIB=OFF |