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

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

[Davide Pesavento]

commit:     e4702214f3c3450f8be612efdadd53b4366ed9d6
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 07:05:15 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 07:05:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e4702214

[qt5-build.eclass] perl is always required for building.

---
 eclass/qt5-build.eclass |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d13cb37..535b9a5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -55,10 +55,8 @@ if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
 	IUSE+=" +pch"
 fi
 
-DEPEND="virtual/pkgconfig"
-if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
-	DEPEND+=" >=dev-lang/perl-5.10"
-fi
+DEPEND=">=dev-lang/perl-5.10
+	virtual/pkgconfig"
 if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"
 fi

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

[Andreas Sturmlechner]

commit:     66f2e5903d0dc56cc4cc4a25be33060c4adabf2d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 19:32:46 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 28 19:34:22 2024 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=66f2e590

qt5-build.eclass: qtbase: Bump _QT5_GENTOOPATCHSET_REV=6 for 5.15.14

Patch dropped (upstreamed) since _QT5_GENTOOPATCHSET_REV=5:

Match deadcode elimination with cpu feature check

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

 eclass/qt5-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8f4e6a0a..88720e39 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -126,11 +126,11 @@ fi
 
 if [[ ${QT5_MODULE} == qtbase ]]; then
 	case ${PV} in
-		5.15.11)
-			_QT5_GENTOOPATCHSET_REV=4
+		5.15.13)
+			_QT5_GENTOOPATCHSET_REV=5
 			;;
 		*)
-			_QT5_GENTOOPATCHSET_REV=5
+			_QT5_GENTOOPATCHSET_REV=6
 			;;
 	esac
 	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"

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

[Andreas Sturmlechner]

commit:     d3ebc1b5c5b02ce0ba70d1da4b3e3dc1661203c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 09:40:02 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 09:40:02 2024 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d3ebc1b5

qt5-build.eclass: cleanup outdated comment

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 60d525b3..8f4e6a0a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -185,7 +185,7 @@ qt5-build_src_prepare() {
 		append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
 	fi
 
-	# many bugs, no one to fix (already done for qtbase)
+	# many bugs, no one to fix
 	filter-lto
 
 	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then

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

[Andreas Sturmlechner]

commit:     72f4dff5d8ce757144b88e7a9c599c36c724c904
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 19:00:27 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 15:55:01 2024 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=72f4dff5

qt5-build.eclass: Move append-ldflags and filter-lto to src_prepare

Bug: https://bugs.gentoo.org/919789
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9561d918..60d525b3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -179,6 +179,15 @@ fi
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
+	# Workaround for bug #915203
+	# Upstream: https://bugreports.qt.io/browse/QTBUG-111514
+	if [[ ${PN} != qtcore ]]; then
+		append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+	fi
+
+	# many bugs, no one to fix (already done for qtbase)
+	filter-lto
+
 	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
 		if [[ -n ${KDE_ORG_COMMIT} ]]; then
 			einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
@@ -231,15 +240,6 @@ qt5-build_src_configure() {
 		qt5_tools_configure
 	fi
 
-	# Workaround for bug #915203
-	# Upstream: https://bugreports.qt.io/browse/QTBUG-111514
-	if [[ ${PN} != qtcore ]]; then
-		append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-	fi
-
-	# many bugs, no one to fix
-	filter-lto
-
 	qt5_foreach_target_subdir qt5_qmake
 }
 

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

[Sam James]

commit:     c550a242890c0febed168de56c5a5aad76c46756
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 11:31:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 11:31:37 2024 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c550a242

qt5-build.eclass: fix typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e7f9a016..9561d918 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -233,7 +233,7 @@ qt5-build_src_configure() {
 
 	# Workaround for bug #915203
 	# Upstream: https://bugreports.qt.io/browse/QTBUG-111514
-	if [[ ${PN} != qtcore ]]; the
+	if [[ ${PN} != qtcore ]]; then
 		append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
 	fi
 

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

[Sam James]

commit:     973e1f7a98705f64da479882b4b8f833e24457cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 10:41:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 10:45:55 2024 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=973e1f7a

qt5-build.eclass: use test-flags-CCLD for -Wl,--undefined-version

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2c65ac9b..e7f9a016 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -233,8 +233,8 @@ qt5-build_src_configure() {
 
 	# Workaround for bug #915203
 	# Upstream: https://bugreports.qt.io/browse/QTBUG-111514
-	if [[ ${PN} != qtcore ]]; then
-		append-ldflags -Wl,--undefined-version
+	if [[ ${PN} != qtcore ]]; the
+		append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
 	fi
 
 	# many bugs, no one to fix

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

[Andreas Sturmlechner]

commit:     9140d4a16fa4934d53939dd5e5516f4351c4bf2a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  7 17:56:50 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 17:56:50 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=9140d4a1

qt5-build.eclass: filter-lto

Bugs: https://bugs.gentoo.org/650488
Bugs: https://bugs.gentoo.org/692078
Bugs: https://bugs.gentoo.org/713850
Bugs: https://bugs.gentoo.org/908419
Bugs: https://bugs.gentoo.org/652158
Bugs: https://bugs.gentoo.org/919043
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e9cb2f50..fb417d00 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -237,6 +237,9 @@ qt5-build_src_configure() {
 		append-ldflags -Wl,--undefined-version
 	fi
 
+	# many bugs, no one to fix
+	filter-lto
+
 	qt5_foreach_target_subdir qt5_qmake
 }
 

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

[Andreas Sturmlechner]

commit:     8138d7bc836b35dd42df44f829dcd518f03a4e64
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Wed Oct 11 12:30:44 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 20:00:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8138d7bc

qt5-build.eclass: workaround undefined qt_version_tag (LLD 17)

Bug: https://bugreports.qt.io/browse/QTBUG-111514
Bug: https://bugs.gentoo.org/915203
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33302
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5e23d793..e9cb2f50 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -231,6 +231,12 @@ qt5-build_src_configure() {
 		qt5_tools_configure
 	fi
 
+	# Workaround for bug #915203
+	# Upstream: https://bugreports.qt.io/browse/QTBUG-111514
+	if [[ ${PN} != qtcore ]]; then
+		append-ldflags -Wl,--undefined-version
+	fi
+
 	qt5_foreach_target_subdir qt5_qmake
 }
 

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

[Andreas Sturmlechner]

commit:     93362d2540b24a74b9dc2e4939371a1ca4da0c03
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 20:58:18 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 21:19:42 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=93362d25

qt5-build.eclass: Rename qt5_tools_oos_quirk -> qt5_configure_oos_quirk

...and turn it into a public helper, as it serves more than just qttools.

The initial review missed the fact that qtlocation is not part of qttools, so
push the quirks back into the ebuilds, calling the newly publicised function.

Bug: https://bugs.gentoo.org/910066
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 61 +++++++++++++++++++------------------------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 847c4366..5e23d793 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -326,6 +326,28 @@ qt5-build_pkg_postrm() {
 
 ######  Public helpers  ######
 
+# @FUNCTION: qt5_configure_oos_quirk
+# @USAGE: <file> or <file> <path>
+# @DESCRIPTION:
+# Quirk for out-of-source builds. Runs qmake in root directory, copies
+# generated pri <file> from source <path> to build dir <path>.
+# If no <path> is given, <file> is copied to ${QT5_BUILD_DIR}.
+qt5_configure_oos_quirk() {
+	if [[ "$#" == 2 ]]; then
+		local source="${2}/${1}"
+		local dest="${QT5_BUILD_DIR}/${2}"
+	elif [[ "$#" == 1 ]]; then
+		local source="${1}"
+		local dest="${QT5_BUILD_DIR}"
+	else
+		die "${FUNCNAME[0]} must be passed either one or two arguments"
+	fi
+
+	mkdir -p "${dest}" || die
+	qt5_qmake "${QT5_BUILD_DIR}"
+	cp "${source}" "${dest}" || die
+}
+
 # @FUNCTION: qt5_syncqt_version
 # @DESCRIPTION:
 # Wrapper for Qt5 syncqt.pl to sync header files for ${PV} (required to run if
@@ -739,44 +761,7 @@ qt5_tools_configure() {
 	# allow the ebuild to override what we set here
 	myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" )
 
-	# out-of-source build quirks
-	case ${PN} in
-		qdoc)
-			# bug 676948
-			qt5_tools_oos_quirk qtqdoc-config.pri src/qdoc
-			;;
-		qtlocation)
-			# src/plugins/geoservices requires files that are only generated
-			# when qmake is run in the root directory. bug 633776
-			qt5_tools_oos_quirk qtlocation-config.pri src/location
-			;;
-		*) ;;
-	esac
-
-	qt5_tools_oos_quirk qttools-config.pri
-}
-
-# @FUNCTION: qt5_tools_oos_quirk
-# @INTERNAL
-# @USAGE: <file> or <file> <path>
-# @DESCRIPTION:
-# Quirk for out-of-source builds. Runs qmake in root directory, copies
-# generated pri <file> from source <path> to build dir <path>.
-# If no <path> is given, <file> is copied to ${QT5_BUILD_DIR}.
-qt5_tools_oos_quirk() {
-	if [[ "$#" == 2 ]]; then
-		local source="${2}/${1}"
-		local dest="${QT5_BUILD_DIR}/${2}"
-	elif [[ "$#" == 1 ]]; then
-		local source="${1}"
-		local dest="${QT5_BUILD_DIR}"
-	else
-		die "${FUNCNAME[0]} must be passed either one or two arguments"
-	fi
-
-	mkdir -p "${dest}" || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${source}" "${dest}" || die
+	qt5_configure_oos_quirk qttools-config.pri
 }
 
 # @FUNCTION: qt5_qmake_args

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

[Andreas Sturmlechner]

commit:     ef16882b0231f3b6944c38a42b85da4324689ea3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 17:26:41 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 15:53:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ef16882b

qt5-build.eclass: Add qt5_syncqt_version()

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

 eclass/qt5-build.eclass | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 31e3be2e..847c4366 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -326,6 +326,25 @@ qt5-build_pkg_postrm() {
 
 ######  Public helpers  ######
 
+# @FUNCTION: qt5_syncqt_version
+# @DESCRIPTION:
+# Wrapper for Qt5 syncqt.pl to sync header files for ${PV} (required to run if
+# headers are added/removed by patching)
+qt5_syncqt_version() {
+	if [[ ${PV} == *9999* ]]; then
+		return
+	fi
+
+	local syncqt
+	if [[ ${PN} == qtcore ]]; then
+		syncqt=bin/syncqt.pl
+	else
+		syncqt=${QT5_BINDIR}/syncqt.pl
+	fi
+
+	perl ${syncqt} -version ${PV} || die
+}
+
 # @FUNCTION: qt5_symlink_binary_to_path
 # @USAGE: <target binary name> [suffix]
 # @DESCRIPTION:

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

[Andreas Sturmlechner]

commit:     4100f922ad8fd7df2186d8e8544511a7d0c0d9ba
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 16:04:40 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 15:53:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4100f922

qt5-build.eclass: Import out-of-source quirks from qdoc/qtlocation

We probably won't get this fixed in Qt5 cycle anymore. Standardises
the quirk via new internal helper function qt5_tools_oos_quirk() to
avoid qt5_qmake usage in ebuilds.

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

 eclass/qt5-build.eclass | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8779d5e9..31e3be2e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -720,9 +720,44 @@ qt5_tools_configure() {
 	# allow the ebuild to override what we set here
 	myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" )
 
-	mkdir -p "${QT5_BUILD_DIR}" || die
+	# out-of-source build quirks
+	case ${PN} in
+		qdoc)
+			# bug 676948
+			qt5_tools_oos_quirk qtqdoc-config.pri src/qdoc
+			;;
+		qtlocation)
+			# src/plugins/geoservices requires files that are only generated
+			# when qmake is run in the root directory. bug 633776
+			qt5_tools_oos_quirk qtlocation-config.pri src/location
+			;;
+		*) ;;
+	esac
+
+	qt5_tools_oos_quirk qttools-config.pri
+}
+
+# @FUNCTION: qt5_tools_oos_quirk
+# @INTERNAL
+# @USAGE: <file> or <file> <path>
+# @DESCRIPTION:
+# Quirk for out-of-source builds. Runs qmake in root directory, copies
+# generated pri <file> from source <path> to build dir <path>.
+# If no <path> is given, <file> is copied to ${QT5_BUILD_DIR}.
+qt5_tools_oos_quirk() {
+	if [[ "$#" == 2 ]]; then
+		local source="${2}/${1}"
+		local dest="${QT5_BUILD_DIR}/${2}"
+	elif [[ "$#" == 1 ]]; then
+		local source="${1}"
+		local dest="${QT5_BUILD_DIR}"
+	else
+		die "${FUNCNAME[0]} must be passed either one or two arguments"
+	fi
+
+	mkdir -p "${dest}" || die
 	qt5_qmake "${QT5_BUILD_DIR}"
-	cp qttools-config.pri "${QT5_BUILD_DIR}" || die
+	cp "${source}" "${dest}" || die
 }
 
 # @FUNCTION: qt5_qmake_args

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

[Andreas Sturmlechner]

commit:     08f4b50740ee14fde6b9b6bdf51e417bf82deb35
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 21:26:28 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 08:14:17 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=08f4b507

qt5-build.eclass: Fix order of patchsets including depending sed

- downstream patches are based on top of KDE's patchset
- downstream patch affects qmake bootstrapping modifications

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

 eclass/qt5-build.eclass | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f4f4d925..8779d5e9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -189,21 +189,10 @@ qt5-build_src_prepare() {
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_symlink_tools_to_build_dir
 
-		[[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}"
-
 		# Avoid unnecessary qmake recompilations
 		sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
 			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
 
-		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
-		sed -i -e "/outpath\/qmake\".*\"*\$MAKE\"*)/ s|)| \
-			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
-			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
-			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
-			configure || die "sed failed (respect env for qmake build)"
-		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
-			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
-
 		# Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
@@ -214,6 +203,19 @@ qt5-build_src_prepare() {
 
 	[[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"
 
+	if [[ ${QT5_MODULE} == qtbase ]]; then
+		[[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}"
+
+		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
+		sed -i -e "/outpath\/qmake\".*\"*\$MAKE\"*)/ s|)| \
+			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
+			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
+			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
+			configure || die "sed failed (respect env for qmake build)"
+		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
+	fi
+
 	default
 }
 

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

[Andreas Sturmlechner]

commit:     4b35aa2ba9b07fd156e1378cb77ea76daac7a667
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 17:25:09 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 17:39:26 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b35aa2b

qmake-utils.eclass: Now serves both Qt (5 and 6)

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

 eclass/qmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 650a3ccf..88755ab7 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -9,7 +9,7 @@
 # @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
-# Utility eclass providing wrapper functions for Qt5 qmake.
+# Utility eclass providing wrapper functions for Qt qmake.
 #
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.

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

[Andreas Sturmlechner]

commit:     5ddadc0119ada043e48a14585653560b72b5fb58
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  4 16:18:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 17:36:08 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5ddadc01

qmake-utils.eclass: Force QMAKE_*FLAGS_RELEASE_WITH_DEBUGINFO to blank

These variables are usually defined as:

    $ fgrep RELEASE_WITH_DEBUGINFO /usr/lib64/qt5/mkspecs/common/gcc-base.conf
    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
    QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
    QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO +=

They can take precedence over our provided flags, so they need to be
blanked out. They are normally only used when the user specifies
-force-debug-info, but sometimes upstreams enable this themselves.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qmake-utils.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 8608212e..650a3ccf 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -78,12 +78,15 @@ qt5_get_qmake_args() {
 		QMAKE_CFLAGS="${CFLAGS}"
 		QMAKE_CFLAGS_RELEASE=
 		QMAKE_CFLAGS_DEBUG=
+		QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO=
 		QMAKE_CXXFLAGS="${CXXFLAGS}"
 		QMAKE_CXXFLAGS_RELEASE=
 		QMAKE_CXXFLAGS_DEBUG=
+		QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO=
 		QMAKE_LFLAGS="${LDFLAGS}"
 		QMAKE_LFLAGS_RELEASE=
 		QMAKE_LFLAGS_DEBUG=
+		QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO=
 	EOF
 }
 

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

[Andreas Sturmlechner]

commit:     392bec200ab6b5263702de68a69a2836a95cbce0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 19:11:17 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 17:16:46 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=392bec20

qmake-utils.eclass: Reuse qt5_get_qmake_args in eqmake5

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qmake-utils.eclass | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 2d6623f2..8608212e 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -102,28 +102,10 @@ eqmake5() {
 
 	ebegin "Running qmake"
 
-	"$(qt5_get_bindir)"/qmake \
-		-makefile \
-		QMAKE_AR="$(tc-getAR) cqs" \
-		QMAKE_CC="$(tc-getCC)" \
-		QMAKE_LINK_C="$(tc-getCC)" \
-		QMAKE_LINK_C_SHLIB="$(tc-getCC)" \
-		QMAKE_CXX="$(tc-getCXX)" \
-		QMAKE_LINK="$(tc-getCXX)" \
-		QMAKE_LINK_SHLIB="$(tc-getCXX)" \
-		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= \
-		"$@"
+	local -a args
+	mapfile -t args <<<"$(qt5_get_qmake_args)"
+	# NB: we're passing literal quotes in but qmake doesn't seem to mind
+	"$(qt5_get_bindir)"/qmake -makefile "${args[@]}" "$@"
 
 	if ! eend $? ; then
 		echo

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

[Andreas Sturmlechner]

commit:     36972bc5067874ad38bebabf57ac4c2785e96c30
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 14:04:20 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 17:16:39 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=36972bc5

qmake-utils.eclass: Add a function to get qmake args

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 345c574a..2d6623f2 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -60,40 +60,31 @@ qt5_get_plugindir() {
 	echo $(qt5_get_libdir)/qt5/plugins
 }
 
-# @FUNCTION: qt6_get_bindir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 binaries are installed.
-# EPREFIX is already prepended to the returned path.
-qt6_get_bindir() {
-	echo ${EPREFIX}$(qt6_get_libdir)/qt6/bin
-}
-
-# @FUNCTION: qt6_get_headerdir
+# @FUNCTION: qt5_get_qmake_args
 # @DESCRIPTION:
-# Echoes the directory where Qt6 headers are installed.
-qt6_get_headerdir() {
-	echo /usr/include/qt6
-}
-
-# @FUNCTION: qt6_get_libdir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 libraries are installed.
-qt6_get_libdir() {
-	echo /usr/$(get_libdir)
-}
-
-# @FUNCTION: qt6_get_mkspecsdir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 mkspecs are installed.
-qt6_get_mkspecsdir() {
-	echo $(qt6_get_libdir)/qt6/mkspecs
-}
-
-# @FUNCTION: qt6_get_plugindir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 plugins are installed.
-qt6_get_plugindir() {
-	echo $(qt6_get_libdir)/qt6/plugins
+# Echoes a multi-line string containing arguments to pass to qmake.
+qt5_get_qmake_args() {
+	cat <<-EOF
+		QMAKE_AR="$(tc-getAR) cqs"
+		QMAKE_CC="$(tc-getCC)"
+		QMAKE_LINK_C="$(tc-getCC)"
+		QMAKE_LINK_C_SHLIB="$(tc-getCC)"
+		QMAKE_CXX="$(tc-getCXX)"
+		QMAKE_LINK="$(tc-getCXX)"
+		QMAKE_LINK_SHLIB="$(tc-getCXX)"
+		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=
+	EOF
 }
 
 # @FUNCTION: eqmake5
@@ -143,4 +134,40 @@ eqmake5() {
 	fi
 }
 
+# @FUNCTION: qt6_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 binaries are installed.
+# EPREFIX is already prepended to the returned path.
+qt6_get_bindir() {
+	echo ${EPREFIX}$(qt6_get_libdir)/qt6/bin
+}
+
+# @FUNCTION: qt6_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 headers are installed.
+qt6_get_headerdir() {
+	echo /usr/include/qt6
+}
+
+# @FUNCTION: qt6_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 libraries are installed.
+qt6_get_libdir() {
+	echo /usr/$(get_libdir)
+}
+
+# @FUNCTION: qt6_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 mkspecs are installed.
+qt6_get_mkspecsdir() {
+	echo $(qt6_get_libdir)/qt6/mkspecs
+}
+
+# @FUNCTION: qt6_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 plugins are installed.
+qt6_get_plugindir() {
+	echo $(qt6_get_libdir)/qt6/plugins
+}
+
 fi

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

[Andreas Sturmlechner]

commit:     aafc8807b0afe5d6a3d0bdc8bde104ee4079378a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 19:45:50 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 19:45:50 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=aafc8807

qt5-build.eclass: Set _QT5_GENTOOPATCHSET_REV=4 for >=Qt5Base-5.15.9

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

 eclass/qt5-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 25499b0c..f4f4d925 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -126,11 +126,11 @@ fi
 
 if [[ ${QT5_MODULE} == qtbase ]]; then
 	case ${PV} in
-		5.15.7)
-			_QT5_GENTOOPATCHSET_REV=2
+		5.15.8)
+			_QT5_GENTOOPATCHSET_REV=3
 			;;
 		*)
-			_QT5_GENTOOPATCHSET_REV=3
+			_QT5_GENTOOPATCHSET_REV=4
 			;;
 	esac
 	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"

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

[Andreas Sturmlechner]

commit:     0bbdf985a4221d17467fda761dd798096a03516e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 22:04:31 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:27:25 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0bbdf985

eclass: standardize prologue/epilogue

Closes: https://github.com/gentoo/gentoo/pull/30061
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 16 ++++++++++------
 eclass/qt6-build.eclass | 22 +++++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a3a7c881..ae74c2e0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -11,15 +11,17 @@
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
 
-if [[ ${CATEGORY} != dev-qt ]]; then
-	die "${ECLASS} is only to be used for building Qt 5"
-fi
-
 case ${EAPI} in
 	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ -z ${_QT5_BUILD_ECLASS} ]]; then
+_QT5_BUILD_ECLASS=1
+
+[[ ${CATEGORY} != dev-qt ]] &&
+	die "${ECLASS} is only to be used for building Qt 5"
+
 # @ECLASS_VARIABLE: QT5_BUILD_TYPE
 # @DESCRIPTION:
 # Default value is "release".
@@ -171,8 +173,6 @@ fi
 
 ######  Phase functions  ######
 
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
-
 # @FUNCTION: qt5-build_src_prepare
 # @DESCRIPTION:
 # Prepares the environment and patches the sources if necessary.
@@ -971,3 +971,7 @@ qt5_regenerate_global_configs() {
 		ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file"
 	fi
 }
+
+fi
+
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index b7e062e6..f92d37eb 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt6-build.eclass
@@ -10,15 +10,17 @@
 # This eclass contains various functions that are used when building Qt6.
 # Requires EAPI 8.
 
-if [[ ${CATEGORY} != dev-qt ]]; then
-	die "qt6-build.eclass is only to be used for building Qt 6"
-fi
-
 case ${EAPI} in
-	8)	: ;;
-	*)	die "qt6-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ -z ${_QT6_BUILD_ECLASS} ]]; then
+_QT6_BUILD_ECLASS=1
+
+[[ ${CATEGORY} != dev-qt ]] &&
+	die "${ECLASS} is only to be used for building Qt 6"
+
 # @ECLASS_VARIABLE: QT6_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -99,8 +101,6 @@ BDEPEND="
 #	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 #fi
 
-EXPORT_FUNCTIONS src_prepare src_configure
-
 ######  Phase functions  ######
 
 # @FUNCTION: qt6-build_src_prepare
@@ -166,3 +166,7 @@ qt6_prepare_env() {
 		QT6_QMLDIR QT6_DATADIR QT6_DOCDIR QT6_TRANSLATIONDIR \
 		QT6_EXAMPLESDIR QT6_TESTSDIR QT6_SYSCONFDIR
 }
+
+fi
+
+EXPORT_FUNCTIONS src_prepare src_configure

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

[Andreas Sturmlechner]

commit:     8245199aef9d94e48d6ce6c8bbe9d9ce756f5c6c
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 11:19:22 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:27:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8245199a

qt6-build.eclass: add 'qt6_symlink_binary_to_path'

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

 eclass/qt6-build.eclass | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index f92d37eb..79c06f34 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -137,6 +137,16 @@ qt_feature() {
 	echo "-DQT_FEATURE_${2:-$1}=$(usex $1 ON OFF)"
 }
 
+# @FUNCTION: qt6_symlink_binary_to_path
+# @USAGE: <target binary name> [suffix]
+# @DESCRIPTION:
+# Symlink a given binary from QT6_BINDIR to QT6_PREFIX/bin, with optional suffix
+qt6_symlink_binary_to_path() {
+    [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
+    dosym -r "${QT6_BINDIR}"/${1} /usr/bin/${1}${2}
+}
+
 ######  Internal functions  ######
 
 # @FUNCTION: qt6_prepare_env

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

[Andreas Sturmlechner]

commit:     6dd17872938f2008941c42e2e634dbef2e74ddaf
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 16:40:01 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:28:26 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6dd17872

qt6-build.eclass: Quote argument of ":" command

This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt6-build.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 79c06f34..91f076ad 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -26,14 +26,14 @@ _QT6_BUILD_ECLASS=1
 # @DESCRIPTION:
 # The upstream name of the module this package belongs to. Used for
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
-: ${QT6_MODULE:=${PN}}
+: "${QT6_MODULE:=${PN}}"
 
 # @ECLASS_VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
 # 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}
+: "${VIRTUALX_REQUIRED:=manual}"
 
 inherit cmake virtualx
 
@@ -82,7 +82,7 @@ EGIT_REPO_URI=(
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT6_BUILD_DIR:=${S}_build}
+: "${QT6_BUILD_DIR:=${S}_build}"
 
 IUSE="debug test"
 
@@ -142,9 +142,9 @@ qt_feature() {
 # @DESCRIPTION:
 # Symlink a given binary from QT6_BINDIR to QT6_PREFIX/bin, with optional suffix
 qt6_symlink_binary_to_path() {
-    [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
 
-    dosym -r "${QT6_BINDIR}"/${1} /usr/bin/${1}${2}
+	dosym -r "${QT6_BINDIR}"/${1} /usr/bin/${1}${2}
 }
 
 ######  Internal functions  ######

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

[Andreas Sturmlechner]

commit:     e73c0e589e11913b9a6f15e9e4186af48359d885
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 16:40:00 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 12:27:54 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e73c0e58

qt5-build.eclass: Quote argument of ":" command

This avoids globbing, see: https://www.shellcheck.net/wiki/SC2223

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ae74c2e0..25499b0c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -51,7 +51,7 @@ readonly QT5_BUILD_TYPE
 # @DESCRIPTION:
 # The upstream name of the module this package belongs to. Used for
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
-: ${QT5_MODULE:=${PN}}
+: "${QT5_MODULE:=${PN}}"
 
 # @ECLASS_VARIABLE: QT5_PV
 # @DESCRIPTION:
@@ -100,7 +100,7 @@ readonly QT5_PV
 # For proper description see virtualx.eclass man page.
 # 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}
+: "${VIRTUALX_REQUIRED:=manual}"
 
 inherit estack flag-o-matic toolchain-funcs virtualx
 
@@ -140,7 +140,7 @@ fi
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${S}_build}
+: "${QT5_BUILD_DIR:=${S}_build}"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
 

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

[Andreas Sturmlechner]

commit:     438f2aec5508b984baadee1e43edff4ee153961e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 14:19:10 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 14:23:59 2023 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=438f2aec

qt5-build.eclass: Set _QT5_GENTOOPATCHSET_REV=3 for >=Qt5Base-5.15.8

Closes: https://bugs.gentoo.org/889780
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d4b1d0f7..a3a7c881 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -124,11 +124,11 @@ fi
 
 if [[ ${QT5_MODULE} == qtbase ]]; then
 	case ${PV} in
-		5.15.5)
-			_QT5_GENTOOPATCHSET_REV=1
+		5.15.7)
+			_QT5_GENTOOPATCHSET_REV=2
 			;;
 		*)
-			_QT5_GENTOOPATCHSET_REV=2
+			_QT5_GENTOOPATCHSET_REV=3
 			;;
 	esac
 	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"

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

[Jimi Huotari]

commit:     3dabe0ce2bc8a39c01d45899ced94ed65f3c47ff
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 22:25:06 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 22:27:44 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3dabe0ce

qt6-build.eclass: adjust variable names

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt6-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index e7624b0c..b7e062e6 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -19,14 +19,14 @@ case ${EAPI} in
 	*)	die "qt6-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-# @ECLASS-VARIABLE: QT6_MODULE
+# @ECLASS_VARIABLE: QT6_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
 # The upstream name of the module this package belongs to. Used for
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT6_MODULE:=${PN}}
 
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @ECLASS_VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
 # Here we redefine default value to be manual, if your package needs virtualx
@@ -76,7 +76,7 @@ EGIT_REPO_URI=(
 )
 [[ ${QT6_BUILD_TYPE} == live ]] && inherit git-r3
 
-# @ECLASS-VARIABLE: QT6_BUILD_DIR
+# @ECLASS_VARIABLE: QT6_BUILD_DIR
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.

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

[Andreas Sturmlechner]

commit:     62ba24237fdbbb0585de46780bc15c4bfe6fc920
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 09:34:47 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 19:19:12 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=62ba2423

qt5-build.eclass: Set _QT5_GENTOOPATCHSET_REV=2 for >=Qt5Base-5.15.7

Apply gentoo-patchset before running sed over configure.

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

 eclass/qt5-build.eclass | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0825d311..d4b1d0f7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -123,7 +123,14 @@ if [[ ${PN} != qtwebengine ]]; then
 fi
 
 if [[ ${QT5_MODULE} == qtbase ]]; then
-	_QT5_GENTOOPATCHSET_REV=1
+	case ${PV} in
+		5.15.5)
+			_QT5_GENTOOPATCHSET_REV=1
+			;;
+		*)
+			_QT5_GENTOOPATCHSET_REV=2
+			;;
+	esac
 	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
 fi
 
@@ -182,6 +189,8 @@ qt5-build_src_prepare() {
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_symlink_tools_to_build_dir
 
+		[[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}"
+
 		# Avoid unnecessary qmake recompilations
 		sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
 			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
@@ -201,8 +210,6 @@ qt5-build_src_prepare() {
 
 		# Respect build variables in configure tests (bug #639494)
 		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
-
-		[[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}"
 	fi
 
 	[[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"

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

[Jimi Huotari]

commit:     bc6a930bf7ffa456a2d26489a38d8e6b526b5edc
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 13:17:57 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 13:30:05 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc6a930b

qt6-build.eclass: add qt6-build_src_install

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt6-build.eclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 139fb03e..e7624b0c 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -119,6 +119,13 @@ qt6-build_src_configure() {
 	cmake_src_configure
 }
 
+# @FUNCTION: qt6-build_src_install
+# @DESCRIPTION:
+# Runs cmake_src_install and anything else that might be needed here.
+qt6-build_src_install() {
+	cmake_src_install
+}
+
 ######  Public helpers  ######
 
 # @FUNCTION: qt_feature

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

[Andreas Sturmlechner]

commit:     56064249c35a88e07c8ef642d61e767877e0ee98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 09:09:03 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 09:12:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=56064249

qt5-build.eclass: _QT5_GENTOOPATCHSET_REV shall always be applied

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

 eclass/qt5-build.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c6cb5dd3..0825d311 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -112,10 +112,6 @@ if [[ ${PN} != qtwebengine ]]; then
 			_QT5_P=${QT5_MODULE}-everywhere-opensource-src-${PV}
 			HOMEPAGE="https://www.qt.io/"
 			SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
-			if [[ ${QT5_MODULE} == qtbase ]]; then
-				_QT5_GENTOOPATCHSET_REV=1
-				SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
-			fi
 			# KDE Qt5PatchCollection on top of tag v${PV}-lts-lgpl
 			if [[ -n ${QT5_KDEPATCHSET_REV} ]]; then
 				HOMEPAGE+=" https://invent.kde.org/qt/qt/${QT5_MODULE} https://community.kde.org/Qt5PatchCollection"
@@ -126,6 +122,11 @@ if [[ ${PN} != qtwebengine ]]; then
 	esac
 fi
 
+if [[ ${QT5_MODULE} == qtbase ]]; then
+	_QT5_GENTOOPATCHSET_REV=1
+	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
+fi
+
 # @ECLASS_VARIABLE: QT5_BUILD_DIR
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:

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

[Andreas Sturmlechner]

commit:     e15399ee86607f962caa65b638bf181403340f0c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 14:55:24 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 11:23:16 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e15399ee

qt5-build.eclass: Merge _QT5_GENTOOPATCHSET_REV handling into main block

Dropping pre-5.15.5 SRC_URI support.

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

 eclass/qt5-build.eclass | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 86082a07..872357ec 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -107,11 +107,15 @@ if [[ ${PN} != qtwebengine ]]; then
 		*9999 )
 			inherit kde.org # kde/5.15 branch
 			;;
-		5.15.[3-9]* | 5.15.??* )
+		5.15.[5-9]* | 5.15.??* )
 			# official stable release
 			_QT5_P=${QT5_MODULE}-everywhere-opensource-src-${PV}
 			HOMEPAGE="https://www.qt.io/"
 			SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
+			if [[ ${QT5_MODULE} == qtbase ]]; then
+				_QT5_GENTOOPATCHSET_REV=1
+				SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
+			fi
 			# KDE Qt5PatchCollection on top of tag v${PV}-lts-lgpl
 			if [[ -n ${QT5_KDEPATCHSET_REV} ]]; then
 				HOMEPAGE+=" https://invent.kde.org/qt/qt/${QT5_MODULE} https://community.kde.org/Qt5PatchCollection"
@@ -122,11 +126,6 @@ if [[ ${PN} != qtwebengine ]]; then
 	esac
 fi
 
-if [[ ${QT5_MODULE} == qtbase ]] && [[ ${PV} == 5.15.[5-9]* ]]; then
-	_QT5_GENTOOPATCHSET_REV=1
-	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
-fi
-
 # @ECLASS_VARIABLE: QT5_BUILD_DIR
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:

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

[Andreas Sturmlechner]

commit:     aa7f8e5bd7efbba10385ac768a817f0675daded1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 15:39:40 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 11:23:35 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=aa7f8e5b

qt5-build.eclass: Support sed regardless if $MAKE is quoted or not

Bug: https://bugs.gentoo.org/792804
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 872357ec..c6cb5dd3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -186,7 +186,7 @@ qt5-build_src_prepare() {
 			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
-		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \
+		sed -i -e "/outpath\/qmake\".*\"*\$MAKE\"*)/ s|)| \
 			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
 			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
 			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \

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

[Jimi Huotari]

commit:     c9d046c7a6a4d538655d3b6ccbbc926539b2cd89
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 18:40:13 2022 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:40:51 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c9d046c7

qt6-build.eclass: adjust copyright year

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt6-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 3711a0ae..139fb03e 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt6-build.eclass

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

[Andreas Sturmlechner]

commit:     35c9a1ee1bc627ebaf4843de72e4527bbfb904bf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 11:11:33 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 11:11:33 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=35c9a1ee

qt5-build.eclass: Restrict gentoo-patchset use to >=5.15.5

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 39a72e57..86082a07 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -122,7 +122,7 @@ if [[ ${PN} != qtwebengine ]]; then
 	esac
 fi
 
-if [[ ${QT5_MODULE} == qtbase ]] && [[ ${PV} == 5.15.[4-9]* ]]; then
+if [[ ${QT5_MODULE} == qtbase ]] && [[ ${PV} == 5.15.[5-9]* ]]; then
 	_QT5_GENTOOPATCHSET_REV=1
 	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
 fi

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

[Andreas Sturmlechner]

commit:     dfaa1f6e860d5bcf3ab1d9a930baedae1bdb6d73
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 11:39:45 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 18:20:52 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dfaa1f6e

qt5-build.eclass: Add _QT5_GENTOOPATCHSET_REV qtbase patchset logic

Usage may be extended to other QT5_MODULEs in the future.

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

 eclass/qt5-build.eclass | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2272e2e2..39a72e57 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -63,6 +63,13 @@ readonly QT5_PV
 # The upstream package name of the module this package belongs to.
 # Used for SRC_URI and S.
 
+# @ECLASS_VARIABLE: _QT5_GENTOOPATCHSET_REV
+# @DEFAULT_UNSET
+# @INTERNAL
+# @DESCRIPTION:
+# Gentoo downstream patchset version applied over qtbase. Used for SRC_URI and
+# applied in src_prepare.
+
 # @ECLASS_VARIABLE: QT5_TARGET_SUBDIRS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -115,6 +122,11 @@ if [[ ${PN} != qtwebengine ]]; then
 	esac
 fi
 
+if [[ ${QT5_MODULE} == qtbase ]] && [[ ${PV} == 5.15.[4-9]* ]]; then
+	_QT5_GENTOOPATCHSET_REV=1
+	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz"
+fi
+
 # @ECLASS_VARIABLE: QT5_BUILD_DIR
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
@@ -189,6 +201,8 @@ qt5-build_src_prepare() {
 
 		# Respect build variables in configure tests (bug #639494)
 		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
+
+		[[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}"
 	fi
 
 	[[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"

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

[Andreas Sturmlechner]

commit:     bde13f1db05a918bfe395e1e104fd57a3d870410
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 10:58:18 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 10:58:18 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bde13f1d

qt5-build.eclass: Support future double-digit Qt-5.15 patch releases

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6da97387..2272e2e2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -100,7 +100,7 @@ if [[ ${PN} != qtwebengine ]]; then
 		*9999 )
 			inherit kde.org # kde/5.15 branch
 			;;
-		5.15.[3-9]* )
+		5.15.[3-9]* | 5.15.??* )
 			# official stable release
 			_QT5_P=${QT5_MODULE}-everywhere-opensource-src-${PV}
 			HOMEPAGE="https://www.qt.io/"

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

[Andreas Sturmlechner]

commit:     e95b42d61f7898045b0b9e94a7a20f1dd28f69cd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 12:27:46 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 12:47:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e95b42d6

qt5-build.eclass: Drop support for Qt 5.15.2

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

 eclass/qt5-build.eclass | 51 ++++++++++---------------------------------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3c8f92f9..6da97387 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -97,10 +97,8 @@ inherit estack flag-o-matic toolchain-funcs virtualx
 
 if [[ ${PN} != qtwebengine ]]; then
 	case ${PV} in
-		5.15.2* | *9999 )
-			# kde/5.15 branch or Qt5PatchCollection based on Qt 5.15.2
-			# (using KDE_ORG_COMMIT)
-			inherit kde.org
+		*9999 )
+			inherit kde.org # kde/5.15 branch
 			;;
 		5.15.[3-9]* )
 			# official stable release
@@ -125,22 +123,15 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
 
-case ${PV} in
-	5.15.2*)
-		SLOT=5/$(ver_cut 1-2)
-		;;
+case ${PN} in
+	assistant|linguist|qdbus|qdbusviewer|pixeltool)
+		SLOT=0 ;;
+	linguist-tools|qdoc|qtdiag|qtgraphicaleffects|qtimageformats| \
+	qtpaths|qtplugininfo|qtquickcontrols|qtquicktimeline| \
+	qttranslations|qtwaylandscanner|qtxmlpatterns)
+		SLOT=5 ;;
 	*)
-		case ${PN} in
-			assistant|linguist|qdbus|qdbusviewer|pixeltool)
-				SLOT=0 ;;
-			linguist-tools|qdoc|qtdiag|qtgraphicaleffects|qtimageformats| \
-			qtpaths|qtplugininfo|qtquickcontrols|qtquicktimeline| \
-			qttranslations|qtwaylandscanner|qtxmlpatterns)
-				SLOT=5 ;;
-			*)
-				SLOT=5/$(ver_cut 1-2) ;;
-		esac
-		;;
+		SLOT=5/$(ver_cut 1-2) ;;
 esac
 
 IUSE="debug test"
@@ -174,10 +165,6 @@ qt5-build_src_prepare() {
 			einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
 			mkdir -p .git || die # need to fake a git repository for configure
 		fi
-		# Ensure our ${QT5_PV} is not contradicted by any upstream (Qt) commit
-		# bumping version in 5.15 branch after release (probably can be dropped
-		# after 5.15.2_p* are gone)
-		sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
 	fi
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
@@ -289,24 +276,6 @@ qt5-build_src_install() {
 		sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
-
-		if ver_test -lt 5.15.2-r10; then
-			# install qtchooser configuration file
-			cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
-				${QT5_BINDIR}
-				${QT5_LIBDIR}
-			_EOF_
-
-			(
-				insinto /etc/xdg/qtchooser
-				doins "${T}/qt5-${CHOST}.conf"
-			)
-
-			# convenience symlinks
-			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
-			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
-			dosym qt5.conf /etc/xdg/qtchooser/default.conf
-		fi
 	fi
 
 	qt5_install_module_config

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

[Andreas Sturmlechner]

commit:     4777a2c149b3fd6298b6f49ea5591537d62e2bc2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 20:29:29 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:45:39 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4777a2c1

*.eclass: @ECLASS-VARIABLE renamed to @ECLASS_VARIABLE

Bug: https://bugs.gentoo.org/835396
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0a5a7ff3..3c8f92f9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -20,7 +20,7 @@ case ${EAPI} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-# @ECLASS-VARIABLE: QT5_BUILD_TYPE
+# @ECLASS_VARIABLE: QT5_BUILD_TYPE
 # @DESCRIPTION:
 # Default value is "release".
 # If PV matches "*9999*", this is automatically set to "live".
@@ -30,7 +30,7 @@ if [[ ${PV} == *9999* ]]; then
 fi
 readonly QT5_BUILD_TYPE
 
-# @ECLASS-VARIABLE: QT5_KDEPATCHSET_REV
+# @ECLASS_VARIABLE: QT5_KDEPATCHSET_REV
 # @DEFAULT_UNSET
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -44,32 +44,32 @@ readonly QT5_BUILD_TYPE
 # Used for SRC_URI and applied in src_prepare.
 # Must be set before inheriting the eclass.
 
-# @ECLASS-VARIABLE: QT5_MODULE
+# @ECLASS_VARIABLE: QT5_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
 # The upstream name of the module this package belongs to. Used for
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
-# @ECLASS-VARIABLE: QT5_PV
+# @ECLASS_VARIABLE: QT5_PV
 # @DESCRIPTION:
 # 3-component version for use in dependency declarations on other dev-qt/ pkgs.
 QT5_PV=$(ver_cut 1-3)
 readonly QT5_PV
 
-# @ECLASS-VARIABLE: _QT5_P
+# @ECLASS_VARIABLE: _QT5_P
 # @INTERNAL
 # @DESCRIPTION:
 # The upstream package name of the module this package belongs to.
 # Used for SRC_URI and S.
 
-# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
+# @ECLASS_VARIABLE: QT5_TARGET_SUBDIRS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array variable containing the source directories that should be built.
 # All paths must be relative to ${S}.
 
-# @ECLASS-VARIABLE: QT5_GENTOO_CONFIG
+# @ECLASS_VARIABLE: QT5_GENTOO_CONFIG
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array of <useflag:feature:macro> triplets that are evaluated in src_install
@@ -77,7 +77,7 @@ readonly QT5_PV
 # definitions, which are then merged together with all other Qt5 packages
 # installed on the system to obtain the global qconfig.{h,pri} files.
 
-# @ECLASS-VARIABLE: QT5_GENTOO_PRIVATE_CONFIG
+# @ECLASS_VARIABLE: QT5_GENTOO_PRIVATE_CONFIG
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Array of <useflag:feature> pairs that are evaluated in src_install
@@ -85,7 +85,7 @@ readonly QT5_PV
 # which are then merged together with all other Qt5 packages installed on the
 # system to obtain the global qmodule.pri file.
 
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @ECLASS_VARIABLE: VIRTUALX_REQUIRED
 # @PRE_INHERIT
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
@@ -117,7 +117,7 @@ if [[ ${PN} != qtwebengine ]]; then
 	esac
 fi
 
-# @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @ECLASS_VARIABLE: QT5_BUILD_DIR
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.

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

[Andreas Sturmlechner]

commit:     f747303f5f8c53cc2d6566d2c50a500788019db5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 22:47:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:04:45 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f747303f

qt5-build.eclass: Change SLOTing in 5.15.3

- 0 for binary only (user-facing) tools not tied to specific Qt major version
- 5 (clean) for binary only/unversioned plugins/files-only/non-private headers
- 5/$(ver_cut 1-2) for everything else; unless overridden by ebuild
- No change for 5.15.2 ebuilds

dev-qt/qtxmlpatterns was added to clean "5" slot because development is dead.

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

 eclass/qt5-build.eclass | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 921f4f27..0a5a7ff3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -124,7 +124,25 @@ fi
 : ${QT5_BUILD_DIR:=${S}_build}
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-SLOT=5/$(ver_cut 1-2)
+
+case ${PV} in
+	5.15.2*)
+		SLOT=5/$(ver_cut 1-2)
+		;;
+	*)
+		case ${PN} in
+			assistant|linguist|qdbus|qdbusviewer|pixeltool)
+				SLOT=0 ;;
+			linguist-tools|qdoc|qtdiag|qtgraphicaleffects|qtimageformats| \
+			qtpaths|qtplugininfo|qtquickcontrols|qtquicktimeline| \
+			qttranslations|qtwaylandscanner|qtxmlpatterns)
+				SLOT=5 ;;
+			*)
+				SLOT=5/$(ver_cut 1-2) ;;
+		esac
+		;;
+esac
+
 IUSE="debug test"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then

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

[Andreas Sturmlechner]

commit:     64370c71231259a942e981b7436e81023c6e5254
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 18:41:24 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:04:45 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=64370c71

qt5-build.eclass: New helper function: qt5_symlink_binary_to_path()

Symlink necessary tools to /usr/bin

According to upstream discussion on Qt6 recommended tools to be in PATH.
See also: https://lists.qt-project.org/pipermail/development/2020-November/040626.html

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

 eclass/qt5-build.eclass | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8242db0b..921f4f27 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -316,6 +316,16 @@ qt5-build_pkg_postrm() {
 
 ######  Public helpers  ######
 
+# @FUNCTION: qt5_symlink_binary_to_path
+# @USAGE: <target binary name> [suffix]
+# @DESCRIPTION:
+# Symlink a given binary from QT5_BINDIR to QT5_PREFIX/bin, with optional suffix
+qt5_symlink_binary_to_path() {
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
+	dosym -r "${QT5_BINDIR}"/${1} /usr/bin/${1}${2}
+}
+
 # @FUNCTION: qt_use
 # @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:

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

[Andreas Sturmlechner]

commit:     f8f26d895d3323cc99f02128d6cb6d08f9a06bdc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  6 18:30:30 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 13:54:25 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f8f26d89

qt5-build.eclass: Add support for Qt 5.15.3 (and future) tarballs

KDE Qt5PatchCollection patches will be applied on top of v5.15.3-lts-lgpl

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

 eclass/qt5-build.eclass | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 757afa85..8242db0b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -30,6 +30,20 @@ if [[ ${PV} == *9999* ]]; then
 fi
 readonly QT5_BUILD_TYPE
 
+# @ECLASS-VARIABLE: QT5_KDEPATCHSET_REV
+# @DEFAULT_UNSET
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Downstream generated patchset revision pulled from KDE's Qt5PatchCollection,
+# with the patchset having been generated in the following way from upstream's
+# qt module git repository:
+# @CODE
+# git format-patch v${PV}-lts-lgpl..origin/gentoo-kde/${PV} \
+#	-o ${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}
+# @CODE
+# Used for SRC_URI and applied in src_prepare.
+# Must be set before inheriting the eclass.
+
 # @ECLASS-VARIABLE: QT5_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -48,7 +62,6 @@ readonly QT5_PV
 # @DESCRIPTION:
 # The upstream package name of the module this package belongs to.
 # Used for SRC_URI and S.
-_QT5_P=${QT5_MODULE}-everywhere-src-${PV}
 
 # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
 # @DEFAULT_UNSET
@@ -83,15 +96,25 @@ _QT5_P=${QT5_MODULE}-everywhere-src-${PV}
 inherit estack flag-o-matic toolchain-funcs virtualx
 
 if [[ ${PN} != qtwebengine ]]; then
-	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
-		# KDE Qt5PatchCollection
-		inherit kde.org
-	else
-		# official stable release
-		HOMEPAGE="https://www.qt.io/"
-		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
-		S=${WORKDIR}/${_QT5_P}
-	fi
+	case ${PV} in
+		5.15.2* | *9999 )
+			# kde/5.15 branch or Qt5PatchCollection based on Qt 5.15.2
+			# (using KDE_ORG_COMMIT)
+			inherit kde.org
+			;;
+		5.15.[3-9]* )
+			# official stable release
+			_QT5_P=${QT5_MODULE}-everywhere-opensource-src-${PV}
+			HOMEPAGE="https://www.qt.io/"
+			SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
+			# KDE Qt5PatchCollection on top of tag v${PV}-lts-lgpl
+			if [[ -n ${QT5_KDEPATCHSET_REV} ]]; then
+				HOMEPAGE+=" https://invent.kde.org/qt/qt/${QT5_MODULE} https://community.kde.org/Qt5PatchCollection"
+				SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}.tar.xz"
+			fi
+			S="${WORKDIR}"/${_QT5_P/opensource-}
+			;;
+	esac
 fi
 
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
@@ -163,6 +186,8 @@ qt5-build_src_prepare() {
 		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
 	fi
 
+	[[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"
+
 	default
 }
 

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

[Andreas Sturmlechner]

commit:     4ce41369c608d6489a6d38fc409da7869e4c24e6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 09:49:30 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 09:49:30 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4ce41369

qt5-build.eclass: Update comment regarding MODULE_VERSION downpatching

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

 eclass/qt5-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a2a72bde..757afa85 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -129,13 +129,13 @@ qt5-build_src_prepare() {
 	qt5_prepare_env
 
 	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
-		# Upstream bumped version in 5.15 branch after 5.15.2 release but their
-		# 5.15.3 release is closed and this will never be more than a Qt 5.15.2
-		# with patches on top.
 		if [[ -n ${KDE_ORG_COMMIT} ]]; then
 			einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
 			mkdir -p .git || die # need to fake a git repository for configure
 		fi
+		# Ensure our ${QT5_PV} is not contradicted by any upstream (Qt) commit
+		# bumping version in 5.15 branch after release (probably can be dropped
+		# after 5.15.2_p* are gone)
 		sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
 	fi
 

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

[Andreas Sturmlechner]

commit:     20465e2c89ccbaa50b691cc8b0db390ca1e3e196
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 20:54:23 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 15:49:19 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=20465e2c

qt5-build.eclass: remove kernel_FreeBSD

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

 eclass/qt5-build.eclass | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8756d6e5..a2a72bde 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -490,13 +490,6 @@ qt5_base_configure() {
 		-testsdir "${QT5_TESTSDIR}"
 
 		# force appropriate compiler
-		$(if use kernel_FreeBSD; then
-			if tc-is-gcc; then
-				echo -platform freebsd-g++
-			elif tc-is-clang; then
-				echo -platform freebsd-clang
-			fi
-		fi)
 		$(if use kernel_linux; then
 			if tc-is-gcc; then
 				echo -platform linux-g++

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

[Andreas Sturmlechner]

commit:     3c50b1281e86e34074558790346289b0c43e82f1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 16:36:05 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 17:15:57 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c50b128

qt6-build.eclass: Add missing RESTRICT="!test? ( test )"

Follow-up to c47eda67b875e004e765d1b5a11d67eff51823ee but for Qt6.

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

 eclass/qt6-build.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index fa82952e..3711a0ae 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -84,7 +84,11 @@ EGIT_REPO_URI=(
 
 IUSE="debug test"
 
-[[ ${QT6_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	RESTRICT="test" # bug 457182
+else
+	RESTRICT="!test? ( test )"
+fi
 
 BDEPEND="
 	dev-lang/perl

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

[Jimi Huotari]

commit:     04b92f8139dfcb0f97a411b87c09e29f1ad43886
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 22:12:26 2020 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 06:07:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=04b92f81

qt6-build.eclass: Add stub eclass

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

 eclass/qt6-build.eclass | 132 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
new file mode 100644
index 00000000..91188291
--- /dev/null
+++ b/eclass/qt6-build.eclass
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: qt6-build.eclass
+# @MAINTAINER:
+# qt@gentoo.org
+# @AUTHOR:
+# Davide Pesavento <pesa@gentoo.org>
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Eclass for Qt6 split ebuilds.
+# @DESCRIPTION:
+# This eclass contains various functions that are used when building Qt6.
+# Requires EAPI 7.
+
+if [[ ${CATEGORY} != dev-qt ]]; then
+	die "qt6-build.eclass is only to be used for building Qt 6"
+fi
+
+case ${EAPI} in
+	7)	: ;;
+	*)	die "qt6-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+esac
+
+# @ECLASS-VARIABLE: QT6_MODULE
+# @PRE_INHERIT
+# @DESCRIPTION:
+# The upstream name of the module this package belongs to. Used for
+# SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
+: ${QT6_MODULE:=${PN}}
+
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# For proper description see virtualx.eclass man page.
+# 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 cmake virtualx
+
+HOMEPAGE="https://www.qt.io/"
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+SLOT=6/$(ver_cut 1-2)
+
+QT6_MINOR_VERSION=$(ver_cut 2)
+readonly QT6_MINOR_VERSION
+
+case ${PV} in
+	6.9999)
+		# git dev branch
+		QT6_BUILD_TYPE="live"
+		EGIT_BRANCH="dev"
+		;;
+	6.?.9999|6.??.9999)
+		# git stable branch
+		QT6_BUILD_TYPE="live"
+		EGIT_BRANCH=${PV%.9999}
+		;;
+	*_alpha*|*_beta*|*_rc*)
+		# development release
+		QT6_BUILD_TYPE="release"
+		MY_P=${QT6_MODULE}-everywhere-src-${PV/_/-}
+		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+		;;
+	*)
+		# official stable release
+		QT6_BUILD_TYPE="release"
+		MY_P=${QT6_MODULE}-everywhere-src-${PV}
+		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+		;;
+esac
+readonly QT6_BUILD_TYPE
+
+EGIT_REPO_URI=(
+	"https://code.qt.io/qt/${QT6_MODULE}.git"
+	"https://github.com/qt/${QT6_MODULE}.git"
+)
+[[ ${QT6_BUILD_TYPE} == live ]] && inherit git-r3
+
+# @ECLASS-VARIABLE: QT6_BUILD_DIR
+# @OUTPUT_VARIABLE
+# @DESCRIPTION:
+# Build directory for out-of-source builds.
+: ${QT6_BUILD_DIR:=${S}_build}
+
+IUSE="debug test"
+
+[[ ${QT6_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+"
+if [[ ${PN} != qttest ]]; then
+	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
+fi
+RDEPEND="
+	dev-qt/qtchooser
+"
+
+######  Public helpers  ######
+
+######  Internal functions  ######
+
+# @FUNCTION: qt6_prepare_env
+# @INTERNAL
+# @DESCRIPTION:
+# Prepares the environment for building Qt.
+qt6_prepare_env() {
+	# setup installation directories
+	# note: keep paths in sync with qmake-utils.eclass
+	QT6_PREFIX=${EPREFIX}/usr
+	QT6_HEADERDIR=${QT6_PREFIX}/include/qt6
+	QT6_LIBDIR=${QT6_PREFIX}/$(get_libdir)
+	QT6_ARCHDATADIR=${QT6_PREFIX}/$(get_libdir)/qt6
+	QT6_BINDIR=${QT6_ARCHDATADIR}/bin
+	QT6_PLUGINDIR=${QT6_ARCHDATADIR}/plugins
+	QT6_LIBEXECDIR=${QT6_ARCHDATADIR}/libexec
+	QT6_IMPORTDIR=${QT6_ARCHDATADIR}/imports
+	QT6_QMLDIR=${QT6_ARCHDATADIR}/qml
+	QT6_DATADIR=${QT6_PREFIX}/share/qt6
+	QT6_DOCDIR=${QT6_PREFIX}/share/qt6-doc
+	QT6_TRANSLATIONDIR=${QT6_DATADIR}/translations
+	QT6_EXAMPLESDIR=${QT6_DATADIR}/examples
+	QT6_TESTSDIR=${QT6_DATADIR}/tests
+	QT6_SYSCONFDIR=${EPREFIX}/etc/xdg
+	readonly QT6_PREFIX QT6_HEADERDIR QT6_LIBDIR QT6_ARCHDATADIR \
+		QT6_BINDIR QT6_PLUGINDIR QT6_LIBEXECDIR QT6_IMPORTDIR \
+		QT6_QMLDIR QT6_DATADIR QT6_DOCDIR QT6_TRANSLATIONDIR \
+		QT6_EXAMPLESDIR QT6_TESTSDIR QT6_SYSCONFDIR
+}

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

[Jimi Huotari]

commit:     c543f0261f7c58279b406d021a98138b12a907f3
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 20:31:10 2021 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 06:08:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c543f026

qt6-build.eclass: add functions and update EAPI

Also remove references to qtchooser, and comment out qttest package
which has not been split from qtbase at this time.

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt6-build.eclass | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 91188291..fa82952e 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -1,23 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt6-build.eclass
 # @MAINTAINER:
 # qt@gentoo.org
-# @AUTHOR:
-# Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Eclass for Qt6 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt6.
-# Requires EAPI 7.
+# Requires EAPI 8.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
 	die "qt6-build.eclass is only to be used for building Qt 6"
 fi
 
 case ${EAPI} in
-	7)	: ;;
+	8)	: ;;
 	*)	die "qt6-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
@@ -92,15 +90,42 @@ BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
-if [[ ${PN} != qttest ]]; then
-	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
-fi
-RDEPEND="
-	dev-qt/qtchooser
-"
+# TODO: Tests have not been split from qtbase.
+#if [[ ${PN} != qttest ]]; then
+#	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
+#fi
+
+EXPORT_FUNCTIONS src_prepare src_configure
+
+######  Phase functions  ######
+
+# @FUNCTION: qt6-build_src_prepare
+# @DESCRIPTION:
+# Prepares the environment and patches the sources if necessary.
+qt6-build_src_prepare() {
+	qt6_prepare_env
+
+	cmake_src_prepare
+}
+
+# @FUNCTION: qt6-build_src_configure
+# @DESCRIPTION:
+# Configures sources.
+qt6-build_src_configure() {
+	cmake_src_configure
+}
 
 ######  Public helpers  ######
 
+# @FUNCTION: qt_feature
+# @USAGE: <flag> [feature]
+# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+qt_feature() {
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+	echo "-DQT_FEATURE_${2:-$1}=$(usex $1 ON OFF)"
+}
+
 ######  Internal functions  ######
 
 # @FUNCTION: qt6_prepare_env

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

[Jimi Huotari]

commit:     39366055b71b842f4637a1e9ed137ad00c0b78ac
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 20:21:52 2021 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 06:08:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=39366055

qmake-utils.eclass: Preliminary qt6_get_*dir support

Rebased changes from patch by Andreas Sturmlechner [1].

1. https://github.com/gentoo/qt/pull/224

Closes: https://github.com/gentoo/qt/pull/224
Thanks-to: Andreas Sturmlechner <asturm <AT> gentoo.org>
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qmake-utils.eclass | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 1f09cbd9..345c574a 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -60,6 +60,42 @@ qt5_get_plugindir() {
 	echo $(qt5_get_libdir)/qt5/plugins
 }
 
+# @FUNCTION: qt6_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 binaries are installed.
+# EPREFIX is already prepended to the returned path.
+qt6_get_bindir() {
+	echo ${EPREFIX}$(qt6_get_libdir)/qt6/bin
+}
+
+# @FUNCTION: qt6_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 headers are installed.
+qt6_get_headerdir() {
+	echo /usr/include/qt6
+}
+
+# @FUNCTION: qt6_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 libraries are installed.
+qt6_get_libdir() {
+	echo /usr/$(get_libdir)
+}
+
+# @FUNCTION: qt6_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 mkspecs are installed.
+qt6_get_mkspecsdir() {
+	echo $(qt6_get_libdir)/qt6/mkspecs
+}
+
+# @FUNCTION: qt6_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 plugins are installed.
+qt6_get_plugindir() {
+	echo $(qt6_get_libdir)/qt6/plugins
+}
+
 # @FUNCTION: eqmake5
 # @USAGE: [arguments for qmake]
 # @DESCRIPTION:

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

[Andreas Sturmlechner]

commit:     edbc3c52339c596ada3226f2c008b0743208cdb7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 21:52:30 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 15:43:38 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=edbc3c52

qt5-build.eclass: Downpatch version of live to 5.15.2 too

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

 eclass/qt5-build.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a320a78d..8756d6e5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -128,13 +128,15 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
-	if [[ -n ${KDE_ORG_COMMIT} ]]; then
+	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
 		# Upstream bumped version in 5.15 branch after 5.15.2 release but their
 		# 5.15.3 release is closed and this will never be more than a Qt 5.15.2
 		# with patches on top.
-		einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
+		if [[ -n ${KDE_ORG_COMMIT} ]]; then
+			einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
+			mkdir -p .git || die # need to fake a git repository for configure
+		fi
 		sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
-		mkdir -p .git || die # need to fake a git repository for configure
 	fi
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then

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

[Andreas Sturmlechner]

commit:     7bdafe706c39de34b751bbccebf2e0c7bfe06135
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 21:33:24 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  7 15:43:38 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=7bdafe70

qt5-build.eclass: Introduce QT5_PV for intra-dev-qt deps

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

 eclass/qt5-build.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 40c9387a..a320a78d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -37,6 +37,12 @@ readonly QT5_BUILD_TYPE
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
+# @ECLASS-VARIABLE: QT5_PV
+# @DESCRIPTION:
+# 3-component version for use in dependency declarations on other dev-qt/ pkgs.
+QT5_PV=$(ver_cut 1-3)
+readonly QT5_PV
+
 # @ECLASS-VARIABLE: _QT5_P
 # @INTERNAL
 # @DESCRIPTION:
@@ -109,7 +115,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
-	DEPEND+=" test? ( ~dev-qt/qttest-$(ver_cut 1-3) )"
+	DEPEND+=" test? ( =dev-qt/qttest-${QT5_PV}* )"
 fi
 
 ######  Phase functions  ######
@@ -127,7 +133,7 @@ qt5-build_src_prepare() {
 		# 5.15.3 release is closed and this will never be more than a Qt 5.15.2
 		# with patches on top.
 		einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
-		sed -e "/^MODULE_VERSION/s/5\.15\.3/5\.15\.2/" -i .qmake.conf || die
+		sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
 		mkdir -p .git || die # need to fake a git repository for configure
 	fi
 

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

[Andreas Sturmlechner]

commit:     18416c5d4797ba363d217e574e967c15aaf39eaa
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 11:17:11 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  5 18:23:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=18416c5d

qt5-build.eclass: Always run qt5_tools_configure for QT5_MODULE=qttools

Run qt5_qmake directly inside qt5_tools_configure(), copy the resulting
qttools-config.pri into QT5_BUILD_DIR again.

Add linguist-tools handling.

Bug: https://bugs.gentoo.org/728278
Bug: https://bugs.gentoo.org/811147
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4f687c8a..40c9387a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -166,7 +166,7 @@ qt5-build_src_configure() {
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_base_configure
 	fi
-	if [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then
+	if [[ ${QT5_MODULE} == qttools ]]; then
 		qt5_tools_configure
 	fi
 
@@ -643,7 +643,10 @@ qt5_base_configure() {
 # @FUNCTION: qt5_tools_configure
 # @INTERNAL
 # @DESCRIPTION:
-# Disables modules other than ${PN} belonging to qttools.
+# Most of qttools require files that are only generated when qmake is
+# run in the root directory. Related bugs: 676948, 716514.
+# Runs qt5_qmake in root directory to create qttools-config.pri and copy to
+# ${QT5_BUILD_DIR}, disabling modules other than ${PN} belonging to qttools.
 qt5_tools_configure() {
 	# configure arguments
 	local qmakeargs=(
@@ -659,13 +662,21 @@ qt5_tools_configure() {
 		-no-feature-winrtrunner
 	)
 
-	local i
+	local i module=${PN}
+	case ${PN} in
+		linguist-tools) module=linguist ;;
+		*) ;;
+	esac
 	for i in assistant designer linguist pixeltool qdbus qdoc qtdiag qtpaths qtplugininfo; do
-		[[ ${PN} == ${i} ]] || qmakeargs+=( -no-feature-${i} )
+		[[ ${module} != ${i} ]] && qmakeargs+=( -no-feature-${i} )
 	done
 
 	# allow the ebuild to override what we set here
 	myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" )
+
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT5_BUILD_DIR}"
+	cp qttools-config.pri "${QT5_BUILD_DIR}" || die
 }
 
 # @FUNCTION: qt5_qmake_args

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

[Andreas Sturmlechner]

commit:     4bc5554165042bc12f95b7c66743111fcf7b766b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 13:55:26 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 13:55:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4bc55541

qt5-build.eclass: Sync dev-qt/qtcore blocker w/ Gentoo ebuild repo

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 13d50a8a..4f687c8a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -239,7 +239,7 @@ qt5-build_src_install() {
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 
-		if ver_test -lt 5.15.2-r3; then
+		if ver_test -lt 5.15.2-r10; then
 			# install qtchooser configuration file
 			cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
 				${QT5_BINDIR}

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

[Andreas Sturmlechner]

commit:     aa1f9aa2da019d228268a0c327b6c7075a7e8884
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 18:47:58 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 20 12:34:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=aa1f9aa2

qt5-build.eclass: Drop EAPI-7 support

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

 eclass/qt5-build.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fe23e5da..13d50a8a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -6,7 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
@@ -16,7 +16,7 @@ if [[ ${CATEGORY} != dev-qt ]]; then
 fi
 
 case ${EAPI} in
-	7|8) ;;
+	8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -99,9 +99,9 @@ SLOT=5/$(ver_cut 1-2)
 IUSE="debug test"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	RESTRICT+=" test" # bug 457182
+	RESTRICT="test" # bug 457182
 else
-	RESTRICT+=" !test? ( test )"
+	RESTRICT="!test? ( test )"
 fi
 
 BDEPEND="

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

[Andreas Sturmlechner]

commit:     5660a1787f797e35d75ff1dc486b398629cf4a80
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 19:02:16 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 13:09:20 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5660a178

qt5-build.eclass: Drop obsolete conditional for dev-qt/qtwebengine

dev-qt/qtwebengine conditional code already moved into ebuild.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0b2b5518..a2fb90b5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -127,19 +127,6 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	# bug 307861
-	if [[ ${PN} == qtwebengine ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			ewarn
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn
-		fi
-		eshopts_pop
-	fi
-
 	case ${QT5_BUILD_TYPE} in
 		live)    git-r3_src_unpack ;&
 		release) default ;;

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

[Andreas Sturmlechner]

commit:     922b678e0d4a69689b0ad3bc007752aec15c4d04
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  8 19:47:48 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 13:09:38 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=922b678e

qt5-build.eclass: Use kde.org eclass for snapshots and live ebuilds

- Drop unused src_unpack phase
- Snapshots are identified by having KDE_ORG_COMMIT set pre-inherit
- All live ebuilds and snapshots except qtwebengine inherit kde.org.eclass
- SRC_URI, src_unpack handling is done by kde.org.eclass for them

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

 eclass/qt5-build.eclass | 54 ++++++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a2fb90b5..a42fbce9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -76,26 +76,17 @@ _QT5_P=${QT5_MODULE}-everywhere-src-${PV}
 
 inherit estack flag-o-matic toolchain-funcs virtualx
 
-HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-SLOT=5/$(ver_cut 1-2)
-
-case ${PV} in
-	5.15.9999)
-		# KDE upstream for 5.15 patches
-		HOMEPAGE+=" https://invent.kde.org/qt/qt/"
-		EGIT_BRANCH="kde/5.15"
-		;;
-	*)
+if [[ ${PN} != qtwebengine ]]; then
+	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
+		# KDE Qt5PatchCollection
+		inherit kde.org
+	else
 		# official stable release
+		HOMEPAGE="https://www.qt.io/"
 		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
 		S=${WORKDIR}/${_QT5_P}
-		;;
-esac
-
-EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" )
-
-[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
+	fi
+fi
 
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @OUTPUT_VARIABLE
@@ -103,6 +94,8 @@ EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" )
 # Build directory for out-of-source builds.
 : ${QT5_BUILD_DIR:=${S}_build}
 
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+SLOT=5/$(ver_cut 1-2)
 IUSE="debug test"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
@@ -121,17 +114,7 @@ fi
 
 ######  Phase functions  ######
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
-
-# @FUNCTION: qt5-build_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt5-build_src_unpack() {
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 
 # @FUNCTION: qt5-build_src_prepare
 # @DESCRIPTION:
@@ -139,6 +122,15 @@ qt5-build_src_unpack() {
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
+	if [[ -n ${KDE_ORG_COMMIT} ]]; then
+		# Upstream bumped version in 5.15 branch after 5.15.2 release but their
+		# 5.15.3 release is closed and this will never be more than a Qt 5.15.2
+		# with patches on top.
+		einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}"
+		sed -e "/^MODULE_VERSION/s/5\.15\.3/5\.15\.2/" -i .qmake.conf || die
+		mkdir -p .git || die # need to fake a git repository for configure
+	fi
+
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_symlink_tools_to_build_dir
 
@@ -637,9 +629,11 @@ qt5_base_configure() {
 
 	# a forwarding header is no longer created since 5.8, causing the system
 	# config to always be used. bug 599636
-	# ${S}/include does not exist in live sources
+	# ${S}/include does not exist in live sources or kde.org snapshots
 	local basedir="${S}/"
-	[[ ${QT5_BUILD_TYPE} == live ]] && basedir=""
+	if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
+		basedir=""
+	fi
 	cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die
 
 	popd >/dev/null || die

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

[Davide Pesavento]

commit:     a9f1eb1145529b9dba6b2edf4cfaa7bf2baf0bb2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  9 02:09:26 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul  9 02:09:26 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a9f1eb11

qmake-utils.eclass: sync with gentoo.git

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 eclass/qmake-utils.eclass | 78 +++++------------------------------------------
 1 file changed, 7 insertions(+), 71 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 0d49eb94..1f09cbd9 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -6,7 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt5 qmake.
@@ -14,63 +14,15 @@
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
 
-if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
-_QMAKE_UTILS_ECLASS=1
-
 case ${EAPI} in
-	7) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-inherit 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:
-# Banned.
-qt4_get_bindir() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_headerdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_headerdir() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_libdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_libdir() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: qt4_get_mkspecsdir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_mkspecsdir() {
-	_qmake-utils_banned_func
-}
+if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
+_QMAKE_UTILS_ECLASS=1
 
-# @FUNCTION: qt4_get_plugindir
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qt4_get_plugindir() {
-	_qmake-utils_banned_func
-}
+inherit toolchain-funcs
 
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
@@ -108,22 +60,6 @@ qt5_get_plugindir() {
 	echo $(qt5_get_libdir)/qt5/plugins
 }
 
-# @FUNCTION: qmake-utils_find_pro_file
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-qmake-utils_find_pro_file() {
-	_qmake-utils_banned_func
-}
-
-# @FUNCTION: eqmake4
-# @INTERNAL
-# @DESCRIPTION:
-# Banned.
-eqmake4() {
-	_qmake-utils_banned_func
-}
-
 # @FUNCTION: eqmake5
 # @USAGE: [arguments for qmake]
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     393fa008998e17fc523a66bf27d23b35ef136cfa
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  9 02:16:48 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul  9 02:16:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=393fa008

qt5-build.eclass: sync with gentoo.git

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 eclass/qt5-build.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index dbbba44e..0b2b5518 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -10,15 +10,14 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 7.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
-	die "qt5-build.eclass is only to be used for building Qt 5"
+	die "${ECLASS} is only to be used for building Qt 5"
 fi
 
 case ${EAPI} in
-	7)	: ;;
-	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @ECLASS-VARIABLE: QT5_BUILD_TYPE
@@ -26,7 +25,7 @@ esac
 # Default value is "release".
 # If PV matches "*9999*", this is automatically set to "live".
 QT5_BUILD_TYPE=release
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	QT5_BUILD_TYPE=live
 fi
 readonly QT5_BUILD_TYPE
@@ -68,6 +67,7 @@ _QT5_P=${QT5_MODULE}-everywhere-src-${PV}
 # system to obtain the global qmodule.pri file.
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @PRE_INHERIT
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
 # Here we redefine default value to be manual, if your package needs virtualx

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

[Andreas Sturmlechner]

commit:     18c5657a35a360c69942bd8fcfcfcdb57a2e1572
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 19:13:26 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 20:37:27 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=18c5657a

qt5-build.eclass: Rename MY_P to _QT5_P and fix eclassdoc warning

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

 eclass/qt5-build.eclass | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1f2a20cb..dbbba44e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -38,6 +38,13 @@ readonly QT5_BUILD_TYPE
 # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
+# @ECLASS-VARIABLE: _QT5_P
+# @INTERNAL
+# @DESCRIPTION:
+# The upstream package name of the module this package belongs to.
+# Used for SRC_URI and S.
+_QT5_P=${QT5_MODULE}-everywhere-src-${PV}
+
 # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -81,9 +88,8 @@ case ${PV} in
 		;;
 	*)
 		# official stable release
-		MY_P=${QT5_MODULE}-everywhere-src-${PV}
-		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
+		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz"
+		S=${WORKDIR}/${_QT5_P}
 		;;
 esac
 

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

[Andreas Sturmlechner]

commit:     04afc30cc7a44f7ae02f78b6f628e911e2feeca9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 19:19:25 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 20:36:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=04afc30c

qt5-build.eclass: Add eclassdoc for QT5_BUILD_TYPE

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

 eclass/qt5-build.eclass | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 55be9e57..1f2a20cb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -21,6 +21,16 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
+# @ECLASS-VARIABLE: QT5_BUILD_TYPE
+# @DESCRIPTION:
+# Default value is "release".
+# If PV matches "*9999*", this is automatically set to "live".
+QT5_BUILD_TYPE=release
+if [[ ${PV} = *9999* ]]; then
+	QT5_BUILD_TYPE=live
+fi
+readonly QT5_BUILD_TYPE
+
 # @ECLASS-VARIABLE: QT5_MODULE
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -67,18 +77,15 @@ case ${PV} in
 	5.15.9999)
 		# KDE upstream for 5.15 patches
 		HOMEPAGE+=" https://invent.kde.org/qt/qt/"
-		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH="kde/5.15"
 		;;
 	*)
 		# official stable release
-		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-everywhere-src-${PV}
 		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac
-readonly QT5_BUILD_TYPE
 
 EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" )
 

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

[Andreas Sturmlechner]

commit:     6fce05edc9093b4e5b1ff2006e777adc75cc2a7d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 17 19:23:14 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 20:31:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6fce05ed

qt5-build.eclass: Drop QT5_MINOR_VERSION (fixes eclassdoc)

No more usage as qt5-build.eclass supports Qt 5.15 branch exclusively.

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

 eclass/qt5-build.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index de7a371c..7c28397d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -63,9 +63,6 @@ HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
 SLOT=5/$(ver_cut 1-2)
 
-QT5_MINOR_VERSION=$(ver_cut 2)
-readonly QT5_MINOR_VERSION
-
 case ${PV} in
 	5.15.9999)
 		# KDE upstream for 5.15 patches

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

[Andreas Sturmlechner]

commit:     c07868209e90d1a9e9a3e5a7a4f10af7e4606ec5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 18:39:19 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 20:35:54 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c0786820

qt5-build.eclass: Drop _alpha/_beta/_rc tarball support

No more such pre-releases happening for Qt5.

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

 eclass/qt5-build.eclass | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7c28397d..55be9e57 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -70,13 +70,6 @@ case ${PV} in
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH="kde/5.15"
 		;;
-	*_alpha*|*_beta*|*_rc*)
-		# development release
-		QT5_BUILD_TYPE="release"
-		MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
-		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-		;;
 	*)
 		# official stable release
 		QT5_BUILD_TYPE="release"

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

[Jimi Huotari]

commit:     b58c4def05ffeb42c562268ae6fbab70817fb820
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 11 16:43:51 2021 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 07:52:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b58c4def

qt5-build.eclass: switch sources to KDE upstream for 5.15 live builds

The KDE community has started [1] maintaining a repository with patches for
the open-source Qt 5.15 branch.

1. https://mail.kde.org/pipermail/distributions/2021-April/000984.html

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt5-build.eclass | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e33511bb..de7a371c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -67,10 +67,11 @@ QT5_MINOR_VERSION=$(ver_cut 2)
 readonly QT5_MINOR_VERSION
 
 case ${PV} in
-	5.??.9999)
-		# git stable branch
+	5.15.9999)
+		# KDE upstream for 5.15 patches
+		HOMEPAGE+=" https://invent.kde.org/qt/qt/"
 		QT5_BUILD_TYPE="live"
-		EGIT_BRANCH=${PV%.9999}
+		EGIT_BRANCH="kde/5.15"
 		;;
 	*_alpha*|*_beta*|*_rc*)
 		# development release
@@ -89,10 +90,8 @@ case ${PV} in
 esac
 readonly QT5_BUILD_TYPE
 
-EGIT_REPO_URI=(
-	"https://code.qt.io/qt/${QT5_MODULE}.git"
-	"https://github.com/qt/${QT5_MODULE}.git"
-)
+EGIT_REPO_URI=( "https://invent.kde.org/qt/qt/${QT5_MODULE}.git" )
+
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
 
 # @ECLASS-VARIABLE: QT5_BUILD_DIR

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

[Andreas Sturmlechner]

commit:     1c192cd021f2c7b6cbde50721d2910b20986e9be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 22:03:31 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 22:03:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=1c192cd0

qt5-build.eclass: Use ~dev-qt/qttest-$(ver_cut 1-3) as orig. intended

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b22ece80..e33511bb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -114,7 +114,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
-	DEPEND+=" test? ( >=dev-qt/qttest-5.15.2:5 )"
+	DEPEND+=" test? ( ~dev-qt/qttest-$(ver_cut 1-3) )"
 fi
 
 ######  Phase functions  ######

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

[Andreas Sturmlechner]

commit:     34a5186cdedc95146f3c21f8afacb39abe02e609
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 00:42:31 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 00:42:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=34a5186c

qt5-build.eclass: Actually should pin to slot 5 with >= Qt deps

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b2f9c8cb..b22ece80 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -114,7 +114,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
-	DEPEND+=" test? ( >=dev-qt/qttest-5.15.2 )"
+	DEPEND+=" test? ( >=dev-qt/qttest-5.15.2:5 )"
 fi
 
 ######  Phase functions  ######

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

[Andreas Sturmlechner]

commit:     82b015ddcd824cafbc610997180031fe4cd2f81c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 10:35:36 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 00:40:28 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=82b015dd

qt5-build.eclass: Make dev-qt/qttest dependency work for qtwebengine snapshot

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index be6e88b3..b2f9c8cb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -114,7 +114,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
-	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
+	DEPEND+=" test? ( >=dev-qt/qttest-5.15.2 )"
 fi
 
 ######  Phase functions  ######

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

[Andreas Sturmlechner]

commit:     5e9138d23d7e032d5e91ff81f98795ddb5d6eeb1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 16:16:08 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 16:16:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5e9138d2

qt5-build.eclass: Drop obsolete pre-5.15.2 quirk

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

 eclass/qt5-build.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5e15ab3d..be6e88b3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -116,9 +116,6 @@ BDEPEND="
 if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
-if ver_test -lt 5.15.2; then
-	RDEPEND+=" dev-qt/qtchooser"
-fi
 
 ######  Phase functions  ######
 

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

[Andreas Sturmlechner]

commit:     cb4829c9aebc800b0270d8d4df56ebe6f325ea83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 19:00:21 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 19:00:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=cb4829c9

qt5-build.eclass: Limit qtchooser config install to <5.15.2-r3

Syncing with dev-qt/qtcore-5.15.2-r2 in Gentoo ebuild repo.

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

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8e586c83..5e15ab3d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -261,7 +261,7 @@ qt5-build_src_install() {
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 
-		if ver_test -lt 5.15.2-r2; then
+		if ver_test -lt 5.15.2-r3; then
 			# install qtchooser configuration file
 			cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
 				${QT5_BINDIR}

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

[Andreas Sturmlechner]

commit:     c47eda67b875e004e765d1b5a11d67eff51823ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 17:29:56 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  1 17:29:56 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c47eda67

qt5-build.eclass: Add missing RESTRICT+=" !test? ( test )"

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

 eclass/qt5-build.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 503d0c3f..8e586c83 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -103,7 +103,11 @@ EGIT_REPO_URI=(
 
 IUSE="debug test"
 
-[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	RESTRICT+=" test" # bug 457182
+else
+	RESTRICT+=" !test? ( test )"
+fi
 
 BDEPEND="
 	dev-lang/perl

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

[Andreas Sturmlechner]

commit:     dcf4883249bd38dcec81d93ae22ab899eae7f1db
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 13:57:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 01:32:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dcf48832

qt5-build.eclass: Limit RDEPEND on qtchooser to Qt versions <5.15.2

Install qtchooser configuration only for <=dev-qt/qtcore-5.15.2-r1

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

 eclass/qt5-build.eclass | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ad7f6a64..503d0c3f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -112,10 +112,9 @@ BDEPEND="
 if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
-RDEPEND="
-	dev-qt/qtchooser
-"
-
+if ver_test -lt 5.15.2; then
+	RDEPEND+=" dev-qt/qtchooser"
+fi
 
 ######  Phase functions  ######
 
@@ -258,22 +257,23 @@ qt5-build_src_install() {
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 
-		# install qtchooser configuration file
-		cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
-			${QT5_BINDIR}
-			${QT5_LIBDIR}
-		_EOF_
-
-		(
-			insinto /etc/xdg/qtchooser
-			doins "${T}/qt5-${CHOST}.conf"
-		)
-
-		# convenience symlinks
-		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
-		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
-		# TODO bug 522646: write an eselect module to manage default.conf
-		dosym qt5.conf /etc/xdg/qtchooser/default.conf
+		if ver_test -lt 5.15.2-r2; then
+			# install qtchooser configuration file
+			cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
+				${QT5_BINDIR}
+				${QT5_LIBDIR}
+			_EOF_
+
+			(
+				insinto /etc/xdg/qtchooser
+				doins "${T}/qt5-${CHOST}.conf"
+			)
+
+			# convenience symlinks
+			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
+			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
+			dosym qt5.conf /etc/xdg/qtchooser/default.conf
+		fi
 	fi
 
 	qt5_install_module_config

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

[Andreas Sturmlechner]

commit:     92022b7fdc3c5de61fb93505d9c9befcec4ac307
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 17:14:11 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 11:13:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=92022b7f

qmake-utils.eclass: Ban qmake-utils_find_pro_file() as well

Always marked as @INTERNAL and no remaining users in gentoo.git.

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

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

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 79dbc8c0..0d49eb94 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -22,7 +22,7 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit estack toolchain-funcs
+inherit toolchain-funcs
 
 # @FUNCTION: _qmake-utils_banned_func
 # @INTERNAL
@@ -109,38 +109,11 @@ qt5_get_plugindir() {
 }
 
 # @FUNCTION: qmake-utils_find_pro_file
-# @RETURN: zero or one qmake .pro file names
 # @INTERNAL
 # @DESCRIPTION:
-# Outputs a project file name that can be passed to eqmake.
-#   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 one of them.
+# Banned.
 qmake-utils_find_pro_file() {
-	local dir_name=$(basename "${S}")
-
-	# set nullglob to avoid expanding *.pro to the literal
-	# string "*.pro" when there are no matching files
-	eshopts_push -s nullglob
-	local pro_files=(*.pro)
-	eshopts_pop
-
-	case ${#pro_files[@]} in
-	0)
-		: ;;
-	1)
-		echo "${pro_files}"
-		;;
-	*)
-		for pro_file in "${pro_files[@]}"; do
-			if [[ ${pro_file%.pro} == ${dir_name} || ${pro_file%.pro} == ${PN} ]]; then
-				echo "${pro_file}"
-				break
-			fi
-		done
-		;;
-	esac
+	_qmake-utils_banned_func
 }
 
 # @FUNCTION: eqmake4

[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@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @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

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

[Andreas Sturmlechner]

commit:     103492b058a9052d08528df571b35465bae10f98
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:29:52 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 20:44:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=103492b0

qt5-build.eclass: Drop obsolete pre-Qt-5.15 quirks

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

 eclass/qt5-build.eclass | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cb385ea2..ad7f6a64 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -185,7 +185,7 @@ qt5-build_src_configure() {
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_base_configure
 	fi
-	if [[ ${QT5_MINOR_VERSION} -ge 15 ]] && [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then
+	if [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then
 		qt5_tools_configure
 	fi
 
@@ -564,8 +564,7 @@ qt5_base_configure() {
 
 		# bug 672340
 		-no-xkbcommon
-		$([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput)
-		$([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput)
+		-no-bundled-xcb-xinput
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif
@@ -610,10 +609,6 @@ qt5_base_configure() {
 		# disable all platform plugins by default, override in qtgui
 		-no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb
 
-		# disable undocumented X11-related flags, override in qtgui
-		# (not shown in ./configure -help output)
-		$([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb)
-
 		# always enable session management support: it doesn't need extra deps
 		# at configure time and turning it off is dangerous, see bug 518262
 		-sm

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

[Andreas Sturmlechner]

commit:     3113b67fe5a4a983e3001162944beff55cd96512
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  2 20:07:42 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 20:12:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3113b67f

qt5-build.eclass: Drop dev branch support, closing with 5.15.9999

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

 eclass/qt5-build.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8531d129..cb385ea2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -67,12 +67,7 @@ QT5_MINOR_VERSION=$(ver_cut 2)
 readonly QT5_MINOR_VERSION
 
 case ${PV} in
-	5.9999)
-		# git dev branch
-		QT5_BUILD_TYPE="live"
-		EGIT_BRANCH="dev"
-		;;
-	5.?.9999|5.??.9999|5.???.9999)
+	5.??.9999)
 		# git stable branch
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH=${PV%.9999}

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

[Andreas Sturmlechner]

commit:     c5a8bc30c940374a54bac471f8c116c14448c9cf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 20:35:12 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 08:50:14 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c5a8bc30

qt5-build.eclass: Drop obsolete pre-Qt-5.14.2 quirks

Bug: https://bugs.gentoo.org/676948
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cd2e19b0..8531d129 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -104,11 +104,7 @@ EGIT_REPO_URI=(
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-if ver_test ${PV} -lt 5.14.2; then
-	: ${QT5_BUILD_DIR:=${S}} # workaround for bug 497312
-else
-	: ${QT5_BUILD_DIR:=${S}_build}
-fi
+: ${QT5_BUILD_DIR:=${S}_build}
 
 IUSE="debug test"
 
@@ -663,9 +659,7 @@ qt5_base_configure() {
 	# config to always be used. bug 599636
 	# ${S}/include does not exist in live sources
 	local basedir="${S}/"
-	if ver_test ${PV} -lt 5.14.2 || [[ ${QT5_BUILD_TYPE} == live ]]; then
-		basedir=""
-	fi
+	[[ ${QT5_BUILD_TYPE} == live ]] && basedir=""
 	cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die
 
 	popd >/dev/null || die

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

[Andreas Sturmlechner]

commit:     e678fa5c98edce05279017c60d859dba19c38165
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 08:30:31 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May  9 08:30:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e678fa5c

qt5-build.eclass: Drop pre-Qt 5.14 quirks

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

 eclass/qt5-build.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d82f3d25..cd2e19b0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -568,7 +568,7 @@ qt5_base_configure() {
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
-		$([[ ${QT5_MINOR_VERSION} -ge 14 ]] && echo -no-feature-gssapi)
+		-no-feature-gssapi
 		-no-xcb-xlib
 
 		# bug 672340
@@ -618,7 +618,6 @@ qt5_base_configure() {
 
 		# disable all platform plugins by default, override in qtgui
 		-no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb
-		$([[ ${QT5_MINOR_VERSION} -lt 14 ]] && echo -no-mirclient)
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)

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

[Andreas Sturmlechner]

commit:     f2e99107a9bf5b96497f666bde7bc0cbdb84663f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 22:01:10 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 21:40:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f2e99107

qt5-build.eclass: Introduce qt5_tools_configure

This is run in src_configure for qttools modules unless
QT5_TARGET_SUBDIRS is defined.

Implementing an idea of Chiitoo in the linked PR.

Closes: https://github.com/gentoo/qt/pull/218
Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9a757cce..d82f3d25 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -194,6 +194,9 @@ qt5-build_src_configure() {
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_base_configure
 	fi
+	if [[ ${QT5_MINOR_VERSION} -ge 15 ]] && [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then
+		qt5_tools_configure
+	fi
 
 	qt5_foreach_target_subdir qt5_qmake
 }
@@ -670,6 +673,34 @@ qt5_base_configure() {
 
 }
 
+# @FUNCTION: qt5_tools_configure
+# @INTERNAL
+# @DESCRIPTION:
+# Disables modules other than ${PN} belonging to qttools.
+qt5_tools_configure() {
+	# configure arguments
+	local qmakeargs=(
+		--
+		# not packaged in Gentoo
+		-no-feature-distancefieldgenerator
+		-no-feature-kmap2qmap
+		-no-feature-macdeployqt
+		-no-feature-makeqpf
+		-no-feature-qev
+		-no-feature-qtattributionsscanner
+		-no-feature-windeployqt
+		-no-feature-winrtrunner
+	)
+
+	local i
+	for i in assistant designer linguist pixeltool qdbus qdoc qtdiag qtpaths qtplugininfo; do
+		[[ ${PN} == ${i} ]] || qmakeargs+=( -no-feature-${i} )
+	done
+
+	# allow the ebuild to override what we set here
+	myqmakeargs=( "${qmakeargs[@]}" "${myqmakeargs[@]}" )
+}
+
 # @FUNCTION: qt5_qmake_args
 # @INTERNAL
 # @DESCRIPTION:

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

[Andreas Sturmlechner]

commit:     548df2493d9801b2503f412ec8c424418cb7721b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 12:21:16 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 18:32:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=548df249

qt5-build.eclass: Drop obsolete in-source build workaround for >=5.14.2

Fixed upstream in 5.11.1.

See also: https://bugreports.qt.io/browse/QTBUG-37417
Upstream commit 67aa365d41ebfe082b4efcfd725e4d5f08be678c

qtbase forwarding header was introduced to fix bug 599636 in commit:
d82f92ed064996dfb187ef668d74ed5b05546b2d

Bug: https://bugs.gentoo.org/497312
Bug: https://bugs.gentoo.org/676948
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b5d0b642..9a757cce 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -104,10 +104,11 @@ EGIT_REPO_URI=(
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-case ${QT5_BUILD_TYPE} in
-	live)    : ${QT5_BUILD_DIR:=${S}_build} ;;
-	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
-esac
+if ver_test ${PV} -lt 5.14.2; then
+	: ${QT5_BUILD_DIR:=${S}} # workaround for bug 497312
+else
+	: ${QT5_BUILD_DIR:=${S}_build}
+fi
 
 IUSE="debug test"
 
@@ -658,7 +659,12 @@ qt5_base_configure() {
 
 	# a forwarding header is no longer created since 5.8, causing the system
 	# config to always be used. bug 599636
-	cp src/corelib/global/qconfig.h include/QtCore/ || die
+	# ${S}/include does not exist in live sources
+	local basedir="${S}/"
+	if ver_test ${PV} -lt 5.14.2 || [[ ${QT5_BUILD_TYPE} == live ]]; then
+		basedir=""
+	fi
+	cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die
 
 	popd >/dev/null || die
 

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

[Andreas Sturmlechner]

commit:     90c316e10a5f0e7aff9b7f4fa2bc01e9b97331e2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 11:53:11 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 12:36:24 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=90c316e1

qt5-build.eclass: Add missing -no-feature-gssapi switch

Upstream commit 1a8f4a3c8fa30265e7f184373c738dbc3574663a

Bug: https://bugs.gentoo.org/716754
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 70e9be80..b5d0b642 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -564,6 +564,7 @@ qt5_base_configure() {
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
+		$([[ ${QT5_MINOR_VERSION} -ge 14 ]] && echo -no-feature-gssapi)
 		-no-xcb-xlib
 
 		# bug 672340

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

[Andreas Sturmlechner]

commit:     0d81f7d4583d9ecf1b279b83506990c108ba68c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 01:08:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 22:14:34 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d81f7d4

qt5-build.eclass: Drop unnecessary >=5.13 condition

5.12 was dropped.

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

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 95eb6174..70e9be80 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.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: qt5-build.eclass
@@ -644,7 +644,7 @@ qt5_base_configure() {
 		-no-gui -no-widgets
 
 		# QTBUG-76521, default will change to zstd in Qt6
-		$([[ ${QT5_MINOR_VERSION} -ge 13 ]] && echo -no-zstd)
+		-no-zstd
 
 		# module-specific options
 		"${myconf[@]}"

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

[Andreas Sturmlechner]

commit:     89e672cff170482048437ce34e869c75138b6c17
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 06:27:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 12:36:43 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=89e672cf

qt5-build.eclass: Disable zstd for Qt5 >=5.13.2 RCC compression

Closes: https://bugs.gentoo.org/699248
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6529b4fa..95eb6174 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -643,6 +643,9 @@ qt5_base_configure() {
 		# enable in respective modules to avoid poisoning QT.global_private.enabled_features
 		-no-gui -no-widgets
 
+		# QTBUG-76521, default will change to zstd in Qt6
+		$([[ ${QT5_MINOR_VERSION} -ge 13 ]] && echo -no-zstd)
+
 		# module-specific options
 		"${myconf[@]}"
 	)

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

[Andreas Sturmlechner]

commit:     5b7c41d563393a928db126ac7136af72210f7550
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 11:26:10 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 11:26:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5b7c41d5

qmake-utils.eclass: Drop obsolete EAPI-5 support

Last consumer in Gentoo ebuild repository was dropped.

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

 eclass/qmake-utils.eclass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index f8981c75..394c8422 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -6,7 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
@@ -17,9 +17,8 @@
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
-[[ ${EAPI:-0} == [01234] ]] && die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}"
+[[ ${EAPI:-0} == [012345] ]] && die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}"
 
-[[ ${EAPI:-0} == 5 ]] && inherit eutils multilib
 inherit estack toolchain-funcs
 
 # @FUNCTION: qt4_get_bindir

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

[Andreas Sturmlechner]

commit:     314a076dda74be6a08694f12013e740a45438192
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 11:21:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 11:22:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=314a076d

qt5-build.eclass: qt5_regenerate_global_configs: use `cp` instead of `mv`

Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Bug: https://bugs.gentoo.org/698174
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cde05162..6529b4fa 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -816,7 +816,7 @@ qt5_regenerate_global_configs() {
 		-execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h
 
 	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
-	mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
+	cp "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
 		|| eerror "Failed to install new gentoo-qconfig.h"
 
 	einfo "Updating QT_CONFIG in qconfig.pri"

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

[Andreas Sturmlechner]

commit:     425506b2913065f43fe7051bdcc016adae5a7307
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 16:43:52 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 16:45:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=425506b2

qt5-build.eclass: Drop EAPI-6 support

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

 eclass/qt5-build.eclass | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 88164d62..cde05162 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -6,18 +6,17 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 6.
+# Requires EAPI 7.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
 	die "qt5-build.eclass is only to be used for building Qt 5"
 fi
 
 case ${EAPI} in
-	6)	inherit eapi7-ver ;;
 	7)	: ;;
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
@@ -118,9 +117,6 @@ BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
-case ${EAPI} in
-	6) DEPEND+=" ${BDEPEND}" ;;
-esac
 if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
@@ -288,7 +284,7 @@ qt5-build_src_install() {
 	qt5_install_module_config
 
 	# prune libtool files
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
 
 # @FUNCTION: qt5-build_pkg_postinst
@@ -815,18 +811,18 @@ qt5_install_module_config() {
 qt5_regenerate_global_configs() {
 	einfo "Regenerating gentoo-qconfig.h"
 
-	find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \
+	find "${ROOT}${QT5_HEADERDIR}"/Gentoo \
 		-name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \
 		-execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h
 
 	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
-	mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
+	mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
 		|| eerror "Failed to install new gentoo-qconfig.h"
 
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
-	local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
-	local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri
+	local qconfig_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
+	local qconfig_pri_orig=${ROOT}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri
 	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
 		local qt_config new_qt_config=
@@ -839,7 +835,7 @@ qt5_regenerate_global_configs() {
 		# generate list of QT_CONFIG entries from the existing list,
 		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
 		eshopts_push -s nullglob
-		for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
+		for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
 			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=\s*//p' "${x}")"
 			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=\s*//p' "${x}")"
 		done
@@ -859,8 +855,8 @@ qt5_regenerate_global_configs() {
 
 	einfo "Updating QT.global_private in qmodule.pri"
 
-	local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
-	local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
+	local qmodule_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
+	local qmodule_pri_orig=${ROOT}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
 	if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then
 		local x
 		local qprivateconfig_enabled= qprivateconfig_disabled=
@@ -871,7 +867,7 @@ qt5_regenerate_global_configs() {
 		qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")"
 		qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")"
 		eshopts_push -s nullglob
-		for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
+		for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
 			qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")"
 			qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")"
 		done

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

[Jimi Huotari]

commit:     2dc658022e54737f8365fda87c7ea01716905d02
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 13:54:21 2019 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 13:54:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dc65802

qt5-build.eclass: adjust configure options for >=5.15

Upstream has removed the -qt-xcb, -system-xcb, -xkb, -xcb-xinput
switches [1] in 5.15 and 6.0.

1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.15&id=60588e1a

Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt5-build.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b2212410..88164d62 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -569,7 +569,11 @@ qt5_base_configure() {
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
 		-no-xcb-xlib
-		-no-xcb-xinput -no-xkbcommon # bug 672340
+
+		# bug 672340
+		-no-xkbcommon
+		$([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput)
+		$([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput)
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif
@@ -617,7 +621,7 @@ qt5_base_configure() {
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)
-		-no-xkb
+		$([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb)
 
 		# always enable session management support: it doesn't need extra deps
 		# at configure time and turning it off is dangerous, see bug 518262

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

[Andreas Sturmlechner]

commit:     a27dfe52973e1f739a2ff6b988248b47e6e2c98d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 08:57:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 08:57:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a27dfe52

qt5-build.eclass: EAPI-7 bump

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

 eclass/qt5-build.eclass | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0e169834..b2212410 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -6,7 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
-# @SUPPORTED_EAPIS: 6
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
@@ -17,7 +17,8 @@ if [[ ${CATEGORY} != dev-qt ]]; then
 fi
 
 case ${EAPI} in
-	6)	: ;;
+	6)	inherit eapi7-ver ;;
+	7)	: ;;
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
@@ -57,7 +58,7 @@ esac
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit eapi7-ver estack flag-o-matic toolchain-funcs virtualx
+inherit estack flag-o-matic toolchain-funcs virtualx
 
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
@@ -113,10 +114,13 @@ IUSE="debug test"
 
 [[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
 
-DEPEND="
+BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
+case ${EAPI} in
+	6) DEPEND+=" ${BDEPEND}" ;;
+esac
 if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi

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

[Jimi Huotari]

commit:     bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 19:26:46 2019 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 19:34:23 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bd1dfde9

qt5-build.eclass: sync with the main Gentoo ebuild repo tree

Use '|' sed delimiter instead of ':', which leads to a failure in
'src_prepare()' with 'CXXFLAGS=-falign-functions=32:25:1'.

- https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21eb6a8e

Bug: https://bugs.gentoo.org/685170
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 434cb63c..0e169834 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -166,9 +166,9 @@ qt5-build_src_prepare() {
 			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
-		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
+		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \
 			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
-			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
+			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \
 			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
 			configure || die "sed failed (respect env for qmake build)"
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \

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

[Andreas Sturmlechner]

commit:     54b686ce5f1dd579f41eb628c56720898dde0e56
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 20:51:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 20:51:01 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=54b686ce

qt5-build.eclass: Drop obsolete <Qt-5.12 conditionals

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

 eclass/qt5-build.eclass | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 877ceae7..434cb63c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,12 +178,6 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
-			# Don't add -O3 to CXXFLAGS (bug 549140)
-			sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-				src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
-		fi
-
 		# Respect build variables in configure tests (bug #639494)
 		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
 	fi
@@ -256,10 +250,6 @@ qt5-build_src_install() {
 
 		popd >/dev/null || die
 
-		if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
-			docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
-		fi
-
 		# install an empty Gentoo/gentoo-qconfig.h in ${D}
 		# so that it's placed under package manager control
 		> "${T}"/gentoo-qconfig.h
@@ -416,11 +406,7 @@ qt5_prepare_env() {
 	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
 	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
 	QT5_DATADIR=${QT5_PREFIX}/share/qt5
-	if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
-		QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
-	else
-		QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
-	fi
+	QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
 	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
 	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
@@ -579,8 +565,7 @@ qt5_base_configure() {
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
 		-no-xcb-xlib
-		$([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
-		$([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
+		-no-xcb-xinput -no-xkbcommon # bug 672340
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif

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

[Michael Palimaka]

commit:     71f49c7d856b4324a86eaa8ed0d1e1ded1df7eff
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 13:06:12 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 13:06:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=71f49c7d

qt5-build.eclass: mirclient disappears in Qt 5.14

Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 eclass/qt5-build.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 613af912..877ceae7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -623,7 +623,8 @@ qt5_base_configure() {
 		$(tc-ld-is-gold && echo -use-gold-linker || echo -no-use-gold-linker)
 
 		# disable all platform plugins by default, override in qtgui
-		-no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb -no-mirclient
+		-no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb
+		$([[ ${QT5_MINOR_VERSION} -lt 14 ]] && echo -no-mirclient)
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)

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

[Andreas Sturmlechner]

commit:     f4614e567024e4179e1a16c879653d2e22c5d836
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 19:47:20 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 14:16:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4614e56

qt5-build.eclass: Relocate QT5_DOCDIR to /usr/share/qt5-doc

Acked-by: Michael Palimaka <kensington <AT> gentoo.org>
Bug: https://bugs.gentoo.org/667280
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2f1e6e68..613af912 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -256,7 +256,9 @@ qt5-build_src_install() {
 
 		popd >/dev/null || die
 
-		docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
+		if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
+			docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
+		fi
 
 		# install an empty Gentoo/gentoo-qconfig.h in ${D}
 		# so that it's placed under package manager control
@@ -414,7 +416,11 @@ qt5_prepare_env() {
 	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
 	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
 	QT5_DATADIR=${QT5_PREFIX}/share/qt5
-	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+	if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
+		QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+	else
+		QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
+	fi
 	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
 	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
 	QT5_TESTSDIR=${QT5_DATADIR}/tests

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

[Andreas Sturmlechner]

commit:     348bed77a2b8f81160a79992888d4374559db530
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  5 20:35:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  5 20:35:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=348bed77

qt5-build.eclass: Drop obsolete Qt 5.12.0 quirk

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

 eclass/qt5-build.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d0a73287..2f1e6e68 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -574,8 +574,7 @@ qt5_base_configure() {
 		-no-openssl -no-libproxy
 		-no-xcb-xlib
 		$([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
-		$([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340
-		$([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
+		$([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif

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

[Jimi Huotari]

commit:     bafd5b0b9e0a2678334355ee3547ebf09833749b
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 20:26:49 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 20:26:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bafd5b0b

qt5-build.eclass: remove obsolete instruction sets workaround

This has seemingly been broken since 2017-08-02, where things
were moved around [1], and now causes build failures as the
directory has been removed completely [2].

1. https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f54f7d84
2. https://code.qt.io/cgit/qt/qtbase.git/commit/?id=73b87697

Bug: https://bugs.gentoo.org/552942
Bug: https://bugs.gentoo.org/672946
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 eclass/qt5-build.eclass | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 83f66220..c6c08a6b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,11 +178,6 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
-		# compiler support for extended instruction sets (bug 552942)
-		find config.tests/common -name '*.pro' -type f -execdir \
-			sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
-
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"

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

[Andreas Sturmlechner]

commit:     4f4cce366061b571324e5f17ac4697b6e26379c4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 17:49:16 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 19:49:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4f4cce36

qt5-build.eclass: Cleanup quirks for no longer available versions

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

 eclass/qt5-build.eclass | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 70f2bed9..3189f0c0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -174,14 +174,8 @@ qt5-build_src_prepare() {
 		qt5_symlink_tools_to_build_dir
 
 		# Avoid unnecessary qmake recompilations
-		if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
-			sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
-				-e '/echo "Done."/a fi' \
-				configure || die "sed failed (skip qmake bootstrap)"
-		else
-			sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
-				configure || die "sed failed (skip qmake bootstrap)"
-		fi
+		sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
+			-e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)"
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
 		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
@@ -196,12 +190,6 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then
-			# Respect toolchain and flags in config.tests
-			find config.tests/unix -name '*.test' -type f -execdir \
-				sed -i -e 's/-nocache //' '{}' + || die
-		fi
-
 		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
 		# compiler support for extended instruction sets (bug 552942)
 		find config.tests/common -name '*.pro' -type f -execdir \
@@ -579,9 +567,6 @@ qt5_base_configure() {
 		# build shared libraries
 		-shared
 
-		# always enable large file support
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -largefile)
-
 		# disabling accessibility is not recommended by upstream, as
 		# it will break QStyle and may break other internal parts of Qt
 		-accessibility
@@ -624,7 +609,6 @@ qt5_base_configure() {
 
 		# disable everything to prevent automagic deps (part 2)
 		-no-gtk
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa)
 
 		# exclude examples and tests from default build
 		-nomake examples
@@ -637,10 +621,6 @@ qt5_base_configure() {
 		# print verbose information about each configure test
 		-verbose
 
-		# always enable iconv support
-		# since 5.8 this is handled in qtcore
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
-
 		# disable everything to prevent automagic deps (part 3)
 		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
 
@@ -667,10 +647,6 @@ qt5_base_configure() {
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)
 		-no-xkb
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-xrender)
-
-		# disable obsolete/unused X11-related flags
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)
 
 		# always enable session management support: it doesn't need extra deps
 		# at configure time and turning it off is dangerous, see bug 518262
@@ -686,9 +662,6 @@ qt5_base_configure() {
 		# disable libinput-based generic plugin by default, override in qtgui
 		-no-libinput
 
-		# disable gstreamer by default, override in qtmultimedia
-		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer)
-
 		# respect system proxies by default: it's the most natural
 		# setting, and it'll become the new upstream default in 5.8
 		-system-proxies

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

[Andreas Sturmlechner]

commit:     7ffe15fefa8bb25be58249827d3bce997d9b4a51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 12:20:35 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 19:49:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=7ffe15fe

qt5-build.eclass: Drop obsolete pre-Qt-5.11 quirks

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

 eclass/qt5-build.eclass | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ef104429..83f66220 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -80,26 +80,14 @@ case ${PV} in
 	*_alpha*|*_beta*|*_rc*)
 		# development release
 		QT5_BUILD_TYPE="release"
-
-		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
-		else
-			MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
-		fi
-
+		MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
 		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
 		# official stable release
 		QT5_BUILD_TYPE="release"
-
-		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			MY_P=${QT5_MODULE}-everywhere-src-${PV}
-		else
-			MY_P=${QT5_MODULE}-opensource-src-${PV}
-		fi
-
+		MY_P=${QT5_MODULE}-everywhere-src-${PV}
 		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
@@ -535,13 +523,11 @@ qt5_base_configure() {
 				echo -platform freebsd-clang
 			fi
 		fi)
-		$(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			if use kernel_linux; then
-				if tc-is-gcc; then
-					echo -platform linux-g++
-				elif tc-is-clang; then
-					echo -platform linux-clang
-				fi
+		$(if use kernel_linux; then
+			if tc-is-gcc; then
+				echo -platform linux-g++
+			elif tc-is-clang; then
+				echo -platform linux-clang
 			fi
 		fi)
 
@@ -571,9 +557,6 @@ qt5_base_configure() {
 		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
 		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
 
-		# ensure the QML debugging support (qmltooling) is built in qtdeclarative
-		$([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug)
-
 		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)
 		$(is-flagq -mno-dspr2 && echo -no-mips_dspr2)

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

[Andreas Sturmlechner]

commit:     9ae2b8e7fa02f5fb1fb79f9af77b7f58131e63ca
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 19:09:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 19:49:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ae2b8e7

qt5-build.eclass: Cleanup obsolete -gt/-ge conditionals

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

 eclass/qt5-build.eclass | 172 +++++++++++++++++++++++-------------------------
 1 file changed, 81 insertions(+), 91 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3189f0c0..ef104429 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -200,9 +200,7 @@ qt5-build_src_prepare() {
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
 
 		# Respect build variables in configure tests (bug #639494)
-		if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-			sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
-		fi
+		sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
 	fi
 
 	default
@@ -508,9 +506,7 @@ qt5_base_configure() {
 	export LD="$(tc-getCXX)"
 
 	# bug 633838
-	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-		unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
-	fi
+	unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
 
 	# configure arguments
 	local conf=(
@@ -670,7 +666,7 @@ qt5_base_configure() {
 		-no-warnings-are-errors
 
 		# enable in respective modules to avoid poisoning QT.global_private.enabled_features
-		$([[ ${QT5_MINOR_VERSION} -ge 9 ]] && echo -no-gui -no-widgets)
+		-no-gui -no-widgets
 
 		# module-specific options
 		"${myconf[@]}"
@@ -681,11 +677,9 @@ qt5_base_configure() {
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 
-	if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
-		# a forwarding header is no longer created since 5.8, causing the system
-		# config to always be used. bug 599636
-		cp src/corelib/global/qconfig.h include/QtCore/ || die
-	fi
+	# a forwarding header is no longer created since 5.8, causing the system
+	# config to always be used. bug 599636
+	cp src/corelib/global/qconfig.h include/QtCore/ || die
 
 	popd >/dev/null || die
 
@@ -769,7 +763,7 @@ qt5_install_module_config() {
 
 	> "${T}"/${PN}-qconfig.h
 	> "${T}"/${PN}-qconfig.pri
-	[[ ${QT5_MINOR_VERSION} -ge 9 ]] && > "${T}"/${PN}-qmodule.pri
+	> "${T}"/${PN}-qmodule.pri
 
 	# generate qconfig_{add,remove} and ${PN}-qconfig.h
 	for x in "${QT5_GENTOO_CONFIG[@]}"; do
@@ -803,32 +797,30 @@ qt5_install_module_config() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
-	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-		# generate qprivateconfig
-		for x in "${QT5_GENTOO_PRIVATE_CONFIG[@]}"; do
-			local flag=${x%%:*}
-			x=${x#${flag}:}
-			local feature=${x%%:*}
-			x=${x#${feature}:}
-
-			if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
-				[[ -n ${feature} ]] && qprivateconfig_add+=" ${feature}"
-			else
-				[[ -n ${feature} ]] && qprivateconfig_remove+=" ${feature}"
-			fi
-		done
+	# generate qprivateconfig
+	for x in "${QT5_GENTOO_PRIVATE_CONFIG[@]}"; do
+		local flag=${x%%:*}
+		x=${x#${flag}:}
+		local feature=${x%%:*}
+		x=${x#${feature}:}
 
-		# generate and install ${PN}-qmodule.pri
-		[[ -n ${qprivateconfig_add} ]] && echo "QT.global_private.enabled_features = ${qprivateconfig_add}" >> "${T}"/${PN}-qmodule.pri
-		[[ -n ${qprivateconfig_remove} ]] && echo "QT.global_private.disabled_features = ${qprivateconfig_remove}" >> "${T}"/${PN}-qmodule.pri
-		[[ -s ${T}/${PN}-qmodule.pri ]] && (
-			insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
-			doins "${T}"/${PN}-qmodule.pri
-		)
-	fi
+		if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
+			[[ -n ${feature} ]] && qprivateconfig_add+=" ${feature}"
+		else
+			[[ -n ${feature} ]] && qprivateconfig_remove+=" ${feature}"
+		fi
+	done
+
+	# generate and install ${PN}-qmodule.pri
+	[[ -n ${qprivateconfig_add} ]] && echo "QT.global_private.enabled_features = ${qprivateconfig_add}" >> "${T}"/${PN}-qmodule.pri
+	[[ -n ${qprivateconfig_remove} ]] && echo "QT.global_private.disabled_features = ${qprivateconfig_remove}" >> "${T}"/${PN}-qmodule.pri
+	[[ -s ${T}/${PN}-qmodule.pri ]] && (
+		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
+		doins "${T}"/${PN}-qmodule.pri
+	)
 
 	# install the original {qconfig,qmodule}.pri from qtcore
-	[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
+	[[ ${PN} == qtcore ]] && (
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri
 		newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri qmodule-qtcore.pri
@@ -886,60 +878,58 @@ qt5_regenerate_global_configs() {
 		ewarn "${qconfig_pri} does not exist or is not a regular file"
 	fi
 
-	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
-		einfo "Updating QT.global_private in qmodule.pri"
-
-		local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
-		local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
-		if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then
-			local x
-			local qprivateconfig_enabled= qprivateconfig_disabled=
-			local qprivateconfig_orig_enabled= qprivateconfig_orig_disabled=
-			local new_qprivateconfig_enabled= new_qprivateconfig_disabled=
-
-			# generate lists of QT.global_private.{dis,en}abled_features
-			qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")"
-			qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")"
-			eshopts_push -s nullglob
-			for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
-				qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")"
-				qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")"
-			done
-			eshopts_pop
-
-			# anything enabled is enabled, but anything disabled is
-			# only disabled if it isn't enabled somewhere else.
-			# this is because we need to forcibly disable some stuff
-			# in qtcore to support split qtbase.
-			new_qprivateconfig_enabled=${qprivateconfig_enabled}
-			for x in ${qprivateconfig_disabled}; do
-				if ! has "${x}" ${qprivateconfig_enabled}; then
-					new_qprivateconfig_disabled+=" ${x}"
-				fi
-			done
-
-			# check all items from the original qtcore qmodule.pri,
-			# and add them to the appropriate list if not overridden
-			# elsewhere
-			for x in ${qprivateconfig_orig_enabled}; do
-				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
-					new_qprivateconfig_enabled+=" ${x}"
-				fi
-			done
-			for x in ${qprivateconfig_orig_disabled}; do
-				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
-					new_qprivateconfig_disabled+=" ${x}"
-				fi
-			done
-
-			# now replace the existing QT.global_private.{dis,en}abled_features
-			# with the generated list
-			sed \
-				-e "s/^QT.global_private.enabled_features\s*=.*/QT.global_private.enabled_features =${new_qprivateconfig_enabled}/" \
-				-e "s/^QT.global_private.disabled_features\s*=.*/QT.global_private.disabled_features =${new_qprivateconfig_disabled}/" \
-				-i "${qmodule_pri}" || eerror "Failed to sed QT.global_private.enabled_features in ${qmodule_pri}"
-		else
-			ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file"
-		fi
+	einfo "Updating QT.global_private in qmodule.pri"
+
+	local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
+	local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
+	if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then
+		local x
+		local qprivateconfig_enabled= qprivateconfig_disabled=
+		local qprivateconfig_orig_enabled= qprivateconfig_orig_disabled=
+		local new_qprivateconfig_enabled= new_qprivateconfig_disabled=
+
+		# generate lists of QT.global_private.{dis,en}abled_features
+		qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+		qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+		eshopts_push -s nullglob
+		for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
+			qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")"
+			qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")"
+		done
+		eshopts_pop
+
+		# anything enabled is enabled, but anything disabled is
+		# only disabled if it isn't enabled somewhere else.
+		# this is because we need to forcibly disable some stuff
+		# in qtcore to support split qtbase.
+		new_qprivateconfig_enabled=${qprivateconfig_enabled}
+		for x in ${qprivateconfig_disabled}; do
+			if ! has "${x}" ${qprivateconfig_enabled}; then
+				new_qprivateconfig_disabled+=" ${x}"
+			fi
+		done
+
+		# check all items from the original qtcore qmodule.pri,
+		# and add them to the appropriate list if not overridden
+		# elsewhere
+		for x in ${qprivateconfig_orig_enabled}; do
+			if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+				new_qprivateconfig_enabled+=" ${x}"
+			fi
+		done
+		for x in ${qprivateconfig_orig_disabled}; do
+			if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+				new_qprivateconfig_disabled+=" ${x}"
+			fi
+		done
+
+		# now replace the existing QT.global_private.{dis,en}abled_features
+		# with the generated list
+		sed \
+			-e "s/^QT.global_private.enabled_features\s*=.*/QT.global_private.enabled_features =${new_qprivateconfig_enabled}/" \
+			-e "s/^QT.global_private.disabled_features\s*=.*/QT.global_private.disabled_features =${new_qprivateconfig_disabled}/" \
+			-i "${qmodule_pri}" || eerror "Failed to sed QT.global_private.enabled_features in ${qmodule_pri}"
+	else
+		ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file"
 	fi
 }

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

[Andreas Sturmlechner]

commit:     56f30cd9bb63cad661de50cefdb7afd4a7e8ccb3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  4 23:52:07 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 19:46:16 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=56f30cd9

qt5-build.eclass: Drop obsolete qtwebkit quirks

Remaining qtwebkit ebuild uses CMake.

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

 eclass/qt5-build.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ee4875de..70f2bed9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -123,14 +123,13 @@ esac
 
 IUSE="debug test"
 
-[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
 [[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
 
 DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
-if [[ (${PN} != qttest && ${PN} != qtwebkit) || (${PN} == qtwebkit && ${QT5_MINOR_VERSION} -lt 9) ]]; then
+if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
 RDEPEND="
@@ -147,7 +146,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # Unpacks the sources.
 qt5-build_src_unpack() {
 	# bug 307861
-	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
+	if [[ ${PN} == qtwebengine ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			ewarn

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

[Andreas Sturmlechner]

commit:     fcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 17:58:25 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec  5 22:16:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fcd6267d

qt5-build.eclass: xkbcommon-{evdev,x11} was dropped in >=5.12.1

Bug: https://bugs.gentoo.org/672340
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d709e3cd..ee4875de 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -612,10 +612,10 @@ qt5_base_configure() {
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
-		-no-xkbcommon-x11 -no-xkbcommon-evdev
 		-no-xcb-xlib
-		$([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2)
-		$([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput)
+		$([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
+		$([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340
+		$([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif

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

[Jimi Huotari]

commit:     677153ee925d8324ec0bb9fc22dc07c139649337
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 11:18:45 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 11:20:45 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=677153ee

qt5-build.eclass: fix configure for 5.12

The 'xinput2' configure option has been renamed to 'xcb-xinput' in:
http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.12&id=a692d7cd

 eclass/qt5-build.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index defbcad2..d709e3cd 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -613,7 +613,9 @@ qt5_base_configure() {
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
 		-no-xkbcommon-x11 -no-xkbcommon-evdev
-		-no-xinput2 -no-xcb-xlib
+		-no-xcb-xlib
+		$([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2)
+		$([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput)
 
 		# cannot use -no-gif because there is no way to override it later
 		#-no-gif

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

[Davide Pesavento]

commit:     6b3873a9577b7b0f20736cb67260bffef83ac87d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 18:27:13 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 20:14:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6b3873a9

qmake-utils.eclass: Ban <EAPI-5 use

 eclass/qmake-utils.eclass | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 74ceca4a..916fcc92 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -6,6 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
@@ -16,7 +17,9 @@
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+[[ ${EAPI:-0} == [01234] ]] && die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}"
+
+[[ ${EAPI:-0} == 5 ]] && inherit eutils multilib
 inherit estack toolchain-funcs
 
 # @FUNCTION: qt4_get_bindir
@@ -24,8 +27,6 @@ inherit estack toolchain-funcs
 # Echoes the directory where Qt4 binaries are installed.
 # EPREFIX is already prepended to the returned path.
 qt4_get_bindir() {
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
 	local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
 	if [[ -d ${qtbindir} ]]; then
 		echo ${qtbindir}
@@ -67,8 +68,6 @@ qt4_get_plugindir() {
 # Echoes the directory where Qt5 binaries are installed.
 # EPREFIX is already prepended to the returned path.
 qt5_get_bindir() {
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
 	echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin
 }
 
@@ -161,8 +160,6 @@ qmake-utils_find_pro_file() {
 eqmake4() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
 	ebegin "Running qmake"
 
 	local qmake_args=("$@")

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

[Davide Pesavento]

commit:     2430d61f6f838448a63f8ab87b3243e8fab95acb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 20:20:18 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 20:20:18 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2430d61f

qmake-utils.eclass: sync with gentoo repo

 eclass/qmake-utils.eclass | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 916fcc92..f8981c75 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -27,6 +27,8 @@ inherit estack toolchain-funcs
 # Echoes the directory where Qt4 binaries are installed.
 # EPREFIX is already prepended to the returned path.
 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}
@@ -39,6 +41,7 @@ qt4_get_bindir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 headers are installed.
 qt4_get_headerdir() {
+	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
 	echo /usr/include/qt4
 }
 
@@ -46,6 +49,7 @@ qt4_get_headerdir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 libraries are installed.
 qt4_get_libdir() {
+	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
 	echo /usr/$(get_libdir)/qt4
 }
 
@@ -53,6 +57,7 @@ qt4_get_libdir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 mkspecs are installed.
 qt4_get_mkspecsdir() {
+	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
 	echo /usr/share/qt4/mkspecs
 }
 
@@ -60,6 +65,7 @@ qt4_get_mkspecsdir() {
 # @DESCRIPTION:
 # Echoes the directory where Qt4 plugins are installed.
 qt4_get_plugindir() {
+	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
 	echo $(qt4_get_libdir)/plugins
 }
 
@@ -159,6 +165,7 @@ qmake-utils_find_pro_file() {
 # specified inside the top-level project file.
 eqmake4() {
 	debug-print-function ${FUNCNAME} "$@"
+	[[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 7 and later"
 
 	ebegin "Running qmake"
 

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

[Davide Pesavento]

commit:     5b7ada46e568dee1f17be50882094d33d6c50506
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 18:14:58 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 18:14:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5b7ada46

qt5-build.eclass: sync with gentoo repo

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2517d399..defbcad2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -945,7 +945,7 @@ qt5_regenerate_global_configs() {
 			done
 
 			# check all items from the original qtcore qmodule.pri,
-			# and add them to the appropriate list if not overriden
+			# and add them to the appropriate list if not overridden
 			# elsewhere
 			for x in ${qprivateconfig_orig_enabled}; do
 				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then

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

[Michael Palimaka]

commit:     0d69aee6e54be232930c76b88366e2bf4add3f85
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 23:23:52 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 01:04:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0d69aee6

qmake-utils.eclass: avoid dependency on eutils for EAPI < 6

 eclass/qmake-utils.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 76dc31b2..74ceca4a 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -16,8 +16,8 @@
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
-[[ ${EAPI:-0} == [012345] ]] && inherit multilib
-inherit eutils toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit estack toolchain-funcs
 
 # @FUNCTION: qt4_get_bindir
 # @DESCRIPTION:
@@ -184,7 +184,7 @@ eqmake4() {
 	# Make sure the CONFIG variable is correctly set for both release and debug builds.
 	local config_add=release
 	local config_remove=debug
-	if use_if_iuse debug; then
+	if in_iuse debug && use debug; then
 		config_add=debug
 		config_remove=release
 	fi

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

[Michael Palimaka]

commit:     ea83584c4018044e7b3c5b2abb9258b3e48403db
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 02:00:56 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 02:00:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ea83584c

qt5-build.eclass: fix syntax error

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2f95c64e..2517d399 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -545,13 +545,13 @@ qt5_base_configure() {
 		-testsdir "${QT5_TESTSDIR}"
 
 		# force appropriate compiler
-		if use kernel_FreeBSD; then
+		$(if use kernel_FreeBSD; then
 			if tc-is-gcc; then
 				echo -platform freebsd-g++
 			elif tc-is-clang; then
 				echo -platform freebsd-clang
 			fi
-		fi
+		fi)
 		$(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
 			if use kernel_linux; then
 				if tc-is-gcc; then

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

[Michael Palimaka]

commit:     2387fb8372d617c08ad5a63404c1699cd0a0d3b5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 01:54:38 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 01:55:44 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2387fb83

qt5-build.eclass: remove version conditional for passing -platform on freebsd

Bug: https://bugs.gentoo.org/649406

 eclass/qt5-build.eclass | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0e7111b5..2f95c64e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -545,14 +545,15 @@ qt5_base_configure() {
 		-testsdir "${QT5_TESTSDIR}"
 
 		# force appropriate compiler
+		if use kernel_FreeBSD; then
+			if tc-is-gcc; then
+				echo -platform freebsd-g++
+			elif tc-is-clang; then
+				echo -platform freebsd-clang
+			fi
+		fi
 		$(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			if use kernel_FreeBSD; then
-				if tc-is-gcc; then
-					echo -platform freebsd-g++
-				elif tc-is-clang; then
-					echo -platform freebsd-clang
-				fi
-			elif use kernel_linux; then
+			if use kernel_linux; then
 				if tc-is-gcc; then
 					echo -platform linux-g++
 				elif tc-is-clang; then

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

[Michael Palimaka]

commit:     4bb467cf7876c1620faf956d9cad560d454206e8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 12:53:23 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 12:53:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4bb467cf

qt5-build.eclass: fix syntax error

 eclass/qt5-build.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3b961700..0e7111b5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -545,8 +545,8 @@ qt5_base_configure() {
 		-testsdir "${QT5_TESTSDIR}"
 
 		# force appropriate compiler
-		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
-			$(if use kernel_FreeBSD; then
+		$(if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
+			if use kernel_FreeBSD; then
 				if tc-is-gcc; then
 					echo -platform freebsd-g++
 				elif tc-is-clang; then
@@ -558,8 +558,8 @@ qt5_base_configure() {
 				elif tc-is-clang; then
 					echo -platform linux-clang
 				fi
-			fi)
-		fi
+			fi
+		fi)
 
 		# configure in release mode by default,
 		# override via the CONFIG qmake variable

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

[Michael Palimaka]

commit:     c0679fd90abb0e90205754a2e41bcb3dc97e31e5
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Mar  3 03:15:19 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 12:47:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c0679fd9

qt5-build.eclass: Pass -platform option to configure on FreeBSD and Linux.

Bug: https://bugs.gentoo.org/649406

 eclass/qt5-build.eclass | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 12695141..3b961700 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -544,6 +544,23 @@ qt5_base_configure() {
 		-examplesdir "${QT5_EXAMPLESDIR}"
 		-testsdir "${QT5_TESTSDIR}"
 
+		# force appropriate compiler
+		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
+			$(if use kernel_FreeBSD; then
+				if tc-is-gcc; then
+					echo -platform freebsd-g++
+				elif tc-is-clang; then
+					echo -platform freebsd-clang
+				fi
+			elif use kernel_linux; then
+				if tc-is-gcc; then
+					echo -platform linux-g++
+				elif tc-is-clang; then
+					echo -platform linux-clang
+				fi
+			fi)
+		fi
+
 		# configure in release mode by default,
 		# override via the CONFIG qmake variable
 		-release

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

[Davide Pesavento]

commit:     8d91ef6080d577ad526f882417575cb94fb71ecf
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 21:28:19 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 21:28:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8d91ef60

qt5-build.eclass: stop using deprecated ltprune.eclass

 eclass/qt5-build.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8bea23d4..12695141 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -57,7 +57,7 @@ esac
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit eapi7-ver estack flag-o-matic ltprune toolchain-funcs virtualx
+inherit eapi7-ver estack flag-o-matic toolchain-funcs virtualx
 
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
@@ -320,7 +320,9 @@ qt5-build_src_install() {
 	fi
 
 	qt5_install_module_config
-	prune_libtool_files
+
+	# prune libtool files
+	find "${D}" -name '*.la' -delete || die
 }
 
 # @FUNCTION: qt5-build_pkg_postinst

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

[Davide Pesavento]

commit:     0809c22f07d3be0ea658cb5228aa8ec5d46d253d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 21:17:24 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 21:17:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0809c22f

qt5-build.eclass: remove gcc version check

Everything older than gcc-5.4.0 has been masked for a while

 eclass/qt5-build.eclass | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e3c50178..8bea23d4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -146,15 +146,6 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	if tc-is-gcc; then
-		local min_gcc4_minor_version=7
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
-			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
-			die "GCC 4.${min_gcc4_minor_version} or later required"
-		fi
-	fi
-
 	# bug 307861
 	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob

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

[Davide Pesavento]

commit:     212eddb0eb1b59d05c6dd45dbd47bdf6a50d8ab3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 21:15:46 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 21:15:46 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=212eddb0

qt5-build.eclass: switch to eapi7-ver.eclass

 eclass/qt5-build.eclass | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b381c284..e3c50178 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -13,7 +13,7 @@
 # Requires EAPI 6.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
-	die "qt5-build.eclass is only to be used for building Qt 5."
+	die "qt5-build.eclass is only to be used for building Qt 5"
 fi
 
 case ${EAPI} in
@@ -57,15 +57,14 @@ esac
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx
+inherit eapi7-ver estack flag-o-matic ltprune toolchain-funcs virtualx
 
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-SLOT=5/$(get_version_component_range 1-2)
+SLOT=5/$(ver_cut 1-2)
 
-QT5_MINOR_VERSION=$(get_version_component_range 2)
-QT5_PATCH_VERSION=$(get_version_component_range 3)
-readonly QT5_MINOR_VERSION QT5_PATCH_VERSION
+QT5_MINOR_VERSION=$(ver_cut 2)
+readonly QT5_MINOR_VERSION
 
 case ${PV} in
 	5.9999)

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

[Andreas Sturmlechner]

commit:     dedf5eab6ea3ac9c150a288ef5c4665e1cbaeb03
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 22 19:35:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 22:14:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dedf5eab

qt5-build.eclass: Set qtchooser default.conf link to qt5.conf

 eclass/qt5-build.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 69566c42..b381c284 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -325,6 +325,8 @@ qt5-build_src_install() {
 		# convenience symlinks
 		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
 		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
+		# TODO bug 522646: write an eselect module to manage default.conf
+		dosym qt5.conf /etc/xdg/qtchooser/default.conf
 	fi
 
 	qt5_install_module_config

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

[Davide Pesavento]

commit:     11c7453a9a179803362ba0318304798258ee12e5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 00:00:13 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 00:00:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=11c7453a

qt5-build.eclass: fix comment

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index dde08fdb..69566c42 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -841,7 +841,7 @@ qt5_install_module_config() {
 		)
 	fi
 
-	# install also the original qconfig.pri
+	# install the original {qconfig,qmodule}.pri from qtcore
 	[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri

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

[Michael Palimaka]

commit:     aaa3b5e3a01c8e2b8decb9b3464cedd484770f10
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 23:35:06 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 23:35:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=aaa3b5e3

qt5-build.eclass: also call default_src_unpack for live ebuilds

This allows, for example, patch tarballs to be applied (as is currently required for qtwebengine).

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1a20b3da..dde08fdb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -170,7 +170,7 @@ qt5-build_src_unpack() {
 	fi
 
 	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;;
+		live)    git-r3_src_unpack ;&
 		release) default ;;
 	esac
 }

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

[Michael Palimaka]

commit:     92b7e6c8b72ded7e357353209254a42a08b20ad0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 23:18:58 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 23:19:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=92b7e6c8

qt5-build.eclass: fix install on prefix

Bug: https://bugs.gentoo.org/646902

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 939a048d..1a20b3da 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -844,8 +844,8 @@ qt5_install_module_config() {
 	# install also the original qconfig.pri
 	[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
-		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
-		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qmodule.pri qmodule-qtcore.pri
+		newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri qconfig-qtcore.pri
+		newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri qmodule-qtcore.pri
 	)
 }
 

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

[Michael Palimaka]

commit:     e553539e7ee050d094da9a4673b2e5ac71aae422
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 01:29:27 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 11:53:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e553539e

qt5-build.eclass: introduce for QT5_GENTOO_PRIVATE_CONFIG

This behaves similarly to QT5_GENTOO_CONFIG, but for the new qmodule.pri instead.

Bug: https://bugs.gentoo.org/634622

 eclass/qt5-build.eclass | 116 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 106 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 28d303e2..939a048d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -42,6 +42,14 @@ esac
 # definitions, which are then merged together with all other Qt5 packages
 # installed on the system to obtain the global qconfig.{h,pri} files.
 
+# @ECLASS-VARIABLE: QT5_GENTOO_PRIVATE_CONFIG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <useflag:feature> pairs that are evaluated in src_install
+# to generate the per-package list of enabled QT.global_private features,
+# which are then merged together with all other Qt5 packages installed on the
+# system to obtain the global qmodule.pri file.
+
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
@@ -319,7 +327,7 @@ qt5-build_src_install() {
 		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
 	fi
 
-	qt5_install_module_qconfigs
+	qt5_install_module_config
 	prune_libtool_files
 }
 
@@ -327,7 +335,7 @@ qt5-build_src_install() {
 # @DESCRIPTION:
 # Regenerate configuration after installation or upgrade/downgrade.
 qt5-build_pkg_postinst() {
-	qt5_regenerate_global_qconfigs
+	qt5_regenerate_global_configs
 }
 
 # @FUNCTION: qt5-build_pkg_postrm
@@ -335,7 +343,7 @@ qt5-build_pkg_postinst() {
 # Regenerate configuration when a module is completely removed.
 qt5-build_pkg_postrm() {
 	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != qtcore ]]; then
-		qt5_regenerate_global_qconfigs
+		qt5_regenerate_global_configs
 	fi
 }
 
@@ -675,6 +683,9 @@ qt5_base_configure() {
 		# do not build with -Werror
 		-no-warnings-are-errors
 
+		# enable in respective modules to avoid poisoning QT.global_private.enabled_features
+		$([[ ${QT5_MINOR_VERSION} -ge 9 ]] && echo -no-gui -no-widgets)
+
 		# module-specific options
 		"${myconf[@]}"
 	)
@@ -762,15 +773,17 @@ qt5_qmake() {
 		|| die "qmake failed (${projectdir#${S}/})"
 }
 
-# @FUNCTION: qt5_install_module_qconfigs
+# @FUNCTION: qt5_install_module_config
 # @INTERNAL
 # @DESCRIPTION:
-# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
-qt5_install_module_qconfigs() {
-	local x qconfig_add= qconfig_remove=
+# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} and
+# ${PN}-qmodule.pri files.
+qt5_install_module_config() {
+	local x qconfig_add= qconfig_remove= qprivateconfig_add= qprivateconfig_remove=
 
 	> "${T}"/${PN}-qconfig.h
 	> "${T}"/${PN}-qconfig.pri
+	[[ ${QT5_MINOR_VERSION} -ge 9 ]] && > "${T}"/${PN}-qmodule.pri
 
 	# generate qconfig_{add,remove} and ${PN}-qconfig.h
 	for x in "${QT5_GENTOO_CONFIG[@]}"; do
@@ -804,19 +817,45 @@ qt5_install_module_qconfigs() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
+	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+		# generate qprivateconfig
+		for x in "${QT5_GENTOO_PRIVATE_CONFIG[@]}"; do
+			local flag=${x%%:*}
+			x=${x#${flag}:}
+			local feature=${x%%:*}
+			x=${x#${feature}:}
+
+			if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
+				[[ -n ${feature} ]] && qprivateconfig_add+=" ${feature}"
+			else
+				[[ -n ${feature} ]] && qprivateconfig_remove+=" ${feature}"
+			fi
+		done
+
+		# generate and install ${PN}-qmodule.pri
+		[[ -n ${qprivateconfig_add} ]] && echo "QT.global_private.enabled_features = ${qprivateconfig_add}" >> "${T}"/${PN}-qmodule.pri
+		[[ -n ${qprivateconfig_remove} ]] && echo "QT.global_private.disabled_features = ${qprivateconfig_remove}" >> "${T}"/${PN}-qmodule.pri
+		[[ -s ${T}/${PN}-qmodule.pri ]] && (
+			insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
+			doins "${T}"/${PN}-qmodule.pri
+		)
+	fi
+
 	# install also the original qconfig.pri
 	[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
+		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qmodule.pri qmodule-qtcore.pri
 	)
 }
 
-# @FUNCTION: qt5_regenerate_global_qconfigs
+# @FUNCTION: qt5_regenerate_global_configs
 # @INTERNAL
 # @DESCRIPTION:
-# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration.
+# Generates Gentoo-specific qconfig.{h,pri} and qmodule.pri according to the
+# build configuration.
 # Don't call die here because dying in pkg_post{inst,rm} only makes things worse.
-qt5_regenerate_global_qconfigs() {
+qt5_regenerate_global_configs() {
 	einfo "Regenerating gentoo-qconfig.h"
 
 	find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \
@@ -860,4 +899,61 @@ qt5_regenerate_global_qconfigs() {
 	else
 		ewarn "${qconfig_pri} does not exist or is not a regular file"
 	fi
+
+	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+		einfo "Updating QT.global_private in qmodule.pri"
+
+		local qmodule_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qmodule.pri
+		local qmodule_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qmodule-qtcore.pri
+		if [[ -f ${qmodule_pri} && -f ${qmodule_pri_orig} ]]; then
+			local x
+			local qprivateconfig_enabled= qprivateconfig_disabled=
+			local qprivateconfig_orig_enabled= qprivateconfig_orig_disabled=
+			local new_qprivateconfig_enabled= new_qprivateconfig_disabled=
+
+			# generate lists of QT.global_private.{dis,en}abled_features
+			qprivateconfig_orig_enabled="$(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+			qprivateconfig_orig_disabled="$(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${qmodule_pri_orig}")"
+			eshopts_push -s nullglob
+			for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qmodule.pri; do
+				qprivateconfig_enabled+=" $(sed -n 's/^QT.global_private.enabled_features\s=\s*//p' "${x}")"
+				qprivateconfig_disabled+=" $(sed -n 's/^QT.global_private.disabled_features\s=\s*//p' "${x}")"
+			done
+			eshopts_pop
+
+			# anything enabled is enabled, but anything disabled is
+			# only disabled if it isn't enabled somewhere else.
+			# this is because we need to forcibly disable some stuff
+			# in qtcore to support split qtbase.
+			new_qprivateconfig_enabled=${qprivateconfig_enabled}
+			for x in ${qprivateconfig_disabled}; do
+				if ! has "${x}" ${qprivateconfig_enabled}; then
+					new_qprivateconfig_disabled+=" ${x}"
+				fi
+			done
+
+			# check all items from the original qtcore qmodule.pri,
+			# and add them to the appropriate list if not overriden
+			# elsewhere
+			for x in ${qprivateconfig_orig_enabled}; do
+				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+					new_qprivateconfig_enabled+=" ${x}"
+				fi
+			done
+			for x in ${qprivateconfig_orig_disabled}; do
+				if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then
+					new_qprivateconfig_disabled+=" ${x}"
+				fi
+			done
+
+			# now replace the existing QT.global_private.{dis,en}abled_features
+			# with the generated list
+			sed \
+				-e "s/^QT.global_private.enabled_features\s*=.*/QT.global_private.enabled_features =${new_qprivateconfig_enabled}/" \
+				-e "s/^QT.global_private.disabled_features\s*=.*/QT.global_private.disabled_features =${new_qprivateconfig_disabled}/" \
+				-i "${qmodule_pri}" || eerror "Failed to sed QT.global_private.enabled_features in ${qmodule_pri}"
+		else
+			ewarn "${qmodule_pri} or ${qmodule_pri_orig} does not exist or is not a regular file"
+		fi
+	fi
 }

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

[Davide Pesavento]

commit:     82026b039b4bc8ddc597c8186b464dd08f6339e3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 18:56:10 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 18:56:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=82026b03

qt5-build.eclass: use a subshell for insinto+newins

 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 963dba57..28d303e2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -804,10 +804,11 @@ qt5_install_module_qconfigs() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
-	if [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then
+	# install also the original qconfig.pri
+	[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
-	fi
+	)
 }
 
 # @FUNCTION: qt5_regenerate_global_qconfigs

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

[Davide Pesavento]

commit:     f4248411525df0fd32662af8a9f07e9bcc5a0f09
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 18:32:15 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 18:51:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4248411

qt5-build.eclass: fix warning message

 eclass/qt5-build.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 25d4136c..963dba57 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -804,7 +804,7 @@ qt5_install_module_qconfigs() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
-	if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then
+	if [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
 	fi
@@ -832,12 +832,12 @@ qt5_regenerate_global_qconfigs() {
 	local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri
 	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
+		local qt_config new_qt_config=
 		if [[ -f ${qconfig_pri_orig} ]]; then
-			local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}")
+			qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}")
 		else
-			local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
+			qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
 		fi
-		local new_qt_config=
 
 		# generate list of QT_CONFIG entries from the existing list,
 		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
@@ -857,6 +857,6 @@ qt5_regenerate_global_qconfigs() {
 		sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \
 			"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}"
 	else
-		ewarn "${qconfig_pri} or ${qconfig_pri_orig} does not exist or is not a regular file"
+		ewarn "${qconfig_pri} does not exist or is not a regular file"
 	fi
 }

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

[Michael Palimaka]

commit:     eddf34bccd6cbd6f4504b08fc6255d24a1e69375
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 23:59:46 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 00:02:06 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=eddf34bc

qt5-build.eclass: relax qconfig-qtcore.pri insertion to all 5.9 and later

Previously, the check was too restrictive and would not match, for example,
5.10.0. There's no real reason to exclude earlier versions of 5.9 as they're
not currently stable so for simplicity fix this by just dropping the extra
check.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index bc477889..25d4136c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -804,7 +804,7 @@ qt5_install_module_qconfigs() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
-	if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 && ${QT5_PATCH_VERSION} -ge 4 ]]; then
+	if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
 	fi

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

[Michael Palimaka]

commit:     bd9b392f33aaf1810c7d59830f495d0ae2ae728d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 12:09:55 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 12:10:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bd9b392f

qt5-build.eclass: restrict qconfig.pri regeneration changes to 5.9.4 and later

 eclass/qt5-build.eclass | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 54e4b321..bc477889 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -804,7 +804,7 @@ qt5_install_module_qconfigs() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
-	if [[ ${PN} = qtcore ]]; then
+	if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 && ${QT5_PATCH_VERSION} -ge 4 ]]; then
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
 	fi
@@ -830,9 +830,13 @@ qt5_regenerate_global_qconfigs() {
 
 	local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
 	local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri
-	if [[ -f ${qconfig_pri} && -f ${qconfig_pri_orig} ]]; then
+	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
-		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}")
+		if [[ -f ${qconfig_pri_orig} ]]; then
+			local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}")
+		else
+			local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
+		fi
 		local new_qt_config=
 
 		# generate list of QT_CONFIG entries from the existing list,

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

[Michael Palimaka]

commit:     7536ec0475e6339a5ff706677a096814d750e072
Author:     i.Dark_Templar <darktemplar <AT> dark-templar-archives <DOT> net>
AuthorDate: Thu Oct 19 20:58:00 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 12:10:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=7536ec04

qt5-build.eclass: fix qconfig.pri regeneration.

Closes: https://github.com/gentoo/gentoo/pull/5991

 eclass/qt5-build.eclass | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 82855656..54e4b321 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -803,6 +803,11 @@ qt5_install_module_qconfigs() {
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri
 	)
+
+	if [[ ${PN} = qtcore ]]; then
+		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
+		newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri
+	fi
 }
 
 # @FUNCTION: qt5_regenerate_global_qconfigs
@@ -824,9 +829,10 @@ qt5_regenerate_global_qconfigs() {
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
 	local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
-	if [[ -f ${qconfig_pri} ]]; then
+	local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri
+	if [[ -f ${qconfig_pri} && -f ${qconfig_pri_orig} ]]; then
 		local x qconfig_add= qconfig_remove=
-		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
+		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}")
 		local new_qt_config=
 
 		# generate list of QT_CONFIG entries from the existing list,
@@ -847,6 +853,6 @@ qt5_regenerate_global_qconfigs() {
 		sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \
 			"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}"
 	else
-		ewarn "${qconfig_pri} does not exist or is not a regular file"
+		ewarn "${qconfig_pri} or ${qconfig_pri_orig} does not exist or is not a regular file"
 	fi
 }

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

[Michael Palimaka]

commit:     a75630443d9dbc5485eb658401b001c0b10ce120
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 14 05:47:40 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 05:48:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a7563044

qt4-r2.eclass: remove dead eclass

 eclass/qt4-r2.eclass | 199 ---------------------------------------------------
 1 file changed, 199 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
deleted file mode 100644
index 91fe242d..00000000
--- a/eclass/qt4-r2.eclass
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: qt4-r2.eclass
-# @MAINTAINER:
-# qt@gentoo.org
-# @BLURB: Eclass for Qt4-based packages, second edition.
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful when
-# dealing with packages using Qt4 libraries. Supports only EAPIs
-# 2, 3, 4, and 5. Use qmake-utils.eclass in EAPI 6 and later.
-
-case ${EAPI} in
-	2|3|4|5) : ;;
-	6) die "qt4-r2.eclass is banned in EAPI 6 and later" ;;
-	*) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
-inherit base eutils qmake-utils
-
-export XDG_CONFIG_HOME="${T}"
-
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dodoc command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" )
-
-# @ECLASS-VARIABLE: HTML_DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dohtml command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/" )
-
-# @ECLASS-VARIABLE: LANGS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# In case your Qt4 application provides various translations, use this variable
-# to specify them in order to populate "linguas_*" IUSE automatically. Make sure
-# that you set this variable before inheriting qt4-r2 eclass.
-#
-# Example: LANGS="de el it ja"
-for x in ${LANGS}; do
-	IUSE+=" linguas_${x}"
-done
-
-# @ECLASS-VARIABLE: LANGSLONG
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Same as LANGS, but this variable is for LINGUAS that must be in long format.
-# Remember to set this variable before inheriting qt4-r2 eclass.
-# Look at ${PORTDIR}/profiles/desc/linguas.desc for details.
-#
-# Example: LANGSLONG="en_GB ru_RU"
-for x in ${LANGSLONG}; do
-	IUSE+=" linguas_${x%_*}"
-done
-unset x
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-# PATCHES=(
-# 	"${FILESDIR}/mypatch.patch"
-# 	"${FILESDIR}/mypatch2.patch"
-# )
-# @CODE
-
-# @FUNCTION: qt4-r2_src_unpack
-# @DESCRIPTION:
-# Default src_unpack function for packages that depend on qt4. If you have to
-# override src_unpack in your ebuild (probably you don't need to), call
-# qt4-r2_src_unpack in it.
-qt4-r2_src_unpack() {
-	debug-print-function $FUNCNAME "$@"
-
-	# remove this block before pushing updates to the tree
-	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-		ewarn
-		ewarn "Please file bugs on bugs.gentoo.org and prepend the summary with"
-		ewarn "[qt overlay]. Alternatively, contact qt@gentoo.org."
-		ewarn "Thank you for using qt overlay."
-		ewarn
-	fi
-
-	base_src_unpack "$@"
-}
-
-# @FUNCTION: qt4-r2_src_prepare
-# @DESCRIPTION:
-# Default src_prepare function for packages that depend on qt4. If you have to
-# override src_prepare in your ebuild, you should call qt4-r2_src_prepare in it,
-# otherwise autopatcher will not work!
-qt4-r2_src_prepare() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_prepare "$@"
-}
-
-# @FUNCTION: qt4-r2_src_configure
-# @DESCRIPTION:
-# Default src_configure function for packages that depend on qt4. If you have to
-# override src_configure in your ebuild, call qt4-r2_src_configure in it.
-qt4-r2_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local project_file=$(qmake-utils_find_pro_file)
-
-	if [[ -n ${project_file} ]]; then
-		eqmake4 "${project_file}"
-	else
-		base_src_configure "$@"
-	fi
-}
-
-# @FUNCTION: qt4-r2_src_compile
-# @DESCRIPTION:
-# Default src_compile function for packages that depend on qt4. If you have to
-# override src_compile in your ebuild (probably you don't need to), call
-# qt4-r2_src_compile in it.
-qt4-r2_src_compile() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_compile "$@"
-}
-
-# @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 translations (via LANGS
-# and LANGSLONG variables).
-qt4-r2_src_install() {
-	debug-print-function $FUNCNAME "$@"
-
-	base_src_install INSTALL_ROOT="${D}" "$@"
-	einstalldocs
-
-	# install translations
-	# need to have specified LANGS or LANGSLONG for this to work
-	[[ -n ${LANGS} || -n ${LANGSLONG} ]] && qt4-r2_install_translations
-}
-
-# @FUNCTION: qt4-r2_install_translations
-# @DESCRIPTION:
-# Choose and install translation files. Normally you don't need to call
-# this function directly as it is called from qt4-r2_src_install.
-qt4-r2_install_translations() {
-	debug-print-function $FUNCNAME "$@"
-
-	# @VARIABLE: TRANSLATIONSDIR
-	# @DESCRIPTION: Translations directory, defaults to ${S}.
-	local roottrdir=${TRANSLATIONSDIR:-${S}}
-	local trdir=.
-	# Find translations directory
-	for dir in lang langs translations; do
-		[[ -d ${roottrdir}/${dir} ]] && trdir=${roottrdir}/${dir}
-        done
-
-	local lang=
-	for lang in ${LINGUAS}; do
-		for x in ${LANGS}; do
-			[[ ${lang} == ${x%_*} ]] && _do_qm "${trdir}" "${x}"
-		done
-		for x in ${LANGSLONG}; do
-			[[ ${lang} == ${x} ]] && _do_qm "${trdir}" "${x}"
-		done
-	done
-}
-
-# Internal function
-_do_qm() {
-	debug-print-function $FUNCNAME "$@"
-	[[ $# -ne 2 ]] && die "$FUNCNAME() requires exactly 2 arguments!"
-
-	local transfile="$(find "${1}" -type f -name "*${2}".qm)"
-	if [[ -f ${transfile} ]]; then
-		(
-			insinto /usr/share/${PN}/"${1#${S}}"
-			doins "${transfile}"
-		) || die "failed to install ${2} translation"
-	else
-		eerror
-		eerror "Failed to install ${2} translation: file not found."
-		eerror
-		die "failed to install ${2} translation"
-	fi
-}
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install

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

[Michael Palimaka]

commit:     6fc5fc1a9455d495abb11cfdf72257b8d8b22c6f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 01:12:40 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 01:12:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6fc5fc1a

qt5-build.eclass: -qml-debug is removed from qtbase in 5.11

Upstream-commit: 525f8516c2580018f910cfb99ab5e0e36bd55ab1

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3b35c94b..82855656 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -572,7 +572,7 @@ qt5_base_configure() {
 		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
 
 		# ensure the QML debugging support (qmltooling) is built in qtdeclarative
-		-qml-debug
+		$([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug)
 
 		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)

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

[Michael Palimaka]

commit:     c6ec22f69391bcb6d8632a6888c3a8f3b2a415ad
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 10:34:27 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:59:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c6ec22f6

qt5-build.eclass: fix respecting toolchain

Bug: https://bugs.gentoo.org/639494

 eclass/qt5-build.eclass | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fd29ed1e..3b35c94b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -213,6 +213,11 @@ qt5-build_src_prepare() {
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
+
+		# Respect build variables in configure tests (bug #639494)
+		if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+			sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
+		fi
 	fi
 
 	default
@@ -689,6 +694,33 @@ qt5_base_configure() {
 
 }
 
+# @FUNCTION: qt5_qmake_args
+# @INTERNAL
+# @DESCRIPTION:
+# Helper function to get the various toolchain-related variables.
+qt5_qmake_args() {
+	echo \
+		QMAKE_AR=\"$(tc-getAR)\" \
+		QMAKE_CC=\"$(tc-getCC)\" \
+		QMAKE_LINK_C=\"$(tc-getCC)\" \
+		QMAKE_LINK_C_SHLIB=\"$(tc-getCC)\" \
+		QMAKE_CXX=\"$(tc-getCXX)\" \
+		QMAKE_LINK=\"$(tc-getCXX)\" \
+		QMAKE_LINK_SHLIB=\"$(tc-getCXX)\" \
+		QMAKE_OBJCOPY=\"$(tc-getOBJCOPY)\" \
+		QMAKE_RANLIB= \
+		QMAKE_STRIP=\"$(tc-getSTRIP)\" \
+		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=
+}
+
 # @FUNCTION: qt5_qmake
 # @INTERNAL
 # @DESCRIPTION:

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

[Michael Palimaka]

commit:     fe45faae1a15c644db0420f33a67df5197c52fcc
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 11:26:11 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 11:28:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fe45faae

qt5-build.eclass: use the system-configured linker

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8728acc2..fd29ed1e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -632,8 +632,8 @@ qt5_base_configure() {
 		# supported; see also https://bugreports.qt.io/browse/QTBUG-36129
 		#-reduce-relocations
 
-		# let configure automatically detect if GNU gold is available
-		#-use-gold-linker
+		# use the system linker (gold will be selected automagically otherwise)
+		$(tc-ld-is-gold && echo -use-gold-linker || echo -no-use-gold-linker)
 
 		# disable all platform plugins by default, override in qtgui
 		-no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb -no-mirclient

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

[Jimi Huotari]

commit:     12a98e5265ea65c6e604eb1a0d8cf7d78cfc8589
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 11:49:31 2017 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 11:49:31 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=12a98e52

qt5-build.eclass: add support for 5.10 URIs

 eclass/qt5-build.eclass | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7462ab20..8728acc2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -73,14 +73,26 @@ case ${PV} in
 	*_alpha*|*_beta*|*_rc*)
 		# development release
 		QT5_BUILD_TYPE="release"
-		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
+
+		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
+			MY_P=${QT5_MODULE}-everywhere-src-${PV/_/-}
+		else
+			MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
+		fi
+
 		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
 		# official stable release
 		QT5_BUILD_TYPE="release"
-		MY_P=${QT5_MODULE}-opensource-src-${PV}
+
+		if [[ ${QT5_MINOR_VERSION} -ge 10 ]]; then
+			MY_P=${QT5_MODULE}-everywhere-src-${PV}
+		else
+			MY_P=${QT5_MODULE}-opensource-src-${PV}
+		fi
+
 		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;

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

[Davide Pesavento]

commit:     81b7f4a8db78fc9d6ff79b2cd55bbea0e8d8ebec
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 02:14:11 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 02:14:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=81b7f4a8

qt5-build.eclass: improve eclassdoc

 eclass/qt5-build.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f5ef89cc..7462ab20 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -6,6 +6,7 @@
 # qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
+# @SUPPORTED_EAPIS: 6
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
@@ -21,9 +22,10 @@ case ${EAPI} in
 esac
 
 # @ECLASS-VARIABLE: QT5_MODULE
+# @PRE_INHERIT
 # @DESCRIPTION:
 # The upstream name of the module this package belongs to. Used for
-# SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass.
+# SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
 # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
@@ -92,6 +94,7 @@ EGIT_REPO_URI=(
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
 
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
 case ${QT5_BUILD_TYPE} in

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

[Davide Pesavento]

commit:     3c8208a14eadfce2aa0495ca48339d1e4bb8f64e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 01:28:10 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 01:28:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3c8208a1

qt5-build.eclass: drop 5.6 support

 eclass/qt5-build.eclass | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 11847bcf..f5ef89cc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -50,19 +50,13 @@ esac
 inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx
 
 HOMEPAGE="https://www.qt.io/"
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+SLOT=5/$(get_version_component_range 1-2)
 
 QT5_MINOR_VERSION=$(get_version_component_range 2)
 QT5_PATCH_VERSION=$(get_version_component_range 3)
 readonly QT5_MINOR_VERSION QT5_PATCH_VERSION
 
-if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
-	LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-else
-	LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
-fi
-
-SLOT=5/$(get_version_component_range 1-2)
-
 case ${PV} in
 	5.9999)
 		# git dev branch
@@ -131,10 +125,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # Unpacks the sources.
 qt5-build_src_unpack() {
 	if tc-is-gcc; then
-		local min_gcc4_minor_version=5
-		if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
-			min_gcc4_minor_version=7
-		fi
+		local min_gcc4_minor_version=7
 		if [[ $(gcc-major-version) -lt 4 ]] || \
 		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
 			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
@@ -268,21 +259,9 @@ qt5-build_src_install() {
 	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
-		local qmake_install_target=install_qmake
-		if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
-			# qmake/qmake-aux.pro
-			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
-		fi
-
-		local global_docs_install_target=
-		if [[ ${QT5_MINOR_VERSION} -le 6 && ${QT5_PATCH_VERSION} -le 2 ]]; then
-			global_docs_install_target=install_global_docs
-		fi
-
 		set -- emake INSTALL_ROOT="${D}" \
-			${qmake_install_target} \
-			install_{syncqt,mkspecs} \
-			${global_docs_install_target}
+			sub-qmake-qmake-aux-pro-install_subtargets \
+			install_{syncqt,mkspecs}
 
 		einfo "Running $*"
 		"$@"
@@ -585,7 +564,7 @@ qt5_base_configure() {
 		# prefer system libraries (only common hard deps here)
 		-system-zlib
 		-system-pcre
-		$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -system-doubleconversion)
+		-system-doubleconversion
 
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev
@@ -603,7 +582,7 @@ qt5_base_configure() {
 		-glib
 
 		# disable everything to prevent automagic deps (part 2)
-		$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo -no-gtkstyle)
+		-no-gtk
 		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa)
 
 		# exclude examples and tests from default build

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

[Michael Palimaka]

commit:     d9286ae0951744ebaec48b3b4e896b04830cfcc3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 11:26:44 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 11:27:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d9286ae0

qt5-build.eclass: fix test dependency logic

Thanks to Arfrever for pointing this out.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 76dfc9b4..11847bcf 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -114,7 +114,7 @@ DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
-if [[ ${PN} != qttest && (${PN} != qtwebkit && ${QT5_MINOR_VERSION} -ge 9) ]]; then
+if [[ (${PN} != qttest && ${PN} != qtwebkit) || (${PN} == qtwebkit && ${QT5_MINOR_VERSION} -lt 9) ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
 RDEPEND="

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

[Michael Palimaka]

commit:     bba86bf1171f811e5f8fe04b305d35b01f5f9a5a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 13:14:46 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 11:13:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bba86bf1

qt5-build.eclass: unset variables that, if set, cause configure to fail

Bug: https://bugs.gentoo.org/633838

 eclass/qt5-build.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d933767b..76dfc9b4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -519,6 +519,11 @@ qt5_base_configure() {
 	tc-export AR CC CXX OBJDUMP RANLIB STRIP
 	export LD="$(tc-getCXX)"
 
+	# bug 633838
+	if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+		unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES
+	fi
+
 	# configure arguments
 	local conf=(
 		# installation paths

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

[Michael Palimaka]

commit:     1f716846a2b83cec88800bd06160b8817715ef79
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 03:26:12 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 03:38:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=1f716846

qt5-build.eclass: don't add a test dependency for dev-qt/qtwebkit

The test dependency for dev-qt/qtwebkit will now be handled manually in that
ebuild as pinned Qt dependencies are no longer used there.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fca63af4..d933767b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -114,7 +114,7 @@ DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
-if [[ ${PN} != qttest ]]; then
+if [[ ${PN} != qttest && (${PN} != qtwebkit && ${QT5_MINOR_VERSION} -ge 9) ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
 RDEPEND="

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

[Michael Palimaka]

commit:     0b04528cc559c66f4fbebf0a0a605bd090e97944
Author:     Jan Kundrát <jkt <AT> kde <DOT> org>
AuthorDate: Fri Sep 22 14:16:55 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 14:44:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0b04528c

qt5-build.eclass: adapt to changes in Qt 5.9 git

A recent commit upstream [1] renamed some configure tests which resulted
in a broken build. It seems that these sed invocations were effectively
a no-op since at least [2] which apparently removed the last instance of
qmake's `-nocache` argument.

This seding was in place in the qt5-build.eclass since its very
beginning. I believe that the explanatory comment does not effectively
match what the code (might have been trying to) do. It seems that the
real origin dates back to 2015 when it was added [3] to the
qt4-build-multilib.eclass by @pesa.

Given that this `sed` was not doing anything for the past year anyway
and that nobody reported a bug about that AFAIK and that it started
breaking the build, it is safe to remove it now.

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b0060d1056d6d1752d91652261de97db909c7862
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=d90db0f136d727f8e6b9a566eee3eae80cd7d81e
[3] https://github.com/gentoo/gentoo-gitmig-20150809-draft/commit/265a3c916261b238bc12505a031d92225b1d7056

 eclass/qt5-build.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c0c5bda8..fa775d36 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -193,9 +193,11 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		# Respect toolchain and flags in config.tests
-		find config.tests/unix -name '*.test' -type f -execdir \
-			sed -i -e 's/-nocache //' '{}' + || die
+		if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then
+			# Respect toolchain and flags in config.tests
+			find config.tests/unix -name '*.test' -type f -execdir \
+				sed -i -e 's/-nocache //' '{}' + || die
+		fi
 
 		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
 		# compiler support for extended instruction sets (bug 552942)

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

[Michael Palimaka]

commit:     66dcf031932854324c8fbe1be883e66a66988968
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 14:26:01 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 14:44:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=66dcf031

qt5-build.eclass: fix 5.9.9999 and later live ebuilds

qconfig.h is created at configure time in $QT5_BUILD_DIR. Live ebuilds are
built out-of-source while release are not. Since the copy was happening in
the source directory, a fatal error occurred in live ebuilds as qconfig.h
is not where it was expected.

 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fa775d36..fca63af4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -680,13 +680,14 @@ qt5_base_configure() {
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 
-	popd >/dev/null || die
-
 	if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
 		# a forwarding header is no longer created since 5.8, causing the system
 		# config to always be used. bug 599636
 		cp src/corelib/global/qconfig.h include/QtCore/ || die
 	fi
+
+	popd >/dev/null || die
+
 }
 
 # @FUNCTION: qt5_qmake

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

[Michael Palimaka]

commit:     d82f92ed064996dfb187ef668d74ed5b05546b2d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 03:46:55 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Sep  8 15:51:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d82f92ed

qt5-build.eclass: create a forwarding header for qtbase

Since 5.8, the build system no longer creates a forwarding header causing the
system config to be used instead of what was passed to configure.

This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5.

Gentoo-bug: 599636

 eclass/qt5-build.eclass | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8066d84f..c0c5bda8 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -615,12 +615,7 @@ qt5_base_configure() {
 		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
 
 		# disable everything to prevent automagic deps (part 3)
-		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
-
-		# FIXME
-		# since 5.8, disabling dbus generates a QT_NO_DBUS in QtCore/qconfig.h,
-		# thus specify runtime loading of libdbus to avoid the #define
-		$([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime || echo -no-dbus)
+		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
 
 		# let portage handle stripping
 		-no-strip
@@ -684,6 +679,12 @@ qt5_base_configure() {
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 
 	popd >/dev/null || die
+
+	if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+		# a forwarding header is no longer created since 5.8, causing the system
+		# config to always be used. bug 599636
+		cp src/corelib/global/qconfig.h include/QtCore/ || die
+	fi
 }
 
 # @FUNCTION: qt5_qmake

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

[Davide Pesavento]

commit:     1679bdc3ac6778153ec044cb9f99479c2b38e8b7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 00:21:14 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 00:21:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=1679bdc3

qt5-build.eclass: update github mirror URL

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 60c16829..d0013f3e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -94,7 +94,7 @@ readonly QT5_BUILD_TYPE
 EGIT_REPO_URI=(
 	"git://code.qt.io/qt/${QT5_MODULE}.git"
 	"https://code.qt.io/git/qt/${QT5_MODULE}.git"
-	"https://github.com/qtproject/${QT5_MODULE}.git"
+	"https://github.com/qt/${QT5_MODULE}.git"
 )
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
 

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

[Davide Pesavento]

commit:     2a263048bd80f87a97fb8fe6b2b57c7ff701a3a6
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 00:22:52 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 00:22:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2a263048

qt5-build.eclass: drop insecure git:// URL from EGIT_REPO_URI

 eclass/qt5-build.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d0013f3e..8066d84f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -92,8 +92,7 @@ esac
 readonly QT5_BUILD_TYPE
 
 EGIT_REPO_URI=(
-	"git://code.qt.io/qt/${QT5_MODULE}.git"
-	"https://code.qt.io/git/qt/${QT5_MODULE}.git"
+	"https://code.qt.io/qt/${QT5_MODULE}.git"
 	"https://github.com/qt/${QT5_MODULE}.git"
 )
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3

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

[Michael Palimaka]

commit:     0315572fe3ad9b50c45f8214a5d6e545f51b4896
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 05:32:29 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 05:37:09 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0315572f

qt5-build.eclass: handle live minor versions >=10

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ec6cac3..60c16829 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -69,7 +69,7 @@ case ${PV} in
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH="dev"
 		;;
-	5.?.9999)
+	5.?.9999|5.??.9999|5.???.9999)
 		# git stable branch
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH=${PV%.9999}

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

[Davide Pesavento]

commit:     e4acb6d593d8c65a1b8430d90dbbc3b8b7d41168
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 00:18:14 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 18 00:18:14 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e4acb6d5

qt5-build.eclass: remove dead code

 eclass/qt5-build.eclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 55537522..b8d1d85c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -85,12 +85,7 @@ case ${PV} in
 		# official stable release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
-		# bug 586646
-		if [[ ${PV} = 5.6.1 ]]; then
-			SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}-1/submodules/${MY_P}-1.tar.xz"
-		else
-			SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
-		fi
+		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

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

[Davide Pesavento]

commit:     bc3929cdd34430e04141c9b06b8ee6a6da636138
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 00:22:33 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 18 00:22:33 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bc3929cd

qt5-build.eclass: simplify conditional since 5.8.0 is gone

 eclass/qt5-build.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b8d1d85c..7ec6cac3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -646,8 +646,7 @@ qt5_base_configure() {
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)
 		-no-xkb
-		$([[ ${QT5_MINOR_VERSION} -lt 8 || ${QT5_MINOR_VERSION} -eq 8
-			&& ${QT5_PATCH_VERSION} -lt 1 ]] && echo -no-xrender)
+		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-xrender)
 
 		# disable obsolete/unused X11-related flags
 		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)

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

[Davide Pesavento]

commit:     07f007ae36f9d3cb99df6d4ebd6367098c9b14dc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 19:21:18 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 19:21:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=07f007ae

qt5-build.eclass: sync with gentoo.git

 eclass/qt5-build.eclass | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0c92a306..55537522 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qt5-build.eclass
@@ -9,14 +9,14 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 5 or 6.
+# Requires EAPI 6.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
 	die "qt5-build.eclass is only to be used for building Qt 5."
 fi
 
 case ${EAPI} in
-	5|6)	: ;;
+	6)	: ;;
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
@@ -47,8 +47,7 @@ esac
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-[[ ${EAPI} == 5 ]] && inherit multilib
-inherit eutils flag-o-matic toolchain-funcs versionator virtualx
+inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx
 
 HOMEPAGE="https://www.qt.io/"
 
@@ -214,12 +213,7 @@ qt5-build_src_prepare() {
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
 	fi
 
-	if [[ ${EAPI} == 5 ]]; then
-		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-		epatch_user
-	else
-		default
-	fi
+	default
 }
 
 # @FUNCTION: qt5-build_src_configure
@@ -477,9 +471,6 @@ qt5_prepare_env() {
 qt5_foreach_target_subdir() {
 	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
 
-	local die_args=()
-	[[ ${EAPI} != 5 ]] && die_args+=(-n)
-
 	local subdir=
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
 		if [[ ${EBUILD_PHASE} == test ]]; then
@@ -490,12 +481,12 @@ qt5_foreach_target_subdir() {
 		local msg="Running $* ${subdir:+in ${subdir}}"
 		einfo "${msg}"
 
-		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die "${die_args[@]}" || return $?
-		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die "${die_args[@]}" || return $?
+		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die -n || return $?
+		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die -n || return $?
 
-		"$@" || die "${die_args[@]}" "${msg} failed" || return $?
+		"$@" || die -n "${msg} failed" || return $?
 
-		popd >/dev/null || die "${die_args[@]}" || return $?
+		popd >/dev/null || die -n || return $?
 	done
 }
 

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

[Davide Pesavento]

commit:     53e51ab097bd73ec05d56c389bc68da17eaf22d5
Author:     Matthias Dahl <matthias.dahl <AT> binary-island <DOT> eu>
AuthorDate: Thu Apr 20 07:55:36 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 00:51:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=53e51ab0

qt5-build.eclass: workaround global disabling of dbus for qtbase >= 5.8

Passing a 'no-dbus' to configure will result in a QT_NO_DBUS macro in
QtCore/qconfig.h when qtcore is compiled -- causing all sorts of havoc
naturally while compiling packages that require QtDBus.

If we use 'dbus-runtime' instead, there will be no hard dependencies
on DBus, while avoiding that macro altogether.

I recompiled Qt 5.8.9999 with it, as well as kde-frameworks/*,
and everything turned out fine. I did not find any side-effects.

Gentoo-Bug: 599636

 eclass/qt5-build.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d679da40..0c92a306 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -630,7 +630,12 @@ qt5_base_configure() {
 		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
 
 		# disable everything to prevent automagic deps (part 3)
-		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
+		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig
+
+		# FIXME
+		# since 5.8, disabling dbus generates a QT_NO_DBUS in QtCore/qconfig.h,
+		# thus specify runtime loading of libdbus to avoid the #define
+		$([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime || echo -no-dbus)
 
 		# let portage handle stripping
 		-no-strip

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

[Davide Pesavento]

commit:     b285e86e38c9ebb5cf7be322498de8fa75e051e5
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 16:26:30 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 04:28:55 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b285e86e

qt5-build.eclass: Fix qtbase configure for {5,5.8}.9999

Upstream has removed an "unused Xlib's XRender dependency", which
results into live and future packages failing during their configure
phases due to an unknown command line option (-xrender or -no-xrender).

http://code.qt.io/cgit/qt/qtbase.git/commit/?id=d37c353dc0f2ae5bb803fe9e5752eff846246439

 eclass/qt5-build.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index eea388d8..d679da40 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -654,7 +654,9 @@ qt5_base_configure() {
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)
-		-no-xkb -no-xrender
+		-no-xkb
+		$([[ ${QT5_MINOR_VERSION} -lt 8 || ${QT5_MINOR_VERSION} -eq 8
+			&& ${QT5_PATCH_VERSION} -lt 1 ]] && echo -no-xrender)
 
 		# disable obsolete/unused X11-related flags
 		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)

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

[Michael Palimaka]

commit:     241a0712deb4e10edaa70f6681490a97d49d5126
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 18:02:53 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 10:26:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=241a0712

qt5-build.eclass: fix avoiding qmake recompilation for Qt 5.8 and later

See qtbase commit 4ce0beee1b69a8695fc24a244a8a3053711906ac.

 eclass/qt5-build.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 301cc17..f97bd77 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -179,8 +179,14 @@ qt5-build_src_prepare() {
 		qt5_symlink_tools_to_build_dir
 
 		# Avoid unnecessary qmake recompilations
-		sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
-			configure || die "sed failed (skip qmake bootstrap)"
+		if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+			sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
+				-e '/echo "Done."/a fi' \
+				configure || die "sed failed (skip qmake bootstrap)"
+		else
+			sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
+				configure || die "sed failed (skip qmake bootstrap)"
+		fi
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
 		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \

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

[Davide Pesavento]

commit:     adec274a96ccf8a1dc925903ef9b78b8805cba0b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 15:35:56 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 15:35:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=adec274a

qt5-build.eclass: drop support for Qt < 5.6

 eclass/qt5-build.eclass | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6ee55a6..301cc17 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -63,11 +63,7 @@ else
 	LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 fi
 
-if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-	SLOT=5/$(get_version_component_range 1-2)
-else
-	SLOT=5
-fi
+SLOT=5/$(get_version_component_range 1-2)
 
 case ${PV} in
 	5.9999)
@@ -149,14 +145,8 @@ qt5-build_src_unpack() {
 		fi
 		if [[ $(gcc-major-version) -lt 4 ]] || \
 		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
-			if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-				eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
-				die "GCC 4.${min_gcc4_minor_version} or later required"
-			else
-				ewarn
-				ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported"
-				ewarn
-			fi
+			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+			die "GCC 4.${min_gcc4_minor_version} or later required"
 		fi
 	fi
 
@@ -563,7 +553,7 @@ qt5_base_configure() {
 
 		# no need to forcefully build host tools in optimized mode,
 		# just follow the overall debug/release build type
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-optimized-tools)
+		-no-optimized-tools
 
 		# licensing stuff
 		-opensource -confirm-license
@@ -586,7 +576,7 @@ qt5_base_configure() {
 		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
 
 		# ensure the QML debugging support (qmltooling) is built in qtdeclarative
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -qml-debug)
+		-qml-debug
 
 		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)
@@ -603,8 +593,7 @@ qt5_base_configure() {
 
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev
-		-no-journald
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog)
+		-no-journald -no-syslog
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
 		-no-openssl -no-libproxy
@@ -645,7 +634,7 @@ qt5_base_configure() {
 		-no-pch
 
 		# link-time code generation is not something we want to enable by default
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-ltcg)
+		-no-ltcg
 
 		# reduced relocations cause major breakage on at least arm and ppc, so
 		# don't specify anything and let the configure figure out if they are
@@ -656,10 +645,7 @@ qt5_base_configure() {
 		#-use-gold-linker
 
 		# disable all platform plugins by default, override in qtgui
-		-no-xcb -no-eglfs -no-kms
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-gbm)
-		-no-directfb -no-linuxfb
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
+		-no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb -no-mirclient
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)
@@ -687,7 +673,7 @@ qt5_base_configure() {
 
 		# respect system proxies by default: it's the most natural
 		# setting, and it'll become the new upstream default in 5.8
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -system-proxies)
+		-system-proxies
 
 		# do not build with -Werror
 		-no-warnings-are-errors

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

[Davide Pesavento]

commit:     ecffac6efd87682facfecdfc309577bcd0bd9d9d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 03:01:06 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 03:01:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecffac6e

qt5-build.eclass: sync with gentoo.git

 eclass/qt5-build.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f6a62cc..6ee55a6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -91,7 +91,12 @@ case ${PV} in
 		# official stable release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
-		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		# bug 586646
+		if [[ ${PV} = 5.6.1 ]]; then
+			SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}-1/submodules/${MY_P}-1.tar.xz"
+		else
+			SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		fi
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

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

[Davide Pesavento]

commit:     4b7ca223526e696b47ba90d3dd5fbcee2c6185f0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 02:47:32 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 02:47:32 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b7ca223

qt5-build.eclass: fix version check for install_global_docs

This restores global docs installation in 5.6.1 and 5.6.2, which
do not contain the mentioned upstream commit.

Amends ff79c14ece9b5fbd2e13a897e67d37ab241a3b68

 eclass/qt5-build.eclass | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d496ba0..f6a62cc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -54,7 +54,8 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 HOMEPAGE="https://www.qt.io/"
 
 QT5_MINOR_VERSION=$(get_version_component_range 2)
-readonly QT5_MINOR_VERSION
+QT5_PATCH_VERSION=$(get_version_component_range 3)
+readonly QT5_MINOR_VERSION QT5_PATCH_VERSION
 
 if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
 	LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
@@ -283,18 +284,16 @@ qt5-build_src_install() {
 			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
 		fi
 
-		if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-
-			set -- emake INSTALL_ROOT="${D}" \
-				${qmake_install_target} \
-				install_{syncqt,mkspecs}
-		else
-
-			set -- emake INSTALL_ROOT="${D}" \
-				${qmake_install_target} \
-				install_{syncqt,mkspecs,global_docs}
+		local global_docs_install_target=
+		if [[ ${QT5_MINOR_VERSION} -le 6 && ${QT5_PATCH_VERSION} -le 2 ]]; then
+			global_docs_install_target=install_global_docs
 		fi
 
+		set -- emake INSTALL_ROOT="${D}" \
+			${qmake_install_target} \
+			install_{syncqt,mkspecs} \
+			${global_docs_install_target}
+
 		einfo "Running $*"
 		"$@"
 

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

[Michael Palimaka]

commit:     59718fb00fe774f1918dd7263f016e6993dc99e5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 19:33:34 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 13:49:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=59718fb0

qt5-build.eclass: introduce qt_use_disable_config

Similar to qt_use_disable_mod, this function helps avoid automagic dependencies.

 eclass/qt5-build.eclass | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9727ce7..d496ba0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -388,6 +388,29 @@ qt_use_compile_test() {
 	fi
 }
 
+# @FUNCTION: qt_use_disable_config
+# @USAGE: <flag> <config> <files...>
+# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+# <config> is the (lowercase) name of a Qt5 config entry.
+# <files...> is a list of one or more qmake project files.
+#
+# This function patches <files> to treat <config> as disabled
+# when <flag> is disabled, otherwise it does nothing.
+# This can be useful to avoid an automagic dependency when the config entry
+# is enabled on the system but the corresponding USE flag is disabled.
+qt_use_disable_config() {
+	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments"
+
+	local flag=$1
+	local config=$2
+	shift 2
+
+	if ! use "${flag}"; then
+		echo "$@" | xargs sed -i -e "s/qtConfig(${config})/false/g" || die
+	fi
+}
+
 # @FUNCTION: qt_use_disable_mod
 # @USAGE: <flag> <module> <files...>
 # @DESCRIPTION:

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

[Michael Palimaka]

commit:     ff79c14ece9b5fbd2e13a897e67d37ab241a3b68
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 18:00:42 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 17:22:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ff79c14e

qt5-build.eclass: Disable 'global_docs'

The global_docs target is not needed any longer due to the following
upstream change:

http://code.qt.io/cgit/qt/qtbase.git/commit/?id=a7ddef139415f74f9ba8dc84a2f15105149ca5e8

Gentoo-Bug: https://bugs.gentoo.org/596054

 eclass/qt5-build.eclass | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f66fde0..9727ce7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -283,9 +283,18 @@ qt5-build_src_install() {
 			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
 		fi
 
-		set -- emake INSTALL_ROOT="${D}" \
-			${qmake_install_target} \
-			install_{syncqt,mkspecs,global_docs}
+		if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+
+			set -- emake INSTALL_ROOT="${D}" \
+				${qmake_install_target} \
+				install_{syncqt,mkspecs}
+		else
+
+			set -- emake INSTALL_ROOT="${D}" \
+				${qmake_install_target} \
+				install_{syncqt,mkspecs,global_docs}
+		fi
+
 		einfo "Running $*"
 		"$@"
 

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

[Michael Palimaka]

commit:     28d0d26ec883a62ad55844cd8e683d24b259c1b1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 16:40:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 16:59:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=28d0d26e

qt5-build.eclass: adjust to upstream multimedia build system changes in qtbase

Change-Id: I1a2ee8be3efb7c4ee9a29d2a8e3fc1f3eea704fc
Gentoo-bug: 600226

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f9de34e..f66fde0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -582,8 +582,8 @@ qt5_base_configure() {
 		-glib
 
 		# disable everything to prevent automagic deps (part 2)
-		-no-pulseaudio -no-alsa
 		$([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo -no-gtkstyle)
+		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-pulseaudio -no-alsa)
 
 		# exclude examples and tests from default build
 		-nomake examples
@@ -647,7 +647,7 @@ qt5_base_configure() {
 		-no-libinput
 
 		# disable gstreamer by default, override in qtmultimedia
-		-no-gstreamer
+		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-gstreamer)
 
 		# respect system proxies by default: it's the most natural
 		# setting, and it'll become the new upstream default in 5.8

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

[Michael Palimaka]

commit:     0dd28ffc0326597f1d297727f999c775dee7fe17
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 18:43:06 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 18:43:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0dd28ffc

qt5-build.eclass: restored commented code

The line appears to have been accidentally commented out in d41a1a9e75f97dc896efc5c93decadc1c45235a0.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 57a0f38..f9de34e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -114,7 +114,7 @@ esac
 IUSE="debug test"
 
 [[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
-#[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
+[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
 
 DEPEND="
 	dev-lang/perl

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

[Davide Pesavento]

commit:     61f4607ed8d02e97d3250fc86a29d94a3bca7cdd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 21:44:36 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 21:44:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=61f4607e

qt5-build.eclass: don't run gcc version checks if compiler is not gcc

Gentoo-Bug: 587582

 eclass/qt5-build.eclass | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5c3acd8..f9de34e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -136,19 +136,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	local min_gcc4_minor_version=5
-	if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
-		min_gcc4_minor_version=7
-	fi
-	if [[ $(gcc-major-version) -lt 4 ]] || \
-	   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
-		if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
-			die "GCC 4.${min_gcc4_minor_version} or later required"
-		else
-			ewarn
-			ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported"
-			ewarn
+	if tc-is-gcc; then
+		local min_gcc4_minor_version=5
+		if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
+			min_gcc4_minor_version=7
+		fi
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
+			if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+				eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+				die "GCC 4.${min_gcc4_minor_version} or later required"
+			else
+				ewarn
+				ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported"
+				ewarn
+			fi
 		fi
 	fi
 

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

[Davide Pesavento]

commit:     2de743381e9955e221fc09c4be521886ecd31788
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 22:53:57 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 22:54:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2de74338

qt5-build.eclass: tweak sed expression to also apply to 5.6.1 and later

See qtbase commit 394a02624105082c9ac440711c8a98bf75b830f3

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9b1a4ab..5c3acd8 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -199,7 +199,7 @@ qt5-build_src_prepare() {
 
 		# Respect toolchain and flags in config.tests
 		find config.tests/unix -name '*.test' -type f -execdir \
-			sed -i -re '/(bin\/qmake|QMAKE")/ s/-nocache //' '{}' + || die
+			sed -i -e 's/-nocache //' '{}' + || die
 
 		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
 		# compiler support for extended instruction sets (bug 552942)

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

[Davide Pesavento]

commit:     16f4d6943bb41fb765fc32cde06ba7bcdbe1e83f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 01:19:20 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 01:19:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=16f4d694

qt5-build.eclass: sync with gentoo.git

 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 47c121d..9b1a4ab 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -647,8 +647,9 @@ qt5_base_configure() {
 		# disable gstreamer by default, override in qtmultimedia
 		-no-gstreamer
 
-		# use upstream default
-		#-no-system-proxies
+		# respect system proxies by default: it's the most natural
+		# setting, and it'll become the new upstream default in 5.8
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -system-proxies)
 
 		# do not build with -Werror
 		-no-warnings-are-errors

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

[Davide Pesavento]

commit:     df3dd7a84882602ec9e0ecc95040252bfeab8964
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 00:08:27 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 00:08:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=df3dd7a8

qt5-build.eclass: -nis is completely gone, don't even mention it

See qtbase commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db

 eclass/qt5-build.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 349e551..47c121d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -594,9 +594,6 @@ qt5_base_configure() {
 		# print verbose information about each configure test
 		-verbose
 
-		# obsolete flag, does nothing
-		#-nis
-
 		# always enable iconv support
 		-iconv
 

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

[Davide Pesavento]

commit:     cb6166dae65059db60215c4ff61e5547df862931
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 00:23:00 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 30 00:39:58 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=cb6166da

qt5-build.eclass: make sure we enable the QML debugging support

The code comment was incorrect, the flag *is* used, at least in Qt 5.6
and later. It obviously applies only to qtdeclarative, but for some
reason the flag can only be toggled from qtbase's configure... meh.

We don't allow turning this functionality off via a USE flag because
it would be a mess to implement properly, and its meaning would be
rather obscure for most users. It's a small amount of code anyway, and
it doesn't require any additional dependencies.

The configure already enabled -qml-debug by default, so this commit
effectively doesn't change anything in practice.

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9732058..349e551 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -547,8 +547,8 @@ qt5_base_configure() {
 		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
 		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
 
-		# obsolete flag, does nothing
-		#-qml-debug
+		# ensure the QML debugging support (qmltooling) is built in qtdeclarative
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -qml-debug)
 
 		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)

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

[Davide Pesavento]

commit:     77126e954de960a466e4d3a9a8a8cfc1618310b3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 12:05:40 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 12:08:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=77126e95

qt5-build.eclass: stop passing removed configure options

See qtbase commit 4cb795cbdbc4d117c9de623b086975ebdf1f9a15

Gentoo-Bug: 581318

 eclass/qt5-build.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 30ef6db..8059167 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -631,8 +631,7 @@ qt5_base_configure() {
 		-no-xkb -no-xrender
 
 		# disable obsolete/unused X11-related flags
-		# (not shown in ./configure -help output)
-		-no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync
+		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync)
 
 		# always enable session management support: it doesn't need extra deps
 		# at configure time and turning it off is dangerous, see bug 518262

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

[Davide Pesavento]

commit:     d8ae116689935bc414af147811cf6c3af534cc37
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 12:16:01 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 12:16:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d8ae1166

qt5-build.eclass: stop passing -largefile to configure

See qtbase commit 84d3a21c9efe7efb2cce6d3bd14af1f9580b1108

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8059167..9732058 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -537,7 +537,7 @@ qt5_base_configure() {
 		-shared
 
 		# always enable large file support
-		-largefile
+		$([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -largefile)
 
 		# disabling accessibility is not recommended by upstream, as
 		# it will break QStyle and may break other internal parts of Qt

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

[Davide Pesavento]

commit:     19e67f928a60a88953d6b85443e630367cedf46a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 16:22:45 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 16:22:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=19e67f92

qt5-build.eclass: drop 5.4 support

 eclass/qt5-build.eclass | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b073497..ba3f5bf 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -201,16 +201,14 @@ qt5-build_src_prepare() {
 		find config.tests/unix -name '*.test' -type f -execdir \
 			sed -i -re '/(bin\/qmake|QMAKE")/ s/-nocache //' '{}' + || die
 
+		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
+		# compiler support for extended instruction sets (bug 552942)
+		find config.tests/common -name '*.pro' -type f -execdir \
+			sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
+
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
-
-		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
-		# compiler support for extended instruction sets (bug 552942)
-		if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
-			find config.tests/common -name '*.pro' -type f -execdir \
-				sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
-		fi
 	fi
 
 	if [[ ${EAPI} == 5 ]]; then
@@ -552,14 +550,7 @@ qt5_base_configure() {
 		# obsolete flag, does nothing
 		#-qml-debug
 
-		# extended instruction sets support
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse2   && echo -no-sse2)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse3   && echo -no-sse3)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-ssse3  && echo -no-ssse3)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.1 && echo -no-sse4.1)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.2 && echo -no-sse4.2)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx    && echo -no-avx)
-		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx2   && echo -no-avx2)
+		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)
 		$(is-flagq -mno-dspr2 && echo -no-mips_dspr2)
 
@@ -576,9 +567,8 @@ qt5_base_configure() {
 		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog)
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
-		-no-openssl
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-{x11,evdev})
+		-no-openssl -no-libproxy
+		-no-xkbcommon-x11 -no-xkbcommon-evdev
 		-no-xinput2 -no-xcb-xlib
 
 		# don't specify -no-gif because there is no way to override it later
@@ -609,10 +599,7 @@ qt5_base_configure() {
 		-iconv
 
 		# disable everything to prevent automagic deps (part 3)
-		-no-cups -no-evdev
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib)
-		-no-icu -no-fontconfig
-		-no-dbus
+		-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
 
 		# let portage handle stripping
 		-no-strip
@@ -657,10 +644,10 @@ qt5_base_configure() {
 		-no-opengl -no-egl
 
 		# disable libinput-based generic plugin by default, override in qtgui
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput)
+		-no-libinput
 
 		# disable gstreamer by default, override in qtmultimedia
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer)
+		-no-gstreamer
 
 		# use upstream default
 		#-no-system-proxies

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

[Davide Pesavento]

commit:     98f0450083e9790268989bb6af75569f813adc7c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 13:28:16 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 13:28:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=98f04500

qt5-build.eclass: use https in SRC_URI

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index baab86f..b073497 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -83,14 +83,14 @@ case ${PV} in
 		# development release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
+		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P%-alpha}
 		;;
 	*)
 		# official stable release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
-		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

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

[Davide Pesavento]

commit:     154f21fa9b3677d079ddf1ac5bad5cbedf792ee7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 21:36:35 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 21:36:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=154f21fa

qt5-build.eclass: adapt qmake installation target name for 5.7

Gentoo-Bug: 566196

 eclass/qt5-build.eclass | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 31a5b65..baab86f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -277,7 +277,15 @@ qt5-build_src_install() {
 	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
-		set -- emake INSTALL_ROOT="${D}" install_{global_docs,mkspecs,qmake,syncqt}
+		local qmake_install_target=install_qmake
+		if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
+			# qmake/qmake-aux.pro
+			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
+		fi
+
+		set -- emake INSTALL_ROOT="${D}" \
+			${qmake_install_target} \
+			install_{syncqt,mkspecs,global_docs}
 		einfo "Running $*"
 		"$@"
 

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

[Davide Pesavento]

commit:     12f4fabfaca9bd4c0f62d8ba0b9731840eff588e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 19:58:11 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 19:58:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=12f4fabf

qt5-build.eclass: rewrite sed so that it works on 5.6 and 5.7 too

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4260c20..0a54bed 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -188,12 +188,12 @@ qt5-build_src_prepare() {
 		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
 			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
 			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
-			-e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
+			-e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \
 			configure || die "sed failed (respect env for qmake build)"
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
 			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
 
-		# Respect CXX in {bsymbolic_functions,fvisibility,precomp}.test
+		# Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 

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

[Davide Pesavento]

commit:     ab4ed663cee3126d99e6638a0607531d589194be
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 20:28:01 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 20:28:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab4ed663

qt5-build.eclass: tweak sed to apply to 5.7's config.tests

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0a54bed..31a5b65 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -199,7 +199,7 @@ qt5-build_src_prepare() {
 
 		# Respect toolchain and flags in config.tests
 		find config.tests/unix -name '*.test' -type f -execdir \
-			sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die
+			sed -i -re '/(bin\/qmake|QMAKE")/ s/-nocache //' '{}' + || die
 
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \

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

[Davide Pesavento]

commit:     7c3bcf6032b37bcb15b8bac6dba1b151e80d613d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 02:03:28 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 02:03:28 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=7c3bcf60

qt5-build.eclass: tweak sed to apply to avx512 tests added in 5.7

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ea4c717..4260c20 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -209,7 +209,7 @@ qt5-build_src_prepare() {
 		# compiler support for extended instruction sets (bug 552942)
 		if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
 			find config.tests/common -name '*.pro' -type f -execdir \
-				sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
+				sed -i -e '/QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
 		fi
 	fi
 

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

[Davide Pesavento]

commit:     be19d02bcd57c7070be6969be595ae5c9f4f74f3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 01:25:54 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 01:25:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=be19d02b

qt5-build.eclass: adjust ${S} for 5.7.0_alpha

Gentoo-Bug: 577114

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3bae89c..ea4c717 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -84,7 +84,7 @@ case ${PV} in
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
+		S=${WORKDIR}/${MY_P%-alpha}
 		;;
 	*)
 		# official stable release

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

[Davide Pesavento]

commit:     e2c27b48a98cb8a6789ff9de5cb1b8637ab45a4e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 01:14:52 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 01:14:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e2c27b48

qt5-build.eclass: simplify gcc version check, add eerror

 eclass/qt5-build.eclass | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d7be3d0..3bae89c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -136,20 +136,19 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	local gcc_version_check_fatal=false
 	local min_gcc4_minor_version=5
-	if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-		gcc_version_check_fatal=true
-	fi
 	if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
 		min_gcc4_minor_version=7
 	fi
 	if [[ $(gcc-major-version) -lt 4 ]] || \
 	   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
-		if ${gcc_version_check_fatal}; then
-			die "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+		if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+			eerror "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+			die "GCC 4.${min_gcc4_minor_version} or later required"
 		else
+			ewarn
 			ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported"
+			ewarn
 		fi
 	fi
 

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

[Davide Pesavento]

commit:     213c3ad70ffa9b73cdf111231fb40810bdf61210
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 01:04:01 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 01:04:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=213c3ad7

qt5-build.eclass: stop mentioning bug 307861 to users

It doesn't contain much useful information or instructions, and
users might actually get more confused because it's about Qt4.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f0023b8..d7be3d0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -153,6 +153,7 @@ qt5-build_src_unpack() {
 		fi
 	fi
 
+	# bug 307861
 	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
@@ -160,7 +161,6 @@ qt5-build_src_unpack() {
 			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
 			ewarn "You may experience really long compilation times and/or increased memory usage."
 			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn "For more info check out https://bugs.gentoo.org/307861"
 			ewarn
 		fi
 		eshopts_pop

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

[Davide Pesavento]

commit:     0b87664bd7a24f3b07117ec6cc059898b6a33aac
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 01:13:52 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 01:13:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0b87664b

qt5-build.eclass: update licensing options for Qt 5.7

http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/

 eclass/qt5-build.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c5eb32b..40f7424 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -52,11 +52,16 @@ esac
 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 
 HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
 QT5_MINOR_VERSION=$(get_version_component_range 2)
 readonly QT5_MINOR_VERSION
 
+if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
+	LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+else
+	LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
+fi
+
 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
 	SLOT=5/$(get_version_component_range 1-2)
 else

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

[Davide Pesavento]

commit:     ecd44b7ea14e4b92d8de94058987b1cd3e52f9ce
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 21:35:30 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 21:35:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecd44b7e

qt5-build.eclass: sync with gentoo repo

 eclass/qt5-build.eclass | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9f8eabb..c5eb32b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -58,8 +58,6 @@ QT5_MINOR_VERSION=$(get_version_component_range 2)
 readonly QT5_MINOR_VERSION
 
 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-	# IMPORTANT: add a subslot dependency to your package only if you are sure
-	#            that it uses some private Qt APIs (most likely it does not)
 	SLOT=5/$(get_version_component_range 1-2)
 else
 	SLOT=5
@@ -196,13 +194,19 @@ qt5-build_src_prepare() {
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect toolchain and flags in config.tests
-		find config.tests/unix -name '*.test' -type f \
-			-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
-			|| die "sed failed (config.tests)"
+		find config.tests/unix -name '*.test' -type f -execdir \
+			sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die
 
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
+
+		# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
+		# compiler support for extended instruction sets (bug 552942)
+		if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
+			find config.tests/common -name '*.pro' -type f -execdir \
+				sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
+		fi
 	fi
 
 	if [[ ${EAPI} == 5 ]]; then
@@ -536,16 +540,16 @@ qt5_base_configure() {
 		# obsolete flag, does nothing
 		#-qml-debug
 
-		# instruction set support
-		$(is-flagq -mno-sse2    && echo -no-sse2)
-		$(is-flagq -mno-sse3    && echo -no-sse3)
-		$(is-flagq -mno-ssse3   && echo -no-ssse3)
-		$(is-flagq -mno-sse4.1  && echo -no-sse4.1)
-		$(is-flagq -mno-sse4.2  && echo -no-sse4.2)
-		$(is-flagq -mno-avx     && echo -no-avx)
-		$(is-flagq -mno-avx2    && echo -no-avx2)
-		$(is-flagq -mno-dsp     && echo -no-mips_dsp)
-		$(is-flagq -mno-dspr2   && echo -no-mips_dspr2)
+		# extended instruction sets support
+		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse2   && echo -no-sse2)
+		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse3   && echo -no-sse3)
+		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-ssse3  && echo -no-ssse3)
+		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.1 && echo -no-sse4.1)
+		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.2 && echo -no-sse4.2)
+		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx    && echo -no-avx)
+		$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx2   && echo -no-avx2)
+		$(is-flagq -mno-dsp   && echo -no-mips_dsp)
+		$(is-flagq -mno-dspr2 && echo -no-mips_dspr2)
 
 		# use pkg-config to detect include and library paths
 		-pkg-config

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

[Davide Pesavento]

commit:     dcea5e74e34ac44f41624762d513cd8d5802abeb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 00:01:56 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 00:01:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dcea5e74

qt5-build.eclass: no need to symlink qdoc

 eclass/qt5-build.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 72e60e9..9f8eabb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -461,7 +461,6 @@ qt5_symlink_tools_to_build_dir() {
 	local tool= tools=()
 	if [[ ${PN} != qtcore ]]; then
 		tools+=(qmake moc rcc qlalr)
-		[[ ${PN} != qdoc ]] && tools+=(qdoc)
 		[[ ${PN} != qtdbus ]] && tools+=(qdbuscpp2xml qdbusxml2cpp)
 		[[ ${PN} != qtwidgets ]] && tools+=(uic)
 	fi

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

[Davide Pesavento]

commit:     91839540e97eb22f0ac218aa174b06a01870f3f5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 02:02:29 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 02:02:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=91839540

qt5-build.eclass: make gcc version check fatal starting with Qt 5.6

 eclass/qt5-build.eclass | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a1ad3fb..72e60e9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -133,15 +133,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
+	local gcc_version_check_fatal=false
 	local min_gcc4_minor_version=5
+	if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+		gcc_version_check_fatal=true
+	fi
 	if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
 		min_gcc4_minor_version=7
 	fi
 	if [[ $(gcc-major-version) -lt 4 ]] || \
 	   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
-		ewarn
-		ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported."
-		ewarn
+		if ${gcc_version_check_fatal}; then
+			die "GCC version 4.${min_gcc4_minor_version} or later is required to build this package"
+		else
+			ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported"
+		fi
 	fi
 
 	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then

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

[Davide Pesavento]

commit:     8ed3b65dd6316568c74cad5485936abd7f4f36a4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 01:31:31 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 01:31:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8ed3b65d

qt5-build.eclass: update gcc version check for 5.7 and qtwebengine

 eclass/qt5-build.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 600f2f9..a1ad3fb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -133,9 +133,14 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install sr
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]]; then
+	local min_gcc4_minor_version=5
+	if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
+		min_gcc4_minor_version=7
+	fi
+	if [[ $(gcc-major-version) -lt 4 ]] || \
+	   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt ${min_gcc4_minor_version} ]]; then
 		ewarn
-		ewarn "Using a GCC version lower than 4.5 is not supported."
+		ewarn "Using a GCC version lower than 4.${min_gcc4_minor_version} is not supported."
 		ewarn
 	fi
 

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

[Davide Pesavento]

commit:     4009c796c455439b48d47dc8d04b2af3d5b4b1ed
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 01:11:39 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 01:12:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4009c796

qt5-build.eclass: warn about -g/-ggdb in qtwebengine too

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a148793..600f2f9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -139,7 +139,7 @@ qt5-build_src_unpack() {
 		ewarn
 	fi
 
-	if [[ ${PN} == qtwebkit ]]; then
+	if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			ewarn

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

[Davide Pesavento]

commit:     45feeecdbbadd6630663527c470974fb62dec352
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 18:03:59 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 18:03:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=45feeecd

qt4-build-multilib.eclass: delete unused eclass

 eclass/qt4-build-multilib.eclass | 836 ---------------------------------------
 1 file changed, 836 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
deleted file mode 100644
index 51a2f30..0000000
--- a/eclass/qt4-build-multilib.eclass
+++ /dev/null
@@ -1,836 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: qt4-build-multilib.eclass
-# @MAINTAINER:
-# qt@gentoo.org
-# @AUTHOR:
-# Davide Pesavento <pesa@gentoo.org>
-# @BLURB: Eclass for Qt4 split ebuilds with multilib support.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4.
-# Requires EAPI 5.
-
-case ${EAPI} in
-	5)	: ;;
-	*)	die "qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3"
-SLOT="4"
-
-case ${PV} in
-	4.?.9999)
-		# git stable branch
-		QT4_BUILD_TYPE="live"
-		EGIT_BRANCH=${PV%.9999}
-		;;
-	*)
-		# official stable release
-		QT4_BUILD_TYPE="release"
-		MY_P=qt-everywhere-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
-		S=${WORKDIR}/${MY_P}
-		;;
-esac
-
-EGIT_REPO_URI=(
-	"git://code.qt.io/qt/qt.git"
-	"https://code.qt.io/git/qt/qt.git"
-	"https://github.com/qtproject/qt.git"
-)
-[[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3
-
-if [[ ${PN} != qttranslations ]]; then
-	IUSE="aqua debug pch"
-	[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
-fi
-
-DEPEND="
-	dev-lang/perl
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	dev-qt/qtchooser
-	abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
-"
-
-
-# src_{configure,compile,test,install} are inherited from multilib-minimal
-EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm
-
-multilib_src_configure()	{ qt4_multilib_src_configure; }
-multilib_src_compile()		{ qt4_multilib_src_compile; }
-multilib_src_test()		{ qt4_multilib_src_test; }
-multilib_src_install()		{ qt4_multilib_src_install; }
-multilib_src_install_all()	{ qt4_multilib_src_install_all; }
-
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-#	PATCHES=(
-#		"${FILESDIR}/mypatch.patch"
-#		"${FILESDIR}/mypatch2.patch"
-#	)
-# @CODE
-
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Space-separated list of directories that will be configured,
-# compiled, and installed. All paths must be relative to ${S}.
-
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of options that must be added to QT_CONFIG in qconfig.pri
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of options that must be removed from QT_CONFIG in qconfig.pri
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of macros that must be defined in QtCore/qconfig.h
-
-
-######  Phase functions  ######
-
-# @FUNCTION: qt4-build-multilib_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt4-build-multilib_src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
-		ewarn
-		ewarn "Using a GCC version lower than 4.4 is not supported."
-		ewarn
-	fi
-
-	if [[ ${PN} == qtwebkit ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			ewarn
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn "For more info check out https://bugs.gentoo.org/307861"
-			ewarn
-		fi
-		eshopts_pop
-	fi
-
-	case ${QT4_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;;
-		release) default ;;
-	esac
-}
-
-# @FUNCTION: qt4-build-multilib_src_prepare
-# @DESCRIPTION:
-# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
-qt4-build-multilib_src_prepare() {
-	if [[ ${PN} != qtcore ]]; then
-		# avoid unnecessary qmake recompilations
-		sed -i -e 's/^if true;/if false;/' configure \
-			|| die "sed failed (skip qmake bootstrap)"
-	fi
-
-	# skip X11 tests in non-gui packages to avoid spurious dependencies
-	if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest qttranslations qtxmlpatterns; then
-		sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure \
-			|| die "sed failed (skip X11 tests)"
-	fi
-
-	if [[ ${PN} == qtcore ]]; then
-		# Bug 373061
-		# qmake bus errors with -O2 or -O3 but -O1 works
-		if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-			replace-flags -O[23] -O1
-		fi
-
-		# Bug 503500
-		# undefined reference with -Os and --as-needed
-		if use x86 || use_if_iuse abi_x86_32; then
-			replace-flags -Os -O2
-		fi
-	fi
-
-	if [[ ${PN} == qtdeclarative ]]; then
-		# Bug 551560
-		# gcc-4.8 ICE with -Os, fixed in 4.9
-		if use x86 && [[ $(gcc-version) == 4.8 ]]; then
-			replace-flags -Os -O2
-		fi
-	fi
-
-	if [[ ${PN} == qtwebkit ]]; then
-		# Bug 550780
-		# various ICEs with graphite-related flags, gcc-5 works
-		if [[ $(gcc-major-version) -lt 5 ]]; then
-			filter-flags -fgraphite-identity -floop-strip-mine
-		fi
-	fi
-
-	# Bug 261632
-	if use ppc64; then
-		append-flags -mminimal-toc
-	fi
-
-	# Read also AR from the environment
-	sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \
-		configure || die "sed SYSTEM_VARIABLES failed"
-
-	# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
-	# or they will override the user's flags (via .qmake.cache)
-	sed -i -e '/^SYSTEM_VARIABLES=/ i \
-		QMakeVar set QMAKE_CFLAGS_RELEASE\
-		QMakeVar set QMAKE_CFLAGS_DEBUG\
-		QMakeVar set QMAKE_CXXFLAGS_RELEASE\
-		QMakeVar set QMAKE_CXXFLAGS_DEBUG\
-		QMakeVar set QMAKE_LFLAGS_RELEASE\
-		QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
-		configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed"
-
-	# Drop -nocache from qmake invocation in all configure tests, to ensure that the
-	# correct toolchain and build flags are picked up from config.tests/.qmake.cache
-	find config.tests/unix -name '*.test' -type f -execdir \
-		sed -i -e '/bin\/qmake/s/-nocache//' '{}' + || die "sed -nocache failed"
-
-	# compile.test needs additional patching so that it doesn't create another cache file
-	# inside the test subdir, which would incorrectly override config.tests/.qmake.cache
-	sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \
-		-e '/bin\/qmake/s/ "$SRCDIR/ "QT_BUILD_TREE=$OUTDIR"&/' \
-		config.tests/unix/compile.test || die "sed compile.test failed"
-
-	# Delete references to the obsolete /usr/X11R6 directory
-	# On prefix, this also prevents looking at non-prefix stuff
-	sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \
-		mkspecs/common/linux.conf \
-		mkspecs/$(qt4_get_mkspec)/qmake.conf \
-		|| die "sed QMAKE_(LIB|INC)DIR failed"
-
-	if use_if_iuse aqua; then
-		sed -i \
-			-e '/^CONFIG/s:app_bundle::' \
-			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			mkspecs/$(qt4_get_mkspec)/qmake.conf \
-			|| die "sed failed (aqua)"
-
-		# we are crazy and build cocoa + qt3support
-		if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-				configure || die "sed failed (cocoa + qt3support)"
-		fi
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
-		sed -i \
-			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
-			-e "s:-arch\s\w*::g" \
-			mkspecs/common/g++-macx.conf \
-			|| die "sed g++-macx.conf failed"
-
-		# Fix configure's -arch settings that appear in qmake/Makefile and also
-		# fix arch handling (automagically duplicates our -arch arg and breaks
-		# pch). Additionally disable Xarch support.
-		sed -i \
-			-e "s:-arch i386::" \
-			-e "s:-arch ppc::" \
-			-e "s:-arch x86_64::" \
-			-e "s:-arch ppc64::" \
-			-e "s:-arch \$i::" \
-			-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
-			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
-			-e "s:-Xarch_x86_64::g" \
-			-e "s:-Xarch_ppc64::g" \
-			configure mkspecs/common/gcc-base-macx.conf mkspecs/common/g++-macx.conf \
-			|| die "sed -arch/-Xarch failed"
-
-		# On Snow Leopard don't fall back to 10.5 deployment target.
-		if [[ ${CHOST} == *-apple-darwin10 ]]; then
-			sed -i \
-				-e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
-				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				configure mkspecs/common/g++-macx.conf \
-				|| die "sed deployment target failed"
-		fi
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]]; then
-		sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
-			mkspecs/$(qt4_get_mkspec)/qmake.conf || die
-	fi
-
-	# apply patches
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-qt4_multilib_src_configure() {
-	qt4_prepare_env
-
-	qt4_symlink_tools_to_build_dir
-
-	# toolchain setup ('local -x' because of bug 532510)
-	local -x \
-		AR="$(tc-getAR) cqs" \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		LD=$(tc-getCXX) \
-		MAKEFLAGS=${MAKEOPTS} \
-		OBJCOPY=$(tc-getOBJCOPY) \
-		OBJDUMP=$(tc-getOBJDUMP) \
-		STRIP=$(tc-getSTRIP)
-
-	# convert tc-arch to the values supported by Qt
-	local arch=$(tc-arch)
-	case ${arch} in
-		amd64|x64-*)	arch=x86_64 ;;
-		arm64|hppa)	arch=generic ;;
-		ppc*-macos)	arch=ppc ;;
-		ppc*)		arch=powerpc ;;
-		sparc*)		arch=sparc ;;
-		x86-macos)	arch=x86 ;;
-		x86*)		arch=i386 ;;
-	esac
-
-	# configure arguments
-	local conf=(
-		# installation paths
-		-prefix "${QT4_PREFIX}"
-		-bindir "${QT4_BINDIR}"
-		-libdir "${QT4_LIBDIR}"
-		-docdir "${QT4_DOCDIR}"
-		-headerdir "${QT4_HEADERDIR}"
-		-plugindir "${QT4_PLUGINDIR}"
-		-importdir "${QT4_IMPORTDIR}"
-		-datadir "${QT4_DATADIR}"
-		-translationdir "${QT4_TRANSLATIONDIR}"
-		-sysconfdir "${QT4_SYSCONFDIR}"
-		-examplesdir "${QT4_EXAMPLESDIR}"
-		-demosdir "${QT4_DEMOSDIR}"
-
-		# debug/release
-		$(use_if_iuse debug && echo -debug || echo -release)
-		-no-separate-debug-info
-
-		# licensing stuff
-		-opensource -confirm-license
-
-		# build shared libraries
-		-shared
-
-		# skip recursive processing of .pro files at the end of configure
-		# (we run qmake by ourselves), thus saving quite a bit of time
-		-dont-process
-
-		# always enable large file support
-		-largefile
-
-		# exceptions USE flag
-		$(in_iuse exceptions && qt_use exceptions || echo -exceptions)
-
-		# build STL support
-		-stl
-
-		# architecture/platform (mkspec)
-		-arch ${arch}
-		-platform $(qt4_get_mkspec)
-
-		# instruction set support
-		$(is-flagq -mno-mmx	&& echo -no-mmx)
-		$(is-flagq -mno-3dnow	&& echo -no-3dnow)
-		$(is-flagq -mno-sse	&& echo -no-sse)
-		$(is-flagq -mno-sse2	&& echo -no-sse2)
-		$(is-flagq -mno-sse3	&& echo -no-sse3)
-		$(is-flagq -mno-ssse3	&& echo -no-ssse3)
-		$(is-flagq -mno-sse4.1	&& echo -no-sse4.1)
-		$(is-flagq -mno-sse4.2	&& echo -no-sse4.2)
-		$(is-flagq -mno-avx	&& echo -no-avx)
-		$(is-flagq -mfpu=*	&& ! is-flagq -mfpu=*neon* && echo -no-neon)
-
-		# bug 367045
-		$([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3)
-
-		# prefer system libraries
-		-system-zlib
-
-		# exclude examples and demos from default build
-		-nomake examples
-		-nomake demos
-
-		# disable rpath on non-prefix (bugs 380415 and 417169)
-		$(usex prefix '' -no-rpath)
-
-		# print verbose information about each configure test
-		-verbose
-
-		# precompiled headers don't work on hardened, where the flag is masked
-		$(in_iuse pch && qt_use pch || echo -no-pch)
-
-		# enable linker optimizations to reduce relocations, except on Solaris
-		# where this flag seems to introduce major breakage to applications,
-		# mostly to be seen as a core dump with the message:
-		# "QPixmap: Must construct a QApplication before a QPaintDevice"
-		$([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations)
-	)
-
-	if use_if_iuse aqua; then
-		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			conf+=(
-				# on (snow) leopard use the new (frameworked) cocoa code
-				-cocoa -framework
-				# add hint for the framework location
-				-F"${QT4_LIBDIR}"
-			)
-		else
-			conf+=(-no-framework)
-		fi
-	fi
-
-	conf+=(
-		# module-specific options
-		"${myconf[@]}"
-	)
-
-	einfo "Configuring with: ${conf[@]}"
-	"${S}"/configure "${conf[@]}" || die "configure failed"
-
-	# configure is stupid and assigns QMAKE_LFLAGS twice,
-	# thus the previous -rpath-link flag gets overwritten
-	# and some packages (e.g. qthelp) fail to link
-	sed -i -e '/^QMAKE_LFLAGS =/ s:$: $$QMAKE_LFLAGS:' \
-		.qmake.cache || die "sed .qmake.cache failed"
-
-	qt4_qmake
-	qt4_foreach_target_subdir qt4_qmake
-}
-
-qt4_multilib_src_compile() {
-	qt4_prepare_env
-
-	qt4_foreach_target_subdir emake
-}
-
-qt4_multilib_src_test() {
-	qt4_prepare_env
-
-	qt4_foreach_target_subdir emake -j1 check
-}
-
-qt4_multilib_src_install() {
-	qt4_prepare_env
-
-	qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
-
-	if [[ ${PN} == qtcore ]]; then
-		set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
-		einfo "Running $*"
-		"$@"
-
-		# install env.d file
-		cat > "${T}/44qt4-${CHOST}" <<-_EOF_
-			LDPATH="${QT4_LIBDIR}"
-		_EOF_
-		doenvd "${T}/44qt4-${CHOST}"
-
-		# install qtchooser configuration file
-		cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_
-			${QT4_BINDIR}
-			${QT4_LIBDIR}
-		_EOF_
-
-		(
-			insinto /etc/xdg/qtchooser
-			doins "${T}/qt4-${CHOST}.conf"
-		)
-
-		if multilib_is_native_abi; then
-			# convenience symlinks
-			dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/4.conf
-			dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/qt4.conf
-			# TODO bug 522646: write an eselect module to manage default.conf
-			dosym qt4.conf /etc/xdg/qtchooser/default.conf
-		fi
-	fi
-
-	# move pkgconfig directory to the correct location
-	if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then
-		mv "${D}${QT4_LIBDIR}"/pkgconfig "${ED}usr/$(get_libdir)" || die
-	fi
-
-	qt4_install_module_qconfigs
-	qt4_symlink_framework_headers
-}
-
-qt4_multilib_src_install_all() {
-	if [[ ${PN} == qtcore ]]; then
-		# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h
-		if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
-			sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
-				|| die "sed failed (qconfig.h)"
-			dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
-				"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
-		else
-			sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
-				"${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
-				|| die "sed failed (qconfig.h)"
-		fi
-
-		dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
-		mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
-	fi
-
-	# install private headers of a few modules
-	if has ${PN} qtcore qtdeclarative qtgui qtscript; then
-		local moduledir=${PN#qt}
-		local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1}
-		[[ ${moduledir} == core ]] && moduledir=corelib
-
-		einfo "Installing private headers into ${QT4_HEADERDIR}/${modulename}/private"
-		insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private
-		find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
-	fi
-
-	prune_libtool_files
-}
-
-# @FUNCTION: qt4-build-multilib_pkg_postinst
-# @DESCRIPTION:
-# Regenerate configuration after installation or upgrade/downgrade.
-qt4-build-multilib_pkg_postinst() {
-	qt4_regenerate_global_qconfigs
-}
-
-# @FUNCTION: qt4-build-multilib_pkg_postrm
-# @DESCRIPTION:
-# Regenerate configuration when a module is completely removed.
-qt4-build-multilib_pkg_postrm() {
-	qt4_regenerate_global_qconfigs
-}
-
-
-######  Public helpers  ######
-
-# @FUNCTION: qt_use
-# @USAGE: <flag> [feature] [enableval]
-# @DESCRIPTION:
-# <flag> is the name of a flag in IUSE.
-#
-# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
-# otherwise. If [feature] is not specified, <flag> is used in its place.
-# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
-qt_use() {
-	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
-
-	usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}"
-}
-
-# @FUNCTION: qt_native_use
-# @USAGE: <flag> [feature] [enableval]
-# @DESCRIPTION:
-# <flag> is the name of a flag in IUSE.
-#
-# Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently
-# building for the native ABI, "-no-${feature}" otherwise. If [feature] is not
-# specified, <flag> is used in its place. If [enableval] is not specified,
-# the "-${enableval}" prefix is omitted.
-qt_native_use() {
-	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
-
-	multilib_is_native_abi && qt_use "$@" || echo "-no-${2:-$1}"
-}
-
-
-######  Internal functions  ######
-
-# @FUNCTION: qt4_prepare_env
-# @INTERNAL
-# @DESCRIPTION:
-# Prepares the environment for building Qt.
-qt4_prepare_env() {
-	# setup installation directories
-	# note: keep paths in sync with qmake-utils.eclass
-	QT4_PREFIX=${EPREFIX}/usr
-	QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
-	QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
-	QT4_BINDIR=${QT4_LIBDIR}/bin
-	QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
-	QT4_IMPORTDIR=${QT4_LIBDIR}/imports
-	QT4_DATADIR=${QT4_PREFIX}/share/qt4
-	QT4_DOCDIR=${QT4_PREFIX}/share/doc/qt-${PV}
-	QT4_TRANSLATIONDIR=${QT4_DATADIR}/translations
-	QT4_EXAMPLESDIR=${QT4_DATADIR}/examples
-	QT4_DEMOSDIR=${QT4_DATADIR}/demos
-	QT4_SYSCONFDIR=${EPREFIX}/etc/qt4
-	QMAKE_LIBDIR_QT=${QT4_LIBDIR}
-
-	export XDG_CONFIG_HOME="${T}"
-}
-
-# @FUNCTION: qt4_foreach_target_subdir
-# @INTERNAL
-# @DESCRIPTION:
-# Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES.
-qt4_foreach_target_subdir() {
-	local ret=0 subdir=
-	for subdir in ${QT4_TARGET_DIRECTORIES}; do
-		mkdir -p "${subdir}" || die
-		pushd "${subdir}" >/dev/null || die
-
-		einfo "Running $* ${subdir:+in ${subdir}}"
-		"$@"
-		((ret+=$?))
-
-		popd >/dev/null || die
-	done
-
-	return ${ret}
-}
-
-# @FUNCTION: qt4_symlink_tools_to_build_dir
-# @INTERNAL
-# @DESCRIPTION:
-# Symlinks qtcore tools to BUILD_DIR,
-# so that they can be used when building other modules.
-qt4_symlink_tools_to_build_dir() {
-	local tool= tools=()
-	if [[ ${PN} != qtcore ]]; then
-		tools+=(qmake moc rcc uic)
-	fi
-
-	mkdir -p "${BUILD_DIR}"/bin || die
-	pushd "${BUILD_DIR}"/bin >/dev/null || die
-
-	for tool in "${tools[@]}"; do
-		[[ -e ${QT4_BINDIR}/${tool} ]] || continue
-		ln -s "${QT4_BINDIR}/${tool}" . || die "failed to symlink ${tool}"
-	done
-
-	popd >/dev/null || die
-}
-
-# @FUNCTION: qt4_qmake
-# @INTERNAL
-# @DESCRIPTION:
-# Helper function that runs qmake in the current target subdir.
-# Intended to be called by qt4_foreach_target_subdir().
-qt4_qmake() {
-	local projectdir=${PWD/#${BUILD_DIR}/${S}}
-
-	"${BUILD_DIR}"/bin/qmake \
-		"${projectdir}" \
-		CONFIG+=nostrip \
-		LIBS+=-L"${QT4_LIBDIR}" \
-		"${myqmakeargs[@]}" \
-		|| die "qmake failed (${projectdir#${S}/})"
-}
-
-# @FUNCTION: qt4_install_module_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
-qt4_install_module_qconfigs() {
-	local x
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
-		for x in QCONFIG_ADD QCONFIG_REMOVE; do
-			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${BUILD_DIR}"/${PN}-qconfig.pri
-		done
-		insinto ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${BUILD_DIR}"/${PN}-qconfig.pri
-	fi
-
-	if [[ -n ${QCONFIG_DEFINE} ]]; then
-		for x in ${QCONFIG_DEFINE}; do
-			echo "#define ${x}" >> "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
-		done
-		insinto ${QT4_HEADERDIR#${EPREFIX}}/Gentoo
-		doins "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
-	fi
-}
-
-# @FUNCTION: qt4_regenerate_global_qconfigs
-# @INTERNAL
-# @DESCRIPTION:
-# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration.
-# Don't call die here because dying in pkg_post{inst,rm} only makes things worse.
-qt4_regenerate_global_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qtcore ]]; then
-		local x qconfig_add qconfig_remove qconfig_new
-		for x in "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
-			[[ -f ${x} ]] || continue
-			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
-			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
-		done
-
-		if [[ -e "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
-			# start with the qconfig.pri that qtcore installed
-			if ! cp "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri \
-				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
-				eerror "cp qconfig failed."
-				return 1
-			fi
-
-			# generate list of QT_CONFIG entries from the existing list
-			# including qconfig_add and excluding qconfig_remove
-			for x in $(sed -n 's/^QT_CONFIG +=//p' \
-				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
-					has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
-			done
-
-			# replace the existing QT_CONFIG list with qconfig_new
-			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
-				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
-				eerror "Sed for QT_CONFIG failed"
-				return 1
-			fi
-
-			# create Gentoo/qconfig.h
-			if [[ ! -e ${ROOT}${QT4_HEADERDIR}/Gentoo ]]; then
-				if ! mkdir -p "${ROOT}${QT4_HEADERDIR}"/Gentoo; then
-					eerror "mkdir ${QT4_HEADERDIR}/Gentoo failed"
-					return 1
-				fi
-			fi
-			: > "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
-			for x in "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
-				[[ -f ${x} ]] || continue
-				cat "${x}" >> "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
-			done
-		else
-			rm -f "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri
-			rm -f "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
-			rmdir "${ROOT}${QT4_DATADIR}"/mkspecs \
-				"${ROOT}${QT4_DATADIR}" \
-				"${ROOT}${QT4_HEADERDIR}"/Gentoo \
-				"${ROOT}${QT4_HEADERDIR}" 2>/dev/null
-		fi
-	fi
-}
-
-# @FUNCTION: qt4_symlink_framework_headers
-# @DESCRIPTION:
-# On OS X we need to add some symlinks when frameworks are being
-# used, to avoid complications with some more or less stupid packages.
-qt4_symlink_framework_headers() {
-	if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		local frw dest f h rdir
-		# Some packages tend to include <Qt/...>
-		dodir "${QT4_HEADERDIR#${EPREFIX}}"/Qt
-
-		# Fake normal headers when frameworks are installed... eases life later
-		# on, make sure we use relative links though, as some ebuilds assume
-		# these dirs exist in src_install to add additional files
-		f=${QT4_HEADERDIR}
-		h=${QT4_LIBDIR}
-		while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
-			f=${f#*/}
-			h=${h#*/}
-		done
-		rdir=${h}
-		f="../"
-		while [[ ${h} == */* ]] ; do
-			f="${f}../"
-			h=${h#*/}
-		done
-		rdir="${f}${rdir}"
-
-		for frw in "${D}${QT4_LIBDIR}"/*.framework; do
-			[[ -e "${frw}"/Headers ]] || continue
-			f=$(basename ${frw})
-			dest="${QT4_HEADERDIR#${EPREFIX}}"/${f%.framework}
-			dosym "${rdir}"/${f}/Headers "${dest}"
-
-			# Link normal headers as well.
-			for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do
-				h=$(basename ${hdr})
-				dosym "../${rdir}"/${f}/Headers/${h} \
-					"${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h}
-			done
-		done
-	fi
-}
-
-# @FUNCTION: qt4_get_mkspec
-# @INTERNAL
-# @DESCRIPTION:
-# Returns the right mkspec for the current CHOST/CXX combination.
-qt4_get_mkspec() {
-	local spec=
-
-	case ${CHOST} in
-		*-linux*)
-			spec=linux ;;
-		*-darwin*)
-			use_if_iuse aqua &&
-				spec=macx ||   # mac with carbon/cocoa
-				spec=darwin ;; # darwin/mac with X11
-		*-freebsd*|*-dragonfly*)
-			spec=freebsd ;;
-		*-netbsd*)
-			spec=netbsd ;;
-		*-openbsd*)
-			spec=openbsd ;;
-		*-aix*)
-			spec=aix ;;
-		hppa*-hpux*)
-			spec=hpux ;;
-		ia64*-hpux*)
-			spec=hpuxi ;;
-		*-solaris*)
-			spec=solaris ;;
-		*)
-			die "qt4-build-multilib.eclass: unsupported CHOST '${CHOST}'" ;;
-	esac
-
-	case $(tc-getCXX) in
-		*g++*)
-			spec+=-g++ ;;
-		*clang*)
-			if [[ -d ${S}/mkspecs/unsupported/${spec}-clang ]]; then
-				spec=unsupported/${spec}-clang
-			else
-				ewarn "${spec}-clang mkspec does not exist, falling back to ${spec}-g++"
-				spec+=-g++
-			fi ;;
-		*icpc*)
-			if [[ -d ${S}/mkspecs/${spec}-icc ]]; then
-				spec+=-icc
-			else
-				ewarn "${spec}-icc mkspec does not exist, falling back to ${spec}-g++"
-				spec+=-g++
-			fi ;;
-		*)
-			die "qt4-build-multilib.eclass: unsupported compiler '$(tc-getCXX)'" ;;
-	esac
-
-	# Add -64 for 64-bit prefix profiles
-	if use amd64-linux || use ia64-linux || use ppc64-linux ||
-		use x64-macos ||
-		use sparc64-freebsd || use x64-freebsd || use x64-openbsd ||
-		use ia64-hpux ||
-		use sparc64-solaris || use x64-solaris
-	then
-		[[ -d ${S}/mkspecs/${spec}-64 ]] && spec+=-64
-	fi
-
-	echo ${spec}
-}

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

[Davide Pesavento]

commit:     dd2818af8e7fe12a3afca273c4c42f73403ad2ee
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 15:46:06 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 15:46:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd2818af

qt5-build.eclass: don't bother exporting DYLD_LIBRARY_PATH for tests

We don't support gentoo prefix anywhere else.

 eclass/qt5-build.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a167234..a148793 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -232,12 +232,11 @@ qt5-build_src_test() {
 	qt5_foreach_target_subdir emake
 
 	# create a custom testrunner script that correctly sets
-	# {,DY}LD_LIBRARY_PATH before executing the given test
+	# LD_LIBRARY_PATH before executing the given test
 	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
 	cat > "${testrunner}" <<-_EOF_ || die
 	#!/bin/sh
 	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
-	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
 	"\$@"
 	_EOF_
 	chmod +x "${testrunner}"

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

[Davide Pesavento]

commit:     79d57b576a73b142bbd939f46311618497083f5e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 17:23:01 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 17:23:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=79d57b57

qt5-build.eclass: disable gbm backend by default

 eclass/qt5-build.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d51d27f..a167234 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -607,7 +607,9 @@ qt5_base_configure() {
 		#-use-gold-linker
 
 		# disable all platform plugins by default, override in qtgui
-		-no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb
+		-no-xcb -no-eglfs -no-kms
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-gbm)
+		-no-directfb -no-linuxfb
 		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
 
 		# disable undocumented X11-related flags, override in qtgui

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

[Davide Pesavento]

commit:     a72b03f11e9d003e26607a1c80457bbf574fe3d7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 17:08:48 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 17:08:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a72b03f1

qt5-build.eclass: add -no-ltcg for 5.6 and later

 eclass/qt5-build.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fe49b00..d51d27f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -589,13 +589,15 @@ qt5_base_configure() {
 		-no-icu -no-fontconfig
 		-no-dbus
 
-		# don't strip
+		# let portage handle stripping
 		-no-strip
 
-		# precompiled headers are not that useful for us
-		# and cause problems on hardened, so turn them off
+		# precompiled headers can cause problems on hardened, so turn them off
 		-no-pch
 
+		# link-time code generation is not something we want to enable by default
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-ltcg)
+
 		# reduced relocations cause major breakage on at least arm and ppc, so
 		# don't specify anything and let the configure figure out if they are
 		# supported; see also https://bugreports.qt.io/browse/QTBUG-36129

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

[Michael Palimaka]

commit:     8aae5020b96f9e252e9f3a562c89551493877bba
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 18:28:06 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 18:28:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8aae5020

qt5-build.eclass: stop the eclass from being used accidentally

 eclass/qt5-build.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 18dff7a..fe49b00 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -12,6 +12,10 @@
 # This eclass contains various functions that are used when building Qt5.
 # Requires EAPI 5 or 6.
 
+if [[ ${CATEGORY} != dev-qt ]]; then
+	die "qt5-build.eclass is only to be used for building Qt 5."
+fi
+
 case ${EAPI} in
 	5|6)	: ;;
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;

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

[Davide Pesavento]

commit:     5c27726a940ba49d683701a2ed642583bd94e3b7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  8 00:05:52 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 00:08:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5c27726a

qt5-build.eclass: use separate readonly call

It's more robust apparently, see also commit
968d828e41322f5ffa55500ad253231cd534bd0b in gentoo.git

 eclass/qt5-build.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 94ea689..18dff7a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -50,7 +50,8 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
-readonly QT5_MINOR_VERSION=$(get_version_component_range 2)
+QT5_MINOR_VERSION=$(get_version_component_range 2)
+readonly QT5_MINOR_VERSION
 
 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
 	# IMPORTANT: add a subslot dependency to your package only if you are sure

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

[Michael Palimaka]

commit:     0161c85edd72a54541620da4664fbba2ff4963d5
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 19:07:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 19:09:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=0161c85e

Revert "qt5-build.eclass: disable qpa platform guard"

It is no longer needed since 23d6d9814942a394b680d732c530a20a44731a70.

It was being triggered due to -no-mirclient no longer being passed due to
6283242f80ac9455e090c1fa31d4c4eb4ed79edc.

This reverts commit cd3745d29928f32a1ac06c05e592faf94a88826a.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1344a01..94ea689 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -601,7 +601,7 @@ qt5_base_configure() {
 
 		# disable all platform plugins by default, override in qtgui
 		-no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient -no-qpa-platform-guard)
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)

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

[Michael Palimaka]

commit:     23d6d9814942a394b680d732c530a20a44731a70
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 18:16:39 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 18:18:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=23d6d981

qt5-build.eclass: use readonly instead of declare -r for QT5_MINOR_VERSION

Otherwise it's not available in qt5_base_configure.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d34583e..94ea689 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -50,7 +50,7 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
-declare -r QT5_MINOR_VERSION=$(get_version_component_range 2)
+readonly QT5_MINOR_VERSION=$(get_version_component_range 2)
 
 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
 	# IMPORTANT: add a subslot dependency to your package only if you are sure

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

[Michael Palimaka]

commit:     cd3745d29928f32a1ac06c05e592faf94a88826a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 18:18:19 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 18:18:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd3745d2

qt5-build.eclass: disable qpa platform guard

It is only relevant to qtgui (where it is not triggered because we do build the
plugin) and otherwise causes all of qtbase to fail configure.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 94ea689..1344a01 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -601,7 +601,7 @@ qt5_base_configure() {
 
 		# disable all platform plugins by default, override in qtgui
 		-no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb
-		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient -no-qpa-platform-guard)
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)

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

[Michael Palimaka]

commit:     1cc1df46f1ae635ae80209a0155ed637958f7838
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 13:08:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 13:08:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=1cc1df46

qt5-build.eclass: latest development releases are gzipped

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8ee1cd7..d34583e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -75,7 +75,7 @@ case ${PV} in
 		# development release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
+		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.gz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)

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

[Davide Pesavento]

commit:     ea1ae9b4c958d98b7cc7b26a26cf8972f658e451
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 03:23:41 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 03:24:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ea1ae9b4

qt5-build.eclass: use 'readonly' instead of 'declare -g -r'

The -g option to declare was added in bash-4.2, so we cannot
rely on it (we still need to support EAPI 5).

 eclass/qt5-build.eclass | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0ab7770..7ad8cf4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -381,21 +381,25 @@ qt_use_disable_mod() {
 qt5_prepare_env() {
 	# setup installation directories
 	# note: keep paths in sync with qmake-utils.eclass
-	declare -g -r QT5_PREFIX=${EPREFIX}/usr
-	declare -g -r QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
-	declare -g -r QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
-	declare -g -r QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
-	declare -g -r QT5_BINDIR=${QT5_ARCHDATADIR}/bin
-	declare -g -r QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
-	declare -g -r QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
-	declare -g -r QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
-	declare -g -r QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
-	declare -g -r QT5_DATADIR=${QT5_PREFIX}/share/qt5
-	declare -g -r QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
-	declare -g -r QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
-	declare -g -r QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
-	declare -g -r QT5_TESTSDIR=${QT5_DATADIR}/tests
-	declare -g -r QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
+	QT5_PREFIX=${EPREFIX}/usr
+	QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
+	QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
+	QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
+	QT5_BINDIR=${QT5_ARCHDATADIR}/bin
+	QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
+	QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
+	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
+	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
+	QT5_DATADIR=${QT5_PREFIX}/share/qt5
+	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
+	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
+	QT5_TESTSDIR=${QT5_DATADIR}/tests
+	QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
+	readonly QT5_PREFIX QT5_HEADERDIR QT5_LIBDIR QT5_ARCHDATADIR \
+		QT5_BINDIR QT5_PLUGINDIR QT5_LIBEXECDIR QT5_IMPORTDIR \
+		QT5_QMLDIR QT5_DATADIR QT5_DOCDIR QT5_TRANSLATIONDIR \
+		QT5_EXAMPLESDIR QT5_TESTSDIR QT5_SYSCONFDIR
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		# see mkspecs/features/qt_config.prf

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

[Davide Pesavento]

commit:     f4aa5216a0b71858e2cefc6aed4bbf72cf8aa303
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 03:33:36 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 03:33:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4aa5216

qt5-build.eclass: define QT5_BUILD_DIR after QT5_BUILD_TYPE

Since the latter is required by the former. Fixes regression
in commit 4b70a2ea5396afc14f018bb3429be4a89d8f1ecf.

 eclass/qt5-build.eclass | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ad8cf4..8ee1cd7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -23,14 +23,6 @@ esac
 # SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass.
 : ${QT5_MODULE:=${PN}}
 
-# @ECLASS-VARIABLE: QT5_BUILD_DIR
-# @DESCRIPTION:
-# Build directory for out-of-source builds.
-case ${QT5_BUILD_TYPE} in
-	live)    : ${QT5_BUILD_DIR:=${S}_build} ;;
-	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
-esac
-
 # @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -103,6 +95,14 @@ EGIT_REPO_URI=(
 )
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
 
+# @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @DESCRIPTION:
+# Build directory for out-of-source builds.
+case ${QT5_BUILD_TYPE} in
+	live)    : ${QT5_BUILD_DIR:=${S}_build} ;;
+	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
+esac
+
 IUSE="debug test"
 
 [[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584

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

[Davide Pesavento]

commit:     2f873589218b6ac68864c12a359b9b6f70978d49
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 01:09:03 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 01:11:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2f873589

qt5-build.eclass: respect nonfatal in qt5_foreach_target_subdir()

In src_test it can be called from virtx, which uses nonfatal.

 eclass/qt5-build.eclass | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7bac25e..9eb17b3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -253,13 +253,11 @@ qt5-build_src_test() {
 	_EOF_
 	chmod +x "${testrunner}"
 
-	local testcmd=(
-		qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
-	)
+	set -- qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
 	if [[ ${VIRTUALX_REQUIRED} == test ]]; then
-		virtx "${testcmd[@]}"
+		virtx "$@"
 	else
-		"${testcmd[@]}"
+		"$@"
 	fi
 }
 
@@ -424,28 +422,31 @@ qt5_prepare_env() {
 # @FUNCTION: qt5_foreach_target_subdir
 # @INTERNAL
 # @DESCRIPTION:
-# Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
+# Executes the command given as argument from inside each directory
+# listed in QT5_TARGET_SUBDIRS. Handles autotests subdirs automatically.
 qt5_foreach_target_subdir() {
 	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
 
-	local ret=0 subdir=
+	local die_args=()
+	[[ ${EAPI} != 5 ]] && die_args+=(-n)
+
+	local subdir=
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
 		if [[ ${EBUILD_PHASE} == test ]]; then
 			subdir=tests/auto${subdir#src}
 			[[ -d ${S}/${subdir} ]] || continue
 		fi
 
-		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
-		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+		local msg="Running $* ${subdir:+in ${subdir}}"
+		einfo "${msg}"
 
-		einfo "Running $* ${subdir:+in ${subdir}}"
-		"$@"
-		((ret+=$?))
+		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die "${die_args[@]}" || return $?
+		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die "${die_args[@]}" || return $?
 
-		popd >/dev/null || die
-	done
+		"$@" || die "${die_args[@]}" "${msg} failed" || return $?
 
-	return ${ret}
+		popd >/dev/null || die "${die_args[@]}" || return $?
+	done
 }
 
 # @FUNCTION: qt5_symlink_tools_to_build_dir

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

[Davide Pesavento]

commit:     4b70a2ea5396afc14f018bb3429be4a89d8f1ecf
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 01:36:06 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 01:36:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b70a2ea

qt5-build.eclass: move some things around

Also, stop documenting PATCHES in eclass-doc. Everyone knows
about it, and it's a PMS thing since EAPI 6 anyway.

 eclass/qt5-build.eclass | 76 +++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 46 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d30cb98..465d826 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,6 +17,34 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
+# @ECLASS-VARIABLE: QT5_MODULE
+# @DESCRIPTION:
+# The upstream name of the module this package belongs to. Used for
+# SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass.
+: ${QT5_MODULE:=${PN}}
+
+# @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @DESCRIPTION:
+# Build directory for out-of-source builds.
+case ${QT5_BUILD_TYPE} in
+	live)    : ${QT5_BUILD_DIR:=${S}_build} ;;
+	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
+esac
+
+# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing the source directories that should be built.
+# All paths must be relative to ${S}.
+
+# @ECLASS-VARIABLE: QT5_GENTOO_CONFIG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <useflag:feature:macro> triplets that are evaluated in src_install
+# to generate the per-package list of enabled QT_CONFIG features and macro
+# definitions, which are then merged together with all other Qt5 packages
+# installed on the system to obtain the global qconfig.{h,pri} files.
+
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.
@@ -40,12 +68,6 @@ else
 	SLOT=5
 fi
 
-# @ECLASS-VARIABLE: QT5_MODULE
-# @DESCRIPTION:
-# The upstream name of the module this package belongs to. Used for
-# SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass.
-: ${QT5_MODULE:=${PN}}
-
 case ${PV} in
 	5.9999)
 		# git dev branch
@@ -97,49 +119,11 @@ RDEPEND="
 	dev-qt/qtchooser
 "
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
-
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-#	PATCHES=(
-#		"${FILESDIR}/mypatch.patch"
-#		"${FILESDIR}/mypatch2.patch"
-#	)
-# @CODE
-
-# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing the source directories that should be built.
-# All paths must be relative to ${S}.
-
-# @ECLASS-VARIABLE: QT5_BUILD_DIR
-# @DESCRIPTION:
-# Build directory for out-of-source builds.
-case ${QT5_BUILD_TYPE} in
-	live)    : ${QT5_BUILD_DIR:=${S}_build} ;;
-	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
-esac
-
-# @ECLASS-VARIABLE: QT5_GENTOO_CONFIG
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array of <useflag:feature:macro> triplets that are evaluated in src_install
-# to generate the per-package list of enabled QT_CONFIG features and macro
-# definitions, which are then merged together with all other Qt5 packages
-# installed on the system to obtain the global qconfig.{h,pri} files.
-
 
 ######  Phase functions  ######
 
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
+
 # @FUNCTION: qt5-build_src_unpack
 # @DESCRIPTION:
 # Unpacks the sources.

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

[Davide Pesavento]

commit:     79c446995b8aaacc6e14116763c9bb92dfe2d175
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 01:18:33 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 01:18:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=79c44699

qt5-build.eclass: move VIRTUALX_REQUIRED definition before inherit

Otherwise it has no effect.

 eclass/qt5-build.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9eb17b3..d30cb98 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,6 +17,13 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# For proper description see virtualx.eclass man page.
+# 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}
+
 [[ ${EAPI} == 5 ]] && inherit multilib
 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 
@@ -130,13 +137,6 @@ esac
 # definitions, which are then merged together with all other Qt5 packages
 # installed on the system to obtain the global qconfig.{h,pri} files.
 
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
-# @DESCRIPTION:
-# For proper description see virtualx.eclass man page.
-# 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}
-
 
 ######  Phase functions  ######
 

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

[Davide Pesavento]

commit:     9c17354f6801d2bc03b3088b7fb23850a4e1ee1d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 01:41:00 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 01:41:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=9c17354f

eclass: do not talk about "herd"

 eclass/qmake-utils.eclass        | 2 +-
 eclass/qt4-build-multilib.eclass | 2 +-
 eclass/qt4-r2.eclass             | 2 +-
 eclass/qt5-build.eclass          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index d300fd2..37c0f81 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -4,7 +4,7 @@
 
 # @ECLASS: qmake-utils.eclass
 # @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
 # @BLURB: Common functions for qmake-based packages.

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index ade46da..51a2f30 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -4,7 +4,7 @@
 
 # @ECLASS: qt4-build-multilib.eclass
 # @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
 # @BLURB: Eclass for Qt4 split ebuilds with multilib support.

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 4a01bd3..1ca40a4 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -4,7 +4,7 @@
 
 # @ECLASS: qt4-r2.eclass
 # @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
 # @BLURB: Eclass for Qt4-based packages, second edition.
 # @DESCRIPTION:
 # This eclass contains various functions that may be useful when

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 465d826..0ab7770 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -4,7 +4,7 @@
 
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
-# Qt herd <qt@gentoo.org>
+# qt@gentoo.org
 # @AUTHOR:
 # Davide Pesavento <pesa@gentoo.org>
 # @BLURB: Eclass for Qt5 split ebuilds.

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

[Davide Pesavento]

commit:     6283242f80ac9455e090c1fa31d4c4eb4ed79edc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 22:40:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 22:40:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6283242f

qt5-build.eclass: declare some variables readonly

 eclass/qt5-build.eclass | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ec4aa39..7bac25e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -23,7 +23,7 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
-QT5_MINOR_VERSION=$(get_version_component_range 2)
+declare -r QT5_MINOR_VERSION=$(get_version_component_range 2)
 
 if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
 	# IMPORTANT: add a subslot dependency to your package only if you are sure
@@ -65,6 +65,7 @@ case ${PV} in
 		S=${WORKDIR}/${MY_P}
 		;;
 esac
+readonly QT5_BUILD_TYPE
 
 EGIT_REPO_URI=(
 	"git://code.qt.io/qt/${QT5_MODULE}.git"
@@ -398,21 +399,21 @@ qt_use_disable_mod() {
 qt5_prepare_env() {
 	# setup installation directories
 	# note: keep paths in sync with qmake-utils.eclass
-	QT5_PREFIX=${EPREFIX}/usr
-	QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
-	QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
-	QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
-	QT5_BINDIR=${QT5_ARCHDATADIR}/bin
-	QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
-	QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
-	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
-	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
-	QT5_DATADIR=${QT5_PREFIX}/share/qt5
-	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
-	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
-	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
-	QT5_TESTSDIR=${QT5_DATADIR}/tests
-	QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
+	declare -g -r QT5_PREFIX=${EPREFIX}/usr
+	declare -g -r QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
+	declare -g -r QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
+	declare -g -r QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
+	declare -g -r QT5_BINDIR=${QT5_ARCHDATADIR}/bin
+	declare -g -r QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
+	declare -g -r QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
+	declare -g -r QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
+	declare -g -r QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
+	declare -g -r QT5_DATADIR=${QT5_PREFIX}/share/qt5
+	declare -g -r QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+	declare -g -r QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
+	declare -g -r QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
+	declare -g -r QT5_TESTSDIR=${QT5_DATADIR}/tests
+	declare -g -r QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		# see mkspecs/features/qt_config.prf

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

[Davide Pesavento]

commit:     b545feebf73592d8068d7ac71264a786328e3e73
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 21:51:32 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 21:51:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b545feeb

qt5-build.eclass: replace deprecated virtualmake usage with virtx

 eclass/qt5-build.eclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0778918..ec4aa39 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -252,14 +252,13 @@ qt5-build_src_test() {
 	_EOF_
 	chmod +x "${testrunner}"
 
-	_qt5_test_runner() {
+	local testcmd=(
 		qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
-	}
-
+	)
 	if [[ ${VIRTUALX_REQUIRED} == test ]]; then
-		VIRTUALX_COMMAND="_qt5_test_runner" virtualmake
+		virtx "${testcmd[@]}"
 	else
-		_qt5_test_runner
+		"${testcmd[@]}"
 	fi
 }
 

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

[Davide Pesavento]

commit:     f9919f0af99e9ececcea0e95391eb90cc36adb68
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 02:04:59 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 02:04:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f9919f0a

qt5-build.eclass: drop subslot from 5.5.x

 eclass/qt5-build.eclass | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 63c6617..0778918 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -23,12 +23,16 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
-# IMPORTANT: add a subslot dependency to your package only if you are sure
-#            that it uses some private Qt APIs (most likely it does not)
-SLOT=5/$(get_version_component_range 1-2)
-
 QT5_MINOR_VERSION=$(get_version_component_range 2)
 
+if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+	# IMPORTANT: add a subslot dependency to your package only if you are sure
+	#            that it uses some private Qt APIs (most likely it does not)
+	SLOT=5/$(get_version_component_range 1-2)
+else
+	SLOT=5
+fi
+
 # @ECLASS-VARIABLE: QT5_MODULE
 # @DESCRIPTION:
 # The upstream name of the module this package belongs to. Used for

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

[Davide Pesavento]

commit:     26d126500a79a90e32a0c65c1f3f9883425076be
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 01:56:08 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 01:56:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=26d12650

qt4-r2.eclass: ban for EAPI=6

 eclass/qt4-r2.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 6354577..4a01bd3 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -8,11 +8,13 @@
 # @BLURB: Eclass for Qt4-based packages, second edition.
 # @DESCRIPTION:
 # This eclass contains various functions that may be useful when
-# dealing with packages using Qt4 libraries. Requires EAPI=2 or later.
+# dealing with packages using Qt4 libraries. Supports only EAPIs
+# 2, 3, 4, and 5. Use qmake-utils.eclass in EAPI 6 and later.
 
 case ${EAPI} in
 	2|3|4|5) : ;;
-	*)	 die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
+	6) die "qt4-r2.eclass is banned in EAPI 6 and later" ;;
+	*) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
 inherit base eutils qmake-utils

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

[Davide Pesavento]

commit:     f3886df8a10a03548efb3941c84aefc51fb4b195
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 23:07:29 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 23:07:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f3886df8

qt5-build.eclass: add missing die when using cat with heredocs

 eclass/qt5-build.eclass | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4ad6ee0..63c6617 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,12 +17,9 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
+[[ ${EAPI} == 5 ]] && inherit multilib
 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 
-if [[ ${EAPI} == 5 ]]; then
-	inherit multilib
-fi
-
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 
@@ -243,12 +240,12 @@ qt5-build_src_test() {
 	# create a custom testrunner script that correctly sets
 	# {,DY}LD_LIBRARY_PATH before executing the given test
 	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
+	cat > "${testrunner}" <<-_EOF_ || die
 	#!/bin/sh
 	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
 	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
 	"\$@"
-	EOF
+	_EOF_
 	chmod +x "${testrunner}"
 
 	_qt5_test_runner() {
@@ -293,7 +290,7 @@ qt5-build_src_install() {
 			|| die "sed failed (qconfig.h)"
 
 		# install qtchooser configuration file
-		cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_
+		cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
 			${QT5_BINDIR}
 			${QT5_LIBDIR}
 		_EOF_

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

[Davide Pesavento]

commit:     b8475c6b50beaf3081a9417d27c4e6d8dfcb1f11
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 22:47:32 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 22:47:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b8475c6b

qmake-utils.eclass: stop inheriting unneeded multilib in EAPI 6

 eclass/qmake-utils.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index a5d3756..d300fd2 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -17,7 +17,8 @@
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit multilib
+inherit eutils toolchain-funcs
 
 # @FUNCTION: qt4_get_bindir
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     f527f1e3a1b76d938085f26d25a88d07115c4b87
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 17:12:33 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 17:12:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f527f1e3

qt5-build.eclass: minor configure updates for 5.6 and later

 eclass/qt5-build.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 930619d..4ad6ee0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -505,11 +505,15 @@ qt5_base_configure() {
 		-release
 		-no-separate-debug-info
 
+		# no need to forcefully build host tools in optimized mode,
+		# just follow the overall debug/release build type
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-optimized-tools)
+
 		# licensing stuff
 		-opensource -confirm-license
 
-		# let configure automatically figure out if C++11 is supported
-		#-c++11
+		# autodetect the highest supported version of the C++ standard
+		#-c++std <c++11|c++14|c++1z>
 
 		# build shared libraries
 		-shared
@@ -578,9 +582,6 @@ qt5_base_configure() {
 		# print verbose information about each configure test
 		-verbose
 
-		# doesn't actually matter since we override CXXFLAGS
-		#-no-optimized-qmake
-
 		# obsolete flag, does nothing
 		#-nis
 

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

[Davide Pesavento]

commit:     e7965ab4d0f98974f7abb148bcf00abafd6d698f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 16:21:49 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 16:21:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=e7965ab4

qt5-build.eclass: stop passing some obsolete options to configure

They were unused since the early Qt 5.0.0 days, and now upstream
officially dropped them so the configure won't accept them anymore.

See fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f and
e824abd987d77efaa085fe1f9fb514d270798d55 in qtbase.

 eclass/qt5-build.eclass | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 85ac374..930619d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -10,7 +10,7 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 5.
+# Requires EAPI 5 or 6.
 
 case ${EAPI} in
 	5|6)	: ;;
@@ -19,7 +19,7 @@ esac
 
 inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 
-if [[ ${EAPI} == 5 ]] ; then
+if [[ ${EAPI} == 5 ]]; then
 	inherit multilib
 fi
 
@@ -204,11 +204,10 @@ qt5-build_src_prepare() {
 	fi
 
 	if [[ ${EAPI} == 5 ]]; then
-		# apply patches
 		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 		epatch_user
 	else
-		default_src_prepare
+		default
 	fi
 }
 
@@ -619,8 +618,7 @@ qt5_base_configure() {
 
 		# disable obsolete/unused X11-related flags
 		# (not shown in ./configure -help output)
-		-no-mitshm -no-xcursor -no-xfixes -no-xinerama -no-xinput
-		-no-xrandr -no-xshape -no-xsync -no-xvideo
+		-no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync
 
 		# always enable session management support: it doesn't need extra deps
 		# at configure time and turning it off is dangerous, see bug 518262

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

[Michael Palimaka]

commit:     d7c421552fbd47e5f57b69e12abad6e15e4d4b47
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:41:46 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:41:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d7c42155

qt5-build.eclass: disallow version mixing

Gentoo-bug: 564560

 eclass/qt5-build.eclass | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 07780cb..c18dda5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -78,11 +78,7 @@ DEPEND="
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
-	if [[ ${QT5_MODULE} == qtbase ]]; then
-		DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
-	else
-		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5 )"
-	fi
+	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
 RDEPEND="
 	dev-qt/qtchooser

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

[Michael Palimaka]

commit:     80b046cd0e1b639559e7344f9fdba75352f429f3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:48:15 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:48:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=80b046cd

qt5-build.eclass: add initial EAPI 6 support

 eclass/qt5-build.eclass | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c18dda5..85ac374 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -13,11 +13,15 @@
 # Requires EAPI 5.
 
 case ${EAPI} in
-	5)	: ;;
+	5|6)	: ;;
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx
+inherit eutils flag-o-matic toolchain-funcs versionator virtualx
+
+if [[ ${EAPI} == 5 ]] ; then
+	inherit multilib
+fi
 
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
@@ -199,9 +203,13 @@ qt5-build_src_prepare() {
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
 	fi
 
-	# apply patches
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	epatch_user
+	if [[ ${EAPI} == 5 ]]; then
+		# apply patches
+		[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	else
+		default_src_prepare
+	fi
 }
 
 # @FUNCTION: qt5-build_src_configure

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

[Davide Pesavento]

commit:     942576847685e455639de9c2f6f431d42ee83445
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 22:34:45 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 22:34:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=94257684

qt5-build.eclass: disable configure options that are new in 5.6

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 eclass/qt5-build.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b274cf6..0359315 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -546,6 +546,7 @@ qt5_base_configure() {
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev
 		-no-journald
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-syslog)
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
 		-no-openssl
@@ -608,7 +609,8 @@ qt5_base_configure() {
 		#-use-gold-linker
 
 		# disable all platform plugins by default, override in qtgui
-		-no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms
+		-no-xcb -no-eglfs -no-kms -no-directfb -no-linuxfb
+		$([[ ${QT5_MINOR_VERSION} -ge 6 ]] && echo -no-mirclient)
 
 		# disable undocumented X11-related flags, override in qtgui
 		# (not shown in ./configure -help output)

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

[Davide Pesavento]

commit:     b47f0bcf118e9b08f1ac33954e9eaae2b7483335
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 01:55:43 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 01:55:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b47f0bcf

qt5-build.eclass: sync with gentoo repo.

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 eclass/qt5-build.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 748ed77..b274cf6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -197,6 +197,10 @@ qt5-build_src_prepare() {
 		find config.tests/unix -name '*.test' -type f \
 			-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
 			|| die "sed failed (config.tests)"
+
+		# Don't add -O3 to CXXFLAGS (bug 549140)
+		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
 	fi
 
 	# apply patches

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

[Davide Pesavento]

commit:     bf56ad3eaf6873584702a7b52d510cf5134fce84
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 01:36:19 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 01:55:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf56ad3e

qt4-build-multilib.eclass: support myqmakeargs.

See commit d74741b15fd18bd0f44cbd348a1752255ca19cb9

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 eclass/qt4-build-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 3baed5d..ade46da 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -637,10 +637,10 @@ qt4_qmake() {
 	local projectdir=${PWD/#${BUILD_DIR}/${S}}
 
 	"${BUILD_DIR}"/bin/qmake \
+		"${projectdir}" \
 		CONFIG+=nostrip \
 		LIBS+=-L"${QT4_LIBDIR}" \
-		"${projectdir}" \
-		"$@" \
+		"${myqmakeargs[@]}" \
 		|| die "qmake failed (${projectdir#${S}/})"
 }
 

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

[Davide Pesavento]

commit:     d74741b15fd18bd0f44cbd348a1752255ca19cb9
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 21:33:03 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 21:33:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d74741b1

[qt5-build.eclass] New myqmakeargs variable to pass arguments to qmake from ebuilds.

 eclass/qt5-build.eclass | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 100a36c..a9dbe18 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -227,8 +227,10 @@ qt5-build_src_compile() {
 # @DESCRIPTION:
 # Runs tests in the target directories.
 qt5-build_src_test() {
-	# '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
-	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake
+	# disable broken cmake tests (bug 474004)
+	local myqmakeargs=("${myqmakeargs[@]}" -after SUBDIRS-=cmake SUBDIRS-=installed_cmake)
+
+	qt5_foreach_target_subdir qt5_qmake
 	qt5_foreach_target_subdir emake
 
 	# create a custom testrunner script that correctly sets
@@ -663,6 +665,7 @@ qt5_qmake() {
 	fi
 
 	"${qmakepath}"/qmake \
+		"${projectdir}" \
 		CONFIG+=$(usex debug debug release) \
 		CONFIG-=$(usex debug release debug) \
 		QMAKE_AR="$(tc-getAR) cqs" \
@@ -684,8 +687,7 @@ qt5_qmake() {
 		QMAKE_LFLAGS="${LDFLAGS}" \
 		QMAKE_LFLAGS_RELEASE= \
 		QMAKE_LFLAGS_DEBUG= \
-		"${projectdir}" \
-		"$@" \
+		"${myqmakeargs[@]}" \
 		|| die "qmake failed (${projectdir#${S}/})"
 }
 

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

[Davide Pesavento]

commit:     dc5198319f4e13261e91504a0e1d411b6f11be3c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  8 00:05:42 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 00:05:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dc519831

[qt5-build.eclass] Implement subslotting for all Qt5 modules.

 eclass/qt5-build.eclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fd9406e..100a36c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,14 +17,16 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs virtualx
-
-QT5_MINOR_VERSION=${PV#*.}
-QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
+inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx
 
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
-SLOT="5"
+
+# IMPORTANT: add a subslot dependency to your package only if you are sure
+#            that it uses some private Qt APIs (most likely it does not)
+SLOT=5/$(get_version_component_range 1-2)
+
+QT5_MINOR_VERSION=$(get_version_component_range 2)
 
 # @ECLASS-VARIABLE: QT5_MODULE
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     2773b2b244cb30bfd1835f7978835a973900e567
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 13:07:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 13:07:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2773b2b2

[eclass] Shorten die message.

 eclass/qt4-build-multilib.eclass | 3 ++-
 eclass/qt5-build.eclass          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index baac03c..aef1641 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -640,7 +640,8 @@ qt4_qmake() {
 		CONFIG+=nostrip \
 		LIBS+=-L"${QT4_LIBDIR}" \
 		"${projectdir}" \
-		|| die "qmake failed (${projectdir})"
+		"$@" \
+		|| die "qmake failed (${projectdir#${S}/})"
 }
 
 # @FUNCTION: qt4_install_module_qconfigs

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ef4cdfb..fd9406e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -684,7 +684,7 @@ qt5_qmake() {
 		QMAKE_LFLAGS_DEBUG= \
 		"${projectdir}" \
 		"$@" \
-		|| die "qmake failed (${projectdir})"
+		|| die "qmake failed (${projectdir#${S}/})"
 }
 
 # @FUNCTION: qt5_install_module_qconfigs

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

[Davide Pesavento]

commit:     57293c08f9c38855b723c150cbba3f5487af8393
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 00:30:56 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 00:30:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=57293c08

[qmake-utils.eclass] Sync.

 eclass/qmake-utils.eclass | 54 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 5822848..2594a95 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -22,10 +22,11 @@ inherit eutils multilib toolchain-funcs
 # @FUNCTION: qt4_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt4 binaries are installed.
+# EPREFIX is already prepended to the returned path.
 qt4_get_bindir() {
 	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
 
-	local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
+	local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
 	if [[ -d ${qtbindir} ]]; then
 		echo ${qtbindir}
 	else
@@ -36,42 +37,67 @@ qt4_get_bindir() {
 # @FUNCTION: qt4_get_headerdir
 # @DESCRIPTION:
 # Echoes the directory where Qt4 headers are installed.
-# Does not take EPREFIX into account.
 qt4_get_headerdir() {
 	echo /usr/include/qt4
 }
 
+# @FUNCTION: qt4_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 libraries are installed.
+qt4_get_libdir() {
+	echo /usr/$(get_libdir)/qt4
+}
+
 # @FUNCTION: qt4_get_mkspecsdir
 # @DESCRIPTION:
 # Echoes the directory where Qt4 mkspecs are installed.
-# Does not take EPREFIX into account.
 qt4_get_mkspecsdir() {
 	echo /usr/share/qt4/mkspecs
 }
 
+# @FUNCTION: qt4_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 plugins are installed.
+qt4_get_plugindir() {
+	echo $(qt4_get_libdir)/plugins
+}
+
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 binaries are installed.
+# EPREFIX is already prepended to the returned path.
 qt5_get_bindir() {
 	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
 
-	echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
+	echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin
 }
 
 # @FUNCTION: qt5_get_headerdir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 headers are installed.
-# Does not take EPREFIX into account.
 qt5_get_headerdir() {
 	echo /usr/include/qt5
 }
 
+# @FUNCTION: qt5_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 libraries are installed.
+qt5_get_libdir() {
+	echo /usr/$(get_libdir)
+}
+
 # @FUNCTION: qt5_get_mkspecsdir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 mkspecs are installed.
-# Does not take EPREFIX into account.
 qt5_get_mkspecsdir() {
-	echo /usr/$(get_libdir)/qt5/mkspecs
+	echo $(qt5_get_libdir)/qt5/mkspecs
+}
+
+# @FUNCTION: qt5_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 plugins are installed.
+qt5_get_plugindir() {
+	echo $(qt5_get_libdir)/qt5/plugins
 }
 
 # @FUNCTION: qmake-utils_find_pro_file
@@ -120,10 +146,10 @@ qmake-utils_find_pro_file() {
 # @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.
+# 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.
 #
@@ -233,9 +259,9 @@ eqmake4() {
 		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_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

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

[Davide Pesavento]

commit:     3e4b34762a05f4f7964dc0d386d352513b8db068
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 18:45:22 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 18:45:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e4b3476

[qt5-build.eclass] Configure with -no-xkbcommon-x11 by default.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 008700c..ef4cdfb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -542,7 +542,7 @@ qt5_base_configure() {
 		-no-freetype -no-harfbuzz
 		-no-openssl
 		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
-		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-evdev)
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-{x11,evdev})
 		-no-xinput2 -no-xcb-xlib
 
 		# don't specify -no-gif because there is no way to override it later

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

[Davide Pesavento]

commit:     dd99c2642b5e2b098a1406ca7a8bcdf7df30cd88
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 16:38:28 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 16:38:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dd99c264

[qt5-build.eclass] Some updates for 5.5 support.

 eclass/qt5-build.eclass | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d0db81f..008700c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -535,9 +535,6 @@ qt5_base_configure() {
 		-system-zlib
 		-system-pcre
 
-		# don't specify -no-gif because there is no way to override it later
-		#-no-gif
-
 		# disable everything to prevent automagic deps (part 1)
 		-no-mtdev
 		-no-journald
@@ -545,8 +542,12 @@ qt5_base_configure() {
 		-no-freetype -no-harfbuzz
 		-no-openssl
 		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-xkbcommon-evdev)
 		-no-xinput2 -no-xcb-xlib
 
+		# don't specify -no-gif because there is no way to override it later
+		#-no-gif
+
 		# always enable glib event loop support
 		-glib
 
@@ -578,7 +579,10 @@ qt5_base_configure() {
 		-iconv
 
 		# disable everything to prevent automagic deps (part 3)
-		-no-cups -no-evdev -no-icu -no-fontconfig -no-dbus
+		-no-cups -no-evdev
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-tslib)
+		-no-icu -no-fontconfig
+		-no-dbus
 
 		# don't strip
 		-no-strip
@@ -614,9 +618,16 @@ qt5_base_configure() {
 		# typedef qreal to double (warning: changing this flag breaks the ABI)
 		-qreal double
 
-		# disable opengl and egl by default, override in qtgui and qtopengl
+		# disable OpenGL and EGL support by default, override in qtgui,
+		# qtopengl, qtprintsupport and qtwidgets
 		-no-opengl -no-egl
 
+		# disable libinput-based generic plugin by default, override in qtgui
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libinput)
+
+		# disable gstreamer by default, override in qtmultimedia
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-gstreamer)
+
 		# use upstream default
 		#-no-system-proxies
 

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

[Davide Pesavento]

commit:     504931cc75df08070039b824e526eb7067348473
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 20:11:11 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 20:11:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=504931cc

[eclass] Reduce diff between qt4 and qt5 eclasses.

 eclass/qt4-build-multilib.eclass | 26 +++++++++++++++-----------
 eclass/qt5-build.eclass          |  6 +++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index fe6bccf..baac03c 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -25,16 +25,12 @@ SLOT="4"
 
 case ${PV} in
 	4.?.9999)
+		# git stable branch
 		QT4_BUILD_TYPE="live"
-		EGIT_REPO_URI=(
-			"git://code.qt.io/qt/qt.git"
-			"https://code.qt.io/git/qt/qt.git"
-			"https://github.com/qtproject/qt.git"
-		)
 		EGIT_BRANCH=${PV%.9999}
-		inherit git-r3
 		;;
 	*)
+		# official stable release
 		QT4_BUILD_TYPE="release"
 		MY_P=qt-everywhere-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
@@ -42,6 +38,13 @@ case ${PV} in
 		;;
 esac
 
+EGIT_REPO_URI=(
+	"git://code.qt.io/qt/qt.git"
+	"https://code.qt.io/git/qt/qt.git"
+	"https://github.com/qtproject/qt.git"
+)
+[[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3
+
 if [[ ${PN} != qttranslations ]]; then
 	IUSE="aqua debug pch"
 	[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
@@ -507,21 +510,19 @@ qt4_multilib_src_install_all() {
 		find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
 	fi
 
-	# remove .la files since we are building only shared libraries
 	prune_libtool_files
 }
 
 # @FUNCTION: qt4-build-multilib_pkg_postinst
 # @DESCRIPTION:
-# Regenerate configuration, plus throw a message about possible
-# breakages and proposed solutions.
+# Regenerate configuration after installation or upgrade/downgrade.
 qt4-build-multilib_pkg_postinst() {
 	qt4_regenerate_global_qconfigs
 }
 
 # @FUNCTION: qt4-build-multilib_pkg_postrm
 # @DESCRIPTION:
-# Regenerate configuration when the package is completely removed.
+# Regenerate configuration when a module is completely removed.
 qt4-build-multilib_pkg_postrm() {
 	qt4_regenerate_global_qconfigs
 }
@@ -590,16 +591,19 @@ qt4_prepare_env() {
 # @DESCRIPTION:
 # Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES.
 qt4_foreach_target_subdir() {
-	local subdir
+	local ret=0 subdir=
 	for subdir in ${QT4_TARGET_DIRECTORIES}; do
 		mkdir -p "${subdir}" || die
 		pushd "${subdir}" >/dev/null || die
 
 		einfo "Running $* ${subdir:+in ${subdir}}"
 		"$@"
+		((ret+=$?))
 
 		popd >/dev/null || die
 	done
+
+	return ${ret}
 }
 
 # @FUNCTION: qt4_symlink_tools_to_build_dir

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5bc5cbd..d0db81f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -39,19 +39,19 @@ case ${PV} in
 		EGIT_BRANCH="dev"
 		;;
 	5.?.9999)
-		# git stable branches (5.x)
+		# git stable branch
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	*_alpha*|*_beta*|*_rc*)
-		# development releases
+		# development release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
-		# official stable releases
+		# official stable release
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
 		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"

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

[Davide Pesavento]

commit:     fb38b1da22ef21f32e3d659b8287715cce0bf6f8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 19:14:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 19:14:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb38b1da

[qt5-build] Allow configuring debug/release on a per-package basis.

Partially based on github pull request #92.

 eclass/qt5-build.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6f10824..5bc5cbd 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -489,8 +489,9 @@ qt5_base_configure() {
 		-examplesdir "${QT5_EXAMPLESDIR}"
 		-testsdir "${QT5_TESTSDIR}"
 
-		# debug/release
-		$(usex debug -debug -release)
+		# configure in release mode by default,
+		# override via the CONFIG qmake variable
+		-release
 		-no-separate-debug-info
 
 		# licensing stuff
@@ -649,6 +650,8 @@ qt5_qmake() {
 	fi
 
 	"${qmakepath}"/qmake \
+		CONFIG+=$(usex debug debug release) \
+		CONFIG-=$(usex debug release debug) \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_LINK_C="$(tc-getCC)" \

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

[Davide Pesavento]

commit:     a0f5885211ad0b2250d36489e5c5021f8fbc2dc4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 17:41:46 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 17:41:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a0f58852

[qmake-utils.eclass] Use use_if_iuse().

 eclass/qmake-utils.eclass | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 1f6e250..5822848 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -141,14 +141,13 @@ eqmake4() {
 
 	local qmake_args=("$@")
 
-	# check if project file was passed as a first argument
-	# if not, then search for it
+	# 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 "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"
@@ -156,13 +155,12 @@ eqmake4() {
 		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"
+	# Make sure the CONFIG variable is correctly set for both release and debug builds.
+	local config_add=release
+	local config_remove=debug
+	if use_if_iuse debug; then
+		config_add=debug
+		config_remove=release
 	fi
 
 	local awkscript='BEGIN {
@@ -240,7 +238,6 @@ eqmake4() {
 		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)"
@@ -288,7 +285,6 @@ eqmake5() {
 		QMAKE_LFLAGS_DEBUG= \
 		"$@"
 
-	# was qmake successful?
 	if ! eend $? ; then
 		echo
 		eerror "Running qmake has failed! (see above for details)"

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

[Davide Pesavento]

commit:     4af309cd76d82a1d20806aace900e6165eed2b1f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 17:22:52 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 17:22:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4af309cd

[qt4-build-multilib.eclass] Drop QT4_VERBOSE_BUILD (always true now).

 eclass/qt4-build-multilib.eclass | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 747f2c5..fe6bccf 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -88,11 +88,6 @@ multilib_src_install_all()	{ qt4_multilib_src_install_all; }
 # Space-separated list of directories that will be configured,
 # compiled, and installed. All paths must be relative to ${S}.
 
-# @ECLASS-VARIABLE: QT4_VERBOSE_BUILD
-# @DESCRIPTION:
-# Set to false to reduce build output during compilation.
-: ${QT4_VERBOSE_BUILD:=true}
-
 # @ECLASS-VARIABLE: QCONFIG_ADD
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -381,8 +376,8 @@ qt4_multilib_src_configure() {
 		# disable rpath on non-prefix (bugs 380415 and 417169)
 		$(usex prefix '' -no-rpath)
 
-		# verbosity of the configure and build phases
-		-verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
+		# print verbose information about each configure test
+		-verbose
 
 		# precompiled headers don't work on hardened, where the flag is masked
 		$(in_iuse pch && qt_use pch || echo -no-pch)

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

[Davide Pesavento]

commit:     65763aa8eb76013181256a5dff2697664d6ed188
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 23:08:04 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 23:08:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=65763aa8

[qt4-build-multilib.eclass] Sync.

 eclass/qt4-build-multilib.eclass | 54 ++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 078b61c..747f2c5 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -171,9 +171,20 @@ qt4-build-multilib_src_prepare() {
 		fi
 	fi
 
+	if [[ ${PN} == qtdeclarative ]]; then
+		# Bug 551560
+		# gcc-4.8 ICE with -Os, fixed in 4.9
+		if use x86 && [[ $(gcc-version) == 4.8 ]]; then
+			replace-flags -Os -O2
+		fi
+	fi
+
 	if [[ ${PN} == qtwebkit ]]; then
 		# Bug 550780
-		filter-flags -fgraphite-identity -floop-strip-mine
+		# various ICEs with graphite-related flags, gcc-5 works
+		if [[ $(gcc-major-version) -lt 5 ]]; then
+			filter-flags -fgraphite-identity -floop-strip-mine
+		fi
 	fi
 
 	# Bug 261632
@@ -198,8 +209,8 @@ qt4-build-multilib_src_prepare() {
 
 	# Drop -nocache from qmake invocation in all configure tests, to ensure that the
 	# correct toolchain and build flags are picked up from config.tests/.qmake.cache
-	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-		sed -i -e '/bin\/qmake/s/ -nocache//' || die "sed -nocache failed"
+	find config.tests/unix -name '*.test' -type f -execdir \
+		sed -i -e '/bin\/qmake/s/-nocache//' '{}' + || die "sed -nocache failed"
 
 	# compile.test needs additional patching so that it doesn't create another cache file
 	# inside the test subdir, which would incorrectly override config.tests/.qmake.cache
@@ -285,21 +296,21 @@ qt4_multilib_src_configure() {
 		CC=$(tc-getCC) \
 		CXX=$(tc-getCXX) \
 		LD=$(tc-getCXX) \
+		MAKEFLAGS=${MAKEOPTS} \
 		OBJCOPY=$(tc-getOBJCOPY) \
+		OBJDUMP=$(tc-getOBJDUMP) \
 		STRIP=$(tc-getSTRIP)
 
 	# convert tc-arch to the values supported by Qt
-	local arch=
-	case $(tc-arch) in
-		amd64|x64-*)		  arch=x86_64 ;;
-		ppc*-macos)		  arch=ppc ;;
-		ppc*)			  arch=powerpc ;;
-		sparc*)			  arch=sparc ;;
-		x86-macos)		  arch=x86 ;;
-		x86*)			  arch=i386 ;;
-		alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
-		arm64|hppa|sh)		  arch=generic ;;
-		*) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;;
+	local arch=$(tc-arch)
+	case ${arch} in
+		amd64|x64-*)	arch=x86_64 ;;
+		arm64|hppa)	arch=generic ;;
+		ppc*-macos)	arch=ppc ;;
+		ppc*)		arch=powerpc ;;
+		sparc*)		arch=sparc ;;
+		x86-macos)	arch=x86 ;;
+		x86*)		arch=i386 ;;
 	esac
 
 	# configure arguments
@@ -462,15 +473,10 @@ qt4_multilib_src_install() {
 		fi
 	fi
 
-	# move pkgconfig files to the correct location
-	eshopts_push -s nullglob
-	local pcfile
-	for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do
-		dodir /usr/$(get_libdir)/pkgconfig
-		mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die
-	done
-	eshopts_pop
-	rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die
+	# move pkgconfig directory to the correct location
+	if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then
+		mv "${D}${QT4_LIBDIR}"/pkgconfig "${ED}usr/$(get_libdir)" || die
+	fi
 
 	qt4_install_module_qconfigs
 	qt4_symlink_framework_headers
@@ -754,7 +760,7 @@ qt4_symlink_framework_headers() {
 			dosym "${rdir}"/${f}/Headers "${dest}"
 
 			# Link normal headers as well.
-			for hdr in "${D}/${QT4_LIBDIR}/${f}"/Headers/*; do
+			for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do
 				h=$(basename ${hdr})
 				dosym "../${rdir}"/${f}/Headers/${h} \
 					"${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h}

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

[Davide Pesavento]

commit:     9843f6b6b71ca7b82c28685105a08a172e767c1c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 17:43:36 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 17:43:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=9843f6b6

[qt5-build] Disable instruction set when the corresponding flag is present.

We now detect if the user disabled one or more instruction sets,
and pass the corresponding -no-foo option to configure.

Heavily based on commit 1dec9f625b40e91fcf680d8bfd80f8d876ea8ee5
that did the same for qt4-build-multilib.eclass.

 eclass/qt5-build.eclass | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 14fbb78..6f10824 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -321,14 +321,13 @@ qt5-build_pkg_postrm() {
 ######  Public helpers  ######
 
 # @FUNCTION: qt_use
-# @USAGE: <flag> [feature] [enableopt]
+# @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
 # <flag> is the name of a flag in IUSE.
 #
-# Echoes "-${enableopt}-${feature}" if <flag> is enabled, or "-no-${feature}"
-# if it is disabled. If [feature] is not specified, it defaults to the value
-# of <flag>. If [enableopt] is not specified, the whole "-${enableopt}" prefix
-# is omitted.
+# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
+# otherwise. If [feature] is not specified, <flag> is used in its place.
+# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
 qt_use() {
 	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
 
@@ -517,6 +516,17 @@ qt5_base_configure() {
 		# obsolete flag, does nothing
 		#-qml-debug
 
+		# instruction set support
+		$(is-flagq -mno-sse2    && echo -no-sse2)
+		$(is-flagq -mno-sse3    && echo -no-sse3)
+		$(is-flagq -mno-ssse3   && echo -no-ssse3)
+		$(is-flagq -mno-sse4.1  && echo -no-sse4.1)
+		$(is-flagq -mno-sse4.2  && echo -no-sse4.2)
+		$(is-flagq -mno-avx     && echo -no-avx)
+		$(is-flagq -mno-avx2    && echo -no-avx2)
+		$(is-flagq -mno-dsp     && echo -no-mips_dsp)
+		$(is-flagq -mno-dspr2   && echo -no-mips_dspr2)
+
 		# use pkg-config to detect include and library paths
 		-pkg-config
 

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

[Davide Pesavento]

commit:     4e6b7334a6b4e7ab026a8e49edb04250ebb429cd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 00:21:07 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 00:21:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4e6b7334

[qt4-build-multilib.eclass] Use usex().

 eclass/qt4-build-multilib.eclass | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 5b6cc95..078b61c 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -368,7 +368,7 @@ qt4_multilib_src_configure() {
 		-nomake demos
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
-		$(use prefix || echo -no-rpath)
+		$(usex prefix '' -no-rpath)
 
 		# verbosity of the configure and build phases
 		-verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
@@ -531,22 +531,30 @@ qt4-build-multilib_pkg_postrm() {
 # @FUNCTION: qt_use
 # @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+#
 # Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
 # otherwise. If [feature] is not specified, <flag> is used in its place.
 # If [enableval] is not specified, the "-${enableval}" prefix is omitted.
 qt_use() {
-	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
+	usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}"
 }
 
 # @FUNCTION: qt_native_use
 # @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+#
 # Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently
 # building for the native ABI, "-no-${feature}" otherwise. If [feature] is not
 # specified, <flag> is used in its place. If [enableval] is not specified,
 # the "-${enableval}" prefix is omitted.
 qt_native_use() {
-	multilib_is_native_abi && use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
+	multilib_is_native_abi && qt_use "$@" || echo "-no-${2:-$1}"
 }
 
 

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

[Davide Pesavento]

commit:     c743688da3090d852587057eb6d95eea2e93054a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 00:02:41 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 00:02:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=c743688d

[qt5-build.eclass] Use usex().

 eclass/qt5-build.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a31755b..14fbb78 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -332,7 +332,7 @@ qt5-build_pkg_postrm() {
 qt_use() {
 	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
 
-	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+	usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}"
 }
 
 # @FUNCTION: qt_use_compile_test
@@ -491,7 +491,7 @@ qt5_base_configure() {
 		-testsdir "${QT5_TESTSDIR}"
 
 		# debug/release
-		$(use debug && echo -debug || echo -release)
+		$(usex debug -debug -release)
 		-no-separate-debug-info
 
 		# licensing stuff
@@ -552,7 +552,7 @@ qt5_base_configure() {
 		-no-compile-examples
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
-		$(use prefix || echo -no-rpath)
+		$(usex prefix '' -no-rpath)
 
 		# print verbose information about each configure test
 		-verbose

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

[Davide Pesavento]

commit:     cbce78583c023404aee6e1695173b1e537c2451a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 01:56:58 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 01:56:58 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=cbce7858

[eclass] Sync.

 eclass/qt4-build-multilib.eclass | 79 ++++++++++++++++------------------------
 eclass/qt5-build.eclass          |  4 +-
 2 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 245c020..5b6cc95 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -20,7 +20,7 @@ esac
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
 
 HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
+LICENSE="|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3"
 SLOT="4"
 
 case ${PV} in
@@ -108,6 +108,9 @@ multilib_src_install_all()	{ qt4_multilib_src_install_all; }
 # @DESCRIPTION:
 # List of macros that must be defined in QtCore/qconfig.h
 
+
+######  Phase functions  ######
+
 # @FUNCTION: qt4-build-multilib_src_unpack
 # @DESCRIPTION:
 # Unpacks the sources.
@@ -459,9 +462,18 @@ qt4_multilib_src_install() {
 		fi
 	fi
 
-	install_qconfigs
-	fix_library_files
-	fix_includes
+	# move pkgconfig files to the correct location
+	eshopts_push -s nullglob
+	local pcfile
+	for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do
+		dodir /usr/$(get_libdir)/pkgconfig
+		mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die
+	done
+	eshopts_pop
+	rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die
+
+	qt4_install_module_qconfigs
+	qt4_symlink_framework_headers
 }
 
 qt4_multilib_src_install_all() {
@@ -503,16 +515,19 @@ qt4_multilib_src_install_all() {
 # Regenerate configuration, plus throw a message about possible
 # breakages and proposed solutions.
 qt4-build-multilib_pkg_postinst() {
-	generate_qconfigs
+	qt4_regenerate_global_qconfigs
 }
 
 # @FUNCTION: qt4-build-multilib_pkg_postrm
 # @DESCRIPTION:
 # Regenerate configuration when the package is completely removed.
 qt4-build-multilib_pkg_postrm() {
-	generate_qconfigs
+	qt4_regenerate_global_qconfigs
 }
 
+
+######  Public helpers  ######
+
 # @FUNCTION: qt_use
 # @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
@@ -547,7 +562,6 @@ qt4_prepare_env() {
 	QT4_PREFIX=${EPREFIX}/usr
 	QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
 	QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
-	QT4_PCDIR=${QT4_PREFIX}/$(get_libdir)/pkgconfig
 	QT4_BINDIR=${QT4_LIBDIR}/bin
 	QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
 	QT4_IMPORTDIR=${QT4_LIBDIR}/imports
@@ -616,11 +630,11 @@ qt4_qmake() {
 		|| die "qmake failed (${projectdir})"
 }
 
-# @FUNCTION: install_qconfigs
+# @FUNCTION: qt4_install_module_qconfigs
 # @INTERNAL
 # @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations.
-install_qconfigs() {
+# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
+qt4_install_module_qconfigs() {
 	local x
 	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
 		for x in QCONFIG_ADD QCONFIG_REMOVE; do
@@ -639,11 +653,12 @@ install_qconfigs() {
 	fi
 }
 
-# @FUNCTION: generate_qconfigs
+# @FUNCTION: qt4_regenerate_global_qconfigs
 # @INTERNAL
 # @DESCRIPTION:
-# Generates gentoo-specific qconfig.{h,pri}.
-generate_qconfigs() {
+# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration.
+# Don't call die here because dying in pkg_post{inst,rm} only makes things worse.
+qt4_regenerate_global_qconfigs() {
 	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qtcore ]]; then
 		local x qconfig_add qconfig_remove qconfig_new
 		for x in "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
@@ -652,8 +667,6 @@ generate_qconfigs() {
 			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
 		done
 
-		# these error checks do not use die because dying in pkg_post{inst,rm}
-		# just makes things worse.
 		if [[ -e "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
 			# start with the qconfig.pri that qtcore installed
 			if ! cp "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri \
@@ -699,39 +712,11 @@ generate_qconfigs() {
 	fi
 }
 
-# @FUNCTION: fix_library_files
-# @INTERNAL
-# @DESCRIPTION:
-# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and
-# moves the *.pc files into the pkgconfig directory.
-fix_library_files() {
-	local libfile
-	for libfile in "${D}"/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
-		fi
-	done
-
-	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations
-	for libfile in "${D}"/${QT4_LIBDIR}/pkgconfig/*.pc; do
-		if [[ -e ${libfile} ]]; then
-			sed -i -e "s:${S}/bin:${QT4_BINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
-
-		# Move .pc files into the pkgconfig directory
-		dodir ${QT4_PCDIR#${EPREFIX}}
-		mv ${libfile} "${D}"/${QT4_PCDIR}/ || die "moving ${libfile} to ${D}/${QT4_PCDIR}/ failed"
-		fi
-	done
-
-	# Don't install an empty directory
-	rmdir "${D}"/${QT4_LIBDIR}/pkgconfig
-}
-
-# @FUNCTION: fix_includes
+# @FUNCTION: qt4_symlink_framework_headers
 # @DESCRIPTION:
-# For MacOS X we need to add some symlinks when frameworks are
-# being used, to avoid complications with some more or less stupid packages.
-fix_includes() {
+# On OS X we need to add some symlinks when frameworks are being
+# used, to avoid complications with some more or less stupid packages.
+qt4_symlink_framework_headers() {
 	if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
 		local frw dest f h rdir
 		# Some packages tend to include <Qt/...>

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f8c7674..025a731 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -23,7 +23,7 @@ QT5_MINOR_VERSION=${PV#*.}
 QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
 
 HOMEPAGE="https://www.qt.io/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3"
 SLOT="5"
 
 # @ECLASS-VARIABLE: QT5_MODULE
@@ -225,8 +225,6 @@ qt5-build_src_compile() {
 # @DESCRIPTION:
 # Runs tests in the target directories.
 qt5-build_src_test() {
-	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
-
 	# '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
 	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake
 	qt5_foreach_target_subdir emake

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

[Davide Pesavento]

commit:     f5bc55012fa5b5f0cadd2a80dcd501a3b7ede00a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 19:11:47 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 31 19:11:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f5bc5501

Revert "Fix build failure with gold linker wrt bug #541262."

This reverts commit f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d.

The bug is already fixed upstream for 5.4.2, see qtbase commit
53e2db74dba8135bd88bad48fbf9f2fc81ed4f8b.

 eclass/qt5-build.eclass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a209cec..f8c7674 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -191,10 +191,6 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		# -fuse-ld is a gcc switch, not an ld switch (bug #541262)
-		sed -i -e '/linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold/s/linker/compiler/' \
-			configure || die "sed failed (-fuse-ld)"
-
 		# Respect toolchain and flags in config.tests
 		find config.tests/unix -name '*.test' -type f \
 			-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \

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

[Michael Palimaka]

commit:     f6b7f47fb07fda8aa6e0c3be5be7f60c2d541b0d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 17:33:09 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun May 31 17:33:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6b7f47f

[eclass] Fix build failure with gold linker wrt bug #541262.

 eclass/qt5-build.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f8c7674..a209cec 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -191,6 +191,10 @@ qt5-build_src_prepare() {
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
+		# -fuse-ld is a gcc switch, not an ld switch (bug #541262)
+		sed -i -e '/linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold/s/linker/compiler/' \
+			configure || die "sed failed (-fuse-ld)"
+
 		# Respect toolchain and flags in config.tests
 		find config.tests/unix -name '*.test' -type f \
 			-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \

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

[Davide Pesavento]

commit:     8f2e955183ee5287518b8f28fe9a4ba09e0d0e82
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 14:12:53 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 31 14:12:53 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f2e9551

[qt4-build-multilib.eclass] Sync.

 eclass/qt4-build-multilib.eclass | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index a244484..245c020 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -154,20 +154,6 @@ qt4-build-multilib_src_prepare() {
 			|| die "sed failed (skip X11 tests)"
 	fi
 
-	if use_if_iuse aqua; then
-		sed -i \
-			-e '/^CONFIG/s:app_bundle::' \
-			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			mkspecs/$(qt4_get_mkspec)/qmake.conf \
-			|| die "sed failed (aqua)"
-
-		# we are crazy and build cocoa + qt3support
-		if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-				configure || die "sed failed (cocoa + qt3support)"
-		fi
-	fi
-
 	if [[ ${PN} == qtcore ]]; then
 		# Bug 373061
 		# qmake bus errors with -O2 or -O3 but -O1 works
@@ -182,6 +168,11 @@ qt4-build-multilib_src_prepare() {
 		fi
 	fi
 
+	if [[ ${PN} == qtwebkit ]]; then
+		# Bug 550780
+		filter-flags -fgraphite-identity -floop-strip-mine
+	fi
+
 	# Bug 261632
 	if use ppc64; then
 		append-flags -mminimal-toc
@@ -220,6 +211,20 @@ qt4-build-multilib_src_prepare() {
 		mkspecs/$(qt4_get_mkspec)/qmake.conf \
 		|| die "sed QMAKE_(LIB|INC)DIR failed"
 
+	if use_if_iuse aqua; then
+		sed -i \
+			-e '/^CONFIG/s:app_bundle::' \
+			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
+			mkspecs/$(qt4_get_mkspec)/qmake.conf \
+			|| die "sed failed (aqua)"
+
+		# we are crazy and build cocoa + qt3support
+		if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+			sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
+				configure || die "sed failed (cocoa + qt3support)"
+		fi
+	fi
+
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
 		sed -i \

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

[Davide Pesavento]

commit:     8c7f090934da5e104417cb380b4a3a70d974fac4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 12:53:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 31 12:53:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=8c7f0909

[qmake-utils.eclass] Add comment.

 eclass/qmake-utils.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index c2da6d9..1f6e250 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -10,6 +10,9 @@
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
+#
+# This eclass does not set any metadata variables nor export any phase
+# functions. It can be inherited safely.
 
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1

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

[Davide Pesavento]

commit:     520f6e8aa88ac33221a93597020e5c0c62d65e11
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 15:27:38 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 10 15:27:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=520f6e8a

[eclass] Sync again.

 eclass/qmake-utils.eclass | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index ff8b352..c2da6d9 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -20,6 +20,8 @@ inherit eutils multilib toolchain-funcs
 # @DESCRIPTION:
 # Echoes the directory where Qt4 binaries are installed.
 qt4_get_bindir() {
+	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
 	local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
 	if [[ -d ${qtbindir} ]]; then
 		echo ${qtbindir}
@@ -31,36 +33,42 @@ qt4_get_bindir() {
 # @FUNCTION: qt4_get_headerdir
 # @DESCRIPTION:
 # Echoes the directory where Qt4 headers are installed.
+# Does not take EPREFIX into account.
 qt4_get_headerdir() {
-	echo ${EPREFIX}/usr/include/qt4
+	echo /usr/include/qt4
 }
 
 # @FUNCTION: qt4_get_mkspecsdir
 # @DESCRIPTION:
 # Echoes the directory where Qt4 mkspecs are installed.
+# Does not take EPREFIX into account.
 qt4_get_mkspecsdir() {
-	echo ${EPREFIX}/usr/share/qt4/mkspecs
+	echo /usr/share/qt4/mkspecs
 }
 
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 binaries are installed.
 qt5_get_bindir() {
+	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
 	echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
 }
 
 # @FUNCTION: qt5_get_headerdir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 headers are installed.
+# Does not take EPREFIX into account.
 qt5_get_headerdir() {
-	echo ${EPREFIX}/usr/include/qt5
+	echo /usr/include/qt5
 }
 
 # @FUNCTION: qt5_get_mkspecsdir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 mkspecs are installed.
+# Does not take EPREFIX into account.
 qt5_get_mkspecsdir() {
-	echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs
+	echo /usr/$(get_libdir)/qt5/mkspecs
 }
 
 # @FUNCTION: qmake-utils_find_pro_file
@@ -252,8 +260,6 @@ eqmake4() {
 eqmake5() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
 	ebegin "Running qmake"
 
 	"$(qt5_get_bindir)"/qmake \

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

[Davide Pesavento]

commit:     cd976c551901203f7f60c10325f88f250fb080d8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 14:49:52 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 10 14:49:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd976c55

[eclass] Sync.

 eclass/qmake-utils.eclass        | 28 ++++++++++++++++++++++++++++
 eclass/qt4-build-multilib.eclass |  1 +
 eclass/qt5-build.eclass          |  1 +
 3 files changed, 30 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 725a5a5..ff8b352 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -28,6 +28,20 @@ qt4_get_bindir() {
 	fi
 }
 
+# @FUNCTION: qt4_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 headers are installed.
+qt4_get_headerdir() {
+	echo ${EPREFIX}/usr/include/qt4
+}
+
+# @FUNCTION: qt4_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 mkspecs are installed.
+qt4_get_mkspecsdir() {
+	echo ${EPREFIX}/usr/share/qt4/mkspecs
+}
+
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 binaries are installed.
@@ -35,6 +49,20 @@ qt5_get_bindir() {
 	echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
 }
 
+# @FUNCTION: qt5_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 headers are installed.
+qt5_get_headerdir() {
+	echo ${EPREFIX}/usr/include/qt5
+}
+
+# @FUNCTION: qt5_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 mkspecs are installed.
+qt5_get_mkspecsdir() {
+	echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs
+}
+
 # @FUNCTION: qmake-utils_find_pro_file
 # @RETURN: zero or one qmake .pro file names
 # @INTERNAL

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 0fbe454..a244484 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -538,6 +538,7 @@ qt_native_use() {
 # Prepares the environment for building Qt.
 qt4_prepare_env() {
 	# setup installation directories
+	# note: keep paths in sync with qmake-utils.eclass
 	QT4_PREFIX=${EPREFIX}/usr
 	QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
 	QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ea55dcf..f8c7674 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -389,6 +389,7 @@ qt_use_disable_mod() {
 # Prepares the environment for building Qt.
 qt5_prepare_env() {
 	# setup installation directories
+	# note: keep paths in sync with qmake-utils.eclass
 	QT5_PREFIX=${EPREFIX}/usr
 	QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
 	QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)

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

[Davide Pesavento]

commit:     02b430583079d5d4f98bb76b19fa612c93c0050f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 01:12:43 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 10 01:12:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=02b43058

[qt4-build-multilib.eclass] Sync.

 eclass/qt4-build-multilib.eclass | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 8a0d45c..0fbe454 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -187,12 +187,6 @@ qt4-build-multilib_src_prepare() {
 		append-flags -mminimal-toc
 	fi
 
-	# Bug 417105
-	# graphite on gcc 4.7 causes miscompilations
-	if [[ $(gcc-version) == "4.7" ]]; then
-		filter-flags -fgraphite-identity
-	fi
-
 	# Read also AR from the environment
 	sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \
 		configure || die "sed SYSTEM_VARIABLES failed"
@@ -355,6 +349,9 @@ qt4_multilib_src_configure() {
 		$(is-flagq -mno-avx	&& echo -no-avx)
 		$(is-flagq -mfpu=*	&& ! is-flagq -mfpu=*neon* && echo -no-neon)
 
+		# bug 367045
+		$([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3)
+
 		# prefer system libraries
 		-system-zlib
 
@@ -376,10 +373,6 @@ qt4_multilib_src_configure() {
 		# mostly to be seen as a core dump with the message:
 		# "QPixmap: Must construct a QApplication before a QPaintDevice"
 		$([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations)
-
-		# this one is needed for all systems with a separate -liconv, apart from
-		# Darwin, for which the sources already cater for -liconv
-		$(use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && echo -liconv)
 	)
 
 	if use_if_iuse aqua; then

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

[Davide Pesavento]

commit:     5e16bcd72951e73dbb89fdaa9b0dee793acdc4e8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed May  6 00:49:10 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed May  6 00:49:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5e16bcd7

[qt4-build-multilib] Rewrite handling of toolchain and *FLAGS during configure

Previously we would directly patch the config.tests code in ${S}, but
this meant that the native ABI flags were being used for all ABIs, so
for example we were compiling 64-bit tests during the 32-bit build...

Switch to using the .qmake.cache file, that the configure already creates
inside the (ABI-specific) build dir.

Fixes bug #545106 and probably many more that haven't been discovered yet.

 eclass/qt4-build-multilib.eclass | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 2c4de88..8a0d45c 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -198,7 +198,7 @@ qt4-build-multilib_src_prepare() {
 		configure || die "sed SYSTEM_VARIABLES failed"
 
 	# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
-	# or they will override user's flags (.qmake.cache)
+	# or they will override the user's flags (via .qmake.cache)
 	sed -i -e '/^SYSTEM_VARIABLES=/ i \
 		QMakeVar set QMAKE_CFLAGS_RELEASE\
 		QMakeVar set QMAKE_CFLAGS_DEBUG\
@@ -208,12 +208,16 @@ qt4-build-multilib_src_prepare() {
 		QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
 		configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed"
 
-	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	# Drop -nocache from qmake invocation in all configure tests, to ensure that the
+	# correct toolchain and build flags are picked up from config.tests/.qmake.cache
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
-			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
-			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
-		|| die "sed config.tests failed"
+		sed -i -e '/bin\/qmake/s/ -nocache//' || die "sed -nocache failed"
+
+	# compile.test needs additional patching so that it doesn't create another cache file
+	# inside the test subdir, which would incorrectly override config.tests/.qmake.cache
+	sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \
+		-e '/bin\/qmake/s/ "$SRCDIR/ "QT_BUILD_TREE=$OUTDIR"&/' \
+		config.tests/unix/compile.test || die "sed compile.test failed"
 
 	# Delete references to the obsolete /usr/X11R6 directory
 	# On prefix, this also prevents looking at non-prefix stuff

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

[Davide Pesavento]

commit:     1dec9f625b40e91fcf680d8bfd80f8d876ea8ee5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May  5 16:55:39 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May  5 17:24:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=1dec9f62

[qt4-build-multilib] Disable instruction set when the corresponding flag is present

This wasn't necessary until now because the user's flags were overriding
the additional -mfoo flag passed from configure to compile.test. However
we will soon stop substituting the flags directly in compile.test because
that doesn't work in the multilib case, and there is no other feasible way
to have the user's flags take precedence over the appended ones during
the configure tests.

Therefore we now detect if the user disabled one or more instruction sets,
and pass the corresponding -no-foo option to configure.

Credit to kensington for the idea.

 eclass/qt4-build-multilib.eclass | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 9a758e4..2c4de88 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -339,6 +339,18 @@ qt4_multilib_src_configure() {
 		-arch ${arch}
 		-platform $(qt4_get_mkspec)
 
+		# instruction set support
+		$(is-flagq -mno-mmx	&& echo -no-mmx)
+		$(is-flagq -mno-3dnow	&& echo -no-3dnow)
+		$(is-flagq -mno-sse	&& echo -no-sse)
+		$(is-flagq -mno-sse2	&& echo -no-sse2)
+		$(is-flagq -mno-sse3	&& echo -no-sse3)
+		$(is-flagq -mno-ssse3	&& echo -no-ssse3)
+		$(is-flagq -mno-sse4.1	&& echo -no-sse4.1)
+		$(is-flagq -mno-sse4.2	&& echo -no-sse4.2)
+		$(is-flagq -mno-avx	&& echo -no-avx)
+		$(is-flagq -mfpu=*	&& ! is-flagq -mfpu=*neon* && echo -no-neon)
+
 		# prefer system libraries
 		-system-zlib
 

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

[Michael Palimaka]

commit:     78d066c32d911b68b85794cf2bdc93aca37cde58
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 16:45:59 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 16:45:59 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=78d066c3

[eclass] Update gtkstyle comment.

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1b79670..ea55dcf 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -543,8 +543,8 @@ qt5_base_configure() {
 		# disable everything to prevent automagic deps (part 2)
 		-no-pulseaudio -no-alsa
 
-		# disable gtkstyle because it adds qt4 include paths to the compiler
-		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
+		# override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked
+		# to avoid adding qt4 include paths (bug 433826)
 		-no-gtkstyle
 
 		# exclude examples and tests from default build

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

[Davide Pesavento]

commit:     f0f0aa0cbabd3a3d3c14a1eae1066a82d8eb0f32
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 17:33:07 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 17:33:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f0f0aa0c

[qt5-build.eclass] Export AR and OBJDUMP as well.

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2536c72..1b79670 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -469,7 +469,7 @@ qt5_symlink_tools_to_build_dir() {
 # Runs ./configure for modules belonging to qtbase.
 qt5_base_configure() {
 	# setup toolchain variables used by configure
-	tc-export CC CXX RANLIB STRIP
+	tc-export AR CC CXX OBJDUMP RANLIB STRIP
 	export LD="$(tc-getCXX)"
 
 	# configure arguments

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

[Davide Pesavento]

commit:     6a666f95d25eb75c651033f50c27dbc6da343b53
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 16:17:32 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 16:17:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=6a666f95

[qt4-build-multilib.eclass] Remove sed that does not apply anymore.

This expression doesn't match anything since at least Qt 4.7.0, so
it is effectively dead code. Those platforms that still need such
patching have been broken for years, and apparently nobody cares.

 eclass/qt4-build-multilib.eclass | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c7e21cd..9a758e4 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -258,14 +258,6 @@ qt4-build-multilib_src_prepare() {
 		fi
 	fi
 
-	# This is needed for all systems with a separate -liconv, except
-	# Darwin, for which the sources already cater for -liconv
-	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \
-			config.tests/unix/iconv/iconv.pro \
-			|| die "sed iconv.pro failed"
-	fi
-
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
 			mkspecs/$(qt4_get_mkspec)/qmake.conf || die

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

[Davide Pesavento]

commit:     a1d4bf6c0691a40ce206318b2349e3f375a22b3f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 15:53:40 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 15:53:40 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1d4bf6c

[qt4-build-multilib.eclass] Merge two seds into one and simplify it.

 eclass/qt4-build-multilib.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 33c3ffe..c7e21cd 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -215,8 +215,12 @@ qt4-build-multilib_src_prepare() {
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"
 
-	# Bug 172219
-	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+	# Delete references to the obsolete /usr/X11R6 directory
+	# On prefix, this also prevents looking at non-prefix stuff
+	sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \
+		mkspecs/common/linux.conf \
+		mkspecs/$(qt4_get_mkspec)/qmake.conf \
+		|| die "sed QMAKE_(LIB|INC)DIR failed"
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
@@ -254,7 +258,7 @@ qt4-build-multilib_src_prepare() {
 		fi
 	fi
 
-	# this is needed for all systems with a separate -liconv, except
+	# This is needed for all systems with a separate -liconv, except
 	# Darwin, for which the sources already cater for -liconv
 	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
 		sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \
@@ -267,10 +271,6 @@ qt4-build-multilib_src_prepare() {
 			mkspecs/$(qt4_get_mkspec)/qmake.conf || die
 	fi
 
-	# do not flirt with non-Prefix stuff, we're quite possessive
-	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
-		mkspecs/$(qt4_get_mkspec)/qmake.conf || die
-
 	# apply patches
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 	epatch_user

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

[Davide Pesavento]

commit:     149d4288ba43bbd2d279b6b1ea9f65d801360b0c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 15:19:18 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 15:19:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=149d4288

[qt4-build-multilib.eclass] Conditionalize sed.

According to the comment preceding it, this sed is needed only on Solaris.
Make it conditional on CHOST so that it isn't applied on other platforms.

 eclass/qt4-build-multilib.eclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index acf6b11..33c3ffe 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -257,14 +257,15 @@ qt4-build-multilib_src_prepare() {
 	# this is needed for all systems with a separate -liconv, except
 	# Darwin, for which the sources already cater for -liconv
 	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
-			-i config.tests/unix/iconv/iconv.pro \
+		sed -i -e 's|mac:\(LIBS += -liconv\)|\1|g' \
+			config.tests/unix/iconv/iconv.pro \
 			|| die "sed iconv.pro failed"
 	fi
 
-	# we need some patches for Solaris
-	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
-		mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+	if [[ ${CHOST} == *-solaris* ]]; then
+		sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
+			mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+	fi
 
 	# do not flirt with non-Prefix stuff, we're quite possessive
 	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \

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

[Davide Pesavento]

commit:     dbd1a5e07c634d3425c44a2191db0bacbbacf2db
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 14:51:09 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 14:51:09 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=dbd1a5e0

[qt4-build-multilib.eclass] Remove unneeded sed.

We already force the solaris-g++ mkspec on Solaris via the -platform
configure switch, therefore this sed is useless.

 eclass/qt4-build-multilib.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index f745627..acf6b11 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -265,8 +265,7 @@ qt4-build-multilib_src_prepare() {
 	# we need some patches for Solaris
 	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
 		mkspecs/$(qt4_get_mkspec)/qmake.conf || die
-	# use GCC over SunStudio
-	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
+
 	# do not flirt with non-Prefix stuff, we're quite possessive
 	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
 		mkspecs/$(qt4_get_mkspec)/qmake.conf || die

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

[Davide Pesavento]

commit:     41dfbf3cfeac30f8cb4ab660e41e454f40a536ce
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 19:29:42 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 19:29:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=41dfbf3c

[qt4-build-multilib.eclass] Switch EGIT_REPO_URI to code.qt.io and add github mirror.

 eclass/qt4-build-multilib.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index b171ba5..e5563e5 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -27,8 +27,9 @@ case ${PV} in
 	4.?.9999)
 		QT4_BUILD_TYPE="live"
 		EGIT_REPO_URI=(
-			"git://gitorious.org/qt/qt.git"
-			"https://git.gitorious.org/qt/qt.git"
+			"git://code.qt.io/qt/qt.git"
+			"https://code.qt.io/git/qt/qt.git"
+			"https://github.com/qtproject/qt.git"
 		)
 		EGIT_BRANCH=${PV%.9999}
 		inherit git-r3

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

[Davide Pesavento]

commit:     7930e357c955fb17c3deccd43ecfc23033f6bb36
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 19:26:13 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 19:26:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=7930e357

[qt5-build.eclass] Switch EGIT_REPO_URI to code.qt.io and add github mirror.

 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 89c8daa..82e2030 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -60,8 +60,9 @@ case ${PV} in
 esac
 
 EGIT_REPO_URI=(
-	"git://gitorious.org/qt/${QT5_MODULE}.git"
-	"https://git.gitorious.org/qt/${QT5_MODULE}.git"
+	"git://code.qt.io/qt/${QT5_MODULE}.git"
+	"https://code.qt.io/git/qt/${QT5_MODULE}.git"
+	"https://github.com/qtproject/${QT5_MODULE}.git"
 )
 [[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
 

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

[Davide Pesavento]

commit:     617835996185eeefad4c31ca50fc2be8dbe8b3c2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 02:16:30 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Mar 23 02:16:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=61783599

[qt4-build-multilib.eclass] Sync.

 eclass/qt4-build-multilib.eclass | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index a9764e9..b171ba5 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -167,17 +167,25 @@ qt4-build-multilib_src_prepare() {
 		fi
 	fi
 
+	if [[ ${PN} == qtcore ]]; then
+		# Bug 373061
+		# qmake bus errors with -O2 or -O3 but -O1 works
+		if [[ ${CHOST} == *86*-apple-darwin* ]]; then
+			replace-flags -O[23] -O1
+		fi
+
+		# Bug 503500
+		# undefined reference with -Os and --as-needed
+		if use x86 || use_if_iuse abi_x86_32; then
+			replace-flags -Os -O2
+		fi
+	fi
+
 	# Bug 261632
 	if use ppc64; then
 		append-flags -mminimal-toc
 	fi
 
-	# Bug 373061
-	# qmake bus errors with -O2 or -O3 but -O1 works
-	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-		replace-flags -O[23] -O1
-	fi
-
 	# Bug 417105
 	# graphite on gcc 4.7 causes miscompilations
 	if [[ $(gcc-version) == "4.7" ]]; then

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

[Davide Pesavento]

commit:     bd650e6e59c4d2dcc92de075abc97b3c2f623a17
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 01:26:40 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 01:27:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=bd650e6e

[qt4-build-multilib.eclass] Fix indentation.

 eclass/qt4-build-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 9580e63..a9764e9 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -291,7 +291,7 @@ qt4_multilib_src_configure() {
 		x86-macos)		  arch=x86 ;;
 		x86*)			  arch=i386 ;;
 		alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
-		arm64|hppa|sh)	  arch=generic ;;
+		arm64|hppa|sh)		  arch=generic ;;
 		*) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;;
 	esac
 

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

[Michael Palimaka]

commit:     ae895d38213bab3dc73826104811fc0b09efb551
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 14:10:47 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 14:10:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ae895d38

[eclass] Sync with main tree.

 eclass/qt4-build-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 084f5b0..9580e63 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -290,8 +290,8 @@ qt4_multilib_src_configure() {
 		sparc*)			  arch=sparc ;;
 		x86-macos)		  arch=x86 ;;
 		x86*)			  arch=i386 ;;
-		alpha|arm|arm64|ia64|mips|s390) arch=$(tc-arch) ;;
-		hppa|sh)		  arch=generic ;;
+		alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
+		arm64|hppa|sh)	  arch=generic ;;
 		*) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;;
 	esac
 

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

[Michael Palimaka]

commit:     3b74681e65bd81e66b61f7783eec72bc915e8a23
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 14:10:39 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 14:10:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=3b74681e

[eclass] Sync with main tree.

 eclass/qt4-build-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index f890469..084f5b0 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -290,7 +290,7 @@ qt4_multilib_src_configure() {
 		sparc*)			  arch=sparc ;;
 		x86-macos)		  arch=x86 ;;
 		x86*)			  arch=i386 ;;
-		alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
+		alpha|arm|arm64|ia64|mips|s390) arch=$(tc-arch) ;;
 		hppa|sh)		  arch=generic ;;
 		*) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;;
 	esac

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

[Davide Pesavento]

commit:     6e59c6155928568620efb0466408ee75645d70d6
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 26 02:13:53 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 02:13:53 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6e59c615

[qt5-build.eclass] The configure option '-no-libproxy' is new since 5.5

---
 eclass/qt5-build.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7a6e693..89c8daa 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -532,7 +532,8 @@ qt5_base_configure() {
 		-no-journald
 		-no-libpng -no-libjpeg
 		-no-freetype -no-harfbuzz
-		-no-openssl -no-libproxy
+		-no-openssl
+		$([[ ${QT5_MINOR_VERSION} -ge 5 ]] && echo -no-libproxy)
 		-no-xinput2 -no-xcb-xlib
 
 		# always enable glib event loop support

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

[Davide Pesavento]

commit:     fc8b43b1950fe8d3db8a8349c97024b764cfdb19
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 14:23:22 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 14:23:22 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fc8b43b1

[qmake-utils.eclass] Minor improvements to qt{4,5}_get_bindir().

---
 eclass/qmake-utils.eclass | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index cc11970..725a5a5 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -16,6 +16,25 @@ _QMAKE_UTILS_ECLASS=1
 
 inherit eutils multilib toolchain-funcs
 
+# @FUNCTION: qt4_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 binaries are installed.
+qt4_get_bindir() {
+	local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
+	if [[ -d ${qtbindir} ]]; then
+		echo ${qtbindir}
+	else
+		echo ${EPREFIX}/usr/bin
+	fi
+}
+
+# @FUNCTION: qt5_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 binaries are installed.
+qt5_get_bindir() {
+	echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
+}
+
 # @FUNCTION: qmake-utils_find_pro_file
 # @RETURN: zero or one qmake .pro file names
 # @INTERNAL
@@ -51,25 +70,6 @@ qmake-utils_find_pro_file() {
 	esac
 }
 
-# @FUNCTION qt4_get_bindir
-# @DESCRIPTION:
-# Get the correct location of Qt4's installed binaries.
-qt4_get_bindir() {
-	local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
-	if [[ -x ${qtbindir} ]]; then
-		echo ${qtbindir}
-	else
-		echo ${EPREFIX}/usr/bin
-	fi
-}
-
-# @FUNCTION qt5_get_bindir
-# @DESCRIPTION:
-# Get the correct location of Qt5's installed binaries.
-qt5_get_bindir() {
-	echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
-}
-
 # @VARIABLE: EQMAKE4_EXCLUDE
 # @DEFAULT_UNSET
 # @DESCRIPTION:

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

[Ben de Groot]

commit:     a8a171061e8347da2a1bfe3dac8916f6d52e927e
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 11 15:11:35 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 15:11:35 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a8a17106

qmake-utils.eclass: add get_bindir helper functions

---
 eclass/qmake-utils.eclass | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 623a629..cc11970 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -51,6 +51,25 @@ qmake-utils_find_pro_file() {
 	esac
 }
 
+# @FUNCTION qt4_get_bindir
+# @DESCRIPTION:
+# Get the correct location of Qt4's installed binaries.
+qt4_get_bindir() {
+	local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
+	if [[ -x ${qtbindir} ]]; then
+		echo ${qtbindir}
+	else
+		echo ${EPREFIX}/usr/bin
+	fi
+}
+
+# @FUNCTION qt5_get_bindir
+# @DESCRIPTION:
+# Get the correct location of Qt5's installed binaries.
+qt5_get_bindir() {
+	echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
+}
+
 # @VARIABLE: EQMAKE4_EXCLUDE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -158,11 +177,7 @@ eqmake4() {
 
 	[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop
 
-	# determine qmake binary location
-	local qmake_path=${EPREFIX}/usr/$(get_libdir)/qt4/bin/qmake
-	[[ ! -x ${qmake_path} ]] && qmake_path=${EPREFIX}/usr/bin/qmake
-
-	"${qmake_path}" \
+	"$(qt4_get_bindir)"/qmake \
 		-makefile \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
@@ -213,7 +228,7 @@ eqmake5() {
 
 	ebegin "Running qmake"
 
-	"${EPREFIX}"/usr/$(get_libdir)/qt5/bin/qmake \
+	"$(qt5_get_bindir)"/qmake \
 		-makefile \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \

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

[Davide Pesavento]

commit:     127d83d7a11916ea75d9b42251a4d46fa1b4e1d3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 01:58:53 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 01:58:53 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=127d83d7

[qt5-build.eclass] Update SRC_URIs.

---
 eclass/qt5-build.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2277e17..f4bb2b2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -47,14 +47,14 @@ case ${PV} in
 		# development releases
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt-project.org/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
+		SRC_URI="http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
 		# official stable releases
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
-		SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac
@@ -575,9 +575,9 @@ qt5_base_configure() {
 		# and cause problems on hardened, so turn them off
 		-no-pch
 
-		# reduced relocations cause major breakage on at least arm and ppc, so we
-		# don't specify anything and let configure figure out if they are supported,
-		# see also https://bugreports.qt-project.org/browse/QTBUG-36129
+		# reduced relocations cause major breakage on at least arm and ppc, so
+		# don't specify anything and let the configure figure out if they are
+		# supported; see also https://bugreports.qt.io/browse/QTBUG-36129
 		#-reduce-relocations
 
 		# let configure automatically detect if GNU gold is available

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

[Davide Pesavento]

commit:     8dba75abb1e95c531b0a76b44cc614728ced221b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 01:52:31 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 01:52:31 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8dba75ab

[qt4-build-multilib.eclass] Sync.

---
 eclass/qt4-build-multilib.eclass | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index ab02459..f890469 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -36,7 +36,7 @@ case ${PV} in
 	*)
 		QT4_BUILD_TYPE="release"
 		MY_P=qt-everywhere-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
+		SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac
@@ -272,10 +272,14 @@ qt4_multilib_src_configure() {
 
 	qt4_symlink_tools_to_build_dir
 
-	# toolchain setup
-	tc-export CC CXX OBJCOPY STRIP
-	export AR="$(tc-getAR) cqs"
-	export LD="$(tc-getCXX)"
+	# toolchain setup ('local -x' because of bug 532510)
+	local -x \
+		AR="$(tc-getAR) cqs" \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		LD=$(tc-getCXX) \
+		OBJCOPY=$(tc-getOBJCOPY) \
+		STRIP=$(tc-getSTRIP)
 
 	# convert tc-arch to the values supported by Qt
 	local arch=

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

[Davide Pesavento]

commit:     d84e3803b6ae0d91ef80de2d4993e683cdfd2bb1
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 12 17:44:35 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Dec 12 17:44:35 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d84e3803

[qt5-build.eclass] Drop 5.3 support.

---
 eclass/qt5-build.eclass | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5ac1a6a..2277e17 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -23,11 +23,7 @@ QT5_MINOR_VERSION=${PV#*.}
 QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
 
 HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
-if [[ ${QT5_MINOR_VERSION} -ge 4 ]]; then
-	LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-else
-	LICENSE="|| ( LGPL-2.1 GPL-3 )"
-fi
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
 
 # @ECLASS-VARIABLE: QT5_MODULE
@@ -72,7 +68,7 @@ EGIT_REPO_URI=(
 IUSE="debug test"
 
 [[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
-[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT+=" test" # bug 457182
+[[ ${QT5_BUILD_TYPE} == release ]] && RESTRICT+=" test" # bug 457182
 
 DEPEND="
 	dev-lang/perl

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

[Davide Pesavento]

commit:     ffcdad51d0e04a981eb342994d4359e999e27128
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 20 02:51:02 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Nov 20 02:51:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ffcdad51

[qt5-build.eclass] Add RDEPEND on dev-qt/qtchooser.

---
 eclass/qt5-build.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index df0645b..5ac1a6a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -85,9 +85,13 @@ if [[ ${PN} != qttest ]]; then
 		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
 	fi
 fi
+RDEPEND="
+	dev-qt/qtchooser
+"
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 
+
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     e3125dce828ba9e3e740b484395f927947803079
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 17 02:16:53 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 17 02:16:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e3125dce

[qmake-utils.eclass] Stop setting QTDIR.

It's only relevant when building qt itself,
and in any case qmake doesn't use it.

---
 eclass/qmake-utils.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index bfba8a5..966dbbe 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -164,7 +164,6 @@ eqmake4() {
 
 	"${qmake_path}" \
 		-makefile \
-		QTDIR="${EPREFIX}"/usr/$(get_libdir) \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_CXX="$(tc-getCXX)" \

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

[Davide Pesavento]

commit:     3746180bb11bf44fc6d0d9b84f4c4d1fc7d578bc
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 17 01:33:21 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 17 01:33:21 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3746180b

[qt4-build{,-multilib}.eclass] Sync.

---
 eclass/qt4-build-multilib.eclass |  1 +
 eclass/qt4-build.eclass          | 64 +++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index f53fed2..ab02459 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -52,6 +52,7 @@ DEPEND="
 "
 RDEPEND="
 	dev-qt/qtchooser
+	abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 "
 
 

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 107d186..07b9aac 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -14,27 +14,24 @@ case ${EAPI} in
 	*)	die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-if [[ ${PV} == *9999* ]]; then
-	QT4_BUILD_TYPE="live"
-	inherit git-r3
-else
-	QT4_BUILD_TYPE="release"
-fi
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="4"
 
-case ${QT4_BUILD_TYPE} in
-	live)
+case ${PV} in
+	4.?.9999)
+		QT4_BUILD_TYPE="live"
 		EGIT_REPO_URI=(
 			"git://gitorious.org/qt/qt.git"
 			"https://git.gitorious.org/qt/qt.git"
 		)
 		EGIT_BRANCH=${PV%.9999}
+		inherit git-r3
 		;;
-	release)
+	*)
+		QT4_BUILD_TYPE="release"
 		MY_P=qt-everywhere-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		S=${WORKDIR}/${MY_P}
@@ -42,10 +39,7 @@ case ${QT4_BUILD_TYPE} in
 esac
 
 IUSE="aqua debug pch"
-if ! version_is_at_least 4.8.5; then
-	[[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
-fi
-[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
+[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
 
 DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
@@ -78,17 +72,32 @@ qt4-build_pkg_setup() {
 	fi
 }
 
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing all the patches to be applied. This variable
+# is expected to be defined in the global scope of ebuilds. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+#
+# Example:
+# @CODE
+#	PATCHES=(
+#		"${FILESDIR}/mypatch.patch"
+#		"${FILESDIR}/patches_folder/"
+#	)
+# @CODE
+
 # @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Space-separated list including the directories that will be extracted from
-# Qt tarball.
+# Space-separated list of directories that will be extracted
+# from Qt tarball.
 
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories in which the
-# code should be compiled. This is a space-separated list.
+# Space-separated list of directories that will be configured,
+# compiled, and installed. All paths must be relative to ${S}.
 
 # @FUNCTION: qt4-build_src_unpack
 # @DESCRIPTION:
@@ -96,13 +105,13 @@ qt4-build_pkg_setup() {
 qt4-build_src_unpack() {
 	setqtenv
 
-	if ! version_is_at_least 4.4 $(gcc-version); then
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
 		ewarn
 		ewarn "Using a GCC version lower than 4.4 is not supported."
 		ewarn
 	fi
 
-	if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
+	if [[ ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			ewarn
@@ -135,19 +144,6 @@ qt4-build_src_unpack() {
 	esac
 }
 
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# PATCHES array variable containing all various patches to be applied.
-# This variable is expected to be defined in global scope of ebuild.
-# Make sure to specify the full path. This variable is utilised in
-# src_prepare() phase.
-#
-# @CODE
-#   PATCHES=( "${FILESDIR}/mypatch.patch"
-#             "${FILESDIR}/patches_folder/" )
-# @CODE
-
 # @FUNCTION: qt4-build_src_prepare
 # @DESCRIPTION:
 # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix

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

[Davide Pesavento]

commit:     0c7c3aec2835675afd7b1fbcdea4fde9edd25bbb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 14 02:25:32 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Nov 14 02:25:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0c7c3aec

[qt5-build.eclass] Install global docs.

Thanks to Eugene Shalygin and Paweł Stankowski in bug 457028.

---
 eclass/qt5-build.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 363a5cc..df0645b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -261,12 +261,14 @@ qt5-build_src_install() {
 	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
-		set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
+		set -- emake INSTALL_ROOT="${D}" install_{global_docs,mkspecs,qmake,syncqt}
 		einfo "Running $*"
 		"$@"
 
 		popd >/dev/null || die
 
+		docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
+
 		# install an empty Gentoo/gentoo-qconfig.h in ${D}
 		# so that it's placed under package manager control
 		> "${T}"/gentoo-qconfig.h

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

[Davide Pesavento]

commit:     76e7878d8edcac87954db89f1bbb24bf8d7fa09e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 02:53:32 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 02:53:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76e7878d

[qt5-build.eclass] Tweak qconfig.h sed expression to avoid problems.

See commit f1c2941f8b40e41e3413f4465c2edec1bb1a78a8

---
 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index bb8fc4d..363a5cc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -276,7 +276,7 @@ qt5-build_src_install() {
 		)
 
 		# include gentoo-qconfig.h at the beginning of QtCore/qconfig.h
-		sed -i -e '1a#include <Gentoo/gentoo-qconfig.h>\n' \
+		sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 

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

[Davide Pesavento]

commit:     76ea4b39084f43ebf1e079aa1df02d3a75f62b4e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  1 23:46:07 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov  1 23:46:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76ea4b39

[qt4-r2.eclass] Sync with portage.

---
 eclass/qt4-r2.eclass | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 80c5f5e..c0feabe 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -15,7 +15,7 @@ case ${EAPI} in
 	*)	 die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit base qmake-utils
+inherit base eutils qmake-utils
 
 export XDG_CONFIG_HOME="${T}"
 
@@ -69,10 +69,10 @@ unset x
 #
 # Example:
 # @CODE
-#	PATCHES=(
-#		"${FILESDIR}/mypatch.patch"
-#		"${FILESDIR}/mypatch2.patch"
-#	)
+# PATCHES=(
+# 	"${FILESDIR}/mypatch.patch"
+# 	"${FILESDIR}/mypatch2.patch"
+# )
 # @CODE
 
 # @FUNCTION: qt4-r2_src_unpack
@@ -142,14 +142,7 @@ qt4-r2_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
 	base_src_install INSTALL_ROOT="${D}" "$@"
-
-	# backward compatibility for non-array variables
-	if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dodoc ${DOCS} || die "dodoc failed"
-	fi
-	if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
-		dohtml -r ${HTML_DOCS} || die "dohtml failed"
-	fi
+	einstalldocs
 
 	# install translations
 	# need to have specified LANGS or LANGSLONG for this to work

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

[Davide Pesavento]

commit:     0243e6ffbce522097b10c5b9b2fd957243348fe9
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  1 23:34:33 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov  1 23:34:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0243e6ff

[qmake-utils.eclass] Sync with portage.

---
 eclass/qmake-utils.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 61fb280..bfba8a5 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -218,9 +218,11 @@ eqmake5() {
 		-makefile \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
+		QMAKE_LINK_C="$(tc-getCC)" \
+		QMAKE_LINK_C_SHLIB="$(tc-getCC)" \
 		QMAKE_CXX="$(tc-getCXX)" \
 		QMAKE_LINK="$(tc-getCXX)" \
-		QMAKE_LINK_C="$(tc-getCC)" \
+		QMAKE_LINK_SHLIB="$(tc-getCXX)" \
 		QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \
 		QMAKE_RANLIB= \
 		QMAKE_STRIP= \

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

[Davide Pesavento]

commit:     503fc0ecf6e835bff9f8f9a9a524e94b5d517e00
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 20:06:16 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 01:20:36 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=503fc0ec

[qt4-build-multilib.eclass] Install configs for qtchooser.

---
 eclass/qt4-build-multilib.eclass | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 9d25622..d677ae5 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -411,6 +411,25 @@ qt4_multilib_src_install() {
 	if [[ ${PN} == qtcore ]]; then
 		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}"
 		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
+
+		# install qtchooser configuration file
+		cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_
+			${QT4_BINDIR}
+			${QT4_LIBDIR}
+		_EOF_
+
+		(
+			insinto /etc/xdg/qtchooser
+			doins "${T}/qt4-${CHOST}.conf"
+		)
+
+		if multilib_is_native_abi; then
+			# convenience symlinks
+			dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/4.conf
+			dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/qt4.conf
+			# TODO bug 522646: write an eselect module to manage default.conf
+			dosym qt4.conf /etc/xdg/qtchooser/default.conf
+		fi
 	fi
 
 	install_qconfigs

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

[Davide Pesavento]

commit:     f469926ea6b250036778faffdbddbf569b51221e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 20:47:26 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 01:20:47 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f469926e

[qmake-utils.eclass] eqmake4: always use Qt4's qmake.

Use direct path to Qt4 binary location, fallback to /usr/bin.

---
 eclass/qmake-utils.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index b91e3e0..61fb280 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -158,10 +158,13 @@ eqmake4() {
 
 	[[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop
 
-	"${EPREFIX}"/usr/bin/qmake \
+	# determine qmake binary location
+	local qmake_path=${EPREFIX}/usr/$(get_libdir)/qt4/bin/qmake
+	[[ ! -x ${qmake_path} ]] && qmake_path=${EPREFIX}/usr/bin/qmake
+
+	"${qmake_path}" \
 		-makefile \
 		QTDIR="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE="${EPREFIX}"/usr/bin/qmake \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_CXX="$(tc-getCXX)" \

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

[Davide Pesavento]

commit:     0e35f3672b4db75ab27e2c99051637898c1962d3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 20:12:08 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 01:20:43 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0e35f367

[qt5-build.eclass] Install configs for qtchooser.

---
 eclass/qt5-build.eclass | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4da3887..bb8fc4d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -279,6 +279,21 @@ qt5-build_src_install() {
 		sed -i -e '1a#include <Gentoo/gentoo-qconfig.h>\n' \
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
+
+		# install qtchooser configuration file
+		cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_
+			${QT5_BINDIR}
+			${QT5_LIBDIR}
+		_EOF_
+
+		(
+			insinto /etc/xdg/qtchooser
+			doins "${T}/qt5-${CHOST}.conf"
+		)
+
+		# convenience symlinks
+		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
+		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
 	fi
 
 	qt5_install_module_qconfigs

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

[Davide Pesavento]

commit:     a9c4dc873d09da96d3d54f72aa8f1901861208eb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 23:49:30 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 23:49:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a9c4dc87

[qt4-build-multilib.eclass] Make qt4_symlink_tools_to_build_dir more similar to the qt5 version.

---
 eclass/qt4-build-multilib.eclass | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 338e050..9d25622 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -269,9 +269,7 @@ qt4-build-multilib_src_prepare() {
 qt4_multilib_src_configure() {
 	qt4_prepare_env
 
-	if [[ ${PN} != qtcore ]]; then
-		qt4_symlink_tools_to_build_dir
-	fi
+	qt4_symlink_tools_to_build_dir
 
 	# toolchain setup
 	tc-export CC CXX OBJCOPY STRIP
@@ -519,16 +517,23 @@ qt4_foreach_target_subdir() {
 # @FUNCTION: qt4_symlink_tools_to_build_dir
 # @INTERNAL
 # @DESCRIPTION:
-# Symlinks qtcore tools to BUILD_DIR, so they can be used during compilation.
+# Symlinks qtcore tools to BUILD_DIR,
+# so that they can be used when building other modules.
 qt4_symlink_tools_to_build_dir() {
+	local tool= tools=()
+	if [[ ${PN} != qtcore ]]; then
+		tools+=(qmake moc rcc uic)
+	fi
+
 	mkdir -p "${BUILD_DIR}"/bin || die
+	pushd "${BUILD_DIR}"/bin >/dev/null || die
 
-	local bin
-	for bin in "${QT4_BINDIR}"/{qmake,moc,rcc,uic}; do
-		if [[ -e ${bin} ]]; then
-			ln -s "${bin}" "${BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
-		fi
+	for tool in "${tools[@]}"; do
+		[[ -e ${QT4_BINDIR}/${tool} ]] || continue
+		ln -s "${QT4_BINDIR}/${tool}" . || die "failed to symlink ${tool}"
 	done
+
+	popd >/dev/null || die
 }
 
 # @FUNCTION: qt4_qmake

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

[Davide Pesavento]

commit:     a2e19063055abeb65097dae9e1e6b4ee881f6367
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 12:43:07 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 12:43:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a2e19063

[qt4-build-multilib.eclass] Create qconfigs in separate directories

Create qconfig files in ${BUILD_DIR} rather than ${T} since the former
location is separate for different ABIs. This solves the issue of
installing the concatenated qconfig for two consecutive ABIs without
introducing race conditions.

---
 eclass/qt4-build-multilib.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 876eb94..338e050 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -554,18 +554,18 @@ install_qconfigs() {
 	local x
 	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
 		for x in QCONFIG_ADD QCONFIG_REMOVE; do
-			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
+			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${BUILD_DIR}"/${PN}-qconfig.pri
 		done
 		insinto ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${T}"/${PN}-qconfig.pri
+		doins "${BUILD_DIR}"/${PN}-qconfig.pri
 	fi
 
 	if [[ -n ${QCONFIG_DEFINE} ]]; then
 		for x in ${QCONFIG_DEFINE}; do
-			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
+			echo "#define ${x}" >> "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
 		done
 		insinto ${QT4_HEADERDIR#${EPREFIX}}/Gentoo
-		doins "${T}"/gentoo-${PN}-qconfig.h
+		doins "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
 	fi
 }
 

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

[Davide Pesavento]

commit:     355c4da66275b190d76d97aff1c008667f5c1e0b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  9 16:59:56 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Oct  9 16:59:56 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=355c4da6

[qt5-build.eclass] Fix assignments to RESTRICT.

---
 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9382f76..4da3887 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -71,8 +71,8 @@ EGIT_REPO_URI=(
 
 IUSE="debug test"
 
-[[ ${PN} == qtwebkit ]] && RESTRICT="mirror" # bug 524584
-[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test" # bug 457182
+[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
+[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT+=" test" # bug 457182
 
 DEPEND="
 	dev-lang/perl

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

[Davide Pesavento]

commit:     24b99a5f9f4a10b7380154d89bf4253413b85e9f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  7 16:26:07 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Oct  7 16:26:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=24b99a5f

[qt5-build.eclass] Restrict mirror for qtwebkit wrt bug #524584.

---
 eclass/qt5-build.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c160911..9382f76 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -71,7 +71,8 @@ EGIT_REPO_URI=(
 
 IUSE="debug test"
 
-[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test"
+[[ ${PN} == qtwebkit ]] && RESTRICT="mirror" # bug 524584
+[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test" # bug 457182
 
 DEPEND="
 	dev-lang/perl

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

[Davide Pesavento]

commit:     9e6cc0d84df50c5998eb05b053e35fc12fdf318b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 22 00:08:46 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 00:08:46 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9e6cc0d8

[eclass] Fix SRC_URI (bug 523408) and update HOMEPAGE.

---
 eclass/qt4-build-multilib.eclass | 4 ++--
 eclass/qt4-build.eclass          | 4 ++--
 eclass/qt5-build.eclass          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 7693930..876eb94 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -19,7 +19,7 @@ esac
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
 
-HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
+HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="4"
 
@@ -36,7 +36,7 @@ case ${PV} in
 	*)
 		QT4_BUILD_TYPE="release"
 		MY_P=qt-everywhere-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
+		SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index a2a0126..107d186 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -23,7 +23,7 @@ else
 	QT4_BUILD_TYPE="release"
 fi
 
-HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
+HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
 case ${QT4_BUILD_TYPE} in
@@ -36,7 +36,7 @@ case ${QT4_BUILD_TYPE} in
 		;;
 	release)
 		MY_P=qt-everywhere-opensource-src-${PV/_/-}
-		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
+		SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3607fc7..c160911 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -22,7 +22,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs virtualx
 QT5_MINOR_VERSION=${PV#*.}
 QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
 
-HOMEPAGE="https://qt-project.org/"
+HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
 if [[ ${QT5_MINOR_VERSION} -ge 4 ]]; then
 	LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 else
@@ -58,7 +58,7 @@ case ${PV} in
 		# official stable releases
 		QT5_BUILD_TYPE="release"
 		MY_P=${QT5_MODULE}-opensource-src-${PV}
-		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

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

[Davide Pesavento]

commit:     492099778173832aa98030c2fc423995a0912893
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 14:00:20 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 14:00:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=49209977

[qt5-build.eclass] Exclude installed_cmake tests as well.

Otherwise qmake generates a make target with unsatisfiable
dependencies because the cmake subdir is excluded.

make: *** No rule to make target 'cmake-make_first',
needed by 'sub-installed_cmake-make_first'.  Stop.

---
 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 31359c5..3607fc7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -225,8 +225,8 @@ qt5-build_src_compile() {
 qt5-build_src_test() {
 	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
 
-	# '-after SUBDIRS-=cmake' disables broken tests - bug #474004
-	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
+	# '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
+	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake
 	qt5_foreach_target_subdir emake
 
 	# create a custom testrunner script that correctly sets

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

[Davide Pesavento]

commit:     473b873b058808e4bfa2a77c9159a66ab3c09685
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 00:05:09 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 00:05:09 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=473b873b

[qt5-build.eclass] Restrict tests on 5.3.x (except live).

---
 eclass/qt5-build.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 596e4bd..31359c5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -71,6 +71,8 @@ EGIT_REPO_URI=(
 
 IUSE="debug test"
 
+[[ ${QT5_BUILD_TYPE} == release && ${QT5_MINOR_VERSION} -le 3 ]] && RESTRICT="test"
+
 DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig

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

[Davide Pesavento]

commit:     279a71a89cea2e9774cf6d465f05e5c82709bc2e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 22:57:20 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 22:57:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=279a71a8

[qt5-build.eclass] Make qt5_symlink_tools_to_build_dir() slightly smarter.

With the new behavior, we no longer symlink the tools that are about to
be built. For example, uic is not symlinked when emerging qtwidgets.

---
 eclass/qt5-build.eclass | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 226c17a..596e4bd 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -423,16 +423,23 @@ qt5_foreach_target_subdir() {
 # Symlinks qmake and a few other tools to QT5_BUILD_DIR,
 # so that they can be used when building other modules.
 qt5_symlink_tools_to_build_dir() {
-	mkdir -p "${QT5_BUILD_DIR}"/bin || die
+	local tool= tools=()
+	if [[ ${PN} != qtcore ]]; then
+		tools+=(qmake moc rcc qlalr)
+		[[ ${PN} != qdoc ]] && tools+=(qdoc)
+		[[ ${PN} != qtdbus ]] && tools+=(qdbuscpp2xml qdbusxml2cpp)
+		[[ ${PN} != qtwidgets ]] && tools+=(uic)
+	fi
 
-	[[ ${PN} == qtcore ]] && return
+	mkdir -p "${QT5_BUILD_DIR}"/bin || die
+	pushd "${QT5_BUILD_DIR}"/bin >/dev/null || die
 
-	local bin
-	for bin in "${QT5_BINDIR}"/{qmake,moc,rcc,qlalr,uic,qdbuscpp2xml,qdbusxml2cpp,qdoc}; do
-		if [[ -e ${bin} ]]; then
-			ln -s "${bin}" "${QT5_BUILD_DIR}"/bin || die "failed to symlink ${bin}"
-		fi
+	for tool in "${tools[@]}"; do
+		[[ -e ${QT5_BINDIR}/${tool} ]] || continue
+		ln -s "${QT5_BINDIR}/${tool}" . || die "failed to symlink ${tool}"
 	done
+
+	popd >/dev/null || die
 }
 
 # @FUNCTION: qt5_base_configure

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

[Davide Pesavento]

commit:     8150517e34f5b825bc3ba8216a0682a9a44cce94
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 27 02:05:06 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Aug 27 02:05:06 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8150517e

[qt5-build.eclass] Don't symlink tools for non-qtbase packages.

Just run qmake directly from QT5_BINDIR.

---
 eclass/qt5-build.eclass | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 18218df..226c17a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -163,11 +163,13 @@ qt5-build_src_unpack() {
 
 # @FUNCTION: qt5-build_src_prepare
 # @DESCRIPTION:
-# Prepares the sources before the configure phase.
+# Prepares the environment and patches the sources if necessary.
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
+		qt5_symlink_tools_to_build_dir
+
 		# Avoid unnecessary qmake recompilations
 		sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
 			configure || die "sed failed (skip qmake bootstrap)"
@@ -191,10 +193,6 @@ qt5-build_src_prepare() {
 			|| die "sed failed (config.tests)"
 	fi
 
-	if [[ ${PN} != qtcore ]]; then
-		qt5_symlink_tools_to_build_dir
-	fi
-
 	# apply patches
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 	epatch_user
@@ -202,7 +200,8 @@ qt5-build_src_prepare() {
 
 # @FUNCTION: qt5-build_src_configure
 # @DESCRIPTION:
-# Runs qmake, possibly preceded by ./configure.
+# Runs qmake in the target directories. For packages
+# in qtbase, ./configure is also run before qmake.
 qt5-build_src_configure() {
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_base_configure
@@ -213,14 +212,14 @@ qt5-build_src_configure() {
 
 # @FUNCTION: qt5-build_src_compile
 # @DESCRIPTION:
-# Compiles the code in target directories.
+# Runs emake in the target directories.
 qt5-build_src_compile() {
 	qt5_foreach_target_subdir emake
 }
 
 # @FUNCTION: qt5-build_src_test
 # @DESCRIPTION:
-# Runs tests in target directories.
+# Runs tests in the target directories.
 qt5-build_src_test() {
 	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
 
@@ -252,7 +251,7 @@ qt5-build_src_test() {
 
 # @FUNCTION: qt5-build_src_install
 # @DESCRIPTION:
-# Performs the actual installation of target directories.
+# Runs emake install in the target directories.
 qt5-build_src_install() {
 	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
@@ -421,14 +420,17 @@ qt5_foreach_target_subdir() {
 # @FUNCTION: qt5_symlink_tools_to_build_dir
 # @INTERNAL
 # @DESCRIPTION:
-# Symlinks qtcore tools to QT5_BUILD_DIR, so they can be used when building other modules.
+# Symlinks qmake and a few other tools to QT5_BUILD_DIR,
+# so that they can be used when building other modules.
 qt5_symlink_tools_to_build_dir() {
 	mkdir -p "${QT5_BUILD_DIR}"/bin || die
 
+	[[ ${PN} == qtcore ]] && return
+
 	local bin
-	for bin in "${QT5_BINDIR}"/{qmake,moc,rcc,uic,qdoc,qdbuscpp2xml,qdbusxml2cpp}; do
+	for bin in "${QT5_BINDIR}"/{qmake,moc,rcc,qlalr,uic,qdbuscpp2xml,qdbusxml2cpp,qdoc}; do
 		if [[ -e ${bin} ]]; then
-			ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
+			ln -s "${bin}" "${QT5_BUILD_DIR}"/bin || die "failed to symlink ${bin}"
 		fi
 	done
 }
@@ -586,7 +588,6 @@ qt5_base_configure() {
 		"${myconf[@]}"
 	)
 
-	mkdir -p "${QT5_BUILD_DIR}" || die
 	pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
 	einfo "Configuring with: ${conf[@]}"
@@ -602,8 +603,14 @@ qt5_base_configure() {
 # Intended to be called by qt5_foreach_target_subdir().
 qt5_qmake() {
 	local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}
+	local qmakepath=
+	if [[ ${QT5_MODULE} == qtbase ]]; then
+		qmakepath=${QT5_BUILD_DIR}/bin
+	else
+		qmakepath=${QT5_BINDIR}
+	fi
 
-	"${QT5_BUILD_DIR}"/bin/qmake \
+	"${qmakepath}"/qmake \
 		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_LINK_C="$(tc-getCC)" \

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

[Davide Pesavento]

commit:     0f5a20be5e440c1ba6fe49b1f2fc9a457ec28a99
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 27 00:38:44 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Aug 27 00:38:44 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0f5a20be

[qt5-build.eclass] Address comments from mgorny and hasufell during review.

---
 eclass/qt5-build.eclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6602383..18218df 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -186,8 +186,8 @@ qt5-build_src_prepare() {
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect toolchain and flags in config.tests
-		find config.tests/unix -name '*.test' -type f -print0 \
-			| xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \
+		find config.tests/unix -name '*.test' -type f \
+			-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
 			|| die "sed failed (config.tests)"
 	fi
 
@@ -258,8 +258,11 @@ qt5-build_src_install() {
 
 	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
-		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}"
-		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
+
+		set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
+		einfo "Running $*"
+		"$@"
+
 		popd >/dev/null || die
 
 		# install an empty Gentoo/gentoo-qconfig.h in ${D}

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

[Davide Pesavento]

commit:     eab801ffe3289e8f3c245169e0d7d4cc98d17738
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 27 00:09:50 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Aug 27 00:09:50 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=eab801ff

[qt5-build.eclass] Update HOMEPAGE and LICENSE.

---
 eclass/qt5-build.eclass | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4c81dea..6602383 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -19,8 +19,15 @@ esac
 
 inherit eutils flag-o-matic multilib toolchain-funcs virtualx
 
-HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
+QT5_MINOR_VERSION=${PV#*.}
+QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
+
+HOMEPAGE="https://qt-project.org/"
+if [[ ${QT5_MINOR_VERSION} -ge 4 ]]; then
+	LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+else
+	LICENSE="|| ( LGPL-2.1 GPL-3 )"
+fi
 SLOT="5"
 
 # @ECLASS-VARIABLE: QT5_MODULE

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

[Davide Pesavento]

commit:     01887c6b3a0bb2740caf755a5d0db58ad07f63db
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 25 01:37:59 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug 25 01:37:59 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=01887c6b

[qt5-build.eclass] Rename internal function.

---
 eclass/qt5-build.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a4ae5af..4c81dea 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -217,6 +217,10 @@ qt5-build_src_compile() {
 qt5-build_src_test() {
 	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
 
+	# '-after SUBDIRS-=cmake' disables broken tests - bug #474004
+	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
+	qt5_foreach_target_subdir emake
+
 	# create a custom testrunner script that correctly sets
 	# {,DY}LD_LIBRARY_PATH before executing the given test
 	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
@@ -228,18 +232,14 @@ qt5-build_src_test() {
 	EOF
 	chmod +x "${testrunner}"
 
-	# '-after SUBDIRS-=cmake' disables broken tests - bug #474004
-	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
-	qt5_foreach_target_subdir emake
-
-	_test_runner() {
+	_qt5_test_runner() {
 		qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
 	}
 
 	if [[ ${VIRTUALX_REQUIRED} == test ]]; then
-		VIRTUALX_COMMAND="_test_runner" virtualmake
+		VIRTUALX_COMMAND="_qt5_test_runner" virtualmake
 	else
-		_test_runner
+		_qt5_test_runner
 	fi
 }
 

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

[Davide Pesavento]

commit:     212df0a5584a53a6c0f15a1079bae40bccb89a63
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 01:42:18 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 01:42:18 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=212df0a5

[qt5-build.eclass] Remove useless sed.

The intent of these two expressions was to give precedence to
the user's CXXFLAGS/LDFLAGS over those passed by the configure
on the command line. However the user's flags are stored in
.qmake.cache, which is read before processing command line
variables anyway, thus there's no point in changing the order.
Some other solution is needed.

---
 eclass/qt5-build.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 04800d3..9c2799c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -189,10 +189,8 @@ qt5-build_src_prepare() {
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect toolchain and flags in config.tests
-		find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-			sed -ri -e '/CXXFLAGS=/ s/"(\$CXXFLAGS) (\$PARAM)"/"\2 \1"/' \
-				-e '/LFLAGS=/ s/"(\$LFLAGS) (\$PARAM)"/"\2 \1"/' \
-				-e '/bin\/qmake/ s/-nocache //' \
+		find config.tests/unix -name '*.test' -type f -print0 \
+			| xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \
 			|| die "sed failed (config.tests)"
 	fi
 

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

[Davide Pesavento]

commit:     212df0a5584a53a6c0f15a1079bae40bccb89a63
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 01:42:18 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 01:42:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=212df0a5

[qt5-build.eclass] Remove useless sed.

The intent of these two expressions was to give precedence to
the user's CXXFLAGS/LDFLAGS over those passed by the configure
on the command line. However the user's flags are stored in
.qmake.cache, which is read before processing command line
variables anyway, thus there's no point in changing the order.
Some other solution is needed.

---
 eclass/qt5-build.eclass | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 04800d3..9c2799c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -189,10 +189,8 @@ qt5-build_src_prepare() {
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect toolchain and flags in config.tests
-		find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-			sed -ri -e '/CXXFLAGS=/ s/"(\$CXXFLAGS) (\$PARAM)"/"\2 \1"/' \
-				-e '/LFLAGS=/ s/"(\$LFLAGS) (\$PARAM)"/"\2 \1"/' \
-				-e '/bin\/qmake/ s/-nocache //' \
+		find config.tests/unix -name '*.test' -type f -print0 \
+			| xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \
 			|| die "sed failed (config.tests)"
 	fi
 

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

[Davide Pesavento]

commit:     58d910c1b685e65946742b7d6f02593c2425f1e5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 00:11:15 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 00:11:15 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=58d910c1

[qt5-build.eclass] Export toolchain variables only when needed.

The variables exported by tc-export are used only by the configure script.

---
 eclass/qt5-build.eclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5923b0e..1e053ea 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -209,15 +209,14 @@ qt5-build_src_prepare() {
 # @DESCRIPTION:
 # Runs qmake, possibly preceded by ./configure.
 qt5-build_src_configure() {
-	# toolchain setup
-	tc-export CC CXX RANLIB STRIP
-	# qmake-generated Makefiles use LD/LINK for linking
-	export LD="$(tc-getCXX)"
-
 	mkdir -p "${QT5_BUILD_DIR}" || die
 	pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
+		# toolchain setup
+		tc-export CC CXX RANLIB STRIP
+		export LD="$(tc-getCXX)"
+
 		qt5_base_configure
 	fi
 

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

[Davide Pesavento]

commit:     58d910c1b685e65946742b7d6f02593c2425f1e5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 00:11:15 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 00:11:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=58d910c1

[qt5-build.eclass] Export toolchain variables only when needed.

The variables exported by tc-export are used only by the configure script.

---
 eclass/qt5-build.eclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 5923b0e..1e053ea 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -209,15 +209,14 @@ qt5-build_src_prepare() {
 # @DESCRIPTION:
 # Runs qmake, possibly preceded by ./configure.
 qt5-build_src_configure() {
-	# toolchain setup
-	tc-export CC CXX RANLIB STRIP
-	# qmake-generated Makefiles use LD/LINK for linking
-	export LD="$(tc-getCXX)"
-
 	mkdir -p "${QT5_BUILD_DIR}" || die
 	pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
+		# toolchain setup
+		tc-export CC CXX RANLIB STRIP
+		export LD="$(tc-getCXX)"
+
 		qt5_base_configure
 	fi
 

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

[Davide Pesavento]

commit:     c32aaecbd56bab9f7bf5a93e66d321bd60148899
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 01:17:11 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 01:17:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c32aaecb

[qt5-build.eclass] Fix comment.

---
 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 10f1586..04800d3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -184,7 +184,7 @@ qt5-build_src_prepare() {
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
 			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
 
-		# Respect CXX in configure
+		# Respect CXX in {bsymbolic_functions,fvisibility,precomp}.test
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 

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

[Davide Pesavento]

commit:     c32aaecbd56bab9f7bf5a93e66d321bd60148899
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 01:17:11 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 01:17:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c32aaecb

[qt5-build.eclass] Fix comment.

---
 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 10f1586..04800d3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -184,7 +184,7 @@ qt5-build_src_prepare() {
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
 			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
 
-		# Respect CXX in configure
+		# Respect CXX in {bsymbolic_functions,fvisibility,precomp}.test
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 

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

[Davide Pesavento]

commit:     4a8ca10b657ed9a267470924b56efa235b34f679
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 00:21:20 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 00:30:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4a8ca10b

[qt5-build.eclass] Minor refactoring.

---
 eclass/qt5-build.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1e053ea..10f1586 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -209,20 +209,11 @@ qt5-build_src_prepare() {
 # @DESCRIPTION:
 # Runs qmake, possibly preceded by ./configure.
 qt5-build_src_configure() {
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	pushd "${QT5_BUILD_DIR}" >/dev/null || die
-
 	if [[ ${QT5_MODULE} == qtbase ]]; then
-		# toolchain setup
-		tc-export CC CXX RANLIB STRIP
-		export LD="$(tc-getCXX)"
-
 		qt5_base_configure
 	fi
 
 	qt5_foreach_target_subdir qt5_qmake
-
-	popd >/dev/null || die
 }
 
 # @FUNCTION: qt5-build_src_compile
@@ -446,6 +437,10 @@ qt5_symlink_tools_to_build_dir() {
 # @DESCRIPTION:
 # Runs ./configure for modules belonging to qtbase.
 qt5_base_configure() {
+	# setup toolchain variables used by configure
+	tc-export CC CXX RANLIB STRIP
+	export LD="$(tc-getCXX)"
+
 	# configure arguments
 	local conf=(
 		# installation paths
@@ -590,8 +585,13 @@ qt5_base_configure() {
 		"${myconf[@]}"
 	)
 
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	pushd "${QT5_BUILD_DIR}" >/dev/null || die
+
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
+
+	popd >/dev/null || die
 }
 
 # @FUNCTION: qt5_qmake

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

[Davide Pesavento]

commit:     4a8ca10b657ed9a267470924b56efa235b34f679
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 00:21:20 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 00:30:27 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4a8ca10b

[qt5-build.eclass] Minor refactoring.

---
 eclass/qt5-build.eclass | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1e053ea..10f1586 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -209,20 +209,11 @@ qt5-build_src_prepare() {
 # @DESCRIPTION:
 # Runs qmake, possibly preceded by ./configure.
 qt5-build_src_configure() {
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	pushd "${QT5_BUILD_DIR}" >/dev/null || die
-
 	if [[ ${QT5_MODULE} == qtbase ]]; then
-		# toolchain setup
-		tc-export CC CXX RANLIB STRIP
-		export LD="$(tc-getCXX)"
-
 		qt5_base_configure
 	fi
 
 	qt5_foreach_target_subdir qt5_qmake
-
-	popd >/dev/null || die
 }
 
 # @FUNCTION: qt5-build_src_compile
@@ -446,6 +437,10 @@ qt5_symlink_tools_to_build_dir() {
 # @DESCRIPTION:
 # Runs ./configure for modules belonging to qtbase.
 qt5_base_configure() {
+	# setup toolchain variables used by configure
+	tc-export CC CXX RANLIB STRIP
+	export LD="$(tc-getCXX)"
+
 	# configure arguments
 	local conf=(
 		# installation paths
@@ -590,8 +585,13 @@ qt5_base_configure() {
 		"${myconf[@]}"
 	)
 
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	pushd "${QT5_BUILD_DIR}" >/dev/null || die
+
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
+
+	popd >/dev/null || die
 }
 
 # @FUNCTION: qt5_qmake

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

[Davide Pesavento]

commit:     c212b9fbb0bbcf288057539afdf4b2db9f5f806e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  4 23:13:21 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug  4 23:13:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c212b9fb

[qt5-build.eclass] Introduce qt_use_compile_test().

---
 eclass/qt5-build.eclass | 49 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f64ab35..56ff905 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -292,22 +292,19 @@ qt5-build_src_install() {
 	fi
 
 	qt5_install_module_qconfigs
-
-	# remove .la files since we are building only shared libraries
 	prune_libtool_files
 }
 
 # @FUNCTION: qt5-build_pkg_postinst
 # @DESCRIPTION:
-# Regenerate configuration, plus throw a message about possible
-# breakages and proposed solutions.
+# Regenerate configuration after installation or upgrade/downgrade.
 qt5-build_pkg_postinst() {
 	qt5_regenerate_global_qconfigs
 }
 
 # @FUNCTION: qt5-build_pkg_postrm
 # @DESCRIPTION:
-# Regenerate configuration when the package is completely removed.
+# Regenerate configuration when a module is completely removed.
 qt5-build_pkg_postrm() {
 	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != qtcore ]]; then
 		qt5_regenerate_global_qconfigs
@@ -315,16 +312,40 @@ qt5-build_pkg_postrm() {
 }
 
 # @FUNCTION: qt_use
-# @USAGE: <flag> [feature] [enableval]
+# @USAGE: <flag> [feature] [enableopt]
 # @DESCRIPTION:
-# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature}" if it's disabled. If [feature] is not specified,
-# <flag> will be used for that. If [enableval] is not specified, the
-# "-${enableval}" prefix is omitted.
+# <flag> is the name of a flag in IUSE.
+#
+# Echoes "-${enableopt}-${feature}" if <flag> is enabled, or "-no-${feature}"
+# if it is disabled. If [feature] is not specified, it defaults to the value
+# of <flag>. If [enableopt] is not specified, the whole "-${enableopt}" prefix
+# is omitted.
 qt_use() {
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
 	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
 }
 
+# @FUNCTION: qt_use_compile_test
+# @USAGE: <flag> [config]
+# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+# [config] is the argument of qtCompileTest, defaults to <flag>.
+#
+# This function is useful to disable optional dependencies that are checked
+# at qmake-time using the qtCompileTest() function. If <flag> is disabled,
+# the compile test is skipped and the dependency is assumed to be unavailable,
+# i.e. the corresponding feature will be disabled. Note that all invocations
+# of this function must happen before calling qt5-build_src_configure.
+qt_use_compile_test() {
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
+	if ! use "$1"; then
+		mkdir -p "${QT5_BUILD_DIR}" || die
+		echo "CONFIG += done_config_${2:-$1}" >> "${QT5_BUILD_DIR}"/.qmake.cache || die
+	fi
+}
+
 # @FUNCTION: qt_use_disable_mod
 # @USAGE: <flag> <module> <files...>
 # @DESCRIPTION:
@@ -337,15 +358,15 @@ qt_use() {
 # This can be useful to avoid an automagic dependency when the module
 # is present on the system but the corresponding USE flag is disabled.
 qt_use_disable_mod() {
-	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least 3 arguments"
+	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments"
 
 	local flag=$1
 	local module=$2
 	shift 2
 
-	use "${flag}" && return
-
-	echo "$@" | xargs sed -i -e "s/qtHaveModule(${module})/false/g" || die
+	if ! use "${flag}"; then
+		echo "$@" | xargs sed -i -e "s/qtHaveModule(${module})/false/g" || die
+	fi
 }
 
 

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

[Davide Pesavento]

commit:     1ea428272dd5d364468a5fbb403544e877405d64
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 30 19:29:21 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 30 19:29:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1ea42827

[qt5-build.eclass] Refactor qt5_install_module_qconfigs().

---
 eclass/qt5-build.eclass | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 96c3d77..f64ab35 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -65,7 +65,7 @@ EGIT_REPO_URI=(
 IUSE="debug test"
 
 DEPEND="
-	>=dev-lang/perl-5.14
+	dev-lang/perl
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
@@ -612,7 +612,12 @@ qt5_qmake() {
 # @DESCRIPTION:
 # Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
 qt5_install_module_qconfigs() {
-	local x
+	local x qconfig_add= qconfig_remove=
+
+	> "${T}"/${PN}-qconfig.h
+	> "${T}"/${PN}-qconfig.pri
+
+	# generate qconfig_{add,remove} and ${PN}-qconfig.h
 	for x in "${QT5_GENTOO_CONFIG[@]}"; do
 		local flag=${x%%:*}
 		x=${x#${flag}:}
@@ -622,30 +627,23 @@ qt5_install_module_qconfigs() {
 		macro=$(tr 'a-z-' 'A-Z_' <<< "${macro}")
 
 		if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
-			[[ -n ${feature} ]] && QCONFIG_ADD+=("${feature}")
-			[[ -n ${macro} ]] && QCONFIG_DEFINE+=("QT_${macro}")
+			[[ -n ${feature} ]] && qconfig_add+=" ${feature}"
+			[[ -n ${macro} ]] && echo "#define QT_${macro}" >> "${T}"/${PN}-qconfig.h
 		else
-			[[ -n ${feature} ]] && QCONFIG_REMOVE+=("${feature}")
-			[[ -n ${macro} ]] && QCONFIG_DEFINE+=("QT_NO_${macro}")
+			[[ -n ${feature} ]] && qconfig_remove+=" ${feature}"
+			[[ -n ${macro} ]] && echo "#define QT_NO_${macro}" >> "${T}"/${PN}-qconfig.h
 		fi
 	done
 
-	# qconfig.h
-	> "${T}"/${PN}-qconfig.h
-	for x in "${QCONFIG_DEFINE[@]}"; do
-		echo "#define ${x}" >> "${T}"/${PN}-qconfig.h
-	done
+	# install ${PN}-qconfig.h
 	[[ -s ${T}/${PN}-qconfig.h ]] && (
 		insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
 		doins "${T}"/${PN}-qconfig.h
 	)
 
-	# qconfig.pri
-	> "${T}"/${PN}-qconfig.pri
-	[[ -n ${QCONFIG_ADD[@]} ]] && echo "QCONFIG_ADD=${QCONFIG_ADD[@]}" \
-		>> "${T}"/${PN}-qconfig.pri
-	[[ -n ${QCONFIG_REMOVE[@]} ]] && echo "QCONFIG_REMOVE=${QCONFIG_REMOVE[@]}" \
-		>> "${T}"/${PN}-qconfig.pri
+	# generate and install ${PN}-qconfig.pri
+	[[ -n ${qconfig_add} ]] && echo "QCONFIG_ADD=${qconfig_add}" >> "${T}"/${PN}-qconfig.pri
+	[[ -n ${qconfig_remove} ]] && echo "QCONFIG_REMOVE=${qconfig_remove}" >> "${T}"/${PN}-qconfig.pri
 	[[ -s ${T}/${PN}-qconfig.pri ]] && (
 		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri

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

[Davide Pesavento]

commit:     48ab7905a8f855e8ee2c7bffbfdc45f17aad21e8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 22:45:00 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 22:45:00 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=48ab7905

[qt5-build.eclass] Use /etc/xdg as sysconfdir (upstream default).

---
 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 80f4886..464e2d0 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -371,7 +371,7 @@ qt5_prepare_env() {
 	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
 	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
-	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
+	QT5_SYSCONFDIR=${EPREFIX}/etc/xdg
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		# see mkspecs/features/qt_config.prf

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

[Davide Pesavento]

commit:     7e540a0d8c78c843f98ca1750e72a5255f7f546b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 28 21:50:33 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 28 21:50:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7e540a0d

[qt5-build.eclass] Add comment about linking with GNU gold.

The option has been introduced in the dev branch (will become 5.4)

---
 eclass/qt5-build.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1855d18..ed92ab5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -526,6 +526,9 @@ qt5_base_configure() {
 		# see also https://bugreports.qt-project.org/browse/QTBUG-36129
 		#-reduce-relocations
 
+		# let configure automatically detect if GNU gold is available
+		#-use-gold-linker
+
 		# disable all platform plugins by default, override in qtgui
 		-no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms
 

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

[Davide Pesavento]

commit:     20364fbfaf7c53dfac2401cae0c8c20914dbe230
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Sat Mar  8 12:00:27 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 28 21:12:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=20364fbf

[qt5-build.eclass] Set correct flags and toolchain in qt5_qmake.

Fixes bug #490254.

---
 eclass/qt5-build.eclass | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e6c20ec..1855d18 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -184,17 +184,6 @@ qt5-build_src_prepare() {
 		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
 			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
 
-		# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
-		# or they will override user's flags (bug 427782)
-		sed -i -e '/^SYSTEM_VARIABLES=/ i \
-			QMakeVar set QMAKE_CFLAGS_RELEASE\
-			QMakeVar set QMAKE_CFLAGS_DEBUG\
-			QMakeVar set QMAKE_CXXFLAGS_RELEASE\
-			QMakeVar set QMAKE_CXXFLAGS_DEBUG\
-			QMakeVar set QMAKE_LFLAGS_RELEASE\
-			QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
-			configure || die "sed failed (QMAKE_*FLAGS_{RELEASE,DEBUG})"
-
 		# Respect CXX in configure
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
@@ -577,7 +566,28 @@ qt5_base_configure() {
 qt5_qmake() {
 	local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}
 
-	"${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" "$@" \
+	"${QT5_BUILD_DIR}"/bin/qmake \
+		QMAKE_AR="$(tc-getAR) cqs" \
+		QMAKE_CC="$(tc-getCC)" \
+		QMAKE_LINK_C="$(tc-getCC)" \
+		QMAKE_LINK_C_SHLIB="$(tc-getCC)" \
+		QMAKE_CXX="$(tc-getCXX)" \
+		QMAKE_LINK="$(tc-getCXX)" \
+		QMAKE_LINK_SHLIB="$(tc-getCXX)" \
+		QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \
+		QMAKE_RANLIB= \
+		QMAKE_STRIP="$(tc-getSTRIP)" \
+		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= \
+		"${projectdir}" \
+		"$@" \
 		|| die "qmake failed (${projectdir})"
 }
 

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

[Davide Pesavento]

commit:     c0aabf0dbb701c5bc469c9425c7ce2b242c50cef
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 28 20:25:06 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 28 20:25:06 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c0aabf0d

[qt5-build.eclass] Stop passing -process to configure (bug 518402).

It's already the default anyway.

---
 eclass/qt5-build.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 16b5d93..e6c20ec 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -469,9 +469,6 @@ qt5_base_configure() {
 		# build shared libraries
 		-shared
 
-		# generate only a top-level Makefile
-		-process
-
 		# always enable large file support
 		-largefile
 

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

[Michael Palimaka]

commit:     c4c66ad230789d5d1ec1bf0b8c735095d4b76dfa
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 19:53:48 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 19:53:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c4c66ad2

[eclass] Disable cmake-related tests wrt bug #474004.

---
 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d089b87..16b5d93 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -261,7 +261,8 @@ qt5-build_src_test() {
 	EOF
 	chmod +x "${testrunner}"
 
-	qt5_foreach_target_subdir qt5_qmake
+	# '-after SUBDIRS-=cmake' disables broken tests - bug #474004
+	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
 	qt5_foreach_target_subdir emake
 
 	_test_runner() {
@@ -579,7 +580,7 @@ qt5_base_configure() {
 qt5_qmake() {
 	local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}
 
-	"${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" \
+	"${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" "$@" \
 		|| die "qmake failed (${projectdir})"
 }
 

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

[Davide Pesavento]

commit:     fd0170b72ae239f5d51e2ec807036c7de3895877
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 13:26:41 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 13:26:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fd0170b7

[qt5-build.eclass] QCONFIG_* variables are no longer public API.

---
 eclass/qt5-build.eclass | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 28b82d9..d089b87 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -115,21 +115,6 @@ esac
 # definitions, which are then merged together with all other Qt5 packages
 # installed on the system to obtain the global qconfig.{h,pri} files.
 
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array of options that must be added to QT_CONFIG in qconfig.pri
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array of options that must be removed from QT_CONFIG in qconfig.pri
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array of macros that must be defined in QtCore/qconfig.h
-
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass man page.

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

[Davide Pesavento]

commit:     dc15981d63addb5cf8e7c942fec6590f018a32f8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 26 12:39:38 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 12:39:38 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dc15981d

[qt5-build.eclass] Return proper exit status from qt5_foreach_target_subdir.

Fix/workaround for bug 517976.

---
 eclass/qt5-build.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 00456df..28b82d9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -411,7 +411,7 @@ qt5_prepare_env() {
 qt5_foreach_target_subdir() {
 	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
 
-	local subdir
+	local ret=0 subdir=
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
 		if [[ ${EBUILD_PHASE} == test ]]; then
 			subdir=tests/auto${subdir#src}
@@ -423,9 +423,12 @@ qt5_foreach_target_subdir() {
 
 		einfo "Running $* ${subdir:+in ${subdir}}"
 		"$@"
+		((ret+=$?))
 
 		popd >/dev/null || die
 	done
+
+	return ${ret}
 }
 
 # @FUNCTION: qt5_symlink_tools_to_build_dir

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

[Davide Pesavento]

commit:     1e26c0d965e1d8d070c19d359fb43e6a70bf91ce
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 26 09:53:30 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 09:53:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1e26c0d9

[qt5-build.eclass] Extend QT5_GENTOO_CONFIG syntax.

A single '!' as first element of a triplet always evaluates as false.

---
 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 84d1ceb..00456df 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -609,7 +609,7 @@ qt5_install_module_qconfigs() {
 		local macro=${x}
 		macro=$(tr 'a-z-' 'A-Z_' <<< "${macro}")
 
-		if [[ -z ${flag} ]] || use ${flag}; then
+		if [[ -z ${flag} ]] || { [[ ${flag} != '!' ]] && use ${flag}; }; then
 			[[ -n ${feature} ]] && QCONFIG_ADD+=("${feature}")
 			[[ -n ${macro} ]] && QCONFIG_DEFINE+=("QT_${macro}")
 		else

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

[Davide Pesavento]

commit:     3b968a1e761d32b1f87cfcecda24178ee1da95ec
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 23 18:03:08 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 18:19:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3b968a1e

[qt5-build.eclass] Introduce QT5_GENTOO_CONFIG eclass variable.

Second part of the fix for bug 510556.

Provides a declarative interface for easily managing QT_CONFIG values in
qconfig.pri and QT_* macros in qconfig.h that depend on USE flags. Will
eventually replace the QCONFIG_* variables when all ebuilds are converted.

---
 eclass/qt5-build.eclass | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2ddcd86..206aa31 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -107,6 +107,14 @@ case ${QT5_BUILD_TYPE} in
 	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
 esac
 
+# @ECLASS-VARIABLE: QT5_GENTOO_CONFIG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array of <useflag:feature:macro> triplets that are evaluated in src_install
+# to generate the per-package list of enabled QT_CONFIG features and macro
+# definitions, which are then merged together with all other Qt5 packages
+# installed on the system to obtain the global qconfig.{h,pri} files.
+
 # @ECLASS-VARIABLE: QCONFIG_ADD
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -294,12 +302,16 @@ qt5-build_src_install() {
 		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
 		popd >/dev/null || die
 
-		# create an empty Gentoo/gentoo-qconfig.h
-		dodir "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
-		: > "${D}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h
+		# install an empty Gentoo/gentoo-qconfig.h in ${D}
+		# so that it's placed under package manager control
+		> "${T}"/gentoo-qconfig.h
+		(
+			insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
+			doins "${T}"/gentoo-qconfig.h
+		)
 
 		# include gentoo-qconfig.h at the beginning of QtCore/qconfig.h
-		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+		sed -i -e '1a#include <Gentoo/gentoo-qconfig.h>\n' \
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 	fi
@@ -589,9 +601,25 @@ qt5_qmake() {
 # Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
 qt5_install_module_qconfigs() {
 	local x
+	for x in "${QT5_GENTOO_CONFIG[@]}"; do
+		local flag=${x%%:*}
+		x=${x#${flag}:}
+		local feature=${x%%:*}
+		x=${x#${feature}:}
+		local macro=${x}
+		macro=$(tr 'a-z-' 'A-Z_' <<< "${macro}")
+
+		if [[ -z ${flag} ]] || use ${flag}; then
+			[[ -n ${feature} ]] && QCONFIG_ADD+=("${feature}")
+			[[ -n ${macro} ]] && QCONFIG_DEFINE+=("QT_${macro}")
+		else
+			[[ -n ${feature} ]] && QCONFIG_REMOVE+=("${feature}")
+			[[ -n ${macro} ]] && QCONFIG_DEFINE+=("QT_NO_${macro}")
+		fi
+	done
 
 	# qconfig.h
-	: > "${T}"/${PN}-qconfig.h
+	> "${T}"/${PN}-qconfig.h
 	for x in "${QCONFIG_DEFINE[@]}"; do
 		echo "#define ${x}" >> "${T}"/${PN}-qconfig.h
 	done
@@ -601,7 +629,7 @@ qt5_install_module_qconfigs() {
 	)
 
 	# qconfig.pri
-	: > "${T}"/${PN}-qconfig.pri
+	> "${T}"/${PN}-qconfig.pri
 	[[ -n ${QCONFIG_ADD[@]} ]] && echo "QCONFIG_ADD=${QCONFIG_ADD[@]}" \
 		>> "${T}"/${PN}-qconfig.pri
 	[[ -n ${QCONFIG_REMOVE[@]} ]] && echo "QCONFIG_REMOVE=${QCONFIG_REMOVE[@]}" \
@@ -615,8 +643,8 @@ qt5_install_module_qconfigs() {
 # @FUNCTION: qt5_regenerate_global_qconfigs
 # @INTERNAL
 # @DESCRIPTION:
-# Generates gentoo-specific qconfig.{h,pri}.
-# Don't die here because dying in pkg_post{inst,rm} just makes things worse.
+# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration.
+# Don't call die here because dying in pkg_post{inst,rm} only makes things worse.
 qt5_regenerate_global_qconfigs() {
 	einfo "Regenerating gentoo-qconfig.h"
 

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

[Davide Pesavento]

commit:     74bdf65d1644777a05093efeba5d584c4e91a718
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 24 00:15:26 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 00:15:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=74bdf65d

[qt5-build.eclass] Sort and uniquify macros in gentoo-qconfig.h

---
 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 206aa31..84d1ceb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -650,7 +650,7 @@ qt5_regenerate_global_qconfigs() {
 
 	find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \
 		-name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \
-		-execdir cat '{}' + > "${T}"/gentoo-qconfig.h
+		-execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h
 
 	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
 	mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \

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

[Davide Pesavento]

commit:     d81b3b0001165085978c2e4a79f754fd871037ed
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 21 15:54:41 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 23 00:48:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d81b3b00

[qt5-build.eclass] Disable (almost) everything in qtbase's configure.

Prevents automagic deps and leakage of QT_CONFIG flags into installed
qconfig files. First part of the fix for bug 510556.

---
 eclass/qt5-build.eclass | 84 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 64 insertions(+), 20 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ef597d1..2ddcd86 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -107,11 +107,6 @@ case ${QT5_BUILD_TYPE} in
 	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
 esac
 
-# @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
-# @DESCRIPTION:
-# Set to false to reduce build output during compilation.
-: ${QT5_VERBOSE_BUILD:=true}
-
 # @ECLASS-VARIABLE: QCONFIG_ADD
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -467,31 +462,70 @@ qt5_base_configure() {
 		# licensing stuff
 		-opensource -confirm-license
 
+		# let configure automatically figure out if C++11 is supported
+		#-c++11
+
 		# build shared libraries
 		-shared
 
-		# disabling accessibility support is not recommended by upstream,
-		# as it will break QStyle and may break other internal parts of Qt
+		# generate only a top-level Makefile
+		-process
+
+		# always enable large file support
+		-largefile
+
+		# disabling accessibility is not recommended by upstream, as
+		# it will break QStyle and may break other internal parts of Qt
 		-accessibility
 
+		# disable all SQL drivers by default, override in qtsql
+		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
+		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
+
+		# obsolete flag, does nothing
+		#-qml-debug
+
 		# use pkg-config to detect include and library paths
 		-pkg-config
 
-		# prefer system libraries
+		# prefer system libraries (only common deps here)
 		-system-zlib
 		-system-pcre
-		-system-xcb
-		-system-xkbcommon
+
+		# don't specify -no-gif because there is no way to override it later
+		#-no-gif
+
+		# disable everything to prevent automagic deps (part 1)
+		-no-mtdev -no-journald -no-libpng -no-libjpeg
+		-no-freetype -no-harfbuzz -no-openssl -no-xinput2
+		-no-xcb-xlib -no-glib -no-pulseaudio -no-alsa
+
+		# disable gtkstyle because it adds qt4 include paths to the compiler
+		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
+		-no-gtkstyle
 
 		# exclude examples and tests from default build
 		-nomake examples
 		-nomake tests
+		-no-compile-examples
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
 		$(use prefix || echo -no-rpath)
 
-		# verbosity of the configure and build phases
-		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
+		# print verbose information about each configure test
+		-verbose
+
+		# doesn't actually matter since we override CXXFLAGS
+		#-no-optimized-qmake
+
+		# obsolete flag, does nothing
+		#-nis
+
+		# always enable iconv support
+		-iconv
+
+		# disable everything to prevent automagic deps (part 2)
+		-no-cups -no-evdev -no-icu -no-fontconfig -no-dbus
 
 		# don't strip
 		-no-strip
@@ -505,16 +539,26 @@ qt5_base_configure() {
 		# see also https://bugreports.qt-project.org/browse/QTBUG-36129
 		#-reduce-relocations
 
-		# disable all SQL drivers by default, override in qtsql
-		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
-		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
-
 		# disable all platform plugins by default, override in qtgui
-		-no-xcb -no-xrender -no-eglfs -no-directfb -no-linuxfb -no-kms
+		-no-xcb -no-eglfs -no-directfb -no-linuxfb -no-kms
 
-		# disable gtkstyle because it adds qt4 include paths to the compiler
-		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
-		-no-gtkstyle
+		# disable undocumented X11-related flags, override in qtgui
+		# (not shown in ./configure -help output)
+		-no-sm -no-xkb -no-xrender
+
+		# disable obsolete/unused X11-related flags
+		# (not shown in ./configure -help output)
+		-no-mitshm -no-xcursor -no-xfixes -no-xinerama -no-xinput
+		-no-xrandr -no-xshape -no-xsync -no-xvideo
+
+		# typedef qreal to double (warning: changing this flag breaks the ABI)
+		-qreal double
+
+		# disable opengl and egl by default, override in qtgui and qtopengl
+		-no-opengl -no-egl
+
+		# use upstream default
+		#-no-system-proxies
 
 		# do not build with -Werror
 		-no-warnings-are-errors

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

[Michael Palimaka]

commit:     48f6e4a0f077245d12a9ea78b6062fcb1d371f24
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 16 17:42:48 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 16 17:43:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=48f6e4a0

[eclass] Remove CVS header.

---
 eclass/qmake-utils.eclass | 2 +-
 eclass/qt4-build.eclass   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 4457675..b91e3e0 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.2 2014/07/11 08:21:58 ulm Exp $
+# $Header: $
 
 # @ECLASS: qmake-utils.eclass
 # @MAINTAINER:

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index c85653f..a2a0126 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.152 2013/10/14 17:29:55 pesa Exp $
+# $Header: $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:

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

[Davide Pesavento]

commit:     f09df1a1e00d47be2e62ad15bb8130ac120a2b4c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 13 23:34:31 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 23:34:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f09df1a1

[qt5-build.eclass] The minimum supported version of gcc is 4.5

http://lists.qt-project.org/pipermail/development/2014-June/017410.html

---
 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 827bf78..ef597d1 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -151,9 +151,9 @@ qt5-build_pkg_setup() {
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]]; then
 		ewarn
-		ewarn "Using a GCC version lower than 4.4 is not supported."
+		ewarn "Using a GCC version lower than 4.5 is not supported."
 		ewarn
 	fi
 

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

[Davide Pesavento]

commit:     f3ddfdb6a90e7d424160bb00f9247eae88ee4a50
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 11 14:03:33 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 11 14:03:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f3ddfdb6

[qt5-build] Let configure figure out reduced relocations support.

This should fix arm and ppc support (at least). See upstream bug
https://bugreports.qt-project.org/browse/QTBUG-36129

Thanks to Vladimir Smirnov <civil <AT> gentoo.org> for the heads-up.

---
 eclass/qt5-build.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 99ba8df..827bf78 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -496,13 +496,14 @@ qt5_base_configure() {
 		# don't strip
 		-no-strip
 
-		# precompiled headers aren't really useful for us
+		# precompiled headers are not that useful for us
 		# and cause problems on hardened, so turn them off
 		-no-pch
 
-		# reduce relocations in libraries through extra linker optimizations
-		# requires GNU ld >= 2.18
-		-reduce-relocations
+		# reduced relocations cause major breakage on at least arm and ppc, so we
+		# don't specify anything and let configure figure out if they are supported,
+		# see also https://bugreports.qt-project.org/browse/QTBUG-36129
+		#-reduce-relocations
 
 		# disable all SQL drivers by default, override in qtsql
 		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc

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

[Davide Pesavento]

commit:     9b6c9ff8afdbd8b3a23e2e7f4697fd46c7befe60
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 11 13:45:47 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 11 13:45:47 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b6c9ff8

[qmake-utils.eclass] Sync with portage.

---
 eclass/qmake-utils.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index ff8ee05..4457675 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.2 2014/07/11 08:21:58 ulm Exp $
 
 # @ECLASS: qmake-utils.eclass
 # @MAINTAINER:
@@ -11,8 +11,8 @@
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
 
-if [[ ${___ECLASS_ONCE_QMAKE_UTILS} != "recur -_+^+_- spank" ]]; then
-___ECLASS_ONCE_QMAKE_UTILS="recur -_+^+_- spank"
+if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
+_QMAKE_UTILS_ECLASS=1
 
 inherit eutils multilib toolchain-funcs
 

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

[Davide Pesavento]

commit:     e91ccd1661000aeb24fbdb0cf218456cc9cbbe19
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  8 16:34:03 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul  8 16:34:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e91ccd16

[qt4-build-multilib.eclass] Add RDEPEND on qtchooser.

---
 eclass/qt4-build-multilib.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 71ae1b3..c685334 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -50,6 +50,9 @@ DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
+RDEPEND="
+	dev-qt/qtchooser
+"
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
 

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

[Michael Palimaka]

commit:     cfbbac058369e7d86f0803b883755070345fab9e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  8 10:45:22 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jul  8 10:45:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cfbbac05

Revert "[eclass] Add RDEPEND on qtchooser."

This is causing blockers because qt-4.8.6 is still masked

This reverts commit ab5c7bec5a9dc95306e571dd48e73f25bf431452.

---
 eclass/qt4-build-multilib.eclass | 3 ---
 eclass/qt5-build.eclass          | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c685334..71ae1b3 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -50,9 +50,6 @@ DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
-RDEPEND="
-	dev-qt/qtchooser
-"
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
 

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4b510ed..99ba8df 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -65,7 +65,7 @@ EGIT_REPO_URI=(
 IUSE="debug test"
 
 DEPEND="
-	dev-lang/perl
+	>=dev-lang/perl-5.14
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
@@ -75,9 +75,6 @@ if [[ ${PN} != qttest ]]; then
 		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
 	fi
 fi
-RDEPEND="
-	dev-qt/qtchooser
-"
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 

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

[Davide Pesavento]

commit:     ab5c7bec5a9dc95306e571dd48e73f25bf431452
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  7 21:01:40 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul  7 21:01:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ab5c7bec

[eclass] Add RDEPEND on qtchooser.

---
 eclass/qt4-build-multilib.eclass | 3 +++
 eclass/qt5-build.eclass          | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 71ae1b3..c685334 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -50,6 +50,9 @@ DEPEND="
 	dev-lang/perl
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
+RDEPEND="
+	dev-qt/qtchooser
+"
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
 

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 99ba8df..4b510ed 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -65,7 +65,7 @@ EGIT_REPO_URI=(
 IUSE="debug test"
 
 DEPEND="
-	>=dev-lang/perl-5.14
+	dev-lang/perl
 	virtual/pkgconfig
 "
 if [[ ${PN} != qttest ]]; then
@@ -75,6 +75,9 @@ if [[ ${PN} != qttest ]]; then
 		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
 	fi
 fi
+RDEPEND="
+	dev-qt/qtchooser
+"
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 

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

[Davide Pesavento]

commit:     8b3e9c1290a659128adb0f4bbc323ba39413522c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 29 00:50:42 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 00:51:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8b3e9c12

[qt4-build-multilib] Do common stuff in multilib_src_install_all().

---
 eclass/qt4-build-multilib.eclass | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 6b34c46..71ae1b3 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -415,7 +415,7 @@ multilib_src_test() {
 # @FUNCTION: qt4-build-multilib_src_install
 # @DESCRIPTION:
 # Performs the actual installation, running 'emake install'
-# inside all QT4_TARGET_DIRECTORIES, and installing qconfigs.
+# in all QT4_TARGET_DIRECTORIES, and installing qconfigs.
 qt4-build-multilib_src_install() {
 	multilib-minimal_src_install
 }
@@ -430,6 +430,19 @@ multilib_src_install() {
 		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
 	fi
 
+	install_qconfigs
+	fix_library_files
+	fix_includes
+}
+
+multilib_src_install_all() {
+	qt4-build-multilib_src_install_all
+}
+
+# @FUNCTION: qt4-build-multilib_src_install_all
+# @DESCRIPTION:
+# Common install phase for all multilib ABIs.
+qt4-build-multilib_src_install_all() {
 	# install private headers of a few modules
 	if has ${PN} qtcore qtdeclarative qtgui qtscript; then
 		local moduledir=${PN#qt}
@@ -441,10 +454,6 @@ multilib_src_install() {
 		find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
 	fi
 
-	install_qconfigs
-	fix_library_files
-	fix_includes
-
 	# remove .la files since we are building only shared libraries
 	prune_libtool_files
 }

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

[Davide Pesavento]

commit:     fa3dbe9a2e41a45824a183e5c20ae8dddda9540e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 28 23:55:35 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun 28 23:55:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fa3dbe9a

[qt4-build-multilib] Remove special case for qtmultimedia.

Doesn't seem to be needed anymore.

---
 eclass/qt4-build-multilib.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c4a5562..6b34c46 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -407,9 +407,6 @@ qt4-build-multilib_src_test() {
 }
 
 multilib_src_test() {
-	# QtMultimedia does not have any test suite (bug #332299)
-	[[ ${PN} == qtmultimedia ]] && return
-
 	qt4_prepare_env
 
 	qt4_foreach_target_subdir emake -j1 check

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

[Davide Pesavento]

commit:     5a8c47c59332c1a7d63cca6878575b61ea22773f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 22 18:26:46 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 22 18:26:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5a8c47c5

[qt4-build-multilib] Provide qt_native_use() convenience function.

---
 eclass/qt4-build-multilib.eclass | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index efa501c..c4a5562 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -470,14 +470,24 @@ qt4-build-multilib_pkg_postrm() {
 # @FUNCTION: qt_use
 # @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
-# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature}" if it's disabled. If [feature] is not specified,
-# <flag> will be used for that. If [enableval] is not specified, the
-# "-${enableval}" prefix is omitted.
+# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
+# otherwise. If [feature] is not specified, <flag> is used in its place.
+# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
 qt_use() {
 	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
 }
 
+# @FUNCTION: qt_native_use
+# @USAGE: <flag> [feature] [enableval]
+# @DESCRIPTION:
+# Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently
+# building for the native ABI, "-no-${feature}" otherwise. If [feature] is not
+# specified, <flag> is used in its place. If [enableval] is not specified,
+# the "-${enableval}" prefix is omitted.
+qt_native_use() {
+	multilib_is_native_abi && use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+}
+
 
 ######  Internal functions  ######
 

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

[Davide Pesavento]

commit:     394586c3d4717c1abb6cfde3322c3b0554e41295
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  9 20:38:02 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun  9 20:38:02 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=394586c3

[qt5-build.eclass] Adapt to new branching scheme (stable -> 5.x)

---
 eclass/qt5-build.eclass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b017b7d..99ba8df 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -38,20 +38,19 @@ case ${PV} in
 	5.?.9999)
 		# git stable branch
 		QT5_BUILD_TYPE="live"
-		EGIT_BRANCH="stable"
+		EGIT_BRANCH=${PV%.9999}
 		;;
 	*_alpha*|*_beta*|*_rc*)
 		# pre-releases
 		QT5_BUILD_TYPE="release"
-		MY_PV="${PV/rc/RC}"
-		MY_P="${QT5_MODULE}-opensource-src-${MY_PV/_/-}"
+		MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt-project.org/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 	*)
 		# official stable releases
 		QT5_BUILD_TYPE="release"
-		MY_P="${QT5_MODULE}-opensource-src-${PV}"
+		MY_P=${QT5_MODULE}-opensource-src-${PV}
 		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;

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

[Davide Pesavento]

commit:     45bcdb4264ad3e8744b0d71367aacbd4ed433f9e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun  5 10:27:22 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun  5 10:27:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=45bcdb42

Reduce differences between qt4-build-multilib and qt5-build eclasses.

---
 eclass/qt4-build-multilib.eclass | 31 +++++++++--------
 eclass/qt5-build.eclass          | 72 ++++++++++++++++++++--------------------
 2 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 5de1d45..efa501c 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -251,7 +251,6 @@ qt4-build-multilib_src_prepare() {
 
 	# apply patches
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	debug-print "$FUNCNAME: applying user patches"
 	epatch_user
 }
 
@@ -523,6 +522,21 @@ qt4_foreach_target_subdir() {
 	done
 }
 
+# @FUNCTION: qt4_symlink_tools_to_build_dir
+# @INTERNAL
+# @DESCRIPTION:
+# Symlinks qtcore tools to BUILD_DIR, so they can be used during compilation.
+qt4_symlink_tools_to_build_dir() {
+	mkdir -p "${BUILD_DIR}"/bin || die
+
+	local bin
+	for bin in "${QT4_BINDIR}"/{qmake,moc,rcc,uic}; do
+		if [[ -e ${bin} ]]; then
+			ln -s "${bin}" "${BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
+		fi
+	done
+}
+
 # @FUNCTION: qt4_qmake
 # @INTERNAL
 # @DESCRIPTION:
@@ -621,21 +635,6 @@ generate_qconfigs() {
 	fi
 }
 
-# @FUNCTION: qt4_symlink_tools_to_build_dir
-# @INTERNAL
-# @DESCRIPTION:
-# Symlinks qtcore tools to BUILD_DIR, so they can be used during compilation.
-qt4_symlink_tools_to_build_dir() {
-	mkdir -p "${BUILD_DIR}"/bin || die
-
-	local bin
-	for bin in "${QT4_BINDIR}"/{qmake,moc,rcc,uic}; do
-		if [[ -e ${bin} ]]; then
-			ln -s "${bin}" "${BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
-		fi
-	done
-}
-
 # @FUNCTION: fix_library_files
 # @INTERNAL
 # @DESCRIPTION:

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0eeb787..b017b7d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,7 +17,7 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs versionator virtualx
+inherit eutils flag-o-matic multilib toolchain-funcs virtualx
 
 HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
@@ -152,7 +152,7 @@ qt5-build_pkg_setup() {
 # @DESCRIPTION:
 # Unpacks the sources.
 qt5-build_src_unpack() {
-	if ! version_is_at_least 4.4 $(gcc-version); then
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
 		ewarn
 		ewarn "Using a GCC version lower than 4.4 is not supported."
 		ewarn
@@ -221,11 +221,11 @@ qt5-build_src_prepare() {
 	fi
 
 	if [[ ${PN} != qtcore ]]; then
-		qt5_symlink_tools_to_buildtree
+		qt5_symlink_tools_to_build_dir
 	fi
 
-	# Apply patches
-	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	# apply patches
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 	epatch_user
 }
 
@@ -239,7 +239,7 @@ qt5-build_src_configure() {
 	export LD="$(tc-getCXX)"
 
 	mkdir -p "${QT5_BUILD_DIR}" || die
-	pushd "${QT5_BUILD_DIR}" > /dev/null || die
+	pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
 	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_base_configure
@@ -247,7 +247,7 @@ qt5-build_src_configure() {
 
 	qt5_foreach_target_subdir qt5_qmake
 
-	popd > /dev/null || die
+	popd >/dev/null || die
 }
 
 # @FUNCTION: qt5-build_src_compile
@@ -295,10 +295,10 @@ qt5-build_src_install() {
 	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
 	if [[ ${PN} == qtcore ]]; then
-		pushd "${QT5_BUILD_DIR}" > /dev/null || die
+		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}"
 		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
-		popd > /dev/null || die
+		popd >/dev/null || die
 
 		# create an empty Gentoo/gentoo-qconfig.h
 		dodir "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
@@ -398,11 +398,35 @@ qt5_prepare_env() {
 	fi
 }
 
-# @FUNCTION: qt5_symlink_tools_to_buildtree
+# @FUNCTION: qt5_foreach_target_subdir
+# @INTERNAL
+# @DESCRIPTION:
+# Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
+qt5_foreach_target_subdir() {
+	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
+
+	local subdir
+	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+		if [[ ${EBUILD_PHASE} == test ]]; then
+			subdir=tests/auto${subdir#src}
+			[[ -d ${S}/${subdir} ]] || continue
+		fi
+
+		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
+		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+
+		einfo "Running $* ${subdir:+in ${subdir}}"
+		"$@"
+
+		popd >/dev/null || die
+	done
+}
+
+# @FUNCTION: qt5_symlink_tools_to_build_dir
 # @INTERNAL
 # @DESCRIPTION:
-# Symlinks qtcore tools to buildtree, so they can be used when building other modules.
-qt5_symlink_tools_to_buildtree() {
+# Symlinks qtcore tools to QT5_BUILD_DIR, so they can be used when building other modules.
+qt5_symlink_tools_to_build_dir() {
 	mkdir -p "${QT5_BUILD_DIR}"/bin || die
 
 	local bin
@@ -515,30 +539,6 @@ qt5_qmake() {
 		|| die "qmake failed (${projectdir})"
 }
 
-# @FUNCTION: qt5_foreach_target_subdir
-# @INTERNAL
-# @DESCRIPTION:
-# Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
-qt5_foreach_target_subdir() {
-	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
-
-	local subdir
-	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
-		if [[ ${EBUILD_PHASE} == test ]]; then
-			subdir=tests/auto${subdir#src}
-			[[ -d ${S}/${subdir} ]] || continue
-		fi
-
-		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
-		pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die
-
-		einfo "Running $* ${subdir:+in ${subdir}}"
-		"$@"
-
-		popd > /dev/null || die
-	done
-}
-
 # @FUNCTION: qt5_install_module_qconfigs
 # @INTERNAL
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     0ecb7506f40d391f77911befc04a402a361b342d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun  5 09:44:54 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun  5 09:44:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0ecb7506

[qt5-build.eclass] Remove unnecessary quoting.

---
 eclass/qt5-build.eclass | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 988eea1..0eeb787 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -61,7 +61,7 @@ EGIT_REPO_URI=(
 	"git://gitorious.org/qt/${QT5_MODULE}.git"
 	"https://git.gitorious.org/qt/${QT5_MODULE}.git"
 )
-[[ ${QT5_BUILD_TYPE} == "live" ]] && inherit git-r3
+[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
 
 IUSE="debug test"
 
@@ -69,8 +69,8 @@ DEPEND="
 	>=dev-lang/perl-5.14
 	virtual/pkgconfig
 "
-if [[ ${PN} != "qttest" ]]; then
-	if [[ ${QT5_MODULE} == "qtbase" ]]; then
+if [[ ${PN} != qttest ]]; then
+	if [[ ${QT5_MODULE} == qtbase ]]; then
 		DEPEND+=" test? ( ~dev-qt/qttest-${PV}[debug=] )"
 	else
 		DEPEND+=" test? ( >=dev-qt/qttest-${PV}:5[debug=] )"
@@ -158,7 +158,7 @@ qt5-build_src_unpack() {
 		ewarn
 	fi
 
-	if [[ ${PN} == "qtwebkit" ]]; then
+	if [[ ${PN} == qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
 			ewarn
@@ -183,7 +183,7 @@ qt5-build_src_unpack() {
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
-	if [[ ${QT5_MODULE} == "qtbase" ]]; then
+	if [[ ${QT5_MODULE} == qtbase ]]; then
 		# Avoid unnecessary qmake recompilations
 		sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
 			configure || die "sed failed (skip qmake bootstrap)"
@@ -220,7 +220,7 @@ qt5-build_src_prepare() {
 			|| die "sed failed (config.tests)"
 	fi
 
-	if [[ ${PN} != "qtcore" ]]; then
+	if [[ ${PN} != qtcore ]]; then
 		qt5_symlink_tools_to_buildtree
 	fi
 
@@ -241,7 +241,7 @@ qt5-build_src_configure() {
 	mkdir -p "${QT5_BUILD_DIR}" || die
 	pushd "${QT5_BUILD_DIR}" > /dev/null || die
 
-	if [[ ${QT5_MODULE} == "qtbase" ]]; then
+	if [[ ${QT5_MODULE} == qtbase ]]; then
 		qt5_base_configure
 	fi
 
@@ -294,7 +294,7 @@ qt5-build_src_test() {
 qt5-build_src_install() {
 	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
-	if [[ ${PN} == "qtcore" ]]; then
+	if [[ ${PN} == qtcore ]]; then
 		pushd "${QT5_BUILD_DIR}" > /dev/null || die
 		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}"
 		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
@@ -328,7 +328,7 @@ qt5-build_pkg_postinst() {
 # @DESCRIPTION:
 # Regenerate configuration when the package is completely removed.
 qt5-build_pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != "qtcore" ]]; then
+	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != qtcore ]]; then
 		qt5_regenerate_global_qconfigs
 	fi
 }
@@ -392,7 +392,7 @@ qt5_prepare_env() {
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
 	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
 
-	if [[ ${QT5_MODULE} == "qtbase" ]]; then
+	if [[ ${QT5_MODULE} == qtbase ]]; then
 		# see mkspecs/features/qt_config.prf
 		export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
 	fi
@@ -524,7 +524,7 @@ qt5_foreach_target_subdir() {
 
 	local subdir
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
-		if [[ ${EBUILD_PHASE} == "test" ]]; then
+		if [[ ${EBUILD_PHASE} == test ]]; then
 			subdir=tests/auto${subdir#src}
 			[[ -d ${S}/${subdir} ]] || continue
 		fi

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

[Davide Pesavento]

commit:     7b4d4636f026dcdd9d366af42cf555f14c3101de
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  4 01:38:21 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun  4 01:38:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7b4d4636

[qt4-build-multilib.eclass] Convert ${conf} to a bash array.

---
 eclass/qt4-build-multilib.eclass | 168 ++++++++++++++++++++++-----------------
 1 file changed, 95 insertions(+), 73 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 0e26497..27e610d 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -59,6 +59,11 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_i
 # Space-separated list of directories that will be configured,
 # compiled, and installed. All paths must be relative to ${S}.
 
+# @ECLASS-VARIABLE: QT4_VERBOSE_BUILD
+# @DESCRIPTION:
+# Set to false to reduce build output during compilation.
+: ${QT4_VERBOSE_BUILD:=true}
+
 # @FUNCTION: qt4-build-multilib_src_unpack
 # @DESCRIPTION:
 # Unpacks the sources.
@@ -124,6 +129,12 @@ qt4-build-multilib_src_prepare() {
 			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
 			mkspecs/$(qt4_get_mkspec)/qmake.conf \
 			|| die "sed failed (aqua)"
+
+		# we are crazy and build cocoa + qt3support
+		if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+			sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
+				configure || die "sed failed (cocoa + qt3support)"
+		fi
 	fi
 
 	# Bug 261632
@@ -246,97 +257,108 @@ multilib_src_configure() {
 	export AR="$(tc-getAR) cqs"
 	export LD="$(tc-getCXX)"
 
-	# configure arguments
-	local conf="
-		-prefix ${QT4_PREFIX}
-		-bindir ${QT4_BINDIR}
-		-libdir ${QT4_LIBDIR}
-		-docdir ${QT4_DOCDIR}
-		-headerdir ${QT4_HEADERDIR}
-		-plugindir ${QT4_PLUGINDIR}
-		-importdir ${QT4_IMPORTDIR}
-		-datadir ${QT4_DATADIR}
-		-translationdir ${QT4_TRANSLATIONDIR}
-		-sysconfdir ${QT4_SYSCONFDIR}
-		-examplesdir ${QT4_EXAMPLESDIR}
-		-demosdir ${QT4_DEMOSDIR}
-		-opensource -confirm-license
-		-shared -fast -largefile -stl -verbose
-		-nomake examples -nomake demos"
-
 	# convert tc-arch to the values supported by Qt
+	local arch=
 	case $(tc-arch) in
-		amd64|x64-*)		  conf+=" -arch x86_64" ;;
-		ppc*-macos)		  conf+=" -arch ppc" ;;
-		ppc*)			  conf+=" -arch powerpc" ;;
-		sparc*)			  conf+=" -arch sparc" ;;
-		x86-macos)		  conf+=" -arch x86" ;;
-		x86*)			  conf+=" -arch i386" ;;
-		alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
-		hppa|sh)		  conf+=" -arch generic" ;;
-		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
+		amd64|x64-*)		  arch=x86_64 ;;
+		ppc*-macos)		  arch=ppc ;;
+		ppc*)			  arch=powerpc ;;
+		sparc*)			  arch=sparc ;;
+		x86-macos)		  arch=x86 ;;
+		x86*)			  arch=i386 ;;
+		alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
+		hppa|sh)		  arch=generic ;;
+		*) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;;
 	esac
 
-	conf+=" -platform $(qt4_get_mkspec)"
+	# configure arguments
+	local conf=(
+		# installation paths
+		-prefix "${QT4_PREFIX}"
+		-bindir "${QT4_BINDIR}"
+		-libdir "${QT4_LIBDIR}"
+		-docdir "${QT4_DOCDIR}"
+		-headerdir "${QT4_HEADERDIR}"
+		-plugindir "${QT4_PLUGINDIR}"
+		-importdir "${QT4_IMPORTDIR}"
+		-datadir "${QT4_DATADIR}"
+		-translationdir "${QT4_TRANSLATIONDIR}"
+		-sysconfdir "${QT4_SYSCONFDIR}"
+		-examplesdir "${QT4_EXAMPLESDIR}"
+		-demosdir "${QT4_DEMOSDIR}"
+
+		# debug/release
+		$(use_if_iuse debug && echo -debug || echo -release)
+		-no-separate-debug-info
+
+		# licensing stuff
+		-opensource -confirm-license
 
-	# debug/release
-	if use_if_iuse debug; then
-		conf+=" -debug"
-	else
-		conf+=" -release"
-	fi
-	conf+=" -no-separate-debug-info"
+		# build shared libraries
+		-shared
 
-	# skip recursive processing of .pro files at the end of configure
-	# (we run qmake by ourselves), thus saving quite a bit of time
-	conf+=" -dont-process"
+		# misc stuff
+		-fast -largefile
 
-	# exceptions USE flag
-	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
+		# skip recursive processing of .pro files at the end of configure
+		# (we run qmake by ourselves), thus saving quite a bit of time
+		-dont-process
 
-	# disable rpath (bug 380415), except on prefix (bug 417169)
-	use prefix || conf+=" -no-rpath"
+		# exceptions USE flag
+		$(in_iuse exceptions && qt_use exceptions || echo -exceptions)
 
-	# precompiled headers don't work on hardened, where the flag is masked
-	conf+=" $(in_iuse pch && qt_use pch || echo -no-pch)"
+		# build STL support
+		-stl
 
-	# -reduce-relocations
-	# This flag seems to introduce major breakage to applications,
-	# mostly to be seen as a core dump with the message "QPixmap: Must
-	# construct a QApplication before a QPaintDevice" on Solaris.
-	#   -- Daniel Vergien
-	[[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
+		# architecture/platform (mkspec)
+		-arch ${arch}
+		-platform $(qt4_get_mkspec)
 
-	# this one is needed for all systems with a separate -liconv, apart from
-	# Darwin, for which the sources already cater for -liconv
-	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
-		conf+=" -liconv"
-	fi
+		# prefer system libraries
+		-system-zlib
+
+		# exclude examples and demos from default build
+		-nomake examples
+		-nomake demos
+
+		# disable rpath on non-prefix (bugs 380415 and 417169)
+		$(use prefix || echo -no-rpath)
+
+		# verbosity of the configure and build phases
+		-verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
+
+		# precompiled headers don't work on hardened, where the flag is masked
+		$(in_iuse pch && qt_use pch || echo -no-pch)
+
+		# enable linker optimizations to reduce relocations, except on Solaris
+		# where this flag seems to introduce major breakage to applications,
+		# mostly to be seen as a core dump with the message:
+		# "QPixmap: Must construct a QApplication before a QPaintDevice"
+		$([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations)
+
+		# this one is needed for all systems with a separate -liconv, apart from
+		# Darwin, for which the sources already cater for -liconv
+		$(use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && echo -liconv)
+	)
 
 	if use_if_iuse aqua; then
-		# On (snow) leopard use the new (frameworked) cocoa code.
 		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
-			conf+=" -cocoa -framework"
-			# We need the source's headers, not the installed ones.
-			conf+=" -I${S}/include"
-			# Add hint for the framework location.
-			conf+=" -F${QT4_LIBDIR}"
-
-			# We are crazy and build cocoa + qt3support :-)
-			if use_if_iuse qt3support; then
-				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-					-i configure || die
-			fi
+			conf+=(
+				# on (snow) leopard use the new (frameworked) cocoa code
+				-cocoa -framework
+				# add hint for the framework location
+				-F"${QT4_LIBDIR}"
+			)
 		else
-			conf+=" -no-framework"
+			conf+=(-no-framework)
 		fi
 	fi
 
 	# append module-specific arguments
-	conf+=" ${myconf}"
+	conf+=(${myconf})
 
-	einfo "Configuring with:" ${conf}
-	"${S}"/configure ${conf} || die "configure failed"
+	einfo "Configuring with: ${conf[@]}"
+	"${S}"/configure "${conf[@]}" || die "configure failed"
 
 	# configure is stupid and assigns QMAKE_LFLAGS twice,
 	# thus the previous -rpath-link flag gets overwritten
@@ -712,7 +734,7 @@ qt4_get_mkspec() {
 		*-solaris*)
 			spec=solaris ;;
 		*)
-			die "${FUNCNAME}(): Unsupported CHOST '${CHOST}'" ;;
+			die "qt4-build-multilib.eclass: unsupported CHOST '${CHOST}'" ;;
 	esac
 
 	case $(tc-getCXX) in
@@ -733,7 +755,7 @@ qt4_get_mkspec() {
 				spec+=-g++
 			fi ;;
 		*)
-			die "${FUNCNAME}(): Unsupported compiler '$(tc-getCXX)'" ;;
+			die "qt4-build-multilib.eclass: unsupported compiler '$(tc-getCXX)'" ;;
 	esac
 
 	# Add -64 for 64-bit prefix profiles

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

[Davide Pesavento]

commit:     68c798f41e1be1585039c8f4e5ef5eae7ac0d017
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  4 01:57:37 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun  4 01:57:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=68c798f4

[qt4-build-multilib.eclass] -fast is practically redundant with -dont-process.

---
 eclass/qt4-build-multilib.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 27e610d..f674af6 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -297,13 +297,13 @@ multilib_src_configure() {
 		# build shared libraries
 		-shared
 
-		# misc stuff
-		-fast -largefile
-
 		# skip recursive processing of .pro files at the end of configure
 		# (we run qmake by ourselves), thus saving quite a bit of time
 		-dont-process
 
+		# always enable large file support
+		-largefile
+
 		# exceptions USE flag
 		$(in_iuse exceptions && qt_use exceptions || echo -exceptions)
 

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

[Davide Pesavento]

commit:     8bab5b6b3a2e6c87d048f43ad9264bcbc2883681
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  4 02:08:10 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun  4 02:08:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8bab5b6b

[qt4-build-multilib.eclass] Move eclass variables doc to the beginning.

---
 eclass/qt4-build-multilib.eclass | 58 +++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index f674af6..5de1d45 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -53,6 +53,21 @@ DEPEND="
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
 
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing all the patches to be applied. This variable
+# is expected to be defined in the global scope of ebuilds. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+#
+# Example:
+# @CODE
+#	PATCHES=(
+#		"${FILESDIR}/mypatch.patch"
+#		"${FILESDIR}/mypatch2.patch"
+#	)
+# @CODE
+
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -64,6 +79,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_i
 # Set to false to reduce build output during compilation.
 : ${QT4_VERBOSE_BUILD:=true}
 
+# @ECLASS-VARIABLE: QCONFIG_ADD
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of options that must be added to QT_CONFIG in qconfig.pri
+
+# @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of options that must be removed from QT_CONFIG in qconfig.pri
+
+# @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of macros that must be defined in QtCore/qconfig.h
+
 # @FUNCTION: qt4-build-multilib_src_unpack
 # @DESCRIPTION:
 # Unpacks the sources.
@@ -93,19 +123,6 @@ qt4-build-multilib_src_unpack() {
 	esac
 }
 
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# PATCHES array variable containing all various patches to be applied.
-# This variable is expected to be defined in global scope of ebuild.
-# Make sure to specify the full path. This variable is utilised in
-# src_prepare() phase.
-#
-# @CODE
-#   PATCHES=( "${FILESDIR}/mypatch.patch"
-#             "${FILESDIR}/patches_folder/" )
-# @CODE
-
 # @FUNCTION: qt4-build-multilib_src_prepare
 # @DESCRIPTION:
 # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
@@ -521,21 +538,6 @@ qt4_qmake() {
 		|| die "qmake failed (${projectdir})"
 }
 
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DESCRIPTION:
-# List options that need to be added to QT_CONFIG in qconfig.pri
-: ${QCONFIG_ADD:=}
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DESCRIPTION:
-# List options that need to be removed from QT_CONFIG in qconfig.pri
-: ${QCONFIG_REMOVE:=}
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DESCRIPTION:
-# List variables that should be defined at the top of QtCore/qconfig.h
-: ${QCONFIG_DEFINE:=}
-
 # @FUNCTION: install_qconfigs
 # @INTERNAL
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     fd4931f7892c72794633e85bd0e212f43111bded
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  4 00:14:01 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun  4 00:14:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fd4931f7

[qt4-build-multilib.eclass] Remove dead code.

---
 eclass/qt4-build-multilib.eclass | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 42e1097..0e26497 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -119,9 +119,11 @@ qt4-build-multilib_src_prepare() {
 	fi
 
 	if use_if_iuse aqua; then
-		sed -e '/^CONFIG/s:app_bundle::' \
+		sed -i \
+			-e '/^CONFIG/s:app_bundle::' \
 			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			-i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+			mkspecs/$(qt4_get_mkspec)/qmake.conf \
+			|| die "sed failed (aqua)"
 	fi
 
 	# Bug 261632
@@ -167,34 +169,19 @@ qt4-build-multilib_src_prepare() {
 	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
 
 	if [[ ${CHOST} == *-darwin* ]]; then
-		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
-		# crippled (by design) :/
-		local mac_gpp_conf=
-		if [[ -f mkspecs/common/mac-g++.conf ]]; then
-			# qt < 4.8 has mac-g++.conf
-			mac_gpp_conf="mkspecs/common/mac-g++.conf"
-		elif [[ -f mkspecs/common/g++-macx.conf ]]; then
-			# qt >= 4.8 has g++-macx.conf
-			mac_gpp_conf="mkspecs/common/g++-macx.conf"
-		else
-			die "no known conf file for mac found"
-		fi
-		sed \
+		# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
+		sed -i \
 			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
 			-e "s:-arch\s\w*::g" \
-			-i ${mac_gpp_conf} \
-			|| die "sed ${mac_gpp_conf} failed"
+			mkspecs/common/g++-macx.conf \
+			|| die "sed g++-macx.conf failed"
 
 		# Fix configure's -arch settings that appear in qmake/Makefile and also
 		# fix arch handling (automagically duplicates our -arch arg and breaks
 		# pch). Additionally disable Xarch support.
-		local mac_gcc_confs="${mac_gpp_conf}"
-		if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
-			mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
-		fi
-		sed \
+		sed -i \
 			-e "s:-arch i386::" \
 			-e "s:-arch ppc::" \
 			-e "s:-arch x86_64::" \
@@ -204,14 +191,15 @@ qt4-build-multilib_src_prepare() {
 			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
 			-e "s:-Xarch_x86_64::g" \
 			-e "s:-Xarch_ppc64::g" \
-			-i configure ${mac_gcc_confs} \
+			configure mkspecs/common/gcc-base-macx.conf mkspecs/common/g++-macx.conf \
 			|| die "sed -arch/-Xarch failed"
 
 		# On Snow Leopard don't fall back to 10.5 deployment target.
 		if [[ ${CHOST} == *-apple-darwin10 ]]; then
-			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
+			sed -i \
+				-e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
 				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				-i configure ${mac_gpp_conf} \
+				configure mkspecs/common/g++-macx.conf \
 				|| die "sed deployment target failed"
 		fi
 	fi

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

[Davide Pesavento]

commit:     c904e3ec4ca104d03df8171bd628e11510982c43
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 23:58:58 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun  3 23:58:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c904e3ec

[qt4-build-multilib.eclass] Use -dont-process rather than patching configure.

---
 eclass/qt4-build-multilib.eclass | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 5eef7f7..42e1097 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -107,13 +107,15 @@ qt4-build-multilib_src_unpack() {
 # the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
 qt4-build-multilib_src_prepare() {
 	if [[ ${PN} != qtcore ]]; then
-		skip_qmake_build
-		skip_project_generation
+		# avoid unnecessary qmake recompilations
+		sed -i -e 's/^if true;/if false;/' configure \
+			|| die "sed failed (skip qmake bootstrap)"
 	fi
 
 	# skip X11 tests in non-gui packages to avoid spurious dependencies
 	if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest qttranslations qtxmlpatterns; then
-		sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure || die
+		sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure \
+			|| die "sed failed (skip X11 tests)"
 	fi
 
 	if use_if_iuse aqua; then
@@ -297,6 +299,10 @@ multilib_src_configure() {
 	fi
 	conf+=" -no-separate-debug-info"
 
+	# skip recursive processing of .pro files at the end of configure
+	# (we run qmake by ourselves), thus saving quite a bit of time
+	conf+=" -dont-process"
+
 	# exceptions USE flag
 	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
 
@@ -603,22 +609,6 @@ generate_qconfigs() {
 	fi
 }
 
-# @FUNCTION: skip_qmake_build
-# @INTERNAL
-# @DESCRIPTION:
-# Patches configure to skip qmake compilation, as it's already installed by qtcore.
-skip_qmake_build() {
-	sed -i -e "s:if true:if false:g" "${S}"/configure || die
-}
-
-# @FUNCTION: skip_project_generation
-# @INTERNAL
-# @DESCRIPTION:
-# Exit the script early by throwing in an exit before all of the .pro files are scanned.
-skip_project_generation() {
-	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
-}
-
 # @FUNCTION: qt4_symlink_tools_to_build_dir
 # @INTERNAL
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     fc8ff562a0f85889729e08c98aee4efd0fdc0881
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 23:22:40 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun  3 23:22:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fc8ff562

[qt4-build-multilib.eclass] Don't bother fixing .la files, they'll be pruned later.

---
 eclass/qt4-build-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 5511995..5eef7f7 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -637,11 +637,11 @@ qt4_symlink_tools_to_build_dir() {
 # @FUNCTION: fix_library_files
 # @INTERNAL
 # @DESCRIPTION:
-# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
+# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and
 # moves the *.pc files into the pkgconfig directory.
 fix_library_files() {
 	local libfile
-	for libfile in "${D}"/${QT4_LIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
+	for libfile in "${D}"/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do
 		if [[ -e ${libfile} ]]; then
 			sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
 		fi

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

[Davide Pesavento]

commit:     6feaa4f92f24205c0bb63a68585f6d4baa3bd20c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  3 14:04:30 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun  3 14:04:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6feaa4f9

[qt4-build-multilib.eclass] Refactoring.

---
 eclass/qt4-build-multilib.eclass | 68 ++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 9c0d397..86285af 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -350,21 +350,8 @@ multilib_src_configure() {
 	sed -i -e '/^QMAKE_LFLAGS =/ s:$: $$QMAKE_LFLAGS:' \
 		.qmake.cache || die "sed .qmake.cache failed"
 
-	local dir
-	for dir in . ${QT4_TARGET_DIRECTORIES}; do
-		mkdir -p "${dir}" || die
-		pushd "${dir}" >/dev/null || die
-
-		local projectdir=${PWD/#${BUILD_DIR}/${S}}
-		einfo "Running qmake in: ${dir}"
-		"${BUILD_DIR}"/bin/qmake \
-			CONFIG+=nostrip \
-			LIBS+=-L"${QT4_LIBDIR}" \
-			"${projectdir}" \
-			|| die "qmake failed (${projectdir})"
-
-		popd >/dev/null || die
-	done
+	qt4_qmake
+	qt4_foreach_target_subdir qt4_qmake
 }
 
 # @FUNCTION: qt4-build-multilib_src_compile
@@ -377,12 +364,7 @@ qt4-build-multilib_src_compile() {
 multilib_src_compile() {
 	qt4_prepare_env
 
-	local dir
-	for dir in ${QT4_TARGET_DIRECTORIES}; do
-		pushd ${dir} >/dev/null || die
-		emake
-		popd >/dev/null || die
-	done
+	qt4_foreach_target_subdir emake
 }
 
 # @FUNCTION: qt4-build-multilib_src_test
@@ -398,10 +380,7 @@ multilib_src_test() {
 
 	qt4_prepare_env
 
-	local dir
-	for dir in ${QT4_TARGET_DIRECTORIES}; do
-		emake -j1 check -C ${dir}
-	done
+	qt4_foreach_target_subdir emake -j1 check
 }
 
 # @FUNCTION: qt4-build-multilib_src_install
@@ -415,12 +394,7 @@ qt4-build-multilib_src_install() {
 multilib_src_install() {
 	qt4_prepare_env
 
-	local dir
-	for dir in ${QT4_TARGET_DIRECTORIES}; do
-		pushd ${dir} >/dev/null || die
-		emake INSTALL_ROOT="${D}" install
-		popd >/dev/null || die
-	done
+	qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
 	# install private headers of a few modules
 	if has ${PN} qtcore qtdeclarative qtgui qtscript; then
@@ -493,6 +467,38 @@ qt4_prepare_env() {
 	export XDG_CONFIG_HOME="${T}"
 }
 
+# @FUNCTION: qt4_foreach_target_subdir
+# @INTERNAL
+# @DESCRIPTION:
+# Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES.
+qt4_foreach_target_subdir() {
+	local subdir
+	for subdir in ${QT4_TARGET_DIRECTORIES}; do
+		mkdir -p "${subdir}" || die
+		pushd "${subdir}" >/dev/null || die
+
+		einfo "Running $* ${subdir:+in ${subdir}}"
+		"$@"
+
+		popd >/dev/null || die
+	done
+}
+
+# @FUNCTION: qt4_qmake
+# @INTERNAL
+# @DESCRIPTION:
+# Helper function that runs qmake in the current target subdir.
+# Intended to be called by qt4_foreach_target_subdir().
+qt4_qmake() {
+	local projectdir=${PWD/#${BUILD_DIR}/${S}}
+
+	"${BUILD_DIR}"/bin/qmake \
+		CONFIG+=nostrip \
+		LIBS+=-L"${QT4_LIBDIR}" \
+		"${projectdir}" \
+		|| die "qmake failed (${projectdir})"
+}
+
 # @ECLASS-VARIABLE: QCONFIG_ADD
 # @DESCRIPTION:
 # List options that need to be added to QT_CONFIG in qconfig.pri

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

[Davide Pesavento]

commit:     5e4bec4f6f92e1ca4a3d6bab63604c8ae8c59b29
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  1 01:38:35 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 02:39:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5e4bec4f

[qt4-build-multilib.eclass] Initial multilib support.

---
 eclass/qt4-build-multilib.eclass | 68 +++++++++++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 18 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 2fe2bce..9c0d397 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -17,7 +17,7 @@ case ${EAPI} in
 	*)	die "qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs # TODO multilib-minimal
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
 
 HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
@@ -46,10 +46,10 @@ if [[ ${PN} != qttranslations ]]; then
 	[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
 fi
 
-DEPEND="virtual/pkgconfig"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	DEPEND+=" dev-lang/perl"
-fi
+DEPEND="
+	dev-lang/perl
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
 
@@ -106,12 +106,9 @@ qt4-build-multilib_src_unpack() {
 # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
 # the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
 qt4-build-multilib_src_prepare() {
-	qt4_prepare_env
-
 	if [[ ${PN} != qtcore ]]; then
 		skip_qmake_build
 		skip_project_generation
-		symlink_tools_to_buildtree
 	fi
 
 	# skip X11 tests in non-gui packages to avoid spurious dependencies
@@ -244,6 +241,16 @@ qt4-build-multilib_src_prepare() {
 # @DESCRIPTION:
 # Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES.
 qt4-build-multilib_src_configure() {
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	qt4_prepare_env
+
+	if [[ ${PN} != qtcore ]]; then
+		qt4_symlink_tools_to_build_dir
+	fi
+
 	# toolchain setup
 	tc-export CC CXX OBJCOPY STRIP
 	export AR="$(tc-getAR) cqs"
@@ -331,11 +338,11 @@ qt4-build-multilib_src_configure() {
 		fi
 	fi
 
+	# append module-specific arguments
 	conf+=" ${myconf}"
-	myconf=
 
 	einfo "Configuring with:" ${conf}
-	./configure ${conf} || die "configure failed"
+	"${S}"/configure ${conf} || die "configure failed"
 
 	# configure is stupid and assigns QMAKE_LFLAGS twice,
 	# thus the previous -rpath-link flag gets overwritten
@@ -345,12 +352,17 @@ qt4-build-multilib_src_configure() {
 
 	local dir
 	for dir in . ${QT4_TARGET_DIRECTORIES}; do
-		pushd ${dir} >/dev/null || die
+		mkdir -p "${dir}" || die
+		pushd "${dir}" >/dev/null || die
+
+		local projectdir=${PWD/#${BUILD_DIR}/${S}}
 		einfo "Running qmake in: ${dir}"
-		"${S}"/bin/qmake \
-			LIBS+=-L"${QT4_LIBDIR}" \
+		"${BUILD_DIR}"/bin/qmake \
 			CONFIG+=nostrip \
-			|| die "qmake failed"
+			LIBS+=-L"${QT4_LIBDIR}" \
+			"${projectdir}" \
+			|| die "qmake failed (${projectdir})"
+
 		popd >/dev/null || die
 	done
 }
@@ -359,6 +371,12 @@ qt4-build-multilib_src_configure() {
 # @DESCRIPTION:
 # Compiles the code in QT4_TARGET_DIRECTORIES.
 qt4-build-multilib_src_compile() {
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	qt4_prepare_env
+
 	local dir
 	for dir in ${QT4_TARGET_DIRECTORIES}; do
 		pushd ${dir} >/dev/null || die
@@ -371,9 +389,15 @@ qt4-build-multilib_src_compile() {
 # @DESCRIPTION:
 # Runs unit tests in all QT4_TARGET_DIRECTORIES.
 qt4-build-multilib_src_test() {
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
 	# QtMultimedia does not have any test suite (bug #332299)
 	[[ ${PN} == qtmultimedia ]] && return
 
+	qt4_prepare_env
+
 	local dir
 	for dir in ${QT4_TARGET_DIRECTORIES}; do
 		emake -j1 check -C ${dir}
@@ -385,6 +409,12 @@ qt4-build-multilib_src_test() {
 # Performs the actual installation, running 'emake install'
 # inside all QT4_TARGET_DIRECTORIES, and installing qconfigs.
 qt4-build-multilib_src_install() {
+	multilib-minimal_src_install
+}
+
+multilib_src_install() {
+	qt4_prepare_env
+
 	local dir
 	for dir in ${QT4_TARGET_DIRECTORIES}; do
 		pushd ${dir} >/dev/null || die
@@ -577,15 +607,17 @@ skip_project_generation() {
 	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
 }
 
-# @FUNCTION: symlink_tools_to_buildtree
+# @FUNCTION: qt4_symlink_tools_to_build_dir
 # @INTERNAL
 # @DESCRIPTION:
-# Symlinks generated binaries to buildtree, so they can be used during compilation time.
-symlink_tools_to_buildtree() {
+# Symlinks qtcore tools to BUILD_DIR, so they can be used during compilation.
+qt4_symlink_tools_to_build_dir() {
+	mkdir -p "${BUILD_DIR}"/bin || die
+
 	local bin
 	for bin in "${QT4_BINDIR}"/{qmake,moc,rcc,uic}; do
 		if [[ -e ${bin} ]]; then
-			ln -s "${bin}" "${S}"/bin/ || die "failed to symlink ${bin}"
+			ln -s "${bin}" "${BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
 		fi
 	done
 }

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

[Davide Pesavento]

commit:     9274dedab52676baa745224639e3c2ab1661955e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 31 01:55:09 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 02:39:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9274deda

[qt4-build-multilib.eclass] syncqt is automatically run by configure when needed.

---
 eclass/qt4-build-multilib.eclass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 8f49441..2fe2bce 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -108,10 +108,6 @@ qt4-build-multilib_src_unpack() {
 qt4-build-multilib_src_prepare() {
 	qt4_prepare_env
 
-	if [[ ${QT4_BUILD_TYPE} == live ]]; then
-		QTDIR="." ./bin/syncqt || die "syncqt failed"
-	fi
-
 	if [[ ${PN} != qtcore ]]; then
 		skip_qmake_build
 		skip_project_generation

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

[Davide Pesavento]

commit:     84b6a537ba886fca36e0e4d2cbf2d525d1f7d057
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 17:23:49 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun  1 02:39:56 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=84b6a537

[qt4-build-multilib.eclass] Respect also AR, OBJCOPY, and STRIP.

---
 eclass/qt4-build-multilib.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index f19980b..4771381 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -182,6 +182,10 @@ qt4-build-multilib_src_prepare() {
 		filter-flags -fgraphite-identity
 	fi
 
+	# Read also AR from the environment
+	sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \
+		configure || die "sed SYSTEM_VARIABLES failed"
+
 	# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
 	# or they will override user's flags (.qmake.cache)
 	sed -i -e '/^SYSTEM_VARIABLES=/ i \
@@ -191,7 +195,7 @@ qt4-build-multilib_src_prepare() {
 		QMakeVar set QMAKE_CXXFLAGS_DEBUG\
 		QMakeVar set QMAKE_LFLAGS_RELEASE\
 		QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
-		configure || die "sed SYSTEM_VARIABLES failed"
+		configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed"
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
@@ -281,7 +285,8 @@ qt4-build-multilib_src_prepare() {
 # Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES.
 qt4-build-multilib_src_configure() {
 	# toolchain setup
-	tc-export CC CXX
+	tc-export CC CXX OBJCOPY STRIP
+	export AR="$(tc-getAR) cqs"
 	export LD="$(tc-getCXX)"
 
 	# configure arguments

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

[Davide Pesavento]

commit:     7e71215c77b38814444820a54cf24fc7daa4ce92
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 21:39:01 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 29 21:39:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7e71215c

[qt4-build-multilib.eclass] Simplify how toolchain vars are respected.

Backported from qt5-build.eclass

---
 eclass/qt4-build-multilib.eclass | 41 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index e908604..af90b06 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -189,21 +189,16 @@ qt4-build-multilib_src_prepare() {
 		filter-flags -fgraphite-identity
 	fi
 
-	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
-	sed -e "/^SYSTEM_VARIABLES=/i \
-		CC='$(tc-getCC)'\n\
-		CXX='$(tc-getCXX)'\n\
-		CFLAGS='${CFLAGS}'\n\
-		CXXFLAGS='${CXXFLAGS}'\n\
-		LDFLAGS='${LDFLAGS}'\n\
-		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
-		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
-		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
-		-i configure \
-		|| die "sed SYSTEM_VARIABLES failed"
+	# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
+	# or they will override user's flags (.qmake.cache)
+	sed -i -e '/^SYSTEM_VARIABLES=/ i \
+		QMakeVar set QMAKE_CFLAGS_RELEASE\
+		QMakeVar set QMAKE_CFLAGS_DEBUG\
+		QMakeVar set QMAKE_CXXFLAGS_RELEASE\
+		QMakeVar set QMAKE_CXXFLAGS_DEBUG\
+		QMakeVar set QMAKE_LFLAGS_RELEASE\
+		QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
+		configure || die "sed SYSTEM_VARIABLES failed"
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
@@ -292,6 +287,10 @@ qt4-build-multilib_src_prepare() {
 # @DESCRIPTION:
 # Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES.
 qt4-build-multilib_src_configure() {
+	# toolchain setup
+	tc-export CC CXX
+	export LD="$(tc-getCXX)"
+
 	# configure arguments
 	local conf="
 		-prefix ${QT4_PREFIX}
@@ -385,8 +384,8 @@ qt4-build-multilib_src_configure() {
 		pushd ${dir} >/dev/null || die
 		einfo "Running qmake in: ${dir}"
 		"${S}"/bin/qmake \
-			"LIBS+=-L${QT4_LIBDIR}" \
-			"CONFIG+=nostrip" \
+			LIBS+=-L"${QT4_LIBDIR}" \
+			CONFIG+=nostrip \
 			|| die "qmake failed"
 		popd >/dev/null || die
 	done
@@ -399,13 +398,7 @@ qt4-build-multilib_src_compile() {
 	local dir
 	for dir in ${QT4_TARGET_DIRECTORIES}; do
 		pushd ${dir} >/dev/null || die
-		emake \
-			AR="$(tc-getAR) cqs" \
-			CC="$(tc-getCC)" \
-			CXX="$(tc-getCXX)" \
-			LINK="$(tc-getCXX)" \
-			RANLIB=":" \
-			STRIP=":"
+		emake
 		popd >/dev/null || die
 	done
 }

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

[Davide Pesavento]

commit:     6d5c381970990e7b81ee2e40b4072140cfbc2a11
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 17:39:34 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 29 17:39:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6d5c3819

[qt4-build-multilib.eclass] Always extract doc.pri, qpluginbase.pri, src.pro, tools.pro

---
 eclass/qt4-build-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index abfad52..e908604 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -116,8 +116,8 @@ qt4-build-multilib_src_unpack() {
 			local tarball="${MY_P}.tar.gz" target= targets=
 			# On MacOS we need src/gui/kernel/qapplication_mac.mm for platform detection
 			for target in \
-				bin config.tests configure LICENSE.GPL3 LICENSE.LGPL mkspecs \
-				projects.pro qmake src/{qbase,qt_install,qt_targets}.pri \
+				bin config.tests configure doc/doc.pri LICENSE.GPL3 mkspecs projects.pro qmake \
+				src/{plugins/qpluginbase,qbase,qt_install,qt_targets}.pri {src/src,tools/tools}.pro \
 				$([[ ${CHOST} == *-apple-darwin* ]] && echo src/gui/kernel/qapplication_mac.mm) \
 				${QT4_EXTRACT_DIRECTORIES}
 			do

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

[Davide Pesavento]

commit:     b9745751e2d1fe089a68ba54849c73037575d8a6
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 10:55:19 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 10:55:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b9745751

[qt4-build-multilib.eclass] Improve description of qt4_get_mkspec().

---
 eclass/qt4-build-multilib.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 15799c7..abfad52 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -705,10 +705,9 @@ fix_includes() {
 }
 
 # @FUNCTION: qt4_get_mkspec
-# @RETURN: the specs-directory w/o path
 # @INTERNAL
 # @DESCRIPTION:
-# Allows us to define which mkspecs dir we want to use.
+# Returns the right mkspec for the current CHOST/CXX combination.
 qt4_get_mkspec() {
 	local spec=
 

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

[Davide Pesavento]

commit:     1586bcba38ebe9f6a8922bb735b3d0eeaa534bb5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 02:41:25 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 02:41:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1586bcba

[qt4-build-multilib.eclass] Improve and rename qt_mkspecs_dir().

---
 eclass/qt4-build-multilib.eclass | 84 ++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 659b369..fb290ae 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -167,12 +167,9 @@ qt4-build-multilib_src_prepare() {
 	fi
 
 	if use_if_iuse aqua; then
-		# provide a proper macx-g++-64
-		use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
-
 		sed -e '/^CONFIG/s:app_bundle::' \
 			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
-			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+			-i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
 	fi
 
 	# Bug 261632
@@ -216,7 +213,7 @@ qt4-build-multilib_src_prepare() {
 		|| die "sed config.tests failed"
 
 	# Bug 172219
-	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
@@ -278,12 +275,12 @@ qt4-build-multilib_src_prepare() {
 
 	# we need some patches for Solaris
 	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
-		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+		mkspecs/$(qt4_get_mkspec)/qmake.conf || die
 	# use GCC over SunStudio
 	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
 	# do not flirt with non-Prefix stuff, we're quite possessive
 	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
-		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+		mkspecs/$(qt4_get_mkspec)/qmake.conf || die
 
 	# apply patches
 	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
@@ -326,7 +323,7 @@ qt4-build-multilib_src_configure() {
 		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
 	esac
 
-	conf+=" -platform $(qt_mkspecs_dir)"
+	conf+=" -platform $(qt4_get_mkspec)"
 
 	# debug/release
 	if use_if_iuse debug; then
@@ -506,7 +503,7 @@ qt4_prepare_env() {
 	QT4_SYSCONFDIR=${EPREFIX}/etc/qt4
 	QMAKE_LIBDIR_QT=${QT4_LIBDIR}
 
-	PLATFORM=$(qt_mkspecs_dir)
+	PLATFORM=$(qt4_get_mkspec)
 	unset QMAKESPEC
 
 	export XDG_CONFIG_HOME="${T}"
@@ -710,58 +707,69 @@ fix_includes() {
 	fi
 }
 
-# @FUNCTION: qt_mkspecs_dir
+# @FUNCTION: qt4_get_mkspec
 # @RETURN: the specs-directory w/o path
 # @INTERNAL
 # @DESCRIPTION:
 # Allows us to define which mkspecs dir we want to use.
-qt_mkspecs_dir() {
+qt4_get_mkspec() {
 	local spec=
 
-	case "${CHOST}" in
+	case ${CHOST} in
+		*-linux*)
+			spec=linux ;;
+		*-darwin*)
+			use_if_iuse aqua &&
+				spec=macx ||   # mac with carbon/cocoa
+				spec=darwin ;; # darwin/mac with X11
 		*-freebsd*|*-dragonfly*)
 			spec=freebsd ;;
-		*-openbsd*)
-			spec=openbsd ;;
 		*-netbsd*)
 			spec=netbsd ;;
-		*-darwin*)
-			if use_if_iuse aqua; then
-				# mac with carbon/cocoa
-				spec=macx
-			else
-				# darwin/mac with x11
-				spec=darwin
-			fi
-			;;
+		*-openbsd*)
+			spec=openbsd ;;
+		*-aix*)
+			spec=aix ;;
+		hppa*-hpux*)
+			spec=hpux ;;
+		ia64*-hpux*)
+			spec=hpuxi ;;
 		*-solaris*)
 			spec=solaris ;;
-		*-linux-*|*-linux)
-			spec=linux ;;
 		*)
-			die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
+			die "${FUNCNAME}(): Unsupported CHOST '${CHOST}'" ;;
 	esac
 
-	case "$(tc-getCXX)" in
+	case $(tc-getCXX) in
 		*g++*)
 			spec+=-g++ ;;
-		*icpc*)
-			spec+=-icc ;;
 		*clang*)
-			spec+=-clang ;;
+			if [[ -d ${S}/mkspecs/unsupported/${spec}-clang ]]; then
+				spec=unsupported/${spec}-clang
+			else
+				ewarn "${spec}-clang mkspec does not exist, falling back to ${spec}-g++"
+				spec+=-g++
+			fi ;;
+		*icpc*)
+			if [[ -d ${S}/mkspecs/${spec}-icc ]]; then
+				spec+=-icc
+			else
+				ewarn "${spec}-icc mkspec does not exist, falling back to ${spec}-g++"
+				spec+=-g++
+			fi ;;
 		*)
-			die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
+			die "${FUNCNAME}(): Unsupported compiler '$(tc-getCXX)'" ;;
 	esac
 
-	# Add -64 for 64bit profiles
-	if use x64-freebsd ||
-		use amd64-linux ||
+	# Add -64 for 64-bit prefix profiles
+	if use amd64-linux || use ia64-linux || use ppc64-linux ||
 		use x64-macos ||
-		use x64-solaris ||
-		use sparc64-solaris
+		use sparc64-freebsd || use x64-freebsd || use x64-openbsd ||
+		use ia64-hpux ||
+		use sparc64-solaris || use x64-solaris
 	then
-		spec+=-64
+		[[ -d ${S}/mkspecs/${spec}-64 ]] && spec+=-64
 	fi
 
-	echo "${spec}"
+	echo ${spec}
 }

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

[Davide Pesavento]

commit:     1c01ff4e90283b0f9e286d2953a0e12a13840026
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 26 23:44:55 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 26 23:44:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1c01ff4e

[qt4-build-multilib.eclass] Get rid of install_directories().

---
 eclass/qt4-build-multilib.eclass | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index acf3166..dd919f9 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -415,7 +415,7 @@ qt4-build-multilib_src_compile() {
 
 # @FUNCTION: qt4-build-multilib_src_test
 # @DESCRIPTION:
-# Runs tests only in target directories.
+# Runs unit tests in all QT4_TARGET_DIRECTORIES.
 qt4-build-multilib_src_test() {
 	# QtMultimedia does not have any test suite (bug #332299)
 	[[ ${PN} == qtmultimedia ]] && return
@@ -428,9 +428,16 @@ qt4-build-multilib_src_test() {
 
 # @FUNCTION: qt4-build-multilib_src_install
 # @DESCRIPTION:
-# Perform the actual installation including some library fixes.
+# Performs the actual installation, running 'emake install'
+# inside all QT4_TARGET_DIRECTORIES, and installing qconfigs.
 qt4-build-multilib_src_install() {
-	install_directories ${QT4_TARGET_DIRECTORIES}
+	local dir
+	for dir in ${QT4_TARGET_DIRECTORIES}; do
+		pushd ${dir} >/dev/null || die
+		emake INSTALL_ROOT="${D}" install
+		popd >/dev/null || die
+	done
+
 	install_qconfigs
 	fix_library_files
 	fix_includes
@@ -495,19 +502,6 @@ qt4_prepare_env() {
 	export XDG_CONFIG_HOME="${T}"
 }
 
-# @FUNCTION: install_directories
-# @USAGE: < directories >
-# @INTERNAL
-# @DESCRIPTION:
-# Runs emake install in the given directories, which are separated by spaces.
-install_directories() {
-	for x in "$@"; do
-		pushd "${S}"/${x} >/dev/null || die
-		emake INSTALL_ROOT="${D}" install
-		popd >/dev/null || die
-	done
-}
-
 # @ECLASS-VARIABLE: QCONFIG_ADD
 # @DESCRIPTION:
 # List options that need to be added to QT_CONFIG in qconfig.pri

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

[Davide Pesavento]

commit:     a5943eeb2515e08a9fb4b3b21315ba57980458ba
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 02:43:14 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 02:43:14 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a5943eeb

[qt4-build-multilib.eclass] No need to define PLATFORM.

We already pass the mkspec to configure via "-platform <foo>",
which should have the same effect.

---
 eclass/qt4-build-multilib.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index fb290ae..15799c7 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -503,9 +503,6 @@ qt4_prepare_env() {
 	QT4_SYSCONFDIR=${EPREFIX}/etc/qt4
 	QMAKE_LIBDIR_QT=${QT4_LIBDIR}
 
-	PLATFORM=$(qt4_get_mkspec)
-	unset QMAKESPEC
-
 	export XDG_CONFIG_HOME="${T}"
 }
 

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

[Davide Pesavento]

commit:     646a897c283518ca5825aea3eeee338dfe6bcbca
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 00:38:09 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu May 22 01:05:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=646a897c

[qt4-build-multilib.eclass] New multilib-compatible eclass for building Qt4.

For now it's just a copy of qt4-build.eclass with tons of cleanups, removal
of dead code and old cruft, and general function reorganization to improve
readability. Real multilib support will be added soon. See also bug 498010.

One major change of this eclass is that all Qt4 binaries are now installed
into '/usr/$(get_libdir)/qt4/bin', similarly to Qt5.

---
 eclass/qt4-build-multilib.eclass | 758 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 758 insertions(+)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
new file mode 100644
index 0000000..b35f334
--- /dev/null
+++ b/eclass/qt4-build-multilib.eclass
@@ -0,0 +1,758 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: qt4-build-multilib.eclass
+# @MAINTAINER:
+# Qt herd <qt@gentoo.org>
+# @AUTHOR:
+# Davide Pesavento <pesa@gentoo.org>
+# @BLURB: Eclass for Qt4 split ebuilds with multilib support.
+# @DESCRIPTION:
+# This eclass contains various functions that are used when building Qt4.
+# Requires EAPI 5.
+
+case ${EAPI} in
+	5)	: ;;
+	*)	die "qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0}" ;;
+esac
+
+inherit eutils flag-o-matic multilib toolchain-funcs # TODO multilib-minimal
+
+HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="4"
+
+case ${PV} in
+	4.?.9999)
+		QT4_BUILD_TYPE="live"
+		EGIT_REPO_URI=(
+			"git://gitorious.org/qt/qt.git"
+			"https://git.gitorious.org/qt/qt.git"
+		)
+		EGIT_BRANCH=${PV%.9999}
+		inherit git-r3
+		;;
+	*)
+		QT4_BUILD_TYPE="release"
+		MY_P=qt-everywhere-opensource-src-${PV/_/-}
+		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
+		S=${WORKDIR}/${MY_P}
+		;;
+esac
+
+IUSE="aqua debug pch"
+[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
+
+DEPEND="virtual/pkgconfig"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	DEPEND+=" dev-lang/perl"
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
+
+# @FUNCTION: qt4-build-multilib_pkg_setup
+# @DESCRIPTION:
+# Sets up PATH and LD_LIBRARY_PATH.
+qt4-build-multilib_pkg_setup() {
+	# Warn users of possible breakage when downgrading to a previous release.
+	# Downgrading revisions within the same release is safe.
+	if has_version ">${CATEGORY}/${P}-r9999:4"; then
+		ewarn
+		ewarn "Downgrading Qt is completely unsupported and can break your system!"
+		ewarn
+	fi
+
+	PATH="${S}/bin${PATH:+:}${PATH}"
+	if [[ ${CHOST} != *-darwin* ]]; then
+		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+	else
+		DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
+	fi
+}
+
+# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Space-separated list including the directories that will be extracted from
+# Qt tarball.
+
+# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Arguments for build_target_directories. Takes the directories in which the
+# code should be compiled. This is a space-separated list.
+
+# @FUNCTION: qt4-build-multilib_src_unpack
+# @DESCRIPTION:
+# Unpacks the sources.
+qt4-build-multilib_src_unpack() {
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
+		ewarn
+		ewarn "Using a GCC version lower than 4.4 is not supported."
+		ewarn
+	fi
+
+	if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
+		eshopts_push -s extglob
+		if is-flagq '-g?(gdb)?([1-9])'; then
+			ewarn
+			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+			ewarn "You may experience really long compilation times and/or increased memory usage."
+			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+			ewarn "For more info check out https://bugs.gentoo.org/307861"
+			ewarn
+		fi
+		eshopts_pop
+	fi
+
+	case ${QT4_BUILD_TYPE} in
+		live)
+			git-r3_src_unpack
+			;;
+		release)
+			local tarball="${MY_P}.tar.gz" target= targets=
+			# On MacOS we need src/gui/kernel/qapplication_mac.mm for platform detection
+			for target in \
+				bin config.tests configure LICENSE.GPL3 LICENSE.LGPL mkspecs \
+				projects.pro qmake src/{qbase,qt_install,qt_targets}.pri \
+				$([[ ${CHOST} == *-apple-darwin* ]] && echo src/gui/kernel/qapplication_mac.mm) \
+				${QT4_EXTRACT_DIRECTORIES}
+			do
+				targets+="${MY_P}/${target} "
+			done
+
+			ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
+			tar -xzf "${DISTDIR}"/${tarball} ${targets}
+			eend $? || die "failed to unpack"
+			;;
+	esac
+}
+
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# PATCHES array variable containing all various patches to be applied.
+# This variable is expected to be defined in global scope of ebuild.
+# Make sure to specify the full path. This variable is utilised in
+# src_prepare() phase.
+#
+# @CODE
+#   PATCHES=( "${FILESDIR}/mypatch.patch"
+#             "${FILESDIR}/patches_folder/" )
+# @CODE
+
+# @FUNCTION: qt4-build-multilib_src_prepare
+# @DESCRIPTION:
+# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
+# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
+qt4-build-multilib_src_prepare() {
+	qt4_prepare_env
+
+	if [[ ${QT4_BUILD_TYPE} == live ]]; then
+		QTDIR="." ./bin/syncqt || die "syncqt failed"
+	fi
+
+	if [[ ${CATEGORY}/${PN} != dev-qt/qtcore ]]; then
+		skip_qmake_build
+		skip_project_generation
+		symlink_binaries_to_buildtree
+	fi
+
+	# skip X11 tests in non-gui packages to avoid spurious dependencies
+	if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns; then
+		sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure || die
+	fi
+
+	if use aqua; then
+		# provide a proper macx-g++-64
+		use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
+
+		sed -e '/^CONFIG/s:app_bundle::' \
+			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
+			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+	fi
+
+	# Bug 261632
+	if use ppc64; then
+		append-flags -mminimal-toc
+	fi
+
+	# Bug 373061
+	# qmake bus errors with -O2 or -O3 but -O1 works
+	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
+		replace-flags -O[23] -O1
+	fi
+
+	# Bug 417105
+	# graphite on gcc 4.7 causes miscompilations
+	if [[ $(gcc-version) == "4.7" ]]; then
+		filter-flags -fgraphite-identity
+	fi
+
+	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+	sed -e "/^SYSTEM_VARIABLES=/i \
+		CC='$(tc-getCC)'\n\
+		CXX='$(tc-getCXX)'\n\
+		CFLAGS='${CFLAGS}'\n\
+		CXXFLAGS='${CXXFLAGS}'\n\
+		LDFLAGS='${LDFLAGS}'\n\
+		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
+		-i configure \
+		|| die "sed SYSTEM_VARIABLES failed"
+
+	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
+			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+		|| die "sed config.tests failed"
+
+	# Bug 172219
+	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
+		# crippled (by design) :/
+		local mac_gpp_conf=
+		if [[ -f mkspecs/common/mac-g++.conf ]]; then
+			# qt < 4.8 has mac-g++.conf
+			mac_gpp_conf="mkspecs/common/mac-g++.conf"
+		elif [[ -f mkspecs/common/g++-macx.conf ]]; then
+			# qt >= 4.8 has g++-macx.conf
+			mac_gpp_conf="mkspecs/common/g++-macx.conf"
+		else
+			die "no known conf file for mac found"
+		fi
+		sed \
+			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
+			-e "s:-arch\s\w*::g" \
+			-i ${mac_gpp_conf} \
+			|| die "sed ${mac_gpp_conf} failed"
+
+		# Fix configure's -arch settings that appear in qmake/Makefile and also
+		# fix arch handling (automagically duplicates our -arch arg and breaks
+		# pch). Additionally disable Xarch support.
+		local mac_gcc_confs="${mac_gpp_conf}"
+		if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
+			mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
+		fi
+		sed \
+			-e "s:-arch i386::" \
+			-e "s:-arch ppc::" \
+			-e "s:-arch x86_64::" \
+			-e "s:-arch ppc64::" \
+			-e "s:-arch \$i::" \
+			-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
+			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
+			-e "s:-Xarch_x86_64::g" \
+			-e "s:-Xarch_ppc64::g" \
+			-i configure ${mac_gcc_confs} \
+			|| die "sed -arch/-Xarch failed"
+
+		# On Snow Leopard don't fall back to 10.5 deployment target.
+		if [[ ${CHOST} == *-apple-darwin10 ]]; then
+			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
+				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
+				-i configure ${mac_gpp_conf} \
+				|| die "sed deployment target failed"
+		fi
+	fi
+
+	# this is needed for all systems with a separate -liconv, except
+	# Darwin, for which the sources already cater for -liconv
+	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
+		sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
+			-i config.tests/unix/iconv/iconv.pro \
+			|| die "sed iconv.pro failed"
+	fi
+
+	# we need some patches for Solaris
+	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
+		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+	# use GCC over SunStudio
+	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
+	# do not flirt with non-Prefix stuff, we're quite possessive
+	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
+		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+
+	# apply patches
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	debug-print "$FUNCNAME: applying user patches"
+	epatch_user
+}
+
+# @FUNCTION: qt4-build-multilib_src_configure
+# @DESCRIPTION:
+# Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES.
+qt4-build-multilib_src_configure() {
+	# configure arguments
+	local conf="
+		-prefix ${QT4_PREFIX}
+		-bindir ${QT4_BINDIR}
+		-libdir ${QT4_LIBDIR}
+		-docdir ${QT4_DOCDIR}
+		-headerdir ${QT4_HEADERDIR}
+		-plugindir ${QT4_PLUGINDIR}
+		-importdir ${QT4_IMPORTDIR}
+		-datadir ${QT4_DATADIR}
+		-translationdir ${QT4_TRANSLATIONDIR}
+		-sysconfdir ${QT4_SYSCONFDIR}
+		-examplesdir ${QT4_EXAMPLESDIR}
+		-demosdir ${QT4_DEMOSDIR}
+		-opensource -confirm-license
+		-shared -fast -largefile -stl -verbose
+		-nomake examples -nomake demos"
+
+	# Convert tc-arch to the values supported by Qt
+	case $(tc-arch) in
+		amd64|x64-*)		  conf+=" -arch x86_64" ;;
+		ppc*-macos)		  conf+=" -arch ppc" ;;
+		ppc*)			  conf+=" -arch powerpc" ;;
+		sparc*)			  conf+=" -arch sparc" ;;
+		x86-macos)		  conf+=" -arch x86" ;;
+		x86*)			  conf+=" -arch i386" ;;
+		alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
+		hppa|sh)		  conf+=" -arch generic" ;;
+		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
+	esac
+
+	conf+=" -platform $(qt_mkspecs_dir)"
+
+	# debug/release
+	if use debug; then
+		conf+=" -debug"
+	else
+		conf+=" -release"
+	fi
+	conf+=" -no-separate-debug-info"
+
+	# exceptions USE flag
+	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
+
+	# disable rpath (bug 380415), except on prefix (bug 417169)
+	use prefix || conf+=" -no-rpath"
+
+	# precompiled headers don't work on hardened, where the flag is masked
+	conf+=" $(qt_use pch)"
+
+	# -reduce-relocations
+	# This flag seems to introduce major breakage to applications,
+	# mostly to be seen as a core dump with the message "QPixmap: Must
+	# construct a QApplication before a QPaintDevice" on Solaris.
+	#   -- Daniel Vergien
+	[[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
+
+	# this one is needed for all systems with a separate -liconv, apart from
+	# Darwin, for which the sources already cater for -liconv
+	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
+		conf+=" -liconv"
+	fi
+
+	if use aqua; then
+		# On (snow) leopard use the new (frameworked) cocoa code.
+		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
+			conf+=" -cocoa -framework"
+			# We need the source's headers, not the installed ones.
+			conf+=" -I${S}/include"
+			# Add hint for the framework location.
+			conf+=" -F${QT4_LIBDIR}"
+
+			# We are crazy and build cocoa + qt3support :-)
+			if use qt3support; then
+				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
+					-i configure || die
+			fi
+		else
+			conf+=" -no-framework"
+		fi
+	fi
+
+	conf+=" ${myconf}"
+	myconf=
+
+	einfo "Configuring with:" ${conf}
+	./configure ${conf} || die "configure failed"
+
+	local dir
+	for dir in ${QT4_TARGET_DIRECTORIES}; do
+		pushd ${dir} >/dev/null || die
+		einfo "Running qmake in: ${dir}"
+		"${S}"/bin/qmake \
+			"LIBS+=-L${QT4_LIBDIR}" \
+			"CONFIG+=nostrip" \
+			|| die "qmake failed"
+		popd >/dev/null || die
+	done
+}
+
+# @FUNCTION: qt4-build-multilib_src_compile
+# @DESCRIPTION:
+# Compiles the code in QT4_TARGET_DIRECTORIES.
+qt4-build-multilib_src_compile() {
+	local dir
+	for dir in ${QT4_TARGET_DIRECTORIES}; do
+		pushd ${dir} >/dev/null || die
+		emake \
+			AR="$(tc-getAR) cqs" \
+			CC="$(tc-getCC)" \
+			CXX="$(tc-getCXX)" \
+			LINK="$(tc-getCXX)" \
+			RANLIB=":" \
+			STRIP=":"
+		popd >/dev/null || die
+	done
+}
+
+# @FUNCTION: qt4-build-multilib_src_test
+# @DESCRIPTION:
+# Runs tests only in target directories.
+qt4-build-multilib_src_test() {
+	# QtMultimedia does not have any test suite (bug #332299)
+	[[ ${CATEGORY}/${PN} == dev-qt/qtmultimedia ]] && return
+
+	local dir
+	for dir in ${QT4_TARGET_DIRECTORIES}; do
+		emake -j1 check -C ${dir}
+	done
+}
+
+# @FUNCTION: qt4-build-multilib_src_install
+# @DESCRIPTION:
+# Perform the actual installation including some library fixes.
+qt4-build-multilib_src_install() {
+	install_directories ${QT4_TARGET_DIRECTORIES}
+	install_qconfigs
+	fix_library_files
+	fix_includes
+
+	# remove .la files since we are building only shared libraries
+	prune_libtool_files
+}
+
+# @FUNCTION: qt4-build-multilib_pkg_postinst
+# @DESCRIPTION:
+# Regenerate configuration, plus throw a message about possible
+# breakages and proposed solutions.
+qt4-build-multilib_pkg_postinst() {
+	generate_qconfigs
+}
+
+# @FUNCTION: qt4-build-multilib_pkg_postrm
+# @DESCRIPTION:
+# Regenerate configuration when the package is completely removed.
+qt4-build-multilib_pkg_postrm() {
+	generate_qconfigs
+}
+
+# @FUNCTION: qt_use
+# @USAGE: <flag> [feature] [enableval]
+# @DESCRIPTION:
+# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
+# "-no-${feature}" if it's disabled. If [feature] is not specified,
+# <flag> will be used for that. If [enableval] is not specified, the
+# "-${enableval}" prefix is omitted.
+qt_use() {
+	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+}
+
+
+######  Internal functions  ######
+
+# @FUNCTION: qt4_prepare_env
+# @INTERNAL
+# @DESCRIPTION:
+# Prepares the environment for building Qt.
+qt4_prepare_env() {
+	# setup installation directories
+	QT4_PREFIX=${EPREFIX}/usr
+	QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
+	QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
+	QT4_PCDIR=${QT4_PREFIX}/$(get_libdir)/pkgconfig
+	QT4_BINDIR=${QT4_LIBDIR}/bin
+	QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
+	QT4_IMPORTDIR=${QT4_LIBDIR}/imports
+	QT4_DATADIR=${QT4_PREFIX}/share/qt4
+	QT4_DOCDIR=${QT4_PREFIX}/share/doc/qt-${PV}
+	QT4_TRANSLATIONDIR=${QT4_DATADIR}/translations
+	QT4_EXAMPLESDIR=${QT4_DATADIR}/examples
+	QT4_DEMOSDIR=${QT4_DATADIR}/demos
+	QT4_SYSCONFDIR=${EPREFIX}/etc/qt4
+	QMAKE_LIBDIR_QT=${QT4_LIBDIR}
+
+	PLATFORM=$(qt_mkspecs_dir)
+	unset QMAKESPEC
+
+	export XDG_CONFIG_HOME="${T}"
+}
+
+# @FUNCTION: install_directories
+# @USAGE: < directories >
+# @INTERNAL
+# @DESCRIPTION:
+# Runs emake install in the given directories, which are separated by spaces.
+install_directories() {
+	for x in "$@"; do
+		pushd "${S}"/${x} >/dev/null || die
+		emake INSTALL_ROOT="${D}" install
+		popd >/dev/null || die
+	done
+}
+
+# @ECLASS-VARIABLE: QCONFIG_ADD
+# @DESCRIPTION:
+# List options that need to be added to QT_CONFIG in qconfig.pri
+: ${QCONFIG_ADD:=}
+
+# @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DESCRIPTION:
+# List options that need to be removed from QT_CONFIG in qconfig.pri
+: ${QCONFIG_REMOVE:=}
+
+# @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DESCRIPTION:
+# List variables that should be defined at the top of QtCore/qconfig.h
+: ${QCONFIG_DEFINE:=}
+
+# @FUNCTION: install_qconfigs
+# @INTERNAL
+# @DESCRIPTION:
+# Install gentoo-specific mkspecs configurations.
+install_qconfigs() {
+	local x
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
+		for x in QCONFIG_ADD QCONFIG_REMOVE; do
+			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
+		done
+		insinto ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
+		doins "${T}"/${PN}-qconfig.pri
+	fi
+
+	if [[ -n ${QCONFIG_DEFINE} ]]; then
+		for x in ${QCONFIG_DEFINE}; do
+			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
+		done
+		insinto ${QT4_HEADERDIR#${EPREFIX}}/Gentoo
+		doins "${T}"/gentoo-${PN}-qconfig.h
+	fi
+}
+
+# @FUNCTION: generate_qconfigs
+# @INTERNAL
+# @DESCRIPTION:
+# Generates gentoo-specific qconfig.{h,pri}.
+generate_qconfigs() {
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == dev-qt/qtcore ]]; then
+		local x qconfig_add qconfig_remove qconfig_new
+		for x in "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
+			[[ -f ${x} ]] || continue
+			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
+			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
+		done
+
+		# these error checks do not use die because dying in pkg_post{inst,rm}
+		# just makes things worse.
+		if [[ -e "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
+			# start with the qconfig.pri that qtcore installed
+			if ! cp "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri \
+				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
+				eerror "cp qconfig failed."
+				return 1
+			fi
+
+			# generate list of QT_CONFIG entries from the existing list
+			# including qconfig_add and excluding qconfig_remove
+			for x in $(sed -n 's/^QT_CONFIG +=//p' \
+				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
+					has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
+			done
+
+			# replace the existing QT_CONFIG list with qconfig_new
+			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
+				"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
+				eerror "Sed for QT_CONFIG failed"
+				return 1
+			fi
+
+			# create Gentoo/qconfig.h
+			if [[ ! -e ${ROOT}${QT4_HEADERDIR}/Gentoo ]]; then
+				if ! mkdir -p "${ROOT}${QT4_HEADERDIR}"/Gentoo; then
+					eerror "mkdir ${QT4_HEADERDIR}/Gentoo failed"
+					return 1
+				fi
+			fi
+			: > "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
+			for x in "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
+				[[ -f ${x} ]] || continue
+				cat "${x}" >> "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
+			done
+		else
+			rm -f "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri
+			rm -f "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
+			rmdir "${ROOT}${QT4_DATADIR}"/mkspecs \
+				"${ROOT}${QT4_DATADIR}" \
+				"${ROOT}${QT4_HEADERDIR}"/Gentoo \
+				"${ROOT}${QT4_HEADERDIR}" 2>/dev/null
+		fi
+	fi
+}
+
+# @FUNCTION: skip_qmake_build
+# @INTERNAL
+# @DESCRIPTION:
+# Patches configure to skip qmake compilation, as it's already installed by qtcore.
+skip_qmake_build() {
+	sed -i -e "s:if true:if false:g" "${S}"/configure || die
+}
+
+# @FUNCTION: skip_project_generation
+# @INTERNAL
+# @DESCRIPTION:
+# Exit the script early by throwing in an exit before all of the .pro files are scanned.
+skip_project_generation() {
+	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
+}
+
+# @FUNCTION: symlink_binaries_to_buildtree
+# @INTERNAL
+# @DESCRIPTION:
+# Symlinks generated binaries to buildtree, so they can be used during compilation time.
+symlink_binaries_to_buildtree() {
+	for bin in qmake moc uic rcc; do
+		ln -s "${QT4_BINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
+	done
+}
+
+# @FUNCTION: fix_library_files
+# @INTERNAL
+# @DESCRIPTION:
+# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
+# moves the *.pc files into the pkgconfig directory.
+fix_library_files() {
+	local libfile
+	for libfile in "${D}"/${QT4_LIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
+		if [[ -e ${libfile} ]]; then
+			sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
+		fi
+	done
+
+	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations
+	for libfile in "${D}"/${QT4_LIBDIR}/pkgconfig/*.pc; do
+		if [[ -e ${libfile} ]]; then
+			sed -i -e "s:${S}/bin:${QT4_BINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
+
+		# Move .pc files into the pkgconfig directory
+		dodir ${QT4_PCDIR#${EPREFIX}}
+		mv ${libfile} "${D}"/${QT4_PCDIR}/ || die "moving ${libfile} to ${D}/${QT4_PCDIR}/ failed"
+		fi
+	done
+
+	# Don't install an empty directory
+	rmdir "${D}"/${QT4_LIBDIR}/pkgconfig
+}
+
+# @FUNCTION: fix_includes
+# @DESCRIPTION:
+# For MacOS X we need to add some symlinks when frameworks are
+# being used, to avoid complications with some more or less stupid packages.
+fix_includes() {
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		local frw dest f h rdir
+		# Some packages tend to include <Qt/...>
+		dodir "${QT4_HEADERDIR#${EPREFIX}}"/Qt
+
+		# Fake normal headers when frameworks are installed... eases life later
+		# on, make sure we use relative links though, as some ebuilds assume
+		# these dirs exist in src_install to add additional files
+		f=${QT4_HEADERDIR}
+		h=${QT4_LIBDIR}
+		while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
+			f=${f#*/}
+			h=${h#*/}
+		done
+		rdir=${h}
+		f="../"
+		while [[ ${h} == */* ]] ; do
+			f="${f}../"
+			h=${h#*/}
+		done
+		rdir="${f}${rdir}"
+
+		for frw in "${D}${QT4_LIBDIR}"/*.framework; do
+			[[ -e "${frw}"/Headers ]] || continue
+			f=$(basename ${frw})
+			dest="${QT4_HEADERDIR#${EPREFIX}}"/${f%.framework}
+			dosym "${rdir}"/${f}/Headers "${dest}"
+
+			# Link normal headers as well.
+			for hdr in "${D}/${QT4_LIBDIR}/${f}"/Headers/*; do
+				h=$(basename ${hdr})
+				dosym "../${rdir}"/${f}/Headers/${h} \
+					"${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h}
+			done
+		done
+	fi
+}
+
+# @FUNCTION: qt_mkspecs_dir
+# @RETURN: the specs-directory w/o path
+# @INTERNAL
+# @DESCRIPTION:
+# Allows us to define which mkspecs dir we want to use.
+qt_mkspecs_dir() {
+	local spec=
+
+	case "${CHOST}" in
+		*-freebsd*|*-dragonfly*)
+			spec=freebsd ;;
+		*-openbsd*)
+			spec=openbsd ;;
+		*-netbsd*)
+			spec=netbsd ;;
+		*-darwin*)
+			if use aqua; then
+				# mac with carbon/cocoa
+				spec=macx
+			else
+				# darwin/mac with x11
+				spec=darwin
+			fi
+			;;
+		*-solaris*)
+			spec=solaris ;;
+		*-linux-*|*-linux)
+			spec=linux ;;
+		*)
+			die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
+	esac
+
+	case "$(tc-getCXX)" in
+		*g++*)
+			spec+=-g++ ;;
+		*icpc*)
+			spec+=-icc ;;
+		*clang*)
+			spec+=-clang ;;
+		*)
+			die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
+	esac
+
+	# Add -64 for 64bit profiles
+	if use x64-freebsd ||
+		use amd64-linux ||
+		use x64-macos ||
+		use x64-solaris ||
+		use sparc64-solaris
+	then
+		spec+=-64
+	fi
+
+	echo "${spec}"
+}

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

[Davide Pesavento]

commit:     8d7f7f9428e4ccddf0defc051c7067d509fefcdb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 17:58:15 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 19 17:58:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8d7f7f94

[qt5-build.eclass] Add workaround for bug 497312.

---
 eclass/qt5-build.eclass | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0765c60..988eea1 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -103,7 +103,10 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${S}_build}
+case ${QT5_BUILD_TYPE} in
+	live)    : ${QT5_BUILD_DIR:=${S}_build} ;;
+	release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
+esac
 
 # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
 # @DESCRIPTION:
@@ -169,12 +172,8 @@ qt5-build_src_unpack() {
 	fi
 
 	case ${QT5_BUILD_TYPE} in
-		live)
-			git-r3_src_unpack
-			;;
-		release)
-			default
-			;;
+		live)    git-r3_src_unpack ;;
+		release) default ;;
 	esac
 }
 

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

[Davide Pesavento]

commit:     0f53bfd7eaeeba7617e03e1cffa008243ff176d9
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 17:44:21 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 19 17:44:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0f53bfd7

[qt5-build.eclass] Delete obsolete comment.

---
 eclass/qt5-build.eclass | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1f1ee24..0765c60 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,13 +17,6 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
-# @DESCRIPTION:
-# 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 eutils flag-o-matic multilib toolchain-funcs versionator virtualx
 
 HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
@@ -132,6 +125,13 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 # @DESCRIPTION:
 # Array of macros that must be defined in QtCore/qconfig.h
 
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# For proper description see virtualx.eclass man page.
+# 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}
+
 # @FUNCTION: qt5-build_pkg_setup
 # @DESCRIPTION:
 # Warns and/or dies if the user is trying to downgrade Qt.
@@ -261,7 +261,6 @@ qt5-build_src_compile() {
 # @FUNCTION: qt5-build_src_test
 # @DESCRIPTION:
 # Runs tests in target directories.
-# TODO: find a way to avoid circular deps with USE=test.
 qt5-build_src_test() {
 	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
 
@@ -396,8 +395,6 @@ qt5_prepare_env() {
 
 	if [[ ${QT5_MODULE} == "qtbase" ]]; then
 		# see mkspecs/features/qt_config.prf
-		# note: this could be the cause of bug 451456, so do it
-		#       only when really needed, i.e. for qtbase modules
 		export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
 	fi
 }

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

[Michael Palimaka]

commit:     a3d4c7bad92cb0c8b7f402e7c050484777386fbc
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May  9 19:19:18 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May  9 19:19:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a3d4c7ba

[eclass] Update copyright.

---
 eclass/qmake-utils.eclass | 2 +-
 eclass/qt4-build.eclass   | 2 +-
 eclass/qt4-r2.eclass      | 2 +-
 eclass/qt5-build.eclass   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 046690d..ff8ee05 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 64c2cab..c85653f 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.152 2013/10/14 17:29:55 pesa Exp $
 

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 5b45486..80c5f5e 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d69304d..1f1ee24 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

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

[Michael Palimaka]

commit:     03443a339ac82ab76d8fbfa85fff03954ecede33
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May  9 19:03:26 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May  9 19:03:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=03443a33

[eclass] Add workaround due to upstream changing release candidate capitalisation.

---
 eclass/qt5-build.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e681517..d69304d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -50,7 +50,8 @@ case ${PV} in
 	*_alpha*|*_beta*|*_rc*)
 		# pre-releases
 		QT5_BUILD_TYPE="release"
-		MY_P="${QT5_MODULE}-opensource-src-${PV/_/-}"
+		MY_PV="${PV/rc/RC}"
+		MY_P="${QT5_MODULE}-opensource-src-${MY_PV/_/-}"
 		SRC_URI="http://download.qt-project.org/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;

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

[Michael Palimaka]

commit:     d1d3ff20f334679c8299c1315cf20f4f557a9815
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 27 13:42:50 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 13:42:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d1d3ff20

[eclass] Add support for virtualx for tests.

---
 eclass/qt5-build.eclass | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index c607f6f..e681517 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,7 +17,14 @@ case ${EAPI} in
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# 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 eutils flag-o-matic multilib toolchain-funcs versionator virtualx
 
 HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
@@ -270,7 +277,16 @@ qt5-build_src_test() {
 
 	qt5_foreach_target_subdir qt5_qmake
 	qt5_foreach_target_subdir emake
-	qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
+
+	_test_runner() {
+		qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
+	}
+
+	if [[ ${VIRTUALX_REQUIRED} == test ]]; then
+		VIRTUALX_COMMAND="_test_runner" virtualmake
+	else
+		_test_runner
+	fi
 }
 
 # @FUNCTION: qt5-build_src_install

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

[Davide Pesavento]

commit:     c2d8ee8c88713507904d002a638c7e721efeb6fa
Author:     Uwe L. Korn <uwelk <AT> xhochy <DOT> com>
AuthorDate: Tue Mar 25 12:26:50 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Mar 26 14:16:02 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c2d8ee8c

[qt5-build.eclass] Download development release if beta is not numbered

---
 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 264e158..c607f6f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -40,7 +40,7 @@ case ${PV} in
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH="stable"
 		;;
-	*_alpha?|*_beta?|*_rc?)
+	*_alpha*|*_beta*|*_rc*)
 		# pre-releases
 		QT5_BUILD_TYPE="release"
 		MY_P="${QT5_MODULE}-opensource-src-${PV/_/-}"

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

[Davide Pesavento]

commit:     439d470f64b8c05da04c4cb3a6cb2d174cb9e543
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jan 22 17:43:28 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 17:43:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=439d470f

[qt5-build.eclass] Attempt to fix bug 451456, at least for non-qtbase modules.

---
 eclass/qt5-build.eclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 18954ef..264e158 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -377,8 +377,12 @@ qt5_prepare_env() {
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
 	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
 
-	# see mkspecs/features/qt_config.prf
-	export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
+	if [[ ${QT5_MODULE} == "qtbase" ]]; then
+		# see mkspecs/features/qt_config.prf
+		# note: this could be the cause of bug 451456, so do it
+		#       only when really needed, i.e. for qtbase modules
+		export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
+	fi
 }
 
 # @FUNCTION: qt5_symlink_tools_to_buildtree

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

[Davide Pesavento]

commit:     558ab8606afdd320d04aa45112b9406f0701c591
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 11 19:41:39 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 19:41:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=558ab860

[eclass/qt4-build] Mess with $MY_P only when needed (release builds).

---
 eclass/qt4-build.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index ada7815..64c2cab 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -26,9 +26,6 @@ fi
 HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
-MY_PV=${PV/_/-}
-MY_P=qt-everywhere-opensource-src-${MY_PV}
-
 case ${QT4_BUILD_TYPE} in
 	live)
 		EGIT_REPO_URI=(
@@ -38,6 +35,7 @@ case ${QT4_BUILD_TYPE} in
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
+		MY_P=qt-everywhere-opensource-src-${PV/_/-}
 		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		S=${WORKDIR}/${MY_P}
 		;;

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

[Davide Pesavento]

commit:     a4a0b22604bc8e75e4b6b5153b0239419143cf06
Author:     Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Sat Nov  9 12:48:52 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 12:48:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a4a0b226

[eclass/qt4-build] Set a custom $S only for release-builds.

---
 eclass/qt4-build.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 2c7c44b..ada7815 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -39,6 +39,7 @@ case ${QT4_BUILD_TYPE} in
 		;;
 	release)
 		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
+		S=${WORKDIR}/${MY_P}
 		;;
 esac
 
@@ -53,8 +54,6 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	DEPEND+=" dev-lang/perl"
 fi
 
-S=${WORKDIR}/${MY_P}
-
 # @FUNCTION: qt4-build_pkg_setup
 # @DESCRIPTION:
 # Sets up PATH and LD_LIBRARY_PATH.

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

[Davide Pesavento]

commit:     dd37d2106f6107d19f4df8c3d5c0162b85b60074
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Oct 23 15:05:27 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 15:05:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dd37d210

[qt5-build.eclass] Introduce qt_use_disable_mod() utility function.

---
 eclass/qt5-build.eclass | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2ba8621..18954ef 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -329,6 +329,29 @@ qt_use() {
 	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
 }
 
+# @FUNCTION: qt_use_disable_mod
+# @USAGE: <flag> <module> <files...>
+# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+# <module> is the (lowercase) name of a Qt5 module.
+# <files...> is a list of one or more qmake project files.
+#
+# This function patches <files> to treat <module> as not installed
+# when <flag> is disabled, otherwise it does nothing.
+# This can be useful to avoid an automagic dependency when the module
+# is present on the system but the corresponding USE flag is disabled.
+qt_use_disable_mod() {
+	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least 3 arguments"
+
+	local flag=$1
+	local module=$2
+	shift 2
+
+	use "${flag}" && return
+
+	echo "$@" | xargs sed -i -e "s/qtHaveModule(${module})/false/g" || die
+}
+
 
 ######  Internal functions  ######
 

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

[Davide Pesavento]

commit:     ced1ddd540fd0444d2cef4e67c91ae3aec521b9d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 23:50:05 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 23:50:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ced1ddd5

[qt5-build.eclass] Improve eclass doc slightly.

---
 eclass/qt5-build.eclass | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 97fbc52..2ba8621 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -110,16 +110,19 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 : ${QT5_VERBOSE_BUILD:=true}
 
 # @ECLASS-VARIABLE: QCONFIG_ADD
+# @DEFAULT_UNSET
 # @DESCRIPTION:
-# List of options that need to be added to QT_CONFIG in qconfig.pri
+# Array of options that must be added to QT_CONFIG in qconfig.pri
 
 # @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
-# List of options that need to be removed from QT_CONFIG in qconfig.pri
+# Array of options that must be removed from QT_CONFIG in qconfig.pri
 
 # @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
-# List of variables that should be defined at the top of QtCore/qconfig.h
+# Array of macros that must be defined in QtCore/qconfig.h
 
 # @FUNCTION: qt5-build_pkg_setup
 # @DESCRIPTION:
@@ -139,18 +142,20 @@ qt5-build_pkg_setup() {
 # Unpacks the sources.
 qt5-build_src_unpack() {
 	if ! version_is_at_least 4.4 $(gcc-version); then
+		ewarn
 		ewarn "Using a GCC version lower than 4.4 is not supported."
+		ewarn
 	fi
 
 	if [[ ${PN} == "qtwebkit" ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
+			ewarn
 			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
 			ewarn "You may experience really long compilation times and/or increased memory usage."
 			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
 			ewarn "For more info check out https://bugs.gentoo.org/307861"
-			echo
+			ewarn
 		fi
 		eshopts_pop
 	fi

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

[Davide Pesavento]

commit:     3d7c330ccd0a49f454c54ed5121e7dd72c3414b7
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Tue Oct 22 21:51:59 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 21:51:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3d7c330c

eclass/qt5-build: fix empty #define, caused by non-array empty string QCONFIG_DEFINE

---
 eclass/qt5-build.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f63b639..97fbc52 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -112,17 +112,14 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 # @ECLASS-VARIABLE: QCONFIG_ADD
 # @DESCRIPTION:
 # List of options that need to be added to QT_CONFIG in qconfig.pri
-: ${QCONFIG_ADD:=}
 
 # @ECLASS-VARIABLE: QCONFIG_REMOVE
 # @DESCRIPTION:
 # List of options that need to be removed from QT_CONFIG in qconfig.pri
-: ${QCONFIG_REMOVE:=}
 
 # @ECLASS-VARIABLE: QCONFIG_DEFINE
 # @DESCRIPTION:
 # List of variables that should be defined at the top of QtCore/qconfig.h
-: ${QCONFIG_DEFINE:=}
 
 # @FUNCTION: qt5-build_pkg_setup
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     e9ca1f5435a223d0a881f1b696d013f963155158
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Oct 20 21:21:35 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 21:21:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e9ca1f54

[qt4-build.eclass] Don't die on downgrade, just warn the user.

---
 eclass/qt4-build.eclass | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 5ca3423..2c7c44b 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -59,16 +59,12 @@ S=${WORKDIR}/${MY_P}
 # @DESCRIPTION:
 # Sets up PATH and LD_LIBRARY_PATH.
 qt4-build_pkg_setup() {
-	# Protect users by not allowing downgrades between releases.
-	# Downgrading revisions within the same release should be allowed.
+	# Warn users of possible breakage when downgrading to a previous release.
+	# Downgrading revisions within the same release is safe.
 	if has_version ">${CATEGORY}/${P}-r9999:4"; then
-		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			eerror "    ***  Sanity check to keep you from breaking your system  ***"
-			eerror "Downgrading Qt is completely unsupported and will break your system!"
-			die "aborting to save your system"
-		else
-			ewarn "Downgrading Qt is completely unsupported and will break your system!"
-		fi
+		ewarn
+		ewarn "Downgrading Qt is completely unsupported and can break your system!"
+		ewarn
 	fi
 
 	PATH="${S}/bin${PATH:+:}${PATH}"
@@ -112,12 +108,12 @@ qt4-build_src_unpack() {
 	if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
 		eshopts_push -s extglob
 		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
+			ewarn
 			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
 			ewarn "You may experience really long compilation times and/or increased memory usage."
 			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
 			ewarn "For more info check out https://bugs.gentoo.org/307861"
-			echo
+			ewarn
 		fi
 		eshopts_pop
 	fi

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

[Davide Pesavento]

commit:     7506779fe45bbbf3c2ba924d66c108a91fc82994
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Oct 14 17:32:56 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 17:32:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7506779f

[qt4-build.eclass] Sync with portage.

---
 eclass/qt4-build.eclass | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 1fce381..3162f18 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.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-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.152 2013/10/14 17:29:55 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -103,6 +103,8 @@ qt4-build_src_unpack() {
 
 	if ! version_is_at_least 4.1 $(gcc-version); then
 		ewarn "Using a GCC version lower than 4.1 is not supported."
+	elif use_if_iuse c++0x && ! version_is_at_least 4.4 $(gcc-version); then
+		ewarn "USE=c++0x requires GCC 4.4 or later."
 	fi
 
 	if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
@@ -163,7 +165,7 @@ qt4-build_src_prepare() {
 	fi
 
 	# avoid X11 dependency in non-gui packages
-	local nolibx11_pkgs="qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
+	local nolibx11_pkgs="qtbearer qtcore qtdbus qtscript qtsql qttest qtxmlpatterns"
 	has ${PN} ${nolibx11_pkgs} && qt_nolibx11
 
 	if use aqua; then
@@ -181,37 +183,27 @@ qt4-build_src_prepare() {
 		symlink_binaries_to_buildtree
 	fi
 
-	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-		# qmake bus errors with -O2 or -O3 but -O1 works
-		# Bug 373061
-		replace-flags -O[23] -O1
-	fi
-
-	# Bug 178652
-	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
-		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
-		append-flags -fno-gcse
-	fi
-
 	if use_if_iuse c++0x; then
 		append-cxxflags -std=c++0x
 	fi
 
-	# Unsupported old gcc versions - hardened needs this :(
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		ewarn "Appending -fno-stack-protector to CXXFLAGS"
-		append-cxxflags -fno-stack-protector
-		# Bug 253127
-		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
-			-i mkspecs/common/g++.conf || die
-	fi
-
 	# Bug 261632
 	if use ppc64; then
-		ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
 		append-flags -mminimal-toc
 	fi
 
+	# Bug 373061
+	# qmake bus errors with -O2 or -O3 but -O1 works
+	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
+		replace-flags -O[23] -O1
+	fi
+
+	# Bug 417105
+	# graphite on gcc 4.7 causes miscompilations
+	if [[ $(gcc-version) == "4.7" ]]; then
+		filter-flags -fgraphite-identity
+	fi
+
 	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
 	sed -e "/^SYSTEM_VARIABLES=/i \
 		CC='$(tc-getCC)'\n\

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

[Davide Pesavento]

commit:     782439cfd69d67fad1f50b1e3ca3a68b44100a24
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Oct  7 23:29:52 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 23:29:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=782439cf

[qt{4,5}-build] Switch to git-r3 eclass.

---
 eclass/qt4-build.eclass | 10 ++++++----
 eclass/qt5-build.eclass | 13 ++++++-------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index ba0ed38..1fce381 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -18,7 +18,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
 if [[ ${PV} == *9999* ]]; then
 	QT4_BUILD_TYPE="live"
-	inherit git-2
+	inherit git-r3
 else
 	QT4_BUILD_TYPE="release"
 fi
@@ -31,8 +31,10 @@ MY_P=qt-everywhere-opensource-src-${MY_PV}
 
 case ${QT4_BUILD_TYPE} in
 	live)
-		EGIT_REPO_URI="git://gitorious.org/qt/qt.git
-			https://git.gitorious.org/qt/qt.git"
+		EGIT_REPO_URI=(
+			"git://gitorious.org/qt/qt.git"
+			"https://git.gitorious.org/qt/qt.git"
+		)
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
@@ -118,7 +120,7 @@ qt4-build_src_unpack() {
 
 	case ${QT4_BUILD_TYPE} in
 		live)
-			git-2_src_unpack
+			git-r3_src_unpack
 			;;
 		release)
 			local tarball="${MY_P}.tar.gz" target= targets=

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b55680d..eb511ec 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -56,12 +56,11 @@ case ${PV} in
 		;;
 esac
 
-if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
-	EGIT_PROJECT=${QT5_MODULE}
-	EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
-		https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
-	inherit git-2
-fi
+EGIT_REPO_URI=(
+	"git://gitorious.org/qt/${QT5_MODULE}.git"
+	"https://git.gitorious.org/qt/${QT5_MODULE}.git"
+)
+[[ ${QT5_BUILD_TYPE} == "live" ]] && inherit git-r3
 
 IUSE="+c++11 debug test"
 
@@ -161,7 +160,7 @@ qt5-build_src_unpack() {
 
 	case ${QT5_BUILD_TYPE} in
 		live)
-			git-2_src_unpack
+			git-r3_src_unpack
 			;;
 		release)
 			default

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

[Davide Pesavento]

commit:     fe762c420faf977896ef80d1aa026a90b47541c0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jul 28 00:01:04 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 00:01:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe762c42

[qt4-build.eclass] Fix bug 478018.

---
 eclass/qt4-build.eclass | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 0ca15d7..ba0ed38 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.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-build.eclass,v 1.147 2013/07/06 07:57:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.148 2013/07/27 23:47:20 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -804,10 +804,9 @@ qt_mkspecs_dir() {
 # @FUNCTION: qt_nolibx11
 # @INTERNAL
 # @DESCRIPTION:
-# Ignore X11 tests for packages that don't need X libraries installed.
+# Skip X11 tests for packages that don't need X libraries installed.
 qt_nolibx11() {
-	sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
-		die "x11 check sed failed"
+	sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' "${S}"/configure || die
 }
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

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

[Davide Pesavento]

commit:     d24c3971b085d1c4386f187ef2bbc25865d343d6
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Jul  6 08:00:52 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 08:00:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d24c3971

[qt4-build.eclass] Update SRC_URI. Drop support for EAPI 3.

---
 eclass/qt4-build.eclass | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 8a99acb..0ca15d7 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.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-build.eclass,v 1.146 2013/04/28 16:15:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.147 2013/07/06 07:57:14 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -10,7 +10,7 @@
 # This eclass contains various functions that are used when building Qt4.
 
 case ${EAPI} in
-	3|4|5)	: ;;
+	4|5)	: ;;
 	*)	die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
@@ -36,7 +36,7 @@ case ${QT4_BUILD_TYPE} in
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
-		SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
+		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
 		;;
 esac
 
@@ -552,8 +552,7 @@ build_directories() {
 			CXX="$(tc-getCXX)" \
 			LINK="$(tc-getCXX)" \
 			RANLIB=":" \
-			STRIP=":" \
-			|| die "emake failed"
+			STRIP=":"
 		popd >/dev/null || die
 	done
 }
@@ -566,7 +565,7 @@ build_directories() {
 install_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
-		emake INSTALL_ROOT="${D}" install || die "emake install failed"
+		emake INSTALL_ROOT="${D}" install
 		popd >/dev/null || die
 	done
 }
@@ -597,7 +596,7 @@ install_qconfigs() {
 			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
 		done
 		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
+		doins "${T}"/${PN}-qconfig.pri
 	fi
 
 	if [[ -n ${QCONFIG_DEFINE} ]]; then
@@ -605,7 +604,7 @@ install_qconfigs() {
 			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
 		done
 		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
-		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
+		doins "${T}"/gentoo-${PN}-qconfig.h
 	fi
 }
 

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

[Davide Pesavento]

commit:     1736dcd1c1bf7bb7fe9473c6363827029a91d493
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 08:13:37 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 08:13:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1736dcd1

[qt5-build.eclass] Add two new configure flags.

---
 eclass/qt5-build.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f9509da..b55680d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -420,6 +420,7 @@ qt5_base_configure() {
 		-system-zlib
 		-system-pcre
 		-system-xcb
+		-system-xkbcommon
 
 		# exclude examples and tests from default build
 		-nomake examples
@@ -453,6 +454,9 @@ qt5_base_configure() {
 		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
 		-no-gtkstyle
 
+		# don't build with -Werror
+		-no-warnings-are-errors
+
 		# module-specific options
 		"${myconf[@]}"
 	)

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

[Davide Pesavento]

commit:     62d4d313966a9a0b1292a3592623ec44af112634
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 02:08:16 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 02:08:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=62d4d313

[qt4-build.eclass] Sync with portage.

---
 eclass/qt4-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index af6e252..8a99acb 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.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-build.eclass,v 1.144 2013/03/03 00:22:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.146 2013/04/28 16:15:33 zmedico Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -152,7 +152,7 @@ qt4-build_src_unpack() {
 # @FUNCTION: qt4-build_src_prepare
 # @DESCRIPTION:
 # Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
-# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
+# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
 qt4-build_src_prepare() {
 	setqtenv
 

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

[Davide Pesavento]

commit:     41454997385e24245f668faec27a434a6bf2f3ab
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 02:03:34 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 02:03:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=41454997

[qmake-utils.eclass] Restore compatibility with all EAPIs.

---
 eclass/qmake-utils.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index baf4ed4..046690d 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -10,16 +10,10 @@
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
-# Requires EAPI=2 or later.
 
 if [[ ${___ECLASS_ONCE_QMAKE_UTILS} != "recur -_+^+_- spank" ]]; then
 ___ECLASS_ONCE_QMAKE_UTILS="recur -_+^+_- spank"
 
-case ${EAPI} in
-	2|3|4|5) : ;;
-	*)	 die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
 inherit eutils multilib toolchain-funcs
 
 # @FUNCTION: qmake-utils_find_pro_file
@@ -83,7 +77,7 @@ qmake-utils_find_pro_file() {
 eqmake4() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
+	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
 
 	ebegin "Running qmake"
 
@@ -213,7 +207,7 @@ eqmake4() {
 eqmake5() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
+	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
 
 	ebegin "Running qmake"
 

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

[Davide Pesavento]

commit:     9dd835e0234f36f9ea9478eab8eee0743fc10582
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 01:54:42 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 01:54:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9dd835e0

[qmake-utils.eclass] Add inclusion guard.

---
 eclass/qmake-utils.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index eddff63..baf4ed4 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -12,6 +12,9 @@
 # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
 # Requires EAPI=2 or later.
 
+if [[ ${___ECLASS_ONCE_QMAKE_UTILS} != "recur -_+^+_- spank" ]]; then
+___ECLASS_ONCE_QMAKE_UTILS="recur -_+^+_- spank"
+
 case ${EAPI} in
 	2|3|4|5) : ;;
 	*)	 die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}" ;;
@@ -244,3 +247,5 @@ eqmake5() {
 		die "eqmake5 failed"
 	fi
 }
+
+fi

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

[Davide Pesavento]

commit:     ffba5311dd6567eec1f27502d672d70e24dcf919
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 01:44:41 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 01:45:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ffba5311

[qmake-utils.eclass] Add qmake-utils_find_pro_file(). Sync with portage.

---
 eclass/qmake-utils.eclass | 76 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 10 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 6fa2734..eddff63 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -17,7 +17,50 @@ case ${EAPI} in
 	*)	 die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
+
+# @FUNCTION: qmake-utils_find_pro_file
+# @RETURN: zero or one qmake .pro file names
+# @INTERNAL
+# @DESCRIPTION:
+# Outputs a project file name that can be passed to eqmake.
+#   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 one of them.
+qmake-utils_find_pro_file() {
+	local dir_name=$(basename "${S}")
+
+	# set nullglob to avoid expanding *.pro to the literal
+	# string "*.pro" when there are no matching files
+	eshopts_push -s nullglob
+	local pro_files=(*.pro)
+	eshopts_pop
+
+	case ${#pro_files[@]} in
+	0)
+		: ;;
+	1)
+		echo "${pro_files}"
+		;;
+	*)
+		for pro_file in "${pro_files[@]}"; do
+			if [[ ${pro_file%.pro} == ${dir_name} || ${pro_file%.pro} == ${PN} ]]; then
+				echo "${pro_file}"
+				break
+			fi
+		done
+		;;
+	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]
@@ -28,8 +71,9 @@ inherit multilib toolchain-funcs
 # 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 eqmake5 on the top-level project file only, unless you
+# 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.
@@ -46,7 +90,7 @@ eqmake4() {
 	# if not, then search for it
 	local regexp='.*\.pro'
 	if ! [[ ${1} =~ ${regexp} ]]; then
-		local project_file=$(_find_project_file)
+		local project_file=$(qmake-utils_find_pro_file)
 		if [[ -z ${project_file} ]]; then
 			echo
 			eerror "No project files found in '${PWD}'!"
@@ -65,6 +109,7 @@ eqmake4() {
 		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;
@@ -87,16 +132,25 @@ eqmake4() {
 			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
@@ -105,6 +159,8 @@ eqmake4() {
 		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) \

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

[Davide Pesavento]

commit:     1e8e3e08681f961ef40bda2a46095da22311ec15
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 01:47:33 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 01:47:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1e8e3e08

[qt4-r2.eclass] Inherit and use qmake-utils.eclass

---
 eclass/qt4-r2.eclass | 155 +--------------------------------------------------
 1 file changed, 2 insertions(+), 153 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 7b2766f..5b45486 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -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}"
 
@@ -113,7 +113,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}"
@@ -156,157 +156,6 @@ qt4-r2_src_install() {
 	[[ -n ${LANGS} || -n ${LANGSLONG} ]] && qt4-r2_install_translations
 }
 
-# @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
-# strong reasons to do things differently. During the building, qmake
-# will be automatically re-invoked with the right arguments on every
-# directory specified inside the top-level project file.
-eqmake4() {
-	[[ ${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 http://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;
-			}'
-	local file=
-	while read file; do
-		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)
-
-	"${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 http://bugs.gentoo.org/"
-		echo
-		die "eqmake4 failed"
-	fi
-
-	return 0
-}
-
-# 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
-}
-
 # @FUNCTION: qt4-r2_install_translations
 # @DESCRIPTION:
 # Choose and install translation files. Normally you don't need to call

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

[Davide Pesavento]

commit:     d11a5636128d2fa3c8be327e270396e9879d113b
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri May 31 09:02:34 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 31 09:02:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d11a5636

First version of qmake-utils.eclass

---
 eclass/qmake-utils.eclass | 190 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 190 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
new file mode 100644
index 0000000..6fa2734
--- /dev/null
+++ b/eclass/qmake-utils.eclass
@@ -0,0 +1,190 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: qmake-utils.eclass
+# @MAINTAINER:
+# Qt herd <qt@gentoo.org>
+# @AUTHOR:
+# Davide Pesavento <pesa@gentoo.org>
+# @BLURB: Common functions for qmake-based packages.
+# @DESCRIPTION:
+# Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
+# Requires EAPI=2 or later.
+
+case ${EAPI} in
+	2|3|4|5) : ;;
+	*)	 die "qmake-utils.eclass: unsupported EAPI=${EAPI:-0}" ;;
+esac
+
+inherit multilib toolchain-funcs
+
+# @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 eqmake5 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;
+			}'
+	local file=
+	while read file; do
+		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)
+
+	"${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
+}
+
+# @FUNCTION: eqmake5
+# @USAGE: [arguments for qmake]
+# @DESCRIPTION:
+# Wrapper for Qt5's qmake. All arguments are passed to qmake.
+#
+# For recursive build systems, i.e. those based on the subdirs template,
+# you should run eqmake5 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.
+eqmake5() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
+
+	ebegin "Running qmake"
+
+	"${EPREFIX}"/usr/$(get_libdir)/qt5/bin/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= \
+		"$@"
+
+	# 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 "eqmake5 failed"
+	fi
+}

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

[Davide Pesavento]

commit:     87497323f590c38927fdfea0cdcf48ab694609e8
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Apr  7 13:18:04 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 13:18:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=87497323

[qt5-build.eclass] Switch to new download URLs.

---
 eclass/qt5-build.eclass |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1a9977d..41af502 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -31,17 +31,27 @@ SLOT="5"
 
 case ${PV} in
 	5.9999)
+		# git dev branch
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH="dev"
 		;;
 	5.?.9999)
+		# git stable branch
 		QT5_BUILD_TYPE="live"
 		EGIT_BRANCH="stable"
 		;;
-	*)
+	*_alpha?|*_beta?|*_rc?)
+		# pre-releases
 		QT5_BUILD_TYPE="release"
 		MY_P="${QT5_MODULE}-opensource-src-${PV/_/-}"
-		SRC_URI="http://releases.qt-project.org/qt5/${PV}/submodules_tar/${MY_P}.tar.xz"
+		SRC_URI="http://download.qt-project.org/development_releases/qt/${PV%.*}/${PV/_/-}/submodules_tar/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+		;;
+	*)
+		# official stable releases
+		QT5_BUILD_TYPE="release"
+		MY_P="${QT5_MODULE}-opensource-src-${PV}"
+		SRC_URI="http://download.qt-project.org/official_releases/qt/${PV%.*}/${PV}/submodules_tar/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

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

[Davide Pesavento]

commit:     f394aa20cf6a3a49cbd9e02417f13292fac4905c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Mar 16 08:30:13 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 08:30:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f394aa20

[qt4-build.eclass] Remove wrong sed'ing of QT_INSTALL_{LIBS,PLUGINS}.

See bug 304971 comments 16-18.

---
 eclass/qt4-build.eclass |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index e14a664..af6e252 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -527,15 +527,6 @@ setqtenv() {
 # @DESCRIPTION:
 # Generates Makefiles for the given list of directories.
 prepare_directories() {
-	# avoid running over the maximum argument number, bug #299810
-	{
-		echo "${S}"/mkspecs/common/*.conf
-		find "${S}" -name '*.pr[io]'
-	} | xargs sed -i \
-		-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
-		-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
-		|| die
-
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
 		einfo "Running qmake in: ${x}"

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

[Davide Pesavento]

commit:     e35525f62ec4f68c50bbfa6ff6b7d810620fa345
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 19:10:42 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 19:10:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e35525f6

[qt4-r2.eclass] Sync with portage.

---
 eclass/qt4-r2.eclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 3263da3..7b2766f 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -248,6 +248,7 @@ eqmake4() {
 		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= \

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

[Davide Pesavento]

commit:     7493e22d8a5b0f0d4f22e793223f009cbbfe043f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jan  3 08:41:17 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jan  3 08:41:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7493e22d

[qt4-build.eclass] Remove more dead code, spotted by Arfrever.

---
 eclass/qt4-build.eclass |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 912a567..9fd3997 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -425,15 +425,6 @@ qt4-build_src_configure() {
 		unset glibflags
 	fi
 
-	if use_if_iuse qpa; then
-		echo
-		ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
-		ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
-		ewarn "disable it before reporting any bugs related to this useflag."
-		echo
-		conf+=" -qpa"
-	fi
-
 	if use aqua; then
 		# On (snow) leopard use the new (frameworked) cocoa code.
 		if [[ ${CHOST##*-darwin} -ge 9 ]]; then

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

[Davide Pesavento]

commit:     c68366b7690a9d8c17a3e474a0021b52df39ccc3
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jan  2 00:00:39 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jan  2 00:00:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c68366b7

[qt5-build.eclass] Make qconfig.pri parsing less strict.

---
 eclass/qt5-build.eclass |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7295c8f..50fc114 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -515,28 +515,28 @@ qt5_install_module_qconfigs() {
 qt5_regenerate_global_qconfigs() {
 	einfo "Regenerating gentoo-qconfig.h"
 
-	find "${ROOT}${QT5_HEADERDIR}"/Gentoo \
+	find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \
 		-name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \
 		-execdir cat '{}' + > "${T}"/gentoo-qconfig.h
 
 	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
-	mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
+	mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
 		|| eerror "Failed to install new gentoo-qconfig.h"
 
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
-	local qconfig_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
+	local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
 	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
-		local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${qconfig_pri}")
+		local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}")
 		local new_qt_config=
 
 		# generate list of QT_CONFIG entries from the existing list,
 		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
 		eshopts_push -s nullglob
-		for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
-			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
-			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
+		for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
+			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=\s*//p' "${x}")"
+			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=\s*//p' "${x}")"
 		done
 		eshopts_pop
 		for x in ${qt_config} ${qconfig_add}; do
@@ -546,9 +546,9 @@ qt5_regenerate_global_qconfigs() {
 		done
 
 		# now replace the existing QT_CONFIG with the generated list
-		sed -i -e "s/^QT_CONFIG +=.*/QT_CONFIG +=${new_qt_config}/" \
-			"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in qconfig.pri"
+		sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \
+			"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}"
 	else
-		ewarn "'${qconfig_pri}' does not exist or is not a regular file"
+		ewarn "${qconfig_pri} does not exist or is not a regular file"
 	fi
 }

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

[Davide Pesavento]

commit:     a158d72f278fe9bfc332cddc7454f09caccd07e6
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jan  1 23:39:23 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan  1 23:39:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a158d72f

[qt5-build.eclass] Fix qconfig processing: don't assume that ${PN} starts with "qt-".

---
 eclass/qt5-build.eclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8c1b6d3..7295c8f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -515,8 +515,9 @@ qt5_install_module_qconfigs() {
 qt5_regenerate_global_qconfigs() {
 	einfo "Regenerating gentoo-qconfig.h"
 
-	find "${ROOT}${QT5_HEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \
-		-exec cat {} + > "${T}"/gentoo-qconfig.h
+	find "${ROOT}${QT5_HEADERDIR}"/Gentoo \
+		-name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \
+		-execdir cat '{}' + > "${T}"/gentoo-qconfig.h
 
 	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
 	mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
@@ -533,7 +534,7 @@ qt5_regenerate_global_qconfigs() {
 		# generate list of QT_CONFIG entries from the existing list,
 		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
 		eshopts_push -s nullglob
-		for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
+		for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
 			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
 			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
 		done

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

[Davide Pesavento]

commit:     9b5308c4f7e8a41a48311d85c4b9e6fc9ff83293
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Dec 31 06:27:09 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 06:27:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b5308c4

[qt4-build.eclass] Remove dead code.

---
 eclass/qt4-build.eclass |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 27d51a7..1ddca1a 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -36,20 +36,13 @@ case ${QT4_BUILD_TYPE} in
 		EGIT_BRANCH=${PV%.9999}
 		;;
 	release)
-		if version_is_at_least 4.8.1; then
-			SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
-		else
-			SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
-		fi
+		SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
 		;;
 esac
 
 IUSE="aqua debug pch"
 [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]] && IUSE+=" +exceptions"
-if version_is_at_least 4.8; then
-	[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
-	version_is_at_least 4.8.3 || IUSE+=" qpa"
-fi
+[[ ${CATEGORY}/${PN} != x11-libs/qt-webkit ]] && IUSE+=" c++0x"
 
 DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
@@ -279,11 +272,6 @@ qt4-build_src_prepare() {
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"
 
-	if ! version_is_at_least 4.8; then
-		# Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
-		sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
-	fi
-
 	# Bug 172219
 	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 
@@ -411,9 +399,8 @@ qt4-build_src_configure() {
 	# exceptions USE flag
 	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
 
-	# disable rpath on Qt >= 4.8 (bug 380415)
-	# but leave it enabled on prefix (bug 417169)
-	version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath"
+	# disable rpath (bug 380415), except on prefix (bug 417169)
+	use prefix || conf+=" -no-rpath"
 
 	# precompiled headers don't work on hardened, where the flag is masked
 	conf+=" $(qt_use pch)"

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

[Davide Pesavento]

commit:     3ae74b4dd12500aed5d229e6da9736e3a4c8807d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Dec 22 03:31:48 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 03:31:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3ae74b4d

[qt4-build.eclass] Tweak sed to match against Qt 4.8.4 too.

Thanks to Tomasz Mloduchowski <q <AT> qdot.me> for spotting the regression.

---
 eclass/qt4-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index b584cf1..27d51a7 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -274,7 +274,7 @@ qt4-build_src_prepare() {
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
+		sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
 			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"

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

[Davide Pesavento]

commit:     1c011848ec967c6281c5aec1c5a5322dac3fa414
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Dec 22 03:29:33 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 03:29:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1c011848

[qt5-build.eclass] Delete obsolete TODO.

---
 eclass/qt5-build.eclass |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 572067b..8c1b6d3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -260,7 +260,6 @@ qt5-build_src_test() {
 # @FUNCTION: qt5-build_src_install
 # @DESCRIPTION:
 # Performs the actual installation of target directories.
-# TODO: pkgconfig files are installed in the wrong place
 qt5-build_src_install() {
 	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 

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

[Davide Pesavento]

commit:     c3c033418ef8c10b093eb2a8f662a23b43c25a5a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Dec 22 03:27:40 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 03:27:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c3c03341

[qt5-build.eclass] Add @AUTHOR.

---
 eclass/qt5-build.eclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8b3c8c9..572067b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -5,6 +5,8 @@
 # @ECLASS: qt5-build.eclass
 # @MAINTAINER:
 # Qt herd <qt@gentoo.org>
+# @AUTHOR:
+# Davide Pesavento <pesa@gentoo.org>
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.

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

[Davide Pesavento]

commit:     fea912e76178fd1676311988fff089542b73062e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Dec 20 03:15:23 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 03:15:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fea912e7

[qt5-build.eclass] Update SRC_URI for 5.0.0 final release.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cc91eb8..8b3c8c9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -44,7 +44,7 @@ case ${PV} in
 	*)
 		QT5_BUILD_TYPE="release"
 		MY_P="${EGIT_PROJECT}-opensource-src-${PV/_/-}"
-		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/submodules_tar/${MY_P}.tar.xz"
+		SRC_URI="http://releases.qt-project.org/qt5/${PV}/submodules_tar/${MY_P}.tar.xz"
 		S=${WORKDIR}/${MY_P}
 		;;
 esac

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

[Davide Pesavento]

commit:     defdc0beecd17165377a994968d529fe77f88475
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Dec  9 16:06:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec  9 16:40:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=defdc0be

[qt5-build.eclass] Simplify qt5_qmake() logic.

We can simply give qmake the dir where the .pro file is contained and
it'll work just fine. This allows us to work with project files named
differently than the directory in which they reside (e.g. qt-webkit).

---
 eclass/qt5-build.eclass |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 023c95e..cf56c85 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -451,10 +451,9 @@ qt5_base_configure() {
 # Intended to be called by qt5_foreach_target_subdir().
 qt5_qmake() {
 	local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}
-	local projectfile=${projectdir}/${projectdir##*/}.pro
 
-	"${QT5_BUILD_DIR}"/bin/qmake "${projectfile}" \
-		|| die "qmake failed (${projectfile})"
+	"${QT5_BUILD_DIR}"/bin/qmake "${projectdir}" \
+		|| die "qmake failed (${projectdir})"
 }
 
 # @FUNCTION: qt5_foreach_target_subdir

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

[Davide Pesavento]

commit:     215d3ddfb648bb37201bbe0aa7d56602462c2950
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Dec  9 16:32:00 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec  9 16:40:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=215d3ddf

[qt5-build.eclass] Stop changing EGIT_SOURCEDIR and S in live ebuilds.

No longer necessary after previous commit.

---
 eclass/qt5-build.eclass |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cf56c85..cc91eb8 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -45,13 +45,12 @@ case ${PV} in
 		QT5_BUILD_TYPE="release"
 		MY_P="${EGIT_PROJECT}-opensource-src-${PV/_/-}"
 		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/submodules_tar/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
 		;;
 esac
 
 EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
 	https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
-EGIT_SOURCEDIR=${WORKDIR}/${EGIT_PROJECT}
-S=${EGIT_SOURCEDIR}
 
 IUSE="+c++11 debug test"
 
@@ -87,7 +86,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${WORKDIR}/${EGIT_PROJECT}_build}
+: ${QT5_BUILD_DIR:=${S}_build}
 
 # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
 # @DESCRIPTION:
@@ -149,7 +148,6 @@ qt5-build_src_unpack() {
 			;;
 		release)
 			default
-			mv "${MY_P}" "${EGIT_PROJECT}" || die
 			;;
 	esac
 }

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

[Davide Pesavento]

commit:     ca54f55ea5603761e4f2a706896263e29426c0eb
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Dec  8 17:51:29 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 17:51:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ca54f55e

[qt5-build.eclass] Drop support for EAPI 4.

---
 eclass/qt5-build.eclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e14a15a..023c95e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -8,10 +8,10 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 4.
+# Requires EAPI 5.
 
 case ${EAPI} in
-	4|5)	: ;;
+	5)	: ;;
 	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 

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

[Davide Pesavento]

commit:     7beef12b30a3488797f58c0f33ead968a4417bf7
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Dec  8 12:44:50 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 12:44:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7beef12b

[qt5-build.eclass] Adapt to new upstream branching model.

---
 eclass/qt5-build.eclass |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 161061f..e14a15a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -17,15 +17,6 @@ esac
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
-if [[ ${PV} == *9999* ]]; then
-	QT5_BUILD_TYPE="live"
-	inherit git-2
-else
-	QT5_BUILD_TYPE="release"
-fi
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
-
 HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="5"
@@ -38,17 +29,30 @@ case ${PN#qt-} in
 		EGIT_PROJECT="${PN/-}"
 		;;
 esac
-case ${QT5_BUILD_TYPE} in
-	live)
-		EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
-			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
+
+case ${PV} in
+	5.9999)
+		QT5_BUILD_TYPE="live"
+		EGIT_BRANCH="dev"
+		inherit git-2
 		;;
-	release)
-		MY_P=${EGIT_PROJECT}-opensource-src-${PV/_/-}
+	5.?.9999)
+		QT5_BUILD_TYPE="live"
+		EGIT_BRANCH="stable"
+		inherit git-2
+		;;
+	*)
+		QT5_BUILD_TYPE="release"
+		MY_P="${EGIT_PROJECT}-opensource-src-${PV/_/-}"
 		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/submodules_tar/${MY_P}.tar.xz"
 		;;
 esac
 
+EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
+	https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
+EGIT_SOURCEDIR=${WORKDIR}/${EGIT_PROJECT}
+S=${EGIT_SOURCEDIR}
+
 IUSE="+c++11 debug test"
 
 DEPEND=">=dev-lang/perl-5.14
@@ -57,7 +61,7 @@ if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"
 fi
 
-S=${WORKDIR}/${EGIT_PROJECT}
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
@@ -335,6 +339,7 @@ qt5_prepare_env() {
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
 	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
 
+	# see mkspecs/features/qt_config.prf
 	export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
 }
 

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

[Davide Pesavento]

commit:     6eba7d22fa5f55d7dc1229efaf5959355665a40e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Dec  7 16:27:21 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 16:27:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6eba7d22

[qt5-build.eclass] QMAKEMODULES is a colon-separated list.

---
 eclass/qt5-build.eclass |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b36b97a..161061f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -335,9 +335,7 @@ qt5_prepare_env() {
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
 	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
 
-	export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules
-			${S}/mkspecs/modules
-			${QT5_ARCHDATADIR}/mkspecs/modules"
+	export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules:${S}/mkspecs/modules:${QT5_ARCHDATADIR}/mkspecs/modules"
 }
 
 # @FUNCTION: qt5_symlink_tools_to_buildtree

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

[Davide Pesavento]

commit:     bbd7bb5739ab12578f07540882bffc7ab8509919
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Dec  7 11:53:24 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 11:53:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bbd7bb57

[qt5-build.eclass] Headers are no longer installed into /usr/include/qt5/Qt/

---
 eclass/qt5-build.eclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 32745d8..b36b97a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -270,10 +270,9 @@ qt5-build_src_install() {
 		dodir "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
 		: > "${D}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h
 
-		# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h
+		# include gentoo-qconfig.h at the beginning of QtCore/qconfig.h
 		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
-			"${D}${QT5_HEADERDIR}"/Qt/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 	fi
 

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

[Davide Pesavento]

commit:     eca53e78af284d980875a40d95090afaa9d20dee
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Dec  7 11:14:16 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 11:14:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=eca53e78

[qt5-build.eclass] Use new -libexecdir configure option.

---
 eclass/qt5-build.eclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index da32de7..32745d8 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -326,6 +326,7 @@ qt5_prepare_env() {
 	QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
 	QT5_BINDIR=${QT5_ARCHDATADIR}/bin
 	QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
+	QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec
 	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
 	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
 	QT5_DATADIR=${QT5_PREFIX}/share/qt5
@@ -369,6 +370,7 @@ qt5_base_configure() {
 		-libdir "${QT5_LIBDIR}"
 		-archdatadir "${QT5_ARCHDATADIR}"
 		-plugindir "${QT5_PLUGINDIR}"
+		-libexecdir "${QT5_LIBEXECDIR}"
 		-importdir "${QT5_IMPORTDIR}"
 		-qmldir "${QT5_QMLDIR}"
 		-datadir "${QT5_DATADIR}"

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

[Davide Pesavento]

commit:     562ce5b04f47ad568767a2349c47c48064a7593f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Dec  7 11:02:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 11:02:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=562ce5b0

[qt5-build.eclass] Raise minimum perl version as documented in qt-project wiki.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1bde393..da32de7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -51,7 +51,7 @@ esac
 
 IUSE="+c++11 debug test"
 
-DEPEND=">=dev-lang/perl-5.10
+DEPEND=">=dev-lang/perl-5.14
 	virtual/pkgconfig"
 if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"

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

[Davide Pesavento]

commit:     e9f4c22a688b93dbc76ccccf47460740e9206eae
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Nov 22 10:59:40 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 10:59:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e9f4c22a

[qt5-build.eclass] Use the new qmldir configure option.

---
 eclass/qt5-build.eclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ffaa022..1bde393 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -327,6 +327,7 @@ qt5_prepare_env() {
 	QT5_BINDIR=${QT5_ARCHDATADIR}/bin
 	QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
 	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
+	QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
 	QT5_DATADIR=${QT5_PREFIX}/share/qt5
 	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
 	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
@@ -369,6 +370,7 @@ qt5_base_configure() {
 		-archdatadir "${QT5_ARCHDATADIR}"
 		-plugindir "${QT5_PLUGINDIR}"
 		-importdir "${QT5_IMPORTDIR}"
+		-qmldir "${QT5_QMLDIR}"
 		-datadir "${QT5_DATADIR}"
 		-docdir "${QT5_DOCDIR}"
 		-translationdir "${QT5_TRANSLATIONDIR}"

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

[Davide Pesavento]

commit:     865e1dbb3efc49b6088d5fa37ea45abeb422007c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 19 10:37:13 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 10:37:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=865e1dbb

[qt5-build.eclass] Fix QMAKEMODULES.

---
 eclass/qt5-build.eclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index af54b5b..ffaa022 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -334,7 +334,9 @@ qt5_prepare_env() {
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
 	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
 
-	export QMAKEMODULES=${QT5_ARCHDATADIR}/mkspecs/modules
+	export QMAKEMODULES="${QT5_BUILD_DIR}/mkspecs/modules
+			${S}/mkspecs/modules
+			${QT5_ARCHDATADIR}/mkspecs/modules"
 }
 
 # @FUNCTION: qt5_symlink_tools_to_buildtree

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

[Davide Pesavento]

commit:     8044f9aebf2e99844fe1dfc6e42f9f879484827b
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 19 04:10:33 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 04:10:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8044f9ae

[qt5-build.eclass] Drop "pch" USE flag.

---
 eclass/qt5-build.eclass |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a2e8e01..ee8b3a5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -50,9 +50,6 @@ case ${QT5_BUILD_TYPE} in
 esac
 
 IUSE="+c++11 debug test"
-if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
-	IUSE+=" +pch"
-fi
 
 DEPEND=">=dev-lang/perl-5.10
 	virtual/pkgconfig"
@@ -411,8 +408,9 @@ qt5_base_configure() {
 		# don't strip
 		-no-strip
 
-		# precompiled headers don't work on hardened, where the flag is masked
-		$(qt_use pch)
+		# precompiled headers aren't really useful for us
+		# and cause problems on hardened, so turn them off
+		-no-pch
 
 		# reduce relocations in libraries through extra linker optimizations
 		# requires GNU ld >= 2.18

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

[Davide Pesavento]

commit:     953cfacac6a1763600db33a97681cc81bfa1ccdf
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 19 03:50:17 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 03:50:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=953cfaca

[qt5-build.eclass] Refactoring and cleanup.

---
 eclass/qt5-build.eclass |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7006406..a2e8e01 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -40,7 +40,6 @@ case ${PN#qt-} in
 esac
 case ${QT5_BUILD_TYPE} in
 	live)
-		MY_P=${P}
 		EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
 			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
 		;;
@@ -61,7 +60,7 @@ if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"
 fi
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${EGIT_PROJECT}
 
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
@@ -87,7 +86,7 @@ S=${WORKDIR}/${MY_P}
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${WORKDIR}/${MY_P}_build}
+: ${QT5_BUILD_DIR:=${WORKDIR}/${EGIT_PROJECT}_build}
 
 # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
 # @DESCRIPTION:
@@ -149,6 +148,7 @@ qt5-build_src_unpack() {
 			;;
 		release)
 			default
+			mv "${MY_P}" "${EGIT_PROJECT}" || die
 			;;
 	esac
 }
@@ -159,8 +159,6 @@ qt5-build_src_unpack() {
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
-	mkdir -p "${QT5_BUILD_DIR}" || die
-
 	if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
 		# Avoid unnecessary qmake recompilations
 		sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
@@ -216,6 +214,7 @@ qt5-build_src_configure() {
 	# qmake-generated Makefiles use LD/LINK for linking
 	export LD="$(tc-getCXX)"
 
+	mkdir -p "${QT5_BUILD_DIR}" || die
 	pushd "${QT5_BUILD_DIR}" > /dev/null || die
 
 	if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
@@ -445,12 +444,8 @@ qt5_base_configure() {
 # Helper function that runs qmake in the current target subdir.
 # Intended to be called by qt5_foreach_target_subdir().
 qt5_qmake() {
-	local projectfile=${S}/
-	if [[ -n ${subdir} ]]; then
-		projectfile+=${subdir}/${subdir##*/}.pro
-	else
-		projectfile+=${EGIT_PROJECT}.pro
-	fi
+	local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}}
+	local projectfile=${projectdir}/${projectdir##*/}.pro
 
 	"${QT5_BUILD_DIR}"/bin/qmake "${projectfile}" \
 		|| die "qmake failed (${projectfile})"

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

[Davide Pesavento]

commit:     59b90c149df119858af48bdab8824245576c88c4
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 19 01:29:57 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 01:29:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=59b90c14

[qt5-build.eclass] Overhaul qmake handling.

Invoke qmake once for each target subdir, instead of doing one huge
recursive call at the root of the build tree. This is faster, less
hacky and slightly more correct.

The recursive call was previously needed in order to create all the
qt_lib_*.pri files, but since we can use QMAKEMODULES to tell qmake
where to find the .pri files for already installed modules, the
recursive call is no longer necessary.

---
 eclass/qt5-build.eclass |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e113969..7006406 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -202,9 +202,6 @@ qt5-build_src_prepare() {
 		qt5_symlink_tools_to_buildtree
 	fi
 
-	# Remove unused project files to speed up recursive qmake invocation
-	rm -f demos/demos.pro examples/examples.pro tests/tests.pro
-
 	# Apply patches
 	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 	epatch_user
@@ -225,12 +222,7 @@ qt5-build_src_configure() {
 		qt5_base_configure
 	fi
 
-	einfo "Running qmake"
-	./bin/qmake -recursive \
-		"${S}"/${EGIT_PROJECT}.pro \
-		QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
-		QMAKE_LIBDIR+="${QT5_LIBDIR}" \
-		|| die "qmake failed"
+	qt5_foreach_target_subdir qt5_qmake
 
 	popd > /dev/null || die
 }
@@ -260,12 +252,7 @@ qt5-build_src_test() {
 	EOF
 	chmod +x "${testrunner}"
 
-	qmake() {
-		"${QT5_BUILD_DIR}"/bin/qmake \
-			"${S}/${subdir}/${subdir##*/}.pro" \
-			|| die "qmake failed"
-	}
-	qt5_foreach_target_subdir qmake
+	qt5_foreach_target_subdir qt5_qmake
 	qt5_foreach_target_subdir emake
 	qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
 }
@@ -350,6 +337,8 @@ qt5_prepare_env() {
 	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
 	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
+
+	export QMAKEMODULES=${QT5_ARCHDATADIR}/mkspecs/modules
 }
 
 # @FUNCTION: qt5_symlink_tools_to_buildtree
@@ -399,9 +388,10 @@ qt5_base_configure() {
 		# C++11 support
 		$(qt_use c++11)
 
-		# general configure options
+		# build shared libraries
 		-shared
-		-dont-process
+
+		# use pkg-config to detect include and library paths
 		-pkg-config
 
 		# prefer system libraries
@@ -449,6 +439,23 @@ qt5_base_configure() {
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 }
 
+# @FUNCTION: qt5_qmake
+# @INTERNAL
+# @DESCRIPTION:
+# Helper function that runs qmake in the current target subdir.
+# Intended to be called by qt5_foreach_target_subdir().
+qt5_qmake() {
+	local projectfile=${S}/
+	if [[ -n ${subdir} ]]; then
+		projectfile+=${subdir}/${subdir##*/}.pro
+	else
+		projectfile+=${EGIT_PROJECT}.pro
+	fi
+
+	"${QT5_BUILD_DIR}"/bin/qmake "${projectfile}" \
+		|| die "qmake failed (${projectfile})"
+}
+
 # @FUNCTION: qt5_foreach_target_subdir
 # @INTERNAL
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     982d4692a40a69123d4be7e4ae012dda13eaf15d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Nov 17 22:51:25 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 22:51:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=982d4692

[qt5-build.eclass] Update SRC_URI.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 87ae26a..e113969 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -46,7 +46,7 @@ case ${QT5_BUILD_TYPE} in
 		;;
 	release)
 		MY_P=${EGIT_PROJECT}-opensource-src-${PV/_/-}
-		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/split_sources/${MY_P}.tar.xz"
+		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/submodules_tar/${MY_P}.tar.xz"
 		;;
 esac
 

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

[Davide Pesavento]

commit:     a66cfcef20629cf3887ff6ee8c8eda858ae2dde4
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 12 09:14:28 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 09:14:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a66cfcef

[qt4-build.eclass] Drop support for EAPI=2.

---
 eclass/qt4-build.eclass |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index cb627f6..d1784ca 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -10,8 +10,8 @@
 # This eclass contains various functions that are used when building Qt4.
 
 case ${EAPI} in
-	2|3|4|5) : ;;
-	*)	 die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+	3|4|5)	: ;;
+	*)	die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -101,8 +101,6 @@ S=${WORKDIR}/${MY_P}
 # @DESCRIPTION:
 # Sets up PATH and LD_LIBRARY_PATH.
 qt4-build_pkg_setup() {
-	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
-
 	# Protect users by not allowing downgrades between releases.
 	# Downgrading revisions within the same release should be allowed.
 	if has_version ">${CATEGORY}/${P}-r9999:4"; then
@@ -190,7 +188,7 @@ qt4-build_src_unpack() {
 # PATCHES array variable containing all various patches to be applied.
 # This variable is expected to be defined in global scope of ebuild.
 # Make sure to specify the full path. This variable is utilised in
-# src_unpack/src_prepare phase, based on EAPI.
+# src_prepare() phase.
 #
 # @CODE
 #   PATCHES=( "${FILESDIR}/mypatch.patch"
@@ -550,7 +548,6 @@ fix_includes() {
 # @DESCRIPTION:
 # Perform the actual installation including some library fixes.
 qt4-build_src_install() {
-	[[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
 	setqtenv
 
 	install_directories ${QT4_TARGET_DIRECTORIES}

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

[Davide Pesavento]

commit:     0861b3fd3541ad3415b0f3a09f702e7b3cf9d1d0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 12 09:09:48 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 09:09:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0861b3fd

[qt4-build.eclass] Delete unused variable.

---
 eclass/qt4-build.eclass |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index fe29c24..cb627f6 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -580,7 +580,6 @@ setqtenv() {
 	QTEXAMPLESDIR=${QTDATADIR}/examples
 	QTDEMOSDIR=${QTDATADIR}/demos
 	QMAKE_LIBDIR_QT=${QTLIBDIR}
-	QT_INSTALL_PREFIX=${QTLIBDIR}
 
 	PLATFORM=$(qt_mkspecs_dir)
 	unset QMAKESPEC

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

[Davide Pesavento]

commit:     fdb50f3f9c75dc1d4dc01e4987fd3d9b34d8517d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 12 09:18:14 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 09:18:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fdb50f3f

[qt4-build.eclass] Collapse some (now always true) conditionals.

---
 eclass/qt4-build.eclass |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index d1784ca..b584cf1 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -206,11 +206,9 @@ qt4-build_src_prepare() {
 		QTDIR="." ./bin/syncqt || die "syncqt failed"
 	fi
 
-	if version_is_at_least 4.7; then
-		# avoid X11 dependency in non-gui packages
-		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
-		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
-	fi
+	# avoid X11 dependency in non-gui packages
+	local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
+	has ${PN} ${nolibx11_pkgs} && qt_nolibx11
 
 	if use aqua; then
 		# provide a proper macx-g++-64
@@ -374,7 +372,7 @@ qt4-build_src_configure() {
 		-docdir ${QTDOCDIR}
 		-headerdir ${QTHEADERDIR}
 		-plugindir ${QTPLUGINDIR}
-		$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
+		-importdir ${QTIMPORTDIR}
 		-datadir ${QTDATADIR}
 		-translationdir ${QTTRANSDIR}
 		-sysconfdir ${QTSYSCONFDIR}

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

[Davide Pesavento]

commit:     38ba740cc97915b41aaea6d0a8871a37b1371f90
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 12 04:33:59 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 04:33:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=38ba740c

[qt5-build.eclass] Fix path to mkspecs, they are installed under $archdatadir now.

---
 eclass/qt5-build.eclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 95ae1e7..87ae26a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -496,7 +496,7 @@ qt5_install_module_qconfigs() {
 		[[ -n ${!x} ]] && echo "${x}=${!x}" >> "${T}"/${PN}-qconfig.pri
 	done
 	[[ -s ${T}/${PN}-qconfig.pri ]] && (
-		insinto "${QT5_DATADIR#${EPREFIX}}"/mkspecs/gentoo
+		insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri
 	)
 }
@@ -518,7 +518,7 @@ qt5_regenerate_global_qconfigs() {
 
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
-	local qconfig_pri=${ROOT}${QT5_DATADIR}/mkspecs/qconfig.pri
+	local qconfig_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri
 	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
 		local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${qconfig_pri}")
@@ -527,7 +527,7 @@ qt5_regenerate_global_qconfigs() {
 		# generate list of QT_CONFIG entries from the existing list,
 		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
 		eshopts_push -s nullglob
-		for x in "${ROOT}${QT5_DATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
+		for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
 			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
 			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
 		done

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

[Davide Pesavento]

commit:     fb25240775cb349ff6ea3a11e6a5bb8767acad26
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 12 04:04:49 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 04:04:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fb252407

[qt5-build.eclass] Define archdatadir and put bindir under it. Move libs to /usr/lib{,64}.

---
 eclass/qt5-build.eclass |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9c52415..95ae1e7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -292,12 +292,6 @@ qt5-build_src_install() {
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			"${D}${QT5_HEADERDIR}"/Qt/qconfig.h \
 			|| die "sed failed (qconfig.h)"
-
-		# install env.d file for custom LDPATH
-		cat <<-EOF > "${T}"/55qt5
-		LDPATH="${QT5_LIBDIR}"
-		EOF
-		doenvd "${T}"/55qt5
 	fi
 
 	qt5_install_module_qconfigs
@@ -344,11 +338,12 @@ qt_use() {
 qt5_prepare_env() {
 	# setup installation directories
 	QT5_PREFIX=${EPREFIX}/usr
-	QT5_BINDIR=${QT5_PREFIX}/qt5/bin # FIXME
 	QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
-	QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)/qt5
-	QT5_PLUGINDIR=${QT5_LIBDIR}/plugins
-	QT5_IMPORTDIR=${QT5_LIBDIR}/imports
+	QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)
+	QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5
+	QT5_BINDIR=${QT5_ARCHDATADIR}/bin
+	QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins
+	QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
 	QT5_DATADIR=${QT5_PREFIX}/share/qt5
 	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
 	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
@@ -384,6 +379,7 @@ qt5_base_configure() {
 		-bindir "${QT5_BINDIR}"
 		-headerdir "${QT5_HEADERDIR}"
 		-libdir "${QT5_LIBDIR}"
+		-archdatadir "${QT5_ARCHDATADIR}"
 		-plugindir "${QT5_PLUGINDIR}"
 		-importdir "${QT5_IMPORTDIR}"
 		-datadir "${QT5_DATADIR}"

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

[Davide Pesavento]

commit:     53d958b40d6152d4de0ecb8182a5e7344a2faf2f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 12 02:52:00 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 02:52:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=53d958b4

[qt5-build.eclass] Adapt to recent upstream changes.

---
 eclass/qt5-build.eclass |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 738e70d..f12a2e6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -162,22 +162,18 @@ qt5-build_src_prepare() {
 	mkdir -p "${QT5_BUILD_DIR}" || die
 
 	if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
-		if [[ ${PN} == "qt-core" ]]; then
-			# Respect CC, CXX, *FLAGS, MAKEOPTS and
-			# EXTRA_EMAKE when bootstrapping qmake
-			sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
-				${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
-				'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
-				-e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
-				configure || die "sed failed (respect env for qmake)"
-			sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
-				qmake/Makefile.unix || die "sed failed (CPPFLAGS)"
-		else
-			# Skip qmake bootstrap
-			sed -i -e '/outpath\/qmake".*"$MAKE")/ d' \
-				configure || die "sed failed (skip qmake bootstrap)"
-			rm -f qmake/Makefile*
-		fi
+		# Avoid unnecessary qmake recompilations
+		sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
+			configure || die "sed failed (skip qmake bootstrap)"
+
+		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
+		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
+			${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
+			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
+			-e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
+			configure || die "sed failed (respect env for qmake build)"
+		sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+			qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)"
 
 		# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
 		# or they will override user's flags (bug 427782)
@@ -232,7 +228,6 @@ qt5-build_src_configure() {
 	einfo "Running qmake"
 	./bin/qmake -recursive \
 		"${S}"/${EGIT_PROJECT}.pro \
-		$(version_is_at_least 5.0.0_beta2 || echo "CONFIG+=nostrip") \
 		QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
 		QMAKE_LIBDIR+="${QTLIBDIR}" \
 		|| die "qmake failed"
@@ -416,6 +411,7 @@ qt5_base_configure() {
 		# prefer system libraries
 		-system-zlib
 		-system-pcre
+		-system-xcb
 
 		# exclude examples and tests from default build
 		-nomake examples
@@ -428,7 +424,7 @@ qt5_base_configure() {
 		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
 
 		# don't strip
-		$(version_is_at_least 5.0.0_beta2 && echo -no-strip)
+		-no-strip
 
 		# precompiled headers don't work on hardened, where the flag is masked
 		$(qt_use pch)

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

[Davide Pesavento]

commit:     92f822478e09549f862e35784e19dc3b10fe45d3
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 12 03:11:27 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 03:11:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=92f82247

[qt5-build.eclass] Rename some variables.

---
 eclass/qt5-build.eclass |   78 +++++++++++++++++++++++-----------------------
 1 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f12a2e6..9c52415 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -229,7 +229,7 @@ qt5-build_src_configure() {
 	./bin/qmake -recursive \
 		"${S}"/${EGIT_PROJECT}.pro \
 		QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
-		QMAKE_LIBDIR+="${QTLIBDIR}" \
+		QMAKE_LIBDIR+="${QT5_LIBDIR}" \
 		|| die "qmake failed"
 
 	popd > /dev/null || die
@@ -254,8 +254,8 @@ qt5-build_src_test() {
 	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
 	cat <<-EOF > "${testrunner}"
 	#!/bin/sh
-	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
-	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
+	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
+	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
 	"\$@"
 	EOF
 	chmod +x "${testrunner}"
@@ -284,18 +284,18 @@ qt5-build_src_install() {
 		popd > /dev/null || die
 
 		# create an empty Gentoo/gentoo-qconfig.h
-		dodir "${QTHEADERDIR#${EPREFIX}}"/Gentoo
-		: > "${D}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+		dodir "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
+		: > "${D}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h
 
 		# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h
 		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
-			"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
-			"${D}${QTHEADERDIR}"/Qt/qconfig.h \
+			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
+			"${D}${QT5_HEADERDIR}"/Qt/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 
 		# install env.d file for custom LDPATH
 		cat <<-EOF > "${T}"/55qt5
-		LDPATH="${QTLIBDIR}"
+		LDPATH="${QT5_LIBDIR}"
 		EOF
 		doenvd "${T}"/55qt5
 	fi
@@ -343,18 +343,18 @@ qt_use() {
 # Prepares the environment for building Qt.
 qt5_prepare_env() {
 	# setup installation directories
-	QTPREFIXDIR=${EPREFIX}/usr
-	QTBINDIR=${QTPREFIXDIR}/qt5/bin # FIXME
-	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt5
-	QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
-	QTHEADERDIR=${QTPREFIXDIR}/include/qt5
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTIMPORTDIR=${QTLIBDIR}/imports
-	QTDATADIR=${QTPREFIXDIR}/share/qt5
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTTESTSDIR=${QTDATADIR}/tests
-	QTSYSCONFDIR=${EPREFIX}/etc/qt5
+	QT5_PREFIX=${EPREFIX}/usr
+	QT5_BINDIR=${QT5_PREFIX}/qt5/bin # FIXME
+	QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
+	QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)/qt5
+	QT5_PLUGINDIR=${QT5_LIBDIR}/plugins
+	QT5_IMPORTDIR=${QT5_LIBDIR}/imports
+	QT5_DATADIR=${QT5_PREFIX}/share/qt5
+	QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
+	QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
+	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
+	QT5_TESTSDIR=${QT5_DATADIR}/tests
+	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
 }
 
 # @FUNCTION: qt5_symlink_tools_to_buildtree
@@ -365,7 +365,7 @@ qt5_symlink_tools_to_buildtree() {
 	mkdir -p "${QT5_BUILD_DIR}"/bin || die
 
 	local bin
-	for bin in "${QTBINDIR}"/{qmake,moc,rcc,uic,qdoc,qdbuscpp2xml,qdbusxml2cpp}; do
+	for bin in "${QT5_BINDIR}"/{qmake,moc,rcc,uic,qdoc,qdbuscpp2xml,qdbusxml2cpp}; do
 		if [[ -e ${bin} ]]; then
 			ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
 		fi
@@ -380,18 +380,18 @@ qt5_base_configure() {
 	# configure arguments
 	local conf=(
 		# installation paths
-		-prefix "${QTPREFIXDIR}"
-		-bindir "${QTBINDIR}"
-		-libdir "${QTLIBDIR}"
-		-docdir "${QTDOCDIR}"
-		-headerdir "${QTHEADERDIR}"
-		-plugindir "${QTPLUGINDIR}"
-		-importdir "${QTIMPORTDIR}"
-		-datadir "${QTDATADIR}"
-		-translationdir "${QTTRANSDIR}"
-		-sysconfdir "${QTSYSCONFDIR}"
-		-examplesdir "${QTEXAMPLESDIR}"
-		-testsdir "${QTTESTSDIR}"
+		-prefix "${QT5_PREFIX}"
+		-bindir "${QT5_BINDIR}"
+		-headerdir "${QT5_HEADERDIR}"
+		-libdir "${QT5_LIBDIR}"
+		-plugindir "${QT5_PLUGINDIR}"
+		-importdir "${QT5_IMPORTDIR}"
+		-datadir "${QT5_DATADIR}"
+		-docdir "${QT5_DOCDIR}"
+		-translationdir "${QT5_TRANSLATIONDIR}"
+		-sysconfdir "${QT5_SYSCONFDIR}"
+		-examplesdir "${QT5_EXAMPLESDIR}"
+		-testsdir "${QT5_TESTSDIR}"
 
 		# debug/release
 		$(use debug && echo -debug || echo -release)
@@ -490,7 +490,7 @@ qt5_install_module_qconfigs() {
 		echo "#define ${x}" >> "${T}"/${PN}-qconfig.h
 	done
 	[[ -s ${T}/${PN}-qconfig.h ]] && (
-		insinto "${QTHEADERDIR#${EPREFIX}}"/Gentoo
+		insinto "${QT5_HEADERDIR#${EPREFIX}}"/Gentoo
 		doins "${T}"/${PN}-qconfig.h
 	)
 
@@ -500,7 +500,7 @@ qt5_install_module_qconfigs() {
 		[[ -n ${!x} ]] && echo "${x}=${!x}" >> "${T}"/${PN}-qconfig.pri
 	done
 	[[ -s ${T}/${PN}-qconfig.pri ]] && (
-		insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
+		insinto "${QT5_DATADIR#${EPREFIX}}"/mkspecs/gentoo
 		doins "${T}"/${PN}-qconfig.pri
 	)
 }
@@ -513,16 +513,16 @@ qt5_install_module_qconfigs() {
 qt5_regenerate_global_qconfigs() {
 	einfo "Regenerating gentoo-qconfig.h"
 
-	find "${ROOT}${QTHEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \
+	find "${ROOT}${QT5_HEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \
 		-exec cat {} + > "${T}"/gentoo-qconfig.h
 
 	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
-	mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h \
+	mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
 		|| eerror "Failed to install new gentoo-qconfig.h"
 
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
-	local qconfig_pri=${ROOT}${QTDATADIR}/mkspecs/qconfig.pri
+	local qconfig_pri=${ROOT}${QT5_DATADIR}/mkspecs/qconfig.pri
 	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
 		local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${qconfig_pri}")
@@ -531,7 +531,7 @@ qt5_regenerate_global_qconfigs() {
 		# generate list of QT_CONFIG entries from the existing list,
 		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
 		eshopts_push -s nullglob
-		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
+		for x in "${ROOT}${QT5_DATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
 			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
 			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
 		done

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

[Davide Pesavento]

commit:     8355488510fb33cc2efb41e024dabbfb6d91ea43
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Nov  9 09:36:17 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Nov  9 09:36:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=83554885

[qt4-build.eclass] Use prune_libtool_files().

---
 eclass/qt4-build.eclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 8f56d1d..fe29c24 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -558,8 +558,8 @@ qt4-build_src_install() {
 	fix_library_files
 	fix_includes
 
-	# remove .la files since we are building only shared Qt libraries
-	find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
+	# remove .la files since we are building only shared libraries
+	prune_libtool_files
 }
 
 # @FUNCTION: setqtenv

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

[Davide Pesavento]

commit:     6d1af466d8b0d60ed77506a5af2f46b9710eab98
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Nov  9 09:18:17 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Nov  9 09:18:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6d1af466

[qt4-build.eclass] Respect AR (bug 440262).

And skip RANLIB since we already build the archive index
using the 's' option of ar.

---
 eclass/qt4-build.eclass |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index a679ca6..8f56d1d 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -622,9 +622,14 @@ prepare_directories() {
 build_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
-		emake CC="$(tc-getCC)" \
+		emake \
+			AR="$(tc-getAR) cqs" \
+			CC="$(tc-getCC)" \
 			CXX="$(tc-getCXX)" \
-			LINK="$(tc-getCXX)" || die "emake failed"
+			LINK="$(tc-getCXX)" \
+			RANLIB=":" \
+			STRIP=":" \
+			|| die "emake failed"
 		popd >/dev/null || die
 	done
 }

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

[Davide Pesavento]

commit:     7e71b2f4206711554e1efb181dd6ad3d30f0ec97
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Nov  9 08:22:07 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Nov  9 08:22:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7e71b2f4

[qt4-build.eclass] Minor cleanup.

---
 eclass/qt4-build.eclass |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index ed50795..a679ca6 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -567,20 +567,20 @@ qt4-build_src_install() {
 setqtenv() {
 	# Set up installation directories
 	QTPREFIXDIR=${EPREFIX}/usr
-	QTBINDIR=${EPREFIX}/usr/bin
-	QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
-	QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
-	QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
-	QTHEADERDIR=${EPREFIX}/usr/include/qt4
+	QTBINDIR=${QTPREFIXDIR}/bin
+	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt4
+	QTPCDIR=${QTPREFIXDIR}/$(get_libdir)/pkgconfig
+	QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
+	QTHEADERDIR=${QTPREFIXDIR}/include/qt4
 	QTPLUGINDIR=${QTLIBDIR}/plugins
 	QTIMPORTDIR=${QTLIBDIR}/imports
-	QTDATADIR=${EPREFIX}/usr/share/qt4
+	QTDATADIR=${QTPREFIXDIR}/share/qt4
 	QTTRANSDIR=${QTDATADIR}/translations
 	QTSYSCONFDIR=${EPREFIX}/etc/qt4
 	QTEXAMPLESDIR=${QTDATADIR}/examples
 	QTDEMOSDIR=${QTDATADIR}/demos
 	QMAKE_LIBDIR_QT=${QTLIBDIR}
-	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
+	QT_INSTALL_PREFIX=${QTLIBDIR}
 
 	PLATFORM=$(qt_mkspecs_dir)
 	unset QMAKESPEC
@@ -594,23 +594,26 @@ setqtenv() {
 # @DESCRIPTION:
 # Generates Makefiles for the given list of directories.
 prepare_directories() {
+	# avoid running over the maximum argument number, bug #299810
+	{
+		echo "${S}"/mkspecs/common/*.conf
+		find "${S}" -name '*.pr[io]'
+	} | xargs sed -i \
+		-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
+		-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
+		|| die
+
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null || die
 		einfo "Running qmake in: ${x}"
-		# avoid running over the maximum argument number, bug #299810
-		{
-			echo "${S}"/mkspecs/common/*.conf
-			find "${S}" -name '*.pr[io]'
-		} | xargs sed -i \
-			-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
-			-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
-			|| die
-		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
+		"${S}"/bin/qmake \
+			"LIBS+=-L${QTLIBDIR}" \
+			"CONFIG+=nostrip" \
+			|| die "qmake failed"
 		popd >/dev/null || die
 	done
 }
 
-
 # @FUNCTION: build_directories
 # @USAGE: < directories >
 # @INTERNAL

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

[Davide Pesavento]

commit:     43005bf367f592b38f5dddac7d43c35fedfbd968
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Nov  7 03:09:24 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 03:09:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=43005bf3

[qt4-r2.eclass] Properly define QMAKE_{AR,RANLIB,OBJCOPY}.

This should fix bug 440266 (and probably others too).

---
 eclass/qt4-r2.eclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index a35975c..5a906f9 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -244,9 +244,13 @@ eqmake4() {
 		-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_OBJCOPY="$(tc-getOBJCOPY)" \
+		QMAKE_RANLIB= \
+		QMAKE_STRIP= \
 		QMAKE_CFLAGS="${CFLAGS}" \
 		QMAKE_CFLAGS_RELEASE= \
 		QMAKE_CFLAGS_DEBUG= \
@@ -259,7 +263,6 @@ eqmake4() {
 		QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
 		QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
 		QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE_STRIP= \
 		"${qmake_args[@]}"
 
 	# was qmake successful?

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

[Davide Pesavento]

commit:     f87e8be9fae4bdd3b88e8c19fcd1550df1c717d2
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Nov  1 08:25:13 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 08:25:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f87e8be9

Update Qt homepage (s/nokia/digia/).

---
 eclass/qt4-build.eclass |    2 +-
 eclass/qt5-build.eclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index df37b64..ed50795 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -23,7 +23,7 @@ else
 	QT4_BUILD_TYPE="release"
 fi
 
-HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
+HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 
 MY_PV=${PV/_/-}

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ae704f2..738e70d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -26,7 +26,7 @@ fi
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
 
-HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
+HOMEPAGE="http://qt-project.org/ http://qt.digia.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="5"
 

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

[Davide Pesavento]

commit:     61d9cae2123d4cbd513174e3fe5ab520b4961f47
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 00:24:08 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 00:24:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=61d9cae2

[qt5-build.eclass] Enable qmake cache and put user's {CXX,LD}FLAGS last in config.tests.

---
 eclass/qt5-build.eclass |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b8c72f9..ae704f2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -165,8 +165,7 @@ qt5-build_src_prepare() {
 		if [[ ${PN} == "qt-core" ]]; then
 			# Respect CC, CXX, *FLAGS, MAKEOPTS and
 			# EXTRA_EMAKE when bootstrapping qmake
-			sed -i \
-				-e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
+			sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
 				${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
 				'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
 				-e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
@@ -196,11 +195,10 @@ qt5-build_src_prepare() {
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect toolchain and flags in config.tests
-		# FIXME: in compile.test, -m flags are passed to the linker via LIBS
 		find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-			sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
-				'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
-				'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+			sed -ri -e '/CXXFLAGS=/ s/"(\$CXXFLAGS) (\$PARAM)"/"\2 \1"/' \
+				-e '/LFLAGS=/ s/"(\$LFLAGS) (\$PARAM)"/"\2 \1"/' \
+				-e '/bin\/qmake/ s/-nocache //' \
 			|| die "sed failed (config.tests)"
 	fi
 

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

[Davide Pesavento]

commit:     8bdd3521512003e9f937f1529a4b46c6f7107617
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Oct 20 00:20:06 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 00:20:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8bdd3521

[qt5-build.eclass] Fully respect user's *FLAGS.

---
 eclass/qt5-build.eclass |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 91ccd06..b8c72f9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -180,11 +180,22 @@ qt5-build_src_prepare() {
 			rm -f qmake/Makefile*
 		fi
 
+		# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
+		# or they will override user's flags (bug 427782)
+		sed -i -e '/^SYSTEM_VARIABLES=/ i \
+			QMakeVar set QMAKE_CFLAGS_RELEASE\
+			QMakeVar set QMAKE_CFLAGS_DEBUG\
+			QMakeVar set QMAKE_CXXFLAGS_RELEASE\
+			QMakeVar set QMAKE_CXXFLAGS_DEBUG\
+			QMakeVar set QMAKE_LFLAGS_RELEASE\
+			QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
+			configure || die "sed failed (QMAKE_*FLAGS_{RELEASE,DEBUG})"
+
 		# Respect CXX in configure
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-		# Respect CC, CXX, LINK and *FLAGS in config.tests
+		# Respect toolchain and flags in config.tests
 		# FIXME: in compile.test, -m flags are passed to the linker via LIBS
 		find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
 			sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \

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

[Davide Pesavento]

commit:     1ff0a54a8736cff809bfa476a1424bd5aa032b73
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Oct 19 15:30:57 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 15:30:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1ff0a54a

[qt5-build.eclass] Fully respect user's *FLAGS during qmake bootstrap.

---
 eclass/qt5-build.eclass |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f18a37d..91ccd06 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -163,23 +163,26 @@ qt5-build_src_prepare() {
 
 	if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
 		if [[ ${PN} == "qt-core" ]]; then
-			# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
-			# FIXME: see bug 434780
-			sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
-				${MAKEOPTS} ${EXTRA_EMAKE} \
-				'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
+			# Respect CC, CXX, *FLAGS, MAKEOPTS and
+			# EXTRA_EMAKE when bootstrapping qmake
+			sed -i \
+				-e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
+				${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
 				'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
-				configure || die "sed qmake build failed"
+				-e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
+				configure || die "sed failed (respect env for qmake)"
+			sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+				qmake/Makefile.unix || die "sed failed (CPPFLAGS)"
 		else
-			# Skip qmake build
+			# Skip qmake bootstrap
 			sed -i -e '/outpath\/qmake".*"$MAKE")/ d' \
-				configure || die "sed qmake build failed"
+				configure || die "sed failed (skip qmake bootstrap)"
 			rm -f qmake/Makefile*
 		fi
 
 		# Respect CXX in configure
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
-			configure || die "sed QMAKE_CONF_COMPILER failed"
+			configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
 		# Respect CC, CXX, LINK and *FLAGS in config.tests
 		# FIXME: in compile.test, -m flags are passed to the linker via LIBS
@@ -187,7 +190,7 @@ qt5-build_src_prepare() {
 			sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
 				'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
 				'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
-			|| die "sed config.tests failed"
+			|| die "sed failed (config.tests)"
 	fi
 
 	if [[ ${PN} != "qt-core" ]]; then
@@ -284,7 +287,7 @@ qt5-build_src_install() {
 		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
 			"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
 			"${D}${QTHEADERDIR}"/Qt/qconfig.h \
-			|| die "sed qconfig.h failed"
+			|| die "sed failed (qconfig.h)"
 
 		# install env.d file for custom LDPATH
 		cat <<-EOF > "${T}"/55qt5

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

[Davide Pesavento]

commit:     962b35381c49c2f83f108e54b1dfd5ca4c08243f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Oct  6 02:03:31 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 02:03:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=962b3538

[qt5-build.eclass] qt-core now installs an env.d file for custom LDPATH.

---
 eclass/qt5-build.eclass |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 943e52c..f18a37d 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -272,6 +272,7 @@ qt5-build_src_install() {
 
 	if [[ ${PN} == "qt-core" ]]; then
 		pushd "${QT5_BUILD_DIR}" > /dev/null || die
+		einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake,syncqt}"
 		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
 		popd > /dev/null || die
 
@@ -284,6 +285,12 @@ qt5-build_src_install() {
 			"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
 			"${D}${QTHEADERDIR}"/Qt/qconfig.h \
 			|| die "sed qconfig.h failed"
+
+		# install env.d file for custom LDPATH
+		cat <<-EOF > "${T}"/55qt5
+		LDPATH="${QTLIBDIR}"
+		EOF
+		doenvd "${T}"/55qt5
 	fi
 
 	qt5_install_module_qconfigs

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

[Davide Pesavento]

commit:     7a3c9b705558841ccb6517ac4382158818e79023
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Oct  4 03:56:49 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 03:56:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7a3c9b70

[qt4-{build,r2}.eclass] Allow EAPI=5

---
 eclass/qt4-build.eclass |    4 ++--
 eclass/qt4-r2.eclass    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 2d41d13..df37b64 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -10,8 +10,8 @@
 # This eclass contains various functions that are used when building Qt4.
 
 case ${EAPI} in
-	2|3|4)	: ;;
-	*)	die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
+	2|3|4|5) : ;;
+	*)	 die "qt4-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 8916110..a35975c 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -11,8 +11,8 @@
 # dealing with packages using Qt4 libraries. Requires EAPI=2 or later.
 
 case ${EAPI} in
-	2|3|4)	: ;;
-	*)	die "EAPI=${EAPI} is not supported by ${ECLASS} eclass." ;;
+	2|3|4|5) : ;;
+	*)	 die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
 inherit base eutils multilib toolchain-funcs

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

[Davide Pesavento]

commit:     6ff7d3b50b6f4146af73f31359706a5170b99bf0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Oct  4 01:20:59 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 01:20:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6ff7d3b5

[qt5-build.eclass] Don't die when trying to downgrade.

---
 eclass/qt5-build.eclass |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f3a2f15..943e52c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -113,16 +113,12 @@ S=${WORKDIR}/${MY_P}
 # @DESCRIPTION:
 # Warns and/or dies if the user is trying to downgrade Qt.
 qt5-build_pkg_setup() {
-	# Protect users by not allowing downgrades between releases.
-	# Downgrading revisions within the same release should be allowed.
+	# Warn users of possible breakage when downgrading to a previous release.
+	# Downgrading revisions within the same release is safe.
 	if has_version ">${CATEGORY}/${P}-r9999:${SLOT}"; then
-		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			eerror "    ***  Sanity check to keep you from breaking your system  ***"
-			eerror "Downgrading Qt is completely unsupported and will break your system!"
-			die "aborting to save your system"
-		else
-			ewarn "Downgrading Qt is completely unsupported and will break your system!"
-		fi
+		ewarn
+		ewarn "Downgrading Qt is completely unsupported and can break your system!"
+		ewarn
 	fi
 }
 

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

[Davide Pesavento]

commit:     ed97b300f418d41a616b39fa103995ae97be63f5
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Oct  4 00:08:16 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 00:08:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ed97b300

[qt5-build.eclass] Adapt two seds, following a recent upstream change to configure.

---
 eclass/qt5-build.eclass |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 788dbdc..479e44e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -166,12 +166,20 @@ qt5-build_src_prepare() {
 	mkdir -p "${QT5_BUILD_DIR}" || die
 
 	if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
-		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
-		sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR=/ s:): \
-			${MAKEOPTS} ${EXTRA_EMAKE} \
-			'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
-			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
-			configure || die "sed configure failed"
+		if [[ ${PN} == "qt-core" ]]; then
+			# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
+			# FIXME: see bug 434780
+			sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
+				${MAKEOPTS} ${EXTRA_EMAKE} \
+				'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
+				'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
+				configure || die "sed qmake build failed"
+		else
+			# Skip qmake build
+			sed -i -e '/outpath\/qmake".*"$MAKE")/ d' \
+				configure || die "sed qmake build failed"
+			rm -f qmake/Makefile*
+		fi
 
 		# Respect CXX in configure
 		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
@@ -184,13 +192,6 @@ qt5-build_src_prepare() {
 				'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
 				'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 			|| die "sed config.tests failed"
-
-		if [[ ${PN} != "qt-core" ]]; then
-			# Skip qmake build
-			sed -i -e '/"$MAKE".*QMAKE_BUILD_ERROR=/ d' \
-				configure || die "sed configure failed"
-			rm -f qmake/Makefile*
-		fi
 	fi
 
 	if [[ ${PN} != "qt-core" ]]; then

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

[Davide Pesavento]

commit:     28c4dd07660fb68a47d64772d7de3e289bc346b0
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Oct  4 01:11:43 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Oct  4 01:11:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=28c4dd07

[qt5-build.eclass] Support EAPI=5

---
 eclass/qt5-build.eclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 479e44e..f3a2f15 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -11,8 +11,8 @@
 # Requires EAPI 4.
 
 case ${EAPI} in
-	4) : ;;
-	*) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+	4|5)	: ;;
+	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator

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

[Davide Pesavento]

commit:     f7d35fab009f7f484a7f20ea96c2b2c59d564529
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Sep 27 22:37:48 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 22:37:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f7d35fab

[qt5-build.eclass] Fix my previous commit to work with 5.0.0_beta.

---
 eclass/qt5-build.eclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f0eda4a..788dbdc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -223,6 +223,7 @@ qt5-build_src_configure() {
 	einfo "Running qmake"
 	./bin/qmake -recursive \
 		"${S}"/${EGIT_PROJECT}.pro \
+		$(version_is_at_least 5.0.0_beta2 || echo "CONFIG+=nostrip") \
 		QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
 		QMAKE_LIBDIR+="${QTLIBDIR}" \
 		|| die "qmake failed"
@@ -411,7 +412,7 @@ qt5_base_configure() {
 		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
 
 		# don't strip
-		-no-strip
+		$(version_is_at_least 5.0.0_beta2 && echo -no-strip)
 
 		# precompiled headers don't work on hardened, where the flag is masked
 		$(qt_use pch)

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

[Davide Pesavento]

commit:     e51c0943e8c4a170c42aeda1f8869b3120bc2bb8
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Sep 27 22:22:10 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 22:22:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e51c0943

[qt5-build.eclass] Use recently-introduced '-no-strip' configure option.

---
 eclass/qt5-build.eclass |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9b75d5a..f0eda4a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -223,7 +223,6 @@ qt5-build_src_configure() {
 	einfo "Running qmake"
 	./bin/qmake -recursive \
 		"${S}"/${EGIT_PROJECT}.pro \
-		CONFIG+=nostrip \
 		QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
 		QMAKE_LIBDIR+="${QTLIBDIR}" \
 		|| die "qmake failed"
@@ -401,7 +400,7 @@ qt5_base_configure() {
 		-system-zlib
 		-system-pcre
 
-		# exclude examples and tests from being built
+		# exclude examples and tests from default build
 		-nomake examples
 		-nomake tests
 
@@ -411,6 +410,9 @@ qt5_base_configure() {
 		# verbosity of the configure and build phases
 		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
 
+		# don't strip
+		-no-strip
+
 		# precompiled headers don't work on hardened, where the flag is masked
 		$(qt_use pch)
 
@@ -430,7 +432,7 @@ qt5_base_configure() {
 		# TODO: fix properly in qt-widgets
 		-no-gtkstyle
 
-		# package-specific options
+		# module-specific options
 		"${myconf[@]}"
 	)
 

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

[Davide Pesavento]

commit:     9b1ec0e0793642e95abe2185045901acce67ebe3
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Sep  5 02:19:27 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 02:19:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b1ec0e0

[qt5-build.eclass] Always disable gtkstyle to workaround bug #433826.

Thanks to hwoarang for reporting.

---
 eclass/qt5-build.eclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 535b9a5..9b75d5a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -425,6 +425,11 @@ qt5_base_configure() {
 		# disable all platform plugins by default, override in qt-gui
 		-no-xcb -no-xrender -no-eglfs -no-directfb -no-linuxfb -no-kms
 
+		# disable gtkstyle because it adds qt4 include paths to the compiler
+		# command line if x11-libs/cairo is built with USE=qt4 (bug 433826)
+		# TODO: fix properly in qt-widgets
+		-no-gtkstyle
+
 		# package-specific options
 		"${myconf[@]}"
 	)

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

[Davide Pesavento]

commit:     822004baf837315f4dede14a54df286a21cf4067
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 06:59:20 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 06:59:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=822004ba

[qt5-build.eclass] Updates for Qt 5.0.0-beta1.

---
 eclass/qt5-build.eclass |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a513854..d13cb37 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -40,14 +40,13 @@ case ${PN#qt-} in
 esac
 case ${QT5_BUILD_TYPE} in
 	live)
+		MY_P=${P}
 		EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
 			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
 		;;
 	release)
-		MY_PN="qt-everywhere-opensource-src"
-		MY_P=${MY_PN}-${PV/_/-}
-		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/beta-snapshots/latest/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_PN}-${PV%%_*}/${EGIT_PROJECT}
+		MY_P=${EGIT_PROJECT}-opensource-src-${PV/_/-}
+		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/${PV#*_}/split_sources/${MY_P}.tar.xz"
 		;;
 esac
 
@@ -64,6 +63,8 @@ if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"
 fi
 
+S=${WORKDIR}/${MY_P}
+
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -88,7 +89,7 @@ fi
 # @ECLASS-VARIABLE: QT5_BUILD_DIR
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${WORKDIR}/${P}_build}
+: ${QT5_BUILD_DIR:=${WORKDIR}/${MY_P}_build}
 
 # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     e7415022546ebd221819d28fdc864253d4a4874b
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Aug 28 07:36:03 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug 28 07:36:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e7415022

[qt5-build.eclass] Symlink qt-dbus tools too, if available.

---
 eclass/qt5-build.eclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9560d06..a513854 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -355,8 +355,10 @@ qt5_symlink_tools_to_buildtree() {
 	mkdir -p "${QT5_BUILD_DIR}"/bin || die
 
 	local bin
-	for bin in "${QTBINDIR}"/{qmake,moc,rcc,uic,qdoc}; do
-		ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
+	for bin in "${QTBINDIR}"/{qmake,moc,rcc,uic,qdoc,qdbuscpp2xml,qdbusxml2cpp}; do
+		if [[ -e ${bin} ]]; then
+			ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
+		fi
 	done
 }
 

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

[Davide Pesavento]

commit:     dffefad5e43f8d96aeb036870174fc4cd4c99c78
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Aug 13 04:45:53 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 04:45:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dffefad5

[qt5-build.eclass] Specify minimum perl version.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 1d921f4..9560d06 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -58,7 +58,7 @@ fi
 
 DEPEND="virtual/pkgconfig"
 if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
-	DEPEND+=" dev-lang/perl"
+	DEPEND+=" >=dev-lang/perl-5.10"
 fi
 if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"

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

[Davide Pesavento]

commit:     34760f5fb8b9b32618b95afc5f70af6c8c501136
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Aug  9 08:02:30 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Aug  9 08:02:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=34760f5f

[qt5-build.eclass] Prefer linking against uninstalled (just built) libraries.

---
 eclass/qt5-build.eclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e998926..1d921f4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -224,8 +224,9 @@ qt5-build_src_configure() {
 	einfo "Running qmake"
 	./bin/qmake -recursive \
 		"${S}"/${EGIT_PROJECT}.pro \
-		QMAKE_LIBDIR="${QTLIBDIR}" \
 		CONFIG+=nostrip \
+		QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
+		QMAKE_LIBDIR+="${QTLIBDIR}" \
 		|| die "qmake failed"
 
 	popd > /dev/null || die

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

[Davide Pesavento]

commit:     d30389aa5ae0d65b2ed469d9c1c7373950f0fb92
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Aug  6 03:02:29 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 03:02:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d30389aa

Kill qt5-module.eclass with fire.

---
 eclass/qt5-module.eclass |  280 ----------------------------------------------
 1 files changed, 0 insertions(+), 280 deletions(-)

diff --git a/eclass/qt5-module.eclass b/eclass/qt5-module.eclass
deleted file mode 100644
index 0fbc140..0000000
--- a/eclass/qt5-module.eclass
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: qt5-module.eclass
-# @MAINTAINER:
-# Qt herd <qt@gentoo.org>
-# @BLURB: Eclass for Qt5 split ebuilds.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt5.
-# Requires EAPI 4.
-
-case ${EAPI} in
-	4) : ;;
-	*) die "qt5-module.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
-
-if [[ ${PV} == *9999* ]]; then
-	QT5_BUILD_TYPE="live"
-	inherit git-2
-else
-	QT5_BUILD_TYPE="release"
-fi
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test
-
-HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="5"
-
-EGIT_PROJECT=${PN/-}
-case ${QT5_BUILD_TYPE} in
-	live)
-		EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
-			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
-		;;
-	release)
-		SRC_URI="" # TODO
-		;;
-esac
-
-IUSE="debug test"
-
-DEPEND="
-	virtual/pkgconfig
-	test? ( ~x11-libs/qt-test-${PV}[debug=] )
-"
-if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
-	DEPEND+=" dev-lang/perl"
-fi
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-#	PATCHES=(
-#		"${FILESDIR}/mypatch.patch"
-#		"${FILESDIR}/mypatch2.patch"
-#	)
-# @CODE
-
-# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing the source directories that should be built.
-# All paths must be relative to ${S}.
-
-# @ECLASS-VARIABLE: QT5_BUILD_DIR
-# @DESCRIPTION:
-# Build directory for out-of-source builds.
-: ${QT5_BUILD_DIR:=${WORKDIR}/${P}_build}
-
-# @ECLASS-VARIABLE: QCONFIG_ADD
-# @DESCRIPTION:
-# List of options that need to be added to QT_CONFIG in qconfig.pri
-: ${QCONFIG_ADD:=}
-
-# @ECLASS-VARIABLE: QCONFIG_REMOVE
-# @DESCRIPTION:
-# List of options that need to be removed from QT_CONFIG in qconfig.pri
-: ${QCONFIG_REMOVE:=}
-
-# @ECLASS-VARIABLE: QCONFIG_DEFINE
-# @DESCRIPTION:
-# List of variables that should be defined at the top of QtCore/qconfig.h
-: ${QCONFIG_DEFINE:=}
-
-# @FUNCTION: qt5-module_pkg_setup
-# @DESCRIPTION:
-# Warns and/or dies if the user is trying to downgrade Qt.
-qt5-module_pkg_setup() {
-	# Protect users by not allowing downgrades between releases.
-	# Downgrading revisions within the same release should be allowed.
-	if has_version ">${CATEGORY}/${P}-r9999:${SLOT}"; then
-		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			eerror "    ***  Sanity check to keep you from breaking your system  ***"
-			eerror "Downgrading Qt is completely unsupported and will break your system!"
-			die "aborting to save your system"
-		else
-			ewarn "Downgrading Qt is completely unsupported and will break your system!"
-		fi
-	fi
-}
-
-# @FUNCTION: qt5-module_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt5-module_src_unpack() {
-	if ! version_is_at_least 4.4 $(gcc-version); then
-		ewarn "Using a GCC version lower than 4.4 is not supported."
-	fi
-
-	if [[ ${PN} == "qt-webkit" ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn "For more info check out https://bugs.gentoo.org/307861"
-			echo
-		fi
-		eshopts_pop
-	fi
-
-	case ${QT5_BUILD_TYPE} in
-		live)
-			git-2_src_unpack
-			;;
-		release)
-			default
-			;;
-	esac
-}
-
-# @FUNCTION: qt5-module_src_prepare
-# @DESCRIPTION:
-# Prepare the sources before the configure phase.
-qt5-module_src_prepare() {
-	qt5_prepare_env
-
-	mkdir -p "${QT5_BUILD_DIR}" || die
-
-	# Apply patches
-	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-# @FUNCTION: qt5-module_src_configure
-# @DESCRIPTION:
-# Runs ./configure and qmake.
-qt5-module_src_configure() {
-	# toolchain setup
-	tc-export CC CXX RANLIB STRIP
-	# qmake-generated Makefiles use LD/LINK for linking
-	export LD="$(tc-getCXX)"
-
-	pushd "${QT5_BUILD_DIR}" > /dev/null || die
-
-	einfo "Running qmake"
-	"${QTBINDIR}"/qmake \
-		"${S}/${PN/-}.pro" \
-		CONFIG+=nostrip \
-		|| die "qmake failed"
-
-	popd > /dev/null || die
-}
-
-# @FUNCTION: qt5-module_src_compile
-# @DESCRIPTION:
-# Compiles the code in target directories.
-qt5-module_src_compile() {
-	qt5_foreach_target_subdir emake
-}
-
-# @FUNCTION: qt5-module_src_test
-# @DESCRIPTION:
-# Runs tests in target directories.
-# TODO: find a way to avoid circular deps with USE=test.
-qt5-module_src_test() {
-	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
-
-	# create a custom testrunner script that correctly sets
-	# {,DY}LD_LIBRARY_PATH before executing the given test
-	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
-	cat <<-EOF > "${testrunner}"
-	#!/bin/sh
-	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
-	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
-	"\$@"
-	EOF
-	chmod +x "${testrunner}"
-
-	qmake() {
-		"${QTBINDIR}"/qmake \
-			"${S}/${subdir}/${subdir##*/}.pro" \
-			|| die "qmake failed"
-	}
-	qt5_foreach_target_subdir qmake
-	qt5_foreach_target_subdir emake
-	qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
-}
-
-# @FUNCTION: qt5-module_src_install
-# @DESCRIPTION:
-# Performs the actual installation of target directories.
-# TODO: pkgconfig files are installed in the wrong place
-qt5-module_src_install() {
-	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
-
-	# TODO: qt5_install_module_qconfigs
-
-	# remove .la files since we are building only shared libraries
-	prune_libtool_files
-}
-
-# @FUNCTION: qt_use
-# @USAGE: <flag> [feature] [enableval]
-# @DESCRIPTION:
-# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature}" if it's disabled. If [feature] is not specified,
-# <flag> will be used for that. If [enableval] is not specified, the
-# "-${enableval}" prefix is omitted.
-qt_use() {
-	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
-}
-
-
-######  Internal functions  ######
-
-# @FUNCTION: qt5_prepare_env
-# @INTERNAL
-# @DESCRIPTION:
-# Prepares the environment for building Qt.
-qt5_prepare_env() {
-	# setup installation directories
-	QTPREFIXDIR=${EPREFIX}/usr
-	QTBINDIR=${QTPREFIXDIR}/qt5/bin # FIXME
-	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt5
-	QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
-	QTHEADERDIR=${QTPREFIXDIR}/include/qt5
-	QTPLUGINDIR=${QTLIBDIR}/plugins
-	QTIMPORTDIR=${QTLIBDIR}/imports
-	QTDATADIR=${QTPREFIXDIR}/share/qt5
-	QTTRANSDIR=${QTDATADIR}/translations
-	QTEXAMPLESDIR=${QTDATADIR}/examples
-	QTTESTSDIR=${QTDATADIR}/tests
-	QTSYSCONFDIR=${EPREFIX}/etc/qt5
-}
-
-# @FUNCTION: qt5_foreach_target_subdir
-# @INTERNAL
-# @DESCRIPTION:
-# Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
-qt5_foreach_target_subdir() {
-	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
-
-	local subdir
-	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
-		if [[ ${EBUILD_PHASE} == "test" ]]; then
-			subdir=tests/auto${subdir#src}
-			[[ -d ${S}/${subdir} ]] || continue
-		fi
-
-		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
-		pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die
-
-		einfo "Running $* ${subdir:+in ${subdir}}"
-		"$@"
-
-		popd > /dev/null || die
-	done
-}

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

[Davide Pesavento]

commit:     8821a5a851b0494dc1bc2dac888bf42aedc3bd61
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Aug  6 02:53:20 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 02:53:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8821a5a8

Merge qt5-module.eclass into qt5-build.eclass

---
 eclass/qt5-build.eclass |  206 ++++++++++++++++++++++++++---------------------
 1 files changed, 114 insertions(+), 92 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fdb1769..e998926 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -31,7 +31,7 @@ LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="5"
 
 case ${PN#qt-} in
-	core|dbus|gui|network|opengl|sql|test|widgets|xml)
+	core|dbus|gui|network|opengl|printsupport|sql|test|widgets|xml)
 		EGIT_PROJECT="qtbase"
 		;;
 	*)
@@ -51,7 +51,10 @@ case ${QT5_BUILD_TYPE} in
 		;;
 esac
 
-IUSE="+c++11 debug +pch test"
+IUSE="+c++11 debug test"
+if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
+	IUSE+=" +pch"
+fi
 
 DEPEND="virtual/pkgconfig"
 if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
@@ -157,42 +160,46 @@ qt5-build_src_unpack() {
 
 # @FUNCTION: qt5-build_src_prepare
 # @DESCRIPTION:
-# Prepare the sources before the configure phase.
+# Prepares the sources before the configure phase.
 qt5-build_src_prepare() {
 	qt5_prepare_env
 
 	mkdir -p "${QT5_BUILD_DIR}" || die
 
-	if [[ ${PN} == "qt-core" ]]; then
+	if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
 		sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR=/ s:): \
 			${MAKEOPTS} ${EXTRA_EMAKE} \
 			'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
 			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
 			configure || die "sed configure failed"
-	else
-		# Skip qmake build
-		sed -i -e '/"$MAKE".*QMAKE_BUILD_ERROR=/ d' \
-			configure || die "sed configure failed"
-		rm -f qmake/Makefile*
 
-		qt5_symlink_tools_to_buildtree
+		# Respect CXX in configure
+		sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
+			configure || die "sed QMAKE_CONF_COMPILER failed"
+
+		# Respect CC, CXX, LINK and *FLAGS in config.tests
+		# FIXME: in compile.test, -m flags are passed to the linker via LIBS
+		find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+			sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
+				'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+				'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+			|| die "sed config.tests failed"
+
+		if [[ ${PN} != "qt-core" ]]; then
+			# Skip qmake build
+			sed -i -e '/"$MAKE".*QMAKE_BUILD_ERROR=/ d' \
+				configure || die "sed configure failed"
+			rm -f qmake/Makefile*
+		fi
 	fi
 
-	# Respect CXX in configure
-	sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
-		configure || die "sed QMAKE_CONF_COMPILER failed"
-
-	# Respect CC, CXX, LINK and *FLAGS in config.tests
-	# FIXME: in compile.test, -m flags are passed to the linker via LIBS
-	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
-		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
-			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
-			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
-		|| die "sed config.tests failed"
+	if [[ ${PN} != "qt-core" ]]; then
+		qt5_symlink_tools_to_buildtree
+	fi
 
 	# Remove unused project files to speed up recursive qmake invocation
-	rm -f demos/demos.pro examples/examples.pro tests/tests.pro tools/tools.pro
+	rm -f demos/demos.pro examples/examples.pro tests/tests.pro
 
 	# Apply patches
 	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
@@ -201,83 +208,22 @@ qt5-build_src_prepare() {
 
 # @FUNCTION: qt5-build_src_configure
 # @DESCRIPTION:
-# Runs ./configure and qmake.
+# Runs qmake, possibly preceded by ./configure.
 qt5-build_src_configure() {
 	# toolchain setup
 	tc-export CC CXX RANLIB STRIP
 	# qmake-generated Makefiles use LD/LINK for linking
 	export LD="$(tc-getCXX)"
 
-	# configure arguments
-	local conf=(
-		# installation paths
-		-prefix "${QTPREFIXDIR}"
-		-bindir "${QTBINDIR}"
-		-libdir "${QTLIBDIR}"
-		-docdir "${QTDOCDIR}"
-		-headerdir "${QTHEADERDIR}"
-		-plugindir "${QTPLUGINDIR}"
-		-importdir "${QTIMPORTDIR}"
-		-datadir "${QTDATADIR}"
-		-translationdir "${QTTRANSDIR}"
-		-sysconfdir "${QTSYSCONFDIR}"
-		-examplesdir "${QTEXAMPLESDIR}"
-		-testsdir "${QTTESTSDIR}"
-
-		# debug/release
-		$(use debug && echo -debug || echo -release)
-		-no-separate-debug-info
-
-		# licensing stuff
-		-opensource -confirm-license
-
-		# C++11 support
-		$(qt_use c++11)
-
-		# general configure options
-		-shared
-		-dont-process
-		-pkg-config
-
-		# prefer system libraries
-		-system-zlib
-		-system-pcre
-
-		# exclude examples and tests from being built
-		-nomake examples
-		-nomake tests
-
-		# disable rpath on non-prefix (bugs 380415 and 417169)
-		$(use prefix || echo -no-rpath)
-
-		# verbosity of the configure and build phases
-		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
-
-		# precompiled headers don't work on hardened, where the flag is masked
-		$(qt_use pch)
-
-		# reduce relocations in libraries through extra linker optimizations
-		# requires GNU ld >= 2.18
-		-reduce-relocations
-
-		# disable all SQL drivers by default, override in qt-sql
-		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
-		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
-
-		# disable all platform plugins by default, override in qt-gui
-		-no-xcb -no-xrender -no-eglfs -no-directfb -no-linuxfb -no-kms
-
-		# package-specific options
-		"${myconf[@]}"
-	)
-
 	pushd "${QT5_BUILD_DIR}" > /dev/null || die
 
-	einfo "Configuring with: ${conf[@]}"
-	"${S}"/configure "${conf[@]}" || die "configure failed"
+	if [[ ${EGIT_PROJECT} == "qtbase" ]]; then
+		qt5_base_configure
+	fi
 
 	einfo "Running qmake"
-	./bin/qmake -recursive "${S}"/qtbase.pro \
+	./bin/qmake -recursive \
+		"${S}"/${EGIT_PROJECT}.pro \
 		QMAKE_LIBDIR="${QTLIBDIR}" \
 		CONFIG+=nostrip \
 		|| die "qmake failed"
@@ -297,6 +243,8 @@ qt5-build_src_compile() {
 # Runs tests in target directories.
 # TODO: find a way to avoid circular deps with USE=test.
 qt5-build_src_test() {
+	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
+
 	# create a custom testrunner script that correctly sets
 	# {,DY}LD_LIBRARY_PATH before executing the given test
 	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
@@ -411,22 +359,96 @@ qt5_symlink_tools_to_buildtree() {
 	done
 }
 
+# @FUNCTION: qt5_base_configure
+# @INTERNAL
+# @DESCRIPTION:
+# Runs ./configure for modules belonging to qtbase.
+qt5_base_configure() {
+	# configure arguments
+	local conf=(
+		# installation paths
+		-prefix "${QTPREFIXDIR}"
+		-bindir "${QTBINDIR}"
+		-libdir "${QTLIBDIR}"
+		-docdir "${QTDOCDIR}"
+		-headerdir "${QTHEADERDIR}"
+		-plugindir "${QTPLUGINDIR}"
+		-importdir "${QTIMPORTDIR}"
+		-datadir "${QTDATADIR}"
+		-translationdir "${QTTRANSDIR}"
+		-sysconfdir "${QTSYSCONFDIR}"
+		-examplesdir "${QTEXAMPLESDIR}"
+		-testsdir "${QTTESTSDIR}"
+
+		# debug/release
+		$(use debug && echo -debug || echo -release)
+		-no-separate-debug-info
+
+		# licensing stuff
+		-opensource -confirm-license
+
+		# C++11 support
+		$(qt_use c++11)
+
+		# general configure options
+		-shared
+		-dont-process
+		-pkg-config
+
+		# prefer system libraries
+		-system-zlib
+		-system-pcre
+
+		# exclude examples and tests from being built
+		-nomake examples
+		-nomake tests
+
+		# disable rpath on non-prefix (bugs 380415 and 417169)
+		$(use prefix || echo -no-rpath)
+
+		# verbosity of the configure and build phases
+		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
+
+		# precompiled headers don't work on hardened, where the flag is masked
+		$(qt_use pch)
+
+		# reduce relocations in libraries through extra linker optimizations
+		# requires GNU ld >= 2.18
+		-reduce-relocations
+
+		# disable all SQL drivers by default, override in qt-sql
+		-no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc
+		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
+
+		# disable all platform plugins by default, override in qt-gui
+		-no-xcb -no-xrender -no-eglfs -no-directfb -no-linuxfb -no-kms
+
+		# package-specific options
+		"${myconf[@]}"
+	)
+
+	einfo "Configuring with: ${conf[@]}"
+	"${S}"/configure "${conf[@]}" || die "configure failed"
+}
+
 # @FUNCTION: qt5_foreach_target_subdir
 # @INTERNAL
 # @DESCRIPTION:
 # Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
 qt5_foreach_target_subdir() {
+	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
+
 	local subdir
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
 		if [[ ${EBUILD_PHASE} == "test" ]]; then
-			subdir=${subdir/#src/tests\/auto}
-			[[ -d ${subdir} ]] || continue
+			subdir=tests/auto${subdir#src}
+			[[ -d ${S}/${subdir} ]] || continue
 		fi
 
 		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
 		pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die
 
-		einfo "Running $* in ${subdir}"
+		einfo "Running $* ${subdir:+in ${subdir}}"
 		"$@"
 
 		popd > /dev/null || die

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

[Davide Pesavento]

commit:     4cba629fa5015c76cb1fbce82561751e34604f95
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Aug  6 00:56:54 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug  6 00:56:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4cba629f

[qt5-build.eclass] By default, build tools too.

---
 eclass/qt5-build.eclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 768c7bd..fdb1769 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -243,8 +243,9 @@ qt5-build_src_configure() {
 		-system-zlib
 		-system-pcre
 
-		# exclude examples and tests from building
-		-make libs
+		# exclude examples and tests from being built
+		-nomake examples
+		-nomake tests
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
 		$(use prefix || echo -no-rpath)

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

[Michael Palimaka]

commit:     3ea37eb3aa1424cca91cbcb03d742d74f1f2a9a2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 14:45:09 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 14:45:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3ea37eb3

[eclass] More respect for *FLAGS.

---
 eclass/qt4-build.eclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index c6365b1..2d41d13 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -266,7 +266,13 @@ qt4-build_src_prepare() {
 		CXX='$(tc-getCXX)'\n\
 		CFLAGS='${CFLAGS}'\n\
 		CXXFLAGS='${CXXFLAGS}'\n\
-		LDFLAGS='${LDFLAGS}'\n" \
+		LDFLAGS='${LDFLAGS}'\n\
+		QMakeVar set QMAKE_CFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_CXXFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_CXXFLAGS_DEBUG\n\
+		QMakeVar set QMAKE_LFLAGS_RELEASE\n\
+		QMakeVar set QMAKE_LFLAGS_DEBUG\n"\
 		-i configure \
 		|| die "sed SYSTEM_VARIABLES failed"
 

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

[Davide Pesavento]

commit:     a8d824d678635922652d668b94daf617e3b4f738
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jul 22 06:20:02 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 18:10:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a8d824d6

[qt5-build.eclass] qtmodule-configtests is gone.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f356a52..d088b06 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -319,7 +319,7 @@ qt5-build_src_install() {
 
 	if [[ ${PN} == "qt-core" ]]; then
 		pushd "${QT5_BUILD_DIR}" > /dev/null || die
-		emake INSTALL_ROOT="${D}" install_{configtests,mkspecs,qmake,syncqt}
+		emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt}
 		popd > /dev/null || die
 
 		# create an empty Gentoo/gentoo-qconfig.h

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

[Ben de Groot]

commit:     894a599380901b860ef50dba593647456267fa71
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Mon Jul 23 13:23:49 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 13:23:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=894a5993

l10n.eclass: rm since it is in the official tree now

---
 eclass/l10n.eclass |  121 ----------------------------------------------------
 1 files changed, 0 insertions(+), 121 deletions(-)

diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
deleted file mode 100644
index 50464e8..0000000
--- a/eclass/l10n.eclass
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: l10n.eclass
-# @MAINTAINER:
-# Ben de Groot <yngwin@gentoo.org>
-# @BLURB: convenience functions to handle localizations
-# @DESCRIPTION:
-# The l10n (localization) eclass offers a number of functions to more
-# conveniently handle localizations (translations) offered by packages.
-# These are meant to prevent code duplication for such boring tasks as
-# determining the cross-section between the user's set LINGUAS and what
-# is offered by the package; and generating the right list of linguas_*
-# USE flags.
-
-# @ECLASS-VARIABLE: PLOCALES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Variable listing the locales for which localizations are offered by
-# the package. Check profiles/desc/linguas.desc to see if the locales
-# are listed there. Add any missing ones there.
-#
-# Example: PLOCALES="cy de el_GR en_US pt_BR vi zh_CN"
-
-# @ECLASS-VARIABLE: PLOCALE_BACKUP
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# In some cases the package fails when none of the offered PLOCALES are
-# selected by the user. In that case this variable should be set to a
-# default locale (usually 'en' or 'en_US') as backup.
-#
-# Example: PLOCALE_BACKUP="en_US"
-
-# Add linguas useflags
-for u in ${PLOCALES}; do
-	IUSE+=" linguas_${u}"
-done
-
-# @FUNCTION: l10n_for_each_locale_do
-# @USAGE: <function>
-# @DESCRIPTION:
-# Convenience function for processing localizations. The parameter should
-# be a function (defined in the consuming eclass or ebuild) which takes
-# an individual localization as (last) parameter.
-#
-# Example: l10n_for_each_locale_do install_locale
-l10n_for_each_locale_do() {
-	local locs x
-	locs=$(l10n_get_locales)
-	for x in ${locs}; do
-		"${@}" ${x} || die "failed to process enabled ${x} locale"
-	done
-}
-
-# @FUNCTION: l10n_for_each_disabled_locale_do
-# @USAGE: <function>
-# @DESCRIPTION:
-# Complementary to l10n_for_each_locale_do, this function will process
-# locales that are disabled. This could be used for example to remove
-# locales from a Makefile, to prevent them from being built needlessly.
-l10n_for_each_disabled_locale_do() {
-	local locs x
-	locs=$(l10n_get_locales disabled)
-	for x in ${locs}; do
-		"${@}" ${x} || die "failed to process disabled ${x} locale"
-	done
-}
-
-# @FUNCTION: l10n_find_plocales_changes
-# @USAGE: <translations dir> <filename pre pattern> <filename post pattern>
-# @DESCRIPTION:
-# Ebuild maintenance helper function to find changes in package offered
-# locales when doing a version bump. This could be added for example to
-# src_prepare
-#
-# Example: l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-l10n_find_plocales_changes() {
-	[[ $# -ne 3 ]] && die "Exactly 3 arguments are needed!"
-	einfo "Looking in ${1} for new locales ..."
-	pushd "${1}" >/dev/null || die "Cannot access ${1}"
-	local current= x=
-	for x in ${2}*${3} ; do
-		x=${x#"${2}"}
-		x=${x%"${3}"}
-		current+="${x} "
-	done
-	popd >/dev/null
-	if [[ ${PLOCALES} != ${current%[[:space:]]} ]] ; then
-		einfo "There are changes in locales! This ebuild should be updated to:"
-		einfo "PLOCALES=\"${current%[[:space:]]}\""
-	else
-		einfo "Done"
-	fi
-}
-
-# @FUNCTION: l10n_get_locales
-# @USAGE: [disabled]
-# @DESCRIPTION:
-# Determine which LINGUAS USE flags the user has enabled that are offered
-# by the package, as listed in PLOCALES, and return them. In case no
-# locales are selected, fall back on PLOCALE_BACKUP. When the disabled
-# argument is given, return the disabled useflags instead of the enabled
-# ones. This function is normally used internally in this eclass, not by
-# l10n.eclass consumers.
-l10n_get_locales() {
-	local disabled_locales enabled_locales loc locs
-	for loc in ${PLOCALES}; do
-		if use linguas_${loc}; then
-			enabled_locales+="${loc} "
-		else
-			disabled_locales+="${loc} "
-		fi
-	done
-	if [[ ${1} == disabled ]]; then
-		locs=${disabled_locales}
-	else
-		locs=${enabled_locales:-$PLOCALE_BACKUP}
-	fi
-	printf "%s" "${locs}"
-}

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

[Ben de Groot]

commit:     4670b28cc8ea47e0b9fb16b90c0bcb09c62dae94
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Mon Jul 23 12:31:29 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 12:31:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4670b28c

l10n.eclass: update with suggestions by sera

---
 eclass/l10n.eclass |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index ffe8a9b..50464e8 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -33,11 +33,9 @@
 # Example: PLOCALE_BACKUP="en_US"
 
 # Add linguas useflags
-if [[ -n "${PLOCALES}" ]]; then
-	for u in ${PLOCALES}; do
-		IUSE+=" linguas_${u}"
-	done
-fi
+for u in ${PLOCALES}; do
+	IUSE+=" linguas_${u}"
+done
 
 # @FUNCTION: l10n_for_each_locale_do
 # @USAGE: <function>
@@ -50,11 +48,9 @@ fi
 l10n_for_each_locale_do() {
 	local locs x
 	locs=$(l10n_get_locales)
-	if [[ -n "${locs}" ]]; then
-		for x in ${locs}; do
-			${@} ${x} || die "failed to process enabled ${x} locale"
-		done
-	fi
+	for x in ${locs}; do
+		"${@}" ${x} || die "failed to process enabled ${x} locale"
+	done
 }
 
 # @FUNCTION: l10n_for_each_disabled_locale_do
@@ -66,11 +62,9 @@ l10n_for_each_locale_do() {
 l10n_for_each_disabled_locale_do() {
 	local locs x
 	locs=$(l10n_get_locales disabled)
-	if [[ -n "${locs}" ]]; then
-		for x in ${locs}; do
-			${@} ${x} || die "failed to process disabled ${x} locale"
-		done
-	fi
+	for x in ${locs}; do
+		"${@}" ${x} || die "failed to process disabled ${x} locale"
+	done
 }
 
 # @FUNCTION: l10n_find_plocales_changes

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

[Davide Pesavento]

commit:     633a0b814a7af7bb7d1914d469caf3028534f483
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jul 20 07:36:22 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 07:36:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=633a0b81

[qt5-build.eclass] Assign something sensible to SRC_URI and S for (pre-)release tarballs.

---
 eclass/qt5-build.eclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 126136f..f356a52 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -44,7 +44,10 @@ case ${QT5_BUILD_TYPE} in
 			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
 		;;
 	release)
-		SRC_URI="" # TODO
+		MY_PN="qt-everywhere-opensource-src"
+		MY_P=${MY_PN}-${PV/_/-}
+		SRC_URI="http://releases.qt-project.org/qt${PV%.*}/beta-snapshots/latest/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_PN}-${PV%%_*}/${EGIT_PROJECT}
 		;;
 esac
 

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

[Ben de Groot]

commit:     4e58a2225f0da02c3141f08095016436cf6933fb
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Thu Jul 19 15:26:56 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 15:26:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4e58a222

Update l10n.eclass

---
 eclass/l10n.eclass |   72 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index 5c13c00..ffe8a9b 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -33,7 +33,11 @@
 # Example: PLOCALE_BACKUP="en_US"
 
 # Add linguas useflags
-[[ -n "${PLOCALES}" ]] && IUSE+=" $(printf 'linguas_%s ' ${PLOCALES})"
+if [[ -n "${PLOCALES}" ]]; then
+	for u in ${PLOCALES}; do
+		IUSE+=" linguas_${u}"
+	done
+fi
 
 # @FUNCTION: l10n_for_each_locale_do
 # @USAGE: <function>
@@ -44,30 +48,27 @@
 #
 # Example: l10n_for_each_locale_do install_locale
 l10n_for_each_locale_do() {
-	local xlocs=
-	xlocs=$(l10n_get_linguas_crosssection)
-	if [[ -n "${xlocs}" ]]; then
-		local x
-		for x in ${xlocs}; do
-			${@} ${x} || die "failed to process ${x} locale"
+	local locs x
+	locs=$(l10n_get_locales)
+	if [[ -n "${locs}" ]]; then
+		for x in ${locs}; do
+			${@} ${x} || die "failed to process enabled ${x} locale"
 		done
 	fi
 }
 
-# @FUNCTION: l10n_for_each_unselected_locale_do
+# @FUNCTION: l10n_for_each_disabled_locale_do
 # @USAGE: <function>
 # @DESCRIPTION:
 # Complementary to l10n_for_each_locale_do, this function will process
-# locales that are not selected. This could be used for example to remove
+# locales that are disabled. This could be used for example to remove
 # locales from a Makefile, to prevent them from being built needlessly.
-l10n_for_each_unselected_locale_do() {
-	local o= x=
-	o=$(join -v 1 <(echo "${PLOCALES// /$'\n'}") <(echo "${LINGUAS// /$'\n'}") )
-	o=${o//$'\n'/' '}
-	einfo "Unselected locales are: ${o}"
-	if [[ -n "${o}" ]]; then
-		for x in ${o}; do
-			${@} ${x} || die "failed to process unselected ${x} locale"
+l10n_for_each_disabled_locale_do() {
+	local locs x
+	locs=$(l10n_get_locales disabled)
+	if [[ -n "${locs}" ]]; then
+		for x in ${locs}; do
+			${@} ${x} || die "failed to process disabled ${x} locale"
 		done
 	fi
 }
@@ -94,22 +95,33 @@ l10n_find_plocales_changes() {
 	if [[ ${PLOCALES} != ${current%[[:space:]]} ]] ; then
 		einfo "There are changes in locales! This ebuild should be updated to:"
 		einfo "PLOCALES=\"${current%[[:space:]]}\""
+	else
+		einfo "Done"
 	fi
 }
 
-# @FUNCTION: l10n_get_linguas_crosssection
+# @FUNCTION: l10n_get_locales
+# @USAGE: [disabled]
 # @DESCRIPTION:
-# Determine the cross-section of user-set LINGUAS and the locales which
-# the package offers (listed in PLOCALES), and return them. In case no
-# locales are selected, fall back on PLOCALE_BACKUP. This function is
-# normally used internally in this eclass, not by l10n.eclass consumers.
-l10n_get_linguas_crosssection() {
-	local lang= loc= xloc=
-	for lang in ${LINGUAS}; do
-		for loc in ${PLOCALES}; do
-			[[ ${lang} == ${loc} ]] && xloc+="${loc} "
-		done
+# Determine which LINGUAS USE flags the user has enabled that are offered
+# by the package, as listed in PLOCALES, and return them. In case no
+# locales are selected, fall back on PLOCALE_BACKUP. When the disabled
+# argument is given, return the disabled useflags instead of the enabled
+# ones. This function is normally used internally in this eclass, not by
+# l10n.eclass consumers.
+l10n_get_locales() {
+	local disabled_locales enabled_locales loc locs
+	for loc in ${PLOCALES}; do
+		if use linguas_${loc}; then
+			enabled_locales+="${loc} "
+		else
+			disabled_locales+="${loc} "
+		fi
 	done
-	xloc=${xloc:-$PLOCALE_BACKUP}
-	printf "%s" "${xloc}"
+	if [[ ${1} == disabled ]]; then
+		locs=${disabled_locales}
+	else
+		locs=${enabled_locales:-$PLOCALE_BACKUP}
+	fi
+	printf "%s" "${locs}"
 }

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

[Ben de Groot]

commit:     2e27e0a2ca278599cf5912491aacdc3b40af23d5
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Thu Jul 19 06:07:09 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 06:07:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2e27e0a2

l10n.eclass: clean up commented out line

---
 eclass/l10n.eclass |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index f2918f3..5c13c00 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -112,5 +112,4 @@ l10n_get_linguas_crosssection() {
 	done
 	xloc=${xloc:-$PLOCALE_BACKUP}
 	printf "%s" "${xloc}"
-#	einfo "Selected locales are: ${xloc:-none}"
 }

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

[Ben de Groot]

commit:     52e9002e475557e2c2b42a020f3d0b3ad80b0fd4
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Sun Jul 15 11:58:48 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 11:58:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=52e9002e

l10n.eclass: return instead of export, and allow arguments to be passed

---
 eclass/l10n.eclass |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index fd278d2..f2918f3 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -40,15 +40,16 @@
 # @DESCRIPTION:
 # Convenience function for processing localizations. The parameter should
 # be a function (defined in the consuming eclass or ebuild) which takes
-# an individual localization as parameter.
+# an individual localization as (last) parameter.
 #
 # Example: l10n_for_each_locale_do install_locale
 l10n_for_each_locale_do() {
-	l10n_get_linguas_crosssection
-	if [[ -n "${L10N_LOCS}" ]]; then
+	local xlocs=
+	xlocs=$(l10n_get_linguas_crosssection)
+	if [[ -n "${xlocs}" ]]; then
 		local x
-		for x in ${L10N_LOCS}; do
-			${1} ${x} || die "failed to process ${x} locale"
+		for x in ${xlocs}; do
+			${@} ${x} || die "failed to process ${x} locale"
 		done
 	fi
 }
@@ -66,7 +67,7 @@ l10n_for_each_unselected_locale_do() {
 	einfo "Unselected locales are: ${o}"
 	if [[ -n "${o}" ]]; then
 		for x in ${o}; do
-			${1} ${x} || die "failed to process unselected ${x} locale"
+			${@} ${x} || die "failed to process unselected ${x} locale"
 		done
 	fi
 }
@@ -99,19 +100,17 @@ l10n_find_plocales_changes() {
 # @FUNCTION: l10n_get_linguas_crosssection
 # @DESCRIPTION:
 # Determine the cross-section of user-set LINGUAS and the locales which
-# the package offers (listed in PLOCALES), and export L10N_LOCS. In case
-# no locales are selected, fall back on PLOCALE_BACKUP. This function is
+# the package offers (listed in PLOCALES), and return them. In case no
+# locales are selected, fall back on PLOCALE_BACKUP. This function is
 # normally used internally in this eclass, not by l10n.eclass consumers.
 l10n_get_linguas_crosssection() {
-	# @VARIABLE: L10N_LOCS
-	# @DESCRIPTION: Selected locales (cross-section of LINGUAS and PLOCALES)
-	unset L10N_LOCS
 	local lang= loc= xloc=
 	for lang in ${LINGUAS}; do
 		for loc in ${PLOCALES}; do
 			[[ ${lang} == ${loc} ]] && xloc+="${loc} "
 		done
 	done
-	export L10N_LOCS="${xloc:-$PLOCALE_BACKUP}"
-	einfo "Selected locales are: ${L10N_LOCS}"
+	xloc=${xloc:-$PLOCALE_BACKUP}
+	printf "%s" "${xloc}"
+#	einfo "Selected locales are: ${xloc:-none}"
 }

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

[Ben de Groot]

commit:     293a026de28fd1a66fc6e2428a79be7c50397449
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Sat Jul 14 16:45:08 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 16:45:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=293a026d

l10n.eclass: drop l10n_iuse and add linguas useflags automagically

---
 eclass/l10n.eclass |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index 7c9c5b1..fd278d2 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -32,15 +32,8 @@
 #
 # Example: PLOCALE_BACKUP="en_US"
 
-# @FUNCTION: l10n_iuse
-# @DESCRIPTION:
-# Print a list of linguas useflags, corresponding to PLOCALES.
-# Normally used within IUSE.
-#
-# Example: IUSE="doc pdf $(l10n_iuse)"
-l10n_iuse() {
-	[[ -n "${PLOCALES}" ]] && printf 'linguas_%s ' ${PLOCALES}
-}
+# Add linguas useflags
+[[ -n "${PLOCALES}" ]] && IUSE+=" $(printf 'linguas_%s ' ${PLOCALES})"
 
 # @FUNCTION: l10n_for_each_locale_do
 # @USAGE: <function>

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

[Ben de Groot]

commit:     061214eccc7ecbddf9ffcd657ec7117b920df537
Author:     Ben de Groot <yngwin <AT> gmail <DOT> com>
AuthorDate: Sat Jul 14 12:33:38 2012 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 12:33:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=061214ec

l10n.eclass: commit first draft for review and testing

---
 eclass/l10n.eclass |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 124 insertions(+), 0 deletions(-)

diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
new file mode 100644
index 0000000..7c9c5b1
--- /dev/null
+++ b/eclass/l10n.eclass
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: l10n.eclass
+# @MAINTAINER:
+# Ben de Groot <yngwin@gentoo.org>
+# @BLURB: convenience functions to handle localizations
+# @DESCRIPTION:
+# The l10n (localization) eclass offers a number of functions to more
+# conveniently handle localizations (translations) offered by packages.
+# These are meant to prevent code duplication for such boring tasks as
+# determining the cross-section between the user's set LINGUAS and what
+# is offered by the package; and generating the right list of linguas_*
+# USE flags.
+
+# @ECLASS-VARIABLE: PLOCALES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Variable listing the locales for which localizations are offered by
+# the package. Check profiles/desc/linguas.desc to see if the locales
+# are listed there. Add any missing ones there.
+#
+# Example: PLOCALES="cy de el_GR en_US pt_BR vi zh_CN"
+
+# @ECLASS-VARIABLE: PLOCALE_BACKUP
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# In some cases the package fails when none of the offered PLOCALES are
+# selected by the user. In that case this variable should be set to a
+# default locale (usually 'en' or 'en_US') as backup.
+#
+# Example: PLOCALE_BACKUP="en_US"
+
+# @FUNCTION: l10n_iuse
+# @DESCRIPTION:
+# Print a list of linguas useflags, corresponding to PLOCALES.
+# Normally used within IUSE.
+#
+# Example: IUSE="doc pdf $(l10n_iuse)"
+l10n_iuse() {
+	[[ -n "${PLOCALES}" ]] && printf 'linguas_%s ' ${PLOCALES}
+}
+
+# @FUNCTION: l10n_for_each_locale_do
+# @USAGE: <function>
+# @DESCRIPTION:
+# Convenience function for processing localizations. The parameter should
+# be a function (defined in the consuming eclass or ebuild) which takes
+# an individual localization as parameter.
+#
+# Example: l10n_for_each_locale_do install_locale
+l10n_for_each_locale_do() {
+	l10n_get_linguas_crosssection
+	if [[ -n "${L10N_LOCS}" ]]; then
+		local x
+		for x in ${L10N_LOCS}; do
+			${1} ${x} || die "failed to process ${x} locale"
+		done
+	fi
+}
+
+# @FUNCTION: l10n_for_each_unselected_locale_do
+# @USAGE: <function>
+# @DESCRIPTION:
+# Complementary to l10n_for_each_locale_do, this function will process
+# locales that are not selected. This could be used for example to remove
+# locales from a Makefile, to prevent them from being built needlessly.
+l10n_for_each_unselected_locale_do() {
+	local o= x=
+	o=$(join -v 1 <(echo "${PLOCALES// /$'\n'}") <(echo "${LINGUAS// /$'\n'}") )
+	o=${o//$'\n'/' '}
+	einfo "Unselected locales are: ${o}"
+	if [[ -n "${o}" ]]; then
+		for x in ${o}; do
+			${1} ${x} || die "failed to process unselected ${x} locale"
+		done
+	fi
+}
+
+# @FUNCTION: l10n_find_plocales_changes
+# @USAGE: <translations dir> <filename pre pattern> <filename post pattern>
+# @DESCRIPTION:
+# Ebuild maintenance helper function to find changes in package offered
+# locales when doing a version bump. This could be added for example to
+# src_prepare
+#
+# Example: l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
+l10n_find_plocales_changes() {
+	[[ $# -ne 3 ]] && die "Exactly 3 arguments are needed!"
+	einfo "Looking in ${1} for new locales ..."
+	pushd "${1}" >/dev/null || die "Cannot access ${1}"
+	local current= x=
+	for x in ${2}*${3} ; do
+		x=${x#"${2}"}
+		x=${x%"${3}"}
+		current+="${x} "
+	done
+	popd >/dev/null
+	if [[ ${PLOCALES} != ${current%[[:space:]]} ]] ; then
+		einfo "There are changes in locales! This ebuild should be updated to:"
+		einfo "PLOCALES=\"${current%[[:space:]]}\""
+	fi
+}
+
+# @FUNCTION: l10n_get_linguas_crosssection
+# @DESCRIPTION:
+# Determine the cross-section of user-set LINGUAS and the locales which
+# the package offers (listed in PLOCALES), and export L10N_LOCS. In case
+# no locales are selected, fall back on PLOCALE_BACKUP. This function is
+# normally used internally in this eclass, not by l10n.eclass consumers.
+l10n_get_linguas_crosssection() {
+	# @VARIABLE: L10N_LOCS
+	# @DESCRIPTION: Selected locales (cross-section of LINGUAS and PLOCALES)
+	unset L10N_LOCS
+	local lang= loc= xloc=
+	for lang in ${LINGUAS}; do
+		for loc in ${PLOCALES}; do
+			[[ ${lang} == ${loc} ]] && xloc+="${loc} "
+		done
+	done
+	export L10N_LOCS="${xloc:-$PLOCALE_BACKUP}"
+	einfo "Selected locales are: ${L10N_LOCS}"
+}

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

[Davide Pesavento]

commit:     b3a4e045f5aee9115a190b1eaf84ee3d38cb091b
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jul 12 21:02:14 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 21:02:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b3a4e045

[qt5-module.eclass] New eclass for Qt5 modules not belonging to qtbase.

---
 eclass/qt5-module.eclass |  280 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 280 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-module.eclass b/eclass/qt5-module.eclass
new file mode 100644
index 0000000..0fbc140
--- /dev/null
+++ b/eclass/qt5-module.eclass
@@ -0,0 +1,280 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: qt5-module.eclass
+# @MAINTAINER:
+# Qt herd <qt@gentoo.org>
+# @BLURB: Eclass for Qt5 split ebuilds.
+# @DESCRIPTION:
+# This eclass contains various functions that are used when building Qt5.
+# Requires EAPI 4.
+
+case ${EAPI} in
+	4) : ;;
+	*) die "qt5-module.eclass: unsupported EAPI=${EAPI:-0}" ;;
+esac
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+if [[ ${PV} == *9999* ]]; then
+	QT5_BUILD_TYPE="live"
+	inherit git-2
+else
+	QT5_BUILD_TYPE="release"
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test
+
+HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="5"
+
+EGIT_PROJECT=${PN/-}
+case ${QT5_BUILD_TYPE} in
+	live)
+		EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
+			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
+		;;
+	release)
+		SRC_URI="" # TODO
+		;;
+esac
+
+IUSE="debug test"
+
+DEPEND="
+	virtual/pkgconfig
+	test? ( ~x11-libs/qt-test-${PV}[debug=] )
+"
+if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
+	DEPEND+=" dev-lang/perl"
+fi
+
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing all the patches to be applied. This variable
+# is expected to be defined in the global scope of ebuilds. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+#
+# Example:
+# @CODE
+#	PATCHES=(
+#		"${FILESDIR}/mypatch.patch"
+#		"${FILESDIR}/mypatch2.patch"
+#	)
+# @CODE
+
+# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing the source directories that should be built.
+# All paths must be relative to ${S}.
+
+# @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @DESCRIPTION:
+# Build directory for out-of-source builds.
+: ${QT5_BUILD_DIR:=${WORKDIR}/${P}_build}
+
+# @ECLASS-VARIABLE: QCONFIG_ADD
+# @DESCRIPTION:
+# List of options that need to be added to QT_CONFIG in qconfig.pri
+: ${QCONFIG_ADD:=}
+
+# @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DESCRIPTION:
+# List of options that need to be removed from QT_CONFIG in qconfig.pri
+: ${QCONFIG_REMOVE:=}
+
+# @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DESCRIPTION:
+# List of variables that should be defined at the top of QtCore/qconfig.h
+: ${QCONFIG_DEFINE:=}
+
+# @FUNCTION: qt5-module_pkg_setup
+# @DESCRIPTION:
+# Warns and/or dies if the user is trying to downgrade Qt.
+qt5-module_pkg_setup() {
+	# Protect users by not allowing downgrades between releases.
+	# Downgrading revisions within the same release should be allowed.
+	if has_version ">${CATEGORY}/${P}-r9999:${SLOT}"; then
+		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+			eerror "    ***  Sanity check to keep you from breaking your system  ***"
+			eerror "Downgrading Qt is completely unsupported and will break your system!"
+			die "aborting to save your system"
+		else
+			ewarn "Downgrading Qt is completely unsupported and will break your system!"
+		fi
+	fi
+}
+
+# @FUNCTION: qt5-module_src_unpack
+# @DESCRIPTION:
+# Unpacks the sources.
+qt5-module_src_unpack() {
+	if ! version_is_at_least 4.4 $(gcc-version); then
+		ewarn "Using a GCC version lower than 4.4 is not supported."
+	fi
+
+	if [[ ${PN} == "qt-webkit" ]]; then
+		eshopts_push -s extglob
+		if is-flagq '-g?(gdb)?([1-9])'; then
+			echo
+			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+			ewarn "You may experience really long compilation times and/or increased memory usage."
+			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+			ewarn "For more info check out https://bugs.gentoo.org/307861"
+			echo
+		fi
+		eshopts_pop
+	fi
+
+	case ${QT5_BUILD_TYPE} in
+		live)
+			git-2_src_unpack
+			;;
+		release)
+			default
+			;;
+	esac
+}
+
+# @FUNCTION: qt5-module_src_prepare
+# @DESCRIPTION:
+# Prepare the sources before the configure phase.
+qt5-module_src_prepare() {
+	qt5_prepare_env
+
+	mkdir -p "${QT5_BUILD_DIR}" || die
+
+	# Apply patches
+	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
+}
+
+# @FUNCTION: qt5-module_src_configure
+# @DESCRIPTION:
+# Runs ./configure and qmake.
+qt5-module_src_configure() {
+	# toolchain setup
+	tc-export CC CXX RANLIB STRIP
+	# qmake-generated Makefiles use LD/LINK for linking
+	export LD="$(tc-getCXX)"
+
+	pushd "${QT5_BUILD_DIR}" > /dev/null || die
+
+	einfo "Running qmake"
+	"${QTBINDIR}"/qmake \
+		"${S}/${PN/-}.pro" \
+		CONFIG+=nostrip \
+		|| die "qmake failed"
+
+	popd > /dev/null || die
+}
+
+# @FUNCTION: qt5-module_src_compile
+# @DESCRIPTION:
+# Compiles the code in target directories.
+qt5-module_src_compile() {
+	qt5_foreach_target_subdir emake
+}
+
+# @FUNCTION: qt5-module_src_test
+# @DESCRIPTION:
+# Runs tests in target directories.
+# TODO: find a way to avoid circular deps with USE=test.
+qt5-module_src_test() {
+	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
+
+	# create a custom testrunner script that correctly sets
+	# {,DY}LD_LIBRARY_PATH before executing the given test
+	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
+	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
+	"\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	qmake() {
+		"${QTBINDIR}"/qmake \
+			"${S}/${subdir}/${subdir##*/}.pro" \
+			|| die "qmake failed"
+	}
+	qt5_foreach_target_subdir qmake
+	qt5_foreach_target_subdir emake
+	qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
+}
+
+# @FUNCTION: qt5-module_src_install
+# @DESCRIPTION:
+# Performs the actual installation of target directories.
+# TODO: pkgconfig files are installed in the wrong place
+qt5-module_src_install() {
+	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
+
+	# TODO: qt5_install_module_qconfigs
+
+	# remove .la files since we are building only shared libraries
+	prune_libtool_files
+}
+
+# @FUNCTION: qt_use
+# @USAGE: <flag> [feature] [enableval]
+# @DESCRIPTION:
+# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
+# "-no-${feature}" if it's disabled. If [feature] is not specified,
+# <flag> will be used for that. If [enableval] is not specified, the
+# "-${enableval}" prefix is omitted.
+qt_use() {
+	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+}
+
+
+######  Internal functions  ######
+
+# @FUNCTION: qt5_prepare_env
+# @INTERNAL
+# @DESCRIPTION:
+# Prepares the environment for building Qt.
+qt5_prepare_env() {
+	# setup installation directories
+	QTPREFIXDIR=${EPREFIX}/usr
+	QTBINDIR=${QTPREFIXDIR}/qt5/bin # FIXME
+	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt5
+	QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
+	QTHEADERDIR=${QTPREFIXDIR}/include/qt5
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTIMPORTDIR=${QTLIBDIR}/imports
+	QTDATADIR=${QTPREFIXDIR}/share/qt5
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTTESTSDIR=${QTDATADIR}/tests
+	QTSYSCONFDIR=${EPREFIX}/etc/qt5
+}
+
+# @FUNCTION: qt5_foreach_target_subdir
+# @INTERNAL
+# @DESCRIPTION:
+# Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
+qt5_foreach_target_subdir() {
+	[[ -z ${QT5_TARGET_SUBDIRS[@]} ]] && QT5_TARGET_SUBDIRS=("")
+
+	local subdir
+	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+		if [[ ${EBUILD_PHASE} == "test" ]]; then
+			subdir=tests/auto${subdir#src}
+			[[ -d ${S}/${subdir} ]] || continue
+		fi
+
+		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
+		pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die
+
+		einfo "Running $* ${subdir:+in ${subdir}}"
+		"$@"
+
+		popd > /dev/null || die
+	done
+}

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

[Davide Pesavento]

commit:     f92bec11ff0cfe5d97754f1631e67183b108d867
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jul 11 00:03:58 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 00:03:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f92bec11

[qt5-build.eclass] Install syncqt and qtmodule-configtests scripts.

They are used also when building modules outside qtbase.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 10429f7..126136f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -316,7 +316,7 @@ qt5-build_src_install() {
 
 	if [[ ${PN} == "qt-core" ]]; then
 		pushd "${QT5_BUILD_DIR}" > /dev/null || die
-		emake INSTALL_ROOT="${D}" install_{qmake,mkspecs}
+		emake INSTALL_ROOT="${D}" install_{configtests,mkspecs,qmake,syncqt}
 		popd > /dev/null || die
 
 		# create an empty Gentoo/gentoo-qconfig.h

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

[Davide Pesavento]

commit:     ba2d7fa548f17ad16e34e967995527c2e67ed69c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 10 21:44:11 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 21:44:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ba2d7fa5

[qt4-build.eclass] Stop using base_src_prepare() for patching.

---
 eclass/qt4-build.eclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 69e7153..c6365b1 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -14,7 +14,7 @@ case ${EAPI} in
 	*)	die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
 esac
 
-inherit base eutils flag-o-matic multilib toolchain-funcs versionator
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
 if [[ ${PV} == *9999* ]]; then
 	QT4_BUILD_TYPE="live"
@@ -352,7 +352,9 @@ qt4-build_src_prepare() {
 	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
 		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
 
-	base_src_prepare
+	# apply patches
+	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
 }
 
 # @FUNCTION: qt4-build_src_configure

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

[Davide Pesavento]

commit:     795492a32914714ec203cc402ffdde2c220c394c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 10 20:41:00 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 20:41:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=795492a3

[qt5-build.eclass] Stop using base_src_prepare() for patching.

---
 eclass/qt5-build.eclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 94a8752..23fe05c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -15,7 +15,7 @@ case ${EAPI} in
 	*) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
-inherit base eutils flag-o-matic multilib toolchain-funcs versionator
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
 if [[ ${PV} == *9999* ]]; then
 	QT5_BUILD_TYPE="live"
@@ -194,7 +194,9 @@ qt5-build_src_prepare() {
 	tc-export CC CXX RANLIB STRIP
 	export LD="$(tc-getCXX)" # qmake-generated Makefiles use LD/LINK for linking
 
-	base_src_prepare
+	# patching
+	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
 }
 
 # @FUNCTION: qt5-build_src_configure

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

[Davide Pesavento]

commit:     c4aa08c556b6b6c740c89131db32a22413082782
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 10 17:34:55 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 17:44:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c4aa08c5

[qt5-build.eclass] Remove QT5_VERBOSE_CONFIGURE, always pass -verbose.

---
 eclass/qt5-build.eclass |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 3b14330..94a8752 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -84,12 +84,6 @@ fi
 # Build directory for out-of-source builds.
 : ${QT5_BUILD_DIR:=${WORKDIR}/${P}_build}
 
-# @ECLASS-VARIABLE: QT5_VERBOSE_CONFIGURE
-# @DESCRIPTION:
-# Set to false to suppress printing of detailed information
-# about each step of the configure process.
-: ${QT5_VERBOSE_CONFIGURE:=true}
-
 # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
 # @DESCRIPTION:
 # Set to false to reduce build output during compilation.
@@ -249,8 +243,7 @@ qt5-build_src_configure() {
 		$(use prefix || echo -no-rpath)
 
 		# verbosity of the configure and build phases
-		$(${QT5_VERBOSE_CONFIGURE} && echo -verbose)
-		$(${QT5_VERBOSE_BUILD} || echo -silent)
+		-verbose $(${QT5_VERBOSE_BUILD} || echo -silent)
 
 		# precompiled headers don't work on hardened, where the flag is masked
 		$(qt_use pch)

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

[Davide Pesavento]

commit:     26d025ae06848264d8bc4bba5eee83d5de6bd63c
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 10 20:43:27 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 20:43:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=26d025ae

[qt5-build.eclass] Move setup of toolchain to src_configure().

---
 eclass/qt5-build.eclass |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 23fe05c..ba2c489 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -191,9 +191,6 @@ qt5-build_src_prepare() {
 	# Remove unused project files to speed up recursive qmake invocation
 	rm -f demos/demos.pro examples/examples.pro tests/tests.pro tools/tools.pro
 
-	tc-export CC CXX RANLIB STRIP
-	export LD="$(tc-getCXX)" # qmake-generated Makefiles use LD/LINK for linking
-
 	# patching
 	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 	epatch_user
@@ -203,6 +200,11 @@ qt5-build_src_prepare() {
 # @DESCRIPTION:
 # Runs ./configure and qmake.
 qt5-build_src_configure() {
+	# toolchain setup
+	tc-export CC CXX RANLIB STRIP
+	# qmake-generated Makefiles use LD/LINK for linking
+	export LD="$(tc-getCXX)"
+
 	# configure arguments
 	local conf=(
 		# installation paths

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

[Davide Pesavento]

commit:     1f9f7707b3dda732c4f04a675d3677c03b7c5840
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul 10 17:03:04 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 17:44:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1f9f7707

[qt5-build.eclass] Speed up the recursive qmake invocation in src_configure().

---
 eclass/qt5-build.eclass |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 23cf40a..3b14330 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -187,18 +187,18 @@ qt5-build_src_prepare() {
 		configure || die "sed QMAKE_CONF_COMPILER failed"
 
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	# FIXME: in compile.test, -m flags are passed to the linker via LIBS
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
 		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
 			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"
 
-	# TODO
-	# in compile.test, -m flags are passed to the linker via LIBS
+	# Remove unused project files to speed up recursive qmake invocation
+	rm -f demos/demos.pro examples/examples.pro tests/tests.pro tools/tools.pro
 
 	tc-export CC CXX RANLIB STRIP
-	# qmake-generated Makefiles use LD/LINK for linking
-	export LD="$(tc-getCXX)"
+	export LD="$(tc-getCXX)" # qmake-generated Makefiles use LD/LINK for linking
 
 	base_src_prepare
 }
@@ -237,11 +237,13 @@ qt5-build_src_configure() {
 		-shared
 		-dont-process
 		-pkg-config
+
+		# prefer system libraries
 		-system-zlib
 		-system-pcre
 
-		# don't build examples
-		-nomake examples
+		# exclude examples and tests from building
+		-make libs
 
 		# disable rpath on non-prefix (bugs 380415 and 417169)
 		$(use prefix || echo -no-rpath)

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

[Davide Pesavento]

commit:     432866e9a72287a7ac9452eb6a97d9ee4217bcc8
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jul  5 15:22:23 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul  5 15:22:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=432866e9

[qt5-build.eclass] Enable qt-core tests.

---
 eclass/qt5-build.eclass |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 477988a..23cf40a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -54,7 +54,7 @@ DEPEND="virtual/pkgconfig"
 if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
 	DEPEND+=" dev-lang/perl"
 fi
-if [[ ${PN} != "qt-core" && ${PN} != "qt-test" ]]; then
+if [[ ${PN} != "qt-test" ]]; then
 	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"
 fi
 
@@ -285,10 +285,8 @@ qt5-build_src_compile() {
 # @FUNCTION: qt5-build_src_test
 # @DESCRIPTION:
 # Runs tests in target directories.
+# TODO: find a way to avoid circular deps with USE=test.
 qt5-build_src_test() {
-	# TODO: find a way to avoid a circular dep between qt-core and qt-test
-	[[ ${PN} == "qt-core" ]] && return
-
 	# create a custom testrunner script that correctly sets
 	# {,DY}LD_LIBRARY_PATH before executing the given test
 	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner

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

[Davide Pesavento]

commit:     34cfb9adfacd90d9f1a9904b91ba88015e9fb685
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jul  5 14:18:00 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul  5 14:18:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=34cfb9ad

[qt5-build.eclass] Fix build after recent upstream changes.

---
 eclass/qt5-build.eclass |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 24d99e3..477988a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -166,21 +166,22 @@ qt5-build_src_prepare() {
 
 	mkdir -p "${QT5_BUILD_DIR}" || die
 
-	if [[ ${PN} != "qt-core" ]]; then
+	if [[ ${PN} == "qt-core" ]]; then
+		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
+		sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR=/ s:): \
+			${MAKEOPTS} ${EXTRA_EMAKE} \
+			'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
+			'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
+			configure || die "sed configure failed"
+	else
+		# Skip qmake build
+		sed -i -e '/"$MAKE".*QMAKE_BUILD_ERROR=/ d' \
+			configure || die "sed configure failed"
+		rm -f qmake/Makefile*
+
 		qt5_symlink_tools_to_buildtree
 	fi
 
-	# Avoid unnecessary qmake recompilations
-	sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
-		configure || die "sed configure failed"
-
-	# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
-	sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR/ s:): \
-		${MAKEOPTS} ${EXTRA_EMAKE} \
-		'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
-		'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
-		configure || die "sed configure failed"
-
 	# Respect CXX in configure
 	sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 		configure || die "sed QMAKE_CONF_COMPILER failed"
@@ -398,8 +399,7 @@ qt5_symlink_tools_to_buildtree() {
 
 	local bin
 	for bin in "${QTBINDIR}"/{qmake,moc,rcc,uic,qdoc}; do
-		ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ \
-			|| die "symlinking '${bin}' to '${QT5_BUILD_DIR}/bin/' failed"
+		ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ || die "failed to symlink ${bin}"
 	done
 }
 

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

[Davide Pesavento]

commit:     bb9a4d7a6e58f6f3c0b540c1d14646ccedbd75bc
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jul  3 22:56:56 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 22:56:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bb9a4d7a

[qt5-build.eclass] Support opengl module.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 55e58bb..24d99e3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -31,7 +31,7 @@ LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="5"
 
 case ${PN#qt-} in
-	core|dbus|gui|network|sql|test|widgets|xml)
+	core|dbus|gui|network|opengl|sql|test|widgets|xml)
 		EGIT_PROJECT="qtbase"
 		;;
 	*)

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

[Davide Pesavento]

commit:     ef083e063c8adc2a2d06499a7642a64dc1635dfc
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jul  1 23:32:30 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 23:32:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ef083e06

[qt5-build.eclass] Finish src_test() implementation.

We have to use a custom testunner script that sets LD_LIBRARY_PATH
before executing the tests, otherwise ld.so won't find the correct
libraries.

Most tests should pass now. Yay!

---
 eclass/qt5-build.eclass |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f69eed6..55e58bb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -286,16 +286,27 @@ qt5-build_src_compile() {
 # Runs tests in target directories.
 qt5-build_src_test() {
 	# TODO: find a way to avoid a circular dep between qt-core and qt-test
-	# TODO: generate a custom TESTRUNNER script that setups LD_LIBRARY_PATH
-	if [[ ${PN} != "qt-core" ]]; then
-		tests() {
-			"${QT5_BUILD_DIR}"/bin/qmake \
-				"${S}/${subdir}/${subdir##*/}.pro" \
-				|| die "qmake failed"
-			emake check
-		}
-		qt5_foreach_target_subdir tests
-	fi
+	[[ ${PN} == "qt-core" ]] && return
+
+	# create a custom testrunner script that correctly sets
+	# {,DY}LD_LIBRARY_PATH before executing the given test
+	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
+	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
+	"\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	qmake() {
+		"${QT5_BUILD_DIR}"/bin/qmake \
+			"${S}/${subdir}/${subdir##*/}.pro" \
+			|| die "qmake failed"
+	}
+	qt5_foreach_target_subdir qmake
+	qt5_foreach_target_subdir emake
+	qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
 }
 
 # @FUNCTION: qt5-build_src_install

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

[Davide Pesavento]

commit:     21332a01b0600087a93411ca7524bd76e14d82d9
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Jun 30 00:40:02 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 00:40:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=21332a01

[qt5-build.eclass] Initial implementation of src_test().

Still a work-in-progress.

---
 eclass/qt5-build.eclass |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cf5df3a..f69eed6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -48,12 +48,15 @@ case ${QT5_BUILD_TYPE} in
 		;;
 esac
 
-IUSE="+c++11 debug +pch"
+IUSE="+c++11 debug +pch test"
 
 DEPEND="virtual/pkgconfig"
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
+if [[ ${QT5_BUILD_TYPE} == "live" ]]; then
 	DEPEND+=" dev-lang/perl"
 fi
+if [[ ${PN} != "qt-core" && ${PN} != "qt-test" ]]; then
+	DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )"
+fi
 
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
@@ -282,8 +285,17 @@ qt5-build_src_compile() {
 # @DESCRIPTION:
 # Runs tests in target directories.
 qt5-build_src_test() {
-	# TODO
-	:
+	# TODO: find a way to avoid a circular dep between qt-core and qt-test
+	# TODO: generate a custom TESTRUNNER script that setups LD_LIBRARY_PATH
+	if [[ ${PN} != "qt-core" ]]; then
+		tests() {
+			"${QT5_BUILD_DIR}"/bin/qmake \
+				"${S}/${subdir}/${subdir##*/}.pro" \
+				|| die "qmake failed"
+			emake check
+		}
+		qt5_foreach_target_subdir tests
+	fi
 }
 
 # @FUNCTION: qt5-build_src_install
@@ -387,10 +399,17 @@ qt5_symlink_tools_to_buildtree() {
 qt5_foreach_target_subdir() {
 	local subdir
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+		if [[ ${EBUILD_PHASE} == "test" ]]; then
+			subdir=${subdir/#src/tests\/auto}
+			[[ -d ${subdir} ]] || continue
+		fi
+
 		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
 		pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die
+
 		einfo "Running $* in ${subdir}"
 		"$@"
+
 		popd > /dev/null || die
 	done
 }

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

[Davide Pesavento]

commit:     04411b50c835c313756e72d550d2008cce2bdf78
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 23:01:22 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 23:01:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=04411b50

[qt5-build.eclass] Restore the recursive qmake invocation.

The qmake invocation has to be recursive, otherwise <module>.pri files
are not correctly generated for all modules.

However, in order to avoid pre-stripped files, we now pass -dont-process
to configure and execute a single recursive qmake call by ourselves,
starting from the top-level directory.

---
 eclass/qt5-build.eclass |   34 ++++++++++++----------------------
 1 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 10ce73a..cf5df3a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,10 +178,6 @@ qt5-build_src_prepare() {
 		'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
 		configure || die "sed configure failed"
 
-	# Don't run qmake at the end of configure
-	sed -i -e '/echo "Creating makefiles\./,+2 d' \
-		configure || die "sed configure failed"
-
 	# Respect CXX in configure
 	sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 		configure || die "sed QMAKE_CONF_COMPILER failed"
@@ -235,7 +231,7 @@ qt5-build_src_configure() {
 
 		# general configure options
 		-shared
-		-fast
+		-dont-process
 		-pkg-config
 		-system-zlib
 		-system-pcre
@@ -261,24 +257,18 @@ qt5-build_src_configure() {
 		"${myconf[@]}"
 	)
 
-	pushd "${QT5_BUILD_DIR}" >/dev/null || die
+	pushd "${QT5_BUILD_DIR}" > /dev/null || die
 
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 
-	einfo "Running qmake on top-level project file"
-	./bin/qmake "${S}"/qtbase.pro CONFIG+=nostrip || die
-
-	popd >/dev/null || die
+	einfo "Running qmake"
+	./bin/qmake -recursive "${S}"/qtbase.pro \
+		QMAKE_LIBDIR="${QTLIBDIR}" \
+		CONFIG+=nostrip \
+		|| die "qmake failed"
 
-	qmake() {
-		"${QT5_BUILD_DIR}"/bin/qmake \
-			"${S}/${subdir}/${subdir##*/}.pro" \
-			QMAKE_LIBDIR_QT="${QTLIBDIR}" \
-			CONFIG+=nostrip \
-			|| die
-	}
-	qt5_foreach_target_subdir qmake
+	popd > /dev/null || die
 }
 
 # @FUNCTION: qt5-build_src_compile
@@ -304,9 +294,9 @@ qt5-build_src_install() {
 	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
 	if [[ ${PN} == "qt-core" ]]; then
-		pushd "${QT5_BUILD_DIR}" >/dev/null || die
+		pushd "${QT5_BUILD_DIR}" > /dev/null || die
 		emake INSTALL_ROOT="${D}" install_{qmake,mkspecs}
-		popd >/dev/null || die
+		popd > /dev/null || die
 
 		# create an empty Gentoo/gentoo-qconfig.h
 		dodir "${QTHEADERDIR#${EPREFIX}}"/Gentoo
@@ -398,10 +388,10 @@ qt5_foreach_target_subdir() {
 	local subdir
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
 		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
-		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+		pushd "${QT5_BUILD_DIR}/${subdir}" > /dev/null || die
 		einfo "Running $* in ${subdir}"
 		"$@"
-		popd >/dev/null || die
+		popd > /dev/null || die
 	done
 }
 

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

[Davide Pesavento]

commit:     fe0b75cd32209b4981e74dcbdb38b396a6456e63
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 15:15:27 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 15:15:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fe0b75cd

[qt5-build.eclass] Some fixes in qt5_regenerate_global_qconfigs().

---
 eclass/qt5-build.eclass |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9851c11..10ce73a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -443,26 +443,27 @@ qt5_regenerate_global_qconfigs() {
 
 	find "${ROOT}${QTHEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \
 		-exec cat {} + > "${T}"/gentoo-qconfig.h
-	if [[ -s ${T}/gentoo-qconfig.h ]]; then
-		mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h \
-			|| eerror "Failed to install new gentoo-qconfig.h"
-	else
-		eerror "Generated gentoo-qconfig.h is empty"
-	fi
+
+	[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty"
+	mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h \
+		|| eerror "Failed to install new gentoo-qconfig.h"
 
 	einfo "Updating QT_CONFIG in qconfig.pri"
 
-	if [[ -f ${ROOT}${QTDATADIR}/mkspecs/qconfig.pri ]]; then
+	local qconfig_pri=${ROOT}${QTDATADIR}/mkspecs/qconfig.pri
+	if [[ -f ${qconfig_pri} ]]; then
 		local x qconfig_add= qconfig_remove=
-		local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri)
+		local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${qconfig_pri}")
 		local new_qt_config=
 
 		# generate list of QT_CONFIG entries from the existing list,
-		# adding QCONFIG_ADD and excluding QCONFIG_REMOVE
+		# appending QCONFIG_ADD and excluding QCONFIG_REMOVE
+		eshopts_push -s nullglob
 		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
 			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
 			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
 		done
+		eshopts_pop
 		for x in ${qt_config} ${qconfig_add}; do
 			if ! has "${x}" ${new_qt_config} ${qconfig_remove}; then
 				new_qt_config+=" ${x}"
@@ -471,9 +472,8 @@ qt5_regenerate_global_qconfigs() {
 
 		# now replace the existing QT_CONFIG with the generated list
 		sed -i -e "s/^QT_CONFIG +=.*/QT_CONFIG +=${new_qt_config}/" \
-			"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri \
-			|| eerror "Failed to sed QT_CONFIG in qconfig.pri"
+			"${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in qconfig.pri"
 	else
-		eerror "qconfig.pri does not exist or is not a regular file"
+		ewarn "'${qconfig_pri}' does not exist or is not a regular file"
 	fi
 }

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

[Davide Pesavento]

commit:     1932a59999d4036b55f23da55c2fde8352a67932
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 12:46:48 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:46:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1932a599

[qt5-build.eclass] Define QTBINDIR using QTPREFIXDIR.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index dc5b2a1..9851c11 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -363,7 +363,7 @@ qt_use() {
 qt5_prepare_env() {
 	# setup installation directories
 	QTPREFIXDIR=${EPREFIX}/usr
-	QTBINDIR=${EPREFIX}/usr/qt5/bin # FIXME
+	QTBINDIR=${QTPREFIXDIR}/qt5/bin # FIXME
 	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt5
 	QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
 	QTHEADERDIR=${QTPREFIXDIR}/include/qt5

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

[Davide Pesavento]

commit:     27993d2b72f525ede8ec71bf342773d0a9800430
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun 29 12:17:58 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 12:17:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=27993d2b

[qt5-build.eclass] Reword a couple of einfo messages.

---
 eclass/qt5-build.eclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0ea8a8b..dc5b2a1 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -399,7 +399,7 @@ qt5_foreach_target_subdir() {
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
 		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
 		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
-		einfo "[${subdir}] $*"
+		einfo "Running $* in ${subdir}"
 		"$@"
 		popd >/dev/null || die
 	done
@@ -450,7 +450,7 @@ qt5_regenerate_global_qconfigs() {
 		eerror "Generated gentoo-qconfig.h is empty"
 	fi
 
-	einfo "Fixing QT_CONFIG in qconfig.pri"
+	einfo "Updating QT_CONFIG in qconfig.pri"
 
 	if [[ -f ${ROOT}${QTDATADIR}/mkspecs/qconfig.pri ]]; then
 		local x qconfig_add= qconfig_remove=

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

[Davide Pesavento]

commit:     e3a63d518b571f545332c6cfbccb31d5e8dac4fb
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun 28 23:45:36 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 23:45:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e3a63d51

[qt5-build.eclass] Run qmake "manually" at the top level too.

The recursive qmake that is executed at the end of configure is very
time-consuming, not parallelizable and especially it is completely useless,
since we already re-run qmake with custom arguments in all the relevant
directories. The only exception is the top-level project file (qtbase.pro),
which must be handled separately.

Therefore we can delete the recursive qmake invocation from configure
altogether. This also avoids pre-stripping of the qmake binary itself.

---
 eclass/qt5-build.eclass |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e206a4e..0ea8a8b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,6 +178,10 @@ qt5-build_src_prepare() {
 		'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
 		configure || die "sed configure failed"
 
+	# Don't run qmake at the end of configure
+	sed -i -e '/echo "Creating makefiles\./,+2 d' \
+		configure || die "sed configure failed"
+
 	# Respect CXX in configure
 	sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 		configure || die "sed QMAKE_CONF_COMPILER failed"
@@ -258,8 +262,13 @@ qt5-build_src_configure() {
 	)
 
 	pushd "${QT5_BUILD_DIR}" >/dev/null || die
+
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
+
+	einfo "Running qmake on top-level project file"
+	./bin/qmake "${S}"/qtbase.pro CONFIG+=nostrip || die
+
 	popd >/dev/null || die
 
 	qmake() {

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

[Davide Pesavento]

commit:     bada97fbfe7ee2d8cef16ee7c5fe38466b98f407
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun 28 19:00:21 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 19:00:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bada97fb

[qt5-build.eclass] Fix creation of /usr/include/qt5/Gentoo directory.

---
 eclass/qt5-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d388b47..e206a4e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -300,7 +300,7 @@ qt5-build_src_install() {
 		popd >/dev/null || die
 
 		# create an empty Gentoo/gentoo-qconfig.h
-		dodir "${D}${QTHEADERDIR}"/Gentoo
+		dodir "${QTHEADERDIR#${EPREFIX}}"/Gentoo
 		: > "${D}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
 
 		# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h

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

[Davide Pesavento]

commit:     6a40b22aae376b9c53244cd40807d13af2f37c47
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Jun 26 23:29:35 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 23:29:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6a40b22a

[qt5-build.eclass] Make sure the subdir exists before entering it.

---
 eclass/qt5-build.eclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d362524..d388b47 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -388,6 +388,7 @@ qt5_symlink_tools_to_buildtree() {
 qt5_foreach_target_subdir() {
 	local subdir
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+		mkdir -p "${QT5_BUILD_DIR}/${subdir}" || die
 		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
 		einfo "[${subdir}] $*"
 		"$@"

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

[Davide Pesavento]

commit:     bb36f21428822e75bad32e99f339d7382e821d33
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 24 21:03:08 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 21:03:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=bb36f214

[qt5-build.eclass] Stop passing -largefile to configure.

---
 eclass/qt5-build.eclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6d714b6..d362524 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -230,9 +230,11 @@ qt5-build_src_configure() {
 		$(qt_use c++11)
 
 		# general configure options
-		-shared -fast -largefile
+		-shared
+		-fast
 		-pkg-config
-		-system-zlib -system-pcre
+		-system-zlib
+		-system-pcre
 
 		# don't build examples
 		-nomake examples

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

[Davide Pesavento]

commit:     df4b9919281a430d28e7812e29c2014b50df0693
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 24 21:00:12 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 21:00:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=df4b9919

[qt5-build.eclass] Rewrite qconfig.{h,pri} handling and enable it.

---
 eclass/qt5-build.eclass |  156 +++++++++++++++++++++++------------------------
 1 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e1c37d5..6d714b6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -8,7 +8,6 @@
 # @BLURB: Eclass for Qt5 split ebuilds.
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt5.
-# eutils, flag-o-matic, multilib eclasses are guaranteed to be already inherited.
 # Requires EAPI 4.
 
 case ${EAPI} in
@@ -289,6 +288,7 @@ qt5-build_src_test() {
 # @FUNCTION: qt5-build_src_install
 # @DESCRIPTION:
 # Performs the actual installation of target directories.
+# TODO: pkgconfig files are installed in the wrong place
 qt5-build_src_install() {
 	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
@@ -296,12 +296,21 @@ qt5-build_src_install() {
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
 		emake INSTALL_ROOT="${D}" install_{qmake,mkspecs}
 		popd >/dev/null || die
+
+		# create an empty Gentoo/gentoo-qconfig.h
+		dodir "${D}${QTHEADERDIR}"/Gentoo
+		: > "${D}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+
+		# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h
+		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+			"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+			"${D}${QTHEADERDIR}"/Qt/qconfig.h \
+			|| die "sed qconfig.h failed"
 	fi
 
-	# TODO: install_qconfigs
-	# TODO: pkgconfig files are installed in the wrong place
+	qt5_install_module_qconfigs
 
-	# remove .la files since we are building only shared Qt libraries
+	# remove .la files since we are building only shared libraries
 	prune_libtool_files
 }
 
@@ -310,27 +319,25 @@ qt5-build_src_install() {
 # Regenerate configuration, plus throw a message about possible
 # breakages and proposed solutions.
 qt5-build_pkg_postinst() {
-	# TODO
-	#generate_qconfigs
-	:
+	qt5_regenerate_global_qconfigs
 }
 
 # @FUNCTION: qt5-build_pkg_postrm
 # @DESCRIPTION:
 # Regenerate configuration when the package is completely removed.
 qt5-build_pkg_postrm() {
-	# TODO
-	#generate_qconfigs
-	:
+	if [[ -z ${REPLACED_BY_VERSION} && ${PN} != "qt-core" ]]; then
+		qt5_regenerate_global_qconfigs
+	fi
 }
 
 # @FUNCTION: qt_use
-# @USAGE: < flag > [ feature ] [ enableval ]
+# @USAGE: <flag> [feature] [enableval]
 # @DESCRIPTION:
 # This will echo "-${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
-# will be used for that. If [enableval] is not specified, it omits the
-# "-${enableval}" part.
+# "-no-${feature}" if it's disabled. If [feature] is not specified,
+# <flag> will be used for that. If [enableval] is not specified, the
+# "-${enableval}" prefix is omitted.
 qt_use() {
 	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
 }
@@ -386,86 +393,75 @@ qt5_foreach_target_subdir() {
 	done
 }
 
-# @FUNCTION: install_qconfigs
+# @FUNCTION: qt5_install_module_qconfigs
 # @INTERNAL
 # @DESCRIPTION:
-# Installs gentoo-specific mkspecs configurations.
-install_qconfigs() {
+# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
+qt5_install_module_qconfigs() {
 	local x
 
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
-		for x in QCONFIG_ADD QCONFIG_REMOVE; do
-			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
-		done
-		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
-		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
-	fi
+	# qconfig.h
+	: > "${T}"/${PN}-qconfig.h
+	for x in ${QCONFIG_DEFINE}; do
+		echo "#define ${x}" >> "${T}"/${PN}-qconfig.h
+	done
+	[[ -s ${T}/${PN}-qconfig.h ]] && (
+		insinto "${QTHEADERDIR#${EPREFIX}}"/Gentoo
+		doins "${T}"/${PN}-qconfig.h
+	)
 
-	if [[ -n ${QCONFIG_DEFINE} ]]; then
-		for x in ${QCONFIG_DEFINE}; do
-			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
-		done
-		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
-		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
-	fi
+	# qconfig.pri
+	: > "${T}"/${PN}-qconfig.pri
+	for x in QCONFIG_ADD QCONFIG_REMOVE; do
+		[[ -n ${!x} ]] && echo "${x}=${!x}" >> "${T}"/${PN}-qconfig.pri
+	done
+	[[ -s ${T}/${PN}-qconfig.pri ]] && (
+		insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
+		doins "${T}"/${PN}-qconfig.pri
+	)
 }
 
-# @FUNCTION: generate_qconfigs
+# @FUNCTION: qt5_regenerate_global_qconfigs
 # @INTERNAL
 # @DESCRIPTION:
 # Generates gentoo-specific qconfig.{h,pri}.
-generate_qconfigs() {
-	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} ]]; then
-		local x qconfig_add qconfig_remove qconfig_new
-		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
-			[[ -f ${x} ]] || continue
+# Don't die here because dying in pkg_post{inst,rm} just makes things worse.
+qt5_regenerate_global_qconfigs() {
+	einfo "Regenerating gentoo-qconfig.h"
+
+	find "${ROOT}${QTHEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \
+		-exec cat {} + > "${T}"/gentoo-qconfig.h
+	if [[ -s ${T}/gentoo-qconfig.h ]]; then
+		mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h \
+			|| eerror "Failed to install new gentoo-qconfig.h"
+	else
+		eerror "Generated gentoo-qconfig.h is empty"
+	fi
+
+	einfo "Fixing QT_CONFIG in qconfig.pri"
+
+	if [[ -f ${ROOT}${QTDATADIR}/mkspecs/qconfig.pri ]]; then
+		local x qconfig_add= qconfig_remove=
+		local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri)
+		local new_qt_config=
+
+		# generate list of QT_CONFIG entries from the existing list,
+		# adding QCONFIG_ADD and excluding QCONFIG_REMOVE
+		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do
 			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
 			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
 		done
-
-		# these error checks do not use die because dying in pkg_post{inst,rm}
-		# just makes things worse.
-		if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
-			# start with the qconfig.pri that qt-core installed
-			if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "cp qconfig failed."
-				return 1
-			fi
-
-			# generate list of QT_CONFIG entries from the existing list
-			# including qconfig_add and excluding qconfig_remove
-			for x in $(sed -n 's/^QT_CONFIG +=//p' \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
-					has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
-			done
-
-			# replace the existing QT_CONFIG list with qconfig_new
-			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
-				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
-				eerror "Sed for QT_CONFIG failed"
-				return 1
+		for x in ${qt_config} ${qconfig_add}; do
+			if ! has "${x}" ${new_qt_config} ${qconfig_remove}; then
+				new_qt_config+=" ${x}"
 			fi
+		done
 
-			# create Gentoo/qconfig.h
-			if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
-				if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
-					eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
-					return 1
-				fi
-			fi
-			: > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
-				[[ -f ${x} ]] || continue
-				cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			done
-		else
-			rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
-			rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
-			rmdir "${ROOT}${QTDATADIR}"/mkspecs \
-				"${ROOT}${QTDATADIR}" \
-				"${ROOT}${QTHEADERDIR}"/Gentoo \
-				"${ROOT}${QTHEADERDIR}" 2>/dev/null
-		fi
+		# now replace the existing QT_CONFIG with the generated list
+		sed -i -e "s/^QT_CONFIG +=.*/QT_CONFIG +=${new_qt_config}/" \
+			"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri \
+			|| eerror "Failed to sed QT_CONFIG in qconfig.pri"
+	else
+		eerror "qconfig.pri does not exist or is not a regular file"
 	fi
 }

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

[Davide Pesavento]

commit:     a7b4a707badb2000cc2da8c83ccf5800e8029fa1
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 18 21:51:46 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 21:51:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a7b4a707

[qt4-build.eclass] Remove cvs header.

---
 eclass/qt4-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index e5ac52c..69e7153 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/06/07 15:36:49 pesa Exp $
+# $Header: $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:

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

[Davide Pesavento]

commit:     959f96fc05c69937cb5578d8eabe3f546aeeeb95
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 17 21:20:29 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 21:20:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=959f96fc

[qt4-build.eclass] Move build-related checks out of pkg_setup().

---
 eclass/qt4-build.eclass |   58 +++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index dd39ff4..e5ac52c 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -103,33 +103,18 @@ S=${WORKDIR}/${MY_P}
 qt4-build_pkg_setup() {
 	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
 
-	# Protect users by not allowing downgrades between releases
-	# Downgrading revisions within the same release should be allowed
+	# Protect users by not allowing downgrades between releases.
+	# Downgrading revisions within the same release should be allowed.
 	if has_version ">${CATEGORY}/${P}-r9999:4"; then
 		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-			eerror
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror "  Downgrading Qt is completely unsupported and will break your system!"
-			eerror
+			eerror "    ***  Sanity check to keep you from breaking your system  ***"
+			eerror "Downgrading Qt is completely unsupported and will break your system!"
 			die "aborting to save your system"
 		else
 			ewarn "Downgrading Qt is completely unsupported and will break your system!"
 		fi
 	fi
 
-	if [[ ${PN} == qt-webkit ]]; then
-		eshopts_push -s extglob
-		if is-flagq '-g?(gdb)?([1-9])'; then
-			echo
-			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-			ewarn "You may experience really long compilation times and/or increased memory usage."
-			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-			ewarn "For more info check out bug #307861"
-			echo
-		fi
-		eshopts_pop
-	fi
-
 	PATH="${S}/bin${PATH:+:}${PATH}"
 	if [[ ${CHOST} != *-darwin* ]]; then
 		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
@@ -142,28 +127,43 @@ qt4-build_pkg_setup() {
 			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
 				${QT4_EXTRACT_DIRECTORIES}"
 	fi
-
-	if ! version_is_at_least 4.1 $(gcc-version); then
-		ewarn "Using a GCC version lower than 4.1 is not supported."
-	fi
 }
 
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories in which the
-# code should be compiled. This is a space-separated list.
-
 # @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Space-separated list including the directories that will be extracted from
 # Qt tarball.
 
+# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Arguments for build_target_directories. Takes the directories in which the
+# code should be compiled. This is a space-separated list.
+
 # @FUNCTION: qt4-build_src_unpack
 # @DESCRIPTION:
 # Unpacks the sources.
 qt4-build_src_unpack() {
 	setqtenv
 
+	if ! version_is_at_least 4.1 $(gcc-version); then
+		ewarn "Using a GCC version lower than 4.1 is not supported."
+	fi
+
+	if [[ ${PN} == qt-webkit ]]; then
+		eshopts_push -s extglob
+		if is-flagq '-g?(gdb)?([1-9])'; then
+			echo
+			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+			ewarn "You may experience really long compilation times and/or increased memory usage."
+			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+			ewarn "For more info check out https://bugs.gentoo.org/307861"
+			echo
+		fi
+		eshopts_pop
+	fi
+
 	case ${QT4_BUILD_TYPE} in
 		live)
 			git-2_src_unpack
@@ -209,7 +209,7 @@ qt4-build_src_prepare() {
 	fi
 
 	if version_is_at_least 4.7; then
-		# fix libX11 dependency on non X packages
+		# avoid X11 dependency in non-gui packages
 		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
 		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
 	fi

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

[Davide Pesavento]

commit:     49e43d431ea50bb77b45b05a0a823990ec029d77
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 17 20:43:53 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 20:43:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=49e43d43

[qt4-build.eclass] Delete dead code.

---
 eclass/qt4-build.eclass |   32 --------------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index b68f9b6..b5776b7 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -212,8 +212,6 @@ qt4-build_src_prepare() {
 		# fix libX11 dependency on non X packages
 		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
 		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
-
-		qt_assistant_cleanup
 	fi
 
 	if use aqua; then
@@ -871,36 +869,6 @@ qt_mkspecs_dir() {
 	echo "${spec}"
 }
 
-# @FUNCTION: qt_assistant_cleanup
-# @INTERNAL
-# @DESCRIPTION:
-# Tries to clean up tools.pro for qt-assistant ebuilds.
-# Meant to be called in src_prepare().
-# Since Qt 4.7.4 this function is a no-op.
-qt_assistant_cleanup() {
-	# apply patching to qt-assistant ebuilds only
-	[[ ${PN} != qt-assistant ]] && return
-
-	# no longer needed for 4.7.4 and later
-	version_is_at_least 4.7.4 && return
-
-	# different versions (and branches...) may need different handling,
-	# add a case if you need special handling
-	case "${MY_PV_EXTRA}" in
-		*kde-qt*)
-			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
-				-e "/mac/,/^embedded.*makeqpf$/d" \
-				-i tools/tools.pro || die "patching tools.pro failed"
-		;;
-		*)
-			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
-				-e "/mac/,/^embedded.*makeqpf$/d" \
-				-e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
-				-i tools/tools.pro || die "patching tools.pro failed"
-		;;
-	esac
-}
-
 # @FUNCTION: qt_nolibx11
 # @INTERNAL
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     26feb260eb967f1dfcbed2377ed8ec8321eacdcb
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 17 20:51:01 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 20:51:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=26feb260

[qt4-build.eclass] Remove c++0x warning.

---
 eclass/qt4-build.eclass |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index b5776b7..482309c 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -242,14 +242,7 @@ qt4-build_src_prepare() {
 	fi
 
 	if use_if_iuse c++0x; then
-		echo
-		ewarn "You are about to build Qt4 using the C++11 standard. Even though"
-		ewarn "this is an official standard, some of the reverse dependencies"
-		ewarn "may fail to compile or link againt the Qt4 libraries. Before"
-		ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
-		ewarn "disabled."
-		echo
-		append-flags -std=c++0x
+		append-cxxflags -std=c++0x
 	fi
 
 	# Unsupported old gcc versions - hardened needs this :(

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

[Davide Pesavento]

commit:     864c9a6c4d49c5afea2965671214fa093038f942
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 11 23:58:47 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 23:58:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=864c9a6c

[qt5-build.eclass] Recognize more Qt5 modules.

---
 eclass/qt5-build.eclass |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 9e90c2a..e1c37d5 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -12,8 +12,8 @@
 # Requires EAPI 4.
 
 case ${EAPI} in
-	4)	: ;;
-	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+	4) : ;;
+	*) die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
 esac
 
 inherit base eutils flag-o-matic multilib toolchain-funcs versionator
@@ -32,9 +32,12 @@ LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="5"
 
 case ${PN#qt-} in
-	core|dbus|gui|network|sql|test|xml)	EGIT_PROJECT="qtbase" ;;
-	3d|jsbackend|script|svg|xmlpatterns)	EGIT_PROJECT="${PN/-}" ;;
-	*) die "qt5-build.eclass: unknown module ${PN}" ;;
+	core|dbus|gui|network|sql|test|widgets|xml)
+		EGIT_PROJECT="qtbase"
+		;;
+	*)
+		EGIT_PROJECT="${PN/-}"
+		;;
 esac
 case ${QT5_BUILD_TYPE} in
 	live)
@@ -43,6 +46,7 @@ case ${QT5_BUILD_TYPE} in
 		;;
 	release)
 		SRC_URI="" # TODO
+		;;
 esac
 
 IUSE="+c++11 debug +pch"

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

[Davide Pesavento]

commit:     6750c20a16901a1155af5afc3cb7d22830cbe3fe
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 11 23:11:09 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 23:11:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6750c20a

[qt5-build.eclass] Pass CONFIG+=nostrip to qmake.

---
 eclass/qt5-build.eclass |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b1af0e9..9e90c2a 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -189,12 +189,9 @@ qt5-build_src_prepare() {
 	# TODO
 	# in compile.test, -m flags are passed to the linker via LIBS
 
-	# Respect C/C++ compiler
-	tc-export CC CXX
+	tc-export CC CXX RANLIB STRIP
 	# qmake-generated Makefiles use LD/LINK for linking
 	export LD="$(tc-getCXX)"
-	# Don't strip binaries
-	export STRIP=":"
 
 	base_src_prepare
 }
@@ -260,15 +257,14 @@ qt5-build_src_configure() {
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 	popd >/dev/null || die
 
-	if [[ ${PN} != "qt-core" ]]; then
-		qmake() {
-			"${QT5_BUILD_DIR}"/bin/qmake \
-				"${S}/${subdir}/${subdir##*/}.pro" \
-				QMAKE_LIBDIR_QT="${QTLIBDIR}" \
-				|| die
-		}
-		qt5_foreach_target_subdir qmake
-	fi
+	qmake() {
+		"${QT5_BUILD_DIR}"/bin/qmake \
+			"${S}/${subdir}/${subdir##*/}.pro" \
+			QMAKE_LIBDIR_QT="${QTLIBDIR}" \
+			CONFIG+=nostrip \
+			|| die
+	}
+	qt5_foreach_target_subdir qmake
 }
 
 # @FUNCTION: qt5-build_src_compile

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

[Davide Pesavento]

commit:     1041c1d2fe1db668faf0e1c62973c59c17e48a0e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Jun 11 22:35:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 22:35:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1041c1d2

[qt5-build.eclass] Refactoring.

---
 eclass/qt5-build.eclass |   52 +++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b8fd1e1..b1af0e9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -161,7 +161,7 @@ qt5-build_src_prepare() {
 	mkdir -p "${QT5_BUILD_DIR}" || die
 
 	if [[ ${PN} != "qt-core" ]]; then
-		symlink_tools_to_buildtree
+		qt5_symlink_tools_to_buildtree
 	fi
 
 	# Avoid unnecessary qmake recompilations
@@ -201,7 +201,7 @@ qt5-build_src_prepare() {
 
 # @FUNCTION: qt5-build_src_configure
 # @DESCRIPTION:
-# Default configure phase.
+# Runs ./configure and qmake.
 qt5-build_src_configure() {
 	# configure arguments
 	local conf=(
@@ -261,30 +261,21 @@ qt5-build_src_configure() {
 	popd >/dev/null || die
 
 	if [[ ${PN} != "qt-core" ]]; then
-		local subdir
-		for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
-			pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
-			einfo "Running qmake in: ${subdir}"
+		qmake() {
 			"${QT5_BUILD_DIR}"/bin/qmake \
 				"${S}/${subdir}/${subdir##*/}.pro" \
 				QMAKE_LIBDIR_QT="${QTLIBDIR}" \
-				|| die "qmake failed in ${subdir}"
-			popd >/dev/null || die
-		done
+				|| die
+		}
+		qt5_foreach_target_subdir qmake
 	fi
 }
 
 # @FUNCTION: qt5-build_src_compile
 # @DESCRIPTION:
-# Compiles the code in QT5_TARGET_SUBDIRS.
+# Compiles the code in target directories.
 qt5-build_src_compile() {
-	local subdir
-	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
-		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
-		einfo "Building in: ${subdir}"
-		emake
-		popd >/dev/null || die
-	done
+	qt5_foreach_target_subdir emake
 }
 
 # @FUNCTION: qt5-build_src_test
@@ -297,14 +288,9 @@ qt5-build_src_test() {
 
 # @FUNCTION: qt5-build_src_install
 # @DESCRIPTION:
-# Perform the actual installation including some library fixes.
+# Performs the actual installation of target directories.
 qt5-build_src_install() {
-	local subdir
-	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
-		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
-		emake INSTALL_ROOT="${D}" install
-		popd >/dev/null || die
-	done
+	qt5_foreach_target_subdir emake INSTALL_ROOT="${D}" install
 
 	if [[ ${PN} == "qt-core" ]]; then
 		pushd "${QT5_BUILD_DIR}" >/dev/null || die
@@ -372,11 +358,11 @@ qt5_prepare_env() {
 	QTSYSCONFDIR=${EPREFIX}/etc/qt5
 }
 
-# @FUNCTION: symlink_tools_to_buildtree
+# @FUNCTION: qt5_symlink_tools_to_buildtree
 # @INTERNAL
 # @DESCRIPTION:
 # Symlinks qt-core tools to buildtree, so they can be used when building other modules.
-symlink_tools_to_buildtree() {
+qt5_symlink_tools_to_buildtree() {
 	mkdir -p "${QT5_BUILD_DIR}"/bin || die
 
 	local bin
@@ -386,6 +372,20 @@ symlink_tools_to_buildtree() {
 	done
 }
 
+# @FUNCTION: qt5_foreach_target_subdir
+# @INTERNAL
+# @DESCRIPTION:
+# Executes the arguments inside each directory listed in QT5_TARGET_SUBDIRS.
+qt5_foreach_target_subdir() {
+	local subdir
+	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+		einfo "[${subdir}] $*"
+		"$@"
+		popd >/dev/null || die
+	done
+}
+
 # @FUNCTION: install_qconfigs
 # @INTERNAL
 # @DESCRIPTION:

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

[Davide Pesavento]

commit:     eaaf496c13531b36d99f10e4de4d059dce8d1141
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 10 17:55:30 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 17:55:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=eaaf496c

[qt5-build.eclass] Delete unneeded stuff.

---
 eclass/qt5-build.eclass |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 67688a3..fcd8c88 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -251,10 +251,6 @@ qt5-build_src_configure() {
 		# requires GNU ld >= 2.18
 		-reduce-relocations
 
-		# freetype2 include dir is non-standard
-		# FIXME: move to qt-gui ebuild?
-		$($(tc-getPKG_CONFIG) --cflags-only-I freetype2 2>/dev/null)
-
 		# package-specific options
 		"${myconf[@]}"
 	)
@@ -314,7 +310,7 @@ qt5-build_src_install() {
 	# TODO: pkgconfig files are installed in the wrong place
 
 	# remove .la files since we are building only shared Qt libraries
-	prune_libtool_files --all
+	prune_libtool_files
 }
 
 # @FUNCTION: qt5-build_pkg_postinst

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

[Davide Pesavento]

commit:     e7c950f13853f8e1ef6c21c97073bf060f882f5e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun  8 19:13:23 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 19:13:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e7c950f1

[qt5-build.eclass] Respect CXX in configure.

---
 eclass/qt5-build.eclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 8fd8e84..67688a3 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -175,6 +175,10 @@ qt5-build_src_prepare() {
 		'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
 		configure || die "sed configure failed"
 
+	# Respect CXX in configure
+	sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
+		configure || die "sed QMAKE_CONF_COMPILER failed"
+
 	# Respect CC, CXX, LINK and *FLAGS in config.tests
 	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
 		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
@@ -184,7 +188,6 @@ qt5-build_src_prepare() {
 
 	# TODO
 	# in compile.test, -m flags are passed to the linker via LIBS
-	# config tests that use $COMPILER directly ignore toolchain
 
 	# Respect C/C++ compiler
 	tc-export CC CXX

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

[Davide Pesavento]

commit:     fbd71588f47a55cf190957cddc1988fc4a7c7b81
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun  8 00:13:18 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 00:13:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fbd71588

[qt5-build.eclass] Use prune_libtool_files from eutils.

---
 eclass/qt5-build.eclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 874e9e2..80e0c9c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -311,8 +311,7 @@ qt5-build_src_install() {
 	# TODO: pkgconfig files are installed in the wrong place
 
 	# remove .la files since we are building only shared Qt libraries
-	# FIXME: use prune_libtool_files when it'll be available in eutils.eclass
-	find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
+	prune_libtool_files --all
 }
 
 # @FUNCTION: qt5-build_pkg_postinst

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

[Davide Pesavento]

commit:     4aa226b76f0168f53919278534004e8cba8ce0cc
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Jun  8 00:02:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 00:02:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4aa226b7

[qt5-build.eclass] Add support for building other Qt modules.

---
 eclass/qt5-build.eclass |   74 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 03bb283..874e9e2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -150,20 +150,24 @@ qt5-build_src_unpack() {
 			default
 			;;
 	esac
-
-	qt5_prepare_env
 }
 
 # @FUNCTION: qt5-build_src_prepare
 # @DESCRIPTION:
 # Prepare the sources before the configure phase.
 qt5-build_src_prepare() {
+	qt5_prepare_env
+
+	mkdir -p "${QT5_BUILD_DIR}" || die
+
 	if [[ ${PN} != "qt-core" ]]; then
-		skip_qmake_build
-		skip_project_generation
-		symlink_binaries_to_buildtree
+		symlink_tools_to_buildtree
 	fi
 
+	# Avoid unnecessary qmake recompilations
+	sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
+		configure || die "sed configure failed"
+
 	# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
 	sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR/ s:): \
 		${MAKEOPTS} ${EXTRA_EMAKE} \
@@ -182,11 +186,11 @@ qt5-build_src_prepare() {
 	# in compile.test, -m flags are passed to the linker via LIBS
 	# config tests that use $COMPILER directly ignore toolchain
 
-	# respect compiler
+	# Respect C/C++ compiler
 	tc-export CC CXX
 	# qmake-generated Makefiles use LD/LINK for linking
 	export LD="$(tc-getCXX)"
-	# don't strip binaries
+	# Don't strip binaries
 	export STRIP=":"
 
 	base_src_prepare
@@ -252,13 +256,23 @@ qt5-build_src_configure() {
 		"${myconf[@]}"
 	)
 
-	mkdir -p "${QT5_BUILD_DIR}" || die
 	pushd "${QT5_BUILD_DIR}" >/dev/null || die
-
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
-
 	popd >/dev/null || die
+
+	if [[ ${PN} != "qt-core" ]]; then
+		local subdir
+		for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+			pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+			einfo "Running qmake in: ${subdir}"
+			"${QT5_BUILD_DIR}"/bin/qmake \
+				"${S}/${subdir}/${subdir##*/}.pro" \
+				QMAKE_LIBDIR_QT="${QTLIBDIR}" \
+				|| die "qmake failed in ${subdir}"
+			popd >/dev/null || die
+		done
+	fi
 }
 
 # @FUNCTION: qt5-build_src_compile
@@ -268,7 +282,7 @@ qt5-build_src_compile() {
 	local subdir
 	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
 		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
-		einfo "Building in ${subdir}"
+		einfo "Building in: ${subdir}"
 		emake
 		popd >/dev/null || die
 	done
@@ -320,11 +334,26 @@ qt5-build_pkg_postrm() {
 	:
 }
 
+# @FUNCTION: qt_use
+# @USAGE: < flag > [ feature ] [ enableval ]
+# @DESCRIPTION:
+# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
+# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
+# will be used for that. If [enableval] is not specified, it omits the
+# "-${enableval}" part.
+qt_use() {
+	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+}
+
+
+######  Internal functions  ######
+
 # @FUNCTION: qt5_prepare_env
 # @INTERNAL
 # @DESCRIPTION:
-# Sets up installation directories.
+# Prepares the environment for building Qt.
 qt5_prepare_env() {
+	# setup installation directories
 	QTPREFIXDIR=${EPREFIX}/usr
 	QTBINDIR=${EPREFIX}/usr/qt5/bin # FIXME
 	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt5
@@ -339,21 +368,24 @@ qt5_prepare_env() {
 	QTSYSCONFDIR=${EPREFIX}/etc/qt5
 }
 
-# @FUNCTION: qt_use
-# @USAGE: < flag > [ feature ] [ enableval ]
+# @FUNCTION: symlink_tools_to_buildtree
+# @INTERNAL
 # @DESCRIPTION:
-# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
-# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
-# will be used for that. If [enableval] is not specified, it omits the
-# "-${enableval}" part.
-qt_use() {
-	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+# Symlinks qt-core tools to buildtree, so they can be used when building other modules.
+symlink_tools_to_buildtree() {
+	mkdir -p "${QT5_BUILD_DIR}"/bin || die
+
+	local bin
+	for bin in "${QTBINDIR}"/{qmake,moc,rcc}; do
+		ln -s "${bin}" "${QT5_BUILD_DIR}"/bin/ \
+			|| die "symlinking '${bin}' to '${QT5_BUILD_DIR}/bin/' failed"
+	done
 }
 
 # @FUNCTION: install_qconfigs
 # @INTERNAL
 # @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations.
+# Installs gentoo-specific mkspecs configurations.
 install_qconfigs() {
 	local x
 

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

[Davide Pesavento]

commit:     2f72fa20fea29786e43ccd23395cccf1f53158e7
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun  7 15:39:07 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 15:39:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2f72fa20

[qt4-build.eclass] Sync with portage.

---
 eclass/qt4-build.eclass |   76 +++++++++++++++++++++++-----------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index a83bd71..5ad78c7 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.131 2012/05/25 12:06:05 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.132 2012/06/07 15:36:49 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -58,42 +58,42 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
 fi
 
 RDEPEND="
-	!<x11-libs/qt-assistant-${PV}
-	!>x11-libs/qt-assistant-${PV}-r9999
-	!<x11-libs/qt-bearer-${PV}
-	!>x11-libs/qt-bearer-${PV}-r9999
-	!<x11-libs/qt-core-${PV}
-	!>x11-libs/qt-core-${PV}-r9999
-	!<x11-libs/qt-dbus-${PV}
-	!>x11-libs/qt-dbus-${PV}-r9999
-	!<x11-libs/qt-declarative-${PV}
-	!>x11-libs/qt-declarative-${PV}-r9999
-	!<x11-libs/qt-demo-${PV}
-	!>x11-libs/qt-demo-${PV}-r9999
-	!<x11-libs/qt-gui-${PV}
-	!>x11-libs/qt-gui-${PV}-r9999
-	!<x11-libs/qt-multimedia-${PV}
-	!>x11-libs/qt-multimedia-${PV}-r9999
-	!<x11-libs/qt-opengl-${PV}
-	!>x11-libs/qt-opengl-${PV}-r9999
-	!<x11-libs/qt-openvg-${PV}
-	!>x11-libs/qt-openvg-${PV}-r9999
-	!<x11-libs/qt-phonon-${PV}
-	!>x11-libs/qt-phonon-${PV}-r9999
-	!<x11-libs/qt-qt3support-${PV}
-	!>x11-libs/qt-qt3support-${PV}-r9999
-	!<x11-libs/qt-script-${PV}
-	!>x11-libs/qt-script-${PV}-r9999
-	!<x11-libs/qt-sql-${PV}
-	!>x11-libs/qt-sql-${PV}-r9999
-	!<x11-libs/qt-svg-${PV}
-	!>x11-libs/qt-svg-${PV}-r9999
-	!<x11-libs/qt-test-${PV}
-	!>x11-libs/qt-test-${PV}-r9999
-	!<x11-libs/qt-webkit-${PV}
-	!>x11-libs/qt-webkit-${PV}-r9999
-	!<x11-libs/qt-xmlpatterns-${PV}
-	!>x11-libs/qt-xmlpatterns-${PV}-r9999
+	!<x11-libs/qt-assistant-${PV}:4
+	!>x11-libs/qt-assistant-${PV}-r9999:4
+	!<x11-libs/qt-bearer-${PV}:4
+	!>x11-libs/qt-bearer-${PV}-r9999:4
+	!<x11-libs/qt-core-${PV}:4
+	!>x11-libs/qt-core-${PV}-r9999:4
+	!<x11-libs/qt-dbus-${PV}:4
+	!>x11-libs/qt-dbus-${PV}-r9999:4
+	!<x11-libs/qt-declarative-${PV}:4
+	!>x11-libs/qt-declarative-${PV}-r9999:4
+	!<x11-libs/qt-demo-${PV}:4
+	!>x11-libs/qt-demo-${PV}-r9999:4
+	!<x11-libs/qt-gui-${PV}:4
+	!>x11-libs/qt-gui-${PV}-r9999:4
+	!<x11-libs/qt-multimedia-${PV}:4
+	!>x11-libs/qt-multimedia-${PV}-r9999:4
+	!<x11-libs/qt-opengl-${PV}:4
+	!>x11-libs/qt-opengl-${PV}-r9999:4
+	!<x11-libs/qt-openvg-${PV}:4
+	!>x11-libs/qt-openvg-${PV}-r9999:4
+	!<x11-libs/qt-phonon-${PV}:4
+	!>x11-libs/qt-phonon-${PV}-r9999:4
+	!<x11-libs/qt-qt3support-${PV}:4
+	!>x11-libs/qt-qt3support-${PV}-r9999:4
+	!<x11-libs/qt-script-${PV}:4
+	!>x11-libs/qt-script-${PV}-r9999:4
+	!<x11-libs/qt-sql-${PV}:4
+	!>x11-libs/qt-sql-${PV}-r9999:4
+	!<x11-libs/qt-svg-${PV}:4
+	!>x11-libs/qt-svg-${PV}-r9999:4
+	!<x11-libs/qt-test-${PV}:4
+	!>x11-libs/qt-test-${PV}-r9999:4
+	!<x11-libs/qt-webkit-${PV}:4
+	!>x11-libs/qt-webkit-${PV}-r9999:4
+	!<x11-libs/qt-xmlpatterns-${PV}:4
+	!>x11-libs/qt-xmlpatterns-${PV}-r9999:4
 "
 
 S=${WORKDIR}/${MY_P}
@@ -106,7 +106,7 @@ qt4-build_pkg_setup() {
 
 	# Protect users by not allowing downgrades between releases
 	# Downgrading revisions within the same release should be allowed
-	if has_version '>'${CATEGORY}/${P}-r9999; then
+	if has_version ">${CATEGORY}/${P}-r9999:4"; then
 		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 			eerror
 			eerror "Sanity check to keep you from breaking your system:"

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

[Davide Pesavento]

commit:     609621ff47d7a4d8b4fd825e756c407c3af72c27
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun  7 14:11:53 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 14:11:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=609621ff

[qt5-build.eclass] Specify EGIT_PROJECT.

---
 eclass/qt5-build.eclass |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index bf8d3f7..03bb283 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -32,19 +32,18 @@ LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="5"
 
 case ${PN#qt-} in
-	bearer|core|dbus|gui|sql|test|xml)	repo_name="qtbase" ;;
-	3d|jsbackend|script|svg|xmlpatterns)	repo_name="${PN/-}" ;;
+	bearer|core|dbus|gui|sql|test|xml)	EGIT_PROJECT="qtbase" ;;
+	3d|jsbackend|script|svg|xmlpatterns)	EGIT_PROJECT="${PN/-}" ;;
 	*) die "qt5-build.eclass: unknown module ${PN}" ;;
 esac
 case ${QT5_BUILD_TYPE} in
 	live)
-		EGIT_REPO_URI="git://gitorious.org/qt/${repo_name}.git
-			https://git.gitorious.org/qt/${repo_name}.git"
+		EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git
+			https://git.gitorious.org/qt/${EGIT_PROJECT}.git"
 		;;
 	release)
 		SRC_URI="" # TODO
 esac
-unset repo_name
 
 IUSE="+c++11 debug +pch"
 

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

[Davide Pesavento]

commit:     73b63d05c22a7772b1947e2187bc1ff251d25e04
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Jun  6 17:48:29 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 17:48:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=73b63d05

[qt5-build.eclass] New work-in-progress eclass for Qt5 split ebuilds.

---
 eclass/qt5-build.eclass |  436 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 436 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
new file mode 100644
index 0000000..bf8d3f7
--- /dev/null
+++ b/eclass/qt5-build.eclass
@@ -0,0 +1,436 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: qt5-build.eclass
+# @MAINTAINER:
+# Qt herd <qt@gentoo.org>
+# @BLURB: Eclass for Qt5 split ebuilds.
+# @DESCRIPTION:
+# This eclass contains various functions that are used when building Qt5.
+# eutils, flag-o-matic, multilib eclasses are guaranteed to be already inherited.
+# Requires EAPI 4.
+
+case ${EAPI} in
+	4)	: ;;
+	*)	die "qt5-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+esac
+
+inherit base eutils flag-o-matic multilib toolchain-funcs versionator
+
+if [[ ${PV} == *9999* ]]; then
+	QT5_BUILD_TYPE="live"
+	inherit git-2
+else
+	QT5_BUILD_TYPE="release"
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postinst pkg_postrm
+
+HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="5"
+
+case ${PN#qt-} in
+	bearer|core|dbus|gui|sql|test|xml)	repo_name="qtbase" ;;
+	3d|jsbackend|script|svg|xmlpatterns)	repo_name="${PN/-}" ;;
+	*) die "qt5-build.eclass: unknown module ${PN}" ;;
+esac
+case ${QT5_BUILD_TYPE} in
+	live)
+		EGIT_REPO_URI="git://gitorious.org/qt/${repo_name}.git
+			https://git.gitorious.org/qt/${repo_name}.git"
+		;;
+	release)
+		SRC_URI="" # TODO
+esac
+unset repo_name
+
+IUSE="+c++11 debug +pch"
+
+DEPEND="virtual/pkgconfig"
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	DEPEND+=" dev-lang/perl"
+fi
+
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing all the patches to be applied. This variable
+# is expected to be defined in the global scope of ebuilds. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+#
+# Example:
+# @CODE
+#	PATCHES=(
+#		"${FILESDIR}/mypatch.patch"
+#		"${FILESDIR}/mypatch2.patch"
+#	)
+# @CODE
+
+# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing the source directories that should be built.
+# All paths must be relative to ${S}.
+
+# @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @DESCRIPTION:
+# Build directory for out-of-source builds.
+: ${QT5_BUILD_DIR:=${WORKDIR}/${P}_build}
+
+# @ECLASS-VARIABLE: QT5_VERBOSE_CONFIGURE
+# @DESCRIPTION:
+# Set to false to suppress printing of detailed information
+# about each step of the configure process.
+: ${QT5_VERBOSE_CONFIGURE:=true}
+
+# @ECLASS-VARIABLE: QT5_VERBOSE_BUILD
+# @DESCRIPTION:
+# Set to false to reduce build output during compilation.
+: ${QT5_VERBOSE_BUILD:=true}
+
+# @ECLASS-VARIABLE: QCONFIG_ADD
+# @DESCRIPTION:
+# List of options that need to be added to QT_CONFIG in qconfig.pri
+: ${QCONFIG_ADD:=}
+
+# @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DESCRIPTION:
+# List of options that need to be removed from QT_CONFIG in qconfig.pri
+: ${QCONFIG_REMOVE:=}
+
+# @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DESCRIPTION:
+# List of variables that should be defined at the top of QtCore/qconfig.h
+: ${QCONFIG_DEFINE:=}
+
+# @FUNCTION: qt5-build_pkg_setup
+# @DESCRIPTION:
+# Warns and/or dies if the user is trying to downgrade Qt.
+qt5-build_pkg_setup() {
+	# Protect users by not allowing downgrades between releases.
+	# Downgrading revisions within the same release should be allowed.
+	if has_version ">${CATEGORY}/${P}-r9999:${SLOT}"; then
+		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+			eerror "    ***  Sanity check to keep you from breaking your system  ***"
+			eerror "Downgrading Qt is completely unsupported and will break your system!"
+			die "aborting to save your system"
+		else
+			ewarn "Downgrading Qt is completely unsupported and will break your system!"
+		fi
+	fi
+}
+
+# @FUNCTION: qt5-build_src_unpack
+# @DESCRIPTION:
+# Unpacks the sources.
+qt5-build_src_unpack() {
+	if ! version_is_at_least 4.4 $(gcc-version); then
+		ewarn "Using a GCC version lower than 4.4 is not supported."
+	fi
+
+	if [[ ${PN} == "qt-webkit" ]]; then
+		eshopts_push -s extglob
+		if is-flagq '-g?(gdb)?([1-9])'; then
+			echo
+			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+			ewarn "You may experience really long compilation times and/or increased memory usage."
+			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+			ewarn "For more info check out https://bugs.gentoo.org/307861"
+			echo
+		fi
+		eshopts_pop
+	fi
+
+	case ${QT5_BUILD_TYPE} in
+		live)
+			git-2_src_unpack
+			;;
+		release)
+			default
+			;;
+	esac
+
+	qt5_prepare_env
+}
+
+# @FUNCTION: qt5-build_src_prepare
+# @DESCRIPTION:
+# Prepare the sources before the configure phase.
+qt5-build_src_prepare() {
+	if [[ ${PN} != "qt-core" ]]; then
+		skip_qmake_build
+		skip_project_generation
+		symlink_binaries_to_buildtree
+	fi
+
+	# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when building qmake
+	sed -i -e "/\"\$MAKE\".*QMAKE_BUILD_ERROR/ s:): \
+		${MAKEOPTS} ${EXTRA_EMAKE} \
+		'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \
+		'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
+		configure || die "sed configure failed"
+
+	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
+			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+		|| die "sed config.tests failed"
+
+	# TODO
+	# in compile.test, -m flags are passed to the linker via LIBS
+	# config tests that use $COMPILER directly ignore toolchain
+
+	# respect compiler
+	tc-export CC CXX
+	# qmake-generated Makefiles use LD/LINK for linking
+	export LD="$(tc-getCXX)"
+	# don't strip binaries
+	export STRIP=":"
+
+	base_src_prepare
+}
+
+# @FUNCTION: qt5-build_src_configure
+# @DESCRIPTION:
+# Default configure phase.
+qt5-build_src_configure() {
+	# configure arguments
+	local conf=(
+		# installation paths
+		-prefix "${QTPREFIXDIR}"
+		-bindir "${QTBINDIR}"
+		-libdir "${QTLIBDIR}"
+		-docdir "${QTDOCDIR}"
+		-headerdir "${QTHEADERDIR}"
+		-plugindir "${QTPLUGINDIR}"
+		-importdir "${QTIMPORTDIR}"
+		-datadir "${QTDATADIR}"
+		-translationdir "${QTTRANSDIR}"
+		-sysconfdir "${QTSYSCONFDIR}"
+		-examplesdir "${QTEXAMPLESDIR}"
+		-testsdir "${QTTESTSDIR}"
+
+		# debug/release
+		$(use debug && echo -debug || echo -release)
+		-no-separate-debug-info
+
+		# licensing stuff
+		-opensource -confirm-license
+
+		# C++11 support
+		$(qt_use c++11)
+
+		# general configure options
+		-shared -fast -largefile
+		-pkg-config
+		-system-zlib -system-pcre
+
+		# don't build examples
+		-nomake examples
+
+		# disable rpath on non-prefix (bugs 380415 and 417169)
+		$(use prefix || echo -no-rpath)
+
+		# verbosity of the configure and build phases
+		$(${QT5_VERBOSE_CONFIGURE} && echo -verbose)
+		$(${QT5_VERBOSE_BUILD} || echo -silent)
+
+		# precompiled headers don't work on hardened, where the flag is masked
+		$(qt_use pch)
+
+		# reduce relocations in libraries through extra linker optimizations
+		# requires GNU ld >= 2.18
+		-reduce-relocations
+
+		# freetype2 include dir is non-standard
+		# FIXME: move to qt-gui ebuild?
+		$($(tc-getPKG_CONFIG) --cflags-only-I freetype2 2>/dev/null)
+
+		# package-specific options
+		"${myconf[@]}"
+	)
+
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	pushd "${QT5_BUILD_DIR}" >/dev/null || die
+
+	einfo "Configuring with: ${conf[@]}"
+	"${S}"/configure "${conf[@]}" || die "configure failed"
+
+	popd >/dev/null || die
+}
+
+# @FUNCTION: qt5-build_src_compile
+# @DESCRIPTION:
+# Compiles the code in QT5_TARGET_SUBDIRS.
+qt5-build_src_compile() {
+	local subdir
+	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+		einfo "Building in ${subdir}"
+		emake
+		popd >/dev/null || die
+	done
+}
+
+# @FUNCTION: qt5-build_src_test
+# @DESCRIPTION:
+# Runs tests in target directories.
+qt5-build_src_test() {
+	# TODO
+	:
+}
+
+# @FUNCTION: qt5-build_src_install
+# @DESCRIPTION:
+# Perform the actual installation including some library fixes.
+qt5-build_src_install() {
+	local subdir
+	for subdir in "${QT5_TARGET_SUBDIRS[@]}"; do
+		pushd "${QT5_BUILD_DIR}/${subdir}" >/dev/null || die
+		emake INSTALL_ROOT="${D}" install
+		popd >/dev/null || die
+	done
+
+	# TODO: install_qconfigs
+	# TODO: pkgconfig files are installed in the wrong place
+
+	# remove .la files since we are building only shared Qt libraries
+	# FIXME: use prune_libtool_files when it'll be available in eutils.eclass
+	find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
+}
+
+# @FUNCTION: qt5-build_pkg_postinst
+# @DESCRIPTION:
+# Regenerate configuration, plus throw a message about possible
+# breakages and proposed solutions.
+qt5-build_pkg_postinst() {
+	# TODO
+	#generate_qconfigs
+	:
+}
+
+# @FUNCTION: qt5-build_pkg_postrm
+# @DESCRIPTION:
+# Regenerate configuration when the package is completely removed.
+qt5-build_pkg_postrm() {
+	# TODO
+	#generate_qconfigs
+	:
+}
+
+# @FUNCTION: qt5_prepare_env
+# @INTERNAL
+# @DESCRIPTION:
+# Sets up installation directories.
+qt5_prepare_env() {
+	QTPREFIXDIR=${EPREFIX}/usr
+	QTBINDIR=${EPREFIX}/usr/qt5/bin # FIXME
+	QTLIBDIR=${QTPREFIXDIR}/$(get_libdir)/qt5
+	QTDOCDIR=${QTPREFIXDIR}/share/doc/qt-${PV}
+	QTHEADERDIR=${QTPREFIXDIR}/include/qt5
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTIMPORTDIR=${QTLIBDIR}/imports
+	QTDATADIR=${QTPREFIXDIR}/share/qt5
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTTESTSDIR=${QTDATADIR}/tests
+	QTSYSCONFDIR=${EPREFIX}/etc/qt5
+}
+
+# @FUNCTION: qt_use
+# @USAGE: < flag > [ feature ] [ enableval ]
+# @DESCRIPTION:
+# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
+# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
+# will be used for that. If [enableval] is not specified, it omits the
+# "-${enableval}" part.
+qt_use() {
+	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+}
+
+# @FUNCTION: install_qconfigs
+# @INTERNAL
+# @DESCRIPTION:
+# Install gentoo-specific mkspecs configurations.
+install_qconfigs() {
+	local x
+
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
+		for x in QCONFIG_ADD QCONFIG_REMOVE; do
+			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
+		done
+		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
+		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
+	fi
+
+	if [[ -n ${QCONFIG_DEFINE} ]]; then
+		for x in ${QCONFIG_DEFINE}; do
+			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
+		done
+		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
+		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
+	fi
+}
+
+# @FUNCTION: generate_qconfigs
+# @INTERNAL
+# @DESCRIPTION:
+# Generates gentoo-specific qconfig.{h,pri}.
+generate_qconfigs() {
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} ]]; then
+		local x qconfig_add qconfig_remove qconfig_new
+		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
+			[[ -f ${x} ]] || continue
+			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
+			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
+		done
+
+		# these error checks do not use die because dying in pkg_post{inst,rm}
+		# just makes things worse.
+		if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
+			# start with the qconfig.pri that qt-core installed
+			if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
+				eerror "cp qconfig failed."
+				return 1
+			fi
+
+			# generate list of QT_CONFIG entries from the existing list
+			# including qconfig_add and excluding qconfig_remove
+			for x in $(sed -n 's/^QT_CONFIG +=//p' \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
+					has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
+			done
+
+			# replace the existing QT_CONFIG list with qconfig_new
+			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
+				eerror "Sed for QT_CONFIG failed"
+				return 1
+			fi
+
+			# create Gentoo/qconfig.h
+			if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
+				if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
+					eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
+					return 1
+				fi
+			fi
+			: > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
+				[[ -f ${x} ]] || continue
+				cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			done
+		else
+			rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
+			rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			rmdir "${ROOT}${QTDATADIR}"/mkspecs \
+				"${ROOT}${QTDATADIR}" \
+				"${ROOT}${QTHEADERDIR}"/Gentoo \
+				"${ROOT}${QTHEADERDIR}" 2>/dev/null
+		fi
+	fi
+}

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

[Davide Pesavento]

commit:     b0384047b6561c27f841796c6a00b2fb88ec6e8d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri May 25 12:08:59 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 25 12:08:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b0384047

[qt4-build.eclass] Re-enable rpath on prefix wrt bug 417169.

---
 eclass/qt4-build.eclass |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 2a7dcdb..a83bd71 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.130 2012/05/22 13:41:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.131 2012/05/25 12:06:05 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -417,8 +417,9 @@ qt4-build_src_configure() {
 	# exceptions USE flag
 	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
 
-	# disable RPATH on Qt >= 4.8 (bug 380415)
-	version_is_at_least 4.8 && conf+=" -no-rpath"
+	# disable rpath on Qt >= 4.8 (bug 380415)
+	# but leave it enabled on prefix (bug 417169)
+	version_is_at_least 4.8 && use !prefix && conf+=" -no-rpath"
 
 	# precompiled headers don't work on hardened, where the flag is masked
 	conf+=" $(qt_use pch)"

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

[Davide Pesavento]

commit:     f480e64ff88bc921b4ff85d5715064615f444c5a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue May 22 15:12:26 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 22 15:12:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f480e64f

[qt4-build.eclass] Update SRC_URI for Qt 4.8.1 and later.

---
 eclass/qt4-build.eclass |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 73b4f94..2a7dcdb 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.129 2012/05/20 17:12:34 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.130 2012/05/22 13:41:59 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -36,7 +36,11 @@ case ${QT4_BUILD_TYPE} in
 		EGIT_BRANCH="${PV%.9999}"
 		;;
 	release)
-		SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
+		if version_is_at_least 4.8.1; then
+			SRC_URI="http://releases.qt-project.org/qt4/source/${MY_P}.tar.gz"
+		else
+			SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
+		fi
 		;;
 esac
 

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

[Johannes Huber]

commit:     144d7cc57cb49deab41d321286019694979fe7db
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 12:59:41 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May 22 12:59:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=144d7cc5

[eclass] Update patch description.

---
 eclass/qt4-r2.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index a29428b..8916110 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -71,7 +71,7 @@ unset x
 # @CODE
 #	PATCHES=(
 #		"${FILESDIR}/mypatch.patch"
-#		"${FILESDIR}/patches_folder/"
+#		"${FILESDIR}/mypatch2.patch"
 #	)
 # @CODE
 

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

[Davide Pesavento]

commit:     ef2109df4cd719ce0d14760b5df18a825772d71f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May 21 23:27:38 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 21 23:27:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ef2109df

[qt4-r2.eclass] Improvements to qt4-r2_src_install().

Allow DOCS to be an array variable, add support for HTML_DOCS. The
implementation is mostly copied from cmake-utils and base eclasses.
Remove support for DOCSDIR (used by only 2 ebuilds in the tree).
Improve variables documentation.

---
 eclass/qt4-r2.eclass |   83 +++++++++++++++++++++++++++----------------------
 1 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index c8b007d..362ceaf 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -19,16 +19,30 @@ inherit base eutils multilib toolchain-funcs
 
 export XDG_CONFIG_HOME="${T}"
 
+# @ECLASS-VARIABLE: DOCS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array containing documents passed to dodoc command.
+# Paths can be absolute or relative to ${S}.
+#
+# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" )
+
+# @ECLASS-VARIABLE: HTML_DOCS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array containing documents passed to dohtml command.
+# Paths can be absolute or relative to ${S}.
+#
+# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/" )
+
 # @ECLASS-VARIABLE: LANGS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # In case your Qt4 application provides various translations, use this variable
 # to specify them in order to populate "linguas_*" IUSE automatically. Make sure
 # that you set this variable before inheriting qt4-r2 eclass.
-# Example:
-# @CODE
-#   LANGS="en el de"
-# @CODE
+#
+# Example: LANGS="de el it ja"
 for x in ${LANGS}; do
 	IUSE+=" linguas_${x}"
 done
@@ -36,14 +50,31 @@ done
 # @ECLASS-VARIABLE: LANGSLONG
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Same as above, but this variable is for LINGUAS that must be in long format.
+# Same as LANGS, but this variable is for LINGUAS that must be in long format.
 # Remember to set this variable before inheriting qt4-r2 eclass.
 # Look at ${PORTDIR}/profiles/desc/linguas.desc for details.
+#
+# Example: LANGSLONG="en_GB ru_RU"
 for x in ${LANGSLONG}; do
 	IUSE+=" linguas_${x%_*}"
 done
 unset x
 
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing all the patches to be applied. This variable
+# is expected to be defined in the global scope of ebuilds. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+#
+# Example:
+# @CODE
+#	PATCHES=(
+#		"${FILESDIR}/mypatch.patch"
+#		"${FILESDIR}/patches_folder/"
+#	)
+# @CODE
+
 # @FUNCTION: qt4-r2_src_unpack
 # @DESCRIPTION:
 # Default src_unpack function for packages that depend on qt4. If you have to
@@ -64,17 +95,6 @@ qt4-r2_src_unpack() {
 	base_src_unpack "$@"
 }
 
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# In case you have patches to apply, specify them here. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-# Example:
-# @CODE
-#   PATCHES=( "${FILESDIR}"/mypatch.patch
-#             "${FILESDIR}"/mypatch2.patch )
-# @CODE
-
 # @FUNCTION: qt4-r2_src_prepare
 # @DESCRIPTION:
 # Default src_prepare function for packages that depend on qt4. If you have to
@@ -113,34 +133,23 @@ qt4-r2_src_compile() {
 	base_src_compile "$@"
 }
 
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Use this variable if you want to install any documentation.
-# Example:
-# @CODE
-#   DOCS="README AUTHORS"
-# @CODE
-
-# @ECLASS-VARIABLE: DOCSDIR
-# @DESCRIPTION:
-# Directory containing documentation, defaults to ${S}.
-
 # @FUNCTION: qt4-r2_src_install
 # @DESCRIPTION:
 # Default src_install function for qt4-based packages. Installs compiled code,
-# documentation (via DOCS variable) and translations (via LANGS and
-# LANGSLONG variables).
+# documentation (via DOCS and HTML_DOCS variables) and translations (via LANGS
+# and LANGSLONG variables).
 qt4-r2_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
-	emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "emake install failed"
+	base_src_install INSTALL_ROOT="${D}" "$@"
 
-	# install documentation
-	local doc= dir=${DOCSDIR:-${S}}
-	for doc in ${DOCS}; do
-		dodoc "${dir}/${doc}" || die "dodoc failed"
-	done
+	# backward compatibility for non-array variables
+	if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
+		dodoc ${DOCS} || die "dodoc failed"
+	fi
+	if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
+		dohtml -r ${HTML_DOCS} || die "dohtml failed"
+	fi
 
 	# install translations
 	# need to have specified LANGS or LANGSLONG for this to work

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

[Davide Pesavento]

commit:     0c5718598a098a0ad4ed64a5d3d768a1bd6581bd
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun May 20 17:13:31 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 20 17:13:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0c571859

[qt4-build.eclass] Try to avoid sandbox violation when running qhelpgenerator, bug 415517.

---
 eclass/qt4-build.eclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index be72e71..73b4f94 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/05/07 21:28:01 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.129 2012/05/20 17:12:34 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -580,8 +580,9 @@ setqtenv() {
 	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
 
 	PLATFORM=$(qt_mkspecs_dir)
-
 	unset QMAKESPEC
+
+	export XDG_CONFIG_HOME="${T}"
 }
 
 # @FUNCTION: prepare_directories

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

[Davide Pesavento]

commit:     d29e8ece2004453c1da720417ba779476d72ffc9
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon May  7 21:29:36 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May  7 21:29:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d29e8ece

[qt4-build.eclass] Sync with portage.

---
 eclass/qt4-build.eclass |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index b5cfb47..be72e71 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.126 2012/04/25 17:43:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.128 2012/05/07 21:28:01 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -283,8 +283,10 @@ qt4-build_src_prepare() {
 			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
 		|| die "sed config.tests failed"
 
-	# Strip predefined CFLAGS from mkspecs (bug 312689)
-	sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
+	if ! version_is_at_least 4.8; then
+		# Strip predefined CFLAGS from mkspecs (bugs 312689 and 352778)
+		sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
+	fi
 
 	# Bug 172219
 	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die

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

[Johannes Huber]

commit:     84617a4e6609cd68ce0bf01a6729f34cb070f21a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 07:24:46 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May  3 07:24:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=84617a4e

[eclass] Migrate to virtual/pkgconfig.

---
 eclass/qt4-build.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index e27f19b..b5cfb47 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -48,7 +48,7 @@ if version_is_at_least 4.8; then
 	IUSE+=" c++0x qpa"
 fi
 
-DEPEND="dev-util/pkgconfig"
+DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	DEPEND+=" dev-lang/perl"
 fi

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

[Davide Pesavento]

commit:     50d2cfbb2709a8b3e641c1927f5a54942cb01749
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Apr 26 13:05:56 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 13:05:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=50d2cfbb

[qt4-build.eclass] Sync with portage.

---
 eclass/qt4-build.eclass |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 366629f..e27f19b 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.125 2012/04/19 14:52:12 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.126 2012/04/25 17:43:50 grobian Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -504,21 +504,38 @@ qt4-build_src_test() {
 # being used, to avoid complications with some more or less stupid packages.
 fix_includes() {
 	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		local frw dest f h rdir
 		# Some packages tend to include <Qt/...>
 		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
 
-		# Fake normal headers when frameworks are installed... eases life later on
-		local dest f h
+		# Fake normal headers when frameworks are installed... eases life later
+		# on, make sure we use relative links though, as some ebuilds assume
+		# these dirs exist in src_install to add additional files
+		f=${QTHEADERDIR}
+		h=${QTLIBDIR}
+		while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
+			f=${f#*/}
+			h=${h#*/}
+		done
+		rdir=${h}
+		f="../"
+		while [[ ${h} == */* ]] ; do
+			f="${f}../"
+			h=${h#*/}
+		done
+		rdir="${f}${rdir}"
+
 		for frw in "${D}${QTLIBDIR}"/*.framework; do
 			[[ -e "${frw}"/Headers ]] || continue
 			f=$(basename ${frw})
 			dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
-			dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
+			dosym "${rdir}"/${f}/Headers "${dest}"
 
 			# Link normal headers as well.
 			for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
 				h=$(basename ${hdr})
-				dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
+				dosym "../${rdir}"/${f}/Headers/${h} \
+					"${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
 			done
 		done
 	fi

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

[Davide Pesavento]

commit:     05905ee904f463e10ee782ac005bdb727f3fb206
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Apr 19 14:54:33 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr 19 14:54:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=05905ee9

[qt4-build.eclass] Add appropriate blockers for qt-bearer.

---
 eclass/qt4-build.eclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 78d699f..366629f 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.123 2012/03/08 14:24:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.125 2012/04/19 14:52:12 pesa Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -56,6 +56,8 @@ fi
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
+	!<x11-libs/qt-bearer-${PV}
+	!>x11-libs/qt-bearer-${PV}-r9999
 	!<x11-libs/qt-core-${PV}
 	!>x11-libs/qt-core-${PV}-r9999
 	!<x11-libs/qt-dbus-${PV}

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

[Davide Pesavento]

commit:     fd401af5991a7915f014fb1a2b7b3a4e3f7d3f30
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Apr  5 13:36:10 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr  5 13:36:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fd401af5

[qt4-r2.eclass] Move some code around, no functional changes.

---
 eclass/qt4-r2.eclass |  108 ++++++++++++++++++++++++-------------------------
 1 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 09adfd8..c8b007d 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -142,41 +142,11 @@ qt4-r2_src_install() {
 		dodoc "${dir}/${doc}" || die "dodoc failed"
 	done
 
-	# install translations # hwoarang: Is this valid for every package???
+	# install translations
 	# need to have specified LANGS or LANGSLONG for this to work
 	[[ -n ${LANGS} || -n ${LANGSLONG} ]] && prepare_translations
 }
 
-# Internal function, used by eqmake4 and qt4-r2_src_configure
-# Look for project files:
-#   0 *.pro files found - output null string
-#   1 *.pro file found - output its name
-#   2 or more *.pro files found - if ${PN}.pro or $(basename ${S}).pro
-#     are there, output any of them
-# Outputs a project file argument used by eqmake4. Sets nullglob locally
-# to avoid expanding *.pro as "*.pro" when there are no matching files.
-_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
-}
-
 # @FUNCTION: eqmake4
 # @USAGE: [project_file] [parameters to qmake]
 # @DESCRIPTION:
@@ -295,27 +265,34 @@ eqmake4() {
 	return 0
 }
 
-# Internal function
-_do_qm() {
-	debug-print-function $FUNCNAME "$@"
-	[[ $# -ne 2 ]] && die "$FUNCNAME requires exactly 2 arguments!"
+# 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}")
 
-	local transfile="$(find "${1}" -type f -name "*${2}".qm)"
-	if [[ -f ${transfile} ]]; then
-		(
-			insinto /usr/share/${PN}/"${1#${S}}"
-			doins "${transfile}"
-		) || die "failed to install ${2} translation"
-	else
-		eerror
-		eerror "Failed to install ${2} translation: file not found."
-		eerror
-		die "failed to install ${2} translation"
-	fi
-}
+	eshopts_push -s nullglob
+	local pro_files=(*.pro)
+	eshopts_pop
 
-# @VARIABLE: TRANSLATIONSDIR
-# @DESCRIPTION: Translations directory. If not set, ${S} will be used
+	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
+}
 
 # @FUNCTION: prepare_translations
 # @DESCRIPTION:
@@ -324,22 +301,43 @@ _do_qm() {
 prepare_translations() {
 	debug-print-function $FUNCNAME "$@"
 
+	# @VARIABLE: TRANSLATIONSDIR
+	# @DESCRIPTION: Translations directory, defaults to ${S}.
+	local roottrdir=${TRANSLATIONSDIR:-${S}}
+	local trdir=.
 	# Find translations directory
-	# Changed default to . - crazy upstreams :)
-	local roottrdir="${TRANSLATIONSDIR:-${S}}" trdir=.
 	for dir in lang langs translations; do
-		[[ -d ${roottrdir}/${dir} ]] && trdir="${roottrdir}/${dir}"
+		[[ -d ${roottrdir}/${dir} ]] && trdir=${roottrdir}/${dir}
         done
 
 	local lang=
 	for lang in ${LINGUAS}; do
 		for x in ${LANGS}; do
-			[[ ${lang} == ${x%_*} ]] && _do_qm "${trdir}" ${x}
+			[[ ${lang} == ${x%_*} ]] && _do_qm "${trdir}" "${x}"
 		done
 		for x in ${LANGSLONG}; do
-			[[ ${lang} == ${x} ]] && _do_qm "${trdir}" ${x}
+			[[ ${lang} == ${x} ]] && _do_qm "${trdir}" "${x}"
 		done
 	done
 }
 
+# Internal function
+_do_qm() {
+	debug-print-function $FUNCNAME "$@"
+	[[ $# -ne 2 ]] && die "$FUNCNAME() requires exactly 2 arguments!"
+
+	local transfile="$(find "${1}" -type f -name "*${2}".qm)"
+	if [[ -f ${transfile} ]]; then
+		(
+			insinto /usr/share/${PN}/"${1#${S}}"
+			doins "${transfile}"
+		) || die "failed to install ${2} translation"
+	else
+		eerror
+		eerror "Failed to install ${2} translation: file not found."
+		eerror
+		die "failed to install ${2} translation"
+	fi
+}
+
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install

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

[Davide Pesavento]

commit:     11c7a436ede014604172c04d36853541b5c93a7a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Apr  5 12:50:36 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr  5 12:50:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=11c7a436

[qt4-r2.eclass] Apply kensington's patch wrt bug 361303.

---
 eclass/qt4-r2.eclass |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 37d529e..09adfd8 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -268,12 +268,15 @@ eqmake4() {
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_CXX="$(tc-getCXX)" \
 		QMAKE_LINK="$(tc-getCXX)" \
-		QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
-		QMAKE_CFLAGS_DEBUG="${CFLAGS}" \
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-		QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \
-		QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
-		QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
+		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) \

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

[Michael Palimaka]

commit:     f3dea0c8f0d0398ceee5b92886d8d2b356a8b336
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed Apr  4 18:21:47 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed Apr  4 18:21:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f3dea0c8

[qt4-edge.eclass] Remove deprecated, unused eclass.

---
 eclass/qt4-edge.eclass |  127 ------------------------------------------------
 1 files changed, 0 insertions(+), 127 deletions(-)

diff --git a/eclass/qt4-edge.eclass b/eclass/qt4-edge.eclass
deleted file mode 100644
index eb591bc..0000000
--- a/eclass/qt4-edge.eclass
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: qt4-edge.eclass
-# @MAINTAINER:
-# @ Qt herd <qt@gentoo.org>
-# @BLURB: Experimental eclass for Qt4 live ebuild
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful when
-# dealing with packages using Qt4 libraries. Requires EAPI>=2.
-
-inherit base eutils multilib qt4-r2 toolchain-funcs
-
-export XDG_CONFIG_HOME="${T}"
-
-qt4-edge_pkg_setup() {
-	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-		ewarn
-		ewarn "Please file bugs on bugs.gentoo.org and prepend the summary with"
-		ewarn "[qt overlay]. Alternatively, contact qt@gentoo.org."
-		ewarn "Thank you for using qt overlay."
-		ewarn
-	fi
-}
-
-qt4-edge_src_unpack() {
-	debug-print-function $FUNCNAME "$@"
-
-	qt4-r2_src_unpack "$@"
-}
-
-# @FUNCTION: qt4-edge_src_prepare
-# @DESCRIPTION:
-# Default src_prepare function for packages that depend on qt4. If you have to
-# override src_prepare in your ebuild, you should call qt4-edge_src_prepare in it,
-# otherwise autopatcher will not work!
-qt4-edge_src_prepare() {
-	debug-print-function $FUNCNAME "$@"
-
-	qt4-r2_src_prepare
-}
-
-# @FUNCTION: qt4-edge_src_configure
-# @DESCRIPTION:
-# Default src_configure function for packages that depends on qt4. If you have to
-# override src_configure in your ebuild, call qt4-edge_src_configure in it.
-qt4-edge_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	qt4-r2_src_configure
-}
-
-# @FUNCTION: qt4-edge_src_compile
-# @DESCRIPTION:
-# Default src_compile function for packages that depends on qt4. If you have to
-# override src_compile in your ebuild (probably you don't need to), call
-# qt4-edge_src_compile in it.
-qt4-edge_src_compile() {
-	debug-print-function $FUNCNAME "$@"
-
-	qt4-r2_src_compile
-}
-
-# @FUNCTION: qt4-edge_src_install
-# @DESCRIPTION:
-# Default src_install function for qt4-based packages. Installs compiled code,
-# documentation (via DOCS variable) and translations (via LANGS and
-# LANGSLONG variables).
-qt4-edge_src_install() {
-	debug-print-function $FUNCNAME "$@"
-
-	qt4-r2_src_install
-
-	# install translations # hwoarang: Is this valid for every package???
-	# need to have specified LANGS or LANGSLONG for this to work
-	[[ -n "${LANGS}" || -n "${LANGSLONG}" ]] && prepare_translations
-}
-
-# Internal function
-_do_qm() {
-	debug-print-function $FUNCNAME "$@"
-	[[ $# -ne 2 ]] && die "$FUNCNAME requires exactly 2 arguments!"
-
-	local transfile="$(find "${1}" -type f -name "*${2}".qm)"
-	if [[ -f ${transfile} ]]; then
-		(
-			insinto /usr/share/${PN}/"${1#${S}}"
-			doins "${transfile}"
-		) || die "failed to install ${2} translation"
-	else
-		eerror
-		eerror "Failed to install ${2} translation: file not found."
-		eerror
-		die "failed to install ${2} translation"
-	fi
-}
-
-# @VARIABLE: TRANSLATIONSDIR
-# @DESCRIPTION: Translations directory. If not set, ${S} will be used
-
-# @FUNCTION: prepare_translations
-# @DESCRIPTION:
-# Choose and install translation files. Normally you don't need to call
-# this function directly as it is called from qt4-edge_src_install.
-prepare_translations() {
-	debug-print-function $FUNCNAME "$@"
-
-	# Find translations directory
-	# Changed default to . - crazy upstreams :)
-	local roottrdir="${TRANSLATIONSDIR:-${S}}" trdir=.
-	for dir in lang langs translations; do
-		[[ -d ${roottrdir}/${dir} ]] && trdir="${roottrdir}/${dir}"
-	done
-
-	local lang=
-	for lang in ${LINGUAS}; do
-		for x in ${LANGS}; do
-			[[ ${lang} == ${x%_*} ]] && _do_qm "${trdir}" ${x}
-		done
-		for x in ${LANGSLONG}; do
-			[[ ${lang} == ${x} ]] && _do_qm "${trdir}" ${x}
-		done
-	done
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install

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

[Michael Palimaka]

commit:     b10b47a90c6794fa3c3378835379d33f298b1f2f
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed Apr  4 18:23:12 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed Apr  4 18:23:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b10b47a9

[qt4-r2.eclass] Fix reference to qt4-edge.

---
 eclass/qt4-r2.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index 800c19e..37d529e 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -317,7 +317,7 @@ _do_qm() {
 # @FUNCTION: prepare_translations
 # @DESCRIPTION:
 # Choose and install translation files. Normally you don't need to call
-# this function directly as it is called from qt4-edge_src_install.
+# this function directly as it is called from qt4-r2_src_install.
 prepare_translations() {
 	debug-print-function $FUNCNAME "$@"
 

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

[Michael Palimaka]

commit:     64843e8bff3ff16f32e002e7f61afbc420bcb1fb
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed Apr  4 17:44:51 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed Apr  4 17:53:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=64843e8b

[qt4-r2.eclass] Merge qt4-r2 from portage and qt4-edge from the overlay.

---
 eclass/qt4-r2.eclass |  342 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 342 insertions(+), 0 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
new file mode 100644
index 0000000..800c19e
--- /dev/null
+++ b/eclass/qt4-r2.eclass
@@ -0,0 +1,342 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: qt4-r2.eclass
+# @MAINTAINER:
+# Qt herd <qt@gentoo.org>
+# @BLURB: Eclass for Qt4-based packages, second edition.
+# @DESCRIPTION:
+# This eclass contains various functions that may be useful when
+# dealing with packages using Qt4 libraries. Requires EAPI=2 or later.
+
+case ${EAPI} in
+	2|3|4)	: ;;
+	*)	die "EAPI=${EAPI} is not supported by ${ECLASS} eclass." ;;
+esac
+
+inherit base eutils multilib toolchain-funcs
+
+export XDG_CONFIG_HOME="${T}"
+
+# @ECLASS-VARIABLE: LANGS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# In case your Qt4 application provides various translations, use this variable
+# to specify them in order to populate "linguas_*" IUSE automatically. Make sure
+# that you set this variable before inheriting qt4-r2 eclass.
+# Example:
+# @CODE
+#   LANGS="en el de"
+# @CODE
+for x in ${LANGS}; do
+	IUSE+=" linguas_${x}"
+done
+
+# @ECLASS-VARIABLE: LANGSLONG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Same as above, but this variable is for LINGUAS that must be in long format.
+# Remember to set this variable before inheriting qt4-r2 eclass.
+# Look at ${PORTDIR}/profiles/desc/linguas.desc for details.
+for x in ${LANGSLONG}; do
+	IUSE+=" linguas_${x%_*}"
+done
+unset x
+
+# @FUNCTION: qt4-r2_src_unpack
+# @DESCRIPTION:
+# Default src_unpack function for packages that depend on qt4. If you have to
+# override src_unpack in your ebuild (probably you don't need to), call
+# qt4-r2_src_unpack in it.
+qt4-r2_src_unpack() {
+	debug-print-function $FUNCNAME "$@"
+
+	# remove this block before pushing updates to the tree
+	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+		ewarn
+		ewarn "Please file bugs on bugs.gentoo.org and prepend the summary with"
+		ewarn "[qt overlay]. Alternatively, contact qt@gentoo.org."
+		ewarn "Thank you for using qt overlay."
+		ewarn
+	fi
+
+	base_src_unpack "$@"
+}
+
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# In case you have patches to apply, specify them here. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+# Example:
+# @CODE
+#   PATCHES=( "${FILESDIR}"/mypatch.patch
+#             "${FILESDIR}"/mypatch2.patch )
+# @CODE
+
+# @FUNCTION: qt4-r2_src_prepare
+# @DESCRIPTION:
+# Default src_prepare function for packages that depend on qt4. If you have to
+# override src_prepare in your ebuild, you should call qt4-r2_src_prepare in it,
+# otherwise autopatcher will not work!
+qt4-r2_src_prepare() {
+	debug-print-function $FUNCNAME "$@"
+
+	base_src_prepare "$@"
+}
+
+# @FUNCTION: qt4-r2_src_configure
+# @DESCRIPTION:
+# Default src_configure function for packages that depend on qt4. If you have to
+# override src_configure in your ebuild, call qt4-r2_src_configure in it.
+qt4-r2_src_configure() {
+	debug-print-function $FUNCNAME "$@"
+
+	local project_file=$(_find_project_file)
+
+	if [[ -n ${project_file} ]]; then
+		eqmake4 "${project_file}"
+	else
+		base_src_configure "$@"
+	fi
+}
+
+# @FUNCTION: qt4-r2_src_compile
+# @DESCRIPTION:
+# Default src_compile function for packages that depend on qt4. If you have to
+# override src_compile in your ebuild (probably you don't need to), call
+# qt4-r2_src_compile in it.
+qt4-r2_src_compile() {
+	debug-print-function $FUNCNAME "$@"
+
+	base_src_compile "$@"
+}
+
+# @ECLASS-VARIABLE: DOCS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Use this variable if you want to install any documentation.
+# Example:
+# @CODE
+#   DOCS="README AUTHORS"
+# @CODE
+
+# @ECLASS-VARIABLE: DOCSDIR
+# @DESCRIPTION:
+# Directory containing documentation, defaults to ${S}.
+
+# @FUNCTION: qt4-r2_src_install
+# @DESCRIPTION:
+# Default src_install function for qt4-based packages. Installs compiled code,
+# documentation (via DOCS variable) and translations (via LANGS and
+# LANGSLONG variables).
+qt4-r2_src_install() {
+	debug-print-function $FUNCNAME "$@"
+
+	emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "emake install failed"
+
+	# install documentation
+	local doc= dir=${DOCSDIR:-${S}}
+	for doc in ${DOCS}; do
+		dodoc "${dir}/${doc}" || die "dodoc failed"
+	done
+
+	# install translations # hwoarang: Is this valid for every package???
+	# need to have specified LANGS or LANGSLONG for this to work
+	[[ -n ${LANGS} || -n ${LANGSLONG} ]] && prepare_translations
+}
+
+# Internal function, used by eqmake4 and qt4-r2_src_configure
+# Look for project files:
+#   0 *.pro files found - output null string
+#   1 *.pro file found - output its name
+#   2 or more *.pro files found - if ${PN}.pro or $(basename ${S}).pro
+#     are there, output any of them
+# Outputs a project file argument used by eqmake4. Sets nullglob locally
+# to avoid expanding *.pro as "*.pro" when there are no matching files.
+_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
+}
+
+# @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
+# strong reasons to do things differently. During the building, qmake
+# will be automatically re-invoked with the right arguments on every
+# directory specified inside the top-level project file.
+eqmake4() {
+	[[ ${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 http://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;
+			}'
+	local file=
+	while read file; do
+		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)
+
+	"${EPREFIX}"/usr/bin/qmake \
+		-makefile \
+		QTDIR="${EPREFIX}"/usr/$(get_libdir) \
+		QMAKE="${EPREFIX}"/usr/bin/qmake \
+		QMAKE_CC="$(tc-getCC)" \
+		QMAKE_CXX="$(tc-getCXX)" \
+		QMAKE_LINK="$(tc-getCXX)" \
+		QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+		QMAKE_CFLAGS_DEBUG="${CFLAGS}" \
+		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+		QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \
+		QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
+		QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
+		QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
+		QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
+		QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
+		QMAKE_STRIP= \
+		"${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 http://bugs.gentoo.org/"
+		echo
+		die "eqmake4 failed"
+	fi
+
+	return 0
+}
+
+# Internal function
+_do_qm() {
+	debug-print-function $FUNCNAME "$@"
+	[[ $# -ne 2 ]] && die "$FUNCNAME requires exactly 2 arguments!"
+
+	local transfile="$(find "${1}" -type f -name "*${2}".qm)"
+	if [[ -f ${transfile} ]]; then
+		(
+			insinto /usr/share/${PN}/"${1#${S}}"
+			doins "${transfile}"
+		) || die "failed to install ${2} translation"
+	else
+		eerror
+		eerror "Failed to install ${2} translation: file not found."
+		eerror
+		die "failed to install ${2} translation"
+	fi
+}
+
+# @VARIABLE: TRANSLATIONSDIR
+# @DESCRIPTION: Translations directory. If not set, ${S} will be used
+
+# @FUNCTION: prepare_translations
+# @DESCRIPTION:
+# Choose and install translation files. Normally you don't need to call
+# this function directly as it is called from qt4-edge_src_install.
+prepare_translations() {
+	debug-print-function $FUNCNAME "$@"
+
+	# Find translations directory
+	# Changed default to . - crazy upstreams :)
+	local roottrdir="${TRANSLATIONSDIR:-${S}}" trdir=.
+	for dir in lang langs translations; do
+		[[ -d ${roottrdir}/${dir} ]] && trdir="${roottrdir}/${dir}"
+        done
+
+	local lang=
+	for lang in ${LINGUAS}; do
+		for x in ${LANGS}; do
+			[[ ${lang} == ${x%_*} ]] && _do_qm "${trdir}" ${x}
+		done
+		for x in ${LANGSLONG}; do
+			[[ ${lang} == ${x} ]] && _do_qm "${trdir}" ${x}
+		done
+	done
+}
+
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install

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

[Michael Palimaka]

commit:     05501d34f267aa802066ac22b12b3b6fae2d5b1f
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Sun Apr  1 18:02:54 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sun Apr  1 18:02:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=05501d34

[eclass] Remove deprecated qt4-ebuild-edge

---
 eclass/qt4-build-edge.eclass |  193 ------------------------------------------
 1 files changed, 0 insertions(+), 193 deletions(-)

diff --git a/eclass/qt4-build-edge.eclass b/eclass/qt4-build-edge.eclass
deleted file mode 100644
index 649e441..0000000
--- a/eclass/qt4-build-edge.eclass
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: qt4-build-edge.eclass
-# @MAINTAINER:
-# Qt herd <qt@gentoo.org>
-# @BLURB: Eclass for Qt4 split ebuilds in qt overlay.
-# @DESCRIPTION:
-# This eclass contains various functions that are used when building Qt4.
-
-# WARNING: This eclass requires EAPI 2, 3 or 4
-#
-# NOTES:
-#
-#	4.9999 and 4.?.9999[-kde-qt]
-#			stands for live ebuilds from qtsoftware's git repository
-#			(that is Nokia, previously trolltech)
-#	4.?.9999[kde-qt]
-#			stands for live ebuilds from kde-qt git repository
-#	4.*.*_{beta,rc,}* and *
-#			are official releases or snapshots from Nokia
-#
-
-MY_EGIT_COMMIT=${EGIT_COMMIT:=}
-
-inherit eutils git-2 qt4-build
-
-if [[ ${PV} == *.9999 ]]; then
-	SRC_URI=
-	DEPEND="dev-lang/perl"
-fi
-
-# @FUNCTION: qt4-build-edge_pkg_setup
-# @DESCRIPTION:
-# Sets up PATH, {,DY}LD_LIBRARY_PATH and EGIT_* variables.
-qt4-build-edge_pkg_setup() {
-	debug-print-function $FUNCNAME "$@"
-
-	MY_PV_EXTRA="${PV}"
-
-	case "${MY_PV_EXTRA}" in
-		4.?.9999)
-			EGIT_REPO_URI="git://gitorious.org/qt/qt.git"
-			EGIT_PROJECT="qt-${PV}"
-			EGIT_BRANCH="${MY_PV_EXTRA/.9999}"
-			;;
-		4.9999)
-			EGIT_REPO_URI="git://gitorious.org/qt/qt.git"
-			EGIT_PROJECT="qt-${PV}"
-			EGIT_BRANCH="master"
-			;;
-	esac
-
-	EGIT_COMMIT=${MY_EGIT_COMMIT:=${EGIT_BRANCH}}
-
-	# Let users know what they are getting themselves into ;-)
-	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-		echo
-		ewarn "Please file bugs on bugs.gentoo.org and prepend the summary"
-		ewarn "with [qt overlay]. Alternatively, contact <qt@gentoo.org>."
-		ewarn "Thank you for using qt overlay."
-		ewarn
-		case "${MY_PV_EXTRA}" in
-			4.?.9999 | 4.9999)
-				ewarn "The ${PV} version ebuilds install live git code from Nokia Qt Software."
-				;;
-			4.*.*_*)
-				ewarn "The ${PV} version ebuilds install a pre-release from Nokia Qt Software."
-				;;
-		esac
-		echo
-	fi
-
-	qt4-build_pkg_setup
-}
-
-# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
-# @DESCRIPTION:
-# Arguments for build_target_directories. Takes the directories in which the
-# code should be compiled. This is a space-separated list of relative paths.
-
-# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
-# @DESCRIPTION:
-# Space-separated list of directories that will be extracted from Qt tarball.
-
-# @FUNCTION: qt4-build-edge_src_unpack
-# @DESCRIPTION:
-# Unpacks the sources.
-qt4-build-edge_src_unpack() {
-	debug-print-function $FUNCNAME "$@"
-	setqtenv
-
-	local target= targets=
-	for target in configure LICENSE.{GPL3,LGPL} projects.pro \
-			src/{qbase,qt_targets,qt_install}.pri \
-			bin config.tests mkspecs qmake \
-			${QT4_EXTRACT_DIRECTORIES}; do
-		targets+=" ${MY_P}/${target}"
-	done
-
-	case "${PV}" in
-		*.9999)
-			git-2_src_unpack
-			;;
-		*)
-			echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
-			tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
-			;;
-	esac
-}
-
-# @ECLASS-VARIABLE: PATCHES
-# @DESCRIPTION:
-# In case you have patches to apply, specify them here. Make sure to specify
-# the full path. This variable is necessary for src_prepare phase.
-# Example:
-# PATCHES=( "${FILESDIR}"/mypatch.patch
-# "${FILESDIR}"/mypatch2.patch )
-
-# @FUNCTION: qt4-build-edge_src_prepare
-# @DESCRIPTION:
-# Prepares the sources before the configure phase. Strips C(XX)FLAGS if necessary, and fixes
-# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
-qt4-build-edge_src_prepare() {
-	debug-print-function $FUNCNAME "$@"
-	generate_include
-	# We need to remove any specific hardcoded compiler flags
-	sed -i -e '/^QMAKE_CFLAGS[^_.*]/s:\+=.*:=:' \
-		-e '/^QMAKE_CXXFLAGS[^_.*]/s:\+=.*:=:' \
-		-e '/^QMAKE_LFLAGS[^_.*]/s:\+=.*:=:' \
-		"${S}"/mkspecs/common/g++.conf
-
-	qt4-build_src_prepare
-}
-
-# @FUNCTION: qt4-build-edge_src_configure
-# @DESCRIPTION:
-# Runs ./configure with appropriate arguments. You can use
-# the ${myconf} variable to pass additional arguments.
-qt4-build-edge_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-	qt4-build_src_configure
-}
-
-# @FUNCTION: qt4-build-edge_src_compile
-# @DESCRIPTION:
-# Compiles the code in ${QT4_TARGET_DIRECTORIES}.
-qt4-build-edge_src_compile() {
-	debug-print-function $FUNCNAME "$@"
-	qt4-build_src_compile
-}
-
-# @FUNCTION: qt4-build-edge_src_install
-# @DESCRIPTION:
-# Performs the actual installation including some library fixes.
-qt4-build-edge_src_install() {
-	debug-print-function $FUNCNAME "$@"
-	qt4-build_src_install
-}
-
-# @FUNCTION: qt4-build-edge_src_test
-# @DESCRIPTION:
-# Runs make check in target directories only (required for live ebuilds).
-qt4-build-edge_src_test() {
-	debug-print-function $FUNCNAME "$@"
-	qt4-build_src_test
-}
-
-# @FUNCTION: qt4-build-edge_pkg_postrm
-# @DESCRIPTION:
-# Generates configuration when the package is completely removed.
-qt4-build-edge_pkg_postrm() {
-	debug-print-function $FUNCNAME "$@"
-	qt4-build_pkg_postrm
-}
-
-# @FUNCTION: qt4-build-edge_pkg_postinst
-# @DESCRIPTION:
-# Generates configuration after the package is installed.
-qt4-build-edge_pkg_postinst() {
-	debug-print-function $FUNCNAME "$@"
-	qt4-build_pkg_postinst
-}
-
-# @FUNCTION: generate_include
-# @DESCRIPTION:
-# Internal function, required for live ebuilds.
-generate_include() {
-	QTDIR="." perl bin/syncqt
-}
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

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

[Davide Pesavento]

commit:     efbb37fbd3df94148660e4417504f3b591633b8d
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Mar 31 12:20:52 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 12:20:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=efbb37fb

[qt4-build.eclass] Apply prefix fixes for qt 4.8, bug #407523.

---
 eclass/qt4-build.eclass |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index e3c60cf..78d699f 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -227,8 +227,9 @@ qt4-build_src_prepare() {
 	fi
 
 	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
-		# qmake bus errors with -O2 but -O3 works
-		replace-flags -O2 -O3
+		# qmake bus errors with -O2 or -O3 but -O1 works
+		# Bug 373061
+		replace-flags -O[23] -O1
 	fi
 
 	# Bug 178652
@@ -289,17 +290,31 @@ qt4-build_src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]]; then
 		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
 		# crippled (by design) :/
+		local mac_gpp_conf=
+		if [[ -f mkspecs/common/mac-g++.conf ]]; then
+			# qt < 4.8 has mac-g++.conf
+			mac_gpp_conf="mkspecs/common/mac-g++.conf"
+		elif [[ -f mkspecs/common/g++-macx.conf ]]; then
+			# qt >= 4.8 has g++-macx.conf
+			mac_gpp_conf="mkspecs/common/g++-macx.conf"
+		else
+			die "no known conf file for mac found"
+		fi
 		sed \
 			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
 			-e "s:-arch\s\w*::g" \
-			-i mkspecs/common/mac-g++.conf \
-			|| die "sed mkspecs/common/mac-g++.conf failed"
+			-i ${mac_gpp_conf} \
+			|| die "sed ${mac_gpp_conf} failed"
 
 		# Fix configure's -arch settings that appear in qmake/Makefile and also
 		# fix arch handling (automagically duplicates our -arch arg and breaks
 		# pch). Additionally disable Xarch support.
+		local mac_gcc_confs="${mac_gpp_conf}"
+		if [[ -f mkspecs/common/gcc-base-macx.conf ]]; then
+			mac_gcc_confs+=" mkspecs/common/gcc-base-macx.conf"
+		fi
 		sed \
 			-e "s:-arch i386::" \
 			-e "s:-arch ppc::" \
@@ -310,14 +325,14 @@ qt4-build_src_prepare() {
 			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
 			-e "s:-Xarch_x86_64::g" \
 			-e "s:-Xarch_ppc64::g" \
-			-i configure mkspecs/common/mac-g++.conf \
+			-i configure ${mac_gcc_confs} \
 			|| die "sed -arch/-Xarch failed"
 
 		# On Snow Leopard don't fall back to 10.5 deployment target.
 		if [[ ${CHOST} == *-apple-darwin10 ]]; then
 			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
 				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
-				-i configure mkspecs/common/mac-g++.conf \
+				-i configure ${mac_gpp_conf} \
 				|| die "sed deployment target failed"
 		fi
 	fi

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

[Davide Pesavento]

commit:     ad0d41c7708c73f94d49c58c873baa79d062450e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Mar 30 15:17:35 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 15:17:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ad0d41c7

Merged qt4-build and qt4-build-edge eclasses.

---
 eclass/qt4-build.eclass |  872 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 872 insertions(+), 0 deletions(-)

diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
new file mode 100644
index 0000000..e3c60cf
--- /dev/null
+++ b/eclass/qt4-build.eclass
@@ -0,0 +1,872 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.123 2012/03/08 14:24:40 pesa Exp $
+
+# @ECLASS: qt4-build.eclass
+# @MAINTAINER:
+# Qt herd <qt@gentoo.org>
+# @BLURB: Eclass for Qt4 split ebuilds.
+# @DESCRIPTION:
+# This eclass contains various functions that are used when building Qt4.
+
+case ${EAPI} in
+	2|3|4)	: ;;
+	*)	die "qt4-build.eclass requires EAPI 2, 3 or 4." ;;
+esac
+
+inherit base eutils flag-o-matic multilib toolchain-funcs versionator
+
+if [[ ${PV} == *9999* ]]; then
+	QT4_BUILD_TYPE="live"
+	inherit git-2
+else
+	QT4_BUILD_TYPE="release"
+fi
+
+HOMEPAGE="http://qt-project.org/ http://qt.nokia.com/"
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+
+MY_PV=${PV/_/-}
+MY_P=qt-everywhere-opensource-src-${MY_PV}
+
+case ${QT4_BUILD_TYPE} in
+	live)
+		EGIT_REPO_URI="git://gitorious.org/qt/qt.git
+			https://git.gitorious.org/qt/qt.git"
+		EGIT_BRANCH="${PV%.9999}"
+		;;
+	release)
+		SRC_URI="http://get.qt.nokia.com/qt/source/${MY_P}.tar.gz"
+		;;
+esac
+
+IUSE="aqua debug pch"
+if [[ ${CATEGORY}/${PN} != x11-libs/qt-xmlpatterns ]]; then
+	IUSE+=" +exceptions"
+fi
+if version_is_at_least 4.8; then
+	IUSE+=" c++0x qpa"
+fi
+
+DEPEND="dev-util/pkgconfig"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	DEPEND+=" dev-lang/perl"
+fi
+
+RDEPEND="
+	!<x11-libs/qt-assistant-${PV}
+	!>x11-libs/qt-assistant-${PV}-r9999
+	!<x11-libs/qt-core-${PV}
+	!>x11-libs/qt-core-${PV}-r9999
+	!<x11-libs/qt-dbus-${PV}
+	!>x11-libs/qt-dbus-${PV}-r9999
+	!<x11-libs/qt-declarative-${PV}
+	!>x11-libs/qt-declarative-${PV}-r9999
+	!<x11-libs/qt-demo-${PV}
+	!>x11-libs/qt-demo-${PV}-r9999
+	!<x11-libs/qt-gui-${PV}
+	!>x11-libs/qt-gui-${PV}-r9999
+	!<x11-libs/qt-multimedia-${PV}
+	!>x11-libs/qt-multimedia-${PV}-r9999
+	!<x11-libs/qt-opengl-${PV}
+	!>x11-libs/qt-opengl-${PV}-r9999
+	!<x11-libs/qt-openvg-${PV}
+	!>x11-libs/qt-openvg-${PV}-r9999
+	!<x11-libs/qt-phonon-${PV}
+	!>x11-libs/qt-phonon-${PV}-r9999
+	!<x11-libs/qt-qt3support-${PV}
+	!>x11-libs/qt-qt3support-${PV}-r9999
+	!<x11-libs/qt-script-${PV}
+	!>x11-libs/qt-script-${PV}-r9999
+	!<x11-libs/qt-sql-${PV}
+	!>x11-libs/qt-sql-${PV}-r9999
+	!<x11-libs/qt-svg-${PV}
+	!>x11-libs/qt-svg-${PV}-r9999
+	!<x11-libs/qt-test-${PV}
+	!>x11-libs/qt-test-${PV}-r9999
+	!<x11-libs/qt-webkit-${PV}
+	!>x11-libs/qt-webkit-${PV}-r9999
+	!<x11-libs/qt-xmlpatterns-${PV}
+	!>x11-libs/qt-xmlpatterns-${PV}-r9999
+"
+
+S=${WORKDIR}/${MY_P}
+
+# @FUNCTION: qt4-build_pkg_setup
+# @DESCRIPTION:
+# Sets up PATH and LD_LIBRARY_PATH.
+qt4-build_pkg_setup() {
+	[[ ${EAPI} == 2 ]] && use !prefix && EPREFIX=
+
+	# Protect users by not allowing downgrades between releases
+	# Downgrading revisions within the same release should be allowed
+	if has_version '>'${CATEGORY}/${P}-r9999; then
+		if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+			eerror
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror "  Downgrading Qt is completely unsupported and will break your system!"
+			eerror
+			die "aborting to save your system"
+		else
+			ewarn "Downgrading Qt is completely unsupported and will break your system!"
+		fi
+	fi
+
+	if [[ ${PN} == qt-webkit ]]; then
+		eshopts_push -s extglob
+		if is-flagq '-g?(gdb)?([1-9])'; then
+			echo
+			ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+			ewarn "You may experience really long compilation times and/or increased memory usage."
+			ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+			ewarn "For more info check out bug #307861"
+			echo
+		fi
+		eshopts_pop
+	fi
+
+	PATH="${S}/bin${PATH:+:}${PATH}"
+	if [[ ${CHOST} != *-darwin* ]]; then
+		LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+	else
+		DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"
+		# On MacOS we *need* at least src/gui/kernel/qapplication_mac.mm for
+		# platform detection. Note: needs to come before any directories to
+		# avoid extract failure.
+		[[ ${CHOST} == *-apple-darwin* ]] && \
+			QT4_EXTRACT_DIRECTORIES="src/gui/kernel/qapplication_mac.mm
+				${QT4_EXTRACT_DIRECTORIES}"
+	fi
+
+	if ! version_is_at_least 4.1 $(gcc-version); then
+		ewarn "Using a GCC version lower than 4.1 is not supported."
+	fi
+}
+
+# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
+# @DESCRIPTION:
+# Arguments for build_target_directories. Takes the directories in which the
+# code should be compiled. This is a space-separated list.
+
+# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
+# @DESCRIPTION:
+# Space-separated list including the directories that will be extracted from
+# Qt tarball.
+
+# @FUNCTION: qt4-build_src_unpack
+# @DESCRIPTION:
+# Unpacks the sources.
+qt4-build_src_unpack() {
+	setqtenv
+
+	case ${QT4_BUILD_TYPE} in
+		live)
+			git-2_src_unpack
+			;;
+		release)
+			local tarball="${MY_P}.tar.gz" target= targets=
+			for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
+				src/{qbase,qt_targets,qt_install}.pri bin config.tests \
+				mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
+			do
+				targets+="${MY_P}/${target} "
+			done
+
+			ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
+			tar -xzf "${DISTDIR}/${tarball}" ${targets}
+			eend $? || die "failed to unpack"
+			;;
+	esac
+}
+
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# PATCHES array variable containing all various patches to be applied.
+# This variable is expected to be defined in global scope of ebuild.
+# Make sure to specify the full path. This variable is utilised in
+# src_unpack/src_prepare phase, based on EAPI.
+#
+# @CODE
+#   PATCHES=( "${FILESDIR}/mypatch.patch"
+#             "${FILESDIR}/patches_folder/" )
+# @CODE
+
+# @FUNCTION: qt4-build_src_prepare
+# @DESCRIPTION:
+# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
+# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in /etc/make.conf.
+qt4-build_src_prepare() {
+	setqtenv
+
+	if [[ ${QT4_BUILD_TYPE} == live ]]; then
+		QTDIR="." ./bin/syncqt || die "syncqt failed"
+	fi
+
+	if version_is_at_least 4.7; then
+		# fix libX11 dependency on non X packages
+		local nolibx11_pkgs="qt-core qt-dbus qt-script qt-sql qt-test qt-xmlpatterns"
+		has ${PN} ${nolibx11_pkgs} && qt_nolibx11
+
+		qt_assistant_cleanup
+	fi
+
+	if use aqua; then
+		# provide a proper macx-g++-64
+		use x64-macos && ln -s macx-g++ mkspecs/$(qt_mkspecs_dir)
+
+		sed -e '/^CONFIG/s:app_bundle::' \
+			-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
+			-i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+	fi
+
+	if [[ ${PN} != qt-core ]]; then
+		skip_qmake_build
+		skip_project_generation
+		symlink_binaries_to_buildtree
+	fi
+
+	if [[ ${CHOST} == *86*-apple-darwin* ]]; then
+		# qmake bus errors with -O2 but -O3 works
+		replace-flags -O2 -O3
+	fi
+
+	# Bug 178652
+	if [[ $(gcc-major-version) == 3 ]] && use amd64; then
+		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"
+		append-flags -fno-gcse
+	fi
+
+	if use_if_iuse c++0x; then
+		echo
+		ewarn "You are about to build Qt4 using the C++11 standard. Even though"
+		ewarn "this is an official standard, some of the reverse dependencies"
+		ewarn "may fail to compile or link againt the Qt4 libraries. Before"
+		ewarn "reporting a bug, make sure your bug is reproducible with c++0x"
+		ewarn "disabled."
+		echo
+		append-flags -std=c++0x
+	fi
+
+	# Unsupported old gcc versions - hardened needs this :(
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		ewarn "Appending -fno-stack-protector to CXXFLAGS"
+		append-cxxflags -fno-stack-protector
+		# Bug 253127
+		sed -e "/^QMAKE_CFLAGS\t/ s:$: -fno-stack-protector-all:" \
+			-i mkspecs/common/g++.conf || die
+	fi
+
+	# Bug 261632
+	if use ppc64; then
+		ewarn "Appending -mminimal-toc to CFLAGS/CXXFLAGS"
+		append-flags -mminimal-toc
+	fi
+
+	# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
+	sed -e "/^SYSTEM_VARIABLES=/i \
+		CC='$(tc-getCC)'\n\
+		CXX='$(tc-getCXX)'\n\
+		CFLAGS='${CFLAGS}'\n\
+		CXXFLAGS='${CXXFLAGS}'\n\
+		LDFLAGS='${LDFLAGS}'\n" \
+		-i configure \
+		|| die "sed SYSTEM_VARIABLES failed"
+
+	# Respect CC, CXX, LINK and *FLAGS in config.tests
+	find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
+		sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \
+			'QMAKE_CC=$(tc-getCC)'    'QMAKE_CXX=$(tc-getCXX)'      'QMAKE_LINK=$(tc-getCXX)' \
+			'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
+		|| die "sed config.tests failed"
+
+	# Strip predefined CFLAGS from mkspecs (bug 312689)
+	sed -i -e '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf || die
+
+	# Bug 172219
+	sed -e 's:/X11R6/:/:' -i mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# Set FLAGS *and* remove -arch, since our gcc-apple is multilib
+		# crippled (by design) :/
+		sed \
+			-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+			-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+			-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
+			-e "s:-arch\s\w*::g" \
+			-i mkspecs/common/mac-g++.conf \
+			|| die "sed mkspecs/common/mac-g++.conf failed"
+
+		# Fix configure's -arch settings that appear in qmake/Makefile and also
+		# fix arch handling (automagically duplicates our -arch arg and breaks
+		# pch). Additionally disable Xarch support.
+		sed \
+			-e "s:-arch i386::" \
+			-e "s:-arch ppc::" \
+			-e "s:-arch x86_64::" \
+			-e "s:-arch ppc64::" \
+			-e "s:-arch \$i::" \
+			-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
+			-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
+			-e "s:-Xarch_x86_64::g" \
+			-e "s:-Xarch_ppc64::g" \
+			-i configure mkspecs/common/mac-g++.conf \
+			|| die "sed -arch/-Xarch failed"
+
+		# On Snow Leopard don't fall back to 10.5 deployment target.
+		if [[ ${CHOST} == *-apple-darwin10 ]]; then
+			sed -e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
+				-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
+				-i configure mkspecs/common/mac-g++.conf \
+				|| die "sed deployment target failed"
+		fi
+	fi
+
+	# this one is needed for all systems with a separate -liconv, apart from
+	# Darwin, for which the sources already cater for -liconv
+	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
+		sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
+			-i config.tests/unix/iconv/iconv.pro \
+			|| die "sed iconv.pro failed"
+	fi
+
+	# we need some patches for Solaris
+	sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
+		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+	# use GCC over SunStudio
+	sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
+	# do not flirt with non-Prefix stuff, we're quite possessive
+	sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
+		mkspecs/$(qt_mkspecs_dir)/qmake.conf || die
+
+	base_src_prepare
+}
+
+# @FUNCTION: qt4-build_src_configure
+# @DESCRIPTION:
+# Default configure phase
+qt4-build_src_configure() {
+	setqtenv
+
+	local conf="
+		-prefix ${QTPREFIXDIR}
+		-bindir ${QTBINDIR}
+		-libdir ${QTLIBDIR}
+		-docdir ${QTDOCDIR}
+		-headerdir ${QTHEADERDIR}
+		-plugindir ${QTPLUGINDIR}
+		$(version_is_at_least 4.7 && echo -importdir ${QTIMPORTDIR})
+		-datadir ${QTDATADIR}
+		-translationdir ${QTTRANSDIR}
+		-sysconfdir ${QTSYSCONFDIR}
+		-examplesdir ${QTEXAMPLESDIR}
+		-demosdir ${QTDEMOSDIR}
+		-opensource -confirm-license
+		-shared -fast -largefile -stl -verbose
+		-nomake examples -nomake demos"
+
+	# ARCH is set on Gentoo. Qt now falls back to generic on an unsupported
+	# $(tc-arch). Therefore we convert it to supported values.
+	case "$(tc-arch)" in
+		amd64|x64-*)		  conf+=" -arch x86_64" ;;
+		ppc-macos)		  conf+=" -arch ppc" ;;
+		ppc|ppc64|ppc-*)	  conf+=" -arch powerpc" ;;
+		sparc|sparc-*|sparc64-*)  conf+=" -arch sparc" ;;
+		x86-macos)		  conf+=" -arch x86" ;;
+		x86|x86-*)		  conf+=" -arch i386" ;;
+		alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;;
+		hppa|sh)		  conf+=" -arch generic" ;;
+		*) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;;
+	esac
+
+	conf+=" -platform $(qt_mkspecs_dir)"
+
+	[[ $(get_libdir) != lib ]] && conf+=" -L${EPREFIX}/usr/$(get_libdir)"
+
+	# debug/release
+	if use debug; then
+		conf+=" -debug"
+	else
+		conf+=" -release"
+	fi
+	conf+=" -no-separate-debug-info"
+
+	# exceptions USE flag
+	conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)"
+
+	# disable RPATH on Qt >= 4.8 (bug 380415)
+	version_is_at_least 4.8 && conf+=" -no-rpath"
+
+	# precompiled headers don't work on hardened, where the flag is masked
+	conf+=" $(qt_use pch)"
+
+	# -reduce-relocations
+	# This flag seems to introduce major breakage to applications,
+	# mostly to be seen as a core dump with the message "QPixmap: Must
+	# construct a QApplication before a QPaintDevice" on Solaris.
+	#   -- Daniel Vergien
+	[[ ${CHOST} != *-solaris* ]] && conf+=" -reduce-relocations"
+
+	# this one is needed for all systems with a separate -liconv, apart from
+	# Darwin, for which the sources already cater for -liconv
+	if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
+		conf+=" -liconv"
+	fi
+
+	if use_if_iuse glib; then
+		local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)"
+		# avoid the -pthread argument
+		conf+=" ${glibflags//-pthread}"
+		unset glibflags
+	fi
+
+	if use_if_iuse qpa; then
+		echo
+		ewarn "The qpa useflag enables the Qt Platform Abstraction, formely"
+		ewarn "known as Qt Lighthouse. If you are not sure what that is, then"
+		ewarn "disable it before reporting any bugs related to this useflag."
+		echo
+		conf+=" -qpa"
+	fi
+
+	if use aqua; then
+		# On (snow) leopard use the new (frameworked) cocoa code.
+		if [[ ${CHOST##*-darwin} -ge 9 ]]; then
+			conf+=" -cocoa -framework"
+			# We need the source's headers, not the installed ones.
+			conf+=" -I${S}/include"
+			# Add hint for the framework location.
+			conf+=" -F${QTLIBDIR}"
+
+			# We are crazy and build cocoa + qt3support :-)
+			if use qt3support; then
+				sed -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
+					-i configure || die
+			fi
+		else
+			conf+=" -no-framework"
+		fi
+	else
+		# freetype2 include dir is non-standard, thus pass it to configure
+		conf+=" $(pkg-config --cflags-only-I freetype2)"
+	fi
+
+	conf+=" ${myconf}"
+	myconf=
+
+	echo ./configure ${conf}
+	./configure ${conf} || die "./configure failed"
+
+	prepare_directories ${QT4_TARGET_DIRECTORIES}
+}
+
+# @FUNCTION: qt4-build_src_compile
+# @DESCRIPTION:
+# Actual compile phase
+qt4-build_src_compile() {
+	setqtenv
+
+	build_directories ${QT4_TARGET_DIRECTORIES}
+}
+
+# @FUNCTION: qt4-build_src_test
+# @DESCRIPTION:
+# Runs tests only in target directories.
+qt4-build_src_test() {
+	# QtMultimedia does not have any test suite (bug #332299)
+	[[ ${PN} == qt-multimedia ]] && return
+
+	for dir in ${QT4_TARGET_DIRECTORIES}; do
+		emake -j1 check -C ${dir}
+	done
+}
+
+# @FUNCTION: fix_includes
+# @DESCRIPTION:
+# For MacOS X we need to add some symlinks when frameworks are
+# being used, to avoid complications with some more or less stupid packages.
+fix_includes() {
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		# Some packages tend to include <Qt/...>
+		dodir "${QTHEADERDIR#${EPREFIX}}"/Qt
+
+		# Fake normal headers when frameworks are installed... eases life later on
+		local dest f h
+		for frw in "${D}${QTLIBDIR}"/*.framework; do
+			[[ -e "${frw}"/Headers ]] || continue
+			f=$(basename ${frw})
+			dest="${QTHEADERDIR#${EPREFIX}}"/${f%.framework}
+			dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers "${dest}"
+
+			# Link normal headers as well.
+			for hdr in "${D}/${QTLIBDIR}/${f}"/Headers/*; do
+				h=$(basename ${hdr})
+				dosym "${QTLIBDIR#${EPREFIX}}"/${f}/Headers/${h} "${QTHEADERDIR#${EPREFIX}}"/Qt/${h}
+			done
+		done
+	fi
+}
+
+# @FUNCTION: qt4-build_src_install
+# @DESCRIPTION:
+# Perform the actual installation including some library fixes.
+qt4-build_src_install() {
+	[[ ${EAPI} == 2 ]] && use !prefix && ED=${D}
+	setqtenv
+
+	install_directories ${QT4_TARGET_DIRECTORIES}
+	install_qconfigs
+	fix_library_files
+	fix_includes
+
+	# remove .la files since we are building only shared Qt libraries
+	find "${D}"${QTLIBDIR} -type f -name '*.la' -print0 | xargs -0 rm -f
+}
+
+# @FUNCTION: setqtenv
+# @INTERNAL
+setqtenv() {
+	# Set up installation directories
+	QTPREFIXDIR=${EPREFIX}/usr
+	QTBINDIR=${EPREFIX}/usr/bin
+	QTLIBDIR=${EPREFIX}/usr/$(get_libdir)/qt4
+	QTPCDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
+	QTDOCDIR=${EPREFIX}/usr/share/doc/qt-${PV}
+	QTHEADERDIR=${EPREFIX}/usr/include/qt4
+	QTPLUGINDIR=${QTLIBDIR}/plugins
+	QTIMPORTDIR=${QTLIBDIR}/imports
+	QTDATADIR=${EPREFIX}/usr/share/qt4
+	QTTRANSDIR=${QTDATADIR}/translations
+	QTSYSCONFDIR=${EPREFIX}/etc/qt4
+	QTEXAMPLESDIR=${QTDATADIR}/examples
+	QTDEMOSDIR=${QTDATADIR}/demos
+	QMAKE_LIBDIR_QT=${QTLIBDIR}
+	QT_INSTALL_PREFIX=${EPREFIX}/usr/$(get_libdir)/qt4
+
+	PLATFORM=$(qt_mkspecs_dir)
+
+	unset QMAKESPEC
+}
+
+# @FUNCTION: prepare_directories
+# @USAGE: < directories >
+# @INTERNAL
+# @DESCRIPTION:
+# Generates Makefiles for the given list of directories.
+prepare_directories() {
+	for x in "$@"; do
+		pushd "${S}"/${x} >/dev/null || die
+		einfo "Running qmake in: ${x}"
+		# avoid running over the maximum argument number, bug #299810
+		{
+			echo "${S}"/mkspecs/common/*.conf
+			find "${S}" -name '*.pr[io]'
+		} | xargs sed -i \
+			-e "s:\$\$\[QT_INSTALL_LIBS\]:${QTLIBDIR}:g" \
+			-e "s:\$\$\[QT_INSTALL_PLUGINS\]:${QTPLUGINDIR}:g" \
+			|| die
+		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
+		popd >/dev/null || die
+	done
+}
+
+
+# @FUNCTION: build_directories
+# @USAGE: < directories >
+# @INTERNAL
+# @DESCRIPTION:
+# Compiles the code in the given list of directories.
+build_directories() {
+	for x in "$@"; do
+		pushd "${S}"/${x} >/dev/null || die
+		emake CC="$(tc-getCC)" \
+			CXX="$(tc-getCXX)" \
+			LINK="$(tc-getCXX)" || die "emake failed"
+		popd >/dev/null || die
+	done
+}
+
+# @FUNCTION: install_directories
+# @USAGE: < directories >
+# @INTERNAL
+# @DESCRIPTION:
+# Runs emake install in the given directories, which are separated by spaces.
+install_directories() {
+	for x in "$@"; do
+		pushd "${S}"/${x} >/dev/null || die
+		emake INSTALL_ROOT="${D}" install || die "emake install failed"
+		popd >/dev/null || die
+	done
+}
+
+# @ECLASS-VARIABLE: QCONFIG_ADD
+# @DESCRIPTION:
+# List options that need to be added to QT_CONFIG in qconfig.pri
+: ${QCONFIG_ADD:=}
+
+# @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DESCRIPTION:
+# List options that need to be removed from QT_CONFIG in qconfig.pri
+: ${QCONFIG_REMOVE:=}
+
+# @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DESCRIPTION:
+# List variables that should be defined at the top of QtCore/qconfig.h
+: ${QCONFIG_DEFINE:=}
+
+# @FUNCTION: install_qconfigs
+# @INTERNAL
+# @DESCRIPTION:
+# Install gentoo-specific mkspecs configurations.
+install_qconfigs() {
+	local x
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
+		for x in QCONFIG_ADD QCONFIG_REMOVE; do
+			[[ -n ${!x} ]] && echo ${x}=${!x} >> "${T}"/${PN}-qconfig.pri
+		done
+		insinto ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo
+		doins "${T}"/${PN}-qconfig.pri || die "installing ${PN}-qconfig.pri failed"
+	fi
+
+	if [[ -n ${QCONFIG_DEFINE} ]]; then
+		for x in ${QCONFIG_DEFINE}; do
+			echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
+		done
+		insinto ${QTHEADERDIR#${EPREFIX}}/Gentoo
+		doins "${T}"/gentoo-${PN}-qconfig.h || die "installing ${PN}-qconfig.h failed"
+	fi
+}
+
+# @FUNCTION: generate_qconfigs
+# @INTERNAL
+# @DESCRIPTION:
+# Generates gentoo-specific qconfig.{h,pri}.
+generate_qconfigs() {
+	if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qt-core ]]; then
+		local x qconfig_add qconfig_remove qconfig_new
+		for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
+			[[ -f ${x} ]] || continue
+			qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
+			qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
+		done
+
+		# these error checks do not use die because dying in pkg_post{inst,rm}
+		# just makes things worse.
+		if [[ -e "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
+			# start with the qconfig.pri that qt-core installed
+			if ! cp "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qconfig.pri \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
+				eerror "cp qconfig failed."
+				return 1
+			fi
+
+			# generate list of QT_CONFIG entries from the existing list
+			# including qconfig_add and excluding qconfig_remove
+			for x in $(sed -n 's/^QT_CONFIG +=//p' \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
+					has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
+			done
+
+			# replace the existing QT_CONFIG list with qconfig_new
+			if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
+				"${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri; then
+				eerror "Sed for QT_CONFIG failed"
+				return 1
+			fi
+
+			# create Gentoo/qconfig.h
+			if [[ ! -e ${ROOT}${QTHEADERDIR}/Gentoo ]]; then
+				if ! mkdir -p "${ROOT}${QTHEADERDIR}"/Gentoo; then
+					eerror "mkdir ${QTHEADERDIR}/Gentoo failed"
+					return 1
+				fi
+			fi
+			: > "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			for x in "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
+				[[ -f ${x} ]] || continue
+				cat "${x}" >> "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			done
+		else
+			rm -f "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri
+			rm -f "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qconfig.h
+			rmdir "${ROOT}${QTDATADIR}"/mkspecs \
+				"${ROOT}${QTDATADIR}" \
+				"${ROOT}${QTHEADERDIR}"/Gentoo \
+				"${ROOT}${QTHEADERDIR}" 2>/dev/null
+		fi
+	fi
+}
+
+# @FUNCTION: qt4-build_pkg_postrm
+# @DESCRIPTION:
+# Regenerate configuration when the package is completely removed.
+qt4-build_pkg_postrm() {
+	generate_qconfigs
+}
+
+# @FUNCTION: qt4-build_pkg_postinst
+# @DESCRIPTION:
+# Regenerate configuration, plus throw a message about possible
+# breakages and proposed solutions.
+qt4-build_pkg_postinst() {
+	generate_qconfigs
+}
+
+# @FUNCTION: skip_qmake_build
+# @INTERNAL
+# @DESCRIPTION:
+# Patches configure to skip qmake compilation, as it's already installed by qt-core.
+skip_qmake_build() {
+	sed -i -e "s:if true:if false:g" "${S}"/configure || die
+}
+
+# @FUNCTION: skip_project_generation
+# @INTERNAL
+# @DESCRIPTION:
+# Exit the script early by throwing in an exit before all of the .pro files are scanned.
+skip_project_generation() {
+	sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die
+}
+
+# @FUNCTION: symlink_binaries_to_buildtree
+# @INTERNAL
+# @DESCRIPTION:
+# Symlinks generated binaries to buildtree, so they can be used during compilation time.
+symlink_binaries_to_buildtree() {
+	for bin in qmake moc uic rcc; do
+		ln -s "${QTBINDIR}"/${bin} "${S}"/bin/ || die "symlinking ${bin} to ${S}/bin failed"
+	done
+}
+
+# @FUNCTION: fix_library_files
+# @INTERNAL
+# @DESCRIPTION:
+# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
+# moves the *.pc files into the pkgconfig directory.
+fix_library_files() {
+	local libfile
+	for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
+		if [[ -e ${libfile} ]]; then
+			sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
+		fi
+	done
+
+	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations
+	for libfile in "${D}"/${QTLIBDIR}/pkgconfig/*.pc; do
+		if [[ -e ${libfile} ]]; then
+			sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
+
+		# Move .pc files into the pkgconfig directory
+		dodir ${QTPCDIR#${EPREFIX}}
+		mv ${libfile} "${D}"/${QTPCDIR}/ || die "moving ${libfile} to ${D}/${QTPCDIR}/ failed"
+		fi
+	done
+
+	# Don't install an empty directory
+	rmdir "${D}"/${QTLIBDIR}/pkgconfig
+}
+
+# @FUNCTION: qt_use
+# @USAGE: < flag > [ feature ] [ enableval ]
+# @DESCRIPTION:
+# This will echo "-${enableval}-${feature}" if <flag> is enabled, or
+# "-no-${feature}" if it's disabled. If [feature] is not specified, <flag>
+# will be used for that. If [enableval] is not specified, it omits the
+# "-${enableval}" part.
+qt_use() {
+	use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+}
+
+# @FUNCTION: qt_mkspecs_dir
+# @RETURN: the specs-directory w/o path
+# @DESCRIPTION:
+# Allows us to define which mkspecs dir we want to use.
+qt_mkspecs_dir() {
+	local spec=
+
+	case "${CHOST}" in
+		*-freebsd*|*-dragonfly*)
+			spec=freebsd ;;
+		*-openbsd*)
+			spec=openbsd ;;
+		*-netbsd*)
+			spec=netbsd ;;
+		*-darwin*)
+			if use aqua; then
+				# mac with carbon/cocoa
+				spec=macx
+			else
+				# darwin/mac with x11
+				spec=darwin
+			fi
+			;;
+		*-solaris*)
+			spec=solaris ;;
+		*-linux-*|*-linux)
+			spec=linux ;;
+		*)
+			die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;;
+	esac
+
+	case "$(tc-getCXX)" in
+		*g++*)
+			spec+=-g++ ;;
+		*icpc*)
+			spec+=-icc ;;
+		*)
+			die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;;
+	esac
+
+	# Add -64 for 64bit profiles
+	if use x64-freebsd ||
+		use amd64-linux ||
+		use x64-macos ||
+		use x64-solaris ||
+		use sparc64-solaris
+	then
+		spec+=-64
+	fi
+
+	echo "${spec}"
+}
+
+# @FUNCTION: qt_assistant_cleanup
+# @INTERNAL
+# @DESCRIPTION:
+# Tries to clean up tools.pro for qt-assistant ebuilds.
+# Meant to be called in src_prepare().
+# Since Qt 4.7.4 this function is a no-op.
+qt_assistant_cleanup() {
+	# apply patching to qt-assistant ebuilds only
+	[[ ${PN} != qt-assistant ]] && return
+
+	# no longer needed for 4.7.4 and later
+	version_is_at_least 4.7.4 && return
+
+	# different versions (and branches...) may need different handling,
+	# add a case if you need special handling
+	case "${MY_PV_EXTRA}" in
+		*kde-qt*)
+			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
+				-e "/mac/,/^embedded.*makeqpf$/d" \
+				-i tools/tools.pro || die "patching tools.pro failed"
+		;;
+		*)
+			sed -e "/^[ \t]*porting/,/^[ \t]*win32.*activeqt$/d" \
+				-e "/mac/,/^embedded.*makeqpf$/d" \
+				-e "s/^\([ \t]*pixeltool\) /\1 qdoc3 /" \
+				-i tools/tools.pro || die "patching tools.pro failed"
+		;;
+	esac
+}
+
+# @FUNCTION: qt_nolibx11
+# @INTERNAL
+# @DESCRIPTION:
+# Ignore X11 tests for packages that don't need X libraries installed.
+qt_nolibx11() {
+	sed -i "/unixtests\/compile.test.*config.tests\/x11\/xlib/,/fi$/d" "${S}"/configure ||
+		die "x11 check sed failed"
+}
+
+EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_install src_test pkg_postrm pkg_postinst

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

[Davide Pesavento]

commit:     338b6cac2730d05ea06ef2d48c71c0ddb2d780ce
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Mar 25 17:12:04 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 17:12:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=338b6cac

[qt4-edge.eclass] _do_qm(): use insinto instead of INSDESTTREE.

---
 eclass/qt4-edge.eclass |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-edge.eclass b/eclass/qt4-edge.eclass
index 58bbea0..eb591bc 100644
--- a/eclass/qt4-edge.eclass
+++ b/eclass/qt4-edge.eclass
@@ -83,15 +83,16 @@ _do_qm() {
 	[[ $# -ne 2 ]] && die "$FUNCNAME requires exactly 2 arguments!"
 
 	local transfile="$(find "${1}" -type f -name "*${2}".qm)"
-	if [[ -e ${transfile} ]]; then
-		INSDESTTREE="/usr/share/${PN}/${1#${S}}" \
-			doins "${transfile}" \
-			|| die "failed to install ${2} translation"
+	if [[ -f ${transfile} ]]; then
+		(
+			insinto /usr/share/${PN}/"${1#${S}}"
+			doins "${transfile}"
+		) || die "failed to install ${2} translation"
 	else
 		eerror
-		eerror "Failed to install ${2} translation. Contact eclass maintainer."
+		eerror "Failed to install ${2} translation: file not found."
 		eerror
-		die "Failed to install translations"
+		die "failed to install ${2} translation"
 	fi
 }
 

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

[Markos Chandras]

commit:     333021c02d661de4b75b2387a24a1893e9a0c8ce
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 23:08:34 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 23:10:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=333021c0

qt4-build-edge: Eclass now supports EAPI4 as well

---
 eclass/qt4-build-edge.eclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-build-edge.eclass b/eclass/qt4-build-edge.eclass
index ac08d1f..e07e65d 100644
--- a/eclass/qt4-build-edge.eclass
+++ b/eclass/qt4-build-edge.eclass
@@ -9,7 +9,7 @@
 # @DESCRIPTION:
 # This eclass contains various functions that are used when building Qt4.
 
-# WARNING: This eclass requires EAPI=2 or EAPI=3
+# WARNING: This eclass requires EAPI 2, 3 or 4
 #
 # NOTES:
 #