--- /usr/portage/eclass/kde-functions.eclass 2004-06-25 03:13:00.000000000 +0200 +++ kde-functions2.eclass 2004-07-31 02:06:24.000000000 +0200 @@ -10,6 +10,9 @@ ECLASS=kde-functions INHERITED="$INHERITED $ECLASS" # convinience functions for requesting autotools versions + +NEED_CALLED=0 + need-automake() { debug-print-function $FUNCNAME $* @@ -50,7 +53,8 @@ # --------------------------------------------------------------- need-kde() { - + # set this variable for backwards compatibility + NEED_CALLED=1 debug-print-function $FUNCNAME $* KDEVER="$1" @@ -207,7 +211,7 @@ } need-qt() { - + NEED_CALLED=1 debug-print-function $FUNCNAME $* QTVER="$1" --- /usr/portage/eclass/kde.eclass 2004-07-27 18:12:06.000000000 +0200 +++ kde2.eclass 2004-07-31 02:11:04.000000000 +0200 @@ -7,7 +7,7 @@ # Revisions Caleb Tennis # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here. -inherit base kde-functions +inherit base kde-functions2 ECLASS=kde INHERITED="$INHERITED $ECLASS" DESCRIPTION="Based on the $ECLASS eclass" @@ -26,6 +26,25 @@ # overridden in other places like kde-dist, kde-source and some individual ebuilds SLOT="0" + +# Solution A +if [ ${NEED_CALLED} == 0 ] ; then + need-kde ${NEED_KDE} +fi + +# Solution B (can't be written without changes in portage) + +#kde_set_dependencies()() { +# resolve_kde_ver() { +# # local PREFIX_OPS="~ < > <= => = ! !=" +# # +# #} +# if [ ${NEED_CALLED} == 0 ] ; then +# do some parsing +# fi +# +#} + kde_src_unpack() { debug-print-function $FUNCNAME $*