diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-23 18:25:39 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-23 21:05:30 +0200 |
| commit | c5f5858e6ed8800f1b44d3a24296a66b3e79527e (patch) | |
| tree | 79c0241da2fea955748dc8f73792c65a0b63dc1b /eclass | |
| parent | net-p2p/ktorrent: Update SRC_URI (diff) | |
| download | kde-sunset-c5f5858e6ed8800f1b44d3a24296a66b3e79527e.tar.gz kde-sunset-c5f5858e6ed8800f1b44d3a24296a66b3e79527e.tar.bz2 kde-sunset-c5f5858e6ed8800f1b44d3a24296a66b3e79527e.zip | |
kde.eclass, kde-functions.eclass: Properly fix KDEBASE to address the eloquent remark in 7ba60b69
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 17 | ||||
| -rw-r--r-- | 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/ || \ |