...and then I found out about $CATEGORY. i knew something like that should have exist...

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 3001255517e86aff0a79f804dabbc8a58cf17a81..f55e77c433f38e54ac546d25fba1efab637972aa 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.84 2005/01/15 11:48:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.85 2005/01/15 14:52:10 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -386,18 +386,6 @@ 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() {
 
@@ -644,7 +632,7 @@ deprange-dual() {
        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
+               if [ "$PARENT" != "$(get-parent-package $CATEGORY/$PN)" ]; then
                        NEWDEP="$NEWDEP $(deprange-list $MIN $MAX $PARENT)"
                fi
                NEWDEP="$NEWDEP )"

diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass
index 778cdf4f9530df275bbcf704c3ea0c1e9675bda7..71d8719cef011aa89672c80316e4d665af2a0596 100644 (file)
--- a/eclass/kde-meta.eclass
+++ b/eclass/kde-meta.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-meta.eclass,v 1.12 2005/01/14 22:44:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.13 2005/01/15 14:52:10 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 # Simone Gotti <simone.gotti@email.it>
@@ -107,7 +107,7 @@ DEPEND="$DEPEND kdexdeltas? ( dev-util/xdelta )"
 
 # Add a blocking dep on the package we're derived from
 # This is ugly, but I don't know how to get at the category of an ebuild
-for x in $(deprange-list $SLOT.0_alpha1 $SLOT.10 $(get-parent-package $(get-current-package))); do
+for x in $(deprange-list $SLOT.0_alpha1 $SLOT.10 $(get-parent-package $CATEGORY/$PN)); do
        DEPEND="$DEPEND !$x"
        RDEPEND="$RDEPEND !$x"
 done