Use eqmake4() from qmake-utils.eclass

1 files changed, 3 insertions, 175 deletions

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index b7f50093f417..db52fa4cfe3a 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -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/qt4-r2.eclass,v 1.28 2013/06/03 08:41:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.29 2013/12/21 20:11:55 pesa Exp $
 
 # @ECLASS: qt4-r2.eclass
 # @MAINTAINER:
@@ -15,7 +15,7 @@ case ${EAPI} in
 	*)	 die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit base eutils multilib toolchain-funcs
+inherit base qmake-utils
 
 export XDG_CONFIG_HOME="${T}"
 
@@ -104,7 +104,7 @@ qt4-r2_src_prepare() {
 qt4-r2_src_configure() {
 	debug-print-function $FUNCNAME "$@"
 
-	local project_file=$(_find_project_file)
+	local project_file=$(qmake-utils_find_pro_file)
 
 	if [[ -n ${project_file} ]]; then
 		eqmake4 "${project_file}"
@@ -142,176 +142,4 @@ qt4-r2_src_install() {
 	fi
 }
 
-# @VARIABLE: EQMAKE4_EXCLUDE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of files to be excluded from eqmake4 CONFIG processing.
-# Paths are relative to the current working directory (usually ${S}).
-#
-# Example: EQMAKE4_EXCLUDE="ignore/me.pro foo/*"
-
-# @FUNCTION: eqmake4
-# @USAGE: [project_file] [parameters to qmake]
-# @DESCRIPTION:
-# Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will
-# look for it in the current directory (${S}, non-recursively). If more
-# than one project file are found, then ${PN}.pro is processed, provided
-# that it exists. Otherwise eqmake4 fails.
-#
-# All other arguments are appended unmodified to qmake command line.
-#
-# For recursive build systems, i.e. those based on the subdirs template,
-# you should run eqmake4 on the top-level project file only, unless you
-# have a valid reason to do otherwise. During the building, qmake will
-# be automatically re-invoked with the right arguments on every directory
-# specified inside the top-level project file.
-eqmake4() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
-
-	ebegin "Running qmake"
-
-	local qmake_args=("$@")
-
-	# check if project file was passed as a first argument
-	# if not, then search for it
-	local regexp='.*\.pro'
-	if ! [[ ${1} =~ ${regexp} ]]; then
-		local project_file=$(_find_project_file)
-		if [[ -z ${project_file} ]]; then
-			echo
-			eerror "No project files found in '${PWD}'!"
-			eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
-			echo
-			die "eqmake4 failed"
-		fi
-		qmake_args+=("${project_file}")
-	fi
-
-	# make sure CONFIG variable is correctly set
-	# for both release and debug builds
-	local config_add="release"
-	local config_remove="debug"
-	if has debug ${IUSE} && use debug; then
-		config_add="debug"
-		config_remove="release"
-	fi
-
-	local awkscript='BEGIN {
-				printf "### eqmake4 was here ###\n" > file;
-				printf "CONFIG -= debug_and_release %s\n", remove >> file;
-				printf "CONFIG += %s\n\n", add >> file;
-				fixed=0;
-			}
-			/^[[:blank:]]*CONFIG[[:blank:]]*[\+\*]?=/ {
-				if (gsub("\\<((" remove ")|(debug_and_release))\\>", "") > 0) {
-					fixed=1;
-				}
-			}
-			/^[[:blank:]]*CONFIG[[:blank:]]*-=/ {
-				if (gsub("\\<" add "\\>", "") > 0) {
-					fixed=1;
-				}
-			}
-			{
-				print >> file;
-			}
-			END {
-				print fixed;
-			}'
-
-	[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_push -o noglob
-
-	local file
-	while read file; do
-		local excl
-		for excl in ${EQMAKE4_EXCLUDE}; do
-			[[ ${file} == ${excl} ]] && continue 2
-		done
-		grep -q '^### eqmake4 was here ###$' "${file}" && continue
-
-		local retval=$({
-			rm -f "${file}" || echo FAIL
-			awk -v file="${file}" \
-				-v add=${config_add} \
-				-v remove=${config_remove} \
-				-- "${awkscript}" || echo FAIL
-			} < "${file}")
-
-		if [[ ${retval} == 1 ]]; then
-			einfo " - fixed CONFIG in ${file}"
-		elif [[ ${retval} != 0 ]]; then
-			eerror " - error while processing ${file}"
-			die "eqmake4 failed to process ${file}"
-		fi
-	done < <(find . -type f -name '*.pr[io]' -printf '%P\n' 2>/dev/null)
-
-	[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop
-
-	"${EPREFIX}"/usr/bin/qmake \
-		-makefile \
-		QTDIR="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE="${EPREFIX}"/usr/bin/qmake \
-		QMAKE_AR="$(tc-getAR) cqs" \
-		QMAKE_CC="$(tc-getCC)" \
-		QMAKE_CXX="$(tc-getCXX)" \
-		QMAKE_LINK="$(tc-getCXX)" \
-		QMAKE_LINK_C="$(tc-getCC)" \
-		QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \
-		QMAKE_RANLIB= \
-		QMAKE_STRIP= \
-		QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CFLAGS_RELEASE= \
-		QMAKE_CFLAGS_DEBUG= \
-		QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_CXXFLAGS_RELEASE= \
-		QMAKE_CXXFLAGS_DEBUG= \
-		QMAKE_LFLAGS="${LDFLAGS}" \
-		QMAKE_LFLAGS_RELEASE= \
-		QMAKE_LFLAGS_DEBUG= \
-		QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
-		QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
-		"${qmake_args[@]}"
-
-	# was qmake successful?
-	if ! eend $? ; then
-		echo
-		eerror "Running qmake has failed! (see above for details)"
-		eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/"
-		echo
-		die "eqmake4 failed"
-	fi
-}
-
-# Internal function, used by eqmake4 and qt4-r2_src_configure.
-# Outputs a project file name that can be passed to eqmake4. Sets nullglob
-# locally to avoid expanding *.pro as "*.pro" when there are no matching files.
-#   0 *.pro files found --> outputs null string
-#   1 *.pro file found --> outputs its name
-#   2 or more *.pro files found --> if ${PN}.pro or $(basename ${S}).pro
-#       are there, outputs any of them
-_find_project_file() {
-	local dir_name=$(basename "${S}")
-
-	eshopts_push -s nullglob
-	local pro_files=(*.pro)
-	eshopts_pop
-
-	case ${#pro_files[@]} in
-	1)
-		echo "${pro_files[0]}"
-		;;
-	*)
-		for pro_file in "${pro_files[@]}"; do
-			if [[ ${pro_file} == "${dir_name}.pro" || ${pro_file} == "${PN}.pro" ]]; then
-				echo "${pro_file}"
-				break
-			fi
-		done
-		;;
-	esac
-}
-
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install