[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     34c6ac07f854630dc02fa205e749fce418ac282e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 21:24:40 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 13:38:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=34c6ac07

kde5.eclass: Fix SRC_URI, kdevelop missing trailing .0 in first release

Add kdevelop-pg-qt SRC_URIs

 eclass/kde5.eclass | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 01d0f97..113b8fd 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -232,10 +232,19 @@ if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && 
${KDE_BUILD_TYPE} = release ]]; then
        S=${WORKDIR}/${KMNAME}-${PV}
 fi
 
+# Drop this when kdepim is finally split upstream
 if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KMNAME} = kdepim ]]; then
        S="${S}/${PN}"
 fi
 
+if [[ -n ${KDEBASE} && ${KDEBASE} = kdevelop && ${KDE_BUILD_TYPE} = release 
]]; then
+       if [[ -n ${KMNAME} ]]; then
+               S=${WORKDIR}/${KMNAME}-${PV%.0} # kdevelop missing trailing .0 
in first release
+       else
+               S=${WORKDIR}/${PN}-${PV%.0}     # kdevelop missing trailing .0 
in first release
+       fi
+fi
+
 _kde_is_unreleased() {
        local pair
        for pair in "${KDE_UNRELEASED[@]}" ; do
@@ -302,14 +311,22 @@ _calculate_src_uri() {
        esac
 
        if [[ -z ${SRC_URI} && -n ${KDEBASE} ]] ; then
+               local _kdebase
+               case ${PN} in
+                       kdevelop-pg-qt)
+                               _kdebase=${PN} ;;
+                       *)
+                               _kdebase=${KDEBASE} ;;
+               esac
                case ${PV} in
                        *.*.[6-9]? )
-                               
SRC_URI="mirror://kde/unstable/${KDEBASE}/${PV}/src/${_kmname}-${PV}.tar.xz"
+                               
SRC_URI="mirror://kde/unstable/${_kdebase}/${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/${_kdebase}/${PV}/src/${_kmname}-${PV%.0}.tar.xz" 
;;
                esac
+               unset _kdebase
        fi
 
        if [[ ${KDEBASE} = kdel10n ]] ; then