diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:44:59 +0000 |
| commit | 0706fc6986773f4e4d391deff4ad5143c464ea4e (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /eclass/kde5.eclass | |
| parent | aa3411e241a201d53a2689766fe419f2756819f3 (diff) | |
Revert "gentoo resync : 24.03.2019"
This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.
Diffstat (limited to 'eclass/kde5.eclass')
| -rw-r--r-- | eclass/kde5.eclass | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index d7b5eb7f15e4..eaa81039183d 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -162,9 +162,9 @@ KDE_UNRELEASED=( ) if [[ ${KDEBASE} = kdevelop ]]; then HOMEPAGE="https://www.kdevelop.org/" elif [[ ${KMNAME} = kdepim ]]; then - HOMEPAGE="https://kde.org/applications/office/kontact/" + HOMEPAGE="https://www.kde.org/applications/office/kontact/" else - HOMEPAGE="https://kde.org/" + HOMEPAGE="https://www.kde.org/" fi LICENSE="GPL-2" @@ -205,6 +205,11 @@ case ${KDE_AUTODEPS} in if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )" fi + + if [[ ${CATEGORY} = kde-apps && ${PV} = 18.08.3 ]]; then + [[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4" + RDEPEND+=" !kde-apps/kde-l10n" + fi ;; esac @@ -409,10 +414,6 @@ _calculate_live_repo() { EGIT_BRANCH="Plasma/$(ver_cut 1-2)" fi - if [[ ${PV} != 9999 && ${PN} = kdevelop* ]]; then - EGIT_BRANCH="$(ver_cut 1-2)" - fi - EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" } @@ -701,11 +702,8 @@ kde5_src_install() { # cmake can't find the tags and qthelp viewers can't find the docs local p=$(best_version dev-qt/qtcore:5) local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev) - if [[ ${pv} = 5.11* ]]; then - #todo: clean up trailing slash check when EAPI <7 is removed - if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then - docompress -x /usr/share/doc/qt-${pv} - fi + if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then + docompress -x /usr/share/doc/qt-${pv} fi if [[ ${EAPI} = 6 ]]; then |