Adjust eclasses to support new handbook useflag, also keep backcompat with old doc handling (will be dropped). Depend on qt4.5 and add variable allowing to override this. Linugas handling update.

3 files changed, 51 insertions, 27 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 4309baa281d7..0fcf3e27b78a 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.38 2009/05/28 09:47:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.39 2009/06/04 09:29:54 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -82,9 +82,15 @@ if [[ -n ${NEED_KDE} ]]; then
 	esac
 fi
 
+# @ECLASS-VARIABLE: QT_DEPEND
+# @DESCRIPTION:
+# Determine version of qt we enforce as minimal for the package. 4.4.0 4.5.1..
+# Currently defaults to 4.5.1
+QT_DEPEND="${QT_DEPEND:-4.5.1}"
+
 # OpenGL dependencies
 qtopengldepend="
-	x11-libs/qt-opengl:4
+	>=x11-libs/qt-opengl-${QT_DEPEND}:4
 "
 case ${OPENGL_REQUIRED} in
 	always)
@@ -102,7 +108,7 @@ unset qtopengldepend
 
 # WebKit dependencies
 qtwebkitdepend="
-	x11-libs/qt-webkit:4
+	>=x11-libs/qt-webkit-${QT_DEPEND}:4
 "
 case ${WEBKIT_REQUIRED} in
 	always)
@@ -157,7 +163,6 @@ fi # NEED_KDE != NONE block
 
 # Setup packages inheriting this eclass
 case ${KDEBASE} in
-
 	kde-base)
 		if [[ $BUILD_TYPE = live ]]; then
 			# Disable tests for live ebuilds
@@ -191,13 +196,11 @@ case ${KDEBASE} in
 		done
 		unset slot
 		;;
-
 	koffice)
 		SLOT="2"
 		_pv="-${KDE_MINIMAL}"
 		_pvn="${_pv}"
 		;;
-
 	*)
 		_pv="-${KDE_MINIMAL}"
 		_pvn="${_pv}"
@@ -211,13 +214,13 @@ kdecommondepend="
 	x11-libs/libXext
 	x11-libs/libXt
 	x11-libs/libXxf86vm
-	x11-libs/qt-core:4[qt3support,ssl]
-	x11-libs/qt-gui:4[accessibility,dbus]
-	x11-libs/qt-qt3support:4[accessibility]
-	x11-libs/qt-script:4
-	x11-libs/qt-sql:4[qt3support]
-	x11-libs/qt-svg:4
-	x11-libs/qt-test:4
+	>=x11-libs/qt-core-${QT_DEPEND}:4[qt3support,ssl]
+	>=x11-libs/qt-gui-${QT_DEPEND}:4[accessibility,dbus]
+	>=x11-libs/qt-qt3support-${QT_DEPEND}:4[accessibility]
+	>=x11-libs/qt-script-${QT_DEPEND}:4
+	>=x11-libs/qt-sql-${QT_DEPEND}:4[qt3support]
+	>=x11-libs/qt-svg-${QT_DEPEND}:4
+	>=x11-libs/qt-test-${QT_DEPEND}:4
 "
 if [[ ${PN} != kdelibs ]]; then
 	if [[ ${KDEBASE} = kde-base ]]; then
@@ -350,7 +353,7 @@ case ${BUILD_TYPE} in
 			case ${KDEBASE} in
 				kde-base)
 					case ${PV} in
-						4.2.85)
+						4.2.85|4.2.90)
 							# block for normally packed unstable releases
 							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
 						4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*)
@@ -611,6 +614,15 @@ kde4-base_pkg_postinst() {
 		einfo "Use it at your own risk."
 		einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
 		echo
+	elif [[ ${BUILD_TYPE} != live ]] && [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && has kdeprefix ${IUSE//+} && use kdeprefix; then
+		# warning about kdeprefix for non-live users
+		echo
+		ewarn "WARNING! You have kdeprefix useflag enabled."
+		ewarn "This setting is strongly discouraged and might lead to potential troubles"
+		ewarn "with KDE update strategies."
+		ewarn "You are using this setup at your own risk and kde team does not"
+		ewarn "take responsibilities for dead kittens."
+		echo
 	fi
 }
 
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 13e3d17027a8..45a0d3953bb9 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-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/kde4-functions.eclass,v 1.20 2009/05/31 09:45:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.21 2009/06/04 09:29:54 scarabeus Exp $
 
 # @ECLASS: kde4-functions.eclass
 # @MAINTAINER:
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index cbc55ff0358f..46bc50ada8d6 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.21 2009/05/29 10:29:10 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.22 2009/06/04 09:29:54 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -31,16 +31,21 @@ case ${KDEBASE} in
 		;;
 esac
 
-# Add khelpcenter dependency when installing
-if [[ ${PN} != khelpcenter ]] && has doc ${IUSE//+} && use doc; then
+# remove this codeblock when 4.2.3 is dropped
+if [[ ${PV} = "4.2.3" ]]; then
+	[[ ${PN} != khelpcenter ]] && has doc ${IUSE//+} \
+		RDEPEND="${RDEPEND} doc? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )"
+else
+# Add khelpcenter dependency when installing handbooks
+if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
 	RDEPEND="${RDEPEND}
-		>=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=]
+		handbook? ( >=kde-base/khelpcenter-${PV}:${SLOT}[kdeprefix=] )
 	"
 fi
-
+fi
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
-	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphic)
+	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
 		DEPEND="${DEPEND}
 			>=kde-base/qimageblitz-0.0.4
 		"
@@ -66,7 +71,7 @@ case ${KMNAME} in
 			>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=]
 		"
 		case ${PN} in
-			akregator|kaddressbook|kjots|kmail|kmobiletools|knode|knotes|korganizer|ktimetracker)
+			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
 				IUSE="+kontact"
 				RDEPEND="${RDEPEND}
 					kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )
@@ -160,7 +165,7 @@ fi
 # @DESCRIPTION:
 # All subdirectories listed here will be extracted, compiled & installed.
 # $KMMODULE is always added to $KMEXTRA.
-# If the doc USE-flag is set, and if this directory exists,
+# If the handbook USE-flag is set, and if this directory exists,
 # then "doc/$KMMODULE" is added to $KMEXTRA. In other cases, this should be
 # handled in the ebuild.
 # If the documentation is in a different subdirectory, you should add it to KMEXTRA.
@@ -255,7 +260,7 @@ kde4-meta_src_extract() {
 	else
 		local abort tarball tarfile f extractlist moduleprefix postfix
 		case ${PV} in
-			4.2.85)
+			4.2.85|4.2.90)
 				# block for normally packed upstream unstable snapshots
 				KMTARPARAMS="${KMTARPARAMS} --bzip2" # bz2
 				postfix="bz2"
@@ -339,11 +344,18 @@ kde4-meta_create_extractlists() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	# TODO change to KMEXTRA for more strict check
-	if has doc ${IUSE//+} && use doc && [[ -n ${KMMODULE} ]]; then
+	# remvove 4.2.3 check when dropped
+	if [[ ${PV} = "4.2.3" ]]; then
+		if has doc ${IUSE//+} && use doc && [[ -n ${KMMODULE} ]]; then
+			KMEXTRA_NONFATAL="${KMEXTRA_NONFATAL} doc/${KMMODULE##*/}"
+		fi
+	else
+	if has handbook ${IUSE//+} && use handbook && [[ -n ${KMMODULE} ]]; then
 		# We use the basename of $KMMODULE because $KMMODULE can contain
 		# the path to the module subdirectory.
 		KMEXTRA_NONFATAL="${KMEXTRA_NONFATAL} doc/${KMMODULE##*/}"
 	fi
+	fi
 
 	# Add some CMake-files to KMEXTRACTONLY.
 	# Note that this actually doesn't include KMEXTRA handling.
@@ -711,10 +723,10 @@ kde4-meta_src_make_doc() {
 kde4-meta_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if has doc ${IUSE//+} && ! use doc; then
+	if has handbook ${IUSE//+} && ! use handbook; then
 		echo
 		einfo "Application handbook for ${PN} has not been installed."
-		einfo "To install handbook, reemerge =${CATEGORY}/${P} with 'doc' USE flag."
+		einfo "To install handbook, reemerge =${CATEGORY}/${P} with 'handbook' USE flag."
 		echo
 	fi