Sync with KDE overlay - update SRC_URI and manually specify a minimum version for...

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 04b2226396bea63a7012b680e88239b78f83f877..9be4bba1a0b32661f28215cbfe212e405757dcde 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1570 2015/03/21 14:55:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1571 2015/03/21 18:22:22 kensington Exp $
+
+  21 Mar 2015; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass:
+  Sync with KDE overlay - update SRC_URI and manually specify a minimum version
+  for kde-base/oxygen-icons to handle special releases.
 
   21 Mar 2015; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
   python-single-r1.eclass, python-utils-r1.eclass:

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c81139918f67f628b93f10517785e1e5c67468ec..d636324744c5d0d8c6b9ace01524c504b496cfef 100644 (file)
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # 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.147 2015/02/21 13:51:34 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.148 2015/03/21 18:22:22 kensington Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -335,7 +335,7 @@ fi
 
 # all packages needs oxygen icons for basic iconset
 if [[ ${PN} != oxygen-icons ]]; then
-       kderdepend+=" || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons) )"
+       kderdepend+=" || ( kde-apps/oxygen-icons $(add_kdebase_dep oxygen-icons '' 4.14.3) )"
 fi
 
 # add a dependency over kde-l10n
@@ -443,12 +443,12 @@ _calculate_src_uri() {
                                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" ;;
+                               4.11.17)
+                                       # Part of 14.12.3 actually, sigh. Not stable for next release!
+                                       SRC_URI="mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz" ;;
+                               4.14.6)
+                                       # Part of 14.12.3 actually, sigh. Not stable for next release!
+                                       SRC_URI="mirror://kde/stable/applications/14.12.3/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" ;;