Add new and remove old SRC_URI. Update live ebuild branching.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index b0fd42397cb89eb3b779f24367c2a86c3be2496c..7254282b3cec3a002f88c29061f7837bb5afad29 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.1547 2015/02/21 08:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1548 2015/02/21 13:51:34 kensington Exp $
+
+  21 Feb 2015; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass:
+  Add new and remove old SRC_URI. Update live ebuild branching.
 
   21 Feb 2015; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Remove duplicating "using" in EAPI=4 warning message. Spotted by Arfrever.

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index e4f98f64a9953046ba43c2f4de6e6ab0f4eeeab0..c81139918f67f628b93f10517785e1e5c67468ec 100644 (file)
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.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/kde4-base.eclass,v 1.146 2014/12/26 11:42:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.147 2015/02/21 13:51:34 kensington Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -440,24 +440,15 @@ _calculate_src_uri() {
                                4.?.[6-9]? | 4.??.[6-9]?)
                                        # Unstable KDE SC releases
                                        SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
-                               4.[1-7].[12345])
-                                       # Stable KDE SC with old .bz2 support
-                                       SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
-                               4.11.9)
-                                       # Part of 4.12 actually, sigh. Not stable for next release!
-                                       SRC_URI="mirror://kde/stable/4.12.5/src/${_kmname_pv}.tar.xz" ;;
-                               4.11.11)
-                                       # Part of 4.13 actually, sigh. Not stable for next release!
-                                       SRC_URI="mirror://kde/stable/4.13.3/src/${_kmname_pv}.tar.xz" ;;
-                               4.11.12)
-                                       # Part of 4.14 actually, sigh. Not stable for next release!
-                                       SRC_URI="mirror://kde/stable/4.14.1/src/${_kmname_pv}.tar.xz" ;;
-                               4.11.13)
-                                       # Part of 4.14 actually, sigh. Not stable for next release!
-                                       SRC_URI="mirror://kde/stable/4.14.2/src/${_kmname_pv}.tar.xz" ;;
                                4.11.14)
                                        # Part of 4.14 actually, sigh. Not stable for next release!
                                        SRC_URI="mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz" ;;
+                               4.11.16)
+                                       # Part of 14.12.2 actually, sigh. Not stable for next release!
+                                       SRC_URI="mirror://kde/stable/applications/14.12.2/src/${_kmname_pv}.tar.xz" ;;
+                               4.14.5)
+                                       # Part of 14.12.2 actually, sigh. Not stable for next release!
+                                       SRC_URI="mirror://kde/stable/applications/14.12.2/src/${_kmname_pv}.tar.xz" ;;
                                ??.?.[6-9]? | ??.??.[4-9]?)
                                        # Unstable KDE Applications releases
                                        SRC_URI="mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz" ;;
@@ -490,7 +481,7 @@ _calculate_live_repo() {
                        # Determine branch URL based on live type
                        local branch_prefix
                        case ${PV} in
-                               4.9999*)
+                               9999*)
                                        # trunk
                                        branch_prefix="trunk/KDE"
                                        ;;