diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
| commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
| tree | db33a91259730be84999e13a8d8168c799f50ac0 /eclass | |
| parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) | |
gentoo resync : 20.10.2021
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36176 -> 36182 bytes | |||
| -rw-r--r-- | eclass/linux-info.eclass | 2 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 20 | ||||
| -rw-r--r-- | eclass/ruby-fakegem.eclass | 1 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 2 |
5 files changed, 11 insertions, 14 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 68860d4a2b3e..b5be586d1c5d 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 9eae5ad589bb..568f7a1a2832 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -208,7 +208,7 @@ getfilevar() { # Pass dot-config=0 to avoid the config check in kernels prior to 5.4. [[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; } echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \ - nonfatal emake -C "${basedname}" M="${T}" dot-config=0 need-config= ${BUILD_FIXES} -s -f - 2>/dev/null + nonfatal emake -C "${basedname}" --no-print-directory M="${T}" dot-config=0 need-config= ${BUILD_FIXES} -s -f - 2>/dev/null ARCH=${myARCH} fi diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index a0895e27abd9..8756d6e58497 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -6,7 +6,7 @@ # qt@gentoo.org # @AUTHOR: # Davide Pesavento <pesa@gentoo.org> -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: Eclass for Qt5 split ebuilds. # @DESCRIPTION: # This eclass contains various functions that are used when building Qt5. @@ -16,7 +16,7 @@ if [[ ${CATEGORY} != dev-qt ]]; then fi case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -105,9 +105,9 @@ SLOT=5/$(ver_cut 1-2) IUSE="debug test" if [[ ${QT5_BUILD_TYPE} == release ]]; then - RESTRICT+=" test" # bug 457182 + RESTRICT="test" # bug 457182 else - RESTRICT+=" !test? ( test )" + RESTRICT="!test? ( test )" fi BDEPEND=" @@ -175,9 +175,7 @@ qt5-build_src_configure() { qt5_base_configure fi if [[ ${QT5_MODULE} == qttools ]]; then - if [[ ${EAPI} != 7 || -z ${QT5_TARGET_SUBDIRS[@]} ]]; then - qt5_tools_configure - fi + qt5_tools_configure fi qt5_foreach_target_subdir qt5_qmake @@ -684,11 +682,9 @@ qt5_tools_configure() { # allow the ebuild to override what we set here myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" ) - if [[ ${EAPI} != 7 ]]; then - mkdir -p "${QT5_BUILD_DIR}" || die - qt5_qmake "${QT5_BUILD_DIR}" - cp qttools-config.pri "${QT5_BUILD_DIR}" || die - fi + mkdir -p "${QT5_BUILD_DIR}" || die + qt5_qmake "${QT5_BUILD_DIR}" + cp qttools-config.pri "${QT5_BUILD_DIR}" || die } # @FUNCTION: qt5_qmake_args diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index d999ace34286..573e3511daf7 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -402,6 +402,7 @@ EOF # @DESCRIPTION: # Configure extensions defined in RUBY_FAKEGEM_EXTENSIONS, if any. each_fakegem_configure() { + tc-export PKG_CONFIG for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do ${RUBY} --disable=did_you_mean -C ${extension%/*} ${extension##*/} || die done diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index b68ac30e89fd..5a272a209361 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -291,7 +291,7 @@ S=$( gentoo_urls() { local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI - HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI" + HTTP~tamiko/distfiles/URI HTTP~sam/distfiles/URI HTTP~slyfox/distfiles/URI" devspace=${devspace//HTTP/https:\/\/dev.gentoo.org\/} echo mirror://gentoo/$1 ${devspace//URI/$1} } |