| 1 |
carlo 08/09/13 21:30:22 |
| 2 |
|
| 3 |
Modified: kde-meta.eclass kde.eclass |
| 4 |
Log: |
| 5 |
Final preparation for KDE 3.5.10. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.86 eclass/kde-meta.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-meta.eclass?rev=1.86&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-meta.eclass?rev=1.86&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-meta.eclass?r1=1.85&r2=1.86 |
| 13 |
|
| 14 |
Index: kde-meta.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v |
| 17 |
retrieving revision 1.85 |
| 18 |
retrieving revision 1.86 |
| 19 |
diff -u -r1.85 -r1.86 |
| 20 |
--- kde-meta.eclass 21 Feb 2008 10:33:11 -0000 1.85 |
| 21 |
+++ kde-meta.eclass 13 Sep 2008 21:30:21 -0000 1.86 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.85 2008/02/21 10:33:11 zlin Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.86 2008/09/13 21:30:21 carlo Exp $ |
| 27 |
|
| 28 |
# @ECLASS: kde-meta.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -348,9 +348,9 @@ |
| 31 |
# Don't add a param here without looking at its implementation. |
| 32 |
kde_src_unpack |
| 33 |
|
| 34 |
- # kdebase: Remove the installation of the "startkde" script. |
| 35 |
+ # kdebase: Remove the installation of the "startkde" and "kde3" scripts. |
| 36 |
if [[ "$KMNAME" == "kdebase" ]]; then |
| 37 |
- sed -i -e s:"bin_SCRIPTS = startkde"::g "${S}"/Makefile.am.in |
| 38 |
+ sed -i -e s:"bin_SCRIPTS = startkde.*"::g "${S}"/Makefile.am.in |
| 39 |
fi |
| 40 |
|
| 41 |
# for ebuilds with extended src_unpack |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.219 eclass/kde.eclass |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.219&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.219&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?r1=1.218&r2=1.219 |
| 50 |
|
| 51 |
Index: kde.eclass |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v |
| 54 |
retrieving revision 1.218 |
| 55 |
retrieving revision 1.219 |
| 56 |
diff -u -r1.218 -r1.219 |
| 57 |
--- kde.eclass 9 Sep 2008 18:27:37 -0000 1.218 |
| 58 |
+++ kde.eclass 13 Sep 2008 21:30:21 -0000 1.219 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2008 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.218 2008/09/09 18:27:37 cryos Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.219 2008/09/13 21:30:21 carlo Exp $ |
| 64 |
|
| 65 |
# @ECLASS: kde.eclass |
| 66 |
# @MAINTAINER: |
| 67 |
@@ -19,7 +19,7 @@ |
| 68 |
|
| 69 |
DESCRIPTION="Based on the $ECLASS eclass" |
| 70 |
HOMEPAGE="http://www.kde.org/" |
| 71 |
-IUSE="debug xinerama elibc_FreeBSD" |
| 72 |
+IUSE="debug elibc_FreeBSD" |
| 73 |
|
| 74 |
|
| 75 |
if [[ ${CATEGORY} == "kde-base" ]]; then |
| 76 |
@@ -43,7 +43,6 @@ |
| 77 |
IUSE="${IUSE} arts" |
| 78 |
fi |
| 79 |
|
| 80 |
- |
| 81 |
# @ECLASS-VARIABLE: KDE_S |
| 82 |
# @DESCRIPTION: |
| 83 |
# Like the 'normal' ${S} this variable takes the path to the temporary build |
| 84 |
@@ -63,12 +62,18 @@ |
| 85 |
|
| 86 |
DEPEND="sys-devel/make |
| 87 |
dev-util/pkgconfig |
| 88 |
- dev-lang/perl |
| 89 |
- x11-libs/libXt |
| 90 |
- x11-proto/xf86vidmodeproto |
| 91 |
- xinerama? ( x11-proto/xineramaproto )" |
| 92 |
+ dev-lang/perl" |
| 93 |
|
| 94 |
-RDEPEND="xinerama? ( x11-libs/libXinerama )" |
| 95 |
+if [[ ${CATEGORY} != "kde-base" ]] || [[ ${CATEGORY} == "kde-base" && ${PV##*.} -lt 10 ]] ; then |
| 96 |
+ DEPEND="${DEPEND} |
| 97 |
+ x11-libs/libXt |
| 98 |
+ x11-proto/xf86vidmodeproto |
| 99 |
+ xinerama? ( x11-proto/xineramaproto )" |
| 100 |
+ RDEPEND="xinerama? ( x11-libs/libXinerama )" |
| 101 |
+ IUSE="${IUSE} xinerama" |
| 102 |
+else |
| 103 |
+ RDEPEND="" |
| 104 |
+fi |
| 105 |
|
| 106 |
if [[ ${ARTS_REQUIRED} == "yes" ]]; then |
| 107 |
DEPEND="${DEPEND} kde-base/arts" |
| 108 |
@@ -262,7 +267,11 @@ |
| 109 |
case $1 in |
| 110 |
myconf) |
| 111 |
debug-print-section myconf |
| 112 |
- myconf="$myconf --with-x --enable-mitshm $(use_with xinerama) --with-qt-dir=${QTDIR} --enable-mt --with-qt-libraries=${QTDIR}/$(get_libdir)" |
| 113 |
+ if [[ ${CATEGORY} != "kde-base" ]] || [[ ${CATEGORY} == "kde-base" && ${PV##*.} -lt 10 ]] ; then |
| 114 |
+ myconf+=" --with-x --enable-mitshm $(use_with xinerama) --with-qt-dir=${QTDIR} --enable-mt --with-qt-libraries=${QTDIR}/$(get_libdir)" |
| 115 |
+ else |
| 116 |
+ myconf+=" --with-qt-dir=${QTDIR} --enable-mt --with-qt-libraries=${QTDIR}/$(get_libdir)" |
| 117 |
+ fi |
| 118 |
# calculate dependencies separately from compiling, enables ccache to work on kde compiles |
| 119 |
myconf="$myconf --disable-dependency-tracking" |
| 120 |
if use debug ; then |
Archives