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

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

[Ingmar Vanhassel (ingmar)]

ingmar      08/01/16 22:51:47

  Added:                kde4-meta.eclass
  Log:
  kde4-meta.eclass - Eclass for split KDE 4 packages.

Revision  Changes    Path
1.1                  eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.1 2008/01/16 22:51:47 ingmar Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
# kde@gentoo.org
# @BLURB: Eclass for writing "split" KDE packages.
# @DESCRIPTION:
# This eclass provides all necessary functions for writing split KDE ebuilds.
#
# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
#
# 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 multilib kde4-functions kde4-base

EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm

if [[ -z ${KMNAME} ]]; then
	die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
fi

case ${KDEBASE} in
	kde-base)	HOMEPAGE="http://www.kde.org/"
				LICENSE="GPL-2" ;;
	koffice)	HOMEPAGE="http://www.koffice.org/"
				LICENSE="GPL-2" ;;
	*)			die "KDEBASE=${KDEBASE} is unsupported." ;;
esac

debug-print "${BASH_SOURCE} ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - before blockers"
debug-print "${BASH_SOURCE} ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - before blockers"

# Add a blocker on the package we're derived from
DEPEND="${DEPEND} !$(get-parent-package ${CATEGORY}/${PN}):${SLOT}"
RDEPEND="${RDEPEND} !$(get-parent-package ${CATEGORY}/${PN}):${SLOT}"

debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after blockers"
debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after blockers"

# Add dependencies that all packages in a certain module share.
case ${KMNAME} in
	kdebase|kdebase-workspace|kdebase-runtime)
		DEPEND="${DEPEND} >=kde-base/qimageblitz-0.0.4"
		RDEPEND="${RDEPEND} >=kde-base/qimageblitz-0.0.4"
	;;
	kdepim)
		if [[ ${PN} != kode ]]; then
			DEPEND="${DEPEND} >=kde-base/kode-${PV}:${SLOT}"
			RDEPEND="${RDEPEND} >=kde-base/kode-${PV}:${SLOT}"
		fi
		case ${PN} in
			akregator|kaddressbook|kmail|kmobiletools|knode|knotes|korganizer|ktimetracker)
				IUSE="+kontact"
				DEPEND="${DEPEND} kontact? ( >=kde-base/kontact-${PV}:${SLOT} )"
				RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontact-${PV}:${SLOT} )"
			;;
		esac
	;;
	kdegames)
		if [[ ${PN} != "libkdegames" ]]; then
			DEPEND="${DEPEND} >=kde-base/libkdegames-${PV}:${SLOT}"
			RDEPEND="${RDEPEND} >=kde-base/libkdegames-${PV}:${SLOT}"
		fi
	;;
	koffice)
		case ${PN} in
			koffice-libs|koffice-data) : ;;
			*)
			DEPEND="${DEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
			RDEPEND="${RDEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
			;;
		esac
	;;
esac

debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies"
debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"

# @ECLASS-VARIABLE: KMNAME
# @DESCRIPTION:
# Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it _before_ inheriting this eclass,
# (unlike the other parameters), since it's used to set $SRC_URI.

# @ECLASS-VARIABLE: KMMODULE
# @DESCRIPTION:
# Specify exactly one subdirectory of $KMNAME here. Defaults to $PN.
# The subdirectory listed here is treated exactly like items in $KMEXTRA.
#
# Example: The ebuild name of "kdebase/l10n" is kde-base/kdebase-l10n, because
# just 'l10n' would be too confusing. Hence it sets KMMODULE="l10n".

# @ECLASS-VARIABLE: KMNOMODULE
# @DESCRIPTION:
# If set to "true", $KMMODULE doesn't have to be defined.
#
# Example usage: If you're installing subdirectories of a package, like plugins,
# you mark the topsubdirectory (containing the package) as $KMEXTRACTONLY, and set KMNOMODULE="true".
if [[ ${KMNOMODULE} != "true" && -z ${KMMODULE} ]]; then
	KMMODULE=${PN}
fi

# @ECLASS-VARIABLE: KMEXTRA
# @DESCRIPTION:
# All subdirectories listed here will be extracted, compiled & installed.
# $KMMODULE is always added to $KMEXTRA.
# If the htmlhandbook USE-flag is set, and if this directory exists,
# then "doc/$KMMODULE" is added to $KMEXTRA. In other cases, this should be
# handled in the ebuild.
# If the documentation is in a different subdirectory, you should add it to KMEXTRA.

# @ECLASS-VARIABLE: KMCOMPILEONLY
# @DESCRIPTION:
# All subdirectories listed here will be extracted & compiled, but not installed.

# @ECLASS-VARIABLE: KMEXTRACTONLY
# @DESCRIPTION:
# All subdirectories listed here will be extracted, but not compiled nor installed.
# This can be used to avoid compilation in a subdirectory of a directory in $KMMODULE or $KMEXTRA

# @ECLASS-VARIABLE: KMTARPARAMS
# @DESCRIPTION:
# Specify extra parameters to pass to tar, in kde4-meta_src_extract.
# '-xpf -j' are passed to tar by default.

# @FUNCTION: kde4-meta_pkg_setup
# @DESCRIPTION:
# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
# ebuilds.
kde4-meta_pkg_setup() {
	kde4-base_pkg_setup
}

# @FUNCTION: kde4-meta_src_unpack
# @DESCRIPTION:
# This function unpacks the source for split ebuilds. See also
# kde4-meta-src_extract.
kde4-meta_src_unpack() {
	debug-print-function  ${FUNCNAME} "$@"

	if [[ ${KMNAME} = kdepim ]] && \
		has kontact ${IUSE//+} && \
		use kontact; then
			KMEXTRA="${KMEXTRA} kontact/plugins/${PLUGINNAME:-${PN}}"
			KMEXTRACTONLY="${KMEXTRACTONLY} kontact/interfaces/"
	fi

	kde4-meta_src_extract
	kde4-meta_change_cmakelists
}

# @FUNCTION: kde4-meta_src_extract
# @DESCRIPTION:
# A function to unpack the source for a split KDE ebuild.
# Also see KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and KMTARPARAMS.
kde4-meta_src_extract() {
	local tarball tarfile f extractlist
	tarball="${KMNAME}-${PV}.tar.bz2"
	tarfile="${DISTDIR}"/${tarball}

	einfo "Unpacking parts of ${tarball} to ${WORKDIR}"

	kde4-meta_create_extractlists

	for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake \
		AUTHORS COPYING INSTALL README NEWS ChangeLog
	do
		extractlist="${extractlist} ${KMNAME}-${PV}/${f}"
	done
	extractlist="${extractlist} $(__list_needed_subdirectories)"
	KMTARPARAMS="${KMTARPARAMS} -j"

	pushd "${WORKDIR}" > /dev/null
	tar -xpf $tarfile $KMTARPARAMS $extractlist 2> /dev/null

	# Default $S is based on $P; rename the extracted directory to match $S
	mv ${KMNAME}-${PV} ${P} || die "Died while moving \"${KMNAME}-${PV}\" to \"${P}\""

	popd > /dev/null
	kde4-base_src_unpack
}

# Create lists of files and subdirectories to extract.
# Also see the descriptions of KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and KMTARPARAMS.
kde4-meta_create_extractlists() {
	debug-print-function ${FUNCNAME} "$@"

	if has htmlhandbook ${IUSE//+} && use htmlhandbook; then
		# We use the basename of $KMMODULE because $KMMODULE can contain
		# the path to the module subdirectory.
		KMEXTRA="${KMEXTRA} doc/${KMMODULE##*/}"
	fi

	# Add some CMake-files to KMEXTRACTONLY.
	# Note that this actually doesn't include KMEXTRA handling.
	# In those cases you should care to add the relevant files to KMEXTRACTONLY
	case ${KMNAME} in
		kdebase)
		KMEXTRACTONLY="${KMEXTRACTONLY}
			apps/config-apps.h.cmake
			apps/ConfigureChecks.cmake"
		;;
		kdebase-runtime)
		KMEXTRACTONLY="${KMEXTRACTONLY}
			config-runtime.h.cmake"
		;;
		kdebase-workspace)
		KMEXTRACTONLY="${KMEXTRACTONLY}
			config-unix.h.cmake
			ConfigureChecks.cmake
			config-workspace.h.cmake
			config-X11.h.cmake
			startkde.cmake"
		;;
		kdegames)
		if [[ ${PN} != "libkdegames" ]]; then
			KMEXTRACTONLY="${KMEXTRACTONLY}
				libkdegames"
		fi
		;;
		koffice)
			KMEXTRACTONLY="${KMEXTRACTONLY}
				config-endian.h.cmake
				filters/config-filters.h.cmake
				config-openexr.h.cmake
				config-opengl.h.cmake
				config-prefix.h.cmake"
		;;
	esac
	# Don't install cmake modules for split ebuilds to avoid collisions.
	case ${KMNAME} in
		kdebase-workspace|kdebase-runtime|kdepim|kdegames)
			KMCOMPILEONLY="${KMCOMPILEONLY}
				cmake/modules/"
		;;
	esac

	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}"
}

__list_needed_subdirectories() {
	local i j kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist topdir

	# We expand KMEXTRA by adding CMakeLists.txt files
	for i in ${KMEXTRA}; do
		kmextra_expanded="${kmextra_expanded} ${i}"
		j=$(dirname ${i})
		while [[ ${j} != "." ]]; do
			kmextra_expanded="${kmextra_expanded} ${j}/CMakeLists.txt";
			j=$(dirname ${j})
		done
	done

	# Expand KMMODULE
	if [[ -n ${KMMODULE}  ]]; then
		kmmodule_expanded="${KMMODULE}"
		j=$(dirname ${KMMODULE})
		while [[ ${j} != "." ]]; do
			kmmodule_expanded="${kmmodule_expanded} $j/CMakeLists.txt";
			j=$(dirname $j)
		done
	fi

	# Expand KMCOMPILEONLY
	for i in ${KMCOMPILEONLY}; do
		kmcompileonly_expanded="${kmcompileonly_expanded} ${i}"
		j=$(dirname ${i})
		while [[ ${j} != "." ]]; do
			kmcompileonly_expanded="${kmcompileonly_expanded} ${j}/CMakeLists.txt";
			j=$(dirname ${j})
		done
	done

	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmextra_expanded: ${kmextra_expanded}"
	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmmodule_expanded:  ${kmmodule_expanded}"
	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmcompileonly_expanded: ${kmcompileonly_expanded}"


	case ${NEED_KDE} in
		svn) : ;;
		*) topdir="${KMNAME}-${PV}/" ;;
	esac

	# Create final list of stuff to extract
	for i in ${kmmodule_expanded} ${kmextra_expanded} ${kmcompileonly_expanded} \
		${KMEXTRACTONLY}
	do
		extractlist="${extractlist} ${topdir}${i}"
	done

	echo ${extractlist}
}

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

	kde4-meta_src_configure
	kde4-meta_src_make
}

_change_cmakelists_parent_dirs() {
	debug-print-function ${FUNCNAME} "$@"

	local _olddir _dir
	_dir="${S}"/${1}
	until [[ ${_dir} == "${S}" ]]; do
		_olddir=$(basename ${_dir})
		_dir=$(dirname ${_dir})
		debug-print "${LINENO}: processing ${_dir} CMakeLists.txt searching for ${_olddir}"
		if [[ -f ${_dir}/CMakeLists.txt ]]; then
			sed -i -e "/[[:space:]]*${_olddir}[[:space:]]*/s/^#DONOTCOMPILE //" ${_dir}/CMakeLists.txt || \
				die "${LINENO}: died in ${FUNCNAME} while processing ${_dir}"
		fi
	done
}

kde4-meta_change_cmakelists() {
	debug-print-function  ${FUNCNAME} "$@"

	pushd "${S}" > /dev/null

	comment_all_add_subdirectory ./

	# Restore "add_subdirectory( cmake )" in ${S}/CMakeLists.txt
	if [[ -f "${S}"/CMakeLists.txt ]]; then
		sed -i -e '/ *cmake */s/^#DONOTCOMPILE //' "${S}"/CMakeLists.txt || die "${LINENO}: cmake sed died"
	fi

	if [[ -z ${KMNOMODULE} ]]; then
		# Restore "add_subdirectory" in $KMMODULE subdirectories
		find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
			die "${LINENO}: died in KMMODULE section"
		_change_cmakelists_parent_dirs ${KMMODULE}
	fi

	# KMCOMPILEONLY
	local i
	for i in ${KMCOMPILEONLY}; do
		debug-print "${LINENO}: KMCOMPILEONLY, processing ${i}"
		# Uncomment "add_subdirectory" instructions inside $KMCOMPILEONLY, then comment "install" instructions.
		find "${S}"/${i} -name CMakeLists.txt -print0 | \
			xargs -0 sed -i \
				-e 's/^#DONOTCOMPILE //g' \
				-e '/install(.*)/{s/^/#DONOTINSTALL /;}' \
				-e '/^install(/,/)/{s/^/#DONOTINSTALL /;}' \
				-e '/kde4_install_icons(.*)/{s/^/#DONOTINSTALL /;}' || \
				die "${LINENO}: sed died in the KMCOMPILEONLY section while processing ${i}"
		_change_cmakelists_parent_dirs ${i}
	done

	# KMEXTRA section
	for i in ${KMEXTRA}; do
		debug-print "${LINENO}: KMEXTRA section, processing ${i}"
		# Ebuilds use KMEXTRA incorrectly to extract files which should be in $KMEXTRACTONLY 
		if [[ -d "${S}"/${i} ]]; then
			find "${S}"/${i} -name CMakeLists.txt -print0 | \
				xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
				die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
			_change_cmakelists_parent_dirs ${i}
		else
			[[ ${i} == doc/* ]] || \
			die "KMEXTRA should be used to compile and install subdirectories other than \$KMMODULE. Use KMEXTRACTONLY to extract some files."
		fi
	done

	# Documentation section
	if [[ -n ${docs} ]]; then
		sed -i -e '/ *doc */s/^#DONOTCOMPILE //g' "${S}"/CMakeLists.txt || \
			die "${LINENO}: sed died while uncommenting doc dir"

		if [[ -f "${S}"/doc/CMakeLists.txt ]]; then
			sed -i -e "/( *${KMMODULE##*/} *)/s/^#DONOTCOMPILE //g" "${S}"/doc/CMakeLists.txt \
				|| die "${LINENO}: sed died while uncommenting apps documentation in doc subdir "
		fi
	fi

	# KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY
	for i in ${KMEXTRACTONLY}; do
		if [[ -d "${S}"/${i} && -f "${S}"/${i}/../CMakeLists.txt ]]; then
			sed -i -e "/( *$(basename $i) *)/s/^/#DONOTCOMPILE /" "${S}"/${i}/../CMakeLists.txt || \
				die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}"
		fi
	done

	# COLLISION PROTECT section
	# Only install the startkde script as part of kde-base/kdebase-startkde,
	# instead of with every package.
	case ${KMNAME} in
		kdebase-workspace)
		if [[ ${PN} != "kdebase-startkde" && -f "${S}"/CMakeLists.txt ]]; then
			case ${PV} in
				*) # The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.
				sed -i -e '/startkde/s/^/#DONOTINSTALL /' "${S}"/CMakeLists.txt || \
					die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
				;;
			esac
		fi
		;;
		koffice)
		if [[ ${PN} != koffice-libs ]]; then
			sed -i -e '/^INSTALL(FILES.*koffice.desktop/ s/^/#DONOTINSTALL /' \
				doc/CMakeLists.txt || \
				die "${LINENO}: sed died in the koffice.desktop collision prevention section"
		fi
		;;
	esac

	popd > /dev/null
}

# @FUNCTION: kde4-meta_src_configure
# @DESCRIPTION:
# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
# ebuilds.
kde4-meta_src_configure() {
	debug-print-function  ${FUNCNAME} "$@"

	kde4-base_src_configure
}

# @FUNCTION: kde4-meta_src_make
# @DESCRIPTION:
# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
# ebuilds.
kde4-meta_src_make() {
	debug-print-function  ${FUNCNAME} "$@"

	kde4-base_src_make
}

# @FUNCTION: kde4-meta_src_test
# @DESCRIPTION:
# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
# ebuilds.
kde4-meta_src_test() {
	debug-print-function $FUNCNAME "$@"

	kde4-base_src_test
}

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

	kde4-meta_src_make_doc
	cmake-utils_src_install
}

# @FUNCTION: kde4-meta_src_make_doc
# @DESCRIPTION:
# This function searches under ${S}/${KMMODULE},
# and tries to install "AUTHORS ChangeLog* README* NEWS todo" if these files exist.
kde4-meta_src_make_doc() {
	debug-print-function  $FUNCNAME "$@"

	local doc
	for doc in AUTHORS ChangeLog* README* NEWS TODO; do
		[[ -s ${KMMODULE}/$doc ]] && newdoc "${KMMODULE}/${doc}" "${doc}.${KMMODULE##*/}"
	done

	kde4-base_src_make_doc
}

# @FUNCTION: kde4-meta_pkg_postinst
# @DESCRIPTION:
# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
# ebuilds.
kde4-meta_pkg_postinst() {
	kde4-base_pkg_postinst
}

# @FUNCTION: kde4-meta_pkg_postrm
# @DESCRIPTION:
# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
# ebuilds.
kde4-meta_pkg_postrm() {
	kde4-base_pkg_postrm
}



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

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

[Bo Oersted Andresen (zlin)]

zlin        08/02/15 19:48:41

  Modified:             kde4-meta.eclass
  Log:
  Remove qimageblitz dependency from kdeutils modules that don't use it. Upstream already committed a fix to make it optional to trunk.

Revision  Changes    Path
1.2                  eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde4-meta.eclass	16 Jan 2008 22:51:47 -0000	1.1
+++ kde4-meta.eclass	15 Feb 2008 19:48:40 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.1 2008/01/16 22:51:47 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.2 2008/02/15 19:48:40 zlin Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -402,6 +402,16 @@
 			esac
 		fi
 		;;
+		# This is sort of a hack to avoid patching 16 kdeutils packages with
+		# r775410 from upstream trunk which makes blitz optional so superkaramba
+		# only gets compiled when it is found. Bug #209324. Remove this no later
+		# than 4.1.
+		kdeutils)
+		if [[ ${PN} != superkaramba && ${SLOT} == kde-4 ]]; then
+			sed -i -e '/find_package(Blitz REQUIRED)/d' "${S}"/CMakeLists.txt \
+				|| die "${LINENO}: sed to remove dependency on Blitz failed."
+		fi
+		;;
 		koffice)
 		if [[ ${PN} != koffice-libs ]]; then
 			sed -i -e '/^INSTALL(FILES.*koffice.desktop/ s/^/#DONOTINSTALL /' \



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

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

[Tobias Heinlein (keytoaster)]

keytoaster    08/02/24 21:45:39

  Modified:             kde4-meta.eclass
  Log:
  Install cmake modules for libkdegames, bug #211199

Revision  Changes    Path
1.3                  eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4-meta.eclass	15 Feb 2008 19:48:40 -0000	1.2
+++ kde4-meta.eclass	24 Feb 2008 21:45:39 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.2 2008/02/15 19:48:40 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.3 2008/02/24 21:45:39 keytoaster Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -233,8 +233,13 @@
 	# Don't install cmake modules for split ebuilds to avoid collisions.
 	case ${KMNAME} in
 		kdebase-workspace|kdebase-runtime|kdepim|kdegames)
-			KMCOMPILEONLY="${KMCOMPILEONLY}
-				cmake/modules/"
+			if [[ ${PN} != "libkdegames" ]]; then
+				KMCOMPILEONLY="${KMCOMPILEONLY}
+					cmake/modules/"
+			else
+				KMEXTRA="${KMEXTRA}
+					cmake/modules/"
+			fi
 		;;
 	esac
 



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

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

[Bo Oersted Andresen (zlin)]

zlin        08/03/10 21:43:10

  Modified:             kde4-meta.eclass
  Log:
  Add support for KDE4_STRICTER. Prepare for KDE 4.0.2.

Revision  Changes    Path
1.4                  eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kde4-meta.eclass	24 Feb 2008 21:45:39 -0000	1.3
+++ kde4-meta.eclass	10 Mar 2008 21:43:10 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.3 2008/02/24 21:45:39 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.4 2008/03/10 21:43:10 zlin Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -157,7 +157,7 @@
 # A function to unpack the source for a split KDE ebuild.
 # Also see KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and KMTARPARAMS.
 kde4-meta_src_extract() {
-	local tarball tarfile f extractlist
+	local abort tarball tarfile f extractlist
 	tarball="${KMNAME}-${PV}.tar.bz2"
 	tarfile="${DISTDIR}"/${tarball}
 
@@ -174,12 +174,24 @@
 	KMTARPARAMS="${KMTARPARAMS} -j"
 
 	pushd "${WORKDIR}" > /dev/null
+	[[ -n ${KDE4_STRICTER} ]] && echo tar -xpf $tarfile $KMTARPARAMS $extractlist >&2
 	tar -xpf $tarfile $KMTARPARAMS $extractlist 2> /dev/null
 
 	# Default $S is based on $P; rename the extracted directory to match $S
 	mv ${KMNAME}-${PV} ${P} || die "Died while moving \"${KMNAME}-${PV}\" to \"${P}\""
 
 	popd > /dev/null
+
+	if [[ -n ${KDE4_STRICTER} ]]; then
+		for f in $(__list_needed_subdirectories fatal); do
+			if [[ ! -e ${S}/${f#*/} ]]; then
+				eerror "'${f#*/}' is missing"
+				abort=true
+			fi
+		done
+		[[ -n ${abort} ]] && die "There were missing files."
+	fi
+
 	kde4-base_src_unpack
 }
 
@@ -191,7 +203,7 @@
 	if has htmlhandbook ${IUSE//+} && use htmlhandbook; then
 		# We use the basename of $KMMODULE because $KMMODULE can contain
 		# the path to the module subdirectory.
-		KMEXTRA="${KMEXTRA} doc/${KMMODULE##*/}"
+		KMEXTRA_NONFATAL="${KMEXTRA_NONFATAL} doc/${KMMODULE##*/}"
 	fi
 
 	# Add some CMake-files to KMEXTRACTONLY.
@@ -232,7 +244,7 @@
 	esac
 	# Don't install cmake modules for split ebuilds to avoid collisions.
 	case ${KMNAME} in
-		kdebase-workspace|kdebase-runtime|kdepim|kdegames)
+		kdebase-workspace|kdebase-runtime|kdepim|kdegames|kdegraphics)
 			if [[ ${PN} != "libkdegames" ]]; then
 				KMCOMPILEONLY="${KMCOMPILEONLY}
 					cmake/modules/"
@@ -247,10 +259,12 @@
 }
 
 __list_needed_subdirectories() {
-	local i j kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist topdir
+	local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist topdir
 
 	# We expand KMEXTRA by adding CMakeLists.txt files
-	for i in ${KMEXTRA}; do
+	kmextra="${KMEXTRA}"
+	[[ ${1} != fatal ]] && kmextra="${kmextra} ${KMEXTRA_NONFATAL}"
+	for i in ${kmextra}; do
 		kmextra_expanded="${kmextra_expanded} ${i}"
 		j=$(dirname ${i})
 		while [[ ${j} != "." ]]; do
@@ -362,15 +376,18 @@
 	# KMEXTRA section
 	for i in ${KMEXTRA}; do
 		debug-print "${LINENO}: KMEXTRA section, processing ${i}"
-		# Ebuilds use KMEXTRA incorrectly to extract files which should be in $KMEXTRACTONLY 
+		find "${S}"/${i} -name CMakeLists.txt -print0 | \
+			xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
+			die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
+		_change_cmakelists_parent_dirs ${i}
+	done
+	# KMEXTRA_NONFATAL section
+	for i in ${KMEXTRA_NONFATAL}; do
 		if [[ -d "${S}"/${i} ]]; then
 			find "${S}"/${i} -name CMakeLists.txt -print0 | \
 				xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
 				die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
 			_change_cmakelists_parent_dirs ${i}
-		else
-			[[ ${i} == doc/* ]] || \
-			die "KMEXTRA should be used to compile and install subdirectories other than \$KMMODULE. Use KMEXTRACTONLY to extract some files."
 		fi
 	done
 



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

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/03/11 17:41:50

  Modified:             kde4-meta.eclass
  Log:
  and actualy remove the old reference from kde4-meta too.

Revision  Changes    Path
1.13                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kde4-meta.eclass	9 Mar 2009 19:41:26 -0000	1.12
+++ kde4-meta.eclass	11 Mar 2009 17:41:50 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.12 2009/03/09 19:41:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.13 2009/03/11 17:41:50 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -633,7 +633,7 @@
 kde4-meta_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	kde4-base_src_make
+	kde4-base_src_compile
 }
 
 # @FUNCTION: kde4-meta_src_test

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/03/12 12:01:14

  Modified:             kde4-meta.eclass
  Log:
  Update case statement for better deps reflection.

Revision  Changes    Path
1.14                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kde4-meta.eclass	11 Mar 2009 17:41:50 -0000	1.13
+++ kde4-meta.eclass	12 Mar 2009 12:01:14 -0000	1.14
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.13 2009/03/11 17:41:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.14 2009/03/12 12:01:14 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -33,7 +33,7 @@
 
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
-	kdebase|kdebase-{apps,workspace,runtime})
+	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphic)
 		DEPEND="${DEPEND}
 			>=kde-base/qimageblitz-0.0.4
 		"

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/03/12 17:53:05

  Modified:             kde4-meta.eclass
  Log:
  Fix typo in meta eclass. Thanks reavertm for spotting this.

Revision  Changes    Path
1.15                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kde4-meta.eclass	12 Mar 2009 12:01:14 -0000	1.14
+++ kde4-meta.eclass	12 Mar 2009 17:53:05 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.14 2009/03/12 12:01:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.15 2009/03/12 17:53:05 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -132,7 +132,7 @@
 debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
 
 # Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
-case ${SLOT} in
+case ${BUILD_TYPE} in
 	live)
 		case ${KMNAME} in
 			extragear*|playground*)
@@ -140,6 +140,7 @@
 				;;
 		esac
 		;;
+	*) ;;
 esac
 
 # @ECLASS-VARIABLE: KMNAME

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

[Alexey Shvetsov (alexxy)]

alexxy      09/03/15 15:27:13

  Modified:             kde4-meta.eclass
  Log:
  Update kde4-meta eclass for proper working with KDE 4.3 snapshots

Revision  Changes    Path
1.16                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kde4-meta.eclass	12 Mar 2009 17:53:05 -0000	1.15
+++ kde4-meta.eclass	15 Mar 2009 15:27:13 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.15 2009/03/12 17:53:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.16 2009/03/15 15:27:13 alexxy Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -389,6 +389,13 @@
 				KMEXTRACTONLY="${KMEXTRACTONLY}
 					libkdepim"
 			fi
+			case ${SLOT} in
+				4.3|live)
+					KMEXTRACTONLY="${KMEXTRACTONLY}
+							kdepim-version.h
+							config-enterprise.h.cmake"
+					;;
+			esac
 			KMEXTRACTONLY="${KMEXTRACTONLY}
 				kleopatra/ConfigureChecks.cmake"
 			if has kontact ${IUSE//+} && use kontact; then

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

[Tomas Chvatal (scarabeus)]

scarabeus    09/05/14 16:46:53

  Modified:             kde4-meta.eclass
  Log:
  Remove no longer used kdeprefix check from koffice. thanks mr_bones_ for report

Revision  Changes    Path
1.19                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kde4-meta.eclass	9 May 2009 13:23:15 -0000	1.18
+++ kde4-meta.eclass	14 May 2009 16:46:53 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.18 2009/05/09 13:23:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.19 2009/05/14 16:46:53 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -87,11 +87,9 @@
 	koffice)
 		[[ ${PN} != koffice-data ]] && IUSE="debug"
 		RDEPEND="${RDEPEND}
-			!kdeprefix? (
-				!app-office/${PN}:0
-				!app-office/koffice:0
-				!app-office/koffice-meta:0
-			)
+			!app-office/${PN}:0
+			!app-office/koffice:0
+			!app-office/koffice-meta:0
 		"
 		COMMON_DEPEND="
 			dev-cpp/eigen:2

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

[Robert Piasek (dagger)]

dagger      09/05/29 10:29:10

  Modified:             kde4-meta.eclass
  Log:
  update to kde4-meta eclass. This fixes paludis QA warnings for some koffice
  apps which didn't have openexr in IUSE.
  
  Signed-of by: Scarabeus

Revision  Changes    Path
1.21                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kde4-meta.eclass	28 May 2009 09:47:52 -0000	1.20
+++ kde4-meta.eclass	29 May 2009 10:29:10 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.20 2009/05/28 09:47:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.21 2009/05/29 10:29:10 dagger Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -91,9 +91,14 @@
 			!app-office/koffice:0
 			!app-office/koffice-meta:0
 		"
-		COMMON_DEPEND="
+		if has openexr ${IUSE//+}; then
+			COMMON_DEPEND="media-gfx/imagemagick[openexr?]"
+		else
+			COMMON_DEPEND="media-gfx/imagemagick"
+		fi
+
+		COMMON_DEPEND="${COMMON_DEPEND}
 			dev-cpp/eigen:2
-			media-gfx/imagemagick[openexr?]
 			media-libs/fontconfig
 			media-libs/freetype:2
 		"

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

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/11 17:27:36

  Modified:             kde4-meta.eclass
  Log:
  Fix eclassdoc for kde4-meta.

Revision  Changes    Path
1.32                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- kde4-meta.eclass	14 Dec 2009 19:44:15 -0000	1.31
+++ kde4-meta.eclass	11 Jan 2010 17:27:35 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.31 2009/12/14 19:44:15 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.32 2010/01/11 17:27:35 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -490,9 +490,9 @@
 	done
 }
 
-# FIXME: add description
 # @FUNCTION: kde4-meta_change_cmakelists
 # @DESCRIPTION:
+# Adjust CMakeLists.txt to comply to our splitting.
 kde4-meta_change_cmakelists() {
 	debug-print-function ${FUNCNAME} "$@"
 

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

[Maciej Mrozowski (reavertm)]

reavertm    10/03/15 03:35:39

  Modified:             kde4-meta.eclass
  Log:
  Added kdepim-related CMake-checks overriding

Revision  Changes    Path
1.34                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- kde4-meta.eclass	2 Feb 2010 14:20:16 -0000	1.33
+++ kde4-meta.eclass	15 Mar 2010 03:35:39 -0000	1.34
@@ -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-meta.eclass,v 1.33 2010/02/02 14:20:16 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.34 2010/03/15 03:35:39 reavertm Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -573,7 +573,15 @@
 			sed -r -e '/find_package\(KdepimLibs/s/REQUIRED//' \
 				-e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
 				-e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
+				-e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \
+				-e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \
 				-i CMakeLists.txt || die "failed to disable hardcoded checks"
+			# Disable broken or redundant build logic
+			if ( has kontact ${IUSE//+} && use kontact ) || [[ ${PN} = kontact ]]; then
+				sed -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \
+					-e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \
+					-i kontact/plugins/CMakeLists.txt || die 'failed to override build logic'
+			fi
 			if ! slot_is_at_least 4.5 ${SLOT}; then
 				case ${PN} in
 					kalarm|kmailcvt|kontact|korganizer|korn)

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

[Maciej Mrozowski (reavertm)]

reavertm    10/05/15 16:51:46

  Modified:             kde4-meta.eclass
  Log:
  Update qimageblitz category

Revision  Changes    Path
1.36                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kde4-meta.eclass	15 May 2010 15:19:04 -0000	1.35
+++ kde4-meta.eclass	15 May 2010 16:51:46 -0000	1.36
@@ -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-meta.eclass,v 1.35 2010/05/15 15:19:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.36 2010/05/15 16:51:46 reavertm Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -21,7 +21,7 @@
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
 	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
-		COMMONDEPEND+=" >=kde-base/qimageblitz-0.0.4"
+		COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4"
 		;;
 	kdepim|kdepim-runtime)
 		! slot_is_at_least 4.4 ${SLOT} && COMMONDEPEND+=" $(add_kdebase_dep kdepimlibs)"

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

[Maciej Mrozowski (reavertm)]

reavertm    10/09/15 08:22:13

  Modified:             kde4-meta.eclass
  Log:
  Make handbook unpacking less strict, bug 337341. Which is actually fine as handbook are not necessarily located directly in doc/KMMODULE

Revision  Changes    Path
1.42                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kde4-meta.eclass	14 Sep 2010 12:39:51 -0000	1.41
+++ kde4-meta.eclass	15 Sep 2010 08:22:13 -0000	1.42
@@ -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-meta.eclass,v 1.41 2010/09/14 12:39:51 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.42 2010/09/15 08:22:13 reavertm Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -292,7 +292,7 @@
 
 	# Add default handbook locations
 	if [[ -n ${KMMODULE} ]] && [[ ${KDE_HANDBOOK} = always ]] || { [[ ${KDE_HANDBOOK} = optional ]] && use handbook; }; then
-		KMEXTRA+=" doc/${KMMODULE##*/}"
+		KMEXTRA_NONFATAL+=" doc/${KMMODULE##*/}"
 	fi
 
 	# Add some CMake-files to KMEXTRACTONLY.

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

[Maciej Mrozowski (reavertm)]

reavertm    10/09/15 11:06:33

  Modified:             kde4-meta.eclass
  Log:
  Fix handbook related logic: 1) Add KMMODULE to KMEXTRA when KMNOMODULE is false, not when KMMODULE is nonempty

Revision  Changes    Path
1.43                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kde4-meta.eclass	15 Sep 2010 08:22:13 -0000	1.42
+++ kde4-meta.eclass	15 Sep 2010 11:06:33 -0000	1.43
@@ -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-meta.eclass,v 1.42 2010/09/15 08:22:13 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.43 2010/09/15 11:06:33 reavertm Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -100,7 +100,7 @@
 # Example usage: If you're installing subdirectories of a package, like plugins,
 # you mark the top subdirectory (containing the package) as $KMEXTRACTONLY, and
 # set KMNOMODULE="true".
-if [[ -z ${KMMODULE} && ${KMNOMODULE} != true  ]]; then
+if [[ -z ${KMMODULE} ]] && [[ ${KMNOMODULE} != true ]]; then
 	KMMODULE=${PN}
 fi
 
@@ -283,7 +283,7 @@
 
 	# Add default handbook locations
 	# FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 4.4.5.
-	if ! slot_is_at_least 4.5 ${SLOT} && has handbook ${IUSE//+} && use handbook && [[ -n ${KMMODULE} ]]; then
+	if ! slot_is_at_least 4.5 ${SLOT} && has handbook ${IUSE//+} && use handbook && [[ -z ${KMNOMODULE} ]]; then
 		# We use the basename of $KMMODULE because $KMMODULE can contain
 		# the path to the module subdirectory.
 		KMEXTRA_NONFATAL+="
@@ -291,7 +291,7 @@
 	fi
 
 	# Add default handbook locations
-	if [[ -n ${KMMODULE} ]] && [[ ${KDE_HANDBOOK} = always ]] || { [[ ${KDE_HANDBOOK} = optional ]] && use handbook; }; then
+	if [[ -z ${KMNOMODULE} ]] && { [[ ${KDE_HANDBOOK} = always ]] || { [[ ${KDE_HANDBOOK} = optional ]] && use handbook; }; }; then
 		KMEXTRA_NONFATAL+=" doc/${KMMODULE##*/}"
 	fi
 

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

[Theo Chatzimichos (tampakrap)]

tampakrap    10/12/29 16:38:50

  Modified:             kde4-meta.eclass
  Log:
  Catch unpacking errors with die, fixes bug 338397
  Move kde overlay commits b0b8623840b2ac1bf8a29f869c1fbbe30ebdcc6c and f353c08c2b2d3ee444986458bca836b2922dad02 written by dilfridge

Revision  Changes    Path
1.45                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kde4-meta.eclass	2 Dec 2010 21:49:54 -0000	1.44
+++ kde4-meta.eclass	29 Dec 2010 16:38:50 -0000	1.45
@@ -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-meta.eclass,v 1.44 2010/12/02 21:49:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.45 2010/12/29 16:38:50 tampakrap Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -245,8 +245,8 @@
 		extractlist+=" $(__list_needed_subdirectories)"
 
 		pushd "${WORKDIR}" > /dev/null
-		[[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} >&2
-		tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null
+		[[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist}
+		tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} || ewarn "tar extract command failed at least partially - continuing anyway"
 
 		# Default $S is based on $P; rename the extracted directory to match $S if necessary
 		mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""

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

[Andreas HAttel (dilfridge)]

dilfridge    11/01/12 21:24:58

  Modified:             kde4-meta.eclass
  Log:
  Only show the developers the tar unpack warnings (I_KNOW_WHAT_I_AM_DOING)

Revision  Changes    Path
1.48                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kde4-meta.eclass	29 Dec 2010 17:56:34 -0000	1.47
+++ kde4-meta.eclass	12 Jan 2011 21:24:58 -0000	1.48
@@ -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-meta.eclass,v 1.47 2010/12/29 17:56:34 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.48 2011/01/12 21:24:58 dilfridge Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -253,7 +253,12 @@
 
 		pushd "${WORKDIR}" > /dev/null
 		[[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist}
-		tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} || ewarn "tar extract command failed at least partially - continuing anyway"
+		if [[ ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+			# to make the devs happy - bug 338397
+			tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} || ewarn "tar extract command failed at least partially - continuing anyway"
+		else
+			tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null || echo "tar extract command failed at least partially - continuing anyway"
+		fi
 
 		# Default $S is based on $P; rename the extracted directory to match $S if necessary
 		mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""

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

[Andreas HAttel (dilfridge)]

dilfridge    11/03/04 23:19:12

  Modified:             kde4-meta.eclass
  Log:
  Add the missing kde4-meta.eclass patch that makes kde-4.6.1 actually build

Revision  Changes    Path
1.49                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kde4-meta.eclass	12 Jan 2011 21:24:58 -0000	1.48
+++ kde4-meta.eclass	4 Mar 2011 23:19:12 -0000	1.49
@@ -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-meta.eclass,v 1.48 2011/01/12 21:24:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.49 2011/03/04 23:19:12 dilfridge Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -216,9 +216,15 @@
 			kdebase-apps)
 				# kdebase/apps -> kdebase-apps
 				tarball="kdebase-${PV}.tar.${postfix}"
-				# Go one level deeper for kdebase-apps in tarballs
-				moduleprefix=apps/
-				KMTARPARAMS+=" --transform=s|apps/||"
+				case ${PV} in
+					4.6.1)
+						;;
+					*)
+						# Go one level deeper for kdebase-apps in tarballs
+						moduleprefix=apps/
+						KMTARPARAMS+=" --transform=s|apps/||"
+						;;
+				esac
 				;;
 			kdepim)
 				if [[ ${PV} == 4.5.93 ]] ; then
@@ -312,9 +318,18 @@
 	# In those cases you should care to add the relevant files to KMEXTRACTONLY
 	case ${KMNAME} in
 		kdebase)
-			KMEXTRACTONLY+="
-				apps/config-apps.h.cmake
-				apps/ConfigureChecks.cmake"
+			case ${PV} in
+				4.6.1)
+					KMEXTRACTONLY+="
+						config-apps.h.cmake
+						ConfigureChecks.cmake"
+						;;
+					*)
+					KMEXTRACTONLY+="
+						apps/config-apps.h.cmake
+						apps/ConfigureChecks.cmake"
+						;;
+				esac
 			;;
 		kdebase-apps)
 			KMEXTRACTONLY+="

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

[Andreas HAttel (dilfridge)]

dilfridge    11/03/11 19:50:52

  Modified:             kde4-meta.eclass
  Log:
  <=gcc-4.3 and >=kde-4.6 dont mix well, so prevent the doomed attempt in the eclass

Revision  Changes    Path
1.50                 eclass/kde4-meta.eclass

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

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kde4-meta.eclass	4 Mar 2011 23:19:12 -0000	1.49
+++ kde4-meta.eclass	11 Mar 2011 19:50:52 -0000	1.50
@@ -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-meta.eclass,v 1.49 2011/03/04 23:19:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.50 2011/03/11 19:50:52 dilfridge Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -12,9 +12,17 @@
 # You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
 # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
 
-inherit kde4-base versionator
+inherit kde4-base toolchain-funcs versionator
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
+case ${EAPI:-0} in
+	3)
+		KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm"
+		;;
+	*)
+		KDEMETA_EXPF="pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm"
+		;;
+esac
+EXPORT_FUNCTIONS ${KDEMETA_EXPF}
 
 [[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
 
@@ -127,13 +135,26 @@
 # Specify extra parameters to pass to tar, in kde4-meta_src_extract.
 # '-xpf -j' are passed to tar by default.
 
+# @FUNCTION: kde4-meta_pkg_pretend
+# @DESCRIPTION:
+# Currently only checks the gcc version.
+kde4-meta_pkg_pretend() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	slot_is_at_least 4.6 ${SLOT} && ( [[ $(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 SC 4.6 (see bug 354837)."
+}
+
 # @FUNCTION: kde4-meta_pkg_setup
 # @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in
-# split ebuilds.
+# Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version.
+# Use this one in split ebuilds.
 kde4-meta_pkg_setup() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	has pkg_pretend ${KDEMETA_EXPF} || kde4-meta_pkg_pretend
+
 	kde4-base_pkg_setup
 }