[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-r2.eclass

[Davide Pesavento (pesa)]

pesa        13/06/03 06:20:54

  Modified:             ChangeLog qt4-r2.eclass
  Log:
  Add support for EQMAKE4_EXCLUDE.

Revision  Changes    Path
1.849                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.849&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.849&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.848&r2=1.849

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -r1.848 -r1.849
--- ChangeLog	1 Jun 2013 18:51:57 -0000	1.848
+++ ChangeLog	3 Jun 2013 06:20:53 -0000	1.849
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.848 2013/06/01 18:51:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.849 2013/06/03 06:20:53 pesa Exp $
+
+  03 Jun 2013; Davide Pesavento <pesa@g.o> qt4-r2.eclass:
+  Add support for EQMAKE4_EXCLUDE.
 
   01 Jun 2013; Robin H. Johnson <robbat2@g.o> php-ext-source-r2.eclass:
   Fix REQUIRED_USE with PHP_EXT_OPTIONAL_USE set. Fixes REQUIRED_USE



1.26                 eclass/qt4-r2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.25&r2=1.26

Index: qt4-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- qt4-r2.eclass	5 Mar 2013 19:06:19 -0000	1.25
+++ qt4-r2.eclass	3 Jun 2013 06:20:53 -0000	1.26
@@ -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.25 2013/03/05 19:06:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.26 2013/06/03 06:20:53 pesa Exp $
 
 # @ECLASS: qt4-r2.eclass
 # @MAINTAINER:
@@ -127,8 +127,7 @@
 # @FUNCTION: qt4-r2_src_install
 # @DESCRIPTION:
 # Default src_install function for qt4-based packages. Installs compiled code,
-# documentation (via DOCS and HTML_DOCS variables).
-
+# and documentation (via DOCS and HTML_DOCS variables).
 qt4-r2_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
@@ -143,6 +142,14 @@
 	fi
 }
 
+# @VARIABLE: EQMAKE4_EXCLUDE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of files to be excluded from eqmake4 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:
@@ -187,6 +194,7 @@
 		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;
@@ -209,16 +217,25 @@
 			END {
 				print fixed;
 			}'
-	local file=
+
+	[[ -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}")
+			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
@@ -227,6 +244,8 @@
 		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) \
@@ -261,8 +280,6 @@
 		echo
 		die "eqmake4 failed"
 	fi
-
-	return 0
 }
 
 # Internal function, used by eqmake4 and qt4-r2_src_configure.