diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-10-05 17:02:27 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-10-05 17:02:27 +0200 |
| commit | 01482ecc75ed2a7cedbca9d8589fcc3bd92d6296 (patch) | |
| tree | 17e6b1c17ee4230b8a5a627999406f50b144dfaa /eclass | |
| parent | e186329dd84a639d9de88c61493525e4e6393f07 (diff) | |
| download | kde-01482ecc75ed2a7cedbca9d8589fcc3bd92d6296.tar.gz kde-01482ecc75ed2a7cedbca9d8589fcc3bd92d6296.tar.bz2 kde-01482ecc75ed2a7cedbca9d8589fcc3bd92d6296.zip | |
[eclass] Dont be so strict about deps when merging stable-live
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 15 |
1 files changed, 13 insertions, 2 deletions
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}]" |