commit: 425506b2913065f43fe7051bdcc016adae5a7307 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Oct 20 16:43:52 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 20 16:45:08 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=425506b2
qt5-build.eclass: Drop EAPI-6 support Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/qt5-build.eclass | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 88164d62..cde05162 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qt5-build.eclass @@ -6,18 +6,17 @@ # [email protected] # @AUTHOR: # Davide Pesavento <[email protected]> -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 7 # @BLURB: Eclass for Qt5 split ebuilds. # @DESCRIPTION: # This eclass contains various functions that are used when building Qt5. -# Requires EAPI 6. +# Requires EAPI 7. if [[ ${CATEGORY} != dev-qt ]]; then die "qt5-build.eclass is only to be used for building Qt 5" fi case ${EAPI} in - 6) inherit eapi7-ver ;; 7) : ;; *) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;; esac @@ -118,9 +117,6 @@ BDEPEND=" dev-lang/perl virtual/pkgconfig " -case ${EAPI} in - 6) DEPEND+=" ${BDEPEND}" ;; -esac if [[ ${PN} != qttest ]]; then DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" fi @@ -288,7 +284,7 @@ qt5-build_src_install() { qt5_install_module_config # prune libtool files - find "${D}" -name '*.la' -delete || die + find "${D}" -name '*.la' -type f -delete || die } # @FUNCTION: qt5-build_pkg_postinst @@ -815,18 +811,18 @@ qt5_install_module_config() { qt5_regenerate_global_configs() { einfo "Regenerating gentoo-qconfig.h" - find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \ + find "${ROOT}${QT5_HEADERDIR}"/Gentoo \ -name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \ -execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h [[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty" - mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \ + mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \ || eerror "Failed to install new gentoo-qconfig.h" einfo "Updating QT_CONFIG in qconfig.pri" - local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri - local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri + local qconfig_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri + local qconfig_pri_orig=${ROOT}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri if [[ -f ${qconfig_pri} ]]; then local x qconfig_add= qconfig_remove= local qt_config new_qt_config= @@ -839,7 +835,7 @@ qt5_regenerate_global_configs() { # generate list of QT_CONFIG entries from the existing list, # appending QCONFIG_ADD and excluding QCONFIG_REMOVE eshopts_push -s nullglob - for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do + for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=\s*//p' "${x}")" qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=\s*//p' "${x}")" done @@ -859,8 +855,8 @@ qt5_regenerate_global_configs() { einfo "Updating QT.global_private in qmodule.pri" - local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri - local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri + local qmodule_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri + local qmodule_pri_orig=${ROOT}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then local x local qprivateconfig_enabled= qprivateconfig_disabled= @@ -871,7 +867,7 @@ qt5_regenerate_global_configs() { qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")" qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")" eshopts_push -s nullglob - for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do + for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")" qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")" done
