--- eclass/kde4-meta.eclass 2010/06/22 13:49:08 1.38 +++ eclass/kde4-meta.eclass 2010/08/09 15:59:04 1.39 @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.38 2010/06/22 13:49:08 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.39 2010/08/09 15:59:04 reavertm Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -24,7 +24,6 @@ COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4" ;; kdepim|kdepim-runtime) - ! slot_is_at_least 4.4 ${SLOT} && COMMONDEPEND+=" $(add_kdebase_dep kdepimlibs)" case ${PN} in akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker) IUSE+=" +kontact" @@ -204,12 +203,12 @@ else local abort tarball tarfile f extractlist moduleprefix postfix case ${PV} in - 4.[34].8[05] | 4.[34].9[0568]) + 4.[45].8[05] | 4.[45].9[02568]) # block for normally packed upstream unstable snapshots KMTARPARAMS+=" --bzip2" # bz2 postfix="bz2" ;; - 4.[34].[6-9]*) + 4.[45].[6-9]*) # Not passing --xz, as it doesn't work with stable tar KMTARPARAMS+=" --use-compress-program=xz" # xz postfix="xz" @@ -349,10 +348,6 @@ if has kontact ${IUSE//+} && use kontact; then KMEXTRA+=" kontact/plugins/${PLUGINNAME:-${PN}}/" - if ! slot_is_at_least 4.4 ${SLOT}; then - KMEXTRACTONLY+=" - kontactinterfaces/" - fi fi ;; kdeutils)