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

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/01/16 22:50:47

  Added:                kde4-base.eclass
  Log:
  Added kde4-base.eclass.

Revision  Changes    Path
1.1                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
# Copyright 2007-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.1 2008/01/16 22:50:46 ingmar Exp $

# @ECLASS: kde4-base.eclass
# @MAINTAINER:
# kde@gentoo.org
# @BLURB: This eclass provides functions for kde 4.0 ebuilds
# @DESCRIPTION:
# The kde4-base.eclass provides support for building KDE4 monolithic ebuilds
# and KDE4 applications.
#
# NOTE: This eclass uses the SLOT dependencies from EAPI="1" or compatible,
# hence you must define EAPI="1" in the ebuild, before inheriting any eclasses.

inherit base eutils multilib cmake-utils kde4-functions

EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm

COMMONDEPEND=">=x11-libs/qt-4.3.3:4"
DEPEND="${DEPEND} ${COMMONDEPEND}
	>=dev-util/cmake-2.4.7-r1
	dev-util/pkgconfig
	x11-libs/libXt
	x11-proto/xf86vidmodeproto"
RDEPEND="${RDEPEND} ${COMMONDEPEND}"

if has test ${IUSE//+}; then
	DEPEND="${DEPEND}
		test? ( dev-util/cppunit )"
fi

# @ECLASS-VARIABLE: NEED_KDE
# @DESCRIPTION:
# This variable sets the version of KDE4 which will be used by the eclass.
# This variable must be set by the ebuild, for all categories except for "kde-base".
# For kde-base packages, if it is not set by the ebuild,
# it's assumed that the required KDE4 version is the latest, non-live, available.
#
# @CODE
# Acceptable values are:
#	- latest - Use latest version in the portage tree
#		Default for kde-base ebuilds. Banned for ebuilds not part of kde or koffice.
#	- svn - Use svn release (live ebuilds)
#	- :SLOT - Use any version in the SLOT specified in the NEED_KDE value.
#	- VERSION_NUMBER - Use the minimum KDE4 version specified in the NEED_KDE value.
#	- VERSION_NUMBER:SLOT - Use the minimum KDE4 version and the SLOT specified in the NEED_KDE value.
#	- none - Let the ebuild handle SLOT, kde dependencies, KDEDIR, ...
# @CODE
#
# Note: There is no default NEED_KDE for ebuilds not in kde-base or part of
# koffice, so you must set it explicitly in the ebuild, in all other cases.
if [[ -z ${NEED_KDE} ]]; then
	if [[ -n ${KDEBASE} ]]; then
		NEED_KDE="latest"
	else
		die "kde4-base.eclass inherited but NEED_KDE not defined - broken ebuild"
	fi
fi
export NEED_KDE

case ${NEED_KDE} in
	latest)
		# Should only be used by 'kde-base'-ebuilds
		if [[ "${KDEBASE}" == "kde-base" ]]; then
			case ${PV} in
				3.9*)	_kdedir="3.9" ;;
				4*)		_kdedir="4.0" ;;
				*)		die "NEED_KDE=latest not supported for PV=${PV}" ;;
			esac
			_operator=">="
			_pv="-${PV}:kde-4"
		else
			_kdedir="4.0"
			_pv=":kde-4"
		fi
		;;
	svn|9999*|:kde-svn)
		_kdedir="svn"
		_pv=":kde-svn"
		export NEED_KDE="svn"
		;;
	*:kde-svn)
		_kdedir="svn"
		_operator=">="
		_pv="-${NEED_KDE}"
		export NEED_KDE="svn"
		;;
	# The ebuild handles dependencies, KDEDIR, SLOT.
	none)
		# This shouldn't be used for kde-base ebuilds.
		if [[ -n ${KDEBASE} ]]; then
			die 'Ebuilds part of kde-base ebuilds should not use NEED_KDE="none".'
		fi
		;;
	# NEED_KDE=":${SLOT}"
	:kde-4)
		_kdedir="4.0"
		_pv="${NEED_KDE}"
		;;
	# NEED_KDE="${PV}:${SLOT}"
	*:kde-4)
		_kdedir="4.0"
		_operator=">="
		_pv="-${NEED_KDE}"
		;;
	3.9*)
		_kdedir="3.9"
		_operator=">="
		_pv="-${NEED_KDE}:kde-4"
		;;
	4*)
		_kdedir="4.0"
		_operator=">="
		_pv="-${NEED_KDE}:kde-4"
		;;
	*)	die "NEED_KDE=${NEED_KDE} currently not supported."
		;;
esac

if [[ ${NEED_KDE} != none ]]; then
	KDEDIR="/usr/kde/${_kdedir}"
	KDEDIRS="/usr:/usr/local:${KDEDIR}"

	if [[ -n ${KDEBASE} ]]; then
		if [[ ${NEED_KDE} = svn ]]; then
			SLOT="kde-svn"
		else
			SLOT="kde-4"
		fi
	fi

	# We only need to add the dependencies if ${PN} is not "kdelibs" or "kdepimlibs"
	if [[ ${PN} != "kdelibs" ]]; then
		DEPEND="${DEPEND}
		${_operator}kde-base/kdelibs${_pv}"
		RDEPEND="${RDEPEND}
		${_operator}kde-base/kdelibs${_pv}"
		if [[ ${PN} != "kdepimlibs" ]]; then
			DEPEND="${DEPEND}
			${_operator}kde-base/kdepimlibs${_pv}"
			RDEPEND="${RDEPEND}
			${_operator}kde-base/kdepimlibs${_pv}"
		fi
	fi

	unset _operator _pv _kdedir
fi

# 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
if [[ -n ${KDEBASE} ]]; then
	if [[ -n ${KMNAME} ]]; then
		_kmname=${KMNAME}
	else
		_kmname=${PN}
	fi
	_kmname_pv="${_kmname}-${PV}"
	if [[ ${NEED_KDE} != "svn" ]]; then
		case ${KDEBASE} in
			kde-base)
			case ${PV} in
			*)	SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2";;
			esac
			;;
			koffice)
			SRC_URI="mirror://kde/unstable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2"
			;;
		esac
	fi
	unset _kmname _kmname_pv
fi

debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND ${DEPEND} - before blockers"

# Monolithic ebuilds should add blockers for split ebuilds in the same slot.
# If KMNAME is not set then this is not a split package
if [[ -n ${KDEBASE} && -z ${KMNAME} ]]; then
	for _x in $(get-child-packages ${CATEGORY}/${PN}); do
		DEPEND="${DEPEND} !${_x}:${SLOT}"
		RDEPEND="${RDEPEND} !${_x}:${SLOT}"
	done
	unset _x
fi

debug-print "${BASH_SOURCE} ${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND ${DEPEND} - after blockers"

# @ECLASS-VARIABLE: PREFIX
# @DESCRIPTION:
# Set the installation PREFIX. All kde-base ebuilds go into the KDE4 installation directory.
# Applications installed by the other ebuilds go into /usr/ by default, this value
# can be superseded by defining PREFIX before inheriting kde4-base.
if [[ -n ${KDEBASE} ]]; then
	PREFIX=${KDEDIR}
else
	# if PREFIX is not defined we set it to the default value of /usr
	PREFIX="${PREFIX:-/usr}"
fi

debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SLOT ${SLOT} - KDEDIR ${KDEDIR} - KDEDIRS ${KDEDIRS}- PREFIX ${PREFIX} - NEED_KDE ${NEED_KDE}"

# @FUNCTION: kde4-base_pkg_setup
# @DESCRIPTION:
# Adds flags needed by all of KDE 4 to $QT4_BUILT_WITH_USE_CHECK. Uses
# kde4-functions_check_use from kde4-functions.eclass to print appropriate
# errors and die if any required flags listed in $QT4_BUILT_WITH_USE_CHECK or
# $KDE4_BUILT_WITH_USE_CHECK are missing.
kde4-base_pkg_setup() {
	debug-print-function $FUNCNAME "$@"

	# KDE4 applications require qt4 compiled with USE="accessibility dbus jpeg png qt3support ssl zlib".
	QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} accessibility dbus jpeg png qt3support ssl zlib"

	if has debug ${IUSE//+} && use debug; then
		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} debug"
	fi

	if has opengl ${IUSE//+} && use opengl; then
		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
	fi

	kde4-functions_check_use
}

# @FUNCTION: kde4-base_src_unpack
# @DESCRIPTION:
# This function unpacks the source tarballs for KDE4 applications.
#
# If no argument is passed to this function, then standard src_unpack is
# executed. Otherwise options are passed to base_src_unpack.
#
# If the directory ${WORKDIR}/patches/ exists, we apply all patches in that
# directory, provided they follow this format:
# @CODE
# - Monolithic ebuilds, (from kde-base)
#		- $CATEGORY=kde-base:
#			Apply ${CHILD_EBUILD_NAME}-${SLOT}-*{diff,patch}
#		- $CATEGORY=!kde-base:
#			Apply ${CHILD_EBUILD_NAME}-${PV}-*{diff,patch}
# - Split ebuilds:
#		- $CATEGORY=kde-base:
#			Apply ${PN}-${SLOT}-*{diff,patch}
#		- $CATEGORY!=kde-base:
#			Apply ${PN}-${PV}-*{diff,patch}
# @CODE
#
# If ${PATCHES} is non-zero all patches in it gets applied.
kde4-base_src_unpack() {
	debug-print-function $FUNCNAME "$@"

	[[ -z "${KDE_S}" ]] && KDE_S="${S}"

	local _patchdir _packages _p
	_patchdir="${WORKDIR}/patches/"
	if [[ -z $* ]]; then
		# Unpack first and deal with KDE patches after examing possible patch sets.
		# To be picked up, patches need to conform to the guidelines stated before.
		# Monolithic ebuilds will use the split ebuild patches.
		[[ -d "${KDE_S}" ]] || unpack ${A}
		if [[ -d "${_patchdir}" ]]; then
			if is-parent-package ${CATEGORY}/${PN} ; then
				_packages="$(get-child-packages ${CATEGORY}/${PN})"
				_packages="${_packages//${CATEGORY}\//} ${PN}"
			else
				_packages="${PN}"
			fi
			for _p in ${_packages}; do
				PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null)"
				if [[ -n "${KDEBASE}" ]]; then
					PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)"
				fi
			done
		fi
		[[ -n ${PATCHES} ]] && base_src_unpack autopatch
	else
		# Call base_src_unpack, which unpacks and patches
		# step by step transparently as defined in the ebuild.
		base_src_unpack $*
	fi

	# Updated cmake dir
	if [[ -d "${WORKDIR}/cmake" ]] && [[ -d "${KDE_S}/cmake" ]]; then
		ebegin "Updating cmake/ directory..."
		rm -rf "${KDE_S}/cmake" || die "Unable to remove old cmake/ directory"
		ln -s "${WORKDIR}/cmake" "${KDE_S}/cmake" || die "Unable to symlink the new cmake/ directory"
	eend 0
	fi
}

# @FUNCTION: kde4-base_src_compile
# @DESCRIPTION:
# General function for compiling KDE4 applications.
kde4-base_src_compile() {
	debug-print-function ${FUNCNAME} "$@"

	kde4-base_src_configure
	kde4-base_src_make
}

# @FUNCTION: kde4-base_src_configure
# @DESCRIPTION:
# Function for configuring the build of KDE4 applications.
kde4-base_src_configure() {
	debug-print-function ${FUNCNAME} "$@"

	# Final flag handling
	if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then
		einfo "Activating enable-final flag"
		mycmakeargs="${mycmakeargs} -DKDE4_ENABLE_FINAL=ON"
	fi

	 # Enable generation of HTML handbook
	if has htmlhandbook ${IUSE//+} && use htmlhandbook; then
		einfo "Enabling building of HTML handbook"
		mycmakeargs="${mycmakeargs} -DKDE4_ENABLE_HTMLHANDBOOK=ON"
	fi

	# Build tests in src_test only, where we override this value
	mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=OFF"

	# Set distribution name
	[[ ${PN} == "kdelibs" ]] && mycmakeargs="${mycmakeargs} -DKDE_DISTRIBUTION_TEXT=Gentoo"

	# runpath linking
	mycmakeargs="${mycmakeargs} -DKDE4_USE_ALWAYS_FULL_RPATH=ON"

	# Here we set the install prefix
	mycmakeargs="${mycmakeargs} -DCMAKE_INSTALL_PREFIX=${PREFIX}"

	# Set environment
	QTEST_COLORED=1
	QT_PLUGIN_PATH=${KDEDIR}/$(get_libdir)/kde4/plugins/

	cmake-utils_src_configureout
}

# @FUNCTION: kde4-base_src_make
# @DESCRIPTION:
# Function for building KDE4 applications.
# Options are passed to cmake-utils_src_make.
kde4-base_src_make() {
	debug-print-function ${FUNCNAME} "$@"

	cmake-utils_src_make "$@"
}

# @FUNCTION: kde4-base_src_test
# @DESCRIPTION:
# Function for testing KDE4 applications.
kde4-base_src_test() {
	debug-print-function ${FUNCNAME} "$@"

	# Override this value, set in kde4-base_src_configure()
	mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=ON"
	cmake-utils_src_compile

	cmake-utils_src_test
}

# @FUNCTION: kde4-base_src_install
# @DESCRIPTION:
# Function for installing KDE4 applications.
kde4-base_src_install() {
	debug-print-function ${FUNCNAME} "$@"

	kde4-base_src_make_doc
	cmake-utils_src_install
}

# @FUNCTION: kde4-base_src_make_doc
# @DESCRIPTION:
# Function for installing the documentation of KDE4 applications.
kde4-base_src_make_doc() {
	debug-print-function ${FUNCNAME} "$@"

	local doc
	for doc in AUTHORS ChangeLog* README* NEWS TODO; do
		[[ -s $doc ]] && dodoc ${doc}
	done

	if [[ -z ${KMNAME} ]]; then
		for doc in {apps,runtime,workspace,.}/*/{AUTHORS,README*}; do
			if [[ -s $doc ]]; then
				local doc_complete=${doc}
				doc="${doc#*/}"
				newdoc "$doc_complete" "${doc%/*}.${doc##*/}"
			fi
		done
	fi

	if [[ -n ${KDEBASE} && -d "${D}"/usr/share/doc/${PF} ]]; then
		# work around bug #97196
		dodir /usr/share/doc/kde && \
			mv "${D}"/usr/share/doc/${PF} "${D}"/usr/share/doc/kde/ || \
			die "Failed to move docs to kde/ failed."
	fi
}

# @FUNCTION: kde4-base_pkg_postinst
# @DESCRIPTION:
# Function to rebuild the KDE System Configuration Cache after an application has been installed.
kde4-base_pkg_postinst() {
	buildsycoca
}

# @FUNCTION: kde4-base_pkg_postrm
# @DESCRIPTION:
# Function to rebuild the KDE System Configuration Cache after an application has been removed.
kde4-base_pkg_postrm() {
	buildsycoca
}



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/01/18 02:37:09

  Modified:             kde4-base.eclass
  Log:
  Added gif to required x11-libs/qt:4 USE flags for KDE 4.

Revision  Changes    Path
1.2                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde4-base.eclass	16 Jan 2008 22:50:46 -0000	1.1
+++ kde4-base.eclass	18 Jan 2008 02:37:08 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.1 2008/01/16 22:50:46 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.2 2008/01/18 02:37:08 ingmar Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -209,8 +209,8 @@
 kde4-base_pkg_setup() {
 	debug-print-function $FUNCNAME "$@"
 
-	# KDE4 applications require qt4 compiled with USE="accessibility dbus jpeg png qt3support ssl zlib".
-	QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} accessibility dbus jpeg png qt3support ssl zlib"
+	# KDE4 applications require qt4 compiled with USE="accessibility dbus gif jpeg png qt3support ssl zlib".
+	QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} accessibility dbus gif jpeg png qt3support ssl zlib"
 
 	if has debug ${IUSE//+} && use debug; then
 		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} debug"



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/02/18 17:00:32

  Modified:             kde4-base.eclass
  Log:
  kde4-base.eclass: No reason why NEED_KDE=none should be fatal for kde-base ebuilds.

Revision  Changes    Path
1.3                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4-base.eclass	18 Jan 2008 02:37:08 -0000	1.2
+++ kde4-base.eclass	18 Feb 2008 17:00:32 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.2 2008/01/18 02:37:08 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.3 2008/02/18 17:00:32 ingmar Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -88,10 +88,7 @@
 		;;
 	# The ebuild handles dependencies, KDEDIR, SLOT.
 	none)
-		# This shouldn't be used for kde-base ebuilds.
-		if [[ -n ${KDEBASE} ]]; then
-			die 'Ebuilds part of kde-base ebuilds should not use NEED_KDE="none".'
-		fi
+		:
 		;;
 	# NEED_KDE=":${SLOT}"
 	:kde-4)



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Bo Oersted Andresen (zlin)]

zlin        08/03/10 21:41:56

  Modified:             kde4-base.eclass
  Log:
  Add support for split qt-4.4. Add {CPPUNIT,OPENGL}_REQUIRED. Split out kde4-base_apply_patches().

Revision  Changes    Path
1.4                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde4-base.eclass	18 Feb 2008 17:00:32 -0000	1.3
+++ kde4-base.eclass	10 Mar 2008 21:41:56 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.3 2008/02/18 17:00:32 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.4 2008/03/10 21:41:56 zlin Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -17,7 +17,37 @@
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
 
-COMMONDEPEND=">=x11-libs/qt-4.3.3:4"
+COMMONDEPEND="|| ( (
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-test:4 )
+	>=x11-libs/qt-4.3.3:4 )"
+
+# @ECLASS-VARIABLE: OPENGL_REQUIRED
+# @DESCRIPTION:
+# Is qt-opengl required? Possible values are 'always', 'optional' and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 'never'.
+OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
+
+OPENGLDEPEND="|| ( x11-libs/qt-opengl:4
+	>=x11-libs/qt-4.3.3:4 )"
+case "${OPENGL_REQUIRED}" in
+	always)
+	COMMONDEPEND="${COMMONDEPEND}
+		${OPENGLDEPEND}"
+	;;
+	optional)
+	IUSE="${IUSE} opengl"
+	COMMONDEPEND="${COMMONDEPEND}
+		opengl? ( ${OPENGLDEPEND} )"
+	;;
+	*)
+	OPENGL_REQUIRED="never"
+	;;
+esac
+
 DEPEND="${DEPEND} ${COMMONDEPEND}
 	>=dev-util/cmake-2.4.7-r1
 	dev-util/pkgconfig
@@ -25,10 +55,25 @@
 	x11-proto/xf86vidmodeproto"
 RDEPEND="${RDEPEND} ${COMMONDEPEND}"
 
-if has test ${IUSE//+}; then
+# @ECLASS-VARIABLE: CPPUNIT_REQUIRED
+# @DESCRIPTION:
+# Is cppunit required for tests? Possible values are 'always', 'optional' and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 'never'.
+CPPUNIT_REQUIRED="${CPPUNIT_REQUIRED:-never}"
+
+case "${CPPUNIT_REQUIRED}" in
+	always)
+	DEPEND="${DEPEND} dev-util/cppunit"
+	;;
+	optional)
+	IUSE="${IUSE} test"
 	DEPEND="${DEPEND}
 		test? ( dev-util/cppunit )"
-fi
+	;;
+	*)
+	CPPUNIT_REQUIRED="never"
+	;;
+esac
 
 # @ECLASS-VARIABLE: NEED_KDE
 # @DESCRIPTION:
@@ -207,25 +252,44 @@
 	debug-print-function $FUNCNAME "$@"
 
 	# KDE4 applications require qt4 compiled with USE="accessibility dbus gif jpeg png qt3support ssl zlib".
-	QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} accessibility dbus gif jpeg png qt3support ssl zlib"
+	if has_version '<x11-libs/qt-4.4_alpha:4'; then
+		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} accessibility dbus gif jpeg png qt3support ssl zlib"
+	else
+		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+			x11-libs/qt-core qt3support ssl
+			x11-libs/qt-gui accessibility dbus
+			x11-libs/qt-qt3support accessibility"
+	fi
 
 	if has debug ${IUSE//+} && use debug; then
-		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} debug"
+		if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
+			QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} debug"
+		else
+			KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+				x11-libs/qt-core:4 debug
+				x11-libs/qt-gui:4 debug
+				x11-libs/qt-qt3support:4 debug
+				x11-libs/qt-svg:4 debug
+				x11-libs/qt-test:4 debug"
+			if [[ ${OPENGL_REQUIRED} == always ]] || has opengl ${IUSE//+} && use opengl; then
+				KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+					x11-libs/qt-opengl:4 debug"
+			fi
+		fi
 	fi
 
-	if has opengl ${IUSE//+} && use opengl; then
-		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
+	if [[ ${OPENGL_REQUIRED} == always ]] || has opengl ${IUSE//+} && use opengl; then
+		if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
+			QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
+		fi
 	fi
 
 	kde4-functions_check_use
 }
 
-# @FUNCTION: kde4-base_src_unpack
+# @FUNCTION: kde4-base_apply_patches
 # @DESCRIPTION:
-# This function unpacks the source tarballs for KDE4 applications.
-#
-# If no argument is passed to this function, then standard src_unpack is
-# executed. Otherwise options are passed to base_src_unpack.
+# This function applies patches.
 #
 # If the directory ${WORKDIR}/patches/ exists, we apply all patches in that
 # directory, provided they follow this format:
@@ -243,33 +307,46 @@
 # @CODE
 #
 # If ${PATCHES} is non-zero all patches in it gets applied.
+kde4-base_apply_patches() {
+	local _patchdir _packages _p
+	_patchdir="${WORKDIR}/patches/"
+	if [[ -d "${_patchdir}" ]]; then
+		if is-parent-package ${CATEGORY}/${PN} ; then
+			_packages="$(get-child-packages ${CATEGORY}/${PN})"
+			_packages="${_packages//${CATEGORY}\//} ${PN}"
+		else
+			_packages="${PN}"
+		fi
+		for _p in ${_packages}; do
+			PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null)"
+			if [[ -n "${KDEBASE}" ]]; then
+				PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)"
+			fi
+		done
+	fi
+	[[ -n ${PATCHES} ]] && base_src_unpack autopatch
+}
+
+# @FUNCTION: kde4-base_src_unpack
+# @DESCRIPTION:
+# This function unpacks the source tarballs for KDE4 applications.
+#
+# If no argument is passed to this function, then standard src_unpack is
+# executed. Otherwise options are passed to base_src_unpack.
+#
+# In addition it calls kde4-base_apply_patches when no arguments are passed to
+# this function.
 kde4-base_src_unpack() {
 	debug-print-function $FUNCNAME "$@"
 
 	[[ -z "${KDE_S}" ]] && KDE_S="${S}"
 
-	local _patchdir _packages _p
-	_patchdir="${WORKDIR}/patches/"
 	if [[ -z $* ]]; then
 		# Unpack first and deal with KDE patches after examing possible patch sets.
 		# To be picked up, patches need to conform to the guidelines stated before.
 		# Monolithic ebuilds will use the split ebuild patches.
 		[[ -d "${KDE_S}" ]] || unpack ${A}
-		if [[ -d "${_patchdir}" ]]; then
-			if is-parent-package ${CATEGORY}/${PN} ; then
-				_packages="$(get-child-packages ${CATEGORY}/${PN})"
-				_packages="${_packages//${CATEGORY}\//} ${PN}"
-			else
-				_packages="${PN}"
-			fi
-			for _p in ${_packages}; do
-				PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null)"
-				if [[ -n "${KDEBASE}" ]]; then
-					PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)"
-				fi
-			done
-		fi
-		[[ -n ${PATCHES} ]] && base_src_unpack autopatch
+		kde4-base_apply_patches
 	else
 		# Call base_src_unpack, which unpacks and patches
 		# step by step transparently as defined in the ebuild.



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/03/14 15:51:51

  Modified:             kde4-base.eclass
  Log:
  s/einfo/echo/

Revision  Changes    Path
1.5                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kde4-base.eclass	10 Mar 2008 21:41:56 -0000	1.4
+++ kde4-base.eclass	14 Mar 2008 15:51:50 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.4 2008/03/10 21:41:56 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.5 2008/03/14 15:51:50 ingmar Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -380,13 +380,13 @@
 
 	# Final flag handling
 	if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then
-		einfo "Activating enable-final flag"
+		echo "Activating enable-final flag"
 		mycmakeargs="${mycmakeargs} -DKDE4_ENABLE_FINAL=ON"
 	fi
 
 	 # Enable generation of HTML handbook
 	if has htmlhandbook ${IUSE//+} && use htmlhandbook; then
-		einfo "Enabling building of HTML handbook"
+		echo "Enabling building of HTML handbook"
 		mycmakeargs="${mycmakeargs} -DKDE4_ENABLE_HTMLHANDBOOK=ON"
 	fi
 



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Bo Oersted Andresen (zlin)]

zlin        08/03/26 20:39:05

  Modified:             kde4-base.eclass
  Log:
  Don't run `use opengl` when OPENGL_REQUIRED is set to always (bug #214960).

Revision  Changes    Path
1.6                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde4-base.eclass	14 Mar 2008 15:51:50 -0000	1.5
+++ kde4-base.eclass	26 Mar 2008 20:39:05 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.5 2008/03/14 15:51:50 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.6 2008/03/26 20:39:05 zlin Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -271,14 +271,14 @@
 				x11-libs/qt-qt3support:4 debug
 				x11-libs/qt-svg:4 debug
 				x11-libs/qt-test:4 debug"
-			if [[ ${OPENGL_REQUIRED} == always ]] || has opengl ${IUSE//+} && use opengl; then
+			if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
 				KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
 					x11-libs/qt-opengl:4 debug"
 			fi
 		fi
 	fi
 
-	if [[ ${OPENGL_REQUIRED} == always ]] || has opengl ${IUSE//+} && use opengl; then
+	if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
 		if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
 			QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
 		fi



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Wulf Krueger (philantrop)]

philantrop    08/04/03 18:12:49

  Modified:             kde4-base.eclass
  Log:
  Added support for EAPI=kdebuild-1. Hard depend on qt-4.4.x when PV >= 4.1.

Revision  Changes    Path
1.7                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kde4-base.eclass	26 Mar 2008 20:39:05 -0000	1.6
+++ kde4-base.eclass	3 Apr 2008 18:12:48 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.6 2008/03/26 20:39:05 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.7 2008/04/03 18:12:48 philantrop Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -17,36 +17,67 @@
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm
 
-COMMONDEPEND="|| ( (
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-qt3support:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-test:4 )
-	>=x11-libs/qt-4.3.3:4 )"
+kde4-base_set_qt_dependencies() {
+	local qt qtcore qtgui qt3support qtsvg qttest qtopengl qtdepend qtopengldepend
 
-# @ECLASS-VARIABLE: OPENGL_REQUIRED
-# @DESCRIPTION:
-# Is qt-opengl required? Possible values are 'always', 'optional' and 'never'.
-# This variable must be set before inheriting any eclasses. Defaults to 'never'.
-OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
+	# use dependencies
+	case "${EAPI}" in
+		kdebuild-1)
+		qt="[accessibility][dbus][debug?][gif][jpeg][png][qt3support][ssl][zlib]"
+		qtcore="[debug?][qt3support][ssl]"
+		qtgui="[accessibility][dbus][debug?]"
+		qt3support="[accessibility][debug?]"
+		qtsvg="[debug?]"
+		qttest="[debug?]"
+		qtopengl="[debug?]"
+		case "${OPENGL_REQUIRED}" in
+			always)
+			qt="${qt}[opengl]"
+			;;
+			optional)
+			qt="${qt}[opengl?]"
+			;;
+		esac
+		;;
+	esac
 
-OPENGLDEPEND="|| ( x11-libs/qt-opengl:4
-	>=x11-libs/qt-4.3.3:4 )"
-case "${OPENGL_REQUIRED}" in
-	always)
-	COMMONDEPEND="${COMMONDEPEND}
-		${OPENGLDEPEND}"
-	;;
-	optional)
-	IUSE="${IUSE} opengl"
-	COMMONDEPEND="${COMMONDEPEND}
-		opengl? ( ${OPENGLDEPEND} )"
-	;;
-	*)
-	OPENGL_REQUIRED="never"
-	;;
-esac
+	# split qt
+	qtdepend="
+		x11-libs/qt-core:4${qtcore}
+		x11-libs/qt-gui:4${qtgui}
+		x11-libs/qt-qt3support:4${qt3support}
+		x11-libs/qt-svg:4${qtsvg}
+		x11-libs/qt-test:4${qttest}"
+	qtopengldepend="x11-libs/qt-opengl:4${qtopengl}"
+
+	# allow monolithic qt for PV < 4.1
+	case "${PV}" in
+		scm|9999.4|4.1*) : ;;
+		*)
+		qtdepend="|| ( ( ${qtdepend} ) >=x11-libs/qt-4.3.3:4${qt} )"
+		qtopengldepend="|| ( ${qtopengldepend} >=x11-libs/qt-4.3.3:4 )"
+		;;
+	esac
+
+	# opengl dependencies
+	case "${OPENGL_REQUIRED}" in
+		always)
+		qtdepend="${qtdepend}
+			${qtopengldepend}"
+		;;
+		optional)
+		IUSE="${IUSE} opengl"
+		qtdepend="${qtdepend}
+			opengl? ( ${qtopengldepend} )"
+		;;
+		*)
+		OPENGL_REQUIRED="never"
+		;;
+	esac
+
+	COMMONDEPEND="${COMMONDEPEND} ${qtdepend}"
+}
+kde4-base_set_qt_dependencies
 
 DEPEND="${DEPEND} ${COMMONDEPEND}
 	>=dev-util/cmake-2.4.7-r1
@@ -55,6 +86,12 @@
 	x11-proto/xf86vidmodeproto"
 RDEPEND="${RDEPEND} ${COMMONDEPEND}"
 
+# @ECLASS-VARIABLE: OPENGL_REQUIRED
+# @DESCRIPTION:
+# Is qt-opengl required? Possible values are 'always', 'optional' and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 'never'.
+OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
+
 # @ECLASS-VARIABLE: CPPUNIT_REQUIRED
 # @DESCRIPTION:
 # Is cppunit required for tests? Possible values are 'always', 'optional' and 'never'.
@@ -120,7 +157,7 @@
 			_pv=":kde-4"
 		fi
 		;;
-	svn|9999*|:kde-svn)
+	scm|svn|9999*|:kde-svn)
 		_kdedir="svn"
 		_pv=":kde-svn"
 		export NEED_KDE="svn"
@@ -251,40 +288,47 @@
 kde4-base_pkg_setup() {
 	debug-print-function $FUNCNAME "$@"
 
-	# KDE4 applications require qt4 compiled with USE="accessibility dbus gif jpeg png qt3support ssl zlib".
-	if has_version '<x11-libs/qt-4.4_alpha:4'; then
-		QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} accessibility dbus gif jpeg png qt3support ssl zlib"
-	else
-		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-			x11-libs/qt-core qt3support ssl
-			x11-libs/qt-gui accessibility dbus
-			x11-libs/qt-qt3support accessibility"
-	fi
-
-	if has debug ${IUSE//+} && use debug; then
-		if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
-			QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} debug"
+	case "${EAPI}" in
+		kdebuild-1)
+		[[ -n ${QT4_BUILT_WITH_USE_CHECK} || -n ${KDE4_BUILT_WITH_USE_CHECK} ]] && \
+			die "built_with_use illegal in this EAPI!"
+		;;
+		*)
+		# KDE4 applications require qt4 compiled with USE="accessibility dbus gif jpeg png qt3support ssl zlib".
+		if has_version '<x11-libs/qt-4.4_alpha:4'; then
+			QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} accessibility dbus gif jpeg png qt3support ssl zlib"
 		else
 			KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-				x11-libs/qt-core:4 debug
-				x11-libs/qt-gui:4 debug
-				x11-libs/qt-qt3support:4 debug
-				x11-libs/qt-svg:4 debug
-				x11-libs/qt-test:4 debug"
-			if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
+				x11-libs/qt-core qt3support ssl
+				x11-libs/qt-gui accessibility dbus
+				x11-libs/qt-qt3support accessibility"
+		fi
+
+		if has debug ${IUSE//+} && use debug; then
+			if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
+				QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} debug"
+			else
 				KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-					x11-libs/qt-opengl:4 debug"
+					x11-libs/qt-core:4 debug
+					x11-libs/qt-gui:4 debug
+					x11-libs/qt-qt3support:4 debug
+					x11-libs/qt-svg:4 debug
+					x11-libs/qt-test:4 debug"
+				if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
+					KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+						x11-libs/qt-opengl:4 debug"
+				fi
 			fi
 		fi
-	fi
 
-	if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
-		if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
-			QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
+		if has opengl ${IUSE//+} && use opengl || [[ ${OPENGL_REQUIRED} == always ]]; then
+			if has_version '<x11-libs/qt-4.4.0_alpha:4'; then
+				QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
+			fi
 		fi
-	fi
-
-	kde4-functions_check_use
+		kde4-functions_check_use
+		;;
+	esac
 }
 
 # @FUNCTION: kde4-base_apply_patches
@@ -358,7 +402,7 @@
 		ebegin "Updating cmake/ directory..."
 		rm -rf "${KDE_S}/cmake" || die "Unable to remove old cmake/ directory"
 		ln -s "${WORKDIR}/cmake" "${KDE_S}/cmake" || die "Unable to symlink the new cmake/ directory"
-	eend 0
+		eend 0
 	fi
 }
 



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Bo Oersted Andresen (zlin)]

zlin        08/04/06 21:36:53

  Modified:             kde4-base.eclass
  Log:
  Use an array for PATCHES on the eclass level regardless if the ebuild explicitly specifies two or more patches or not.

Revision  Changes    Path
1.9                  eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kde4-base.eclass	4 Apr 2008 22:15:24 -0000	1.8
+++ kde4-base.eclass	6 Apr 2008 21:36:53 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.8 2008/04/04 22:15:24 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.9 2008/04/06 21:36:53 zlin Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -371,9 +371,9 @@
 			done
 		else
 			for _p in ${_packages}; do
-				PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null)"
+				PATCHES=(${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null))
 				if [[ -n "${KDEBASE}" ]]; then
-					PATCHES="${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)"
+					PATCHES=(${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null))
 				fi
 			done
 		fi



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Bo Oersted Andresen (zlin)]

zlin        08/04/14 13:23:15

  Modified:             kde4-base.eclass
  Log:
  Improved PATCHES array handling.

Revision  Changes    Path
1.10                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kde4-base.eclass	6 Apr 2008 21:36:53 -0000	1.9
+++ kde4-base.eclass	14 Apr 2008 13:23:14 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.9 2008/04/06 21:36:53 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.10 2008/04/14 13:23:14 zlin Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -353,7 +353,7 @@
 # If ${PATCHES} is non-zero all patches in it get applied. If there is more
 # than one patch please make ${PATCHES} an array for proper quoting.
 kde4-base_apply_patches() {
-	local _patchdir _packages _p
+	local _patchdir _packages _p _f
 	_patchdir="${WORKDIR}/patches/"
 	if [[ -d "${_patchdir}" ]]; then
 		if is-parent-package ${CATEGORY}/${PN} ; then
@@ -362,21 +362,19 @@
 		else
 			_packages="${PN}"
 		fi
-		if [[ ${#PATCHES[@]} -gt 1 ]]; then
-			for _p in ${_packages}; do
-				PATCHES=( "${PATCHES[@]}" $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null) )
-				if [[ -n "${KDEBASE}" ]]; then
-					PATCHES=( "${PATCHES[@]}" $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null) )
-				fi
-			done
-		else
-			for _p in ${_packages}; do
-				PATCHES=(${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null))
-				if [[ -n "${KDEBASE}" ]]; then
-					PATCHES=(${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null))
-				fi
-			done
+		if [[ $(declare -p PATCHES) != 'declare -a '* ]]; then
+			PATCHES=(${PATCHES})
 		fi
+		for _p in ${_packages}; do
+			for _f in "${_patchdir}"/${_p}-${PV}-*{diff,patch}; do
+				[[ -e ${_f} ]] && PATCHES+=("${_f}")
+			done
+			if [[ -n "${KDEBASE}" ]]; then
+				for _f in "${_patchdir}"/${_p}-${SLOT}-*{diff,patch}; do
+					[[ -e ${_f} ]] && PATCHES+=("${_f}")
+				done
+			fi
+		done
 	fi
 	[[ -n ${PATCHES[@]} ]] && base_src_unpack autopatch
 }



-- 
gentoo-commits@lists.gentoo.org mailing list

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/10/04 14:51:02

  Modified:             kde4-base.eclass
  Log:
  Added automoc to the kde4-base eclass DEPEND list.
  Fixes bug #239526. Thanks to Andreas Eckstein for the reporting.

Revision  Changes    Path
1.14                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kde4-base.eclass	2 Oct 2008 06:49:02 -0000	1.13
+++ kde4-base.eclass	4 Oct 2008 14:51:02 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.13 2008/10/02 06:49:02 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.14 2008/10/04 14:51:02 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -101,6 +101,7 @@
 # Set the common dependencies
 DEPEND="${DEPEND} ${COMMONDEPEND} ${CMAKEDEPEND}
 	dev-util/pkgconfig
+	kde-base/automoc
 	x11-libs/libXt
 	x11-proto/xf86vidmodeproto"
 RDEPEND="${RDEPEND} ${COMMONDEPEND}"

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/10/11 03:05:37

  Modified:             kde4-base.eclass
  Log:
  As we moved KDEDIR setting to pkg_setup, we can't set PREFIX to it in global scope.
  Furthermore, now that we have kdeprefix, set PREFIX to KDEDIR in pkg_setup and so make
  the install location dependent on kdeprefix for all packages that inherit kde4-base.

Revision  Changes    Path
1.15                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kde4-base.eclass	4 Oct 2008 14:51:02 -0000	1.14
+++ kde4-base.eclass	11 Oct 2008 03:05:37 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.14 2008/10/04 14:51:02 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.15 2008/10/11 03:05:37 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -388,13 +388,10 @@
 				;;
 		esac
 	fi
-	
-	if [[ -n ${KDEBASE} ]]; then
-		PREFIX=${KDEDIR}
-	else
-		# if PREFIX is not defined we set it to the default value of /usr
-		PREFIX="${PREFIX:-/usr}"
-	fi
+
+	# Set the prefix based on KDEDIR
+	# Make it a consequence of kdeprefix
+	PREFIX=${KDEDIR}
 
 	unset _kdedir
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    08/11/09 22:52:59

  Modified:             kde4-base.eclass
  Log:
  Fix kde4-base.eclass so it works with updated kde-base.eclass.

Revision  Changes    Path
1.16                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kde4-base.eclass	11 Oct 2008 03:05:37 -0000	1.15
+++ kde4-base.eclass	9 Nov 2008 22:52:59 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.15 2008/10/11 03:05:37 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.16 2008/11/09 22:52:59 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -501,7 +501,7 @@
 		# To be picked up, patches need to conform to the guidelines stated before.
 		# Monolithic ebuilds will use the split ebuild patches.
 		[[ -d "${KDE_S}" ]] || unpack ${A}
-		kde4-base_apply_patches
+		base_src_unpack $*
 	else
 		# Call base_src_unpack, which unpacks and patches
 		# step by step transparently as defined in the ebuild.

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/11/21 17:06:03

  Modified:             kde4-base.eclass
  Log:
  Added a block to x11-libs/qt-phonon.

Revision  Changes    Path
1.17                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kde4-base.eclass	9 Nov 2008 22:52:59 -0000	1.16
+++ kde4-base.eclass	21 Nov 2008 17:06:03 -0000	1.17
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.16 2008/11/09 22:52:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.17 2008/11/21 17:06:03 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -51,6 +51,7 @@
 
 	# split qt
 	qtdepend="
+		!x11-libs/qt-phonon
 		x11-libs/qt-core:4${qtcore}
 		x11-libs/qt-gui:4${qtgui}
 		x11-libs/qt-qt3support:4${qt3support}

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/11/22 01:23:32

  Modified:             kde4-base.eclass
  Log:
  Updated x11-libs/qt-phonon block to avoid a qt downgrade.

Revision  Changes    Path
1.18                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kde4-base.eclass	21 Nov 2008 17:06:03 -0000	1.17
+++ kde4-base.eclass	22 Nov 2008 01:23:31 -0000	1.18
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.17 2008/11/21 17:06:03 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.18 2008/11/22 01:23:31 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -51,7 +51,6 @@
 
 	# split qt
 	qtdepend="
-		!x11-libs/qt-phonon
 		x11-libs/qt-core:4${qtcore}
 		x11-libs/qt-gui:4${qtgui}
 		x11-libs/qt-qt3support:4${qt3support}
@@ -85,7 +84,7 @@
 		;;
 	esac
 
-	COMMONDEPEND="${COMMONDEPEND} ${qtdepend}"
+	COMMONDEPEND="${COMMONDEPEND} ${qtdepend} !x11-libs/qt-phonon"
 }
 kde4-base_set_qt_dependencies
 

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/12/07 11:39:32

  Modified:             kde4-base.eclass
  Log:
  Added kdebase-data to the eclass deps.

Revision  Changes    Path
1.19                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kde4-base.eclass	22 Nov 2008 01:23:31 -0000	1.18
+++ kde4-base.eclass	7 Dec 2008 11:39:32 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.18 2008/11/22 01:23:31 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.19 2008/12/07 11:39:32 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -291,6 +291,7 @@
 			;;
 	esac
 
+	# Adding kdelibs, kdepimlibs and kdebase-data deps to all other packages.
 	# We only need to add the dependencies if ${PN} is not "kdelibs" or "kdepimlibs"
 	if [[ ${PN} != "kdelibs" ]]; then
 		case "${EAPI}" in
@@ -312,7 +313,17 @@
 				*)
 					DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
 					RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
+			esac
+			if [[ ${PN} != "kdebase-data" ]]; then
+				case "${EAPI}" in
+					2)
+						RDEPEND="${RDEPEND} ${_operator}kde-base/kdebase-data${_pv}[kdeprefix=]"
+						;;
+					*)
+						RDEPEND="${RDEPEND} ${_operator}kde-base/kdebase-data${_pv}"
+						;;
 				esac
+			fi
 		fi
 	fi
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/01/06 10:55:41

  Modified:             kde4-base.eclass
  Log:
  Fix autopatch breakage i introduced with last addition to eclass. I am humbly sorry.

Revision  Changes    Path
1.21                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kde4-base.eclass	3 Jan 2009 18:20:00 -0000	1.20
+++ kde4-base.eclass	6 Jan 2009 10:55:41 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.20 2009/01/03 18:20:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.21 2009/01/06 10:55:41 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -536,7 +536,7 @@
 
 # transition function so we will be compatible with soon to come eclasses
 kde4-base_src_prepare() {
-	echo
+	base_src_prepare
 }
 
 # @FUNCTION: kde4-base_src_compile

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

[Alexey Shvetsov (alexxy)]

alexxy      09/01/18 15:12:01

  Modified:             kde4-base.eclass
  Log:
  Force exporting PKG_CONFIG dirs for building kde apps

Revision  Changes    Path
1.24                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kde4-base.eclass	12 Jan 2009 19:40:34 -0000	1.23
+++ kde4-base.eclass	18 Jan 2009 15:12:01 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.23 2009/01/12 19:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.24 2009/01/18 15:12:01 alexxy Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -552,7 +552,7 @@
 	QT_PLUGIN_PATH=${KDEDIR}/$(get_libdir)/kde4/plugins/
 
 	# hardcode path to *.cmake KDE files
-	PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}${KDEDIR}/$(get_libdir)/pkgconfig"
+	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}${KDEDIR}/$(get_libdir)/pkgconfig"
 
 	# additonal arguments for KOFFICE
 	if [[ $KMNAME = koffice ]]; then

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    09/01/24 23:24:13

  Modified:             kde4-base.eclass
  Log:
  Fixed KMMODULE not to add a / at the end. Thanks to ABCD for calling our attention.

Revision  Changes    Path
1.25                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kde4-base.eclass	18 Jan 2009 15:12:01 -0000	1.24
+++ kde4-base.eclass	24 Jan 2009 23:24:13 -0000	1.25
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.24 2009/01/18 15:12:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.25 2009/01/24 23:24:13 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -331,7 +331,7 @@
 		if [[ -n $KMNAME ]]; then
 		    ESVN_PROJECT="${KMNAME}"
 			if [[ -z ${KMNOMODULE} && -z ${KMMODULE} ]]; then
-				KMMODULE="${PN}/"
+				KMMODULE="${PN}"
 			fi
 			# Split kde-base/ ebuilds: (they reside in trunk/KDE)
 			case ${KMNAME} in
@@ -339,7 +339,7 @@
 					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/KDE/kdebase/${KMNAME#kdebase-}/"
 					;;
 				kdereview)
-					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
+					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}/"
 					;;
 				kde*)
 					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/KDE/${KMNAME}"
@@ -347,11 +347,11 @@
 				extragear*|playground*)
 					case ${PN} in
 						*-plasma)
-							ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
-							ESVN_PROJECT="${KMNAME}/${KMMODULE}"
+							ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}/"
+							ESVN_PROJECT="${KMNAME}/${KMMODULE}/"
 							;;
 						*)
-							ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
+							ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}/"
 							;;
 					esac
 				;;

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

[Ben de Groot (yngwin)]

yngwin      09/01/31 14:00:22

  Modified:             kde4-base.eclass
  Log:
  Remove qt-phonon block from kde4-base.eclass

Revision  Changes    Path
1.26                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kde4-base.eclass	24 Jan 2009 23:24:13 -0000	1.25
+++ kde4-base.eclass	31 Jan 2009 14:00:22 -0000	1.26
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.25 2009/01/24 23:24:13 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.26 2009/01/31 14:00:22 yngwin Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -55,7 +55,7 @@
 			;;
 	esac
 
-	COMMONDEPEND="${COMMONDEPEND} ${qtdepend} !x11-libs/qt-phonon"
+	COMMONDEPEND="${COMMONDEPEND} ${qtdepend}"
 }
 kde4-base_set_qt_dependencies
 

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

[Patrick Lauer (patrick)]

patrick     09/01/31 21:31:35

  Modified:             kde4-base.eclass
  Log:
  Fixes for 4.3 snapshot series.

Revision  Changes    Path
1.27                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kde4-base.eclass	31 Jan 2009 14:00:22 -0000	1.26
+++ kde4-base.eclass	31 Jan 2009 21:31:35 -0000	1.27
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.26 2009/01/31 14:00:22 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.27 2009/01/31 21:31:35 patrick Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -166,6 +166,11 @@
 	latest)
 		if [[ $KDEBASE = kde-base ]]; then
 			case ${PV} in
+				4.2.6*)
+                                        _kdedir="4.3"
+                                        _pv="-${PV}:4.3"
+                                        _pvn="-${PV}"
+                                         ;;
 				4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*)
 					_kdedir="4.2"
 					_pv="-${PV}:4.2"
@@ -211,6 +216,12 @@
 		_pvn="-${NEED_KDE}"
 		export NEED_KDE="live"
 		;;
+	4.2.6*)
+                _kdedir="4.3"
+                _pv="-${NEED_KDE}:4.3"
+                _pvn="-${NEED_KDE}"
+                _operator=">="
+                ;;
 	4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*)
 		_kdedir="4.2"
 		_pv="-${NEED_KDE}:4.2"
@@ -383,6 +394,10 @@
 			case ${KDEBASE} in
 				kde-base)
 					case ${PV} in
+						4.2.60)
+							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.svn912032tar.bz2" ;;
+						4.2.61)
+							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.svn917530.tar.bz2" ;;
 						4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* | 4.0.9* | 4.0.8*)
 							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
 						*)	SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/02/02 21:35:08

  Modified:             kde4-base.eclass
  Log:
  Fix spaces with tabs.

Revision  Changes    Path
1.28                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kde4-base.eclass	31 Jan 2009 21:31:35 -0000	1.27
+++ kde4-base.eclass	2 Feb 2009 21:35:08 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.27 2009/01/31 21:31:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.28 2009/02/02 21:35:08 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -167,10 +167,10 @@
 		if [[ $KDEBASE = kde-base ]]; then
 			case ${PV} in
 				4.2.6*)
-                                        _kdedir="4.3"
-                                        _pv="-${PV}:4.3"
-                                        _pvn="-${PV}"
-                                         ;;
+					_kdedir="4.3"
+					_pv="-${PV}:4.3"
+					_pvn="-${PV}"
+					;;
 				4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*)
 					_kdedir="4.2"
 					_pv="-${PV}:4.2"
@@ -217,11 +217,11 @@
 		export NEED_KDE="live"
 		;;
 	4.2.6*)
-                _kdedir="4.3"
-                _pv="-${NEED_KDE}:4.3"
-                _pvn="-${NEED_KDE}"
-                _operator=">="
-                ;;
+		_kdedir="4.3"
+		_pv="-${NEED_KDE}:4.3"
+		_pvn="-${NEED_KDE}"
+		_operator=">="
+		;;
 	4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*)
 		_kdedir="4.2"
 		_pv="-${NEED_KDE}:4.2"

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/03/11 17:40:51

  Modified:             kde4-base.eclass
  Log:
  Fix broken DOC= variable. Cleanup eclass not to duplicate cmake-utils function calls.

Revision  Changes    Path
1.32                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kde4-base.eclass	9 Mar 2009 19:41:26 -0000	1.31
+++ kde4-base.eclass	11 Mar 2009 17:40:51 -0000	1.32
@@ -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.31 2009/03/09 19:41:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.32 2009/03/11 17:40:51 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -610,20 +610,7 @@
 kde4-base_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	kde4-base_src_make
-}
-
-# @FUNCTION: kde4-base_src_make
-# @DESCRIPTION:
-# Function for building KDE4 applications.
-# Options are passed to cmake-utils_src_make.
-kde4-base_src_make() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -d "$WORKDIR/${PN}_build" ]]; then
-		pushd "${WORKDIR}/${PN}_build" > /dev/null
-	fi
-	[ -e [Mm]akefile ] && cmake-utils_src_make "$@"
+	cmake-utils_src_compile
 }
 
 # @FUNCTION: kde4-base_src_test
@@ -651,10 +638,7 @@
 	fi
 
 	kde4-base_src_make_doc
-	if [[ -d "$WORKDIR/${PN}_build" ]]; then
-		pushd "${WORKDIR}/${PN}_build" > /dev/null
-	fi
-	[ -e [Mm]akefile ] && cmake-utils_src_install
+	cmake-utils_src_install
 }
 
 # @FUNCTION: kde4-base_src_make_doc

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

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    09/03/26 21:55:09

  Modified:             kde4-base.eclass
  Log:
  Dropping the >=xorg-server-1.5.2 dep.

Revision  Changes    Path
1.33                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kde4-base.eclass	11 Mar 2009 17:40:51 -0000	1.32
+++ kde4-base.eclass	26 Mar 2009 21:55:09 -0000	1.33
@@ -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.32 2009/03/11 17:40:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.33 2009/03/26 21:55:09 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -80,11 +80,6 @@
 	# Qt
 	kde4-base_set_qt_dependencies
 
-	# Xorg
-	COMMONDEPEND="${COMMONDEPEND}
-		>=x11-base/xorg-server-1.5.2
-	"
-
 	# X11 libs
 	COMMONDEPEND="${COMMONDEPEND}
 		x11-libs/libXext

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/04/15 11:09:50

  Modified:             kde4-base.eclass
  Log:
  Document ESVN_MIRROR variable for kde eclasses. Requested on irc.

Revision  Changes    Path
1.35                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kde4-base.eclass	13 Apr 2009 00:02:45 -0000	1.34
+++ kde4-base.eclass	15 Apr 2009 11:09:50 -0000	1.35
@@ -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.34 2009/04/13 00:02:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.35 2009/04/15 11:09:50 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -263,6 +263,10 @@
 case ${BUILD_TYPE} in
 	live)
 		SRC_URI=""
+		# @ECLASS-VARIABLE: ESVN_MIRROR
+		# @DESCRIPTION:
+		# This variable allows easy overriding of default kde mirror service
+		# (anonsvn) with anything else you might want to use.
 		ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
 		# Split ebuild, or extragear stuff
 		if [[ -n ${KMNAME} ]]; then

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/04/18 21:33:09

  Modified:             kde4-base.eclass
  Log:
  Move elog information from prepare to postinst and also switch from elog to einfo for less verbosity. Thanks for patch to reavertm.

Revision  Changes    Path
1.36                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kde4-base.eclass	15 Apr 2009 11:09:50 -0000	1.35
+++ kde4-base.eclass	18 Apr 2009 21:33:08 -0000	1.36
@@ -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.35 2009/04/15 11:09:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.36 2009/04/18 21:33:08 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -397,14 +397,6 @@
 
 	# Not needed anymore
 	unset _kdedir
-
-	if [[ ${BUILD_TYPE} = live ]] && [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-		echo
-		elog "WARNING! This is an experimental live ebuild of ${KMNAME:-${PN}}"
-		elog "Use it at your own risk."
-		elog "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
-		echo
-	fi
 }
 
 # @FUNCTION: kde4-base_src_unpack
@@ -571,6 +563,14 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	buildsycoca
+
+	if [[ ${BUILD_TYPE} = live ]] && [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+		echo
+		einfo "WARNING! This is an experimental live ebuild of ${KMNAME:-${PN}}"
+		einfo "Use it at your own risk."
+		einfo "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
+		echo
+	fi
 }
 
 # @FUNCTION: kde4-base_pkg_postrm

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/06/04 13:50:10

  Modified:             kde4-base.eclass
  Log:
  Fix variable test. Thx to salnx per forums for the fix.

Revision  Changes    Path
1.40                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kde4-base.eclass	4 Jun 2009 09:29:54 -0000	1.39
+++ kde4-base.eclass	4 Jun 2009 13:50:10 -0000	1.40
@@ -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.39 2009/06/04 09:29:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.40 2009/06/04 13:50:10 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -426,7 +426,7 @@
 			fi
 		done
 		unset slot
-		[[ -z KDEDIR ]] && die "Failed to determine KDEDIR!"
+		[[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!"
 		PREFIX="${PREFIX:-${ROOT}usr}"
 	fi
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/06/05 09:48:46

  Modified:             kde4-base.eclass
  Log:
  Adjust the kdedir check for optional/never required kde. Reported by yngwin.

Revision  Changes    Path
1.41                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kde4-base.eclass	4 Jun 2009 13:50:10 -0000	1.40
+++ kde4-base.eclass	5 Jun 2009 09:48:46 -0000	1.41
@@ -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.40 2009/06/04 13:50:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.41 2009/06/05 09:48:46 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -426,7 +426,14 @@
 			fi
 		done
 		unset slot
-		[[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!"
+
+		# Bail out if kdelibs required but not found
+		if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then
+			[[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!"
+		else
+			[[ -z ${KDEDIR} ]] && KDEDIR="${ROOT}usr"
+		fi
+
 		PREFIX="${PREFIX:-${ROOT}usr}"
 	fi
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/10/27 14:20:14

  Modified:             kde4-base.eclass
  Log:
  Fix undefined variable warning.

Revision  Changes    Path
1.48                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kde4-base.eclass	27 Oct 2009 14:16:49 -0000	1.47
+++ kde4-base.eclass	27 Oct 2009 14:20:13 -0000	1.48
@@ -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.47 2009/10/27 14:16:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.48 2009/10/27 14:20:13 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -28,12 +28,14 @@
 	export_fns="src_configure src_compile src_test src_install"
 fi
 
+inherit kde4-functions
+
 get_build_type
 if [[ ${BUILD_TYPE} = live ]]; then
 	subversion_eclass="subversion"
 fi
 
-inherit base ${cmake_utils} eutils kde4-functions ${subversion_eclass}
+inherit base ${cmake_utils} eutils ${subversion_eclass}
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare  ${export_fns} pkg_postinst pkg_postrm
 

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/10/27 17:43:03

  Modified:             kde4-base.eclass
  Log:
  Fix variable name.

Revision  Changes    Path
1.49                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kde4-base.eclass	27 Oct 2009 14:20:13 -0000	1.48
+++ kde4-base.eclass	27 Oct 2009 17:43:02 -0000	1.49
@@ -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.48 2009/10/27 14:20:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.49 2009/10/27 17:43:02 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -35,7 +35,7 @@
 	subversion_eclass="subversion"
 fi
 
-inherit base ${cmake_utils} eutils ${subversion_eclass}
+inherit base ${buildsystem_eclass} eutils ${subversion_eclass}
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare  ${export_fns} pkg_postinst pkg_postrm
 

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

[Jonathan Callen (abcd)]

abcd        09/10/28 14:23:43

  Modified:             kde4-base.eclass
  Log:
  Use correct variable

Revision  Changes    Path
1.50                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kde4-base.eclass	27 Oct 2009 17:43:02 -0000	1.49
+++ kde4-base.eclass	28 Oct 2009 14:23:43 -0000	1.50
@@ -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.49 2009/10/27 17:43:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.50 2009/10/28 14:23:43 abcd Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -13,13 +13,13 @@
 # NOTE: KDE 4 ebuilds by default define EAPI="2", this can be redefined but
 # eclass will fail with version older than 2.
 
-# @ECLASS-VARIABLE: CMAKE_REQUIRED
+# @ECLASS-VARIABLE: WANT_CMAKE
 # @DESCRIPTION:
 # Specify if cmake buildsystem is being used. Possible values are 'always' and 'never'.
 # 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:-always}"
+WANT_CMAKE="${WANT_CMAKE:-always}"
 if [[ ${WANT_CMAKE} = false || ${WANT_CMAKE} = never ]]; then
 	buildsystem_eclass=""
 	export_fns=""

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

[Jonathan Callen (abcd)]

abcd        09/10/28 14:27:17

  Modified:             kde4-base.eclass
  Log:
  Add back-compat code for CMAKE_REQUIRED

Revision  Changes    Path
1.51                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kde4-base.eclass	28 Oct 2009 14:23:43 -0000	1.50
+++ kde4-base.eclass	28 Oct 2009 14:27:17 -0000	1.51
@@ -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.50 2009/10/28 14:23:43 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.51 2009/10/28 14:27:17 abcd 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'.
-WANT_CMAKE="${WANT_CMAKE:-always}"
+WANT_CMAKE="${WANT_CMAKE:-${CMAKE_REQUIRED:-always}}"
 if [[ ${WANT_CMAKE} = false || ${WANT_CMAKE} = never ]]; then
 	buildsystem_eclass=""
 	export_fns=""

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/10/28 15:50:57

  Modified:             kde4-base.eclass
  Log:
  Use correct variable name. Effectively reverts abcd's change.

Revision  Changes    Path
1.52                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kde4-base.eclass	28 Oct 2009 14:27:17 -0000	1.51
+++ kde4-base.eclass	28 Oct 2009 15:50:56 -0000	1.52
@@ -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.51 2009/10/28 14:27:17 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.52 2009/10/28 15:50:56 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -13,14 +13,14 @@
 # NOTE: KDE 4 ebuilds by default define EAPI="2", this can be redefined but
 # eclass will fail with version older than 2.
 
-# @ECLASS-VARIABLE: WANT_CMAKE
+# @ECLASS-VARIABLE: CMAKE_REQUIRED
 # @DESCRIPTION:
 # Specify if cmake buildsystem is being used. Possible values are 'always' and 'never'.
 # 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'.
-WANT_CMAKE="${WANT_CMAKE:-${CMAKE_REQUIRED:-always}}"
-if [[ ${WANT_CMAKE} = false || ${WANT_CMAKE} = never ]]; then
+CMAKE_REQUIRED="${CMAKE_REQUIRED:-${CMAKE_REQUIRED:-always}}"
+if [[ ${CMAKE_REQUIRED} = false || ${CMAKE_REQUIRED} = never ]]; then
 	buildsystem_eclass=""
 	export_fns=""
 else

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

[Theo Chatzimichos (tampakrap)]

tampakrap    09/11/25 19:51:11

  Modified:             kde4-base.eclass
  Log:
  Fix KOffice URL, bug 294604

Revision  Changes    Path
1.53                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kde4-base.eclass	28 Oct 2009 15:50:56 -0000	1.52
+++ kde4-base.eclass	25 Nov 2009 19:51:11 -0000	1.53
@@ -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.52 2009/10/28 15:50:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.53 2009/11/25 19:51:11 tampakrap Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -367,7 +367,7 @@
 				koffice)
 					case ${PV} in
 						2.0.[6-9]*) SRC_URI="mirror://kde/unstable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" ;;
-						*) SRC_URI="mirror://kde/stable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" ;;
+						*) SRC_URI="mirror://kde/stable/${_kmname_pv}/${_kmname_pv}.tar.bz2" ;;
 					esac
 			esac
 			unset _kmname _kmname_pv

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/04/07 21:16:33

  Modified:             kde4-base.eclass
  Log:
  Drop accessibility requirement on qt. Per bug #309677

Revision  Changes    Path
1.59                 eclass/kde4-base.eclass

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

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kde4-base.eclass	2 Feb 2010 14:20:16 -0000	1.58
+++ kde4-base.eclass	7 Apr 2010 21:16:33 -0000	1.59
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.58 2010/02/02 14:20:16 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.59 2010/04/07 21:16:33 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -235,8 +235,8 @@
 kdecommondepend="
 	dev-lang/perl
 	>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
-	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility,kde]
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4[dbus]
+	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[kde]
 	>=x11-libs/qt-script-${QT_MINIMAL}:4
 	>=x11-libs/qt-sql-${QT_MINIMAL}:4[qt3support]
 	>=x11-libs/qt-svg-${QT_MINIMAL}:4

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

[Maciej Mrozowski (reavertm)]

reavertm    10/05/15 14:03:06

  Modified:             kde4-base.eclass
  Log:
  Added dev-util/automoc dependency for all KDE4 packages

Revision  Changes    Path
1.60                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.59&r2=1.60

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kde4-base.eclass	7 Apr 2010 21:16:33 -0000	1.59
+++ kde4-base.eclass	15 May 2010 14:03:06 -0000	1.60
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.59 2010/04/07 21:16:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.60 2010/05/15 14:03:06 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -260,6 +260,7 @@
 	fi
 fi
 kdedepend="
+	dev-util/automoc
 	dev-util/pkgconfig
 	!aqua? (
 		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1.0 )

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

[Maciej Mrozowski (reavertm)]

reavertm    10/06/26 01:33:22

  Modified:             kde4-base.eclass
  Log:
  Add USE dep on accessibility for Qt packages, see bug 325461

Revision  Changes    Path
1.64                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.63&r2=1.64

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kde4-base.eclass	22 Jun 2010 13:49:08 -0000	1.63
+++ kde4-base.eclass	26 Jun 2010 01:33:21 -0000	1.64
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.63 2010/06/22 13:49:08 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.64 2010/06/26 01:33:21 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -261,8 +261,8 @@
 # KDE dependencies
 kdecommondepend="
 	>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
-	>=x11-libs/qt-gui-${QT_MINIMAL}:4[dbus]
-	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[kde]
+	>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
+	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility,kde]
 	>=x11-libs/qt-script-${QT_MINIMAL}:4
 	>=x11-libs/qt-sql-${QT_MINIMAL}:4[qt3support]
 	>=x11-libs/qt-svg-${QT_MINIMAL}:4

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

[Maciej Mrozowski (reavertm)]

reavertm    10/06/26 16:02:18

  Modified:             kde4-base.eclass
  Log:
  Add comment for accessibility USE dep on qt-gui, qt-qt3support, sync kdevelop eclass updates from overlay

Revision  Changes    Path
1.65                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.64&r2=1.65

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kde4-base.eclass	26 Jun 2010 01:33:21 -0000	1.64
+++ kde4-base.eclass	26 Jun 2010 16:02:18 -0000	1.65
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.64 2010/06/26 01:33:21 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.65 2010/06/26 16:02:18 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -75,17 +75,29 @@
 		;;
 	kdevelop)
 		if [[ ${BUILD_TYPE} = live ]]; then
-			KDEVELOP_VERSION="9999"
-			KDEVPLATFORM_VERSION="9999"
+			# @ECLASS-VARIABLE: KDEVELOP_VERSION
+			# @DESCRIPTION:
+			# Specifies KDevelop version. Default is 4.0.0 for tagged packages and 9999 for live packages.
+			# Applies to KDEBASE=kdevelop only.
+			KDEVELOP_VERSION="${KDEVELOP_VERSION:-9999}"
+			# @ECLASS-VARIABLE: KDEVPLATFORM_VERSION
+			# @DESCRIPTION:
+			# Specifies KDevplatform version. Default is 1.0.0 for tagged packages and 9999 for live packages.
+			# Applies to KDEBASE=kdevelop only.
+			KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-9999}"
 		else
 			case ${PN} in
 				kdevelop|quanta)
 					KDEVELOP_VERSION=${PV}
 					KDEVPLATFORM_VERSION="$(($(get_major_version)-3)).$(get_after_major_version)"
 					;;
-				*)
+				kdevplatform)
 					KDEVELOP_VERSION="$(($(get_major_version)+3)).$(get_after_major_version)"
 					KDEVPLATFORM_VERSION=${PV}
+					;;
+				*)
+					KDEVELOP_VERSION="${KDEVELOP_VERSION:-4.0.0}"
+					KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-1.0.0}"
 			esac
 		fi
 		SLOT="4"
@@ -259,6 +271,7 @@
 unset cppuintdepend
 
 # KDE dependencies
+# Qt accessibility classes are needed in various places, bug 325461
 kdecommondepend="
 	>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
 	>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
@@ -288,9 +301,19 @@
 		"
 		if [[ ${KDEBASE} = kdevelop ]]; then
 			if [[ ${PN} != kdevplatform ]]; then
-				kdecommondepend+="
-					>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
-				"
+				# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
+				# @DESCRIPTION:
+				# Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'.
+				# Applies to KDEBASE=kdevelop only.
+				KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
+				case ${KDEVPLATFORM_REQUIRED} in
+					always)
+						kdecommondepend+="
+							>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
+						"
+						;;
+					*) ;;
+				esac
 			fi
 		fi
 	fi

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

[Maciej Mrozowski (reavertm)]

reavertm    10/08/12 19:32:23

  Modified:             kde4-base.eclass
  Log:
  Handle USE=debug in the same way as cmake-utils, do not abuse it with CMAkE_BUILD_TYPE=Debugfull (it can be done when needed anyway - see CMAKE_BUILD_TYPE section in cmake-utils.eclass(5))

Revision  Changes    Path
1.67                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.66&r2=1.67

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kde4-base.eclass	9 Aug 2010 15:59:04 -0000	1.66
+++ kde4-base.eclass	12 Aug 2010 19:32:23 -0000	1.67
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.66 2010/08/09 15:59:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.67 2010/08/12 19:32:23 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -645,12 +645,13 @@
 		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
+	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
+		# Handle debug and release codepaths
+		if has debug ${IUSE//+} && use debug; then
+			append-cppflags -DDEBUG
+		else
+			append-cppflags -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM
+		fi
 	fi
 
 	# Set distribution name

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

[Maciej Mrozowski (reavertm)]

reavertm    10/08/13 05:05:41

  Modified:             kde4-base.eclass
  Log:
  Revert - breaks kdelibs API (sic!)

Revision  Changes    Path
1.68                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.67&r2=1.68

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kde4-base.eclass	12 Aug 2010 19:32:23 -0000	1.67
+++ kde4-base.eclass	13 Aug 2010 05:05:40 -0000	1.68
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.67 2010/08/12 19:32:23 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.68 2010/08/13 05:05:40 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -645,13 +645,12 @@
 		cmakeargs+=(-DKDE4_ENABLE_FINAL=ON)
 	fi
 
-	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
-		# Handle debug and release codepaths
-		if has debug ${IUSE//+} && use debug; then
-			append-cppflags -DDEBUG
-		else
-			append-cppflags -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM
-		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

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

[Maciej Mrozowski (reavertm)]

reavertm    10/09/11 04:37:08

  Modified:             kde4-base.eclass
  Log:
  Add SRC_URI rule for kdepim-4.4.6

Revision  Changes    Path
1.71                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.70&r2=1.71

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kde4-base.eclass	11 Sep 2010 04:25:23 -0000	1.70
+++ kde4-base.eclass	11 Sep 2010 04:37:07 -0000	1.71
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.70 2010/09/11 04:25:23 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.71 2010/09/11 04:37:07 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -483,6 +483,10 @@
 							# Unstable KDE SC releases
 							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
 							;;
+						4.4.6)
+							# Only kdepim here
+							SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
+							;;
 						*)
 							# Stable KDE SC releases
 							SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2"

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

[Maciej Mrozowski (reavertm)]

reavertm    10/09/11 05:18:35

  Modified:             kde4-base.eclass
  Log:
  Ensure that *two* digits of patch version component determine unstable snaphots

Revision  Changes    Path
1.72                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.71&r2=1.72

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kde4-base.eclass	11 Sep 2010 04:37:07 -0000	1.71
+++ kde4-base.eclass	11 Sep 2010 05:18:35 -0000	1.72
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.71 2010/09/11 04:37:07 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.72 2010/09/11 05:18:35 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -62,9 +62,9 @@
 		# Determine SLOT from PVs
 		case ${PV} in
 			*.9999*) SLOT="${PV/.9999*/}" ;; # stable live
-			4.6* | 4.5.[6-9]*) SLOT="4.6" ;;
-			4.5* | 4.4.[6-9]*) SLOT="4.5" ;;
-			4.4* | 4.3.[6-9]*) SLOT="4.4" ;;
+			4.6* | 4.5.[6-9][0-9]*) SLOT="4.6" ;;
+			4.5* | 4.4.[6-9][0-9]*) SLOT="4.5" ;;
+			4.4* | 4.3.[6-9][0-9]*) SLOT="4.4" ;;
 			9999*) SLOT="live" ;; # regular live
 			*) die "Unsupported ${PV}" ;;
 		esac

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

[Maciej Mrozowski (reavertm)]

reavertm    10/09/13 21:47:37

  Modified:             kde4-base.eclass
  Log:
  Sync from overlay: use add_kdebase_dep in eclass, depend on perl everywhere (kconfig update needs it at runtime), update handbook handling (just pull khelpcenter)

Revision  Changes    Path
1.73                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.72&r2=1.73

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kde4-base.eclass	11 Sep 2010 05:18:35 -0000	1.72
+++ kde4-base.eclass	13 Sep 2010 21:47:37 -0000	1.73
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.72 2010/09/11 05:18:35 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.73 2010/09/13 21:47:37 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -273,6 +273,7 @@
 # KDE dependencies
 # Qt accessibility classes are needed in various places, bug 325461
 kdecommondepend="
+	dev-lang/perl
 	>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
 	>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
 	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility,kde]
@@ -286,32 +287,24 @@
 		x11-libs/libXxf86vm
 	)
 "
-#perl is not needed on host (+ difficult crosscompilation)
-tc-is-cross-compiler || kdecommondepend+=" dev-lang/perl"
 
 if [[ ${PN} != kdelibs ]]; then
-	if [[ ${KDEBASE} = kde-base ]]; then
-		kdecommondepend+=" $(add_kdebase_dep kdelibs)"
-	else
-		kdecommondepend+="
-			>=kde-base/kdelibs-${KDE_MINIMAL}
-		"
-		if [[ ${KDEBASE} = kdevelop ]]; then
-			if [[ ${PN} != kdevplatform ]]; then
-				# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
-				# @DESCRIPTION:
-				# Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'.
-				# Applies to KDEBASE=kdevelop only.
-				KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
-				case ${KDEVPLATFORM_REQUIRED} in
-					always)
-						kdecommondepend+="
-							>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
-						"
-						;;
-					*) ;;
-				esac
-			fi
+	kdecommondepend+=" $(add_kdebase_dep kdelibs)"
+	if [[ ${KDEBASE} = kdevelop ]]; then
+		if [[ ${PN} != kdevplatform ]]; then
+			# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
+			# @DESCRIPTION:
+			# Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'.
+			# Applies to KDEBASE=kdevelop only.
+			KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
+			case ${KDEVPLATFORM_REQUIRED} in
+				always)
+					kdecommondepend+="
+						>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
+					"
+					;;
+				*) ;;
+			esac
 		fi
 	fi
 fi
@@ -323,6 +316,7 @@
 		x11-proto/xf86vidmodeproto
 	)
 "
+kderdepend=""
 
 # Handbook handling - dependencies
 if [[ -n ${KDE_HANDBOOK} ]]; then
@@ -332,41 +326,30 @@
 			app-text/docbook-xsl-stylesheets
 		)
 	"
-	if [[ ${PN} != kdelibs ]]; then
-		if [[ ${KDEBASE} = kde-base ]]; then
-			PDEPEND+=" handbook? ( $(add_kdebase_dep kdelibs 'handbook') )"
-		else
-			PDEPEND+=" handbook? ( >=kde-base/kdelibs-${KDE_MINIMAL}[handbook] )"
-		fi
-	elif [[ ${PN} != khelpcenter ]]; then
-		if [[ ${KDEBASE} = kde-base ]]; then
-			PDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter 'handbook') )"
-		else
-			PDEPEND+=" handbook? ( >=kde-base/khelpcenter-${KDE_MINIMAL}[handbook] )"
-		fi
-	fi
+	[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( $(add_kdebase_dep khelpcenter) )"
 fi
 
 case ${KDE_REQUIRED} in
 	always)
 		IUSE+=" aqua"
-		COMMONDEPEND+=" ${kdecommondepend}"
-		DEPEND+=" ${kdedepend}"
+		[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" ${kdecommondepend}"
+		[[ -n ${kdedepend} ]] && DEPEND+=" ${kdedepend}"
+		[[ -n ${kderdepend} ]] && RDEPEND+=" ${kderdepend}"
 		;;
 	optional)
 		IUSE+=" aqua kde"
-		COMMONDEPEND+=" kde? ( ${kdecommondepend} )"
-		DEPEND+=" kde? ( ${kdedepend} )"
+		[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" kde? ( ${kdecommondepend} )"
+		[[ -n ${kdedepend} ]] && DEPEND+=" kde? ( ${kdedepend} )"
+		[[ -n ${kderdepend} ]] && RDEPEND+=" kde? ( ${kderdepend} )"
 		;;
 	*) ;;
 esac
 
-unset kdecommondepend kdedepend
+unset kdecommondepend kdedepend kderdepend
 
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: COMMONDEPEND is ${COMMONDEPEND}"
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND (only) is ${DEPEND}"
 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND (only) is ${RDEPEND}"
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND is ${PDEPEND}"
 
 # Accumulate dependencies set by this eclass
 DEPEND+=" ${COMMONDEPEND}"

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

[Andreas HAttel (dilfridge)]

dilfridge    10/10/27 21:24:22

  Modified:             kde4-base.eclass
  Log:
  Added hack for manuals relying on outdated DTD

Revision  Changes    Path
1.76                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.75&r2=1.76

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kde4-base.eclass	24 Oct 2010 15:56:03 -0000	1.75
+++ kde4-base.eclass	27 Oct 2010 21:24:22 -0000	1.76
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.75 2010/10/24 15:56:03 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.76 2010/10/27 21:24:22 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -655,6 +655,12 @@
 	if [[ -n ${KMLOADLIBS} ]] ; then
 		load_library_dependencies
 	fi
+
+	# Hack for manuals relying on outdated DTD
+	find "${S}" -name "*.docbook" \
+		-exec sed -i -r \
+			-e 's:-//KDE//DTD DocBook XML V4\.1(\..)?-Based Variant V1\.[01]//EN:-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN:g' {} + \
+		|| die 'failed to fix DocBook variant version'
 }
 
 # @FUNCTION: kde4-base_src_configure

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

[Andreas HAttel (dilfridge)]

dilfridge    10/11/24 23:54:55

  Modified:             kde4-base.eclass
  Log:
  Restrict patching of dtd reference to ebuilds outside kde-proper

Revision  Changes    Path
1.77                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.76&r2=1.77

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kde4-base.eclass	27 Oct 2010 21:24:22 -0000	1.76
+++ kde4-base.eclass	24 Nov 2010 23:54:55 -0000	1.77
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.76 2010/10/27 21:24:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.77 2010/11/24 23:54:55 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -656,11 +656,13 @@
 		load_library_dependencies
 	fi
 
-	# Hack for manuals relying on outdated DTD
-	find "${S}" -name "*.docbook" \
-		-exec sed -i -r \
-			-e 's:-//KDE//DTD DocBook XML V4\.1(\..)?-Based Variant V1\.[01]//EN:-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN:g' {} + \
-		|| die 'failed to fix DocBook variant version'
+	# Hack for manuals relying on outdated DTD, only outside kde-base/koffice/...
+	if [ -z ${KDEBASE} ]; then 
+		find "${S}" -name "*.docbook" \
+			-exec sed -i -r \
+				-e 's:-//KDE//DTD DocBook XML V4\.1(\..)?-Based Variant V1\.[01]//EN:-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN:g' {} + \
+			|| die 'failed to fix DocBook variant version'
+	fi
 }
 
 # @FUNCTION: kde4-base_src_configure

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

[Kacper Kowalik (xarthisius)]

xarthisius    11/01/11 13:15:46

  Modified:             kde4-base.eclass
  Log:
  Remove no longer required or case with scarabeus blessing

Revision  Changes    Path
1.83                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.82&r2=1.83

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- kde4-base.eclass	3 Jan 2011 20:36:17 -0000	1.82
+++ kde4-base.eclass	11 Jan 2011 13:15:46 -0000	1.83
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.82 2011/01/03 20:36:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.83 2011/01/11 13:15:46 xarthisius Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -373,7 +373,7 @@
 	dev-util/automoc
 	dev-util/pkgconfig
 	!aqua? (
-		|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1.0 )
+		>=x11-libs/libXtst-1.1.0
 		x11-proto/xf86vidmodeproto
 	)
 "

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

[Andreas HAttel (dilfridge)]

dilfridge    11/03/16 22:45:30

  Modified:             kde4-base.eclass
  Log:
  Update variable documentation and src_test from kde overlay (interaction with dbus, virtualx)

Revision  Changes    Path
1.85                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.84&r2=1.85

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kde4-base.eclass	28 Jan 2011 05:05:13 -0000	1.84
+++ kde4-base.eclass	16 Mar 2011 22:45:30 -0000	1.85
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.84 2011/01/28 05:05:13 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.85 2011/03/16 22:45:30 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -15,15 +15,9 @@
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
-#  Do we need an X server? Valid values are "always", "optional", and "manual".
-#  "tests" is a synonym for "optional". While virtualx.eclass supports in principle
-#  also the use of an X server during other ebuild phases, we only use it in
-#  src_test here. Most likely you'll want to set "optional", which introduces the
-#  use-flag "test" (if not already present), adds dependencies conditional on that
-#  use-flag, and automatically runs (only) the ebuild test phase with a virtual X server
-#  present. This makes things a lot more comfortable than the bare virtualx eclass.
-
-# In case the variable is not set in the ebuild, let virtualx eclass not do anything
+# For proper description see virtualx.eclass manpage.
+# Here we redefine default value to be manual, if your package needs virtualx
+# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
 inherit kde4-functions base virtualx eutils
@@ -840,17 +834,23 @@
 	cmake-utils_src_configure
 	kde4-base_src_compile
 
-	if [[ ${VIRTUALX_REQUIRED} == always ]] ||
-		( [[ ${VIRTUALX_REQUIRED} != manual ]] && use test ); then
-
-		if [[ ${maketype} ]]; then
+	# When run as normal user during ebuild development with the ebuild command, the
+	# kde tests tend to access the session DBUS. This however is not possible in a real
+	# emerge or on the tinderbox.
+	# > make sure it does not happen, so bad tests can be recognized and disabled
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	if [[ ${VIRTUALX_REQUIRED} == always || ${VIRTUALX_REQUIRED} == test ]]; then
+		# check for sanity if anyone already redefined VIRTUALX_COMMAND from the default
+		if [[ ${VIRTUALX_COMMAND} != "emake" ]]; then
 			# surprise- we are already INSIDE virtualmake!!!
-			ewarn "QA Notice: This version of kde4-base.eclass includes the virtualx functionality."
-			ewarn "           You may NOT set maketype or call virtualmake from the ebuild. Applying workaround."
+			debug-print "QA Notice: This version of kde4-base.eclass includes the virtualx functionality."
+			debug-print "           You may NOT set VIRTUALX_COMMAND or call virtualmake from the ebuild."
+			debug-print "           Setting VIRTUALX_REQUIRED is completely sufficient. See the"
+			debug-print "           kde4-base.eclass docs for details... Applying workaround."
 			cmake-utils_src_test
 		else
-			export maketype="cmake-utils_src_test"
-			virtualmake
+			VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
 		fi
 	else
 		cmake-utils_src_test

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

[Andreas HAttel (dilfridge)]

dilfridge    11/04/06 08:53:48

  Modified:             kde4-base.eclass
  Log:
  Added special handling for kdepim-l10n

Revision  Changes    Path
1.86                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.85&r2=1.86

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kde4-base.eclass	16 Mar 2011 22:45:30 -0000	1.85
+++ kde4-base.eclass	6 Apr 2011 08:53:48 -0000	1.86
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.85 2011/03/16 22:45:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.86 2011/04/06 08:53:48 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -691,7 +691,7 @@
 	# kde-l10n inherits kde4-base but is metpackage, so no check for doc
 	# kdelibs inherits kde4-base but handle installing the handbook itself
 	if ! has kde4-meta ${INHERITED}; then
-		has handbook ${IUSE//+} && [[ ${PN} != kde-l10n ]] && [[ ${PN} != kdelibs ]] && enable_selected_doc_linguas
+		has handbook ${IUSE//+} && [[ ${PN} != kde-l10n ]] && [[ ${PN} != kdepim-l10n ]] && [[ ${PN} != kdelibs ]] && enable_selected_doc_linguas
 	fi
 
 	# SCM bootstrap

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

[Andreas HAttel (dilfridge)]

dilfridge    11/04/21 20:01:23

  Modified:             kde4-base.eclass
  Log:
  Make SRC_URI calculation work with the latest kdepim strangeness

Revision  Changes    Path
1.88                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.87&r2=1.88

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kde4-base.eclass	6 Apr 2011 14:22:14 -0000	1.87
+++ kde4-base.eclass	21 Apr 2011 20:01:23 -0000	1.88
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.87 2011/04/06 14:22:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.88 2011/04/21 20:01:23 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -471,7 +471,7 @@
 					# KDEPIM IS SPECIAL
 					[[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/src/${_kmname_pv}.tar.bz2"
 					;;
-				4.4.[6789] | 4.4.1?)
+				4.4.[6789] | 4.4.1?*)
 					# Stable kdepim releases
 					SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
 					;;

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/04/22 11:18:34

  Modified:             kde4-base.eclass
  Log:
  Rework the kde-l10n handling so it is less annoying for users with no lingua selected.

Revision  Changes    Path
1.89                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.88&r2=1.89

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kde4-base.eclass	21 Apr 2011 20:01:23 -0000	1.88
+++ kde4-base.eclass	22 Apr 2011 11:18:34 -0000	1.89
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.88 2011/04/21 20:01:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.89 2011/04/22 11:18:34 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -378,14 +378,16 @@
 
 # add a dependency over kde-l10n if EAPI4 is around
 if [[ ${KDEBASE} != "kde-base" ]] && [[ -n ${KDE_LINGUAS} ]] && has "${EAPI:-0}" 4; then
-	usedep=''
 	for _lingua in ${KDE_LINGUAS}; do
-		[[ -n ${usedep} ]] && usedep+=","
-		usedep+="linguas_${_lingua}(+)?"
+		# if our package has lignuas, pull in kde-l10n with selected lingua enabled,
+		# but only for selected ones.
+		# this can't be done on one line because if user doesn't use any localisation
+		# then he is probably not interested in kde-l10n at all.
+		kderdepend+="
+			linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n linguas_${_lingua}(+)?) )
+		"
 	done
-	# if our package has lignuas pull in kde-l10n with selected lingua
-	kderdepend+=" $(add_kdebase_dep kde-l10n ${usedep})"
-	unset usedep _lingua
+	unset _lingua
 fi
 
 kdehandbookdepend="

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

[Jonathan Callen (abcd)]

abcd        11/04/22 18:48:03

  Modified:             kde4-base.eclass
  Log:
  Move more fixes from overlay:
  
  EAPI-4 autocompresses /usr/share/doc: exclude /usr/share/doc/HTML
  Fix underquoted USE dep for kde-l10n
  Various other issues

Revision  Changes    Path
1.90                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.89&r2=1.90

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- kde4-base.eclass	22 Apr 2011 11:18:34 -0000	1.89
+++ kde4-base.eclass	22 Apr 2011 18:48:03 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.89 2011/04/22 11:18:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.90 2011/04/22 18:48:03 abcd Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -167,8 +167,9 @@
 # Set this varible if you want your live package to manage its
 # translations. (Mostly all kde ebuilds does not ship documentation
 # and translations in live ebuilds)
-if [[ ${BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} && ${KDEBASE} != "kde-base" ]]; then
-	KDE_HANDBOOK=never
+if [[ ${BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
+	# Kdebase actualy provides the handbooks even for live stuff
+	[[ ${KDEBASE} == kde-base ]] || KDE_HANDBOOK=never
 	KDE_LINGUAS=""
 fi
 
@@ -376,15 +377,15 @@
 	kderdepend+=" $(add_kdebase_dep oxygen-icons)"
 fi
 
-# add a dependency over kde-l10n if EAPI4 is around
-if [[ ${KDEBASE} != "kde-base" ]] && [[ -n ${KDE_LINGUAS} ]] && has "${EAPI:-0}" 4; then
+# add a dependency over kde-l10n if EAPI4 or better is around
+if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} && ${EAPI:-0} != 3 ]]; then
 	for _lingua in ${KDE_LINGUAS}; do
 		# if our package has lignuas, pull in kde-l10n with selected lingua enabled,
 		# but only for selected ones.
 		# this can't be done on one line because if user doesn't use any localisation
 		# then he is probably not interested in kde-l10n at all.
 		kderdepend+="
-			linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n linguas_${_lingua}(+)?) )
+			linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)?") )
 		"
 	done
 	unset _lingua
@@ -467,11 +468,11 @@
 	case ${KDEBASE} in
 		kde-base)
 			case ${PV} in
-				4.[456].8[05] | 4.[456].9[023568] | 4.5.94.1)
+				4.[456].8[05] | 4.[456].9[023568])
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
 					# KDEPIM IS SPECIAL
-					[[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/src/${_kmname_pv}.tar.bz2"
+					[[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname_pv}.tar.bz2"
 					;;
 				4.4.[6789] | 4.4.1?*)
 					# Stable kdepim releases
@@ -743,10 +744,10 @@
 				: ${KDE_DOC_DIRS:=doc}
 				local dir
 				for dir in ${KDE_DOC_DIRS}; do
-					sed -e "/^[[:space:]]*add_subdirectory[[:space:]]*([[:space:]]*${dir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-						-e "/^[[:space:]]*ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${dir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-						-e "/^[[:space:]]*macro_optional_add_subdirectory[[:space:]]*([[:space:]]*${dir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-						-e "/^[[:space:]]*MACRO_OPTIONAL_ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${dir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
+					sed -e "\!^[[:space:]]*add_subdirectory[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
+						-e "\!^[[:space:]]*ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
+						-e "\!^[[:space:]]*macro_optional_add_subdirectory[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
+						-e "\!^[[:space:]]*MACRO_OPTIONAL_ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${dir}[[:space:]]*)!s/^/#DONOTCOMPILE /" \
 						-i CMakeLists.txt || die "failed to comment out handbook"
 				done
 			fi
@@ -938,6 +939,11 @@
 	fi
 
 	cmake-utils_src_install
+
+	# In EAPI 4+, we don't want ${PREFIX}/share/doc/HTML to be compressed,
+	# because then khelpcenter can't find the docs
+	[[ ${EAPI:-0} != 3 && -d ${ED}/${PREFIX}/share/doc/HTML ]] &&
+		docompress -x ${PREFIX}/share/doc/HTML
 }
 
 # @FUNCTION: kde4-base_pkg_preinst

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

[Andreas HAttel (dilfridge)]

dilfridge    11/05/14 16:03:22

  Modified:             kde4-base.eclass
  Log:
  Add x11-libs/libXcomposite to general KDE dependencies

Revision  Changes    Path
1.92                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.91&r2=1.92

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- kde4-base.eclass	1 May 2011 13:52:09 -0000	1.91
+++ kde4-base.eclass	14 May 2011 16:03:22 -0000	1.92
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.91 2011/05/01 13:52:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.92 2011/05/14 16:03:22 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -337,6 +337,7 @@
 		x11-libs/libXext
 		x11-libs/libXt
 		x11-libs/libXxf86vm
+		x11-libs/libXcomposite
 	)
 "
 

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

[Jonathan Callen (abcd)]

abcd        11/05/23 22:56:36

  Modified:             kde4-base.eclass
  Log:
  Always show kdeprefix warning with USE=kdeprefix; make warning scarier

Revision  Changes    Path
1.93                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.92&r2=1.93

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- kde4-base.eclass	14 May 2011 16:03:22 -0000	1.92
+++ kde4-base.eclass	23 May 2011 22:56:36 -0000	1.93
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.92 2011/05/14 16:03:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.93 2011/05/23 22:56:36 abcd Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -980,15 +980,6 @@
 			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 ]] && has kdeprefix ${IUSE//+} && use kdeprefix; then
-			# warning about kdeprefix for non-live users
-			echo
-			ewarn "WARNING! You have the kdeprefix useflag enabled."
-			ewarn "This setting is strongly discouraged and might lead to potential trouble"
-			ewarn "with KDE update strategies."
-			ewarn "You are using this setup at your own risk and the kde team does not"
-			ewarn "take responsibilities for dead kittens."
-			echo
 		fi
 		# for all 3rd party soft tell user that he SHOULD install kdebase-startkde or kdebase-runtime-meta
 		if [[ ${KDEBASE} != kde-base ]] && \
@@ -1003,6 +994,15 @@
 			fi
 		fi
 	fi
+	if has kdeprefix ${IUSE//+} && use kdeprefix; then
+		# warning about kdeprefix
+		echo
+		ewarn "WARNING! You have the kdeprefix useflag enabled."
+		eerror "This setting will be removed on or about 2011-06-06."
+		ewarn "You are using this setup at your own risk and the kde team does not"
+		ewarn "take responsibilities for dead kittens."
+		echo
+	fi
 }
 
 # @FUNCTION: kde4-base_pkg_postrm

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

[Jonathan Callen (abcd)]

abcd        11/06/06 18:42:55

  Modified:             kde4-base.eclass
  Log:
  Goodbye kdeprefix (part 1 -- die on +kdeprefix)

Revision  Changes    Path
1.95                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.94&r2=1.95

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- kde4-base.eclass	6 Jun 2011 17:51:26 -0000	1.94
+++ kde4-base.eclass	6 Jun 2011 18:42:55 -0000	1.95
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.94 2011/06/06 17:51:26 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.95 2011/06/06 18:42:55 abcd Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -620,6 +620,20 @@
 kde4-base_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	if has kdeprefix ${IUSE//+} && use kdeprefix; then
+		eerror "Sorry, kdeprefix support has been removed."
+		eerror "Please remove kdeprefix from your USE variable."
+		die "kdeprefix support has been removed"
+	fi
+
+	if [[ ${CATEGORY}/${PN} != kde-base/kdelibs && ${CATEGORY}/${PN} != kde-base/kde-env ]] && \
+			{ [[ ${KDE_REQUIRED} == always ]] || { [[ ${KDE_REQUIRED} == optional ]] && use kde; }; } && \
+			has_version kde-base/kdelibs[kdeprefix]; then
+		eerror "Sorry, kdeprefix support has been removed."
+		eerror "Please rebuild kdelibs without kdeprefix support."
+		die "kdeprefix support has been removed"
+	fi
+
 	# QA ebuilds
 	[[ -z ${KDE_MINIMAL_VALID} ]] && ewarn "QA Notice: ignoring invalid KDE_MINIMAL (defaulting to ${KDE_MINIMAL})."
 

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

[Andreas HAttel (dilfridge)]

dilfridge    11/07/06 19:26:40

  Modified:             kde4-base.eclass
  Log:
  Only check for gcc version in kde4-base.eclass if we actually compile something

Revision  Changes    Path
1.101                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.100&r2=1.101

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kde4-base.eclass	15 Jun 2011 22:03:13 -0000	1.100
+++ kde4-base.eclass	6 Jul 2011 19:26:40 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.100 2011/06/15 22:03:13 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.101 2011/07/06 19:26:40 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -635,9 +635,11 @@
 	# In theory should be in pkg_pretend but we check it only for kdelibs there
 	# and for others we do just quick scan in pkg_setup because pkg_pretend
 	# executions consume quite some time.
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-		&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+			&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
+	fi
 
 	KDEDIR=/usr
 	: ${PREFIX:=/usr}

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

[Tomas Chvatal (scarabeus)]

scarabeus    11/07/11 17:16:05

  Modified:             kde4-base.eclass
  Log:
  Detect the gcc version in a really saner conditional.

Revision  Changes    Path
1.103                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.102&r2=1.103

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kde4-base.eclass	10 Jul 2011 17:53:37 -0000	1.102
+++ kde4-base.eclass	11 Jul 2011 17:16:04 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.102 2011/07/10 17:53:37 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.103 2011/07/11 17:16:04 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -621,6 +621,7 @@
 # Do some basic settings
 kde4-base_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
+	local gccversion
 
 	if has kdeprefix ${IUSE//+} && use kdeprefix; then
 		eerror "Sorry, kdeprefix support has been removed."
@@ -644,8 +645,8 @@
 	# and for others we do just quick scan in pkg_setup because pkg_pretend
 	# executions consume quite some time.
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+		gccversion=$(gcc-major-version)$(gcc-minor-version)
+		[[ ${gccversion} < 43 ]] \
 			&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
 	fi
 

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

[Andreas HAttel (dilfridge)]

dilfridge    11/07/11 18:27:32

  Modified:             kde4-base.eclass
  Log:
  Revert last commit, as the old version was 1) making less assumptions about gcc version numvers and 2) correct.

Revision  Changes    Path
1.104                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.103&r2=1.104

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kde4-base.eclass	11 Jul 2011 17:16:04 -0000	1.103
+++ kde4-base.eclass	11 Jul 2011 18:27:32 -0000	1.104
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.103 2011/07/11 17:16:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.104 2011/07/11 18:27:32 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -621,7 +621,6 @@
 # Do some basic settings
 kde4-base_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
-	local gccversion
 
 	if has kdeprefix ${IUSE//+} && use kdeprefix; then
 		eerror "Sorry, kdeprefix support has been removed."
@@ -645,8 +644,8 @@
 	# and for others we do just quick scan in pkg_setup because pkg_pretend
 	# executions consume quite some time.
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		gccversion=$(gcc-major-version)$(gcc-minor-version)
-		[[ ${gccversion} < 43 ]] \
+		[[ $(gcc-major-version) -lt 4 ]] || \
+				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
 			&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
 	fi
 

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

[Alexey Shvetsov (alexxy)]

alexxy      11/07/27 09:30:46

  Modified:             kde4-base.eclass
  Log:
  [eclass] Update eclass for KDE SC 4.7.0

Revision  Changes    Path
1.105                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.104&r2=1.105

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- kde4-base.eclass	11 Jul 2011 18:27:32 -0000	1.104
+++ kde4-base.eclass	27 Jul 2011 09:30:46 -0000	1.105
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.104 2011/07/11 18:27:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.105 2011/07/27 09:30:46 alexxy Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -439,15 +439,22 @@
 				4.[456].8[05] | 4.[456].9[023568])
 					# Unstable KDE SC releases
 					SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
-					# KDEPIM IS SPECIAL
-					[[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname_pv}.tar.bz2"
+					if ! version_is_at_least 4.6.80 ${PV}
+					then
+						# KDEPIM IS SPECIAL
+						[[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname_pv}.tar.bz2"
+					fi
 					;;
 				*)
 					# Stable KDE SC releases
 					SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2"
-					# KDEPIM IS SPECIAL
-					[[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
-					;;
+					if ! version_is_at_least 4.6.80 ${PV}
+					then
+						# KDEPIM IS SPECIAL
+						# TODO: It might not be with KDE 4.7 (see above)
+						[[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2"
+					fi
+						;;
 			esac
 			;;
 		koffice)

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

[Andreas HAttel (dilfridge)]

dilfridge    11/08/31 23:44:45

  Modified:             kde4-base.eclass
  Log:
  Add x11-libs/libxkbfile to global kde dependencies, bug 379747

Revision  Changes    Path
1.106                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.105&r2=1.106

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- kde4-base.eclass	27 Jul 2011 09:30:46 -0000	1.105
+++ kde4-base.eclass	31 Aug 2011 23:44:45 -0000	1.106
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.105 2011/07/27 09:30:46 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.106 2011/08/31 23:44:45 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -305,6 +305,7 @@
 		x11-libs/libXt
 		x11-libs/libXxf86vm
 		x11-libs/libXcomposite
+		x11-libs/libxkbfile
 	)
 "
 

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

[Alexey Shvetsov (alexxy)]

alexxy      11/09/07 17:34:04

  Modified:             kde4-base.eclass
  Log:
  [eclass] update kde4 eclasses

Revision  Changes    Path
1.107                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.106&r2=1.107

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kde4-base.eclass	31 Aug 2011 23:44:45 -0000	1.106
+++ kde4-base.eclass	7 Sep 2011 17:34:04 -0000	1.107
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.106 2011/08/31 23:44:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.107 2011/09/07 17:34:04 alexxy Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -576,20 +576,20 @@
 					# every package is listed explicitly now, as upstream
 					# seems to love being different :(
 					case ${_kmname} in
-						blinken|cantor|kalgebra|kalzium|kanagram|kbruch| \
-						kdeplasma-addons|kdepim|kdepim-runtime|kdepimlibs| \
-						kgeography|khangman|kig|kiten|klettres|kmplot|kstars| \
-						ktouch|kturtle|kwordquiz|libkdeedu|mobipocket|okular| \
-						parley|rocs|step)
+						ark|blinken|cantor|filelight|kalgebra|kalzium|kanagram|kbruch| \
+						kcalc|kcharselect|kdeplasma-addons|kdepim|kdepim-runtime|kdepimlibs| \
+						kdf|kfloppy|kgeography|kgpg|khangman|kig|kiten|klettres|kmplot|kremotecontrol| \
+						kstars|ktimer|ktouch|kturtle|kwallet|kwordquiz|libkdeedu|mobipocket| \
+						okular|parley|printer-applet|rocs|step|superkaramba|sweeper)
 							EGIT_BRANCH="$(get_kde_version)"
 							;;
 						marble)
 							EGIT_BRANCH="kde-$(get_kde_version)"
 							;;
-						gwenview|kamera|kate|kcolorchooser|kde-baseapps| \
+						gwenview|jovie|kaccessible|kamera|kate|kcolorchooser|kde-baseapps| \
 						kde-runtime|kde-workspace|kgamma| \
 						kdegraphics-strigi-analyzer|kdegraphics-thumbnailers| \
-						kdelibs|kimono|kolourpaint|konsole|korundum| \
+						kdelibs|kimono|kmag|kmousetool|kmouth|kolourpaint|konsole|korundum| \
 						kross-interpreters|kruler|ksaneplugin|ksnapshot| \
 						libkdcraw|libkexiv2|libkipi|libksane|perlqt|perlkde| \
 						pykde4|qtruby|qyoto|smokegen|smokekde|smokeqt|svgpart)

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

[Andreas HAttel (dilfridge)]

dilfridge    11/10/21 23:00:20

  Modified:             kde4-base.eclass
  Log:
  Use MERGE_TYPE variable only for EAPI=4, bug 385589

Revision  Changes    Path
1.109                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.108&r2=1.109

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- kde4-base.eclass	6 Oct 2011 14:13:29 -0000	1.108
+++ kde4-base.eclass	21 Oct 2011 23:00:19 -0000	1.109
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.108 2011/10/06 14:13:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.109 2011/10/21 23:00:19 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -621,10 +621,14 @@
 	# In theory should be in pkg_pretend but we check it only for kdelibs there
 	# and for others we do just quick scan in pkg_setup because pkg_pretend
 	# executions consume quite some time.
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
+	# We can only do this for EAPI 4 or later because the MERGE_TYPE variable
+	# is otherwise undefined.
+	if [[ ${EAPI:-0} != 3 ]]; then 
+		if [[ ${MERGE_TYPE} != binary ]]; then
+			[[ $(gcc-major-version) -lt 4 ]] || \
+					( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
+				&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
+		fi
 	fi
 
 	KDEDIR=/usr

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

[Patrick Lauer (patrick)]

patrick     13/07/10 03:46:48

  Modified:             kde4-base.eclass
  Log:
  Fix qtgui dependency for qt-4.8.5 - dbus useflag dropped

Revision  Changes    Path
1.126                eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.125&r2=1.126

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kde4-base.eclass	7 Apr 2013 17:30:35 -0000	1.125
+++ kde4-base.eclass	10 Jul 2013 03:46:48 -0000	1.126
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.125 2013/04/07 17:30:35 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.126 2013/07/10 03:46:48 patrick Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -281,7 +281,7 @@
 	>=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility]
 	>=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl]
 	>=dev-qt/qtdbus-${QT_MINIMAL}:4
-	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus]
+	>=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
 	>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support]
 	>=dev-qt/qtsvg-${QT_MINIMAL}:4