diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 20 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 10 |
2 files changed, 5 insertions, 25 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 419272a6f58..ca143ff8c96 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -399,23 +399,3 @@ add_blocker() { # on kdeprefix we block only our slot RDEPEND+=" kdeprefix? ( !<=kde-base/${1}-${2}:${SLOT}[kdeprefix] )" } - -# @FUNCTION: add_kdebase_dep -# @DESCRIPTION: -# Create proper dependency for kde-base/ dependencies, -# adding SLOT when needed (and *only* when needed). -# This takes 1 or 2 arguments. The first being the package -# name, the optional second, is additional USE flags to append. -# The output of this should be added directly to DEPEND/RDEPEND, and -# may be wrapped in a USE conditional (but not an || conditional -# without an extra set of parentheses. -add_kdebase_dep() { - debug-print-function ${FUNCNAME} "$@" - - [[ -z ${1} ]] && die "Missing parameter" - - local use=${2:+,${2}} - - echo "!kdeprefix? ( >=kde-base/${1}-${PV}[-kdeprefix${use}] )" - echo "kdeprefix? ( >=kde-base/${1}-${PV}:${SLOT}[kdeprefix${use}] )" -} diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index da7f2492064..5fa5d8720db 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -22,7 +22,7 @@ fi # Add khelpcenter dependency when installing handbooks if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then - RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )" + RDEPEND+=" handbook? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )" fi # Add dependencies that all packages in a certain module share. @@ -31,23 +31,23 @@ case ${KMNAME} in COMMONDEPEND+=" >=kde-base/qimageblitz-0.0.4" ;; kdenetwork) - COMMONDEPEND+=" $(add_kdebase_dep kdepimlibs)" + COMMONDEPEND+=" >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]" ;; kdepim|kdepim-runtime) COMMONDEPEND+=" dev-libs/boost - $(add_kdebase_dep kdepimlibs) + >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] " case ${PN} in akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker) IUSE+=" +kontact" - RDEPEND+=" kontact? ( $(add_kdebase_dep kontactinterfaces) )" + RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )" ;; esac ;; kdegames) if [[ ${PN} != libkdegames ]]; then - COMMONDEPEND+=" $(add_kdebase_dep libkdegames)" + COMMONDEPEND+=" >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=] " fi ;; koffice) |