diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 25 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 2 |
2 files changed, 23 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 4670e703b54..111bafffee1 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -54,7 +54,7 @@ kde4-base_set_qt_dependencies() { # allow monolithic qt for PV < 4.1 case "${PV}" in - scm|9999*|4.1*|4.0.9*|4.0.8*) : ;; + scm|9999*|4.2*|4.1.9*|4.1.8*|4.1.7*|4.1.6*|4.1*|4.0.9*|4.0.8*) : ;; *) qtdepend="|| ( ( ${qtdepend} ) >=x11-libs/qt-4.3.3:4${qt} )" qtopengldepend="|| ( ${qtopengldepend} >=x11-libs/qt-4.3.3:4 )" @@ -83,7 +83,7 @@ kde4-base_set_qt_dependencies # Set the cmake dependencies case "${PV}" in - 9999*) + 9999*|4.2*|4.1.9*|4.1.8*|4.1.7*|4.1.6*) CMAKEDEPEND=">=dev-util/cmake-2.6" ;; *) @@ -165,6 +165,9 @@ case ${NEED_KDE} in # Should only be used by 'kde-base'-ebuilds if [[ "${KDEBASE}" == "kde-base" ]]; then case ${PV} in + 4.2*|4.1.9*|4.1.8*|4.1.7*|4.1.6*) + _kdedir="4.2" + _pv="-${PV}:4.2" ;; 4.1*| 4.0.9* | 4.0.8*) _kdedir="4.1" _pv="-${PV}:4.1" ;; @@ -180,6 +183,7 @@ case ${NEED_KDE} in _operator=">=" else case ${PV} in + 4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* ) _kdedir="4.2" ;; 4.1 | 4.0.9* | 4.0.8*) _kdedir="4.1" ;; 4.0*) _kdedir="4.0" ;; 3.9*) _kdedir="3.9" ;; @@ -194,6 +198,10 @@ case ${NEED_KDE} in _pv="-${NEED_KDE}" export NEED_KDE="svn" ;; + :4.2) + _kdedir="4.2" + _pv="${NEED_KDE}" + ;; :4.1) _kdedir="4.1" _pv="${NEED_KDE}" @@ -210,6 +218,11 @@ case ${NEED_KDE} in _pv="-${NEED_KDE}" export NEED_KDE="svn" ;; + *:4.2) + _kdedir="4.2" + _operator=">=" + _pv="-${NEED_KDE}" + ;; *:4.1) _kdedir="4.1" _operator=">=" @@ -228,6 +241,11 @@ case ${NEED_KDE} in _pv="-${NEED_KDE}:kde-svn" export NEED_KDE="svn" ;; + 4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*) + _kdedir="4.2" + _operator=">=" + _pv="-${NEED_KDE}" + ;; 4.1 | 4.0.9* | 4.0.8*) _kdedir="4.1" _operator=">=" @@ -262,6 +280,7 @@ if [[ ${NEED_KDE} != none ]]; then SLOT="kde-svn" else case ${PV} in + 4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*) SLOT="4.2" ;; 4.1* | 4.0.9* | 4.0.8*) SLOT="4.1" ;; *) SLOT="kde-4" ;; esac @@ -324,7 +343,7 @@ if [[ -n ${KDEBASE} ]]; then case ${KDEBASE} in kde-base) case ${PV} in - 4.0.9* | 4.0.8*) + 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* | 4.0.9* | 4.0.8*) SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; *) SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2";; esac diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 0c4631290e7..dbd29a7e090 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -33,7 +33,7 @@ fi # @DESCRIPTION: # The slots used by all KDE versions after 4.0 - this doesn't include kde-3.5 and the # live-ebuilds that use the following var. -KDE_SLOTS=( "kde-4" "4.1" ) +KDE_SLOTS=( "kde-4" "4.1" "4.2" ) # @ECLASS-VARIABLE: KDE_LIVE_SLOTS # @DESCRIPTION: |