diff options
Diffstat (limited to 'eclass/kde4-base.eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 6b26906c7b0..ef25558f8b8 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -380,7 +380,7 @@ kdedepend=" dev-util/automoc dev-util/pkgconfig !aqua? ( - || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1.0 ) + >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) " @@ -576,9 +576,9 @@ case ${BUILD_TYPE} in case ${KDEBASE} in kde-base) case ${PV} in - 4.5.93) - # Only kdepim and kdepim-runtime 4.6beta here - SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname}-4.6beta3.tar.bz2" + 4.5.94.1) + # KDEPIM 4.6beta + SRC_URI="mirror://kde/unstable/kdepim/${PV}/src/${_kmname_pv}.tar.bz2" ;; 4.[456].8[05] | 4.[456].9[023568]) # Unstable KDE SC releases @@ -857,6 +857,12 @@ kde4-base_src_test() { cmake-utils_src_configure kde4-base_src_compile + # When run as normal user during ebuild development with the ebuild command, the + # kde tests tend to access the session DBUS. This however is not possible in a real + # emerge or on the tinderbox. + # > make sure it does not happen, so bad tests can be recognized and disabled + unset DBUS_SESSION_BUS_ADDRESS + if [[ ${VIRTUALX_REQUIRED} == always ]] || ( [[ ${VIRTUALX_REQUIRED} != manual ]] && use test ); then |