| 1 |
abcd 09/12/02 17:07:05 |
| 2 |
|
| 3 |
Modified: kde4-base.eclass kde4-meta.eclass |
| 4 |
Log: |
| 5 |
Update kde4 eclasses from overlay |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.55 eclass/kde4-base.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.55&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.55&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.54&r2=1.55 |
| 13 |
|
| 14 |
Index: kde4-base.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
| 17 |
retrieving revision 1.54 |
| 18 |
retrieving revision 1.55 |
| 19 |
diff -u -r1.54 -r1.55 |
| 20 |
--- kde4-base.eclass 1 Dec 2009 10:56:17 -0000 1.54 |
| 21 |
+++ kde4-base.eclass 2 Dec 2009 17:07:05 -0000 1.55 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 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.54 2009/12/01 10:56:17 scarabeus Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.55 2009/12/02 17:07:05 abcd Exp $ |
| 27 |
|
| 28 |
# @ECLASS: kde4-base.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -146,7 +146,7 @@ |
| 31 |
# Currently defaults to 4.5.1 for KDE 4.3 and earlier |
| 32 |
# or 4.6.0_rc1 for KDE 4.4 and later |
| 33 |
if slot_is_at_least 4.4 "${KDE_MINIMAL}"; then |
| 34 |
- QT_MINIMAL="${QT_MINIMAL:-4.6.0_rc1}" |
| 35 |
+ QT_MINIMAL="${QT_MINIMAL:-4.6.0}" |
| 36 |
fi |
| 37 |
|
| 38 |
QT_MINIMAL="${QT_MINIMAL:-4.5.1}" |
| 39 |
@@ -240,7 +240,7 @@ |
| 40 |
kdedepend=" |
| 41 |
dev-util/pkgconfig |
| 42 |
!aqua? ( |
| 43 |
- x11-proto/xextproto |
| 44 |
+ || ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1.0 ) |
| 45 |
x11-proto/xf86vidmodeproto |
| 46 |
) |
| 47 |
" |
| 48 |
@@ -364,7 +364,7 @@ |
| 49 |
case ${KDEBASE} in |
| 50 |
kde-base) |
| 51 |
case ${PV} in |
| 52 |
- 4.3.85 | 4.3.9[0568]) |
| 53 |
+ 4.3.8[05] | 4.3.9[0568]) |
| 54 |
# block for normally packed unstable releases |
| 55 |
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;; |
| 56 |
4.3.[6-9]*) |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.29 eclass/kde4-meta.eclass |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.29&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.29&content-type=text/plain |
| 64 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.28&r2=1.29 |
| 65 |
|
| 66 |
Index: kde4-meta.eclass |
| 67 |
=================================================================== |
| 68 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v |
| 69 |
retrieving revision 1.28 |
| 70 |
retrieving revision 1.29 |
| 71 |
diff -u -r1.28 -r1.29 |
| 72 |
--- kde4-meta.eclass 1 Dec 2009 10:56:17 -0000 1.28 |
| 73 |
+++ kde4-meta.eclass 2 Dec 2009 17:07:05 -0000 1.29 |
| 74 |
@@ -1,6 +1,6 @@ |
| 75 |
# Copyright 1999-2009 Gentoo Foundation |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.28 2009/12/01 10:56:17 scarabeus Exp $ |
| 78 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.29 2009/12/02 17:07:05 abcd Exp $ |
| 79 |
# |
| 80 |
# @ECLASS: kde4-meta.eclass |
| 81 |
# @MAINTAINER: |
| 82 |
@@ -20,6 +20,11 @@ |
| 83 |
die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" |
| 84 |
fi |
| 85 |
|
| 86 |
+# Add khelpcenter dependency when installing handbooks |
| 87 |
+if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then |
| 88 |
+ RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )" |
| 89 |
+fi |
| 90 |
+ |
| 91 |
# Add dependencies that all packages in a certain module share. |
| 92 |
case ${KMNAME} in |
| 93 |
kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics) |
| 94 |
@@ -208,7 +213,7 @@ |
| 95 |
else |
| 96 |
local abort tarball tarfile f extractlist moduleprefix postfix |
| 97 |
case ${PV} in |
| 98 |
- 4.3.85 | 4.3.9[0568]) |
| 99 |
+ 4.3.8[05] | 4.3.9[0568]) |
| 100 |
# block for normally packed upstream unstable snapshots |
| 101 |
KMTARPARAMS+=" --bzip2" # bz2 |
| 102 |
postfix="bz2" |
Archives