diff options
| author | Jonathan Callen <en.ABCD@gmail.com> | 2009-09-03 02:56:15 -0400 |
|---|---|---|
| committer | Jonathan Callen <en.ABCD@gmail.com> | 2009-09-03 02:56:15 -0400 |
| commit | a5b780112a12208eed24879d9738190d1e5aebed (patch) | |
| tree | 8ded5bd0868e4caa835001638c16ce0c1a71be59 /eclass | |
| parent | e0604638c7fc8d9490e4fcb0fdd8c48fd7941c89 (diff) | |
| download | kde-a5b780112a12208eed24879d9738190d1e5aebed.tar.gz kde-a5b780112a12208eed24879d9738190d1e5aebed.tar.bz2 kde-a5b780112a12208eed24879d9738190d1e5aebed.zip | |
Remove libknotificationitem from KDE live; now included in kdelibs
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 664d989014d..235110fe644 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -230,8 +230,10 @@ kdecommondepend=" ) " if [[ ${PN} != kdelibs ]]; then - [[ ${PN} != libknotificationitem ]] && slot_is_at_least 4.3 ${KDE_MINIMAL} && local libknotificationitem_required=1 if [[ ${KDEBASE} = kde-base ]]; then + # All SLOT=4.3 and any SLOT=4.4 where PV < 4.3.66; only kde-base/ + [[ ${PN} != libknotificationitem ]] && slot_is_at_least 4.3 ${SLOT} && \ + [[ ${_pvn} < 4.3.66 || ${_pvn} == 4.3.9999 ]] && local libknotificationitem_required=1 kdecommondepend+=" kdeprefix? ( >=kde-base/kdelibs${_pv}[kdeprefix] ) !kdeprefix? ( >=kde-base/kdelibs${_pvn}[-kdeprefix] ) @@ -245,10 +247,6 @@ if [[ ${PN} != kdelibs ]]; then kdecommondepend+=" >=kde-base/kdelibs${_pv} " - [[ -n ${libknotificationitem_required} ]] && \ - kdecommondepend+=" - >=kde-base/libknotificationitem${_pv} - " fi fi unset _pv _pvn |