[gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass kde4-meta.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    09/12/01 10:56:18

  Modified:             kde4-base.eclass kde4-functions.eclass
                        kde4-meta.eclass
  Log:
  Update kde4 eclasses from overlay:
  Changes:
  kde-functions
  	Update the block resolving case to make it simpler.
  kde-meta
  	Drop not required elogs.
  	Drop redundant dependencies.
  kde-base
  	introduce kdeenablefinal useflag (masked).
  	support unpacking of xz tarballs in eapi2.

Revision  Changes    Path
1.54                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.53&r2=1.54

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kde4-base.eclass	25 Nov 2009 19:51:11 -0000	1.53
+++ kde4-base.eclass	1 Dec 2009 10:56:17 -0000	1.54
@@ -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-base.eclass,v 1.53 2009/11/25 19:51:11 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.54 2009/12/01 10:56:17 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -19,7 +19,7 @@
 # Please note that if it's set to 'never' you need to explicitly override following phases:
 # src_configure, src_compile, src_test and src_install.
 # Defaults to 'always'.
-CMAKE_REQUIRED="${CMAKE_REQUIRED:-${CMAKE_REQUIRED:-always}}"
+: ${CMAKE_REQUIRED:=always}
 if [[ ${CMAKE_REQUIRED} = false || ${CMAKE_REQUIRED} = never ]]; then
 	buildsystem_eclass=""
 	export_fns=""
@@ -144,9 +144,9 @@
 # @DESCRIPTION:
 # Determine version of qt we enforce as minimal for the package. 4.4.0 4.5.1..
 # Currently defaults to 4.5.1 for KDE 4.3 and earlier
-# or 4.6.0_beta for KDE 4.4 and later
+# or 4.6.0_rc1 for KDE 4.4 and later
 if slot_is_at_least 4.4 "${KDE_MINIMAL}"; then
-	QT_MINIMAL="${QT_MINIMAL:-4.6.0_beta}"
+	QT_MINIMAL="${QT_MINIMAL:-4.6.0_rc1}"
 fi
 
 QT_MINIMAL="${QT_MINIMAL:-4.5.1}"
@@ -239,6 +239,10 @@
 fi
 kdedepend="
 	dev-util/pkgconfig
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
 "
 case ${KDE_REQUIRED} in
 	always)
@@ -253,6 +257,7 @@
 		;;
 	*) ;;
 esac
+
 unset kdecommondepend kdedepend
 
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: COMMONDEPEND is ${COMMONDEPEND}"
@@ -264,6 +269,9 @@
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
+# Add experimental kdeenablefinal, disabled by default
+IUSE+=" kdeenablefinal"
+
 # Fetch section - If the ebuild's category is not 'kde-base' and if it is not a
 # koffice ebuild, the URI should be set in the ebuild itself
 case ${BUILD_TYPE} in
@@ -305,7 +313,7 @@
 				kdelibs-*)
 					ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/kdelibs/${KMNAME#kdelibs-}"
 					;;
-				kdereview)
+				kdereview*)
 					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
 					;;
 				kdesupport)
@@ -360,7 +368,10 @@
 							# block for normally packed unstable releases
 							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
 						4.3.[6-9]*)
-							SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/${_kmname_pv}.tar.lzma" ;;
+							# Repacked tarballs: need to depend on xz-utils to ensure that they can be unpacked
+							SRC_URI="http://dev.gentooexperimental.org/~alexxy/kde/${PV}/${_kmname_pv}.tar.xz"
+							DEPEND+=" app-arch/xz-utils"
+							;;
 						*)	SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
 					esac
 					;;
@@ -454,8 +465,25 @@
 	if [[ ${BUILD_TYPE} = live ]]; then
 		migrate_store_dir
 		subversion_src_unpack
+	elif [[ ${EAPI} == 2 ]]; then
+		local file
+		for file in ${A}; do
+			# This setup is because EAPI <= 2 cannot unpack *.tar.xz files
+			# directly, so we do it ourselves (using the exact same code as portage)
+			case ${file} in
+				*.tar.xz)
+					echo ">>> Unpacking ${file} to ${PWD}"
+					xz -dc "${DISTDIR}"/${file} | tar xof -
+					assert "failed unpacking ${file}"
+					;;
+				*)
+					unpack ${file}
+					;;
+			esac
+		done
 	else
-		base_src_unpack
+		# For EAPI >= 3, we can just use unpack() directly
+		unpack ${A}
 	fi
 }
 
@@ -500,17 +528,19 @@
 kde4-base_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# Handle common release builds
-	if ! has debug ${IUSE//+} || ! use debug; then
-		append-cppflags -DQT_NO_DEBUG
-	fi
-
 	# Build tests in src_test only, where we override this value
 	local cmakeargs="-DKDE4_BUILD_TESTS=OFF"
 
-	# set "real" debug mode
+	if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then
+		cmakeargs+=" -DKDE4_ENABLE_FINAL=ON"
+	fi
+
 	if has debug ${IUSE//+} && use debug; then
+		# Set "real" debug mode
 		CMAKE_BUILD_TYPE="Debugfull"
+	else
+		# Handle common release builds
+		append-cppflags -DQT_NO_DEBUG
 	fi
 
 	# Set distribution name



1.27                 eclass/kde4-functions.eclass

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

Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kde4-functions.eclass	27 Oct 2009 14:16:49 -0000	1.26
+++ kde4-functions.eclass	1 Dec 2009 10:56:17 -0000	1.27
@@ -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-functions.eclass,v 1.26 2009/10/27 14:16:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.27 2009/12/01 10:56:17 scarabeus Exp $
 
 inherit versionator
 
@@ -378,8 +378,7 @@
 # will add the following to RDEPEND:
 #    !kdeprefix? ( !kde-base/kdelibs:4.3[-kdeprefix] )
 #    !kdeprefix? ( !<kde-base/kdelibs-4.3.96:4.4[-kdeprefix] )
-#    !kdeprefix? ( !<=kde-base/kdelibs-9999:live[-kdeprefix] )
-#    kdeprefix? ( !<=kde-base/kdelibs-9999:live[kdeprefix] )
+#    !<=kde-base/kdelibs-9999:live
 add_blocker() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -399,7 +398,7 @@
 	local test=${slot}.50
 	version_compare $1 ${test}
 	# 1 = '<', 2 = '=', 3 = '>'
-	[[ $? -ne 1 ]]
+	(( $? != 1 ))
 }
 
 # _less_min_in_slot ver slot
@@ -411,10 +410,10 @@
 	# If slot == live, then test with "9999_pre", so that 9999 tests false
 	local test=9999_pre
 	# If slot == X.Y, then test with X.(Y-1).50
-	[[ $slot == live ]] || test=${slot%.*}.$((${slot#*.} - 1)).50
+	[[ $slot != live ]] && test=${slot%.*}.$((${slot#*.} - 1)).50
 	version_compare $1 ${test}
 	# 1 = '<', 2 = '=', 3 = '>'
-	[[ $? -ne 3 ]]
+	(( $? != 3 ))
 }
 
 # Internal function used for add_blocker and block_other_slots
@@ -474,11 +473,12 @@
 		else
 			atom="<=${pkg}-${!var}"
 		fi
-		# on -kdeprefix we block every slot
-		echo " !kdeprefix? ( !${atom}:${slot}[-kdeprefix] )"
-		# on kdeprefix we block only our slot
+		# we always block our own slot, ignoring kdeprefix
 		if [[ ${SLOT} == ${slot} ]]; then
-			echo " kdeprefix? ( !${atom}:${SLOT}[kdeprefix] )"
+			echo " !${atom}:${slot}"
+		else
+			# we only block other slots on -kdeprefix
+			echo " !kdeprefix? ( !${atom}:${slot}[-kdeprefix] )"
 		fi
 	done
 
@@ -514,6 +514,6 @@
 
 	local use=${2:+,${2}}
 
-	echo "!kdeprefix? ( >=kde-base/${1}-${PV}[-kdeprefix${use}] )"
-	echo "kdeprefix? ( >=kde-base/${1}-${PV}:${SLOT}[kdeprefix${use}] )"
+	echo " !kdeprefix? ( >=kde-base/${1}-${PV}[-kdeprefix${use}] )"
+	echo " kdeprefix? ( >=kde-base/${1}-${PV}:${SLOT}[kdeprefix${use}] )"
 }



1.28                 eclass/kde4-meta.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.27&r2=1.28

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kde4-meta.eclass	27 Oct 2009 14:16:49 -0000	1.27
+++ kde4-meta.eclass	1 Dec 2009 10:56:17 -0000	1.28
@@ -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.27 2009/10/27 14:16:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.28 2009/12/01 10:56:17 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -20,21 +20,13 @@
 	die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
 fi
 
-# Add khelpcenter dependency when installing handbooks
-if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
-	RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )"
-fi
-
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
 	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
 		COMMONDEPEND+=" >=kde-base/qimageblitz-0.0.4"
 		;;
 	kdepim|kdepim-runtime)
-		COMMONDEPEND+="
-			dev-libs/boost
-			$(add_kdebase_dep kdepimlibs)
-		"
+		COMMONDEPEND+="	$(add_kdebase_dep kdepimlibs)"
 		case ${PN} in
 			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
 				IUSE+=" +kontact"
@@ -222,8 +214,9 @@
 				postfix="bz2"
 				;;
 			4.3.[6-9]*)
-				KMTARPARAMS+=" --lzma" # lzma
-				postfix="lzma"
+				# Not passing --xz, as it doesn't work with stable tar
+				KMTARPARAMS+=" --use-compress-program=xz" # xz
+				postfix="xz"
 				;;
 			*)
 				KMTARPARAMS+=" --bzip2" # bz2
@@ -700,17 +693,10 @@
 
 # @FUNCTION: kde4-meta_pkg_postinst
 # @DESCRIPTION:
-# Display information about application handbook and invoke kbuildsycoca4.
+# Invoke kbuildsycoca4.
 kde4-meta_pkg_postinst() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if has handbook ${IUSE//+} && ! use handbook; then
-		echo
-		einfo "Application handbook for ${PN} has not been installed."
-		einfo "To install handbook, reemerge =${CATEGORY}/${PF} with 'handbook' USE flag."
-		echo
-	fi
-
 	kde4-base_pkg_postinst
 }