From 01482ecc75ed2a7cedbca9d8589fcc3bd92d6296 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Tue, 5 Oct 2010 17:02:27 +0200
Subject: [eclass] Dont be so strict about deps when merging stable-live

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

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

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index a7edcbf2adc..abd2e0186f1 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -381,8 +381,19 @@ add_kdebase_dep() {
 		else
 			FIXME_PV=${PV}
 		fi
-		echo " !kdeprefix? ( >=kde-base/${1}-${FIXME_PV}[aqua=,-kdeprefix${use}] )"
-		echo " kdeprefix? ( >=kde-base/${1}-${FIXME_PV}:${SLOT}[aqua=,kdeprefix${use}] )"
+
+		# if building stable-live version depend just on slot
+		# to allow merging packages against more stable basic stuff
+		case ${PV} in
+			*.9999*)
+				echo " !kdeprefix? ( kde-base/${1}:${SLOT}[aqua=,-kdeprefix${use}] )"
+				echo " kdeprefix? ( kde-base/${1}:${SLOT}[aqua=,kdeprefix${use}] )"
+				;;
+			*)
+				echo " !kdeprefix? ( >=kde-base/${1}-${FIXME_PV}[aqua=,-kdeprefix${use}] )"
+				echo " kdeprefix? ( >=kde-base/${1}-${FIXME_PV}:${SLOT}[aqua=,kdeprefix${use}] )"
+				;;
+		esac
 	else
 		if [[ ${KDE_MINIMAL} = live ]]; then
 			echo " kde-base/${1}:${KDE_MINIMAL}[aqua=${use}]"
-- 
cgit v1.2.3