| 1 |
reavertm 10/06/26 16:02:18 |
| 2 |
|
| 3 |
Modified: kde4-base.eclass |
| 4 |
Log: |
| 5 |
Add comment for accessibility USE dep on qt-gui, qt-qt3support, sync kdevelop eclass updates from overlay |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.65 eclass/kde4-base.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.65&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.65&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.64&r2=1.65 |
| 13 |
|
| 14 |
Index: kde4-base.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
| 17 |
retrieving revision 1.64 |
| 18 |
retrieving revision 1.65 |
| 19 |
diff -u -r1.64 -r1.65 |
| 20 |
--- kde4-base.eclass 26 Jun 2010 01:33:21 -0000 1.64 |
| 21 |
+++ kde4-base.eclass 26 Jun 2010 16:02:18 -0000 1.65 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2010 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.64 2010/06/26 01:33:21 reavertm Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.65 2010/06/26 16:02:18 reavertm Exp $ |
| 27 |
|
| 28 |
# @ECLASS: kde4-base.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -75,17 +75,29 @@ |
| 31 |
;; |
| 32 |
kdevelop) |
| 33 |
if [[ ${BUILD_TYPE} = live ]]; then |
| 34 |
- KDEVELOP_VERSION="9999" |
| 35 |
- KDEVPLATFORM_VERSION="9999" |
| 36 |
+ # @ECLASS-VARIABLE: KDEVELOP_VERSION |
| 37 |
+ # @DESCRIPTION: |
| 38 |
+ # Specifies KDevelop version. Default is 4.0.0 for tagged packages and 9999 for live packages. |
| 39 |
+ # Applies to KDEBASE=kdevelop only. |
| 40 |
+ KDEVELOP_VERSION="${KDEVELOP_VERSION:-9999}" |
| 41 |
+ # @ECLASS-VARIABLE: KDEVPLATFORM_VERSION |
| 42 |
+ # @DESCRIPTION: |
| 43 |
+ # Specifies KDevplatform version. Default is 1.0.0 for tagged packages and 9999 for live packages. |
| 44 |
+ # Applies to KDEBASE=kdevelop only. |
| 45 |
+ KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-9999}" |
| 46 |
else |
| 47 |
case ${PN} in |
| 48 |
kdevelop|quanta) |
| 49 |
KDEVELOP_VERSION=${PV} |
| 50 |
KDEVPLATFORM_VERSION="$(($(get_major_version)-3)).$(get_after_major_version)" |
| 51 |
;; |
| 52 |
- *) |
| 53 |
+ kdevplatform) |
| 54 |
KDEVELOP_VERSION="$(($(get_major_version)+3)).$(get_after_major_version)" |
| 55 |
KDEVPLATFORM_VERSION=${PV} |
| 56 |
+ ;; |
| 57 |
+ *) |
| 58 |
+ KDEVELOP_VERSION="${KDEVELOP_VERSION:-4.0.0}" |
| 59 |
+ KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-1.0.0}" |
| 60 |
esac |
| 61 |
fi |
| 62 |
SLOT="4" |
| 63 |
@@ -259,6 +271,7 @@ |
| 64 |
unset cppuintdepend |
| 65 |
|
| 66 |
# KDE dependencies |
| 67 |
+# Qt accessibility classes are needed in various places, bug 325461 |
| 68 |
kdecommondepend=" |
| 69 |
>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl] |
| 70 |
>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus] |
| 71 |
@@ -288,9 +301,19 @@ |
| 72 |
" |
| 73 |
if [[ ${KDEBASE} = kdevelop ]]; then |
| 74 |
if [[ ${PN} != kdevplatform ]]; then |
| 75 |
- kdecommondepend+=" |
| 76 |
- >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION} |
| 77 |
- " |
| 78 |
+ # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED |
| 79 |
+ # @DESCRIPTION: |
| 80 |
+ # Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'. |
| 81 |
+ # Applies to KDEBASE=kdevelop only. |
| 82 |
+ KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}" |
| 83 |
+ case ${KDEVPLATFORM_REQUIRED} in |
| 84 |
+ always) |
| 85 |
+ kdecommondepend+=" |
| 86 |
+ >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION} |
| 87 |
+ " |
| 88 |
+ ;; |
| 89 |
+ *) ;; |
| 90 |
+ esac |
| 91 |
fi |
| 92 |
fi |
| 93 |
fi |
Archives