add two functions:

deprange-dual wraps deprange so that when adding a dep on a split package, the split package's parent monolithic package is accepted as an or-dep (though the split alternative comes first).
get-current-package returns the full name, with category, of the current ebuild. maybe there's a standard way to do this but i've not found it.

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 11f8368d3dba3d9b879a7874c15474fd110cd49d..df75bde3e6eeed33e615bed3241879beb3214068 100644 (file)
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.82 2005/01/14 19:43:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.83 2005/01/14 22:43:22 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -386,6 +386,18 @@ get-child-packages () {
        done
 }
 
+# Because I've no idea how to do it properly (fex how to get the category of the current ebuild),
+# this is a centralized function, and can be fixed centrally
+get-current-package () {
+       if [ -n "$KDEBASE" ]; then
+               echo -n kde-base/$PN
+       elif [ "$KMNAME" == "koffice" ]; then
+               echo -n app-office/$PN
+       else
+               die "get-current-parent-package() called from unrecognized ebuild $PN, please bugreport"
+       fi
+}
+
 # convinience functions for requesting autotools versions
 need-automake() {
 
@@ -624,6 +636,22 @@ deprange-iterate-suffixes() {
        echo -n $NEWDEP
 }
 
+# Wrapper around deprange() used for deps between split ebuilds.
+# It adds the parent monolithic ebuild of the dep as an alternative dep.
+deprange-dual() {
+       local MIN=$1 MAX=$2 NEWDEP=""
+       shift; shift
+       for PACKAGE in $@; do
+               PARENT=$(get-parent-package $PACKAGE)
+               NEWDEP="$NEWDEP || ( $(deprange-list $MIN $MAX $PACKAGE)"
+               if [ "$PARENT" != "$(get-parent-package $(get-current-package))" ]; then
+                       NEWDEP="$NEWDEP $(deprange-list $MIN $MAX $PARENT)"
+               fi
+               NEWDEP="$NEWDEP )"
+       done
+       echo -n $NEWDEP
+}
+
 # ---------------------------------------------------------------
 # kde/qt directory management etc. functions, was kde-dirs.ebuild
 # ---------------------------------------------------------------