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 33081138334 for ; Fri, 16 Aug 2019 14:52:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57D77E0BF4; Fri, 16 Aug 2019 14:52:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3E3CCE0BF4 for ; Fri, 16 Aug 2019 14:52:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A1F7D349C5C for ; Fri, 16 Aug 2019 14:52:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 470F4622 for ; Fri, 16 Aug 2019 14:52:36 +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: <1565967106.b70549449af165b9f2473c2bee1b2b2d3af7e798.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b70549449af165b9f2473c2bee1b2b2d3af7e798 X-VCS-Branch: master Date: Fri, 16 Aug 2019 14:52:36 +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: 00f54783-35fd-4dc5-a424-0dc4545bf629 X-Archives-Hash: 874b428184e9ec9b3d4705dcb2a76306 commit: b70549449af165b9f2473c2bee1b2b2d3af7e798 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 14 14:47:17 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 16 14:51:46 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b7054944 kde5.eclass: Drop EAPI-6 support Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5.eclass | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index a67836b251..281399ac6d 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -33,10 +33,6 @@ _KDE5_ECLASS=1 inherit cmake-utils flag-o-matic kde5-functions virtualx xdg -case ${EAPI} in - 6) inherit eapi7-ver eutils gnome2-utils ;; -esac - if [[ ${KDE_BUILD_TYPE} = live ]]; then inherit git-r3 fi @@ -261,10 +257,6 @@ case ${KDE_SELINUX_MODULE} in ;; esac -case ${EAPI} in - 6) DEPEND+=" ${BDEPEND}" ;; -esac - DEPEND+=" ${COMMONDEPEND}" RDEPEND+=" ${COMMONDEPEND}" unset COMMONDEPEND @@ -624,9 +616,9 @@ kde5_src_configure() { cmakeargs+=( # install mkspecs in the same directory as qt stuff -DKDE_INSTALL_USE_QT_SYS_PATHS=ON + # move handbook outside of doc dir, bug 667138 + -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" ) - # move handbook outside of doc dir for at least two QA warnings, bug 667138 - [[ ${EAPI} != 6 ]] && cmakeargs+=( -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" ) fi # allow the ebuild to override what we set here @@ -679,22 +671,11 @@ kde5_src_test() { # @FUNCTION: kde5_src_install # @DESCRIPTION: -# Wrapper for cmake-utils_src_install with extra logic to avoid compressing -# certain types of files. For example, khelpcenter is not able to read -# compressed handbooks. +# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra. kde5_src_install() { debug-print-function ${FUNCNAME} "$@" cmake-utils_src_install - - if [[ ${EAPI} = 6 ]]; then - # We don't want /usr/share/doc/HTML to be compressed, - # because then khelpcenter can't find the docs - #todo: clean up trailing slash check when EAPI <7 is removed - if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then - docompress -x /usr/share/doc/HTML - fi - fi } # @FUNCTION: kde5_pkg_preinst