diff options
| author | Jonathan Callen <abcd@gentoo.org> | 2009-09-11 17:14:35 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-09-11 23:52:47 -0400 |
| commit | 6658447f57b455e0534415f667137c57691a48ea (patch) | |
| tree | 52a477bfc7f165ee6379b7731085da538e8842cf /eclass/kde4-meta.eclass | |
| parent | ed65ebc4f4cd1bb5c19ec56f3db9ac01c5e61ab8 (diff) | |
| download | kde-6658447f57b455e0534415f667137c57691a48ea.tar.gz kde-6658447f57b455e0534415f667137c57691a48ea.tar.bz2 kde-6658447f57b455e0534415f667137c57691a48ea.zip | |
Add a new add_kdebase_dep() function, and inject it everywhere
The add_kdebase_dep function takes 1-2 arguments, the first being the
name of the package to depend upon, and the second being (optionally)
extra USE deps.
When given 1 argument, this function will output
!kdeprefix? ( >=kde-base/$1-${PV}[-kdeprefix] )
kdeprefix? ( >=kde-base/$1-${PV}:${SLOT}[kdeprefix] )
And 2 arguments outputs
!kdeprefix? ( >=kde-base/$1-${PV}[-kdeprefix,$2] )
kdeprefix? ( >=kde-base/$1-${PV}:${SLOT}[kdeprefix,$2] )
These are the proper deps to replace
>=kde-base/PKG-${PV}:${SLOT}[kdeprefix=,USEDEPS]
as it does not force an all-at-once upgrade of everything.
Some of the deps (the ones from kde4-base.eclass) were already in
this form, so there was an odd combination of packages that could be
installed in separate slots with -kdeprefix, and packages that couldn't.
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 5fa5d8720db..da7f2492064 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? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )" + RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )" 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+=" >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]" + COMMONDEPEND+=" $(add_kdebase_dep kdepimlibs)" ;; kdepim|kdepim-runtime) COMMONDEPEND+=" dev-libs/boost - >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] + $(add_kdebase_dep kdepimlibs) " case ${PN} in akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker) IUSE+=" +kontact" - RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )" + RDEPEND+=" kontact? ( $(add_kdebase_dep kontactinterfaces) )" ;; esac ;; kdegames) if [[ ${PN} != libkdegames ]]; then - COMMONDEPEND+=" >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=] " + COMMONDEPEND+=" $(add_kdebase_dep libkdegames)" fi ;; koffice) |