diff options
Diffstat (limited to 'eclass')
35 files changed, 71 insertions, 511 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 7a149c7af13e..98c03602c807 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index 04c6fb5b7d67..c882196e7758 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -1,5 +1,5 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later +# Copyright 2007-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 # @ECLASS: ant-tasks.eclass # @MAINTAINER: diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass index cce308cbfd63..a357760017f4 100644 --- a/eclass/autotools-multilib.eclass +++ b/eclass/autotools-multilib.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: autotools-multilib.eclass @@ -26,7 +26,7 @@ case ${EAPI:-0} in *) die "EAPI=${EAPI} is not supported" ;; esac -inherit autotools-utils eutils multilib-build multilib-minimal +inherit autotools-utils eutils ltprune multilib-build multilib-minimal EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass index 016041b8f9f3..854b740db4f2 100644 --- a/eclass/bazel.eclass +++ b/eclass/bazel.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: bazel.eclass diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 79d8863017d1..6776a4b03ac6 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cargo.eclass diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index dfccbad1a786..160f40b1cf8e 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cmake.eclass diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index 1ea657a3b6f8..da9364136777 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -19,6 +19,8 @@ case ${EAPI:-0} in die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";; esac +inherit estack + # @VARIABLE: EPATCH_SOURCE # @DESCRIPTION: # Default directory to search for patches. @@ -209,14 +211,13 @@ epatch() { # Let people filter things dynamically if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then # let people use globs in the exclude - local prev_noglob=$(shopt -p -o noglob) - set -o noglob + eshopts_push -o noglob local ex for ex in ${EPATCH_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." - ${prev_noglob} + eshopts_pop continue 2 fi done @@ -224,12 +225,12 @@ epatch() { for ex in ${EPATCH_USER_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." - ${prev_noglob} + eshopts_pop continue 2 fi done - ${prev_noglob} + eshopts_pop fi if [[ ${SINGLE_PATCH} == "yes" ]] ; then diff --git a/eclass/epunt-cxx.eclass b/eclass/epunt-cxx.eclass index 1696faea0134..91406ed86f05 100644 --- a/eclass/epunt-cxx.eclass +++ b/eclass/epunt-cxx.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @DEAD diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index b1b5c866a002..5cc58f9e9392 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: flag-o-matic.eclass diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 229689babf56..42df4a1ff8e9 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: fortran-2.eclass diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index dbe7dc2a5acd..5361f09af1e9 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ghc-package.eclass diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 663fd939b295..e0cf41e4342f 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: git-r3.eclass diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index d19bd0b9ac69..a16fc916c6d2 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnome2.eclass @@ -17,7 +17,7 @@ GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} [[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools -inherit eutils libtool gnome.org gnome2-utils xdg +inherit eutils libtool ltprune gnome.org gnome2-utils xdg case "${EAPI:-0}" in 4|5) diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass index d5de5f60ccdf..80ff2902b3ad 100644 --- a/eclass/go-module.eclass +++ b/eclass/go-module.eclass @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: go-module.eclass diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass index fb57a1e84ac4..159b32f952f9 100644 --- a/eclass/golang-vcs.eclass +++ b/eclass/golang-vcs.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: golang-vcs.eclass @@ -10,7 +10,7 @@ # This eclass is written to ease the maintenance of live ebuilds # of software written in the Go programming language. -inherit eutils golang-base +inherit estack eutils golang-base case "${EAPI:-0}" in 5|6|7) diff --git a/eclass/gstreamer.eclass b/eclass/gstreamer.eclass index 24877de422fa..319f88128518 100644 --- a/eclass/gstreamer.eclass +++ b/eclass/gstreamer.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gstreamer.eclass @@ -23,7 +23,7 @@ # plugin, consider adding media-plugins/gst-plugins-meta dependency, but # also list any packages that provide explicitly requested plugins. -inherit eutils multilib multilib-minimal toolchain-funcs versionator xdg-utils +inherit eutils ltprune multilib multilib-minimal toolchain-funcs versionator xdg-utils case "${EAPI:-0}" in 5|6) diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index b943ebabb3da..2776b5b972f2 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kde.org.eclass @@ -136,7 +136,7 @@ _kde.org_calculate_src_uri() { ;; kde-plasma) case ${PV} in - 5.??.[6-9]? ) + 5.??.[6-9]?* ) _src_uri+="unstable/plasma/$(ver_cut 1-3)/" RESTRICT+=" mirror" ;; diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass index 914ee3e9f750..fc2a7a8d8aa7 100644 --- a/eclass/kodi-addon.eclass +++ b/eclass/kodi-addon.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kodi-addon.eclass diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass index e24fd1875f47..3d2c09754775 100644 --- a/eclass/latex-package.eclass +++ b/eclass/latex-package.eclass @@ -102,32 +102,32 @@ latex-package_src_doinstall() { while [[ ${1} ]]; do case ${1} in "sh") - while read -r -d '' i; do + while IFS= read -r -d '' i; do dobin ${i} - done < <(find -maxdepth 1 -type f -name "*.${1}") + done < <(find -maxdepth 1 -type f -name "*.${1}" -print0) ;; "sty" | "cls" | "fd" | "clo" | "def" | "cfg") - while read -r -d '' i; do + while IFS= read -r -d '' i; do insinto ${TEXMF}/tex/latex/${PN} doins ${i} - done < <(find -maxdepth 1 -type f -name "*.${1}") + done < <(find -maxdepth 1 -type f -name "*.${1}" -print0) ;; "dvi" | "ps" | "pdf") - while read -r -d '' i; do + while IFS= read -r -d '' i; do insinto /usr/share/doc/${PF} doins ${i} dosym /usr/share/doc/${PF}/$(basename ${i}) ${TEXMF}/doc/latex/${PN}/${i} docompress -x /usr/share/doc/${PF}/$(basename ${i}) - done < <(find -maxdepth 1 -type f -name "*.${1}") + done < <(find -maxdepth 1 -type f -name "*.${1}" -print0) ;; "tex" | "dtx") if ! in_iuse doc || use doc ; then - while read -r -d '' i; do - [[ -n ${LATEX_PACKAGE_SKIP} ]] && \ - has ${i##*/} ${LATEX_PACKAGE_SKIP} && \ + while IFS= read -r -d '' i; do + [[ -n ${LATEX_PACKAGE_SKIP} ]] && + has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue einfo "Making documentation: ${i}" @@ -139,34 +139,34 @@ latex-package_src_doinstall() { einfo "pdflatex failed, trying texi2dvi" texi2dvi -q -c --language=latex ${i} || die fi - done < <(find -maxdepth 1 -type f -name "*.${1}") + done < <(find -maxdepth 1 -type f -name "*.${1}" -print0) fi ;; "tfm" | "vf" | "afm") - while read -r -d '' i; do + while IFS= read -r -d '' i; do insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN} doins ${i} - done < <(find -maxdepth 1 -type f -name "*.${1}") + done < <(find -maxdepth 1 -type f -name "*.${1}" -print0) ;; "pfb") - while read -r -d '' i; do + while IFS= read -r -d '' i; do insinto ${TEXMF}/fonts/type1/${SUPPLIER}/${PN} doins ${i} - done < <(find -maxdepth 1 -type f -name "*.pfb") + done < <(find -maxdepth 1 -type f -name "*.pfb" -print0) ;; "ttf") - while read -r -d '' i; do + while IFS= read -r -d '' i; do insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN} doins ${i} - done < <(find -maxdepth 1 -type f -name "*.ttf") + done < <(find -maxdepth 1 -type f -name "*.ttf" -print0) ;; "bst") - while read -r -d '' i; do + while IFS= read -r -d '' i; do insinto ${TEXMF}/bibtex/bst/${PN} doins ${i} - done < <(find -maxdepth 1 -type f -name "*.bst") + done < <(find -maxdepth 1 -type f -name "*.bst" -print0) ;; "styles") @@ -199,10 +199,10 @@ latex-package_src_doinstall() { # relevant files that will be installed latex-package_src_compile() { debug-print function $FUNCNAME $* - while read -r -d '' i; do + while IFS= read -r -d '' i; do einfo "Extracting from ${i}" latex --halt-on-error --interaction=nonstopmode ${i} || die - done < <(find -maxdepth 1 -type f -name "*.ins") + done < <(find -maxdepth 1 -type f -name "*.ins" -print0) } # @FUNCTION: latex-package_src_install diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass index 61713a84b90a..768c4701827b 100644 --- a/eclass/libretro-core.eclass +++ b/eclass/libretro-core.eclass @@ -1,4 +1,4 @@ -# Copyright 2018-2019 Gentoo Authors +# Copyright 2018-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: libretro-core.eclass @@ -74,7 +74,7 @@ else S="${WORKDIR}/${LIBRETRO_REPO_NAME##*/}-${LIBRETRO_COMMIT_SHA}" : ${SRC_URI:="https://github.com/${LIBRETRO_REPO_NAME}/archive/${LIBRETRO_COMMIT_SHA}.tar.gz -> ${P}.tar.gz"} fi -inherit flag-o-matic +inherit flag-o-matic toolchain-funcs case "${EAPI:-0}" in 6|7) diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index b6dc2c84d09f..5b1b8f65cee0 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: linux-mod.eclass @@ -132,7 +132,7 @@ # @DESCRIPTION: # It's a read-only variable. It contains the extension of the kernel modules. -inherit eutils linux-info multilib +inherit eutils linux-info multilib toolchain-funcs EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst src_install src_compile pkg_postrm case ${MODULES_OPTIONAL_USE_IUSE_DEFAULT:-n} in diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass index 5477b9d25edd..1a5b7176ae8a 100644 --- a/eclass/llvm.eclass +++ b/eclass/llvm.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: llvm.eclass diff --git a/eclass/meson.eclass b/eclass/meson.eclass index e642ac49af9b..0588590b31e1 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -1,4 +1,4 @@ -# Copyright 2017-2019 Gentoo Authors +# Copyright 2017-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: meson.eclass diff --git a/eclass/mount-boot.eclass b/eclass/mount-boot.eclass index c5c6b69b063e..00b367793252 100644 --- a/eclass/mount-boot.eclass +++ b/eclass/mount-boot.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mount-boot.eclass @@ -62,8 +62,8 @@ mount-boot_check_status() { return fi - local procstate=$(awk '$2 == "/boot" \ - { print gensub(/^(.*,)?(ro|rw)(,.*)?$/, "\\2", 1, $4); exit }' \ + local procstate=$(awk '$2 == "/boot" { split($4, a, ","); \ + for (i in a) if (a[i] ~ /^r[ow]$/) { print a[i]; break }; exit }' \ /proc/mounts || die "awk failed") if [[ -z ${procstate} ]] ; then diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass index 698b8b24b24f..b8d9bb57c0db 100644 --- a/eclass/mozconfig-v6.52.eclass +++ b/eclass/mozconfig-v6.52.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # @ECLASS: mozconfig-v6.52.eclass diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass deleted file mode 100644 index 6572fae3f7bb..000000000000 --- a/eclass/mozconfig-v6.60.eclass +++ /dev/null @@ -1,441 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# @DEAD -# All consumers are gone. Removal in 14 days -# -# @ECLASS: mozconfig-v6.60.eclass -# @MAINTAINER: -# mozilla team <mozilla@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 -# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 -# @DESCRIPTION: -# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) -# to provide a single common place for the common mozilla engine compoments. -# -# The eclass provides all common dependencies as well as common use flags. -# -# Some use flags which may be optional in particular mozilla packages can be -# supported through setting eclass variables. -# -# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, -# and so ebuilds inheriting this eclass do not need to inherit that. - -case ${EAPI} in - 0|1|2|3|4) - die "EAPI=${EAPI} not supported" - ;; - 5) - inherit multilib - ;; -esac - -inherit flag-o-matic toolchain-funcs mozcoreconf-v6 - -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI -# @DESCRIPTION: -# Set this variable before the inherit line, when an ebuild needs to provide -# optional necko-wifi support via IUSE="wifi". Currently this would include -# ebuilds for firefox, and potentially seamonkey. -# -# Leave the variable UNSET if necko-wifi support should not be available. -# Set the variable to "enabled" if the use flag should be enabled by default. -# Set the variable to any value if the use flag should exist but not be default-enabled. - -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT -# @DESCRIPTION: -# Set this variable before the inherit line, when an ebuild needs to provide -# deterministic jit support via IUSE="jit". The upstream default will be used -# otherwise, which is generally to enable jit unless support for the platform -# is missing. -# -# Set the variable to "enabled" if the use flag should be enabled by default. -# Set the variable to any value if the use flag should exist but not be default-enabled. - -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3 -# @DESCRIPTION: -# Set this variable before the inherit line, when an ebuild can provide -# optional gtk3 support via IUSE="force-gtk3". Currently this would include -# thunderbird and seamonkey in the future, once support is ready for testing. -# -# Leave the variable UNSET if gtk3 support should not be optionally available. -# Set the variable to "enabled" if the use flag should be enabled by default. -# Set the variable to any value if the use flag should exist but not be default-enabled. -# If gtk+:3 is to be the standard toolkit, do not use this and instead use -# MOZCONFIG_OPTIONAL_GTK2ONLY. - -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY -# @DESCRIPTION: -# Set this variable before the inherit line, when an ebuild can provide -# optional gtk2-only support via IUSE="gtk2". -# -# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both -# variables cannot be set at the same time and this variable will be ignored if -# MOZCONFIG_OPTIONAL_GTK3 is set. -# -# Leave the variable UNSET if gtk2-only support should not be available. -# Set the variable to "enabled" if the use flag should be enabled by default. -# Set the variable to any value if the use flag should exist but not be default-enabled. - -# use-flags common among all mozilla ebuilds -IUSE="${IUSE} clang dbus debug neon pulseaudio selinux startup-notification system-harfbuzz - system-icu system-jpeg system-libevent system-sqlite system-libvpx" - -# some notes on deps: -# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14 -# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau - -RDEPEND=">=app-text/hunspell-1.5.4:= - dev-libs/atk - dev-libs/expat - >=x11-libs/cairo-1.10[X] - >=x11-libs/gtk+-2.18:2 - x11-libs/gdk-pixbuf - >=x11-libs/pango-1.22.0 - >=media-libs/libpng-1.6.34:0=[apng] - >=media-libs/mesa-10.2:* - media-libs/fontconfig - >=media-libs/freetype-2.4.10 - kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) - virtual/freedesktop-icon-theme - dbus? ( >=sys-apps/dbus-0.60 - >=dev-libs/dbus-glib-0.72 ) - startup-notification? ( >=x11-libs/startup-notification-0.8 ) - >=x11-libs/pixman-0.19.2 - >=dev-libs/glib-2.26:2 - >=sys-libs/zlib-1.2.3 - >=virtual/libffi-3.0.10:= - virtual/ffmpeg - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXt - system-icu? ( >=dev-libs/icu-59.1:= ) - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) - system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) - system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) - system-libvpx? ( - >=media-libs/libvpx-1.5.0:0=[postproc] - <media-libs/libvpx-1.8:0=[postproc] - ) - system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) -" - -if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then - MOZCONFIG_OPTIONAL_GTK2ONLY= - if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then - IUSE+=" +force-gtk3" - else - IUSE+=" force-gtk3" - fi - RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" -elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then - if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then - IUSE+=" +gtk2" - else - IUSE+=" gtk2" - fi - RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" -else - # no gtk3 related dep set by optional use flags, force it - RDEPEND+=" >=x11-libs/gtk+-3.4.0:3" -fi -if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then - if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then - IUSE+=" +wifi" - else - IUSE+=" wifi" - fi - RDEPEND+=" - wifi? ( - kernel_linux? ( >=sys-apps/dbus-0.60 - >=dev-libs/dbus-glib-0.72 - net-misc/networkmanager ) - )" -fi - -DEPEND="app-arch/zip - app-arch/unzip - >=sys-devel/binutils-2.30 - sys-apps/findutils - || ( - ( - sys-devel/clang:9 - !clang? ( sys-devel/llvm:9 ) - clang? ( - =sys-devel/lld-9* - sys-devel/llvm:9[gold] - ) - ) - ( - sys-devel/clang:8 - !clang? ( sys-devel/llvm:8 ) - clang? ( - =sys-devel/lld-8* - sys-devel/llvm:8[gold] - ) - ) - ( - sys-devel/clang:7 - !clang? ( sys-devel/llvm:7 ) - clang? ( - =sys-devel/lld-7* - sys-devel/llvm:7[gold] - ) - ) - ( - sys-devel/clang:6 - !clang? ( sys-devel/llvm:6 ) - clang? ( - =sys-devel/lld-6* - sys-devel/llvm:6[gold] - ) - ) - ) - pulseaudio? ( media-sound/pulseaudio ) - elibc_glibc? ( - virtual/rust - ) - elibc_musl? ( - virtual/rust - ) - ${RDEPEND}" - -RDEPEND+=" - pulseaudio? ( || ( media-sound/pulseaudio - >=media-sound/apulse-0.1.9 ) ) - selinux? ( sec-policy/selinux-mozilla )" - -# @FUNCTION: mozconfig_config -# @DESCRIPTION: -# Set common configure options for mozilla packages. -# Call this within src_configure() phase, after mozconfig_init -# -# Example: -# -# inherit mozconfig-v6.46 -# -# src_configure() { -# mozconfig_init -# mozconfig_config -# # ... misc ebuild-unique settings via calls to -# # ... mozconfig_{annotate,use_with,use_enable} -# mozconfig_final -# } - -mozconfig_config() { - if use clang && ! tc-is-clang ; then - # Force clang - einfo "Enforcing the use of clang due to USE=clang ..." - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - strip-unsupported-flags - elif ! use clang && ! tc-is-gcc ; then - # Force gcc - einfo "Enforcing the use of gcc due to USE=-clang ..." - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - strip-unsupported-flags - fi - - # Migrated from mozcoreconf-2 - mozconfig_annotate 'system_libs' \ - --with-system-zlib \ - --with-system-bz2 - - # Stylo is horribly broken on arm, renders GUI unusable - use arm && mozconfig_annotate 'breaks UI on arm' --disable-stylo - - # Must pass release in order to properly select linker - mozconfig_annotate 'Enable by Gentoo' --enable-release - - # Set correct update channel, bug 677722 - if [[ -n "${MOZ_ESR}" ]] ; then - mozconfig_annotate 'set update channel to ESR' --enable-update-channel=esr - fi - - # Avoid auto-magic on linker - if use clang ; then - # This is upstream's default - mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld - elif tc-ld-is-gold ; then - mozconfig_annotate "linker is set to gold" --enable-linker=gold - else - mozconfig_annotate "linker is set to bfd" --enable-linker=bfd - fi - - if has bindist ${IUSE}; then - mozconfig_use_enable !bindist official-branding - if [[ ${PN} == firefox ]] && use bindist ; then - mozconfig_annotate '' --with-branding=browser/branding/aurora - fi - fi - - # Enable position independent executables - mozconfig_annotate 'enabled by Gentoo' --enable-pie - mozconfig_use_enable debug - mozconfig_use_enable debug tests - - if ! use debug ; then - mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols - else - mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols - fi - - mozconfig_use_enable startup-notification - - if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then - # wifi pulls in dbus so manage both here - mozconfig_use_enable wifi necko-wifi - if use kernel_linux && use wifi && ! use dbus; then - echo "Enabling dbus support due to wifi request" - mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus - else - mozconfig_use_enable dbus - fi - else - mozconfig_use_enable dbus - mozconfig_annotate 'disabled' --disable-necko-wifi - fi - - if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then - mozconfig_use_enable jit ion - fi - - # These are enabled by default in all mozilla applications - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr - mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) - if use system-libevent; then - mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr - fi - mozconfig_annotate '' --prefix="${EPREFIX}"/usr - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) - mozconfig_annotate 'Gentoo default' --enable-system-hunspell - mozconfig_annotate '' --disable-crashreporter - mozconfig_annotate 'Gentoo default' --with-system-png - mozconfig_annotate '' --enable-system-ffi - mozconfig_annotate '' --disable-gconf - mozconfig_annotate '' --with-intl-api - mozconfig_annotate '' --enable-system-pixman - - # skia has no support for big-endian platforms - if [[ $(tc-endian) == "big" ]]; then - mozconfig_annotate 'big endian target' --disable-skia - else - mozconfig_annotate '' --enable-skia - fi - - # default toolkit is cairo-gtk3, optional use flags can change this - local toolkit="cairo-gtk3" - local toolkit_comment="" - if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then - if ! use force-gtk3; then - toolkit="cairo-gtk2" - toolkit_comment="force-gtk3 use flag" - fi - fi - if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then - if use gtk2 ; then - toolkit="cairo-gtk2" - else - toolkit_comment="gtk2 use flag" - fi - fi - mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit} - - # Instead of the standard --build= and --host=, mozilla uses --host instead - # of --build, and --target intstead of --host. - # Note, mozilla also has --build but it does not do what you think it does. - # Set both --target and --host as mozilla uses python to guess values otherwise - mozconfig_annotate '' --target="${CHOST}" - mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" - - mozconfig_use_enable pulseaudio - # force the deprecated alsa sound code if pulseaudio is disabled - if use kernel_linux && ! use pulseaudio ; then - mozconfig_annotate '-pulseaudio' --enable-alsa - fi - - mozconfig_use_enable system-sqlite - mozconfig_use_with system-jpeg - mozconfig_use_with system-icu - mozconfig_use_with system-libvpx - mozconfig_use_with system-harfbuzz - mozconfig_use_with system-harfbuzz system-graphite2 - - if use clang ; then - # https://bugzilla.mozilla.org/show_bug.cgi?id=1423822 - mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack - fi - - # Modifications to better support ARM, bug 553364 - if use neon ; then - mozconfig_annotate '' --with-fpu=neon - - if ! tc-is-clang ; then - # thumb options aren't supported when using clang, bug 666966 - mozconfig_annotate '' --with-thumb=yes - mozconfig_annotate '' --with-thumb-interwork=no - fi - fi - if [[ ${CHOST} == armv*h* ]] ; then - mozconfig_annotate '' --with-float-abi=hard - if ! use system-libvpx ; then - sed -i -e "s|softfp|hard|" \ - "${S}"/media/libvpx/moz.build - fi - fi -} - -# @FUNCTION: mozconfig_install_prefs -# @DESCRIPTION: -# Set preferences into the prefs.js file specified as a parameter to -# the function. This sets both some common prefs to all mozilla -# packages, and any prefs that may relate to the use flags administered -# by mozconfig_config(). -# -# Call this within src_install() phase, after copying the template -# prefs file (if any) from ${FILESDIR} -# -# Example: -# -# inherit mozconfig-v6.46 -# -# src_install() { -# cp "${FILESDIR}"/gentoo-default-prefs.js \ -# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ -# || die -# -# mozconfig_install_prefs \ -# "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" -# -# ... -# } - -mozconfig_install_prefs() { - local prefs_file="${1}" - - einfo "Adding prefs from mozconfig to ${prefs_file}" - - # set dictionary path, to use system hunspell - echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \ - >>"${prefs_file}" || die - - # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it - if use system-harfbuzz ; then - echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ - >>"${prefs_file}" || die - fi - - # force cairo as the canvas renderer on platforms without skia support - if [[ $(tc-endian) == "big" ]] ; then - echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \ - >>"${prefs_file}" || die - echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \ - >>"${prefs_file}" || die - fi -} diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index f20b27b7643a..828fc772066f 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2013-2019 Gentoo Authors +# Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-build.eclass diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass index d3a7ba3ed83f..a78c118c89ed 100644 --- a/eclass/qmail.eclass +++ b/eclass/qmail.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qmail.eclass diff --git a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass index cedd0580a3d6..fdb2d60f183f 100644 --- a/eclass/readme.gentoo.eclass +++ b/eclass/readme.gentoo.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: readme.gentoo.eclass @@ -19,7 +19,7 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then _README_GENTOO_ECLASS=1 -inherit eutils +inherit estack eutils case "${EAPI:-0}" in 0|1|2|3) diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index b096fd477107..ee5def361146 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ros-catkin.eclass diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass index c39e7f3e0f21..3a29c7e9f765 100644 --- a/eclass/rpm.eclass +++ b/eclass/rpm.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rpm.eclass diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 5126fb96a89d..66266a5b5447 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rust-toolchain.eclass diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index 093c83967bf4..d809a496f526 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: subversion.eclass diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 71c3cbc8c76d..90f7b68312bb 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1811,11 +1811,11 @@ toolchain_src_install() { if [[ -f ${CTARGET}-${x} ]] ; then if ! is_crosscompile ; then ln -sf ${CTARGET}-${x} ${x} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + dosym ${BINPATH}/${CTARGET}-${x} \ /usr/bin/${x}-${GCC_CONFIG_VER} fi # Create versioned symlinks - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ + dosym ${BINPATH}/${CTARGET}-${x} \ /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} fi diff --git a/eclass/vala.eclass b/eclass/vala.eclass index 640af998deba..c0620dbaa0b9 100644 --- a/eclass/vala.eclass +++ b/eclass/vala.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vala.eclass @@ -32,7 +32,7 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.36} # @ECLASS-VARIABLE: VALA_MAX_API_VERSION # @DESCRIPTION: # Maximum vala API version (e.g. 0.36). -VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.46} +VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.48} # @ECLASS-VARIABLE: VALA_USE_DEPEND # @DEFAULT_UNSET |