[gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass kde.eclass

[Carsten Lohrke (carlo)]

carlo       08/08/27 15:29:26

  Modified:             kde-functions.eclass kde.eclass
  Log:
  Prepare kde eclasses for KDE 3.5.10.

Revision  Changes    Path
1.170                eclass/kde-functions.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.170&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.170&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.169&r2=1.170

Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- kde-functions.eclass	27 Jul 2008 19:04:29 -0000	1.169
+++ kde-functions.eclass	27 Aug 2008 15:29:26 -0000	1.170
@@ -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 @@
 if [[ "${CATEGORY}" == "kde-base" ]]; then
 	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	export KDEBASE="true"
+	export KDEREVISION
 fi



1.217                eclass/kde.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.217&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.217&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?r1=1.216&r2=1.217

Index: kde.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- kde.eclass	22 May 2008 23:12:27 -0000	1.216
+++ kde.eclass	27 Aug 2008 15:29:26 -0000	1.217
@@ -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 @@
 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: