diff options
| author | Jonathan Callen <en.ABCD@gmail.com> | 2009-08-06 21:06:08 -0400 |
|---|---|---|
| committer | Jonathan Callen <en.ABCD@gmail.com> | 2009-08-06 21:06:08 -0400 |
| commit | 66c979c9aed56c7c1aef48c4ca1fdf75e472bca3 (patch) | |
| tree | 322ef6606ca8068ca56a75904998387e77d5277e /eclass | |
| parent | 3f6d98d62113f0b49fc0c56bf00ca425c7a89c2e (diff) | |
| download | kde-66c979c9aed56c7c1aef48c4ca1fdf75e472bca3.tar.gz kde-66c979c9aed56c7c1aef48c4ca1fdf75e472bca3.tar.bz2 kde-66c979c9aed56c7c1aef48c4ca1fdf75e472bca3.zip | |
[kde-base/kde*-meta, eclass] Add proper blockers to metas, add function to kde4-functions.eclass to make this easier
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 8 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 1129161ae24..9338d1dc1b7 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -173,13 +173,7 @@ case ${KDEBASE} in _pvn="-${PV}" # Block installation of other SLOTS unless kdeprefix - for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do - # Block non kdeprefix ${PN} on other slots - if [[ ${SLOT} != ${slot} ]]; then - RDEPEND+=" !kdeprefix? ( !kde-base/${PN}:${slot}[-kdeprefix] )" - fi - done - unset slot + RDEPEND+=" $(block_other_slots)" ;; koffice) SLOT="2" diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 2814b28a213..6495d7320a9 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -352,3 +352,17 @@ load_library_dependencies() { done eend $? } + +# @FUNCTION: block_other_slots +# @DESCRIPTION: +# Create blocks for the current package in other slots when +# installed with USE=-kdeprefix +block_other_slots() { + local slot + for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do + # Block non kdeprefix ${PN} on other slots + if [[ ${SLOT} != ${slot} ]]; then + echo "!kdeprefix? ( !kde-base/${PN}:${slot}[-kdeprefix] )" + fi + done +} |