Sync SRC_URI calculation with kde overlay, fixes bug #539668.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index dd0a66aa74427cc83f8f785d6ccea4eb980a92fa..1d1494af25715e8c530098e9c8d099610cc23a7e 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1529 2015/02/10 20:41:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1530 2015/02/10 22:21:26 johu Exp $
+
+  10 Feb 2015; Johannes Huber <johu@gentoo.org> kde5.eclass:
+  Sync SRC_URI calculation with kde overlay, fixes bug #539668.
 
   10 Feb 2015; Johannes Huber <johu@gentoo.org> kde4-functions.eclass:
   Support for kde-apps category, remove function moved to cmake-utils. Some

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 7b4753f7b8eaa091e167505d5d6e5dd66aec53d0..cc3f7a250cce7ff670049409516571445e844d04 100644 (file)
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.2 2014/11/13 04:34:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.3 2015/02/10 22:21:26 johu Exp $
 
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
@@ -196,24 +196,25 @@ _calculate_src_uri() {
        DEPEND+=" app-arch/xz-utils"
 
        case ${CATEGORY} in
-               kde-frameworks)
-                       case ${PV} in 
-                               5.0.0|5.1.0|5.2.0|5.3.0)
-                               SRC_URI="mirror://kde/stable/frameworks/${PV}/${_kmname}-${PV}.tar.xz" ;;
+               kde-apps)
+                       case ${PV} in
+                               ??.?.[6-9]? | ??.??.[6-9]? )
+                                       SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz"
+                                       RESTRICT+=" mirror"
+                                       ;;
                                *)
-                               SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
+                                       SRC_URI="mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
                        esac
                        ;;
-               kde-base)
+               kde-frameworks)
+                       SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
+               kde-plasma)
                        case ${PV} in
                                5.?.[6-9]? )
                                        # Plasma 5 beta releases
                                        SRC_URI="mirror://kde/unstable/plasma/${PV}/${_kmname}-${PV}.tar.xz"
                                        RESTRICT+=" mirror"
                                        ;;
-                               5.1.0.1)
-                                       # Plasma 5 stable releases
-                                       SRC_URI="mirror://kde/stable/plasma/5.1.0/${_kmname}-${PV}.tar.xz" ;;
                                *)
                                        # Plasma 5 stable releases
                                        SRC_URI="mirror://kde/stable/plasma/${PV}/${_kmname}-${PV}.tar.xz" ;;