From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16F39138334 for ; Sun, 20 Oct 2019 16:46:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64CF9E0BB7; Sun, 20 Oct 2019 16:46:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FF87E0BB7 for ; Sun, 20 Oct 2019 16:46:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4751234C0A8 for ; Sun, 20 Oct 2019 16:46:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C08D176A for ; Sun, 20 Oct 2019 16:46:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1571589908.425506b2913065f43fe7051bdcc016adae5a7307.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 425506b2913065f43fe7051bdcc016adae5a7307 X-VCS-Branch: master Date: Sun, 20 Oct 2019 16:46:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da4a5a03-aa74-4887-ba40-f4e58f51a232 X-Archives-Hash: 4650f086304bb68d1d498e4eabaa561a commit: 425506b2913065f43fe7051bdcc016adae5a7307 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 20 16:43:52 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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 @@ # qt@gentoo.org # @AUTHOR: # Davide Pesavento -# @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