diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
| commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
| tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /eclass/kde5.eclass | |
| parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) | |
gentoo resync : 05.04.2019
Diffstat (limited to 'eclass/kde5.eclass')
| -rw-r--r-- | eclass/kde5.eclass | 47 |
1 files changed, 13 insertions, 34 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index eaa81039183d..9c00bd19d595 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -159,14 +159,7 @@ fi # a proper error message via pkg_nofetch. KDE_UNRELEASED=( ) -if [[ ${KDEBASE} = kdevelop ]]; then - HOMEPAGE="https://www.kdevelop.org/" -elif [[ ${KMNAME} = kdepim ]]; then - HOMEPAGE="https://www.kde.org/applications/office/kontact/" -else - HOMEPAGE="https://www.kde.org/" -fi - +HOMEPAGE="https://kde.org/" LICENSE="GPL-2" SLOT=5 @@ -205,11 +198,6 @@ 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 @@ -282,14 +270,6 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; then S=${WORKDIR}/${KMNAME}-${PV} fi -if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release ]]; then - if [[ -n ${KMNAME} ]]; then - S=${WORKDIR}/${KMNAME}-${PV} - else - S=${WORKDIR}/${P} - fi -fi - _kde_is_unreleased() { local pair for pair in "${KDE_UNRELEASED[@]}" ; do @@ -355,23 +335,15 @@ _calculate_src_uri() { ;; esac - if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then - local _kdebase - case ${PN} in - kdevelop-pg-qt) - _kdebase=${PN} ;; - *) - _kdebase=${KDEBASE} ;; - esac + if [[ ${PN} = kdevelop* ]]; then case ${PV} in *.*.[6-9]? ) - SRC_URI="mirror://kde/unstable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" + SRC_URI="mirror://kde/unstable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz" RESTRICT+=" mirror" ;; *) - SRC_URI="mirror://kde/stable/${_kdebase}/${PV}/src/${_kmname}-${PV}.tar.xz" ;; + SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${_kmname}-${PV}.tar.xz" ;; esac - unset _kdebase fi if _kde_is_unreleased ; then @@ -414,6 +386,10 @@ _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}" } @@ -702,8 +678,11 @@ 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 [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then - docompress -x /usr/share/doc/qt-${pv} + 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 fi if [[ ${EAPI} = 6 ]]; then |