[gentoo-commits] proj/qt:master commit in: eclass/

[Andreas Sturmlechner]

commit:     fcf6a8fcf6fe41d636c0adf04dfe9110d7fe9123
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 11:12:36 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 11:12:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fcf6a8fc

qmake-utils.eclass: Drop obsolete EAPI-6 support, ban qt4* functions

Last consumer in Gentoo ebuild repository was dropped.

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qmake-utils.eclass | 191 ++++++++--------------------------------------
 1 file changed, 33 insertions(+), 158 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 394c8422..79dbc8c0 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -6,10 +6,10 @@
 # qt@g.o
 # @AUTHOR:
 # Davide Pesavento <pesa@g.o>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
-# Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
+# Utility eclass providing wrapper functions for Qt5 qmake.
 #
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
@@ -17,55 +17,59 @@
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
-[[ ${EAPI:-0} == [012345] ]] && die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}"
+case ${EAPI} in
+	7) ;;
+	*) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
 
 inherit estack toolchain-funcs
 
+# @FUNCTION: _qmake-utils_banned_func
+# @INTERNAL
+# @DESCRIPTION:
+# Banned functions are banned.
+_qmake-utils_banned_func() {
+	die "${FUNCNAME[1]} is banned in EAPI 7 and later"
+}
+
 # @FUNCTION: qt4_get_bindir
+# @INTERNAL
 # @DESCRIPTION:
-# Echoes the directory where Qt4 binaries are installed.
-# EPREFIX is already prepended to the returned path.
+# Banned.
 qt4_get_bindir() {
-	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-
-	local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
-	if [[ -d ${qtbindir} ]]; then
-		echo ${qtbindir}
-	else
-		echo ${EPREFIX}/usr/bin
-	fi
+	_qmake-utils_banned_func
 }
 
 # @FUNCTION: qt4_get_headerdir
+# @INTERNAL
 # @DESCRIPTION:
-# Echoes the directory where Qt4 headers are installed.
+# Banned.
 qt4_get_headerdir() {
-	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-	echo /usr/include/qt4
+	_qmake-utils_banned_func
 }
 
 # @FUNCTION: qt4_get_libdir
+# @INTERNAL
 # @DESCRIPTION:
-# Echoes the directory where Qt4 libraries are installed.
+# Banned.
 qt4_get_libdir() {
-	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-	echo /usr/$(get_libdir)/qt4
+	_qmake-utils_banned_func
 }
 
 # @FUNCTION: qt4_get_mkspecsdir
+# @INTERNAL
 # @DESCRIPTION:
-# Echoes the directory where Qt4 mkspecs are installed.
+# Banned.
 qt4_get_mkspecsdir() {
-	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-	echo /usr/share/qt4/mkspecs
+	_qmake-utils_banned_func
 }
 
 # @FUNCTION: qt4_get_plugindir
+# @INTERNAL
 # @DESCRIPTION:
-# Echoes the directory where Qt4 plugins are installed.
+# Banned.
 qt4_get_plugindir() {
-	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-	echo $(qt4_get_libdir)/plugins
+	_qmake-utils_banned_func
 }
 
 # @FUNCTION: qt5_get_bindir
@@ -139,141 +143,12 @@ qmake-utils_find_pro_file() {
 	esac
 }
 
-# @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]
+# @INTERNAL
 # @DESCRIPTION:
-# Wrapper for Qt4's qmake. If project_file is not specified, eqmake4 looks
-# for one in the current directory (non-recursively). If multiple project
-# files are found, then ${PN}.pro is used, if it exists, otherwise eqmake4
-# will not be able to continue.
-#
-# 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.
+# Banned.
 eqmake4() {
-	debug-print-function ${FUNCNAME} "$@"
-	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
-
-	ebegin "Running qmake"
-
-	local qmake_args=("$@")
-
-	# Check if the project file name was passed as first argument. If not, look for candidates.
-	local regexp='.*\.pro'
-	if ! [[ ${1} =~ ${regexp} ]]; then
-		local project_file=$(qmake-utils_find_pro_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 the CONFIG variable is correctly set for both release and debug builds.
-	local config_add=release
-	local config_remove=debug
-	if in_iuse debug && 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
-
-	"$(qt4_get_bindir)"/qmake \
-		-makefile \
-		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}$(qt4_get_libdir)" \
-		QMAKE_LIBDIR_X11="${EPREFIX}/usr/$(get_libdir)" \
-		QMAKE_LIBDIR_OPENGL="${EPREFIX}/usr/$(get_libdir)" \
-		"${qmake_args[@]}"
-
-	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
+	_qmake-utils_banned_func
 }
 
 # @FUNCTION: eqmake5