diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2008-08-27 15:29:26 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2008-08-27 15:29:26 +0000 |
| commit | 32da7fcd3b48e3edee503320c56e46c49589fb91 (patch) | |
| tree | eb3fa833406dec51ad8a73e6593fa90a65a426dc /eclass | |
| parent | alpha/ia64 stable wrt #235407 (diff) | |
| download | gentoo-2-32da7fcd3b48e3edee503320c56e46c49589fb91.tar.gz gentoo-2-32da7fcd3b48e3edee503320c56e46c49589fb91.tar.bz2 gentoo-2-32da7fcd3b48e3edee503320c56e46c49589fb91.zip | |
Prepare kde eclasses for KDE 3.5.10.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 3 | ||||
| -rw-r--r-- | eclass/kde.eclass | 23 |
2 files changed, 21 insertions, 5 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index 7d4d37d94111..db265a188396 100644 --- a/eclass/kde-functions.eclass +++ b/eclass/kde-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.169 2008/07/27 19:04:29 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.170 2008/08/27 15:29:26 carlo Exp $ # @ECLASS: kde-functions.eclass # @MAINTAINER: @@ -926,4 +926,5 @@ postprocess_desktop_entries() { if [[ "${CATEGORY}" == "kde-base" ]]; then debug-print "${ECLASS}: KDEBASE ebuild recognized" export KDEBASE="true" + export KDEREVISION fi diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 6eb3933b7bcc..f9d7fb50faed 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.216 2008/05/22 23:12:27 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.217 2008/08/27 15:29:26 carlo Exp $ # @ECLASS: kde.eclass # @MAINTAINER: @@ -21,13 +21,28 @@ DESCRIPTION="Based on the $ECLASS eclass" HOMEPAGE="http://www.kde.org/" IUSE="debug xinerama elibc_FreeBSD" + +if [[ ${CATEGORY} == "kde-base" ]]; then + if [[ ${PV##*.} -lt 10 ]] ; then + # Keep old ebuilds as is + IUSE="${IUSE} kdeenablefinal" + else + # Don't use --enable-final anymore. Does only cause problems for users and + # as an unwelcome extra invalid bug reports, without any reasonable benefit. + + # Get the aRts dependencies right - finally. + case "${PN}" in + blinken|juk|kalarm|kanagram|kbounce|kcontrol|konq-plugins|kscd|kscreensaver|kttsd|kwifimanager) ARTS_REQUIRED="" ;; + artsplugin-*|kaboodle|kasteroids|kdemultimedia-arts|kolf|krec|ksayit|noatun*) ARTS_REQUIRED="yes" ;; + *) ARTS_REQUIRED="never" ;; + esac + fi +fi + if [[ ${ARTS_REQUIRED} != "yes" && ${ARTS_REQUIRED} != "never" && ${PN} != "arts" ]]; then IUSE="${IUSE} arts" fi -if [[ ${CATEGORY} == "kde-base" ]]; then - IUSE="${IUSE} kdeenablefinal" -fi # @ECLASS-VARIABLE: KDE_S # @DESCRIPTION: |