From 14d51bf52e58a0ce4833612a9054e041cff8a184 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 09:58:15 +0100 Subject: llvm.org.eclass: Master is now 13.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/llvm.org.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index c6f4d2a56c11..e532c953cb70 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: llvm.org.eclass @@ -44,7 +44,7 @@ esac # @DESCRIPTION: # The major version of current LLVM trunk. Used to determine # the correct branch to use. -_LLVM_MASTER_MAJOR=12 +_LLVM_MASTER_MAJOR=13 # @ECLASS-VARIABLE: _LLVM_SOURCE_TYPE # @INTERNAL -- cgit v1.2.3-65-gdbad From ddd4e76a4a7e8491cab7798ec0cd4ef7dc8320c8 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:49 +0100 Subject: sys-devel/llvm-common: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../llvm-common/llvm-common-13.0.0.9999.ebuild | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 sys-devel/llvm-common/llvm-common-13.0.0.9999.ebuild diff --git a/sys-devel/llvm-common/llvm-common-13.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-13.0.0.9999.ebuild new file mode 100644 index 000000000000..53511a0a20e3 --- /dev/null +++ b/sys-devel/llvm-common/llvm-common-13.0.0.9999.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit llvm.org + +DESCRIPTION="Common files shared between multiple slots of LLVM" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="" + +RDEPEND="!sys-devel/llvm:0" + +LLVM_COMPONENTS=( llvm/utils/vim ) +llvm.org_set_globals + +src_install() { + insinto /usr/share/vim/vimfiles + doins -r */ + # some users may find it useful + newdoc README README.vim + dodoc vimrc +} -- cgit v1.2.3-65-gdbad From 01b43ef0de62a468da351266cc69281bf9b0d1b0 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:50 +0100 Subject: sys-devel/llvm: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-devel/llvm/llvm-13.0.0.9999.ebuild | 520 +++++++++++++++++++++++++++++++++ 1 file changed, 520 insertions(+) create mode 100644 sys-devel/llvm/llvm-13.0.0.9999.ebuild diff --git a/sys-devel/llvm/llvm-13.0.0.9999.ebuild b/sys-devel/llvm/llvm-13.0.0.9999.ebuild new file mode 100644 index 000000000000..d51ccdbab14b --- /dev/null +++ b/sys-devel/llvm/llvm-13.0.0.9999.ebuild @@ -0,0 +1,520 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ + toolchain-funcs + +DESCRIPTION="Low Level Virtual Machine" +HOMEPAGE="https://llvm.org/" + +# Those are in lib/Targets, without explicit CMakeLists.txt mention +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE ) +# Keep in sync with CMakeLists.txt +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore + "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) + +# Additional licenses: +# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. +# 2. xxhash: BSD. +# 3. MD5 code: public-domain. +# 4. ConvertUTF.h: TODO. + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" +SLOT="$(ver_cut 1)" +KEYWORDS="" +IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3 + kernel_Darwin ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib:0=[${MULTILIB_USEDEP}] + exegesis? ( dev-libs/libpfm:= ) + gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) + libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) + libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) + ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) + xar? ( app-arch/xar ) + xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) + z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + gold? ( sys-libs/binutils-libs )" +BDEPEND=" + dev-lang/perl + >=dev-util/cmake-3.16 + sys-devel/gnuconfig + kernel_Darwin? ( + =sys-devel/binutils-apple-5.1 + ) + doc? ( $(python_gen_any_dep ' + dev-python/recommonmark[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + ') ) + libffi? ( virtual/pkgconfig ) + ${PYTHON_DEPS}" +# There are no file collisions between these versions but having :0 +# installed means llvm-config there will take precedence. +RDEPEND="${RDEPEND} + !sys-devel/llvm:0" +PDEPEND="sys-devel/llvm-common + gold? ( >=sys-devel/llvmgold-${SLOT} )" + +LLVM_COMPONENTS=( llvm ) +LLVM_MANPAGES=build +llvm.org_set_globals + +python_check_deps() { + use doc || return 0 + + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && + has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +check_live_ebuild() { + local prod_targets=( + $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \ + | tail -n +2 | head -n -1) + ) + local all_targets=( + lib/Target/*/ + ) + all_targets=( "${all_targets[@]#lib/Target/}" ) + all_targets=( "${all_targets[@]%/}" ) + + local exp_targets=() i + for i in "${all_targets[@]}"; do + has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" ) + done + # reorder + all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" ) + + if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then + eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!" + eqawarn " Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}" + eqawarn "Expected: ${exp_targets[*]}" + eqawarn + fi + + if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then + eqawarn "ALL_LLVM_TARGETS is outdated!" + eqawarn " Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}" + eqawarn "Expected: ${all_targets[*]}" + fi +} + +check_distribution_components() { + if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then + local all_targets=() my_targets=() l + cd "${BUILD_DIR}" || die + + while read -r l; do + if [[ ${l} == install-*-stripped:* ]]; then + l=${l#install-} + l=${l%%-stripped*} + + case ${l} in + # shared libs + LLVM|LLVMgold) + ;; + # TableGen lib + deps + LLVMDemangle|LLVMSupport|LLVMTableGen) + ;; + # static libs + LLVM*) + continue + ;; + # meta-targets + distribution|llvm-libraries) + continue + ;; + # used only w/ USE=doc + docs-llvm-html) + use doc || continue + ;; + esac + + all_targets+=( "${l}" ) + fi + done < <(ninja -t targets all) + + while read -r l; do + my_targets+=( "${l}" ) + done < <(get_distribution_components $"\n") + + local add=() remove=() + for l in "${all_targets[@]}"; do + if ! has "${l}" "${my_targets[@]}"; then + add+=( "${l}" ) + fi + done + for l in "${my_targets[@]}"; do + if ! has "${l}" "${all_targets[@]}"; then + remove+=( "${l}" ) + fi + done + + if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then + eqawarn "get_distribution_components() is outdated!" + eqawarn " Add: ${add[*]}" + eqawarn "Remove: ${remove[*]}" + fi + cd - >/dev/null || die + fi +} + +src_prepare() { + # Fix llvm-config for shared linking and sane flags + # https://bugs.gentoo.org/show_bug.cgi?id=565358 + eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch + + # disable use of SDK on OSX, bug #568758 + sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die + + # Update config.guess to support more systems + cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die + + # Verify that the live ebuild is up-to-date + check_live_ebuild + + llvm.org_src_prepare +} + +# Is LLVM being linked against libc++? +is_libcxx_linked() { + local code='#include +#if defined(_LIBCPP_VERSION) + HAVE_LIBCXX +#endif +' + local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 + + [[ ${out} == *HAVE_LIBCXX* ]] +} + +get_distribution_components() { + local sep=${1-;} + + local out=( + # shared libs + LLVM + LTO + Remarks + + # tools + llvm-config + + # common stuff + cmake-exports + llvm-headers + + # libraries needed for clang-tblgen + LLVMDemangle + LLVMSupport + LLVMTableGen + ) + + if multilib_is_native_abi; then + out+=( + # utilities + llvm-tblgen + FileCheck + llvm-PerfectShuffle + count + not + yaml-bench + + # tools + bugpoint + dsymutil + llc + lli + lli-child-target + llvm-addr2line + llvm-ar + llvm-as + llvm-bcanalyzer + llvm-bitcode-strip + llvm-c-test + llvm-cat + llvm-cfi-verify + llvm-config + llvm-cov + llvm-cvtres + llvm-cxxdump + llvm-cxxfilt + llvm-cxxmap + llvm-diff + llvm-dis + llvm-dlltool + llvm-dwarfdump + llvm-dwp + llvm-elfabi + llvm-exegesis + llvm-extract + llvm-gsymutil + llvm-ifs + llvm-install-name-tool + llvm-jitlink + llvm-jitlink-executor + llvm-lib + llvm-libtool-darwin + llvm-link + llvm-lipo + llvm-lto + llvm-lto2 + llvm-mc + llvm-mca + llvm-ml + llvm-modextract + llvm-mt + llvm-nm + llvm-objcopy + llvm-objdump + llvm-opt-report + llvm-pdbutil + llvm-profdata + llvm-ranlib + llvm-rc + llvm-readelf + llvm-readobj + llvm-reduce + llvm-rtdyld + llvm-size + llvm-split + llvm-stress + llvm-strings + llvm-strip + llvm-symbolizer + llvm-undname + llvm-xray + obj2yaml + opt + sancov + sanstats + split-file + verify-uselistorder + yaml2obj + + # python modules + opt-viewer + ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-dsymutil-man + docs-llvm-dwarfdump-man + docs-llvm-man + ) + fi + use doc && out+=( + docs-llvm-html + ) + + use gold && out+=( + LLVMgold + ) + fi + + printf "%s${sep}" "${out[@]}" +} + +multilib_src_configure() { + local ffi_cflags ffi_ldflags + if use libffi; then + ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) + ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) + fi + + local libdir=$(get_libdir) + local mycmakeargs=( + # disable appending VCS revision to the version to improve + # direct cache hit ratio + -DLLVM_APPEND_VC_REV=OFF + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" + -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON + -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components) + + # cheap hack: LLVM combines both anyway, and the only difference + # is that the former list is explicitly verified at cmake time + -DLLVM_TARGETS_TO_BUILD="" + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_BUILD_TESTS=$(usex test) + + -DLLVM_ENABLE_FFI=$(usex libffi) + -DLLVM_ENABLE_LIBEDIT=$(usex libedit) + -DLLVM_ENABLE_TERMINFO=$(usex ncurses) + -DLLVM_ENABLE_LIBXML2=$(usex xml) + -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_LIBPFM=$(usex exegesis) + -DLLVM_ENABLE_EH=ON + -DLLVM_ENABLE_RTTI=ON + -DLLVM_ENABLE_Z3_SOLVER=$(usex z3) + + -DLLVM_HOST_TRIPLE="${CHOST}" + + -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" + -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" + # used only for llvm-objdump tool + -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) + + -DPython3_EXECUTABLE="${PYTHON}" + + # disable OCaml bindings (now in dev-ml/llvm-ocaml) + -DOCAMLFIND=NO + ) + + if is_libcxx_linked; then + # Smart hack: alter version suffix -> SOVERSION when linking + # against libc++. This way we won't end up mixing LLVM libc++ + # libraries with libstdc++ clang, and the other way around. + mycmakeargs+=( + -DLLVM_VERSION_SUFFIX="libcxx" + -DLLVM_ENABLE_LIBCXX=ON + ) + fi + +# Note: go bindings have no CMake rules at the moment +# but let's kill the check in case they are introduced +# if ! multilib_is_native_abi || ! use go; then + mycmakeargs+=( + -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + ) +# fi + + use test && mycmakeargs+=( + -DLLVM_LIT_ARGS="$(get_lit_flags)" + ) + + if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + + mycmakeargs+=( + -DLLVM_BUILD_DOCS=${build_docs} + -DLLVM_ENABLE_OCAMLDOC=OFF + -DLLVM_ENABLE_SPHINX=${build_docs} + -DLLVM_ENABLE_DOXYGEN=OFF + -DLLVM_INSTALL_UTILS=ON + ) + use gold && mycmakeargs+=( + -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include + ) + fi + + if tc-is-cross-compiler; then + local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" + [[ -x "${tblgen}" ]] \ + || die "${tblgen} not found or usable" + mycmakeargs+=( + -DCMAKE_CROSSCOMPILING=ON + -DLLVM_TABLEGEN="${tblgen}" + ) + fi + + # workaround BMI bug in gcc-7 (fixed in 7.4) + # https://bugs.gentoo.org/649880 + # apply only to x86, https://bugs.gentoo.org/650506 + if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && + [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] + then + local CFLAGS="${CFLAGS} -mno-bmi" + local CXXFLAGS="${CXXFLAGS} -mno-bmi" + fi + + # LLVM can have very high memory consumption while linking, + # exhausting the limit on 32-bit linker executable + use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory" + + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + cmake_src_configure + + multilib_is_native_abi && check_distribution_components +} + +multilib_src_compile() { + cmake_build distribution + + pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld + pax-mark m "${BUILD_DIR}"/bin/lli + pax-mark m "${BUILD_DIR}"/bin/lli-child-target + + if use test; then + pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests + pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests + pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests + fi +} + +multilib_src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + cmake_build check +} + +src_install() { + local MULTILIB_CHOST_TOOLS=( + /usr/lib/llvm/${SLOT}/bin/llvm-config + ) + + local MULTILIB_WRAPPED_HEADERS=( + /usr/include/llvm/Config/llvm-config.h + ) + + local LLVM_LDPATHS=() + multilib-minimal_src_install + + # move wrapped headers back + mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die +} + +multilib_src_install() { + DESTDIR=${D} cmake_build install-distribution + + # move headers to /usr/include for wrapping + rm -rf "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die + + LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) +} + +multilib_src_install_all() { + local revord=$(( 9999 - ${SLOT} )) + newenvd - "60llvm-${revord}" <<-_EOF_ + PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" + # we need to duplicate it in ROOTPATH for Portage to respect... + ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" + MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" + _EOF_ + + docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages +} + +pkg_postinst() { + elog "You can find additional opt-viewer utility scripts in:" + elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" + elog "To use these scripts, you will need Python along with the following" + elog "packages:" + elog " dev-python/pygments (for opt-viewer)" + elog " dev-python/pyyaml (for all of them)" +} -- cgit v1.2.3-65-gdbad From c570e582623c866f2a2c640282cf4537a76736ba Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:50 +0100 Subject: sys-devel/llvmgold: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-devel/llvmgold/llvmgold-13.ebuild | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 sys-devel/llvmgold/llvmgold-13.ebuild diff --git a/sys-devel/llvmgold/llvmgold-13.ebuild b/sys-devel/llvmgold/llvmgold-13.ebuild new file mode 100644 index 000000000000..3bb1b5358af3 --- /dev/null +++ b/sys-devel/llvmgold/llvmgold-13.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="LLVMgold plugin symlink for autoloading" +HOMEPAGE="https://llvm.org/" +SRC_URI="" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="" +IUSE="" +PROPERTIES="live" + +RDEPEND="sys-devel/llvm:${PV}[gold] + !sys-devel/llvm:0" + +S=${WORKDIR} + +src_install() { + dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins" + dosym "../../../../lib/llvm/${PV}/$(get_libdir)/LLVMgold.so" \ + "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so" +} -- cgit v1.2.3-65-gdbad From 31e13574ec5a53878331d0ebabcd6f7a4128dcfb Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:51 +0100 Subject: dev-ml/llvm-ocaml: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild | 124 ++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild new file mode 100644 index 000000000000..1e25f7546b82 --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-13.0.0.9999.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 + +DESCRIPTION="OCaml bindings for LLVM" +HOMEPAGE="https://llvm.org/" + +# Keep in sync with sys-devel/llvm +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE ) +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore + "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0/${PV}" +KEYWORDS="" +IUSE="debug test ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.00.0:0= + dev-ml/ocaml-ctypes:= + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)]" +for x in "${ALL_LLVM_TARGETS[@]}"; do + RDEPEND+=" + ${x}? ( ~sys-devel/llvm-${PV}[${x}] )" +done +unset x + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + dev-ml/findlib + >=dev-util/cmake-3.16 + test? ( dev-ml/ounit ) + ${PYTHON_DEPS}" + +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals + +pkg_setup() { + LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + local libdir=$(get_libdir) + local mycmakeargs=( + -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON + -DLLVM_OCAML_OUT_OF_TREE=ON + + # cheap hack: LLVM combines both anyway, and the only difference + # is that the former list is explicitly verified at cmake time + -DLLVM_TARGETS_TO_BUILD="" + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_BUILD_TESTS=$(usex test) + + # disable various irrelevant deps and settings + -DLLVM_ENABLE_FFI=OFF + -DLLVM_ENABLE_TERMINFO=OFF + -DHAVE_HISTEDIT_H=NO + -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_EH=ON + -DLLVM_ENABLE_RTTI=ON + + -DLLVM_HOST_TRIPLE="${CHOST}" + + -DPython3_EXECUTABLE="${PYTHON}" + + # disable go bindings + -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + + # TODO: ocamldoc + ) + + use test && mycmakeargs+=( + -DLLVM_LIT_ARGS="$(get_lit_flags)" + ) + + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + # also: custom rules for OCaml do not work for CPPFLAGS + use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" + cmake_src_configure + + local llvm_libdir=$(llvm-config --libdir) + # an ugly hack; TODO: figure out a way to pass -L to ocaml... + cd "${BUILD_DIR}/${libdir}" || die + ln -s "${llvm_libdir}"/*.so . || die + + if use test; then + local llvm_bindir=$(llvm-config --bindir) + # Force using system-installed tools. + sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \ + "${BUILD_DIR}"/test/lit.site.cfg.py || die + fi +} + +src_compile() { + cmake_build ocaml_all +} + +src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + cmake_build check-llvm-bindings-ocaml +} + +src_install() { + DESTDIR="${D}" \ + cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die + + dodoc bindings/ocaml/README.txt +} -- cgit v1.2.3-65-gdbad From a2fcc7aa353e3733a7392c4ea98b76bb80c57642 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:52 +0100 Subject: sys-devel/clang-common: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../clang-common/clang-common-13.0.0.9999.ebuild | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 sys-devel/clang-common/clang-common-13.0.0.9999.ebuild diff --git a/sys-devel/clang-common/clang-common-13.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-13.0.0.9999.ebuild new file mode 100644 index 000000000000..03e4441b91b9 --- /dev/null +++ b/sys-devel/clang-common/clang-common-13.0.0.9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 llvm.org + +DESCRIPTION="Common files shared between multiple slots of clang" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="" + +PDEPEND="sys-devel/clang:*" + +LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh ) +llvm.org_set_globals +S=${WORKDIR}/clang/utils + +src_install() { + newbashcomp bash-autocomplete.sh clang +} -- cgit v1.2.3-65-gdbad From 2e7cc83d039d03fad01386e4b462f96e23de2f1b Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:53 +0100 Subject: sys-devel/clang: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-devel/clang/clang-13.0.0.9999.ebuild | 435 +++++++++++++++++++++++++++++++ 1 file changed, 435 insertions(+) create mode 100644 sys-devel/clang/clang-13.0.0.9999.ebuild diff --git a/sys-devel/clang/clang-13.0.0.9999.ebuild b/sys-devel/clang/clang-13.0.0.9999.ebuild new file mode 100644 index 000000000000..8825b6aafaab --- /dev/null +++ b/sys-devel/clang/clang-13.0.0.9999.ebuild @@ -0,0 +1,435 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org multilib-minimal pax-utils \ + prefix python-single-r1 toolchain-funcs + +DESCRIPTION="C language family frontend for LLVM" +HOMEPAGE="https://llvm.org/" + +# Keep in sync with sys-devel/llvm +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE ) +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore + "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) + +# MSVCSetupApi.h: MIT +# sorttable.js: MIT + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" +SLOT="$(ver_cut 1)" +KEYWORDS="" +IUSE="debug default-compiler-rt default-libcxx default-lld + doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( ${ALL_LLVM_TARGETS[*]} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}] + static-analyzer? ( dev-lang/perl:* ) + xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) + ${PYTHON_DEPS}" +for x in "${ALL_LLVM_TARGETS[@]}"; do + RDEPEND+=" + ${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )" +done +unset x + +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/cmake-3.16 + doc? ( dev-python/sphinx ) + xml? ( virtual/pkgconfig ) + ${PYTHON_DEPS}" +RDEPEND="${RDEPEND} + !/dev/null || die + fi +} + +get_distribution_components() { + local sep=${1-;} + + local out=( + # common stuff + clang-cmake-exports + clang-headers + clang-resource-headers + libclang-headers + + # libs + clang-cpp + libclang + ) + + if multilib_is_native_abi; then + out+=( + # common stuff + bash-autocomplete + libclang-python-bindings + + # tools + c-index-test + clang + clang-format + clang-offload-bundler + clang-offload-wrapper + clang-refactor + clang-rename + clang-scan-deps + diagtool + hmaptool + + # extra tools + clang-apply-replacements + clang-change-namespace + clang-doc + clang-include-fixer + clang-move + clang-query + clang-reorder-fields + clang-tidy + clangd + find-all-symbols + modularize + pp-trace + ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-clang-man + docs-clang-tools-man + ) + fi + + use doc && out+=( + docs-clang-html + docs-clang-tools-html + ) + + use static-analyzer && out+=( + clang-check + clang-extdef-mapping + scan-build + scan-view + ) + fi + + printf "%s${sep}" "${out[@]}" +} + +multilib_src_configure() { + local llvm_version=$(llvm-config --version) || die + local clang_version=$(ver_cut 1-3 "${llvm_version}") + + local mycmakeargs=( + -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + # relative to bindir + -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}" + + -DBUILD_SHARED_LIBS=OFF + -DCLANG_LINK_CLANG_DYLIB=ON + -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components) + + -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_BUILD_TESTS=$(usex test) + + # these are not propagated reliably, so redefine them + -DLLVM_ENABLE_EH=ON + -DLLVM_ENABLE_RTTI=ON + + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) + # libgomp support fails to find headers without explicit -I + # furthermore, it provides only syntax checking + -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp + + # override default stdlib and rtlib + -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") + -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") + -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "") + + -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) + -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) + + -DPython3_EXECUTABLE="${PYTHON}" + ) + use test && mycmakeargs+=( + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_LIT_ARGS="$(get_lit_flags)" + ) + + if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DLLVM_BUILD_DOCS=ON + -DLLVM_ENABLE_SPHINX=ON + -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( + -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra + -DCLANG_INCLUDE_DOCS=${build_docs} + -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} + ) + else + mycmakeargs+=( + -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF + ) + fi + + if [[ -n ${EPREFIX} ]]; then + mycmakeargs+=( + -DGCC_INSTALL_PREFIX="${EPREFIX}/usr" + ) + fi + + if tc-is-cross-compiler; then + [[ -x "/usr/bin/clang-tblgen" ]] \ + || die "/usr/bin/clang-tblgen not found or usable" + mycmakeargs+=( + -DCMAKE_CROSSCOMPILING=ON + -DCLANG_TABLEGEN=/usr/bin/clang-tblgen + ) + fi + + # LLVM can have very high memory consumption while linking, + # exhausting the limit on 32-bit linker executable + use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory" + + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + cmake_src_configure + + multilib_is_native_abi && check_distribution_components +} + +multilib_src_compile() { + cmake_build distribution + + # provide a symlink for tests + if [[ ! -L ${WORKDIR}/lib/clang ]]; then + mkdir -p "${WORKDIR}"/lib || die + ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die + fi +} + +multilib_src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + cmake_build check-clang + multilib_is_native_abi && + cmake_build check-clang-tools check-clangd +} + +src_install() { + MULTILIB_WRAPPED_HEADERS=( + /usr/include/clang/Config/config.h + ) + + multilib-minimal_src_install + + # Move runtime headers to /usr/lib/clang, where they belong + mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die + # move (remaining) wrapped headers back + mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die + + # Apply CHOST and version suffix to clang tools + # note: we use two version components here (vs 3 in runtime path) + local llvm_version=$(llvm-config --version) || die + local clang_version=$(ver_cut 1 "${llvm_version}") + local clang_full_version=$(ver_cut 1-3 "${llvm_version}") + local clang_tools=( clang clang++ clang-cl clang-cpp ) + local abi i + + # cmake gives us: + # - clang-X + # - clang -> clang-X + # - clang++, clang-cl, clang-cpp -> clang + # we want to have: + # - clang-X + # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X + # - clang, clang++, clang-cl, clang-cpp -> clang*-X + # also in CHOST variant + for i in "${clang_tools[@]:1}"; do + rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die + dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}" + dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}" + done + + # now create target symlinks for all supported ABIs + for abi in $(get_all_abis); do + local abi_chost=$(get_abi_CHOST "${abi}") + for i in "${clang_tools[@]}"; do + dosym "${i}-${clang_version}" \ + "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}" + dosym "${abi_chost}-${i}-${clang_version}" \ + "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}" + done + done + + # Remove unnecessary headers on FreeBSD, bug #417171 + if use kernel_FreeBSD; then + rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die + fi +} + +multilib_src_install() { + DESTDIR=${D} cmake_build install-distribution + + # move headers to /usr/include for wrapping & ABI mismatch checks + # (also drop the version suffix from runtime headers) + rm -rf "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die +} + +multilib_src_install_all() { + python_fix_shebang "${ED}" + if use static-analyzer; then + python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view + fi + + docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages + # match 'html' non-compression + use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" + # +x for some reason; TODO: investigate + use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1" +} + +pkg_postinst() { + if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi + + elog "You can find additional utility scripts in:" + elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/clang" + elog "Some of them are vim integration scripts (with instructions inside)." + elog "The run-clang-tidy.py script requires the following additional package:" + elog " dev-python/pyyaml" +} + +pkg_postrm() { + if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow clean all + fi +} -- cgit v1.2.3-65-gdbad From 5ee97fb3041534b788833423778fa4cf491630a8 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:54 +0100 Subject: dev-python/clang-python: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../clang-python/clang-python-13.0.0.9999.ebuild | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 dev-python/clang-python/clang-python-13.0.0.9999.ebuild diff --git a/dev-python/clang-python/clang-python-13.0.0.9999.ebuild b/dev-python/clang-python/clang-python-13.0.0.9999.ebuild new file mode 100644 index 000000000000..0e3b3ea06300 --- /dev/null +++ b/dev-python/clang-python/clang-python-13.0.0.9999.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit llvm.org python-r1 + +DESCRIPTION="Python bindings for sys-devel/clang" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +# The module is opening libclang.so directly, and doing some blasphemy +# on top of it. +RDEPEND=" + >=sys-devel/clang-${PV}:* + !sys-devel/llvm:0[clang(-),python(-)] + !sys-devel/clang:0[python(-)] + ${PYTHON_DEPS}" +DEPEND="${RDEPEND}" + +LLVM_COMPONENTS=( clang/bindings/python ) +llvm.org_set_globals + +python_test() { + "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}" +} + +src_test() { + python_foreach_impl python_test +} + +src_install() { + python_foreach_impl python_domodule clang +} -- cgit v1.2.3-65-gdbad From 9209a0540baa65332bca29560130845016f838f4 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:55 +0100 Subject: dev-python/lit: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/lit/lit-13.0.0.9999.ebuild | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 dev-python/lit/lit-13.0.0.9999.ebuild diff --git a/dev-python/lit/lit-13.0.0.9999.ebuild b/dev-python/lit/lit-13.0.0.9999.ebuild new file mode 100644 index 000000000000..cd8a5985d342 --- /dev/null +++ b/dev-python/lit/lit-13.0.0.9999.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6..9} ) + +inherit distutils-r1 llvm.org + +DESCRIPTION="A stand-alone install of the LLVM suite testing tool" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="test" +RESTRICT="!test? ( test )" + +# Tests require 'FileCheck' and 'not' utilities (from llvm) +BDEPEND=" + test? ( + dev-python/psutil[${PYTHON_USEDEP}] + sys-devel/llvm )" + +LLVM_COMPONENTS=( llvm/utils/lit ) +llvm.org_set_globals + +# TODO: move the manpage generation here (from sys-devel/llvm) + +src_prepare() { + cd "${WORKDIR}" || die + distutils-r1_src_prepare +} + +python_test() { + local -x LIT_PRESERVES_TMP=1 + local litflags=$(get_lit_flags) + ./lit.py ${litflags//;/ } tests || die +} -- cgit v1.2.3-65-gdbad From de60c853dffdd47512fd1da20be328c5aa664c20 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:56 +0100 Subject: sys-devel/lld: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-devel/lld/lld-13.0.0.9999.ebuild | 76 ++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 sys-devel/lld/lld-13.0.0.9999.ebuild diff --git a/sys-devel/lld/lld-13.0.0.9999.ebuild b/sys-devel/lld/lld-13.0.0.9999.ebuild new file mode 100644 index 000000000000..55857fedba99 --- /dev/null +++ b/sys-devel/lld/lld-13.0.0.9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-any-r1 + +DESCRIPTION="The LLVM linker (link editor)" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="~sys-devel/llvm-${PV}" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + >=dev-util/cmake-3.16 + $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") + )" + +LLVM_COMPONENTS=( lld libunwind/include/mach-o ) +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) +llvm.org_set_globals + +python_check_deps() { + has_version -b "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup + use test && python-any-r1_pkg_setup +} + +src_unpack() { + llvm.org_src_unpack + + # Directory ${WORKDIR}/llvm does not exist with USE="-test", + # but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below, + # and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system + # (lld/MachO/CMakeLists.txt) and is expected to be resolvable + # to existent directory ${WORKDIR}/libunwind/include. + mkdir -p "${WORKDIR}/llvm" || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + + -DLLVM_INCLUDE_TESTS=$(usex test) + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + ) + use test && mycmakeargs+=( + -DLLVM_BUILD_TESTS=ON + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="$(get_lit_flags)" + -DPython3_EXECUTABLE="${PYTHON}" + ) + + cmake_src_configure +} + +src_test() { + local -x LIT_PRESERVES_TMP=1 + cmake_build check-lld +} + +src_install() { + cmake_src_install + # LLD has no shared libraries, so strip it all for the time being + rm -r "${ED}"/usr/{include,lib*} || die +} -- cgit v1.2.3-65-gdbad From 2742dee8b7ec201f7a8b8226d7f1d6a36598a444 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:56 +0100 Subject: dev-util/lldb: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-util/lldb/lldb-13.0.0.9999.ebuild | 100 ++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 dev-util/lldb/lldb-13.0.0.9999.ebuild diff --git a/dev-util/lldb/lldb-13.0.0.9999.ebuild b/dev-util/lldb/lldb-13.0.0.9999.ebuild new file mode 100644 index 000000000000..00b5d55d6be5 --- /dev/null +++ b/dev-util/lldb/lldb-13.0.0.9999.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs + +DESCRIPTION="The LLVM debugger" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="libedit lzma ncurses +python test" +REQUIRED_USE=${PYTHON_REQUIRED_USE} +RESTRICT="test" + +RDEPEND=" + libedit? ( dev-libs/libedit:0= ) + lzma? ( app-arch/xz-utils:= ) + ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) + python? ( + $(python_gen_cond_dep ' + dev-python/six[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + ) + ~sys-devel/clang-${PV}[xml] + ~sys-devel/llvm-${PV} + ! Date: Thu, 28 Jan 2021 10:00:57 +0100 Subject: sys-libs/compiler-rt: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../compiler-rt/compiler-rt-13.0.0.9999.ebuild | 126 +++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild new file mode 100644 index 000000000000..07412646ab2a --- /dev/null +++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs + +DESCRIPTION="Compiler runtime library for clang (built-in part)" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="$(ver_cut 1-3)" +KEYWORDS="" +IUSE="+clang test" +RESTRICT="!test? ( test ) !clang? ( test )" + +CLANG_SLOT=${SLOT%%.*} +# llvm-6 for new lit options +DEPEND=" + >=sys-devel/llvm-6" +BDEPEND=" + >=dev-util/cmake-3.16 + clang? ( sys-devel/clang ) + test? ( + $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + ) + ${PYTHON_DEPS}" + +LLVM_COMPONENTS=( compiler-rt ) +llvm.org_set_globals + +PATCHES=( + "${FILESDIR}/9999/${PN}-prefix-paths.patch" +) + +python_check_deps() { + use test || return 0 + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + if ! use clang && ! tc-is-clang; then + ewarn "Building using a compiler other than clang may result in broken atomics" + ewarn "library. Enable USE=clang unless you have a very good reason not to." + fi +} + +pkg_setup() { + # Darwin Prefix builds do not have llvm installed yet, so rely on + # bootstrap-prefix to set the appropriate path vars to LLVM instead + # of using llvm_pkg_setup. + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +test_compiler() { + $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \ + <<<'int main() { return 0; }' &>/dev/null +} + +src_configure() { + # pre-set since we need to pass it to cmake + BUILD_DIR=${WORKDIR}/${P}_build + + local nolib_flags=( -nodefaultlibs -lc ) + if use clang; then + local -x CC=${CHOST}-clang + local -x CXX=${CHOST}-clang++ + strip-unsupported-flags + # ensure we can use clang before installing compiler-rt + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + elif ! test_compiler; then + if test_compiler "${nolib_flags[@]}"; then + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" + fi + fi + + local mycmakeargs=( + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + + -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF + -DCOMPILER_RT_BUILD_PROFILE=OFF + -DCOMPILER_RT_BUILD_SANITIZERS=OFF + -DCOMPILER_RT_BUILD_XRAY=OFF + + -DPython3_EXECUTABLE="${PYTHON}" + ) + + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then + mycmakeargs+=( + # setting -isysroot is disabled with compiler-rt-prefix-paths.patch + # this allows adding arm64 support using SDK in EPREFIX + -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk" + # Set version based on the SDK in EPREFIX. + # This disables i386 for SDK >= 10.15 + -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')" + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" + ) + fi + + if use test; then + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="$(get_lit_flags)" + + -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++" + ) + fi + + cmake_src_configure +} + +src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + + cmake_build check-builtins +} -- cgit v1.2.3-65-gdbad From d03edcfa91384322aa5837e0c4e97894f9cb276e Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:58 +0100 Subject: sys-libs/compiler-rt-sanitizers: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../compiler-rt-sanitizers-13.0.0.9999.ebuild | 197 +++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild new file mode 100644 index 000000000000..4261329f9d3c --- /dev/null +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 + +DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="$(ver_cut 1-3)" +KEYWORDS="" +IUSE="+clang test elibc_glibc" +# base targets +IUSE+=" +libfuzzer +profile +xray" +# sanitizer targets, keep in sync with config-ix.cmake +# NB: ubsan, scudo deliberately match two entries +SANITIZER_FLAGS=( + asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo + shadowcallstack gwp-asan +) +IUSE+=" ${SANITIZER_FLAGS[@]/#/+}" +REQUIRED_USE=" + || ( ${SANITIZER_FLAGS[*]} libfuzzer profile xray ) + gwp-asan? ( scudo ) + ubsan? ( cfi )" +RESTRICT="!test? ( test ) !clang? ( test )" + +CLANG_SLOT=${SLOT%%.*} +# llvm-6 for new lit options +DEPEND=" + >=sys-devel/llvm-6" +BDEPEND=" + >=dev-util/cmake-3.16 + clang? ( sys-devel/clang ) + elibc_glibc? ( net-libs/libtirpc ) + test? ( + !=dev-python/lit-5[\${PYTHON_USEDEP}]") + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + sys-libs/compiler-rt:${SLOT} + ) + ${PYTHON_DEPS}" + +LLVM_COMPONENTS=( compiler-rt ) +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) +llvm.org_set_globals + +PATCHES=( + "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" +) + +python_check_deps() { + use test || return 0 + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +check_space() { + if use test; then + local CHECKREQS_DISK_BUILD=11G + check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + check_space +} + +pkg_setup() { + check_space + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die + + local flag + for flag in "${SANITIZER_FLAGS[@]}"; do + if ! use "${flag}"; then + local cmake_flag=${flag/-/_} + sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \ + cmake/config-ix.cmake || die + fi + done + + if use asan && ! use profile; then + # TODO: fix these tests to be skipped upstream + rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die + fi + + llvm.org_src_prepare +} + +src_configure() { + # pre-set since we need to pass it to cmake + BUILD_DIR=${WORKDIR}/compiler-rt_build + + if use clang; then + local -x CC=${CHOST}-clang + local -x CXX=${CHOST}-clang++ + strip-unsupported-flags + fi + + local flag want_sanitizer=OFF + for flag in "${SANITIZER_FLAGS[@]}"; do + if use "${flag}"; then + want_sanitizer=ON + break + fi + done + + local mycmakeargs=( + -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" + # use a build dir structure consistent with install + # this makes it possible to easily deploy test-friendly clang + -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}" + + -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) + # builtins & crt installed by sys-libs/compiler-rt + -DCOMPILER_RT_BUILD_BUILTINS=OFF + -DCOMPILER_RT_BUILD_CRT=OFF + -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer) + -DCOMPILER_RT_BUILD_PROFILE=$(usex profile) + -DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}" + -DCOMPILER_RT_BUILD_XRAY=$(usex xray) + + -DPython3_EXECUTABLE="${PYTHON}" + ) + if use test; then + mycmakeargs+=( + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="$(get_lit_flags)" + + # they are created during src_test() + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" + ) + + # same flags are passed for build & tests, so we need to strip + # them down to a subset supported by clang + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ + strip-unsupported-flags + fi + + if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then + mycmakeargs+=( + # setting -isysroot is disabled with compiler-rt-prefix-paths.patch + # this allows adding arm64 support using SDK in EPREFIX + -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk" + # Set version based on the SDK in EPREFIX + # This disables i386 for SDK >= 10.15 + # Will error if has_use tsan and SDK < 10.12 + -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')" + # Use our libtool instead of looking it up with xcrun + -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool" + ) + fi + + cmake_src_configure + + if use test; then + local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* ) + [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}" + [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}" + + # copy clang over since resource_dir is located relatively to binary + # therefore, we can put our new libraries in it + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die + cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ + "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die + cp "${sys_dir}"/*builtins*.a \ + "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die + # we also need LLVMgold.so for gold-based tests + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die + fi + fi +} + +src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + # disable sandbox to have it stop clobbering LD_PRELOAD + local -x SANDBOX_ON=0 + # wipe LD_PRELOAD to make ASAN happy + local -x LD_PRELOAD= + + cmake_build check-all +} -- cgit v1.2.3-65-gdbad From fdbc304045bd3ae0f770fb7ea55dc36d4fb08688 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:00:59 +0100 Subject: sys-libs/llvm-libunwind: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../llvm-libunwind-13.0.0.9999.ebuild | 124 +++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild new file mode 100644 index 000000000000..37357781fb44 --- /dev/null +++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake-multilib llvm llvm.org python-any-r1 + +DESCRIPTION="C++ runtime stack unwinder from LLVM" +HOMEPAGE="https://github.com/llvm-mirror/libunwind" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +IUSE="debug +static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND="!sys-libs/libunwind" +# llvm-6 for new lit options +DEPEND=" + >=sys-devel/llvm-6" +BDEPEND=" + test? ( >=sys-devel/clang-3.9.0 + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + )" + +LLVM_COMPONENTS=( libunwind ) +LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake ) +llvm.org_set_globals + +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +multilib_src_configure() { + local libdir=$(get_libdir) + + local mycmakeargs=( + -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) + -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) + -DLLVM_INCLUDE_TESTS=$(usex test) + + # support non-native unwinding; given it's small enough, + # enable it unconditionally + -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON + ) + if use test; then + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" + ) + fi + + cmake_src_configure +} + +build_libcxxabi() { + local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" + local CMAKE_USE_DIR=${WORKDIR}/libcxxabi + local BUILD_DIR=${BUILD_DIR}/libcxxabi + local mycmakeargs=( + -DLIBCXXABI_LIBDIR_SUFFIX= + -DLIBCXXABI_ENABLE_SHARED=OFF + -DLIBCXXABI_ENABLE_STATIC=ONF + -DLIBCXXABI_USE_LLVM_UNWINDER=ON + -DLIBCXXABI_INCLUDE_TESTS=OFF + + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include + -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include + ) + + cmake_src_configure + cmake_src_compile +} + +build_libcxx() { + local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" + local CMAKE_USE_DIR=${WORKDIR}/libcxx + local BUILD_DIR=${BUILD_DIR}/libcxx + local mycmakeargs=( + -DLIBCXX_LIBDIR_SUFFIX= + -DLIBCXX_ENABLE_SHARED=OFF + -DLIBCXX_ENABLE_STATIC=ON + -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF + -DLIBCXXABI_USE_LLVM_UNWINDER=ON + -DLIBCXX_CXX_ABI=libcxxabi + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include + -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF + -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) + -DLIBCXX_HAS_GCC_S_LIB=OFF + -DLIBCXX_INCLUDE_TESTS=OFF + ) + + cmake_src_configure + cmake_src_compile +} + +multilib_src_test() { + # build local copies of libc++ & libc++abi for testing to avoid + # circular deps + build_libcxxabi + build_libcxx + mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die + + local -x LIT_PRESERVES_TMP=1 + cmake_build check-unwind +} + +multilib_src_install() { + cmake_src_install + + # install headers like sys-libs/libunwind + doheader "${S}"/include/*.h +} -- cgit v1.2.3-65-gdbad From 56579bd58c9eaa6e2c719dc374257ba153fff0fb Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:01:00 +0100 Subject: sys-libs/libcxxabi: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild | 121 ++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild new file mode 100644 index 000000000000..640970313365 --- /dev/null +++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs + +DESCRIPTION="Low level support for a standard C++ library" +HOMEPAGE="https://libcxxabi.llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +IUSE="+libunwind +static-libs test elibc_musl" +RESTRICT="!test? ( test )" + +RDEPEND=" + libunwind? ( + || ( + >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] + >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] + ) + )" +# llvm-6 for new lit options +DEPEND="${RDEPEND} + >=sys-devel/llvm-6" +BDEPEND=" + test? ( >=sys-devel/clang-3.9.0 + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + )" + +# libcxx is needed uncondtionally for the headers +LLVM_COMPONENTS=( libcxx{abi,} llvm/cmake/modules ) +llvm.org_set_globals + +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix + # to set the appropriate path vars to LLVM instead of using llvm_pkg_setup. + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then + llvm_pkg_setup + fi + use test && python-any-r1_pkg_setup +} + +multilib_src_configure() { + # link against compiler-rt instead of libgcc if we are using clang with libunwind + local want_compiler_rt=OFF + if use libunwind && tc-is-clang; then + local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ + ${LDFLAGS} -print-libgcc-file-name) + if [[ ${compiler_rt} == *libclang_rt* ]]; then + want_compiler_rt=ON + fi + fi + + local libdir=$(get_libdir) + local mycmakeargs=( + -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} + -DLIBCXXABI_ENABLE_SHARED=ON + -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) + -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) + -DLIBCXXABI_INCLUDE_TESTS=$(usex test) + -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} + + -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/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 + ) + if use test; then + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" + ) + fi + cmake_src_configure +} + +build_libcxx() { + local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" + local CMAKE_USE_DIR=${WORKDIR}/libcxx + local BUILD_DIR=${BUILD_DIR}/libcxx + local mycmakeargs=( + -DLIBCXX_LIBDIR_SUFFIX= + -DLIBCXX_ENABLE_SHARED=OFF + -DLIBCXX_ENABLE_STATIC=ON + -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF + -DLIBCXX_CXX_ABI=libcxxabi + -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include + -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF + -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) + -DLIBCXX_HAS_GCC_S_LIB=OFF + -DLIBCXX_INCLUDE_TESTS=OFF + ) + + cmake_src_configure + cmake_src_compile +} + +multilib_src_test() { + # build a local copy of libc++ for testing to avoid circular dep + build_libcxx + mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die + + local -x LIT_PRESERVES_TMP=1 + cmake_build check-cxxabi +} + +multilib_src_install_all() { + insinto /usr/include/libcxxabi + doins -r include/. +} -- cgit v1.2.3-65-gdbad From 9267f6e1dd8ba1dad9c8099f121606d3aa431165 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:01:01 +0100 Subject: sys-libs/libcxx: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-libs/libcxx/libcxx-13.0.0.9999.ebuild | 218 ++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 sys-libs/libcxx/libcxx-13.0.0.9999.ebuild diff --git a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild new file mode 100644 index 000000000000..6bfe1aa438b4 --- /dev/null +++ b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs + +DESCRIPTION="New implementation of the C++ standard library, targeting C++11" +HOMEPAGE="https://libcxx.llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test" +REQUIRED_USE="libunwind? ( libcxxabi )" +RESTRICT="!test? ( test )" + +RDEPEND=" + libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) + !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )" +# llvm-6 for new lit options +# clang-3.9.0 installs necessary target symlinks unconditionally +# which removes the need for MULTILIB_USEDEP +DEPEND="${RDEPEND} + >=sys-devel/llvm-6" +BDEPEND=" + test? ( + >=dev-util/cmake-3.16 + >=sys-devel/clang-3.9.0 + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + )" + +DOCS=( CREDITS.TXT ) + +LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} ) +llvm.org_set_globals + +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # Darwin Prefix builds do not have llvm installed yet, so rely on + # bootstrap-prefix to set the appropriate path vars to LLVM instead + # of using llvm_pkg_setup. + if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then + llvm_pkg_setup + fi + use test && python-any-r1_pkg_setup + + if ! use libcxxabi && ! tc-is-gcc ; then + eerror "To build ${PN} against libsupc++, you have to use gcc. Other" + eerror "compilers are not supported. Please set CC=gcc and CXX=g++" + eerror "and try again." + die + fi +} + +src_prepare() { + # Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a + # out-of-tree build. + eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch" + + llvm.org_src_prepare +} + +test_compiler() { + $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ + <<<'int main() { return 0; }' &>/dev/null +} + +src_configure() { + # note: we need to do this before multilib kicks in since it will + # alter the CHOST + local cxxabi cxxabi_incs + if use libcxxabi; then + cxxabi=libcxxabi + cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" + else + local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" + cxxabi=libsupc++ + cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # we want -lgcc_s for unwinder, and for compiler runtime when using + # gcc, clang with gcc runtime (or any unknown compiler) + local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF + if use libunwind; then + # work-around missing -lunwind upstream + extra_libs+=( -lunwind ) + # if we're using libunwind and clang with compiler-rt, we want + # to link to compiler-rt instead of -lgcc_s + if tc-is-clang; then + local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ + ${LDFLAGS} -print-libgcc-file-name) + if [[ ${compiler_rt} == *libclang_rt* ]]; then + want_gcc_s=OFF + want_compiler_rt=ON + extra_libs+=( "${compiler_rt}" ) + fi + fi + elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then + # clang-based darwin prefix disables libunwind useflag during + # bootstrap, because libunwind is not in the prefix yet. + # override the default, though, because clang based libcxx + # should never use gcc_s on Darwin. + want_gcc_s=OFF + # compiler_rt is not available in EPREFIX during bootstrap, + # so we cannot link to it yet anyway, so keep the defaults + # of want_compiler_rt=OFF and extra_libs=() + fi + + # bootstrap: cmake is unhappy if compiler can't link to stdlib + local nolib_flags=( -nodefaultlibs -lc ) + if ! test_compiler; then + if test_compiler "${nolib_flags[@]}"; then + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" + fi + fi + + local libdir=$(get_libdir) + local mycmakeargs=( + -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} + -DLIBCXX_ENABLE_SHARED=ON + -DLIBCXX_ENABLE_STATIC=$(usex static-libs) + -DLIBCXX_CXX_ABI=${cxxabi} + -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} + # we're using our own mechanism for generating linker scripts + -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF + -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) + -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} + -DLIBCXX_INCLUDE_TESTS=$(usex test) + -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} + -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" + ) + + if use test; then + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" + -DPython3_EXECUTABLE="${PYTHON}" + ) + fi + cmake_src_configure +} + +multilib_src_test() { + local -x LIT_PRESERVES_TMP=1 + cmake_build check-cxx +} + +# Usage: deps +gen_ldscript() { + local output_format + output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') + [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" + + cat <<-END_LDSCRIPT +/* GNU ld script + Include missing dependencies +*/ +${output_format} +GROUP ( $@ ) +END_LDSCRIPT +} + +gen_static_ldscript() { + local libdir=$(get_libdir) + local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") + + # Move it first. + mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die + # Generate libc++.a ldscript for inclusion of its dependencies so that + # clang++ -stdlib=libc++ -static works out of the box. + local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" + # On Linux/glibc it does not link without libpthread or libdl. It is + # fine on FreeBSD. + use elibc_glibc && deps+=" libpthread.a libdl.a" + + gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die +} + +gen_shared_ldscript() { + local libdir=$(get_libdir) + # libsupc++ doesn't have a shared version + local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") + + mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die + local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" + + gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die +} + +multilib_src_install() { + cmake_src_install + if [[ ${CHOST} != *-darwin* ]] ; then + gen_shared_ldscript + use static-libs && gen_static_ldscript + fi +} + +pkg_postinst() { + elog "This package (${PN}) is mainly intended as a replacement for the C++" + elog "standard library when using clang." + elog "To use it, instead of libstdc++, use:" + elog " clang++ -stdlib=libc++" + elog "to compile your C++ programs." +} -- cgit v1.2.3-65-gdbad From 59e634ea7d06781ad3b34e4ad99f071d2fb2624e Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:01:02 +0100 Subject: sys-libs/libomp: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-libs/libomp/libomp-13.0.0.9999.ebuild | 105 ++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 sys-libs/libomp/libomp-13.0.0.9999.ebuild diff --git a/sys-libs/libomp/libomp-13.0.0.9999.ebuild b/sys-libs/libomp/libomp-13.0.0.9999.ebuild new file mode 100644 index 000000000000..d55fd49f4e7e --- /dev/null +++ b/sys-libs/libomp/libomp-13.0.0.9999.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake-multilib linux-info llvm.org python-any-r1 + +DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" +HOMEPAGE="https://openmp.llvm.org" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" +SLOT="0" +KEYWORDS="" +IUSE="cuda hwloc kernel_linux offload ompt test" +# CUDA works only with the x86_64 ABI +REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )" +RESTRICT="!test? ( test )" + +RDEPEND=" + hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] ) + offload? ( + virtual/libelf:=[${MULTILIB_USEDEP}] + dev-libs/libffi:=[${MULTILIB_USEDEP}] + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + )" +# tests: +# - dev-python/lit provides the test runner +# - sys-devel/llvm provide test utils (e.g. FileCheck) +# - sys-devel/clang provides the compiler to run tests +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + offload? ( virtual/pkgconfig ) + test? ( + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') + >=sys-devel/clang-6 + )" + +LLVM_COMPONENTS=( openmp llvm/include ) +llvm.org_set_globals + +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +kernel_pds_check() { + if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then + local CONFIG_CHECK="~!SCHED_PDS" + local ERROR_SCHED_PDS="\ +PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11 +< 4.14-pf9) do not implement sched_yield() call which may result in horrible +performance problems with libomp. If you are using one of the specified +kernel versions, you may want to disable the PDS scheduler." + + check_extra_config + fi +} + +pkg_pretend() { + kernel_pds_check +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +multilib_src_configure() { + local libdir="$(get_libdir)" + local mycmakeargs=( + -DOPENMP_LIBDIR_SUFFIX="${libdir#lib}" + + -DLIBOMP_USE_HWLOC=$(usex hwloc) + -DLIBOMP_OMPT_SUPPORT=$(usex ompt) + + -DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload) + + # do not install libgomp.so & libiomp5.so aliases + -DLIBOMP_INSTALL_ALIASES=OFF + # disable unnecessary hack copying stuff back to srcdir + -DLIBOMP_COPY_EXPORTS=OFF + ) + use offload && mycmakeargs+=( + # this is non-fatal and libomp checks for CUDA conditionally + # to ABI, so we can just ignore passing the wrong value + # on non-amd64 ABIs + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda) + ) + use test && mycmakeargs+=( + # this project does not use standard LLVM cmake macros + -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit" + -DOPENMP_LIT_ARGS="$(get_lit_flags)" + + -DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")" + -DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")" + ) + cmake_src_configure +} + +multilib_src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + + cmake_build check-libomp +} -- cgit v1.2.3-65-gdbad From 370a1eeaac9835119ae96855ce96aa9b7345236c Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 28 Jan 2021 10:01:02 +0100 Subject: sys-devel/clang-runtime: Add 13.x live ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../clang-runtime/clang-runtime-13.0.0.9999.ebuild | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 sys-devel/clang-runtime/clang-runtime-13.0.0.9999.ebuild diff --git a/sys-devel/clang-runtime/clang-runtime-13.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-13.0.0.9999.ebuild new file mode 100644 index 000000000000..218cdb1426f6 --- /dev/null +++ b/sys-devel/clang-runtime/clang-runtime-13.0.0.9999.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-build + +DESCRIPTION="Meta-ebuild for clang runtime libraries" +HOMEPAGE="https://clang.llvm.org/" +SRC_URI="" + +LICENSE="metapackage" +SLOT="$(ver_cut 1-3)" +KEYWORDS="" +IUSE="+compiler-rt libcxx openmp +sanitize" +REQUIRED_USE="sanitize? ( compiler-rt )" +PROPERTIES="live" + +RDEPEND=" + compiler-rt? ( + ~sys-libs/compiler-rt-${PV}:${SLOT} + sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} ) + ) + libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) + openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )" -- cgit v1.2.3-65-gdbad From 0950b698411ea7ffbafe868d231b18181da77e28 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sat, 16 Jan 2021 14:27:00 +0100 Subject: eclass/distutils-r1: fix distutils_enable_sphinx with DIS.._SINGLE_IMPL python-single-r1 does not have the python_gen_any_dep function use the python_gen_cond_dep instead Closes: https://bugs.gentoo.org/704520 Signed-off-by: Andrew Ammerlaan Signed-off-by: Joonas Niilola --- eclass/distutils-r1.eclass | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 5ffc91be479c..c5c954f49250 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: distutils-r1.eclass @@ -316,22 +316,25 @@ distutils_enable_sphinx() { _DISTUTILS_SPHINX_PLUGINS=( "${@}" ) local deps autodoc=1 d + deps="dev-python/sphinx[\${PYTHON_USEDEP}]" for d; do if [[ ${d} == --no-autodoc ]]; then autodoc= else deps+=" ${d}[\${PYTHON_USEDEP}]" + if [[ ! ${autodoc} ]]; then + die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" + fi fi done - if [[ ! ${autodoc} && -n ${deps} ]]; then - die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" - fi if [[ ${autodoc} ]]; then - deps="$(python_gen_any_dep " - dev-python/sphinx[\${PYTHON_USEDEP}] - ${deps}")" + if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then + deps="$(python_gen_cond_dep "${deps}")" + else + deps="$(python_gen_any_dep "${deps}")" + fi python_check_deps() { use doc || return 0 -- cgit v1.2.3-65-gdbad From 561d239da66d11d6a5fba30577e5e30a997f1c1f Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sat, 16 Jan 2021 14:28:53 +0100 Subject: eclass/docs.eclass: make compatible with python-single-r1 python-single-r1 does not have the pyhton_gen_any-dep function, use the pyhton_gen_cond_dep instead also a much needed update to the documentation of this eclass. Fixed typos, and added proper examples. Signed-off-by: Andrew Ammerlaan Closes: https://github.com/gentoo/gentoo/pull/19078 Signed-off-by: Joonas Niilola --- eclass/docs.eclass | 162 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 51 deletions(-) diff --git a/eclass/docs.eclass b/eclass/docs.eclass index adacae4abda6..b67b268b7508 100644 --- a/eclass/docs.eclass +++ b/eclass/docs.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: docs.eclass @@ -10,20 +10,52 @@ # @SUPPORTED_EAPIS: 6 7 # @BLURB: A simple eclass to build documentation. # @DESCRIPTION: -# A simple eclass providing functions to build documentation. +# A simple eclass providing basic functions and variables to build +# documentation. # -# Please note that docs sets RDEPEND and DEPEND unconditionally -# for you. +# Please note that this eclass appends to RDEPEND and DEPEND +# unconditionally for you. # # This eclass also appends "doc" to IUSE, and sets HTML_DOCS -# to the location of the compiled documentation +# to the location of the compiled documentation automatically, +# 'einstalldocs' will then automatically install the documentation +# to the correct directory. # # The aim of this eclass is to make it easy to add additional -# doc builders. To do this, add a -deps and -# -build function for your doc builder. +# doc builders. To do this, add a _deps and +# _compile function for your doc builder. # For python based doc builders you can use the # python_append_deps function to append [${PYTHON_USEDEP}] # automatically to additional dependencies. +# +# Example use doxygen: +# @CODE +# DOCS_BUILDER="doxygen" +# DOCS_DEPEND="media-gfx/imagemagick" +# DOCS_DIR="docs" +# +# inherit docs +# +# ... +# +# src_compile() { +# default +# docs_compile +# } +# @CODE +# +# Example use mkdocs with distutils-r1: +# @CODE +# DOCS_BUILDER="mkdocs" +# DOCS_DEPEND="dev-python/mkdocs-material" +# DOCS_DIR="doc" +# +# PYTHON_COMPAT=( python3_{7,8,9} ) +# +# inherit distutils-r1 docs +# +# ... +# @CODE case "${EAPI:-0}" in 0|1|2|3|4|5) @@ -50,41 +82,54 @@ esac # Path containing the doc builder config file(s). # # For sphinx this is the location of "conf.py" -# For mkdocs this is the location of "mkdocs.yml" # +# For mkdocs this is the location of "mkdocs.yml" # Note that mkdocs.yml often does not reside # in the same directory as the actual doc files # +# For doxygen the default name is Doxyfile, but +# package may use a non-standard name. If this +# is the case one should set DOCS_CONFIG_NAME to +# the correct name +# # Defaults to ${S} # @ECLASS-VARIABLE: DOCS_DEPEND # @DEFAULT_UNSET # @PRE_INHERIT # @DESCRIPTION: -# Sets additional dependencies to build docs. +# Sets additional dependencies required to build the +# documentation. # For sphinx and mkdocs these dependencies should -# be specified without [${PYTHON_USEDEP}], this +# be specified *without* [${PYTHON_USEDEP}], this # is added by the eclass. E.g. to depend on mkdocs-material: # +# @CODE # DOCS_DEPEND="dev-python/mkdocs-material" +# @CODE # -# This eclass appends to this variable, so you can -# call it later in your ebuild again if necessary. +# This eclass appends to this variable, this makes it +# possible to call it later in your ebuild again if +# necessary. # @ECLASS-VARIABLE: DOCS_AUTODOC # @PRE_INHERIT # @DESCRIPTION: # Sets whether to use sphinx.ext.autodoc/mkautodoc -# Defaults to 1 (True) for sphinx, and 0 (False) for mkdocs +# Defaults to 1 (True) for sphinx, and 0 (False) for mkdocs. +# Not relevant for doxygen. # @ECLASS-VARIABLE: DOCS_OUTDIR # @DESCRIPTION: -# Sets where the compiled files will be put. -# There's no real reason to change this, but this -# variable is useful if you want to overwrite the HTML_DOCS -# added by this eclass. E.g.: +# Sets the directory where the documentation should +# be built into. There is no real reason to change this. +# However, this variable is useful if the package should +# also install other HTML files. # +# Example use: +# @CODE # HTML_DOCS=( "${yourdocs}" "${DOCS_OUTDIR}/." ) +# @CODE # # Defaults to ${S}/_build/html @@ -93,18 +138,19 @@ esac # Name of the doc builder config file. # # Only relevant for doxygen, as it allows -# config files with non-standard names +# config files with non-standard names. +# Does not do anything for mkdocs or sphinx. # # Defaults to Doxyfile for doxygen if [[ ! ${_DOCS} ]]; then -# For the python based DOCS_BUILDERS we need to inherit python-any-r1 +# For the python based DOCS_BUILDERS we need to inherit any python eclass case ${DOCS_BUILDER} in "sphinx"|"mkdocs") # We need the python_gen_any_dep function - if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1} ]]; then - die "python-r1 or python-any-r1 needs to be inherited as well to use python based documentation builders" + if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} ]]; then + die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders" fi ;; "doxygen") @@ -119,6 +165,7 @@ case ${DOCS_BUILDER} in esac # @FUNCTION: python_append_dep +# @INTERNAL # @DESCRIPTION: # Appends [\${PYTHON_USEDEP}] to all dependencies # for python based DOCS_BUILDERs such as mkdocs or @@ -135,6 +182,7 @@ python_append_deps() { } # @FUNCTION: sphinx_deps +# @INTERNAL # @DESCRIPTION: # Sets dependencies for sphinx sphinx_deps() { @@ -142,28 +190,29 @@ sphinx_deps() { : ${DOCS_AUTODOC:=1} + deps="dev-python/sphinx[\${PYTHON_USEDEP}] + ${DOCS_DEPEND}" if [[ ${DOCS_AUTODOC} == 0 ]]; then if [[ -n "${DOCS_DEPEND}" ]]; then die "${FUNCNAME}: do not set DOCS_AUTODOC to 0 if external plugins are used" - else - DOCS_DEPEND="$(python_gen_any_dep " - dev-python/sphinx[\${PYTHON_USEDEP}]")" fi - elif [[ ${DOCS_AUTODOC} == 1 ]]; then - DOCS_DEPEND="$(python_gen_any_dep " - dev-python/sphinx[\${PYTHON_USEDEP}] - ${DOCS_DEPEND}")" - else + elif [[ ${DOCS_AUTODOC} != 0 && ${DOCS_AUTODOC} != 1 ]]; then die "${FUNCNAME}: DOCS_AUTODOC should be set to 0 or 1" fi + if [[ ${_PYTHON_SINGLE_R1} ]]; then + DOCS_DEPEND="$(python_gen_cond_dep "${deps}")" + else + DOCS_DEPEND="$(python_gen_any_dep "${deps}")" + fi } # @FUNCTION: sphinx_compile +# @INTERNAL # @DESCRIPTION: # Calls sphinx to build docs. # -# If you overwrite src_compile or python_compile_all -# do not call this function, call docs_compile instead +# If you overwrite python_compile_all do not call +# this function, call docs_compile instead sphinx_compile() { debug-print-function ${FUNCNAME} use doc || return @@ -190,6 +239,7 @@ sphinx_compile() { } # @FUNCTION: mkdocs_deps +# @INTERNAL # @DESCRIPTION: # Sets dependencies for mkdocs mkdocs_deps() { @@ -197,26 +247,28 @@ mkdocs_deps() { : ${DOCS_AUTODOC:=0} + deps="dev-python/mkdocs[\${PYTHON_USEDEP}] + ${DOCS_DEPEND}" if [[ ${DOCS_AUTODOC} == 1 ]]; then - DOCS_DEPEND="$(python_gen_any_dep " - dev-python/mkdocs[\${PYTHON_USEDEP}] - dev-python/mkautodoc[\${PYTHON_USEDEP}] - ${DOCS_DEPEND}")" - elif [[ ${DOCS_AUTODOC} == 0 ]]; then - DOCS_DEPEND="$(python_gen_any_dep " - dev-python/mkdocs[\${PYTHON_USEDEP}] - ${DOCS_DEPEND}")" - else + deps="dev-python/mkautodoc[\${PYTHON_USEDEP}] + ${deps}" + elif [[ ${DOCS_AUTODOC} != 0 && ${DOCS_AUTODOC} != 1 ]]; then die "${FUNCNAME}: DOCS_AUTODOC should be set to 0 or 1" fi + if [[ ${_PYTHON_SINGLE_R1} ]]; then + DOCS_DEPEND="$(python_gen_cond_dep "${deps}")" + else + DOCS_DEPEND="$(python_gen_any_dep "${deps}")" + fi } # @FUNCTION: mkdocs_compile +# @INTERNAL # @DESCRIPTION: # Calls mkdocs to build docs. # -# If you overwrite src_compile or python_compile_all -# do not call this function, call docs_compile instead +# If you overwrite python_compile_all do not call +# this function, call docs_compile instead mkdocs_compile() { debug-print-function ${FUNCNAME} use doc || return @@ -236,6 +288,7 @@ mkdocs_compile() { } # @FUNCTION: doxygen_deps +# @INTERNAL # @DESCRIPTION: # Sets dependencies for doxygen doxygen_deps() { @@ -246,11 +299,9 @@ doxygen_deps() { } # @FUNCTION: doxygen_compile +# @INTERNAL # @DESCRIPTION: # Calls doxygen to build docs. -# -# If you overwrite src_compile or python_compile_all -# do not call this function, call docs_compile instead doxygen_compile() { debug-print-function ${FUNCNAME} use doc || return @@ -273,12 +324,21 @@ doxygen_compile() { # @DESCRIPTION: # Calls DOCS_BUILDER and sets HTML_DOCS # -# This function must be called in global scope. Take care not to -# overwrite the variables set by it. Has support for distutils-r1 -# eclass, but only if this eclass is inherited *after* -# distutils-r1. If you need to extend src_compile() or -# python_compile_all(), you can call the original implementation -# as docs_compile. +# This function must be called in src_compile. Take care not to +# overwrite the variables set by it. If distutils-r1 is inherited +# *before* this eclass, than docs_compile will be automatically +# added to python_compile_all() and there is no need to call +# it manually. Note that this function checks if USE="doc" is +# enabled, and if not automatically exits. Therefore, there is +# no need to wrap this function in a if statement. +# +# Example use: +# @CODE +# src_compile() { +# default +# docs_compile +# } +# @CODE docs_compile() { debug-print-function ${FUNCNAME} use doc || return -- cgit v1.2.3-65-gdbad From 948a49331fc5d078fc71d00c82569909fd6bb304 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 28 Jan 2021 09:12:00 +0000 Subject: www-client/vivaldi-snapshot: Add version 3.6.2165.32 Package-Manager: Portage-3.0.14, Repoman-3.0.1 Signed-off-by: James Le Cuirot --- www-client/vivaldi-snapshot/Manifest | 4 + .../vivaldi-snapshot-3.6.2165.32.ebuild | 202 +++++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.32.ebuild diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest index 033cb3960f0c..2cc2ff6f78f2 100644 --- a/www-client/vivaldi-snapshot/Manifest +++ b/www-client/vivaldi-snapshot/Manifest @@ -6,3 +6,7 @@ DIST vivaldi-snapshot_3.6.2165.26-1_amd64.deb 77534968 BLAKE2B c8fcd5a48f6657289 DIST vivaldi-snapshot_3.6.2165.26-1_arm64.deb 69807004 BLAKE2B 621675672e6b151a9ec8061f170ac885d151872a334a8ae4ac117f4a640f7a093e30828f1cd95e03e105545790a649b5e668b1dbe663969311df111306f25fe4 SHA512 ef5c098aab49074f5c3c360a9d44929d8e8517f8eaf85d9afca2e46fcecb302f8fac1bb1b37ab1273c764a9c837034992f5d2f963b0b3a43863e1a6e994080cd DIST vivaldi-snapshot_3.6.2165.26-1_armhf.deb 68608692 BLAKE2B 0e54dc2c5f8b8ec238d0de7c79c40316b0f6005df43fc37ace484f4bf048e305be321d880a513c97c3dacd8797229d279c08dfe63a8c7307fe15ba60f935c2c7 SHA512 e2d19ccabea4fde8fab3a2589ef4e8361d4fcd4f964b8254d929822d67cc8a6667356f2131526b124537fc688b18a781833a2c5b07bd14c3f0877f990136e6b2 DIST vivaldi-snapshot_3.6.2165.26-1_i386.deb 74265460 BLAKE2B f285f0b257adb6944c4d05a414b7d9cc404c79555defb5823ccf449b426ba7e9bb5e55cdf2897122d30f0ee971e004c1042ef1428390663a5f193dbb9a7fe490 SHA512 040b5a80fc18e45dd1b4a1f5f7e30b430ef3a28c09e0158f48ca4deb7c408ee27db525602d9cf0d48c51c7c37ad50c44e7a7010b15e4691c48e270c75e1cf2fd +DIST vivaldi-snapshot_3.6.2165.32-1_amd64.deb 77537504 BLAKE2B 5104b2ca7878512afb5c38e242c7e38660365445d4e6d9b0e12e44104f2ee91142d7f935131829a4a6faca778dc753478ea78f35734566a12d50b2778d1f34a1 SHA512 a05ab34c4e22c36571a944510274706980c1b2d9461f36646164393af4bde130db6e906bef6514cfa201e2d06da1e6b8317a54fe65099b21120d5f74e7ba9ddb +DIST vivaldi-snapshot_3.6.2165.32-1_arm64.deb 69777460 BLAKE2B 3bd957ecd1547d79183b955ecbc8aa6d53e9966c8f03810b5f40ac91b5752022f6c91111ab3680f220ba1f8ac1a7748f366a5b0a26ce528fa00cb1be87ec4b3a SHA512 98f2061f5f32be702e55927e58ef8af03bbb5f16c2d6fbd9f4959b9b9732313c3663f4b720243505fbff3f58677a06e49957754efb03fa28b02065edbe338682 +DIST vivaldi-snapshot_3.6.2165.32-1_armhf.deb 68597612 BLAKE2B de4c564394972fb9a85b02541adc67c0841b0b21c00367883527e383af80988969ab6a9c0abc64bb55a7ecad83a1b626f8a62ae383d7818e464f9aac1a3b78af SHA512 efa2a53144791e1bf42515932cc08b3308755feb797c00d64a283880b4c0e9d2aefaa0d7fd0d44eb3354e3bf289b0a087381af62202430dcf0fbae9e58c5a2d8 +DIST vivaldi-snapshot_3.6.2165.32-1_i386.deb 73641588 BLAKE2B 49c95c3d8cd90d1eb69b46df7e99cc5a267a6e0f1ea051e011f9e032fb130b4db63b542015192ebac72840aed11abb650d0b221b84b387cbf72ca4e1432d0bfd SHA512 5dda40708f005862ae214a87d14f5f88f3673615402f07fb1c3317d40cdfb922ace38d897ec3bf88a0975b3f95045cf4d7022a3a3e06fc8edf49c85e9990b68f diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.32.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.32.ebuild new file mode 100644 index 000000000000..e3d12da4e30f --- /dev/null +++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.32.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CHROMIUM_LANGS=" + af + am + ar + be + bg + bn + ca + cs + da + de + de-CH + el + en-GB + en-US + eo + es + es-419 + es-PE + et + eu + fa + fi + fil + fr + fy + gd + gl + gu + he + hi + hr + hu + hy + id + io + is + it + ja + jbo + ka + kn + ko + ku + lt + lv + mk + ml + mr + ms + nb + nl + nn + pl + pt-BR + pt-PT + ro + ru + sc + sk + sl + sq + sr + sv + sw + ta + te + th + tr + uk + vi + zh-CN + zh-TW +" + +inherit chromium-2 desktop unpacker xdg + +VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}" +VIVALDI_HOME="opt/${PN}" +DESCRIPTION="A browser for our friends" +HOMEPAGE="https://vivaldi.com/" + +if [[ ${PV} = *_p* ]]; then + DEB_REV="${PV#*_p}" +else + DEB_REV=1 +fi + +VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_" +SRC_URI=" + amd64? ( ${VIVALDI_BASE_URI}amd64.deb ) + arm64? ( ${VIVALDI_BASE_URI}arm64.deb ) + arm? ( ${VIVALDI_BASE_URI}armhf.deb ) + x86? ( ${VIVALDI_BASE_URI}i386.deb ) +" + +LICENSE="Vivaldi" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" +IUSE="proprietary-codecs widevine" +RESTRICT="bindist mirror" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + media-libs/speex + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pango[X] + proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) + widevine? ( www-plugins/chrome-binary-plugins ) +" + +QA_PREBUILT="*" +S="${WORKDIR}" + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + # Rename docs directory to our needs. + mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die + + # Decompress the docs. + gunzip usr/share/doc/${PF}/changelog.gz || die + + # The appdata directory is deprecated. + mv usr/share/{appdata,metainfo}/ || die + + # Remove cron job for updating from Debian repos. + rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die + rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die + + # Remove scripts that will most likely break things. + rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die + + pushd ${VIVALDI_HOME}/locales > /dev/null || die + rm ja-KS.pak || die # No flag for Kansai as not in IETF list. + chromium_remove_language_paks + popd > /dev/null || die + + if use proprietary-codecs; then + rm ${VIVALDI_HOME}/lib/libffmpeg.so || die + rmdir ${VIVALDI_HOME}/lib || die + fi + + eapply_user +} + +src_install() { + mv */ "${D}" || die + dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} + fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox + + local logo size + for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do + size=${logo##*_} + size=${size%.*} + newicon -s "${size}" "${logo}" ${PN}.png + done + + if use proprietary-codecs; then + dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \ + /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2) + fi + + if use widevine; then + dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \ + /${VIVALDI_HOME}/WidevineCdm + else + rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die + fi + + [[ ${PN} = vivaldi-snapshot ]] && + dosym ${PN} /${VIVALDI_HOME}/vivaldi +} -- cgit v1.2.3-65-gdbad From c89d4a0bf3f374fcea212664a216434ea3b81cec Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 28 Jan 2021 09:13:17 +0000 Subject: www-client/vivaldi-snapshot: Drop old 3.6.2165.22 Package-Manager: Portage-3.0.14, Repoman-3.0.1 Signed-off-by: James Le Cuirot --- www-client/vivaldi-snapshot/Manifest | 4 - .../vivaldi-snapshot-3.6.2165.22.ebuild | 202 --------------------- 2 files changed, 206 deletions(-) delete mode 100644 www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.22.ebuild diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest index 2cc2ff6f78f2..d1eeac4f33b2 100644 --- a/www-client/vivaldi-snapshot/Manifest +++ b/www-client/vivaldi-snapshot/Manifest @@ -1,7 +1,3 @@ -DIST vivaldi-snapshot_3.6.2165.22-1_amd64.deb 77580020 BLAKE2B a35e59be7501e6dd0ff54116d21856c2887aa4cd6cb1f45e73c3c7f2b88c1f299619b8bfbacc994a286af51a09a48d3814dbf2670048b1588457f14cb461ad8c SHA512 a2b0c8e995cbd3c58c1cd93ee9f7c2a7ba29a1f4f7e1d7fdcbfba958c1569b823945cdbda29bc76a1c0c9160f34f84be3e9d4ad41b890319d4a0ae2fadb3a9b4 -DIST vivaldi-snapshot_3.6.2165.22-1_arm64.deb 69778528 BLAKE2B 948be83d7b8422b1482f1a837147d190caac30d1bb10b4a3a5dc8636f347da6f41da51332087239ffdf3428333d731a503de162ade5c59aa46657244503c0827 SHA512 9722f7625af7669348e5e241895fed469a76f398347e5f3f976320664550fc0d64c10c5944dfe68957a45f5f34afaafa1e78623ba20ec3ca008ef3ad13058c52 -DIST vivaldi-snapshot_3.6.2165.22-1_armhf.deb 68599120 BLAKE2B e594ec892c437016bf6be06b516b09167baeaea0def10deaf983f4eded12adb031b6c82806ce088a3557b3af048945e23be56cc4e5ea842da177a940d1cf1b82 SHA512 16e8255e3650a54d747ff2a30f6a41d717ac5969bc672068a13d13c7ca4341bccb147c688d68673cab33166fc3fdaad0c1e164771b81abab7bcc5290d7ab104c -DIST vivaldi-snapshot_3.6.2165.22-1_i386.deb 74260324 BLAKE2B d2ac290079a5186ee6a2ee3902140b9a8e7e481c6083726584a722b032f23561a33517d4d91592edb5523c59e3f60f3759c925aff704c6009aca73b4be4229e7 SHA512 4627e881b17600a7d49f493be2365070161b6c86eb71c56862ad2dfaee2ca71e46f7db9b182342c36e51c7f4d5dcbfff538035fe321399d0ef64ad286451c8d7 DIST vivaldi-snapshot_3.6.2165.26-1_amd64.deb 77534968 BLAKE2B c8fcd5a48f6657289438ba0289a01e3a501510a868a523675c5481335351fefcda2ce972042eb121f488b2b16b7ffe738b8a87ae24d62436a77ebb17480441e2 SHA512 9b6dc9bad55280e79b02ebc70357e9cf4a364249e924c1c744d1748589dda25f29c483f83091823362d4248cd495a54ec11b9992d41e0c351810ef9017fad155 DIST vivaldi-snapshot_3.6.2165.26-1_arm64.deb 69807004 BLAKE2B 621675672e6b151a9ec8061f170ac885d151872a334a8ae4ac117f4a640f7a093e30828f1cd95e03e105545790a649b5e668b1dbe663969311df111306f25fe4 SHA512 ef5c098aab49074f5c3c360a9d44929d8e8517f8eaf85d9afca2e46fcecb302f8fac1bb1b37ab1273c764a9c837034992f5d2f963b0b3a43863e1a6e994080cd DIST vivaldi-snapshot_3.6.2165.26-1_armhf.deb 68608692 BLAKE2B 0e54dc2c5f8b8ec238d0de7c79c40316b0f6005df43fc37ace484f4bf048e305be321d880a513c97c3dacd8797229d279c08dfe63a8c7307fe15ba60f935c2c7 SHA512 e2d19ccabea4fde8fab3a2589ef4e8361d4fcd4f964b8254d929822d67cc8a6667356f2131526b124537fc688b18a781833a2c5b07bd14c3f0877f990136e6b2 diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.22.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.22.ebuild deleted file mode 100644 index e3d12da4e30f..000000000000 --- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.6.2165.22.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CHROMIUM_LANGS=" - af - am - ar - be - bg - bn - ca - cs - da - de - de-CH - el - en-GB - en-US - eo - es - es-419 - es-PE - et - eu - fa - fi - fil - fr - fy - gd - gl - gu - he - hi - hr - hu - hy - id - io - is - it - ja - jbo - ka - kn - ko - ku - lt - lv - mk - ml - mr - ms - nb - nl - nn - pl - pt-BR - pt-PT - ro - ru - sc - sk - sl - sq - sr - sv - sw - ta - te - th - tr - uk - vi - zh-CN - zh-TW -" - -inherit chromium-2 desktop unpacker xdg - -VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}" -VIVALDI_HOME="opt/${PN}" -DESCRIPTION="A browser for our friends" -HOMEPAGE="https://vivaldi.com/" - -if [[ ${PV} = *_p* ]]; then - DEB_REV="${PV#*_p}" -else - DEB_REV=1 -fi - -VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_" -SRC_URI=" - amd64? ( ${VIVALDI_BASE_URI}amd64.deb ) - arm64? ( ${VIVALDI_BASE_URI}arm64.deb ) - arm? ( ${VIVALDI_BASE_URI}armhf.deb ) - x86? ( ${VIVALDI_BASE_URI}i386.deb ) -" - -LICENSE="Vivaldi" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" -IUSE="proprietary-codecs widevine" -RESTRICT="bindist mirror" - -RDEPEND=" - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype - media-libs/speex - net-print/cups - sys-apps/dbus - sys-libs/libcap - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango[X] - proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) - widevine? ( www-plugins/chrome-binary-plugins ) -" - -QA_PREBUILT="*" -S="${WORKDIR}" - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - # Rename docs directory to our needs. - mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die - - # Decompress the docs. - gunzip usr/share/doc/${PF}/changelog.gz || die - - # The appdata directory is deprecated. - mv usr/share/{appdata,metainfo}/ || die - - # Remove cron job for updating from Debian repos. - rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die - rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die - - # Remove scripts that will most likely break things. - rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die - - pushd ${VIVALDI_HOME}/locales > /dev/null || die - rm ja-KS.pak || die # No flag for Kansai as not in IETF list. - chromium_remove_language_paks - popd > /dev/null || die - - if use proprietary-codecs; then - rm ${VIVALDI_HOME}/lib/libffmpeg.so || die - rmdir ${VIVALDI_HOME}/lib || die - fi - - eapply_user -} - -src_install() { - mv */ "${D}" || die - dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} - fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox - - local logo size - for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do - size=${logo##*_} - size=${size%.*} - newicon -s "${size}" "${logo}" ${PN}.png - done - - if use proprietary-codecs; then - dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \ - /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2) - fi - - if use widevine; then - dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \ - /${VIVALDI_HOME}/WidevineCdm - else - rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die - fi - - [[ ${PN} = vivaldi-snapshot ]] && - dosym ${PN} /${VIVALDI_HOME}/vivaldi -} -- cgit v1.2.3-65-gdbad From 095babf97b2ef886fe03dfe5d9f5b58cded8708c Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 28 Jan 2021 09:18:46 +0000 Subject: www-client/vivaldi: Add version 3.6.2165.34 Package-Manager: Portage-3.0.14, Repoman-3.0.1 Signed-off-by: James Le Cuirot --- www-client/vivaldi/Manifest | 4 + www-client/vivaldi/vivaldi-3.6.2165.34.ebuild | 202 ++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 www-client/vivaldi/vivaldi-3.6.2165.34.ebuild diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest index 94c325fbf8ac..51da53132a07 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -2,3 +2,7 @@ DIST vivaldi-stable_3.5.2115.87-1_amd64.deb 76844616 BLAKE2B 1d9f78740bb778b9b17 DIST vivaldi-stable_3.5.2115.87-1_arm64.deb 69043804 BLAKE2B bcb038c7db98183cec134a5aa2b78209b1b918dfd8044e8078ffab8750ce0d065d51311bca724411437e289f63fa86fa062785eb2d7f4cf49e9ebeacc6a793e1 SHA512 ca6cfffc993fc218bfe1da8f4c1997689eb96204e72deacb6dd5ed64173877d9418cfed52b431b1e22afa4258da85823ebb9e37a76a195e7fc2f1f9dc8616b0f DIST vivaldi-stable_3.5.2115.87-1_armhf.deb 68135616 BLAKE2B fffebd9b53796fdc201297e7d18132fab48ad7c5960c3ea5304e5498357bdc9120b09293e283974c135da07362d42efdd5ff0336512117fbbd5ce3c8f4f38c15 SHA512 331ad6a7f91c632efb269d469f017e4cfb80d487cf206890758f244d1be6041dd8b5145dd07238f1402c1bef050b3c411ef019ea300869d3a41da12089e7ef54 DIST vivaldi-stable_3.5.2115.87-1_i386.deb 73585364 BLAKE2B e8d23692931623fc444b28db3dd324fe3d5a322788eda16beaa4049f625358088faa6d56bad6b69f7d0bad9c3a2e60879cf4188e4270255aa3783ef20fa2c389 SHA512 02b87bb42a8c061b762c7bc8f8c2ddd7648909158a4ed426a63aa6552bf5a58c77448a8d08688c29d4d271f41de51ac69d8ff60b21be9d15dbbc124b871e88b6 +DIST vivaldi-stable_3.6.2165.34-1_amd64.deb 77533024 BLAKE2B 01fe76bbdb6b75328a75ab8aee5d76936802b6beb20fa5cd6feba552b04b5a3c1ffd350147cc55a97a8e259db7063f2ea9b247a5df7e4d27cd791339187c5457 SHA512 65e3caf0a12804b5777349d68e498636e0bbe7018856f14f262c0a8cf43f39cd91cbcf6b55a305b4bbd85b06d91c60fdb3d8d033750ecd512fc489b78210bcd0 +DIST vivaldi-stable_3.6.2165.34-1_arm64.deb 69789900 BLAKE2B 9180187ebd5ad0a228d591f6558c57bf4bbfa1517c5a3478db7be8d9916dbe57928bd2606811e351e7f2c0bfa5aa3afca63e81832d4fcf9b6faff3f0d1111e61 SHA512 8cfba43563dc15514f0e9ff9d12126e508a7a6bb77f66efd61c635de7a26a97b0037c33d31b6316db9087b656d5b05c491f10ce86a39263a652d2e59856ff47a +DIST vivaldi-stable_3.6.2165.34-1_armhf.deb 68614424 BLAKE2B d21c9f9766eef38337121372f4307c12f2f4924ae14f33910c7faf85137ea7f7760fbe1543b31a66dfde129a648158cd50816bb45a9cef5a305904068948018c SHA512 0a4e04b0f5764950bc73b8b33d692e2e017df7439a0f6fccb5735e312b5c150c0a23c6a6ce0dc712716fff40e7f76cc92a62e0fd7b70009987840f9efd3a98b9 +DIST vivaldi-stable_3.6.2165.34-1_i386.deb 74272560 BLAKE2B d5764401a1ea590e0e897713799776ce7b8615a19ea3e27b02b7f04cbd14d4f45b1182cc5e4cca830716d8a03e3bfbc4fdc66d4b424ce32a7240074e72e6f95c SHA512 f6a98e3472c484d2d5dd25b164ea2538b1fb451cfc0f42bf23dd140f032e7616c89f257700752a5b21b47d80af03aa23731872f75b1a6e19a22de6dab1a6ab0a diff --git a/www-client/vivaldi/vivaldi-3.6.2165.34.ebuild b/www-client/vivaldi/vivaldi-3.6.2165.34.ebuild new file mode 100644 index 000000000000..e3d12da4e30f --- /dev/null +++ b/www-client/vivaldi/vivaldi-3.6.2165.34.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CHROMIUM_LANGS=" + af + am + ar + be + bg + bn + ca + cs + da + de + de-CH + el + en-GB + en-US + eo + es + es-419 + es-PE + et + eu + fa + fi + fil + fr + fy + gd + gl + gu + he + hi + hr + hu + hy + id + io + is + it + ja + jbo + ka + kn + ko + ku + lt + lv + mk + ml + mr + ms + nb + nl + nn + pl + pt-BR + pt-PT + ro + ru + sc + sk + sl + sq + sr + sv + sw + ta + te + th + tr + uk + vi + zh-CN + zh-TW +" + +inherit chromium-2 desktop unpacker xdg + +VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}" +VIVALDI_HOME="opt/${PN}" +DESCRIPTION="A browser for our friends" +HOMEPAGE="https://vivaldi.com/" + +if [[ ${PV} = *_p* ]]; then + DEB_REV="${PV#*_p}" +else + DEB_REV=1 +fi + +VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_" +SRC_URI=" + amd64? ( ${VIVALDI_BASE_URI}amd64.deb ) + arm64? ( ${VIVALDI_BASE_URI}arm64.deb ) + arm? ( ${VIVALDI_BASE_URI}armhf.deb ) + x86? ( ${VIVALDI_BASE_URI}i386.deb ) +" + +LICENSE="Vivaldi" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" +IUSE="proprietary-codecs widevine" +RESTRICT="bindist mirror" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + media-libs/speex + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pango[X] + proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) + widevine? ( www-plugins/chrome-binary-plugins ) +" + +QA_PREBUILT="*" +S="${WORKDIR}" + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + # Rename docs directory to our needs. + mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die + + # Decompress the docs. + gunzip usr/share/doc/${PF}/changelog.gz || die + + # The appdata directory is deprecated. + mv usr/share/{appdata,metainfo}/ || die + + # Remove cron job for updating from Debian repos. + rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die + rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die + + # Remove scripts that will most likely break things. + rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die + + pushd ${VIVALDI_HOME}/locales > /dev/null || die + rm ja-KS.pak || die # No flag for Kansai as not in IETF list. + chromium_remove_language_paks + popd > /dev/null || die + + if use proprietary-codecs; then + rm ${VIVALDI_HOME}/lib/libffmpeg.so || die + rmdir ${VIVALDI_HOME}/lib || die + fi + + eapply_user +} + +src_install() { + mv */ "${D}" || die + dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} + fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox + + local logo size + for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do + size=${logo##*_} + size=${size%.*} + newicon -s "${size}" "${logo}" ${PN}.png + done + + if use proprietary-codecs; then + dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \ + /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2) + fi + + if use widevine; then + dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \ + /${VIVALDI_HOME}/WidevineCdm + else + rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die + fi + + [[ ${PN} = vivaldi-snapshot ]] && + dosym ${PN} /${VIVALDI_HOME}/vivaldi +} -- cgit v1.2.3-65-gdbad