From 402099dfc5b56923b16056734e1a2b55d40aca1e Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@gentoo.org>
Date: Mon, 27 Dec 2010 20:13:03 +0200
Subject: [eclass] Add support for kdepim 4.4.9 and 4.6beta3

---
 eclass/kde4-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'eclass/kde4-functions.eclass')

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 0083bef8e30..b4850f5f8e0 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -376,7 +376,7 @@ add_kdebase_dep() {
 	if [[ ${KDEBASE} = kde-base ]]; then
 		# FIXME remove hack when kdepim-4.4.{6,7} is gone
 		local FIXME_PV
-		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
 			FIXME_PV=4.4.5
 		else
 			FIXME_PV=${PV}
-- 
cgit v1.2.3


From 5ad1bb5644fd2b0549356c8a26c3a0262c606adc Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@gentoo.org>
Date: Tue, 28 Dec 2010 03:34:47 +0200
Subject: [eclass] More support for kdepim 4.6beta3

---
 eclass/kde4-functions.eclass | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'eclass/kde4-functions.eclass')

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index b4850f5f8e0..54c427d405f 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -374,13 +374,19 @@ add_kdebase_dep() {
 	local use=${2:+,${2}}
 
 	if [[ ${KDEBASE} = kde-base ]]; then
-		# FIXME remove hack when kdepim-4.4.{6,7} is gone
+		# FIXME remove hack when >kdepim-4.4.5 is gone
 		local FIXME_PV
 		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
 			FIXME_PV=4.4.5
 		else
 			FIXME_PV=${PV}
 		fi
+		# FIXME remove hack when kdepim-4.6beta is gone
+		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+			FIXME_PV=4.5.90
+		else
+			FIXME_PV=${PV}
+		fi
 
 		# if building stable-live version depend just on slot
 		# to allow merging packages against more stable basic stuff
-- 
cgit v1.2.3


From 8bcacff251e59b508ae16c94b8fbd05002b81dd3 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@gentoo.org>
Date: Wed, 29 Dec 2010 19:58:50 +0200
Subject: Previous commit broke kdepim installations for =! 4.6beta3, fixing

---
 eclass/kde4-functions.eclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'eclass/kde4-functions.eclass')

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 54c427d405f..2b553af4f92 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $
 
 inherit versionator
 
@@ -378,11 +378,8 @@ add_kdebase_dep() {
 		local FIXME_PV
 		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
 			FIXME_PV=4.4.5
-		else
-			FIXME_PV=${PV}
-		fi
 		# FIXME remove hack when kdepim-4.6beta is gone
-		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+		elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
 			FIXME_PV=4.5.90
 		else
 			FIXME_PV=${PV}
-- 
cgit v1.2.3


From 78df3a775e31fd91e1e1723d57f4fd629fa011f9 Mon Sep 17 00:00:00 2001
From: "Andreas K. Huettel" <mail@akhuettel.de>
Date: Sun, 2 Jan 2011 18:49:28 +0100
Subject: [eclass] Fix add_kdebase_dep() for oxygen-icons and kdepim (bug
 350387)

---
 eclass/kde4-functions.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'eclass/kde4-functions.eclass')

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 2b553af4f92..eb0f32949de 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -376,10 +376,10 @@ add_kdebase_dep() {
 	if [[ ${KDEBASE} = kde-base ]]; then
 		# FIXME remove hack when >kdepim-4.4.5 is gone
 		local FIXME_PV
-		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+		if [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.4.6* || ${PV} = 4.4.7*  || ${PV} = 4.4.8* || ${PV} = 4.4.9* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then
 			FIXME_PV=4.4.5
 		# FIXME remove hack when kdepim-4.6beta is gone
-		elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs ]]; then
+		elif [[ ${KMNAME} = kdepim || ${PN} = kdepim-runtime ]] && [[ ${PV} = 4.5.93* ]] && [[ ${1} = kdelibs || ${1} = kdepimlibs || ${1} = oxygen-icons ]]; then
 			FIXME_PV=4.5.90
 		else
 			FIXME_PV=${PV}
-- 
cgit v1.2.3