[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/

["Johannes Huber" <johu@gentoo.org>]

commit:     454ff99f4be796b36686e042ac4ff9259bfc1f87
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 19:47:03 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 19:47:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=454ff99f

[dev-qt/qtcore] Revision bump adds upstream patch to unbreak cmake qt5 builds.

Package-Manager: portage-2.2.7

---
 .../qtcore-5.2.0_beta1-cmake-regression.patch      | 58 ++++++++++++++++++++++
 dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild         | 56 +++++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/dev-qt/qtcore/files/qtcore-5.2.0_beta1-cmake-regression.patch b/dev-qt/qtcore/files/qtcore-5.2.0_beta1-cmake-regression.patch
new file mode 100644
index 0000000..597c004
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.2.0_beta1-cmake-regression.patch
@@ -0,0 +1,58 @@
+From c0e826e244632d340d4bd4892ba450d19a70fca2 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <stephen.kelly@kdab.com>
+Date: Thu, 24 Oct 2013 15:14:59 +0200
+Subject: [PATCH] Set PRIVATE includes variable to empty, not undefined.
+
+This is necessary so that list(REMOVE_DUPLICATES) works properly.
+
+Change-Id: Id268637d76b1a8785c9ff0c6e09e9ad8a62bbfb6
+Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
+---
+ .../features/data/cmake/Qt5BasicConfig.cmake.in    |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 0cdaafe..296ea2c 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -95,7 +95,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+@@ -106,7 +106,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ELSE
+     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_INCLUDE_DIR}Qt$${CMAKE_MODULE_NAME}\")
+@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+         \"$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
+     )
+ !!ELSE
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ !!ENDIF
+ !!ENDIF
+@@ -124,8 +124,8 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+     include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
+ !!ENDIF
+ !!ELSE
+-    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS)
+-    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS)
++    set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"\")
++    set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
+ !!ENDIF
+ 
+     foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS})
+-- 
+1.7.1
+

diff --git a/dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild b/dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild
new file mode 100644
index 0000000..48f1a41
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.2.0_beta1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+QT5_MODULE="qtbase"
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+glib icu"
+
+DEPEND="
+	>=dev-libs/libpcre-8.30[pcre16]
+	sys-libs/zlib
+	virtual/libiconv
+	glib? ( dev-libs/glib:2 )
+	icu? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+)
+QCONFIG_DEFINE=( QT_ZLIB )
+
+PATCHES=( "${FILESDIR}/${P}-cmake-regression.patch" )
+
+pkg_setup() {
+	QCONFIG_REMOVE=(
+		$(usev !glib)
+		$(usev !icu)
+	)
+
+	qt5-build_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		$(qt_use glib)
+		-iconv
+		$(qt_use icu)
+	)
+	qt5-build_src_configure
+}