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 5C535138359 for ; Sun, 23 Aug 2020 19:46:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7DEBE0831; Sun, 23 Aug 2020 19:46:29 +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 8B810E0835 for ; Sun, 23 Aug 2020 19:46:29 +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 7A7A7340917 for ; Sun, 23 Aug 2020 19:46:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FDA832F for ; Sun, 23 Aug 2020 19:46:25 +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: <1598209530.c5f5858e6ed8800f1b44d3a24296a66b3e79527e.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: eclass/kde-functions.eclass eclass/kde.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c5f5858e6ed8800f1b44d3a24296a66b3e79527e X-VCS-Branch: master Date: Sun, 23 Aug 2020 19:46:25 +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: 8e395779-8d3e-426b-a5f3-452333e77f9e X-Archives-Hash: 3365f3ccf9ce39e1269a70edff03a9e3 commit: c5f5858e6ed8800f1b44d3a24296a66b3e79527e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 23 16:25:39 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 23 19:05:30 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=c5f5858e kde.eclass, kde-functions.eclass: Properly fix KDEBASE to address the eloquent remark in 7ba60b69 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde-functions.eclass | 17 ++++++++++------- eclass/kde.eclass | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index b9137fa2..9c9506db 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -387,7 +387,7 @@ need-kde() { else x_DEPEND="${DEPEND}" fi - if [[ -n "${KDEBASE}" ]]; then + if [[ "${KDEBASE}" == "true" ]]; then # If we're a kde-base package, we need at least our own version of kdelibs. # Note: we only set RDEPEND if it is already set, otherwise # we break packages relying on portage copying RDEPEND from DEPEND. @@ -404,7 +404,7 @@ need-kde() { qtver-from-kdever ${KDEVER} need-qt ${selected_version} - if [[ -n "${KDEBASE}" ]]; then + if [[ "${KDEBASE}" == "true" ]]; then SLOT="$KDEMAJORVER.$KDEMINORVER" else : ${SLOT="0"} @@ -457,7 +457,7 @@ set-kdedir() { if [[ -n "$KDEPREFIX" ]]; then export PREFIX="$KDEPREFIX" else - if [[ -z "$KDEBASE" ]]; then + if [[ -z ${KDEBASE} || ${KDEBASE} != "true" ]]; then PREFIX="/usr/kde/3.5" else case $KDEMAJORVER.$KDEMINORVER in @@ -472,7 +472,7 @@ set-kdedir() { if [[ -n "$KDELIBSDIR" ]]; then export KDEDIR="$KDELIBSDIR" else - if [[ -z "$KDEBASE" ]]; then + if [[ -z ${KDEBASE} || ${KDEBASE} != "true" ]]; then # find the latest kdelibs installed for x in /usr/kde/{svn,3.5} "${PREFIX}" \ "${KDE3LIBSDIR}" "${KDELIBSDIR}" "${KDE3DIR}" "${KDEDIR}" /usr/kde/*; do @@ -662,9 +662,12 @@ postprocess_desktop_entries() { validate_desktop_entries "${PREFIX}"/share/applications } -# is this a kde-base ebuid? CYKER - KLUDGE KLUDGE KLUDGE FUCK YOU kde-apps +# is this ebuild part of the KDE SC? kde-base/ or kde-apps/ are only hints if [[ "${CATEGORY}" == "kde-base" || "${CATEGORY}" == "kde-apps" ]]; then debug-print "${ECLASS}: KDEBASE ebuild recognized" - export KDEBASE="true" - export KDEREVISION + KDEBASE=${KDEBASE:=true} + if [[ ${KDEBASE} == "true" ]]; then + export KDEBASE + export KDEREVISION + fi fi diff --git a/eclass/kde.eclass b/eclass/kde.eclass index c0c636c4..8bf71e2a 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -173,7 +173,7 @@ kde_src_prepare() { for f in "${PATCHDIR}"/${p}-${PV}-*{diff,patch}; do [[ -e ${f} ]] && PATCHES+=("${f}") done - if [[ -n "${KDEBASE}" ]]; then + if [[ "${KDEBASE}" == "true" ]]; then for f in "${PATCHDIR}"/${p}-${SLOT}-*{diff,patch}; do [[ -e ${f} ]] && PATCHES+=("${f}") done @@ -563,7 +563,7 @@ kde_src_install() { shift done - if [[ -n ${KDEBASE} && "${PN}" != "arts" && -d "${D}"/usr/share/doc/${PF} ]]; then + if [[ ${KDEBASE} == "true" && "${PN}" != "arts" && -d "${D}"/usr/share/doc/${PF} ]]; then # work around bug #97196 dodir /usr/share/doc/kde && \ mv "${D}"/usr/share/doc/${PF} "${D}"/usr/share/doc/kde/ || \