subject:"\[gentoo\-commits\] proj\/qt\:master commit in\: dev\-qt\/qtcore\/"

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

2024-01-03 Thread Andreas Sturmlechner

commit: a1d53ef41a21b8db0e76709500df8c0b7ae61038
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  1 13:56:48 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  3 21:09:19 2024 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1d53ef4

dev-qt/qtcore: Add wall of blockers against <${QT5_PV}

Revdeps can drop dev-qt/* dependencies on version bumps at any time, which then
may lead to Portage disregarding these dev-qt/* packages for upgrade if nothing
is left depending on them. When these packages contain Qt5 plugins it breaks
runtime hard - broken screenlocker, blank login manager, ... -, with:

`Cannot mix incompatible Qt library (5.15.10) with this library (5.15.11)`

We've had this happen with dev-qt/qtvirtualkeyboard and dev-qt/qtcharts already
and gradual porting to Qt6 ensures it will happen more often in the future.

Package groups (https://bugs.gentoo.org/918873) are not effective here as it
concerns ::installed package set.

For lack of a better mechanism from the package manager, these blockers make
sure dep calculation will take care of the necessary cleanup of dangling Qt5
packages, even if it will not improve our backtracking situation.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.12..ebuild | 45 +++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtcore/qtcore-5.15.12..ebuild 
b/dev-qt/qtcore/qtcore-5.15.12..ebuild
index 36a727a0..d5a3c424 100644
--- a/dev-qt/qtcore/qtcore-5.15.12..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.12..ebuild
@@ -24,7 +24,50 @@ DEPEND="
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !

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

2023-10-08 Thread Andreas Sturmlechner

commit: ec1cae0ebc814755c9cf1dd5b5a70d1777d422b8
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug  6 11:41:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  8 15:20:41 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ec1cae0e

dev-qt/qtcore: use tc-enables-fortify-source

Better than fragile optimisation level checking.

Bug: https://bugs.gentoo.org/841770
Bug: https://bugs.gentoo.org/847145
Bug: https://bugs.gentoo.org/852974
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.11..ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.15.11..ebuild 
b/dev-qt/qtcore/qtcore-5.15.11..ebuild
index fdea7264..36a727a0 100644
--- a/dev-qt/qtcore/qtcore-5.15.11..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.11..ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != ** ]]; then
 fi
 
 QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
+inherit linux-info flag-o-matic toolchain-funcs qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
@@ -59,6 +59,7 @@ src_prepare() {
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
 
# Broken with FORTIFY_SOURCE=3
+   #
# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
# to unset F_S first, then explicitly set 2, to negate any default
# and anything set by the user if they're choosing 3 (or if they've
@@ -69,7 +70,7 @@ src_prepare() {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
# https://bugreports.qt.io/browse/QTBUG-103782
# bug #847145
-   if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+   if tc-enables-fortify-source ; then
# We can't unconditionally do this b/c we fortify needs
# some level of optimisation.
filter-flags -D_FORTIFY_SOURCE=3

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

2023-10-07 Thread Andreas Sturmlechner

commit: 90cdaecb147ae4a583b777692817409ef5945265
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Sep  7 23:00:25 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct  7 16:07:48 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=90cdaecb

dev-qt/qtcore: remove IUSE=systemd

This is to control where log messages will be sent by default, and
I think enabling this is just going to be confusing. Off-by-default
(even if found), and cmake gives a warning that we should do special
handling for it. Plus no parity for openrc given we were not enabling
syslog as alternative.

Have not looked much, but not seem most distros enable this.

Signed-off-by: Ionen Wolkens  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/metadata.xml   | 1 -
 dev-qt/qtcore/qtcore-5.15.11..ebuild | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index eac86fb8..2bc45aff 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -7,7 +7,6 @@


Disable syscalls not available on Linux 
kernels older than 4.11
-   Enable native journald logging 
support


https://bugreports.qt.io/

diff --git a/dev-qt/qtcore/qtcore-5.15.11..ebuild 
b/dev-qt/qtcore/qtcore-5.15.11..ebuild
index 3478e067..fdea7264 100644
--- a/dev-qt/qtcore/qtcore-5.15.11..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.11..ebuild
@@ -14,7 +14,7 @@ inherit linux-info flag-o-matic qt5-build
 DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
-IUSE="icu old-kernel systemd"
+IUSE="icu old-kernel"
 
 DEPEND="
dev-libs/double-conversion:=
@@ -23,7 +23,6 @@ DEPEND="
sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
-   systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
 
@@ -88,7 +87,6 @@ src_configure() {
local myconf=(
$(qt_use icu)
$(qt_use !icu iconv)
-   $(qt_use systemd journald)
)
use old-kernel && myconf+=(
-no-feature-renameat2 # needs Linux 3.16, bug 669994

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

2023-09-03 Thread Andreas Sturmlechner

commit: d105bdeb2221778d76fd1a8241b1a8ea356fbce6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  5 23:46:28 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  3 08:00:43 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d105bdeb

dev-qt/qtcore: Drop obsolete metadata

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/metadata.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 44b12b34..eac86fb8 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,8 +6,7 @@
Gentoo Qt Project


-   Disable syscalls not available on Linux 
kernels older than 3.17
-   Disable syscalls not available on Linux 
kernels older than 4.11
+   Disable syscalls not available on Linux 
kernels older than 4.11
Enable native journald logging 
support

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

2023-06-22 Thread Andreas Sturmlechner

commit: 4c9d2129b757f5e10e73a9d5e25994542c3e9d07
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 18 17:30:44 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 22 15:53:37 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4c9d2129

dev-qt/qtcore: Make use of qt5_syncqt_version()

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.10..ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-5.15.10..ebuild 
b/dev-qt/qtcore/qtcore-5.15.10..ebuild
index e8431443..3478e067 100644
--- a/dev-qt/qtcore/qtcore-5.15.10..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.10..ebuild
@@ -79,6 +79,9 @@ src_prepare() {
fi
 
qt5-build_src_prepare
+
+   # workaround for a79a370c (...Annotate-QMutex-...patch) adding a header
+   qt5_syncqt_version
 }
 
 src_configure() {

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

2022-06-18 Thread Andreas Sturmlechner

commit: bce861717d5120f95d17eec6ce9d672ae791e80c
Author: Sam James  gentoo  org>
AuthorDate: Wed May 25 23:10:33 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 18 14:21:22 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bce86171

dev-qt/qtcore: add FORTIFY_SOURCE=3 workaround (force back to =2)

As discussed with asturm until we know what's happening with
the upstream bug. We can consider the opensuse patch once
that's resolved, if the upstream fix isn't made public, almost
certainly via KDE Qt5PatchCollection. But we'll see.

Bug: https://bugs.gentoo.org/847145
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.5..ebuild | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtcore/qtcore-5.15.5..ebuild 
b/dev-qt/qtcore/qtcore-5.15.5..ebuild
index 84966e24..1f4a57ff 100644
--- a/dev-qt/qtcore/qtcore-5.15.5..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5..ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 QT5_MODULE="qtbase"
-inherit linux-info qt5-build
+inherit linux-info flag-o-matic qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
@@ -58,6 +58,25 @@ src_prepare() {
# fix missing qt_version_tag symbol w/ LTO, bug 674382
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
 
+   # Broken with FORTIFY_SOURCE=3
+   # Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+   # to unset F_S first, then explicitly set 2, to negate any default
+   # and anything set by the user if they're choosing 3 (or if they've
+   # modified GCC to set 3).
+   #
+   # Refs:
+   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
+   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
+   # https://bugreports.qt.io/browse/QTBUG-103782
+   # bug #847145
+   if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+   # We can't unconditionally do this b/c we fortify needs
+   # some level of optimisation.
+   filter-flags -D_FORTIFY_SOURCE=3
+   # (Qt doesn't seem to respect CPPFLAGS?)
+   append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+   fi
+
qt5-build_src_prepare
 }

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

2022-06-15 Thread Andreas Sturmlechner

commit: f53329f738bfbd9ce93be632a5da4a0bd5767272
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 14 11:41:24 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 14 18:21:17 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f53329f7

dev-qt/qtcore: Cleanup and make use of gentoo-patchset

Ends the which-hunt.

Bug: https://bugs.gentoo.org/828100
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/Manifest |  1 +
 ...qtcore-5.14.1-cmake-macro-backward-compat.patch | 50 --
 dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch| 41 --
 dev-qt/qtcore/qtcore-5.15.4..ebuild|  5 ---
 4 files changed, 1 insertion(+), 96 deletions(-)

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
new file mode 100644
index ..1e41118d
--- /dev/null
+++ b/dev-qt/qtcore/Manifest
@@ -0,0 +1 @@
+DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 
1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd
 SHA512 
c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f

diff --git 
a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch 
b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc3..
--- a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner 
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an 
additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used 
(at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard 
and qtwayland.
-During upgrade from =Qt-5.14, as a consequence of slot upgrade 
rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have 
been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the 
_populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be 
added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For 
debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only 
debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of 
CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a 
Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make 
IsDebugAndRelease
-optional and default to FALSE.
-
 a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in  2020-01-23 
13:37:32.0 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in  2020-02-09 
15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
- 
- file(GLOB pluginTargets 
\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
- 
--macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin 
Configuration PLUGIN_LOCATION
--  IsDebugAndRelease)
-+macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin 
Configuration PLUGIN_LOCATION)
-+set(IsDebugAndRelease FALSE)
-+set (list_var ${ARGN})
-+list(LENGTH list_var num_extra_arg)
-+if (${num_extra_arg} GREATER 0)
-+list(GET list_var 0 IsDebugAndRelease)
-+endif()
-+
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY 
IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch 
b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
deleted file mode 100644
index c83c59ac..
--- a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# Use link option -pthread instead of -lpthread
-
-# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4
-# 
https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling
-# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed 
-latomic --pop-state"
-
-diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
-index 544cc227..add969be 100644
 a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL  = -lEGL
-

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

2022-05-20 Thread Andreas Sturmlechner

commit: 3f34ed50026289f348aa3301c0f3a8deea31540c
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May 19 05:03:48 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 20 06:35:57 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3f34ed50

dev-qt/qtcore: keyword 5.15.3 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.4..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtcore/qtcore-5.15.4..ebuild 
b/dev-qt/qtcore/qtcore-5.15.4..ebuild
index f8c7d657..e197e2ff 100644
--- a/dev-qt/qtcore/qtcore-5.15.4..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4..ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 IUSE="icu old-kernel systemd"

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

2022-04-01 Thread Andreas Sturmlechner

commit: ebcfd362f1047bbb7c09021bad242dc9fd8a030f
Author: Han Gao  gmail  com>
AuthorDate: Sun Mar 27 13:05:18 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 17:57:49 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ebcfd362

dev-qt/qtcore: use link option -pthread instead of -lpthread

Bug: https://bugs.gentoo.org/803470
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Han Gao  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24711
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch | 41 +
 dev-qt/qtcore/qtcore-5.15.3..ebuild |  1 +
 2 files changed, 42 insertions(+)

diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch 
b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
new file mode 100644
index ..c83c59ac
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
@@ -0,0 +1,41 @@
+# Use link option -pthread instead of -lpthread
+
+# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4
+# 
https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling
+# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed 
-latomic --pop-state"
+
+diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+index 544cc227..add969be 100644
+--- a/mkspecs/common/linux.conf
 b/mkspecs/common/linux.conf
+@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL  = -lEGL
+ QMAKE_LIBS_OPENGL   = -lGL
+ QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
+ QMAKE_LIBS_OPENVG   = -lOpenVG
+-QMAKE_LIBS_THREAD   = -lpthread
++QMAKE_LIBS_THREAD   = -pthread
+ QMAKE_LIBS_VULKAN   =
+ 
+ QMAKE_INCDIR_WAYLAND=
+diff --git a/src/corelib/configure.json b/src/corelib/configure.json
+index 9b5d19d4..da028fb2 100644
+--- a/src/corelib/configure.json
 b/src/corelib/configure.json
+@@ -355,7 +355,7 @@
+ "std::future f = std::async([]() { return 42; });",
+ "(void)f.get();"
+ ],
+-"qmake": "unix:LIBS += -lpthread"
++"qmake": "unix:LIBS += -pthread"
+ }
+ },
+ "cxx11_random": {
+@@ -466,7 +466,7 @@
+ "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);",
+ "shm_unlink(\"test\");"
+ ],
+-"qmake": "linux: LIBS += -lpthread -lrt"
++"qmake": "linux: LIBS += -pthread -lrt"
+ }
+ },
+ "linkat": {

diff --git a/dev-qt/qtcore/qtcore-5.15.3..ebuild 
b/dev-qt/qtcore/qtcore-5.15.3..ebuild
index 3d3b8751..f8c7d657 100644
--- a/dev-qt/qtcore/qtcore-5.15.3..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3..ebuild
@@ -44,6 +44,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 
703306
+   "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
 )
 
 pkg_pretend() {

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

2022-03-21 Thread Andreas Sturmlechner

commit: cd28c783082b970b1c52580c2485979d42ae6d5a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 27 20:55:59 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar 21 10:04:45 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd28c783

dev-qt/qtcore: Symlink qmake to /usr/bin/qmake5

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.3..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtcore/qtcore-5.15.3..ebuild 
b/dev-qt/qtcore/qtcore-5.15.3..ebuild
index bf94a0df..3d3b8751 100644
--- a/dev-qt/qtcore/qtcore-5.15.3..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3..ebuild
@@ -81,6 +81,7 @@ src_configure() {
 
 src_install() {
qt5-build_src_install
+   qt5_symlink_binary_to_path qmake 5
 
local flags=(
DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG

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

2022-01-19 Thread Andreas Sturmlechner

commit: 99ee62b2dd16d747c666d86a12c005c5c356dbe9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 19 16:49:25 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 19 16:49:39 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=99ee62b2

dev-qt/qtcore: Drop obsolete downstream reverts

Upstream MR was merged:
https://invent.kde.org/qt/qt/qtbase/-/merge_requests/111

QTBUG: https://bugreports.qt.io/browse/QTBUG-87326

Bug: https://bugs.gentoo.org/737914
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch | 271 -
 dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch |  47 
 dev-qt/qtcore/qtcore-5.15.2..ebuild|   3 +-
 3 files changed, 1 insertion(+), 320 deletions(-)

diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch 
b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
deleted file mode 100644
index 1c8f1e89..
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= 
-Date: Sat, 10 Oct 2020 19:26:13 +0200
-Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
- file-system"
-
-This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.

- src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++
- 1 file changed, 64 insertions(+), 141 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp 
b/src/corelib/time/qtimezoneprivate_tz.cpp
-index c5c70b7364..01f9a6cce0 100644
 a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1,6 +1,5 @@
- /
- **
--** Copyright (C) 2020 The Qt Company Ltd.
- ** Copyright (C) 2019 Crimson AS 
- ** Copyright (C) 2013 John Layt 
- ** Contact: https://www.qt.io/licensing/
-@@ -43,19 +42,18 @@
- #include "qtimezoneprivate_p.h"
- #include "private/qlocale_tools_p.h"
- 
--#include 
--#include 
- #include 
--#include 
- #include 
-+#include 
-+#include 
-+#include 
- 
- #include 
--#include 
- 
- #include 
- #include 
- #include 
--#ifndef Q_OS_INTEGRITY
-+#if !defined(Q_OS_INTEGRITY)
- #include  // to use MAXSYMLINKS constant
- #endif
- #include // to use _SC_SYMLOOP_MAX constant
-@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data 
QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
- return last > tranCache().cbegin() ? dataForTzTransition(*--last) : 
invalidData();
- }
- 
--bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray ) const
--{
--return tzZones->contains(ianaId);
--}
--
--QList QTzTimeZonePrivate::availableTimeZoneIds() const
--{
--QList result = tzZones->keys();
--std::sort(result.begin(), result.end());
--return result;
--}
--
--QList QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country 
country) const
-+static long getSymloopMax()
- {
--// TODO AnyCountry
--QList result;
--for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) 
{
--if (it.value().country == country)
--result << it.key();
--}
--std::sort(result.begin(), result.end());
--return result;
--}
--
--// Getting the system zone's ID:
--
--namespace {
--class ZoneNameReader : public QObject
--{
--public:
--QByteArray name()
--{
--/* Assumptions:
--   a) Systems don't change which of localtime and TZ they use without 
a
--  reboot.
--   b) When they change, they use atomic renames, hence a new device 
and
--  inode for the new file.
--   c) If we change which *name* is used for a zone, while referencing
--  the same final zoneinfo file, we don't care about the change of
--  name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to
--  the same CET file, continuing to use the old name, after
--  /etc/localtime changes which of the two it points to, is
--  harmless).
--
--   The alternative would be to use a file-system watcher, but they 
are a
--   scarce resource.
-- */
--const StatIdent local = identify("/etc/localtime");
--const StatIdent tz = identify("/etc/TZ");
--if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || 
m_last == tz))
--return m_name;
--
--m_name = etcLocalTime();
--if (!m_name.isEmpty()) {
--m_last = local;
--return m_name;
--}
--
--m_name = etcTZ();
--m_last = m_name.isEmpty() ? StatIdent() : tz;
--return m_name;
--}
--
--
--private:
--QByteArray m_name;
--struct StatIdent
--{
--static constexpr unsigned long bad = ~0ul;
--unsigned long m_dev, m_ino;

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

2021-10-03 Thread Andreas Sturmlechner

commit: ed46abceb5880731a465f22c054482d635b8fc00
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct  2 14:13:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  3 12:37:44 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ed46abce

dev-qt: Replace $(ver_cut 1-3) instances w/ ${QT5_PV}

Dropping unnecessary subshells.

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.2..ebuild | 2 +-
 dev-qt/qtgui/qtgui-5.15.2..ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.15.2..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.15.2..ebuild 
b/dev-qt/qtcore/qtcore-5.15.2..ebuild
index 23956275..7cf61d1f 100644
--- a/dev-qt/qtcore/qtcore-5.15.2..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2..ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
-SLOT=5/$(ver_cut 1-3)
+SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"

diff --git a/dev-qt/qtgui/qtgui-5.15.2..ebuild 
b/dev-qt/qtgui/qtgui-5.15.2..ebuild
index f81b5c47..fbc7f440 100644
--- a/dev-qt/qtgui/qtgui-5.15.2..ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2..ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 707658
+SLOT=5/${QT5_PV} # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"

diff --git a/dev-qt/qtsql/qtsql-5.15.2..ebuild 
b/dev-qt/qtsql/qtsql-5.15.2..ebuild
index e1cbc336..0a3163e6 100644
--- a/dev-qt/qtsql/qtsql-5.15.2..ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.2..ebuild
@@ -7,7 +7,7 @@ QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
+SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"

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

2021-09-30 Thread Andreas Sturmlechner

commit: e65b89b6e937ac0a2b3a37e07b08407511b6a692
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Oct 10 17:39:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 30 10:55:51 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e65b89b6

dev-qt/qtcore: Revert timezone handling to 5.14 state

This is an obvious workaround, until we and upstream have
decided what to do...

(sync with Gentoo ebuild repository)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas K. Hüttel  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch | 271 +
 dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch |  47 
 dev-qt/qtcore/qtcore-5.15.2..ebuild|   5 +-
 3 files changed, 322 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch 
b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
new file mode 100644
index ..1c8f1e89
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
@@ -0,0 +1,271 @@
+From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= 
+Date: Sat, 10 Oct 2020 19:26:13 +0200
+Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
+ file-system"
+
+This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.
+---
+ src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++
+ 1 file changed, 64 insertions(+), 141 deletions(-)
+
+diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp 
b/src/corelib/time/qtimezoneprivate_tz.cpp
+index c5c70b7364..01f9a6cce0 100644
+--- a/src/corelib/time/qtimezoneprivate_tz.cpp
 b/src/corelib/time/qtimezoneprivate_tz.cpp
+@@ -1,6 +1,5 @@
+ /
+ **
+-** Copyright (C) 2020 The Qt Company Ltd.
+ ** Copyright (C) 2019 Crimson AS 
+ ** Copyright (C) 2013 John Layt 
+ ** Contact: https://www.qt.io/licensing/
+@@ -43,19 +42,18 @@
+ #include "qtimezoneprivate_p.h"
+ #include "private/qlocale_tools_p.h"
+ 
+-#include 
+-#include 
+ #include 
+-#include 
+ #include 
++#include 
++#include 
++#include 
+ 
+ #include 
+-#include 
+ 
+ #include 
+ #include 
+ #include 
+-#ifndef Q_OS_INTEGRITY
++#if !defined(Q_OS_INTEGRITY)
+ #include  // to use MAXSYMLINKS constant
+ #endif
+ #include // to use _SC_SYMLOOP_MAX constant
+@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data 
QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
+ return last > tranCache().cbegin() ? dataForTzTransition(*--last) : 
invalidData();
+ }
+ 
+-bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray ) const
+-{
+-return tzZones->contains(ianaId);
+-}
+-
+-QList QTzTimeZonePrivate::availableTimeZoneIds() const
+-{
+-QList result = tzZones->keys();
+-std::sort(result.begin(), result.end());
+-return result;
+-}
+-
+-QList QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country 
country) const
++static long getSymloopMax()
+ {
+-// TODO AnyCountry
+-QList result;
+-for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) 
{
+-if (it.value().country == country)
+-result << it.key();
+-}
+-std::sort(result.begin(), result.end());
+-return result;
+-}
+-
+-// Getting the system zone's ID:
+-
+-namespace {
+-class ZoneNameReader : public QObject
+-{
+-public:
+-QByteArray name()
+-{
+-/* Assumptions:
+-   a) Systems don't change which of localtime and TZ they use without 
a
+-  reboot.
+-   b) When they change, they use atomic renames, hence a new device 
and
+-  inode for the new file.
+-   c) If we change which *name* is used for a zone, while referencing
+-  the same final zoneinfo file, we don't care about the change of
+-  name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to
+-  the same CET file, continuing to use the old name, after
+-  /etc/localtime changes which of the two it points to, is
+-  harmless).
+-
+-   The alternative would be to use a file-system watcher, but they 
are a
+-   scarce resource.
+- */
+-const StatIdent local = identify("/etc/localtime");
+-const StatIdent tz = identify("/etc/TZ");
+-if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || 
m_last == tz))
+-return m_name;
+-
+-m_name = etcLocalTime();
+-if (!m_name.isEmpty()) {
+-m_last = local;
+-return m_name;
+-}
+-
+-m_name = etcTZ();
+-m_last = m_name.isEmpty() ? StatIdent() : tz;
+-return m_name;
+-}
+-
+-
+-private:
+-QByteArray m_name;
+-struct StatIdent
+-{
+-static constexpr unsigned long bad = ~0ul;
+-unsigned long m_dev, m_ino;
+-

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

2021-02-01 Thread Andreas Sturmlechner

commit: 9ff8d7a06d35186160ece9436416324342684465
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  2 00:45:47 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb  2 00:48:43 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ff8d7a0

dev-qt/qtcore: Remove obsolete blocker on ! gentoo.org>

 dev-qt/qtcore/qtcore-5.15..ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index 449fddfc..06672498 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -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
 
 EAPI=7
@@ -24,9 +24,7 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
 "
-RDEPEND="${DEPEND}
-   !

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

2020-04-12 Thread Andreas Sturmlechner

commit: dc7faccb8dccf0e3b418bef7b23f49b004fb4208
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 12 17:46:45 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 12 18:04:04 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dc7faccb

dev-qt/qtcore: In >=5.15, disable statx only with IUSE="old-kernel"

Bug: https://bugs.gentoo.org/672856
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/metadata.xml   | 3 ++-
 dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.15..ebuild| 8 
 dev-qt/qtcore/qtcore-5..ebuild   | 8 
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 8342d1e9..9354e57a 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,7 +6,8 @@
Gentoo Qt Project


-   Disable syscalls not available on Linux 
kernels older than 3.17
+   Disable syscalls not available on Linux 
kernels older than 3.17
+   Disable syscalls not available on Linux 
kernels older than 4.11
Enable native journald logging 
support



diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild 
b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 8fe97564..16b2ab23 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
 
 src_configure() {
local myconf=(
-   -no-feature-statx   # bug 672856
+   -no-feature-statx # needs Linux 4.11, bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index 8fe97564..449fddfc 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -49,9 +49,9 @@ PATCHES=( 
"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 7
 pkg_pretend() {
use kernel_linux || return
get_running_version
-   if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for"
-   ewarn "dev-qt/qtcore to function on this kernel properly. See 
Bug #669994."
+   if kernel_is -lt 4 11 && ! use old-kernel; then
+   ewarn "The running kernel is older than 4.11. USE=old-kernel is 
needed for"
+   ewarn "dev-qt/qtcore to function on this kernel properly. Bugs 
#669994, #672856"
fi
 }
 
@@ -67,7 +67,6 @@ src_prepare() {
 
 src_configure() {
local myconf=(
-   -no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
@@ -75,6 +74,7 @@ src_configure() {
use old-kernel && myconf+=(
-no-feature-renameat2 # needs Linux 3.16, bug 669994
-no-feature-getentropy # needs Linux 3.17, bug 669994
+   -no-feature-statx # needs Linux 4.11, bug 672856
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index ff1430d7..77ca00e6 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -48,9 +48,9 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 pkg_pretend() {
use kernel_linux || return
get_running_version
-   if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for"
-   ewarn "dev-qt/qtcore to function on this kernel properly. See 
Bug #669994."
+   if kernel_is -lt 4 11 && ! use old-kernel; then
+   ewarn "The running kernel is older than 4.11. USE=old-kernel is 
needed for"
+   ewarn "dev-qt/qtcore to function on this kernel properly. Bugs 
#669994, #672856"
fi
 }
 
@@ -66,7 +66,6 @@ src_prepare() {
 
 src_configure() {
local myconf=(
-   -no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)
@@ -74,6 +73,7 @@ src_configure() {
use old-kernel && myconf+=(
-no-feature-renameat2 # needs Linux 3.16, bug 669994
-no-feature-getentropy # needs Linux 3.17, bug 669994
+   -no-feature-statx # needs Linux 4.11, bug 672856
)
qt5-build_src_configure
 }

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

2020-04-10 Thread Andreas Sturmlechner

commit: 9ff0752e1ee3c28818197eaaca45545708035152
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 10 17:10:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 10 21:08:40 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ff0752e

dev-qt/qtcore: renameat2 is glibc specific

We let Qt do the detection and only pass -no-foo when old-kernel is requested.

Bug: https://bugs.gentoo.org/669994
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.14..ebuild| 10 ++
 dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 10 ++
 dev-qt/qtcore/qtcore-5.15..ebuild| 10 ++
 dev-qt/qtcore/qtcore-5..ebuild   | 10 ++
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.14..ebuild 
b/dev-qt/qtcore/qtcore-5.14..ebuild
index 14b4d293..8fe97564 100644
--- a/dev-qt/qtcore/qtcore-5.14..ebuild
+++ b/dev-qt/qtcore/qtcore-5.14..ebuild
@@ -50,8 +50,8 @@ pkg_pretend() {
use kernel_linux || return
get_running_version
if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for ${CATEGORY}/${PN}"
-   ewarn "to function on this kernel properly.  See Bug #669994."
+   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for"
+   ewarn "dev-qt/qtcore to function on this kernel properly. See 
Bug #669994."
fi
 }
 
@@ -70,10 +70,12 @@ src_configure() {
-no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
-   $(qt_use !old-kernel feature-renameat2)  # needs Linux 3.16, 
bug 669994
-   $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, 
bug 669994
$(qt_use systemd journald)
)
+   use old-kernel && myconf+=(
+   -no-feature-renameat2 # needs Linux 3.16, bug 669994
+   -no-feature-getentropy # needs Linux 3.17, bug 669994
+   )
qt5-build_src_configure
 }
 

diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild 
b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 14b4d293..8fe97564 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -50,8 +50,8 @@ pkg_pretend() {
use kernel_linux || return
get_running_version
if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for ${CATEGORY}/${PN}"
-   ewarn "to function on this kernel properly.  See Bug #669994."
+   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for"
+   ewarn "dev-qt/qtcore to function on this kernel properly. See 
Bug #669994."
fi
 }
 
@@ -70,10 +70,12 @@ src_configure() {
-no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
-   $(qt_use !old-kernel feature-renameat2)  # needs Linux 3.16, 
bug 669994
-   $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, 
bug 669994
$(qt_use systemd journald)
)
+   use old-kernel && myconf+=(
+   -no-feature-renameat2 # needs Linux 3.16, bug 669994
+   -no-feature-getentropy # needs Linux 3.17, bug 669994
+   )
qt5-build_src_configure
 }
 

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index 14b4d293..8fe97564 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -50,8 +50,8 @@ pkg_pretend() {
use kernel_linux || return
get_running_version
if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for ${CATEGORY}/${PN}"
-   ewarn "to function on this kernel properly.  See Bug #669994."
+   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for"
+   ewarn "dev-qt/qtcore to function on this kernel properly. See 
Bug #669994."
fi
 }
 
@@ -70,10 +70,12 @@ src_configure() {
-no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
-   $(qt_use !old-kernel feature-renameat2)  # needs Linux 3.16, 
bug 669994
-   $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, 
bug 669994
$(qt_use systemd journald)
)
+   use old-kernel && myconf+=(
+   -no-feature-renameat2 # needs Linux 3.16, bug 669994
+   -no-feature-getentropy # needs Linux 3.17, bug 669994
+   )
qt5-build_src_configure
 }
 

diff --git

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

2020-04-09 Thread Andreas Sturmlechner

commit: 3e6eeb7983e0b1fe6ea6dc47bc6cc3a44730f5f3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  8 19:10:05 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 18:12:27 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3e6eeb79

dev-qt/qtcore: More fine-grained subslot

Package-Manager: Portage-2.3.97, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.14..ebuild| 2 ++
 dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 2 ++
 dev-qt/qtcore/qtcore-5.15..ebuild| 2 ++
 dev-qt/qtcore/qtcore-5..ebuild   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-5.14..ebuild 
b/dev-qt/qtcore/qtcore-5.14..ebuild
index 7469ab23..14b4d293 100644
--- a/dev-qt/qtcore/qtcore-5.14..ebuild
+++ b/dev-qt/qtcore/qtcore-5.14..ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"

diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild 
b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 7469ab23..14b4d293 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index 7469ab23..14b4d293 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 7622204e..fc5723d2 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -2,10 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
+SLOT=5/$(ver_cut 1-3)
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"

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

2020-04-09 Thread Andreas Sturmlechner

commit: 9a5c96c676c7fbe248a10d59f8803872f4a9e2be
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  9 18:06:08 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 18:09:58 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9a5c96c6

dev-qt/qtcore: Update 5.15.0_beta3

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild 
b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
index 9b476abf..7469ab23 100644
--- a/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
 
 DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,15 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 
703306
 
+pkg_pretend() {
+   use kernel_linux || return
+   get_running_version
+   if kernel_is -lt 3 17 && ! use old-kernel; then
+   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for ${CATEGORY}/${PN}"
+   ewarn "to function on this kernel properly.  See Bug #669994."
+   fi
+}
+
 src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || 
die
@@ -59,6 +68,8 @@ src_configure() {
-no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
+   $(qt_use !old-kernel feature-renameat2)  # needs Linux 3.16, 
bug 669994
+   $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, 
bug 669994
$(qt_use systemd journald)
)
qt5-build_src_configure

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

2020-04-09 Thread Andreas Sturmlechner

commit: 309a55f158cac29e11823e3904632520b205edfb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  9 18:02:28 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 18:09:57 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=309a55f1

dev-qt/qtcore: Improve old-kernel metadata description

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 34d2b272..8342d1e9 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,7 +6,7 @@
Gentoo Qt Project


-   disable new syscalls for Linux kernel 
>= 3.17
+   Disable syscalls not available on Linux 
kernels older than 3.17
Enable native journald logging 
support

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

2020-04-09 Thread Andreas Sturmlechner

commit: 95afe01e2b4de041b40bd772858869815a3c9745
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  9 18:05:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 18:09:57 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=95afe01e

dev-qt/qtcore: Reduce indentation in pkg_pretend

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/qtcore-5.14..ebuild | 11 +--
 dev-qt/qtcore/qtcore-5.15..ebuild | 11 +--
 dev-qt/qtcore/qtcore-5..ebuild| 11 +--
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.14..ebuild 
b/dev-qt/qtcore/qtcore-5.14..ebuild
index a6f5b7fc..7469ab23 100644
--- a/dev-qt/qtcore/qtcore-5.14..ebuild
+++ b/dev-qt/qtcore/qtcore-5.14..ebuild
@@ -45,12 +45,11 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 
703306
 
 pkg_pretend() {
-   if use kernel_linux; then
-   get_running_version
-   if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. 
USE=old-kernel is needed for ${CATEGORY}/${PN}"
-   ewarn "to function on this kernel properly.  See Bug 
#669994."
-   fi
+   use kernel_linux || return
+   get_running_version
+   if kernel_is -lt 3 17 && ! use old-kernel; then
+   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for ${CATEGORY}/${PN}"
+   ewarn "to function on this kernel properly.  See Bug #669994."
fi
 }
 

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index a6f5b7fc..7469ab23 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -45,12 +45,11 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 
703306
 
 pkg_pretend() {
-   if use kernel_linux; then
-   get_running_version
-   if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. 
USE=old-kernel is needed for ${CATEGORY}/${PN}"
-   ewarn "to function on this kernel properly.  See Bug 
#669994."
-   fi
+   use kernel_linux || return
+   get_running_version
+   if kernel_is -lt 3 17 && ! use old-kernel; then
+   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for ${CATEGORY}/${PN}"
+   ewarn "to function on this kernel properly.  See Bug #669994."
fi
 }
 

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index c39aa396..7622204e 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -44,12 +44,11 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 )
 
 pkg_pretend() {
-   if use kernel_linux; then
-   get_running_version
-   if kernel_is -lt 3 17 && ! use old-kernel; then
-   ewarn "The running kernel is older than 3.17. 
USE=old-kernel is needed for ${CATEGORY}/${PN}"
-   ewarn "to function on this kernel properly.  See Bug 
#669994."
-   fi
+   use kernel_linux || return
+   get_running_version
+   if kernel_is -lt 3 17 && ! use old-kernel; then
+   ewarn "The running kernel is older than 3.17. USE=old-kernel is 
needed for ${CATEGORY}/${PN}"
+   ewarn "to function on this kernel properly.  See Bug #669994."
fi
 }

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

2020-04-09 Thread Andreas Sturmlechner

commit: 35678fe2decea3d9de1a317c9e8e6a031437b334
Author: Benda Xu  gentoo  org>
AuthorDate: Wed Apr  8 08:50:19 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 18:09:50 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=35678fe2

dev-qt/qtcore: enable renameat2 and getentropy conditionally

Add USE=old-kernel to switch off the new syscalls.

renameat2() and getentropy() are not available until linux-3.17.

Bug: https://bugs.gentoo.org/669994
Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu  gentoo.org>
Closes: https://github.com/gentoo/qt/pull/214
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtcore/metadata.xml|  1 +
 dev-qt/qtcore/qtcore-5.14..ebuild | 16 ++--
 dev-qt/qtcore/qtcore-5.15..ebuild | 16 ++--
 dev-qt/qtcore/qtcore-5..ebuild| 18 +++---
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index c612265c..34d2b272 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Qt Project


+   disable new syscalls for Linux kernel 
>= 3.17
Enable native journald logging 
support



diff --git a/dev-qt/qtcore/qtcore-5.14..ebuild 
b/dev-qt/qtcore/qtcore-5.14..ebuild
index 9b476abf..a6f5b7fc 100644
--- a/dev-qt/qtcore/qtcore-5.14..ebuild
+++ b/dev-qt/qtcore/qtcore-5.14..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
 
 DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 
703306
 
+pkg_pretend() {
+   if use kernel_linux; then
+   get_running_version
+   if kernel_is -lt 3 17 && ! use old-kernel; then
+   ewarn "The running kernel is older than 3.17. 
USE=old-kernel is needed for ${CATEGORY}/${PN}"
+   ewarn "to function on this kernel properly.  See Bug 
#669994."
+   fi
+   fi
+}
+
 src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || 
die
@@ -59,6 +69,8 @@ src_configure() {
-no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
+   $(qt_use !old-kernel feature-renameat2)  # needs Linux 3.16, 
bug 669994
+   $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, 
bug 669994
$(qt_use systemd journald)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index 9b476abf..a6f5b7fc 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 QT5_MODULE="qtbase"
-inherit qt5-build
+inherit linux-info qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="icu systemd"
+IUSE="icu old-kernel systemd"
 
 DEPEND="
dev-libs/double-conversion:=
@@ -44,6 +44,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 
703306
 
+pkg_pretend() {
+   if use kernel_linux; then
+   get_running_version
+   if kernel_is -lt 3 17 && ! use old-kernel; then
+   ewarn "The running kernel is older than 3.17. 
USE=old-kernel is needed for ${CATEGORY}/${PN}"
+   ewarn "to function on this kernel properly.  See Bug 
#669994."
+   fi
+   fi
+}
+
 src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || 
die
@@ -59,6 +69,8 @@ src_configure() {
-no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
+   $(qt_use !old-kernel feature-renameat2)  # needs Linux 3.16, 
bug 669994
+   $(qt_use !old-kernel feature-getentropy) # needs Linux 3.17, 
bug 669994
$(qt_use systemd journald)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 4ef01cf6..c39aa396 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -1,9 +1,9 @@
-# Copyright

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

2020-02-09 Thread Andreas Sturmlechner

commit: 91b38cc3ab9bb6c70c9e40ba6a5fbbe41b2da753
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  9 10:59:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  9 19:22:20 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=91b38cc3

dev-qt/qtcore: Fix cmake macro compat. for upgrade from https://bugs.gentoo.org/703306
Closes: https://bugs.gentoo.org/705198
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>
(cherry picked from commit fe1eb44a73d1a8e99aae1eeb2b7504b326df2cd1)

 ...qtcore-5.14.1-cmake-macro-backward-compat.patch | 50 ++
 dev-qt/qtcore/qtcore-5.14..ebuild  |  4 +-
 dev-qt/qtcore/qtcore-5.15..ebuild  |  4 +-
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git 
a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch 
b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
new file mode 100644
index ..30b5abc3
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
@@ -0,0 +1,50 @@
+From: Andreas Sturmlechner 
+Date: Sun, 9 Feb 2020 11:45:00 +0100
+Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14=63d9cd17
+
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an 
additional argument
+IsDebugAndRelease without providing backward compatibility. This macro is used 
(at least) for
+QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard 
and qtwayland.
+During upgrade from =Qt-5.14, as a consequence of slot upgrade 
rebuilds, some
+reverse dependencies are slated for rebuild before these Qt consumers have 
been rebuilt and their
+cmake files regenerated, leading to cmake errors like:
+
+https://bugs.gentoo.org/703306
+https://bugs.gentoo.org/705198
+
+From mkspecs/features/create_cmake.prf:
+
+# CMAKE_DEBUG_AND_RELEASE is used to tell the 
_populate_$${CMAKE_MODULE_NAME}_target_properties
+# functions whether a Configuration specific generator expression needs to be 
added to the values
+# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For 
debug_and_release builds, we do need
+# configuration specific values. For singular builds (only release or only 
debug), we want the
+# values to be applied regardless of the configuration.
+# This would allow on Linux and macOS (and with a recent enough version of 
CMake on Windows) to
+# build a Debug configuration of an application, even if Qt was built in a 
Release configuration.
+
+qt5-build.eclass is configuring either as 'release' or as 'debug', so we make 
IsDebugAndRelease
+optional and default to FALSE.
+
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in  2020-01-23 
13:37:32.0 +0100
 b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in  2020-02-09 
15:15:21.156219814 +0100
+@@ -538,8 +538,14 @@
+ 
+ file(GLOB pluginTargets 
\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
+ 
+-macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin 
Configuration PLUGIN_LOCATION
+-  IsDebugAndRelease)
++macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin 
Configuration PLUGIN_LOCATION)
++set(IsDebugAndRelease FALSE)
++set (list_var ${ARGN})
++list(LENGTH list_var num_extra_arg)
++if (${num_extra_arg} GREATER 0)
++list(GET list_var 0 IsDebugAndRelease)
++endif()
++
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY 
IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

diff --git a/dev-qt/qtcore/qtcore-5.14..ebuild 
b/dev-qt/qtcore/qtcore-5.14..ebuild
index e6a7a124..9b476abf 100644
--- a/dev-qt/qtcore/qtcore-5.14..ebuild
+++ b/dev-qt/qtcore/qtcore-5.14..ebuild
@@ -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
 
 EAPI=7
@@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
 )
 
+PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 
703306
+
 src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || 
die

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index e6a7a124..9b476abf 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -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
 
 EAPI=7
@@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
 )
 
+PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 
703306
+
 src_prepare() {
# don't add -O3 to CXXFLAGS, bug

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

2019-09-23 Thread Andreas Sturmlechner

commit: afbfb79dbd88738e4299f3a20e1622b886dcd9da
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep 23 18:27:06 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep 23 18:27:06 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=afbfb79d

dev-qt/qtcore: Fix hardcoded libdir path in some *.cmake configs

Thanks-to: Manuel Nickschas  quassel-irc.org>
Closes: https://bugs.gentoo.org/691462
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch  | 38 ++
 dev-qt/qtcore/qtcore-5.13.1.ebuild |  4 +++
 2 files changed, 42 insertions(+)

diff --git a/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch 
b/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch
new file mode 100644
index ..49b936f5
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.13.1-Qt5BasicConfig-fix-libdir.patch
@@ -0,0 +1,38 @@
+From cc32a691936f37eaaec618a71edd62f896009c9d Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann 
+Date: Fri, 6 Sep 2019 10:54:44 +0200
+Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
+
+When Qt was configured with -libdir different from "lib", one could not
+build with CMake whenever a static lib was pulled in (e.g. uitools).
+
+Do not hard-code "/lib" but use the correct variable also for static
+libraries.
+
+Fixes: QTBUG-76255
+Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
+Reviewed-by: Alexandru Croitor 
+Reviewed-by: Fabian Vogt 
+---
+ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 
b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d4fd057682d..f4a34d6e481 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -53,7 +53,11 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file 
prl_file_location Configura
+ set(_lib_deps)
+ set(_link_flags)
+ 
+-get_filename_component(_qt5_install_libs 
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++set(_qt5_install_libs 
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++!!ELSE
++set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
++!!ENDIF
+ 
+ if(EXISTS \"${prl_file_location}\")
+ file(STRINGS \"${prl_file_location}\" _prl_strings REGEX 
\"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
+-- 
+2.16.3

diff --git a/dev-qt/qtcore/qtcore-5.13.1.ebuild 
b/dev-qt/qtcore/qtcore-5.13.1.ebuild
index d881786f..28ff5c1c 100644
--- a/dev-qt/qtcore/qtcore-5.13.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.1.ebuild
@@ -43,6 +43,10 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
 )
 
+PATCHES=(
+   "${FILESDIR}/${P}-Qt5BasicConfig-fix-libdir.patch" # QTBUG-76255, bug 
#691462
+)
+
 src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || 
die

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

2019-08-24 Thread Jimi Huotari

commit: f4147c0b8d844b51940dd8badf511941289b84cc
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sat Aug 24 09:14:20 2019 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sat Aug 24 09:14:20 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4147c0b

dev-qt/qtcore: drop 'qfloat16-tables' from 5.14.

This was moved and removed from the build.

- https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14=5e40d3d9

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qtcore/qtcore-5.14..ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-qt/qtcore/qtcore-5.14..ebuild 
b/dev-qt/qtcore/qtcore-5.14..ebuild
index d881786f..68c4c734 100644
--- a/dev-qt/qtcore/qtcore-5.14..ebuild
+++ b/dev-qt/qtcore/qtcore-5.14..ebuild
@@ -30,7 +30,6 @@ QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
src/tools/rcc
-   src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
doc

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

2019-08-04 Thread Michael Palimaka

commit: 1b76480ac298bd1d4890e06ecafdd0277b37d0d8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug  4 12:43:33 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug  4 12:43:43 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1b76480a

dev-qt/qtcore: $D has no trailing slash in EAPI 7

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Michael Palimaka  gentoo.org>

 dev-qt/qtcore/qtcore-5.12..ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.13..ebuild | 2 +-
 dev-qt/qtcore/qtcore-5..ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.12..ebuild 
b/dev-qt/qtcore/qtcore-5.12..ebuild
index 661a57a2..d881786f 100644
--- a/dev-qt/qtcore/qtcore-5.12..ebuild
+++ b/dev-qt/qtcore/qtcore-5.12..ebuild
@@ -72,7 +72,7 @@ src_install() {
)
 
for flag in ${flags[@]}; do
-   cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || 
die
+   cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
 
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}

diff --git a/dev-qt/qtcore/qtcore-5.13..ebuild 
b/dev-qt/qtcore/qtcore-5.13..ebuild
index 661a57a2..d881786f 100644
--- a/dev-qt/qtcore/qtcore-5.13..ebuild
+++ b/dev-qt/qtcore/qtcore-5.13..ebuild
@@ -72,7 +72,7 @@ src_install() {
)
 
for flag in ${flags[@]}; do
-   cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || 
die
+   cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
 
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 661a57a2..d881786f 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -72,7 +72,7 @@ src_install() {
)
 
for flag in ${flags[@]}; do
-   cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || 
die
+   cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
 
#if defined(QT_NO_${flag}) && defined(QT_${flag})
# undef QT_NO_${flag}

[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qdoc/, dev-qt/linguist/, dev-qt/qtscript/, dev-qt/qttest/, ...

2019-03-17 Thread Andreas Sturmlechner

commit: 0909122652b69eed81aa01be1145a0cd1e3b8a20
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 17 13:07:09 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 17 13:07:09 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=09091226

dev-qt: Drop Qt 5.12.2

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/assistant/Manifest  |   1 -
 dev-qt/assistant/assistant-5.12.2.ebuild   |  55 ---
 dev-qt/designer/Manifest   |   1 -
 dev-qt/designer/designer-5.12.2.ebuild |  57 ---
 dev-qt/linguist-tools/Manifest |   1 -
 dev-qt/linguist-tools/linguist-tools-5.12.2.ebuild |  35 -
 dev-qt/linguist/Manifest   |   1 -
 dev-qt/linguist/linguist-5.12.2.ebuild |  48 --
 dev-qt/pixeltool/Manifest  |   1 -
 dev-qt/pixeltool/pixeltool-5.12.2.ebuild   |  25 ---
 dev-qt/qdbus/Manifest  |   1 -
 dev-qt/qdbus/qdbus-5.12.2.ebuild   |  25 ---
 dev-qt/qdbusviewer/Manifest|   1 -
 dev-qt/qdbusviewer/qdbusviewer-5.12.2.ebuild   |  45 --
 dev-qt/qdoc/Manifest   |   1 -
 dev-qt/qdoc/qdoc-5.12.2.ebuild |  40 -
 dev-qt/qt3d/Manifest   |   1 -
 dev-qt/qt3d/qt3d-5.12.2.ebuild |  32 
 dev-qt/qtbluetooth/Manifest|   1 -
 dev-qt/qtbluetooth/qtbluetooth-5.12.2.ebuild   |  33 
 dev-qt/qtcharts/Manifest   |   1 -
 dev-qt/qtcharts/qtcharts-5.12.2.ebuild |  29 
 dev-qt/qtconcurrent/Manifest   |   1 -
 dev-qt/qtconcurrent/qtconcurrent-5.12.2.ebuild |  23 ---
 dev-qt/qtcore/Manifest |   1 -
 dev-qt/qtcore/qtcore-5.12.2.ebuild |  84 --
 dev-qt/qtdatavis3d/Manifest|   1 -
 dev-qt/qtdatavis3d/qtdatavis3d-5.12.2.ebuild   |  31 
 dev-qt/qtdbus/Manifest |   1 -
 dev-qt/qtdbus/qtdbus-5.12.2.ebuild |  43 --
 dev-qt/qtdeclarative/Manifest  |   1 -
 dev-qt/qtdeclarative/qtdeclarative-5.12.2.ebuild   |  55 ---
 dev-qt/qtdiag/Manifest |   1 -
 dev-qt/qtdiag/qtdiag-5.12.2.ebuild |  36 -
 dev-qt/qtgamepad/Manifest  |   1 -
 dev-qt/qtgamepad/qtgamepad-5.12.2.ebuild   |  35 -
 dev-qt/qtgraphicaleffects/Manifest |   1 -
 .../qtgraphicaleffects-5.12.2.ebuild   |  21 ---
 dev-qt/qtgui/Manifest  |   1 -
 dev-qt/qtgui/qtgui-5.12.2.ebuild   | 172 -
 dev-qt/qthelp/Manifest |   1 -
 dev-qt/qthelp/qthelp-5.12.2.ebuild |  29 
 dev-qt/qtimageformats/Manifest |   1 -
 dev-qt/qtimageformats/qtimageformats-5.12.2.ebuild |  29 
 dev-qt/qtlocation/Manifest |   1 -
 dev-qt/qtlocation/qtlocation-5.12.2.ebuild |  44 --
 dev-qt/qtmultimedia/Manifest   |   1 -
 dev-qt/qtmultimedia/qtmultimedia-5.12.2.ebuild |  68 
 dev-qt/qtnetwork/Manifest  |   1 -
 dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild   |  60 ---
 dev-qt/qtnetworkauth/Manifest  |   1 -
 dev-qt/qtnetworkauth/qtnetworkauth-5.12.2.ebuild   |  20 ---
 dev-qt/qtopengl/Manifest   |   1 -
 dev-qt/qtopengl/qtopengl-5.12.2.ebuild |  34 
 dev-qt/qtpaths/Manifest|   1 -
 dev-qt/qtpaths/qtpaths-5.12.2.ebuild   |  23 ---
 dev-qt/qtplugininfo/Manifest   |   1 -
 dev-qt/qtplugininfo/qtplugininfo-5.12.2.ebuild |  23 ---
 dev-qt/qtpositioning/Manifest  |   1 -
 dev-qt/qtpositioning/qtpositioning-5.12.2.ebuild   |  40 -
 dev-qt/qtprintsupport/Manifest |   1 -
 dev-qt/qtprintsupport/qtprintsupport-5.12.2.ebuild |  42 -
 dev-qt/qtquickcontrols/Manifest|   1 -
 .../qtquickcontrols/qtquickcontrols-5.12.2.ebuild  |  32 
 dev-qt/qtquickcontrols2/Manifest   |   1 -
 .../qtquickcontrols2-5.12.2.ebuild |  30 
 dev-qt/qtscript/Manifest   |   1 -
 dev-qt/qtscript/qtscript-5.12.2.ebuild |  36 -
 dev-qt/qtscxml/Manifest|   1 -
 dev-qt/qtscxml/qtscxml-5.12.2.ebuild   |  19 ---
 dev-qt/qtsensors/Manifest  |   1 -
 dev-qt/qtsensors/qtsensors-5.12.2.ebuild   |  28 
 dev-qt/qtserialbus/Manifest|   1 -

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

2019-01-07 Thread Davide Pesavento

commit: ffd4863f2536e76a6c855c7b6d82346299d4bd17
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jan  7 20:15:15 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jan  7 20:15:15 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ffd4863f

dev-qt/qtcore: sync with 5.11.3-r2 in gentoo.git

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtcore/qtcore-5.12.0.ebuild| 10 +-
 dev-qt/qtcore/qtcore-5.12..ebuild | 10 +-
 dev-qt/qtcore/qtcore-5..ebuild| 10 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild 
b/dev-qt/qtcore/qtcore-5.12.0.ebuild
index f6a45867..a77edf08 100644
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
@@ -43,8 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
 )
 
+src_prepare() {
+   # fix missing qt_version_tag symbol w/ LTO, bug 674382
+   sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+   qt5-build_src_prepare
+}
+
 src_configure() {
local myconf=(
+   -no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)

diff --git a/dev-qt/qtcore/qtcore-5.12..ebuild 
b/dev-qt/qtcore/qtcore-5.12..ebuild
index f6a45867..a77edf08 100644
--- a/dev-qt/qtcore/qtcore-5.12..ebuild
+++ b/dev-qt/qtcore/qtcore-5.12..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
@@ -43,8 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
 )
 
+src_prepare() {
+   # fix missing qt_version_tag symbol w/ LTO, bug 674382
+   sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+   qt5-build_src_prepare
+}
+
 src_configure() {
local myconf=(
+   -no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index f6a45867..a77edf08 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
@@ -43,8 +43,16 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
 )
 
+src_prepare() {
+   # fix missing qt_version_tag symbol w/ LTO, bug 674382
+   sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+   qt5-build_src_prepare
+}
+
 src_configure() {
local myconf=(
+   -no-feature-statx   # bug 672856
$(qt_use icu)
$(qt_use !icu iconv)
$(qt_use systemd journald)

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

2019-01-06 Thread Davide Pesavento

commit: c14b6caccfe183122857fb7cf7d664ac3db9c966
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jan  6 21:25:59 2019 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jan  6 21:25:59 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c14b6cac

dev-qt/qtcore: add := subslot dep on sys-libs/zlib

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qtcore/qtcore-5.12.0.ebuild| 4 ++--
 dev-qt/qtcore/qtcore-5.12..ebuild | 4 ++--
 dev-qt/qtcore/qtcore-5..ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild 
b/dev-qt/qtcore/qtcore-5.12.0.ebuild
index 571af4d5..290fc94e 100644
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
dev-libs/libpcre2[pcre16,unicode]
-   sys-libs/zlib
+   sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )

diff --git a/dev-qt/qtcore/qtcore-5.12..ebuild 
b/dev-qt/qtcore/qtcore-5.12..ebuild
index 25c17255..290fc94e 100644
--- a/dev-qt/qtcore/qtcore-5.12..ebuild
+++ b/dev-qt/qtcore/qtcore-5.12..ebuild
@@ -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
 
 EAPI=6
@@ -17,7 +17,7 @@ DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
dev-libs/libpcre2[pcre16,unicode]
-   sys-libs/zlib
+   sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 25c17255..290fc94e 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -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
 
 EAPI=6
@@ -17,7 +17,7 @@ DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
dev-libs/libpcre2[pcre16,unicode]
-   sys-libs/zlib
+   sys-libs/zlib:=
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qttranslations/, dev-qt/qtprintsupport/, ...

2018-12-16 Thread Andreas Sturmlechner

commit: 8a7a728df246eb735bbba5755511ea97a26efc71
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 16 10:18:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 16 19:02:25 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8a7a728d

dev-qt: Qt 5.11 stable branch was closed

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/assistant/assistant-5.11..ebuild|  55 ---
 dev-qt/designer/designer-5.11..ebuild  |  57 ---
 .../linguist-tools/linguist-tools-5.11..ebuild |  35 -
 dev-qt/linguist/linguist-5.11..ebuild  |  48 --
 dev-qt/pixeltool/pixeltool-5.11..ebuild|  25 ---
 dev-qt/qdbus/qdbus-5.11..ebuild|  25 ---
 dev-qt/qdbusviewer/qdbusviewer-5.11..ebuild|  45 --
 dev-qt/qdoc/qdoc-5.11..ebuild  |  37 -
 dev-qt/qt3d/qt3d-5.11..ebuild  |  32 
 dev-qt/qtbluetooth/qtbluetooth-5.11..ebuild|  33 
 dev-qt/qtcanvas3d/qtcanvas3d-5.11..ebuild  |  21 ---
 dev-qt/qtcharts/qtcharts-5.11..ebuild  |  29 
 dev-qt/qtconcurrent/qtconcurrent-5.11..ebuild  |  23 ---
 dev-qt/qtcore/qtcore-5.11..ebuild  |  75 -
 dev-qt/qtdatavis3d/qtdatavis3d-5.11..ebuild|  31 
 dev-qt/qtdbus/qtdbus-5.11..ebuild  |  43 --
 .../qtdeclarative/qtdeclarative-5.11..ebuild   |  64 
 dev-qt/qtdiag/qtdiag-5.11..ebuild  |  36 -
 dev-qt/qtgamepad/qtgamepad-5.11..ebuild|  35 -
 .../qtgraphicaleffects-5.11..ebuild|  21 ---
 dev-qt/qtgui/qtgui-5.11..ebuild| 170 -
 dev-qt/qthelp/qthelp-5.11..ebuild  |  30 
 .../qtimageformats/qtimageformats-5.11..ebuild |  29 
 dev-qt/qtlocation/qtlocation-5.11..ebuild  |  44 --
 dev-qt/qtmultimedia/qtmultimedia-5.11..ebuild  |  68 -
 dev-qt/qtnetwork/qtnetwork-5.11..ebuild|  57 ---
 .../qtnetworkauth/qtnetworkauth-5.11..ebuild   |  20 ---
 dev-qt/qtopengl/qtopengl-5.11..ebuild  |  34 -
 dev-qt/qtpaths/qtpaths-5.11..ebuild|  23 ---
 dev-qt/qtplugininfo/qtplugininfo-5.11..ebuild  |  23 ---
 .../qtpositioning/qtpositioning-5.11..ebuild   |  40 -
 .../qtprintsupport/qtprintsupport-5.11..ebuild |  42 -
 .../qtquickcontrols-5.11..ebuild   |  32 
 .../qtquickcontrols2-5.11..ebuild  |  30 
 dev-qt/qtscript/qtscript-5.11..ebuild  |  36 -
 dev-qt/qtscxml/qtscxml-5.11..ebuild|  19 ---
 dev-qt/qtsensors/qtsensors-5.11..ebuild|  28 
 dev-qt/qtserialbus/qtserialbus-5.11..ebuild|  20 ---
 dev-qt/qtserialport/qtserialport-5.11..ebuild  |  27 
 dev-qt/qtspeech/qtspeech-5.11..ebuild  |  22 ---
 dev-qt/qtsql/qtsql-5.11..ebuild|  58 ---
 dev-qt/qtsvg/qtsvg-5.11..ebuild|  23 ---
 dev-qt/qttest/qttest-5.11..ebuild  |  33 
 .../qttranslations/qttranslations-5.11..ebuild |  19 ---
 .../qtvirtualkeyboard-5.11..ebuild |  38 -
 dev-qt/qtwayland/qtwayland-5.11..ebuild|  39 -
 dev-qt/qtwebchannel/qtwebchannel-5.11..ebuild  |  26 
 dev-qt/qtwebengine/qtwebengine-5.11..ebuild| 140 -
 dev-qt/qtwebsockets/qtwebsockets-5.11..ebuild  |  27 
 dev-qt/qtwebview/qtwebview-5.11..ebuild|  21 ---
 dev-qt/qtwidgets/qtwidgets-5.11..ebuild|  57 ---
 dev-qt/qtx11extras/qtx11extras-5.11..ebuild|  21 ---
 dev-qt/qtxml/qtxml-5.11..ebuild|  29 
 .../qtxmlpatterns/qtxmlpatterns-5.11..ebuild   |  19 ---
 54 files changed, 2114 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.11..ebuild 
b/dev-qt/assistant/assistant-5.11..ebuild
deleted file mode 100644
index 0fe2bc14..
--- a/dev-qt/assistant/assistant-5.11..ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qttools"
-inherit desktop gnome2-utils qt5-build
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-   ~dev-qt/qtcore-${PV}
-   ~dev-qt/qtgui-${PV}
-   ~dev-qt/qthelp-${PV}
-   ~dev-qt/qtnetwork-${PV}
-   ~dev-qt/qtprintsupport-${PV}
-   ~dev-qt/qtsql-${PV}[sqlite]
-   ~dev-qt/qtwidgets-${PV}
-   webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-   src/assistant/assistant
-)
-
-src_prepare() {
-   qt_use_disable_mod webkit webkitwidgets \
-

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

2018-09-13 Thread Jimi Huotari

commit: d58aed70a809eef627f0ca954e8aa3517a7bba43
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Sep 13 10:07:47 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Thu Sep 13 10:10:54 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=d58aed70

dev-qt/qtcore: sync with main Gentoo repo tree

Drop the XRENDER flag, which would lead to QT_NO_XRENDER being set,
which would lead to unwanted behaviour such as shadows not being
rendered around Qt context-menus.

Upstream removed the option a while ago, in
commit: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=d37c353d

Bug: https://bugs.gentoo.org/648300
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 dev-qt/qtcore/qtcore-5.11..ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.12..ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.9..ebuild  | 2 +-
 dev-qt/qtcore/qtcore-5..ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.11..ebuild 
b/dev-qt/qtcore/qtcore-5.11..ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5.11..ebuild
+++ b/dev-qt/qtcore/qtcore-5.11..ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

diff --git a/dev-qt/qtcore/qtcore-5.12..ebuild 
b/dev-qt/qtcore/qtcore-5.12..ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5.12..ebuild
+++ b/dev-qt/qtcore/qtcore-5.12..ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

diff --git a/dev-qt/qtcore/qtcore-5.9..ebuild 
b/dev-qt/qtcore/qtcore-5.9..ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5.9..ebuild
+++ b/dev-qt/qtcore/qtcore-5.9..ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 48916104..25c17255 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -59,7 +59,7 @@ src_install() {
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

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

2018-06-14 Thread Andreas Sturmlechner

commit: 866a5388ddf06ec36a8ea8e36677fc4ef105c1fb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 14 19:45:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 14 19:45:13 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=866a5388

dev-qt/qtcore: Restore qt5_use_modules macro

See also: https://codereview.qt-project.org/#/c/232367/

Bug: https://bugs.gentoo.org/653646
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../qtcore-5.11.0-restore-qt5_use_modules.patch| 224 +
 dev-qt/qtcore/qtcore-5.11.0.ebuild |   2 +
 2 files changed, 226 insertions(+)

diff --git a/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch 
b/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch
new file mode 100644
index ..3b1818d2
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.11.0-restore-qt5_use_modules.patch
@@ -0,0 +1,224 @@
+From d1bbe4acbd8ce09f8f4263bca1aa5682c6559c23 Mon Sep 17 00:00:00 2001
+From: Kevin Funk 
+Date: Thu, 14 Jun 2018 14:50:39 +0200
+Subject: [PATCH] CMake: Restore qt5_use_modules() function
+
+It appears that in the 5 years since we deprecated this function, people
+have not stopped using it. The removal of qt5_use_modules() caused lots of
+troubles in packages still using it when they were compiled against Qt 5.11.0.
+
+Instead, let's revive this function and keep it for the Qt5 life time.
+
+See discussion on qt-development mailing list:
+  http://lists.qt-project.org/pipermail/development/2018-June/032837.html
+
+Change-Id: Ic263e3bb6706268cb9ea38a0711665f166a3aa9e
+---
+ src/corelib/Qt5CoreMacros.cmake| 51 ++
+ tests/auto/cmake/CMakeLists.txt|  1 +
+ .../cmake/test_use_modules_function/CMakeLists.txt | 18 
+ .../auto/cmake/test_use_modules_function/three.cpp | 45 +++
+ tests/auto/cmake/test_use_modules_function/two.cpp | 43 ++
+ 5 files changed, 158 insertions(+)
+ create mode 100644 tests/auto/cmake/test_use_modules_function/CMakeLists.txt
+ create mode 100644 tests/auto/cmake/test_use_modules_function/three.cpp
+ create mode 100644 tests/auto/cmake/test_use_modules_function/two.cpp
+
+diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
+index 1627de40029..819b48f9734 100644
+--- a/src/corelib/Qt5CoreMacros.cmake
 b/src/corelib/Qt5CoreMacros.cmake
+@@ -294,3 +294,54 @@ function(QT5_ADD_RESOURCES outfiles )
+ endfunction()
+ 
+ set(_Qt5_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..")
++
++if (NOT CMAKE_VERSION VERSION_LESS 2.8.9)
++macro(qt5_use_modules _target _link_type)
++if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
++if(CMAKE_WARN_DEPRECATED)
++set(messageType WARNING)
++endif()
++if(CMAKE_ERROR_DEPRECATED)
++set(messageType FATAL_ERROR)
++endif()
++if(messageType)
++message(${messageType} "The qt5_use_modules macro is 
obsolete. Use target_link_libraries with IMPORTED targets instead.")
++endif()
++endif()
++
++if (NOT TARGET ${_target})
++message(FATAL_ERROR "The first argument to qt5_use_modules must 
be an existing target.")
++endif()
++if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" 
STREQUAL "LINK_PRIVATE" )
++set(_qt5_modules ${ARGN})
++set(_qt5_link_type ${_link_type})
++else()
++set(_qt5_modules ${_link_type} ${ARGN})
++endif()
++
++if ("${_qt5_modules}" STREQUAL "")
++message(FATAL_ERROR "qt5_use_modules requires at least one Qt 
module to use.")
++endif()
++
++foreach(_module ${_qt5_modules})
++if (NOT Qt5${_module}_FOUND)
++find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" 
NO_DEFAULT_PATH)
++if (NOT Qt5${_module}_FOUND)
++message(FATAL_ERROR "Can not use \"${_module}\" module 
which has not yet been found.")
++endif()
++endif()
++target_link_libraries(${_target} ${_qt5_link_type} 
${Qt5${_module}_LIBRARIES})
++set_property(TARGET ${_target} APPEND PROPERTY 
INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS})
++set_property(TARGET ${_target} APPEND PROPERTY 
COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS})
++set_property(TARGET ${_target} APPEND PROPERTY 
COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
++set_property(TARGET ${_target} APPEND PROPERTY 
COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
++set_property(TARGET ${_target} APPEND PROPERTY 
COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
++if (Qt5_POSITION_INDEPENDENT_CODE
++AND (CMAKE_VERSION VERSION_LESS 2.8.12
++AND (NOT CMAKE_CXX_COMPILER_ID

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

2018-02-22 Thread Andreas Sturmlechner

commit: 0187047ebc112e073b31c7753d4d07d23a31c57a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Feb 22 19:49:40 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 22:14:14 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0187047e

dev-qt/qtcore: Enforce qtchooser qt5-default, block pre-switch qtcore:4

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qtcore/{qtcore-5.10.1.ebuild => qtcore-5.10.1-r1.ebuild} | 4 +++-
 dev-qt/qtcore/qtcore-5.11.0_alpha.ebuild| 4 +++-
 dev-qt/qtcore/qtcore-5.11..ebuild   | 4 +++-
 dev-qt/qtcore/qtcore-5.9..ebuild| 4 +++-
 dev-qt/qtcore/qtcore-5..ebuild  | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.10.1.ebuild 
b/dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
similarity index 96%
rename from dev-qt/qtcore/qtcore-5.10.1.ebuild
rename to dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
index 368fe44d..9e4d7aab 100644
--- a/dev-qt/qtcore/qtcore-5.10.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.1-r1.ebuild
@@ -22,7 +22,9 @@ DEPEND="
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+   !

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

2018-02-06 Thread Michael Palimaka

commit: 6d5b33f7c7c9cd0b791313a3946caedc7dd9
Author: Psi 
AuthorDate: Tue Feb  6 12:30:29 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Feb  6 12:32:30 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6d5b33f7

dev-qt/qtcore: add support for mangling QT_NO_WIDGETS

Bug: https://bugs.gentoo.org/646504
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtcore/qtcore-5.10.0.ebuild| 8 
 dev-qt/qtcore/qtcore-5.10..ebuild | 8 
 dev-qt/qtcore/qtcore-5.11..ebuild | 8 
 dev-qt/qtcore/qtcore-5.9..ebuild  | 4 ++--
 dev-qt/qtcore/qtcore-5..ebuild| 4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.10.0.ebuild 
b/dev-qt/qtcore/qtcore-5.10.0.ebuild
index d2aa31ee..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.10.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.0.ebuild
@@ -54,10 +54,10 @@ src_install() {
qt5-build_src_install
 
local flags=(
-   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG 
FREETYPE
-   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY 
MITSHM
-   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
-   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

diff --git a/dev-qt/qtcore/qtcore-5.10..ebuild 
b/dev-qt/qtcore/qtcore-5.10..ebuild
index d2aa31ee..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.10..ebuild
+++ b/dev-qt/qtcore/qtcore-5.10..ebuild
@@ -54,10 +54,10 @@ src_install() {
qt5-build_src_install
 
local flags=(
-   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG 
FREETYPE
-   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY 
MITSHM
-   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
-   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

diff --git a/dev-qt/qtcore/qtcore-5.11..ebuild 
b/dev-qt/qtcore/qtcore-5.11..ebuild
index d2aa31ee..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.11..ebuild
+++ b/dev-qt/qtcore/qtcore-5.11..ebuild
@@ -54,10 +54,10 @@ src_install() {
qt5-build_src_install
 
local flags=(
-   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG 
FREETYPE
-   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY 
MITSHM
-   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
-   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

diff --git a/dev-qt/qtcore/qtcore-5.9..ebuild 
b/dev-qt/qtcore/qtcore-5.9..ebuild
index 54eb30f5..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5.9..ebuild
+++ b/dev-qt/qtcore/qtcore-5.9..ebuild
@@ -56,8 +56,8 @@ src_install() {
local flags=(
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
-   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
-   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 54eb30f5..368fe44d 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -56,8 +56,8 @@ src_install() {
local flags=(
ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
-   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
-   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+   XCURSOR XFIXES XKB XRANDR XRENDER XSYNC ZLIB
)
 
for flag in ${flags[@]}; do

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

2018-02-02 Thread Michael Palimaka

commit: ca05e01917d000e2a1f6bfd2aba2c8fa5290675a
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 26 06:44:36 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 11:53:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ca05e019

dev-qt/qtcore: add QT5_GENTOO_PRIVATE_CONFIG

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtcore/qtcore-5.10.0.ebuild| 9 -
 dev-qt/qtcore/qtcore-5.10..ebuild | 9 -
 dev-qt/qtcore/qtcore-5.11..ebuild | 7 +++
 dev-qt/qtcore/qtcore-5.9.4.ebuild | 7 +++
 dev-qt/qtcore/qtcore-5.9..ebuild  | 9 -
 dev-qt/qtcore/qtcore-5..ebuild| 9 -
 6 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.10.0.ebuild 
b/dev-qt/qtcore/qtcore-5.10.0.ebuild
index b568c54d..d2aa31ee 100644
--- a/dev-qt/qtcore/qtcore-5.10.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.10.0.ebuild
@@ -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
 
 EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   !:network
+   !:sql
+   !:testlib
+   !:xml
+)
+
 src_configure() {
local myconf=(
$(qt_use icu)

diff --git a/dev-qt/qtcore/qtcore-5.10..ebuild 
b/dev-qt/qtcore/qtcore-5.10..ebuild
index b568c54d..d2aa31ee 100644
--- a/dev-qt/qtcore/qtcore-5.10..ebuild
+++ b/dev-qt/qtcore/qtcore-5.10..ebuild
@@ -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
 
 EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   !:network
+   !:sql
+   !:testlib
+   !:xml
+)
+
 src_configure() {
local myconf=(
$(qt_use icu)

diff --git a/dev-qt/qtcore/qtcore-5.11..ebuild 
b/dev-qt/qtcore/qtcore-5.11..ebuild
index 970e630d..d2aa31ee 100644
--- a/dev-qt/qtcore/qtcore-5.11..ebuild
+++ b/dev-qt/qtcore/qtcore-5.11..ebuild
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   !:network
+   !:sql
+   !:testlib
+   !:xml
+)
+
 src_configure() {
local myconf=(
$(qt_use icu)

diff --git a/dev-qt/qtcore/qtcore-5.9.4.ebuild 
b/dev-qt/qtcore/qtcore-5.9.4.ebuild
index bce7aeab..54eb30f5 100644
--- a/dev-qt/qtcore/qtcore-5.9.4.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.4.ebuild
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   !:network
+   !:sql
+   !:testlib
+   !:xml
+)
+
 src_configure() {
local myconf=(
$(qt_use icu)

diff --git a/dev-qt/qtcore/qtcore-5.9..ebuild 
b/dev-qt/qtcore/qtcore-5.9..ebuild
index 779bc30c..54eb30f5 100644
--- a/dev-qt/qtcore/qtcore-5.9..ebuild
+++ b/dev-qt/qtcore/qtcore-5.9..ebuild
@@ -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
 
 EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   !:network
+   !:sql
+   !:testlib
+   !:xml
+)
+
 src_configure() {
local myconf=(
$(qt_use icu)

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 779bc30c..54eb30f5 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -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
 
 EAPI=6
@@ -34,6 +34,13 @@ QT5_TARGET_SUBDIRS=(
doc
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   !:network
+   !:sql
+   !:testlib
+   !:xml
+)
+
 src_configure() {
local myconf=(
$(qt_use icu)

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

2017-12-09 Thread Jimi Huotari

commit: 4a318f4fe92e2b8a987920e5579222dacf5968fc
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sat Dec  9 12:12:10 2017 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sat Dec  9 12:57:53 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4a318f4f

dev-qt/qtcore: add 'src/tools/qvkgen' to subdirs

Building 'dev-qt/qtgui' will fail without this new tool.

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 dev-qt/qtcore/qtcore-5.10..ebuild | 1 +
 dev-qt/qtcore/qtcore-5..ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-5.10..ebuild 
b/dev-qt/qtcore/qtcore-5.10..ebuild
index b568c54d..bbe1ad96 100644
--- a/dev-qt/qtcore/qtcore-5.10..ebuild
+++ b/dev-qt/qtcore/qtcore-5.10..ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
+   src/tools/qvkgen
doc
 )
 

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 779bc30c..0dcfb236 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
+   src/tools/qvkgen
doc
 )

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

2017-09-08 Thread Michael Palimaka

commit: c00c316dcf9e123f2d1eeeabd11774a8a491dafc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Aug  7 14:26:26 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Sep  8 15:51:58 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c00c316d

dev-qt/qtcore: replicate ifdefs removed in >=5.8

Gentoo-bug: 620348
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtcore/qtcore-5.10..ebuild | 22 ++
 dev-qt/qtcore/qtcore-5.9.1.ebuild | 22 ++
 dev-qt/qtcore/qtcore-5.9..ebuild  | 22 ++
 dev-qt/qtcore/qtcore-5..ebuild| 22 ++
 4 files changed, 88 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-5.10..ebuild 
b/dev-qt/qtcore/qtcore-5.10..ebuild
index 175000e7..b568c54d 100644
--- a/dev-qt/qtcore/qtcore-5.10..ebuild
+++ b/dev-qt/qtcore/qtcore-5.10..ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
 }
+
+src_install() {
+   qt5-build_src_install
+
+   local flags=(
+   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG 
FREETYPE
+   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY 
MITSHM
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   )
+
+   for flag in ${flags[@]}; do
+   cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || 
die
+
+   #if defined(QT_NO_${flag}) && defined(QT_${flag})
+   # undef QT_NO_${flag}
+   #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+   # define QT_NO_${flag}
+   #endif
+   _EOF_
+   done
+}

diff --git a/dev-qt/qtcore/qtcore-5.9.1.ebuild 
b/dev-qt/qtcore/qtcore-5.9.1.ebuild
index 175000e7..779bc30c 100644
--- a/dev-qt/qtcore/qtcore-5.9.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.1.ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
 }
+
+src_install() {
+   qt5-build_src_install
+
+   local flags=(
+   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   )
+
+   for flag in ${flags[@]}; do
+   cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || 
die
+
+   #if defined(QT_NO_${flag}) && defined(QT_${flag})
+   # undef QT_NO_${flag}
+   #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+   # define QT_NO_${flag}
+   #endif
+   _EOF_
+   done
+}

diff --git a/dev-qt/qtcore/qtcore-5.9..ebuild 
b/dev-qt/qtcore/qtcore-5.9..ebuild
index 175000e7..779bc30c 100644
--- a/dev-qt/qtcore/qtcore-5.9..ebuild
+++ b/dev-qt/qtcore/qtcore-5.9..ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
 }
+
+src_install() {
+   qt5-build_src_install
+
+   local flags=(
+   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   )
+
+   for flag in ${flags[@]}; do
+   cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || 
die
+
+   #if defined(QT_NO_${flag}) && defined(QT_${flag})
+   # undef QT_NO_${flag}
+   #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+   # define QT_NO_${flag}
+   #endif
+   _EOF_
+   done
+}

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 175000e7..779bc30c 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -42,3 +42,25 @@ src_configure() {
)
qt5-build_src_configure
 }
+
+src_install() {
+   qt5-build_src_install
+
+   local flags=(
+   ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+   HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+   OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR
+   XFIXES XKB XRANDR XRENDER XSYNC ZLIB
+   )
+
+   for flag in ${flags[@]}; do
+   cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || 
die
+
+   #if defined(QT_NO_${flag}) && defined(QT_${flag})
+   # undef QT_NO_${flag}
+   #elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+   # define

[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtxml/, dev-qt/qtbluetooth/, dev-qt/qtplugininfo/, ...

2017-07-03 Thread Michael Palimaka

commit: b9780af0e48af1917ae9edb289f6b7c6116537a5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Jul  3 12:10:25 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jul  3 12:13:13 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b9780af0

dev-qt: version bump 5.9.1

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-qt/assistant/Manifest  |   1 +
 dev-qt/assistant/assistant-5.9.1.ebuild|  37 +
 dev-qt/designer/Manifest   |   1 +
 dev-qt/designer/designer-5.9.1.ebuild  |  40 +
 dev-qt/linguist-tools/Manifest |   1 +
 dev-qt/linguist-tools/linguist-tools-5.9.1.ebuild  |  35 +
 dev-qt/linguist/Manifest   |   1 +
 dev-qt/linguist/linguist-5.9.1.ebuild  |  28 
 dev-qt/pixeltool/Manifest  |   1 +
 dev-qt/pixeltool/pixeltool-5.9.1.ebuild|  25 
 dev-qt/qdbus/Manifest  |   1 +
 dev-qt/qdbus/qdbus-5.9.1.ebuild|  25 
 dev-qt/qdbusviewer/Manifest|   1 +
 dev-qt/qdbusviewer/qdbusviewer-5.9.1.ebuild|  27 
 dev-qt/qdoc/Manifest   |   1 +
 dev-qt/qdoc/qdoc-5.9.1.ebuild  |  31 
 dev-qt/qt3d/Manifest   |   1 +
 dev-qt/qt3d/qt3d-5.9.1.ebuild  |  35 +
 dev-qt/qtbluetooth/Manifest|   1 +
 dev-qt/qtbluetooth/qtbluetooth-5.9.1.ebuild|  33 +
 dev-qt/qtcharts/Manifest   |   1 +
 dev-qt/qtcharts/qtcharts-5.9.1.ebuild  |  29 
 dev-qt/qtconcurrent/Manifest   |   1 +
 dev-qt/qtconcurrent/qtconcurrent-5.9.1.ebuild  |  23 +++
 dev-qt/qtcore/Manifest |   1 +
 dev-qt/qtcore/qtcore-5.9.1.ebuild  |  44 ++
 dev-qt/qtdatavis3d/Manifest|   1 +
 dev-qt/qtdatavis3d/qtdatavis3d-5.9.1.ebuild|  31 
 dev-qt/qtdbus/Manifest |   1 +
 dev-qt/qtdbus/qtdbus-5.9.1.ebuild  |  38 +
 dev-qt/qtdeclarative/Manifest  |   1 +
 dev-qt/qtdeclarative/qtdeclarative-5.9.1.ebuild|  56 +++
 dev-qt/qtdiag/Manifest |   1 +
 dev-qt/qtdiag/qtdiag-5.9.1.ebuild  |  25 
 dev-qt/qtgraphicaleffects/Manifest |   1 +
 .../qtgraphicaleffects-5.9.1.ebuild|  21 +++
 dev-qt/qtgui/Manifest  |   1 +
 dev-qt/qtgui/qtgui-5.9.1.ebuild| 164 +
 dev-qt/qthelp/Manifest |   1 +
 dev-qt/qthelp/qthelp-5.9.1.ebuild  |  30 
 dev-qt/qtimageformats/Manifest |   1 +
 dev-qt/qtimageformats/qtimageformats-5.9.1.ebuild  |  23 +++
 dev-qt/qtlocation/Manifest |   1 +
 dev-qt/qtlocation/qtlocation-5.9.1.ebuild  |  32 
 dev-qt/qtmultimedia/Manifest   |   1 +
 dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild  |  76 ++
 dev-qt/qtnetwork/Manifest  |   1 +
 dev-qt/qtnetwork/qtnetwork-5.9.1.ebuild|  53 +++
 dev-qt/qtnetworkauth/Manifest  |   1 +
 dev-qt/qtnetworkauth/qtnetworkauth-5.9.1.ebuild|  20 +++
 dev-qt/qtopengl/Manifest   |   1 +
 dev-qt/qtopengl/qtopengl-5.9.1.ebuild  |  34 +
 dev-qt/qtpaths/Manifest|   1 +
 dev-qt/qtpaths/qtpaths-5.9.1.ebuild|  23 +++
 dev-qt/qtplugininfo/Manifest   |   1 +
 dev-qt/qtplugininfo/qtplugininfo-5.9.1.ebuild  |  23 +++
 dev-qt/qtpositioning/Manifest  |   1 +
 dev-qt/qtpositioning/qtpositioning-5.9.1.ebuild|  37 +
 dev-qt/qtprintsupport/Manifest |   1 +
 dev-qt/qtprintsupport/qtprintsupport-5.9.1.ebuild  |  42 ++
 dev-qt/qtquickcontrols/Manifest|   1 +
 .../qtquickcontrols/qtquickcontrols-5.9.1.ebuild   |  32 
 dev-qt/qtquickcontrols2/Manifest   |   1 +
 .../qtquickcontrols2/qtquickcontrols2-5.9.1.ebuild |  21 +++
 dev-qt/qtscript/Manifest   |   1 +
 dev-qt/qtscript/qtscript-5.9.1.ebuild  |  36 +
 dev-qt/qtscxml/Manifest|   1 +
 dev-qt/qtscxml/qtscxml-5.9.1.ebuild|  19 +++
 dev-qt/qtsensors/Manifest  |   1 +
 dev-qt/qtsensors/qtsensors-5.9.1.ebuild|  26 
 dev-qt/qtserialport/Manifest   |   1 +
 dev-qt/qtserialport/qtserialport-5.9.1.ebuild  |  27 
 dev-qt/qtsql/Manifest  |   1 +
 dev-qt/qtsql/qtsql-5.9.1.ebuild|  53 +++
 dev-qt/qtsvg/Manifest

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

2017-04-18 Thread Davide Pesavento

commit: 346765882df9096eeca6856d6f45d8f24439e39c
Author: Jimi Huotari  gentoo  org>
AuthorDate: Mon Apr 17 13:22:00 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Apr 18 16:11:53 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=34676588

dev-qt/qtcore: Switch to libpcre2

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qtcore/qtcore-5..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 6e111d62..cce06a22 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -16,8 +16,8 @@ IUSE="icu systemd"
 DEPEND="
dev-libs/double-conversion:=
dev-libs/glib:2
-   >=dev-libs/libpcre-8.38[pcre16,unicode]
-   >=sys-libs/zlib-1.2.5
+   dev-libs/libpcre2[pcre16,unicode]
+   sys-libs/zlib
icu? ( dev-libs/icu:= )
!icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )

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

2017-04-18 Thread Davide Pesavento

commit: 685469744619d170ff18bf8974f9fd9ca1dfd3ce
Author: Jimi Huotari  gentoo  org>
AuthorDate: Mon Apr 17 13:25:37 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Apr 18 16:13:20 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=68546974

dev-qt/qtcore: Add 'src/tools/qfloat16-tables' to target subdirs

This directory needs to have been processed before 'src/corelib', or
the compilation will fail.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qtcore/qtcore-5..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index cce06a22..175000e7 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -28,6 +28,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc
src/tools/rcc
+   src/tools/qfloat16-tables
src/corelib
src/tools/qlalr
doc

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

2017-03-14 Thread Davide Pesavento

commit: b9c3b54ae7058423ab3b545a468ff669bff5aad8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Wed Mar 15 00:23:12 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Wed Mar 15 00:23:31 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b9c3b54a

dev-qt/qtcore: cleanup iconv handling

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-qt/qtcore/qtcore-5.8.0.ebuild| 3 ++-
 dev-qt/qtcore/qtcore-5.8..ebuild | 3 ++-
 dev-qt/qtcore/qtcore-5..ebuild   | 3 ++-
 eclass/qt5-build.eclass  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild 
b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
local myconf=(
-system-doubleconversion
-   $(usex icu '-icu -no-iconv' '-iconv -no-icu')
+   $(qt_use icu)
+   $(qt_use !icu iconv)
$(qt_use systemd journald)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5.8..ebuild 
b/dev-qt/qtcore/qtcore-5.8..ebuild
index 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.8..ebuild
+++ b/dev-qt/qtcore/qtcore-5.8..ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
local myconf=(
-system-doubleconversion
-   $(usex icu '-icu -no-iconv' '-iconv -no-icu')
+   $(qt_use icu)
+   $(qt_use !icu iconv)
$(qt_use systemd journald)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
local myconf=(
-system-doubleconversion
-   $(usex icu '-icu -no-iconv' '-iconv -no-icu')
+   $(qt_use icu)
+   $(qt_use !icu iconv)
$(qt_use systemd journald)
)
qt5-build_src_configure

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index dc70b831..97659d23 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -627,7 +627,8 @@ qt5_base_configure() {
-verbose
 
# always enable iconv support
-   -iconv
+   # 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

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

2017-01-25 Thread Michael Palimaka

commit: a7eb647324892b8b155516e6aa9e6dd36d695837
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 25 18:29:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 25 18:30:10 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a7eb6473

dev-qt/qtcore: use system dev-libs/double-conversion

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-qt/qtcore/qtcore-5.8.0.ebuild| 3 ++-
 dev-qt/qtcore/qtcore-5.8..ebuild | 3 ++-
 dev-qt/qtcore/qtcore-5..ebuild   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild 
b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 79ce95f..1a9bc8c 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -14,8 +14,8 @@ fi
 
 IUSE="icu systemd"
 
-# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
+   dev-libs/double-conversion:=
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
@@ -36,6 +36,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
local myconf=(
+   -system-doubleconversion
$(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)

diff --git a/dev-qt/qtcore/qtcore-5.8..ebuild 
b/dev-qt/qtcore/qtcore-5.8..ebuild
index 79ce95f..1a9bc8c 100644
--- a/dev-qt/qtcore/qtcore-5.8..ebuild
+++ b/dev-qt/qtcore/qtcore-5.8..ebuild
@@ -14,8 +14,8 @@ fi
 
 IUSE="icu systemd"
 
-# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
+   dev-libs/double-conversion:=
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
@@ -36,6 +36,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
local myconf=(
+   -system-doubleconversion
$(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 79ce95f..1a9bc8c 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -14,8 +14,8 @@ fi
 
 IUSE="icu systemd"
 
-# TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
+   dev-libs/double-conversion:=
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
@@ -36,6 +36,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
local myconf=(
+   -system-doubleconversion
$(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)

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

2017-01-25 Thread Michael Palimaka

commit: fd78df39dfe6fbc13d8e3358157dcf3201ef12bc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jan 25 17:23:51 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jan 25 17:24:17 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=fd78df39

dev-qt/qtcore: disable iconv if icu is enabled

See qtbase commit fd9e5d90333c385ad191a289b2e95e918c58b242.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-qt/qtcore/qtcore-5.8.0.ebuild| 4 ++--
 dev-qt/qtcore/qtcore-5.8..ebuild | 6 +++---
 dev-qt/qtcore/qtcore-5..ebuild   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild 
b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 02eb34e..79ce95f 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -19,8 +19,8 @@ DEPEND="
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
-   virtual/libiconv
icu? ( dev-libs/icu:= )
+   !icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
local myconf=(
-   $(qt_use icu)
+   $(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5.8..ebuild 
b/dev-qt/qtcore/qtcore-5.8..ebuild
index ad9f43c..79ce95f 100644
--- a/dev-qt/qtcore/qtcore-5.8..ebuild
+++ b/dev-qt/qtcore/qtcore-5.8..ebuild
@@ -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
 # $Id$
 
@@ -19,8 +19,8 @@ DEPEND="
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
-   virtual/libiconv
icu? ( dev-libs/icu:= )
+   !icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
local myconf=(
-   $(qt_use icu)
+   $(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index ad9f43c..79ce95f 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -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
 # $Id$
 
@@ -19,8 +19,8 @@ DEPEND="
dev-libs/glib:2
>=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
-   virtual/libiconv
icu? ( dev-libs/icu:= )
+   !icu? ( virtual/libiconv )
systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
@@ -36,7 +36,7 @@ QT5_TARGET_SUBDIRS=(
 
 src_configure() {
local myconf=(
-   $(qt_use icu)
+   $(usex icu '-icu -no-iconv' '-iconv -no-icu')
$(qt_use systemd journald)
)
qt5-build_src_configure

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

2016-11-30 Thread Michael Palimaka

commit: eb2fcb6851f7442f90f8be85b2c3d7d00f8de646
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Oct  6 17:59:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Nov 30 17:22:50 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb2fcb68

dev-qt/qtcore: Add 'doc' submodule

Fixes install-phase that was broken due to the following upstream
change:

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

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

Package-Manager: portage-2.3.1

 dev-qt/qtcore/qtcore-5.6..ebuild | 1 +
 dev-qt/qtcore/qtcore-5.7..ebuild | 1 +
 dev-qt/qtcore/qtcore-5.8..ebuild | 1 +
 dev-qt/qtcore/qtcore-5..ebuild   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-5.6..ebuild 
b/dev-qt/qtcore/qtcore-5.6..ebuild
index 25061d7..e53c62d 100644
--- a/dev-qt/qtcore/qtcore-5.6..ebuild
+++ b/dev-qt/qtcore/qtcore-5.6..ebuild
@@ -30,6 +30,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+   doc
 )
 
 src_configure() {

diff --git a/dev-qt/qtcore/qtcore-5.7..ebuild 
b/dev-qt/qtcore/qtcore-5.7..ebuild
index b1842b1..ad9f43c 100644
--- a/dev-qt/qtcore/qtcore-5.7..ebuild
+++ b/dev-qt/qtcore/qtcore-5.7..ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+   doc
 )
 
 src_configure() {

diff --git a/dev-qt/qtcore/qtcore-5.8..ebuild 
b/dev-qt/qtcore/qtcore-5.8..ebuild
index b1842b1..ad9f43c 100644
--- a/dev-qt/qtcore/qtcore-5.8..ebuild
+++ b/dev-qt/qtcore/qtcore-5.8..ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+   doc
 )
 
 src_configure() {

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index b1842b1..ad9f43c 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -31,6 +31,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
src/tools/qlalr
+   doc
 )
 
 src_configure() {

[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtxml/, dev-qt/qt3d/, dev-qt/qtlocation/, ...

2016-08-18 Thread Davide Pesavento

commit: 0b1d79c1b563f02d81228e173c1fa9bfb0046dde
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Aug 18 22:32:02 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Aug 18 22:32:02 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=0b1d79c1

dev-qt: add live ebuilds for the 5.8 branch

 dev-qt/assistant/assistant-5.8..ebuild |  38 +
 dev-qt/designer/designer-5.8..ebuild   |  41 +
 .../linguist-tools/linguist-tools-5.8..ebuild  |  36 +
 dev-qt/linguist/linguist-5.8..ebuild   |  29 
 dev-qt/pixeltool/pixeltool-5.8..ebuild |  27 
 dev-qt/qdbus/qdbus-5.8..ebuild |  26 +++
 dev-qt/qdbusviewer/qdbusviewer-5.8..ebuild |  28 
 dev-qt/qdoc/qdoc-5.8..ebuild   |  25 +++
 dev-qt/qt3d/qt3d-5.8..ebuild   |  22 +++
 dev-qt/qtbluetooth/qtbluetooth-5.8..ebuild |  34 
 dev-qt/qtcharts/qtcharts-5.8..ebuild   |  30 
 dev-qt/qtconcurrent/qtconcurrent-5.8..ebuild   |  24 +++
 dev-qt/qtcore/qtcore-5.8..ebuild   |  42 +
 dev-qt/qtdatavis3d/qtdatavis3d-5.8..ebuild |  32 
 dev-qt/qtdbus/qtdbus-5.8..ebuild   |  39 +
 dev-qt/qtdeclarative/qtdeclarative-5.8..ebuild |  53 +++
 dev-qt/qtdiag/qtdiag-5.8..ebuild   |  26 +++
 .../qtgraphicaleffects-5.8..ebuild |  22 +++
 dev-qt/qtgui/qtgui-5.8..ebuild | 175 +
 dev-qt/qthelp/qthelp-5.8..ebuild   |  32 
 .../qtimageformats/qtimageformats-5.8..ebuild  |  24 +++
 dev-qt/qtlocation/qtlocation-5.8..ebuild   |  30 
 dev-qt/qtmultimedia/qtmultimedia-5.8..ebuild   |  77 +
 dev-qt/qtnetwork/qtnetwork-5.8..ebuild |  54 +++
 dev-qt/qtopengl/qtopengl-5.8..ebuild   |  35 +
 dev-qt/qtpaths/qtpaths-5.8..ebuild |  24 +++
 dev-qt/qtplugininfo/qtplugininfo-5.8..ebuild   |  24 +++
 dev-qt/qtpositioning/qtpositioning-5.8..ebuild |  35 +
 .../qtprintsupport/qtprintsupport-5.8..ebuild  |  43 +
 .../qtquickcontrols-5.8..ebuild|  33 
 .../qtquickcontrols2-5.8..ebuild   |  22 +++
 dev-qt/qtscript/qtscript-5.8..ebuild   |  37 +
 dev-qt/qtscxml/qtscxml-5.8..ebuild |  20 +++
 dev-qt/qtsensors/qtsensors-5.8..ebuild |  27 
 dev-qt/qtserialport/qtserialport-5.8..ebuild   |  28 
 dev-qt/qtsql/qtsql-5.8..ebuild |  54 +++
 dev-qt/qtsvg/qtsvg-5.8..ebuild |  24 +++
 dev-qt/qttest/qttest-5.8..ebuild   |  30 
 .../qttranslations/qttranslations-5.8..ebuild  |  20 +++
 dev-qt/qtwayland/qtwayland-5.8..ebuild |  41 +
 dev-qt/qtwebchannel/qtwebchannel-5.8..ebuild   |  27 
 dev-qt/qtwebengine/qtwebengine-5.8..ebuild |  92 +++
 dev-qt/qtwebkit/qtwebkit-5.8..ebuild   | 108 +
 dev-qt/qtwebsockets/qtwebsockets-5.8..ebuild   |  28 
 dev-qt/qtwidgets/qtwidgets-5.8..ebuild |  42 +
 dev-qt/qtx11extras/qtx11extras-5.8..ebuild |  22 +++
 dev-qt/qtxml/qtxml-5.8..ebuild |  26 +++
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.8..ebuild |  20 +++
 48 files changed, 1828 insertions(+)

diff --git a/dev-qt/assistant/assistant-5.8..ebuild 
b/dev-qt/assistant/assistant-5.8..ebuild
new file mode 100644
index 000..bd7939c
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.8..ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+   ~dev-qt/qtcore-${PV}
+   ~dev-qt/qtgui-${PV}
+   ~dev-qt/qthelp-${PV}
+   ~dev-qt/qtnetwork-${PV}
+   ~dev-qt/qtprintsupport-${PV}
+   ~dev-qt/qtsql-${PV}[sqlite]
+   ~dev-qt/qtwidgets-${PV}
+   webkit? ( ~dev-qt/qtwebkit-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+   src/assistant/assistant
+)
+
+src_prepare() {
+   qt_use_disable_mod webkit webkitwidgets \
+   src/assistant/assistant/assistant.pro
+
+   qt5-build_src_prepare
+}

diff --git a/dev-qt/designer/designer-5.8..ebuild 
b/dev-qt/designer/designer-5.8..ebuild
new file mode 100644
index 000..716dfbe
--- /dev/null
+++ b/dev-qt/designer/designer-5.8..ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="WYSIWYG tool for designing and

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

2016-06-14 Thread Davide Pesavento

commit: 60f473fa8ea41ee9fce1ae80263b56712a305fbc
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Jun 14 18:58:07 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Jun 14 18:58:07 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=60f473fa

dev-qt: Qt 5.6.1 moved to the main tree

Package-Manager: portage-2.3.0_rc1

 dev-qt/assistant/Manifest  |   1 -
 dev-qt/assistant/assistant-5.6.1.ebuild|  38 -
 dev-qt/designer/Manifest   |   1 -
 dev-qt/designer/designer-5.6.1.ebuild  |  41 -
 dev-qt/linguist-tools/Manifest |   1 -
 dev-qt/linguist-tools/linguist-tools-5.6.1.ebuild  |  36 -
 dev-qt/linguist/Manifest   |   1 -
 dev-qt/linguist/linguist-5.6.1.ebuild  |  29 
 dev-qt/pixeltool/Manifest  |   1 -
 dev-qt/pixeltool/pixeltool-5.6.1.ebuild|  27 
 dev-qt/qdbus/Manifest  |   1 -
 dev-qt/qdbus/qdbus-5.6.1.ebuild|  26 ---
 dev-qt/qdbusviewer/Manifest|   1 -
 dev-qt/qdbusviewer/qdbusviewer-5.6.1.ebuild|  28 
 dev-qt/qdoc/Manifest   |   1 -
 dev-qt/qdoc/qdoc-5.6.1.ebuild  |  25 ---
 dev-qt/qtbluetooth/Manifest|   1 -
 dev-qt/qtbluetooth/qtbluetooth-5.6.1.ebuild|  34 
 dev-qt/qtconcurrent/Manifest   |   1 -
 dev-qt/qtconcurrent/qtconcurrent-5.6.1.ebuild  |  24 ---
 dev-qt/qtcore/Manifest |   1 -
 dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch  |  56 ---
 dev-qt/qtcore/qtcore-5.6.1.ebuild  |  41 -
 dev-qt/qtdbus/Manifest |   1 -
 dev-qt/qtdbus/qtdbus-5.6.1.ebuild  |  39 -
 dev-qt/qtdeclarative/Manifest  |   1 -
 dev-qt/qtdeclarative/qtdeclarative-5.6.1.ebuild|  51 --
 dev-qt/qtdiag/Manifest |   1 -
 dev-qt/qtdiag/qtdiag-5.6.1.ebuild  |  26 ---
 dev-qt/qtgraphicaleffects/Manifest |   1 -
 .../qtgraphicaleffects-5.6.1.ebuild|  22 ---
 dev-qt/qtgui/Manifest  |   1 -
 dev-qt/qtgui/qtgui-5.6.1.ebuild| 175 -
 dev-qt/qthelp/Manifest |   1 -
 dev-qt/qthelp/qthelp-5.6.1.ebuild  |  32 
 dev-qt/qtimageformats/Manifest |   1 -
 dev-qt/qtimageformats/qtimageformats-5.6.1.ebuild  |  24 ---
 dev-qt/qtlocation/Manifest |   1 -
 dev-qt/qtlocation/qtlocation-5.6.1.ebuild  |  30 
 dev-qt/qtmultimedia/Manifest   |   1 -
 dev-qt/qtmultimedia/qtmultimedia-5.6.1.ebuild  |  77 -
 dev-qt/qtnetwork/Manifest  |   1 -
 dev-qt/qtnetwork/qtnetwork-5.6.1.ebuild|  54 ---
 dev-qt/qtopengl/Manifest   |   1 -
 dev-qt/qtopengl/qtopengl-5.6.1.ebuild  |  35 -
 dev-qt/qtpaths/Manifest|   1 -
 dev-qt/qtpaths/qtpaths-5.6.1.ebuild|  24 ---
 dev-qt/qtplugininfo/Manifest   |   1 -
 dev-qt/qtplugininfo/qtplugininfo-5.6.1.ebuild  |  24 ---
 dev-qt/qtpositioning/Manifest  |   1 -
 dev-qt/qtpositioning/qtpositioning-5.6.1.ebuild|  35 -
 dev-qt/qtprintsupport/Manifest |   1 -
 dev-qt/qtprintsupport/qtprintsupport-5.6.1.ebuild  |  43 -
 dev-qt/qtquickcontrols/Manifest|   1 -
 .../qtquickcontrols/qtquickcontrols-5.6.1.ebuild   |  33 
 dev-qt/qtscript/Manifest   |   1 -
 dev-qt/qtscript/qtscript-5.6.1.ebuild  |  37 -
 dev-qt/qtsensors/Manifest  |   1 -
 dev-qt/qtsensors/qtsensors-5.6.1.ebuild|  27 
 dev-qt/qtserialport/Manifest   |   1 -
 dev-qt/qtserialport/qtserialport-5.6.1.ebuild  |  28 
 dev-qt/qtsql/Manifest  |   1 -
 dev-qt/qtsql/qtsql-5.6.1.ebuild|  54 ---
 dev-qt/qtsvg/Manifest  |   1 -
 dev-qt/qtsvg/qtsvg-5.6.1.ebuild|  24 ---
 dev-qt/qttest/Manifest |   1 -
 dev-qt/qttest/qttest-5.6.1.ebuild  |  30 
 dev-qt/qttranslations/Manifest |   1 -
 dev-qt/qttranslations/qttranslations-5.6.1.ebuild  |  20 ---
 dev-qt/qtwayland/Manifest  |   1 -
 dev-qt/qtwayland/qtwayland-5.6.1.ebuild|  41 -
 dev-qt/qtwebchannel/Manifest   |   1 -
 dev-qt/qtwebchannel/qtwebchannel-5.6.1.ebuild  |  27 
 dev-qt/qtwebengine/Manifest|   1 -

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

2016-04-24 Thread Davide Pesavento

commit: a3e8d5f4bfe6557ef38692a29c788a12b663900e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Apr 24 15:44:18 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Apr 24 15:44:18 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a3e8d5f4

dev-qt/qtcore: use := on systemd dependency

We link against libsystemd.

Package-Manager: portage-2.2.28

 dev-qt/qtcore/qtcore-5.6..ebuild   | 2 +-
 dev-qt/qtcore/qtcore-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.7..ebuild   | 2 +-
 dev-qt/qtcore/qtcore-5..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.6..ebuild 
b/dev-qt/qtcore/qtcore-5.6..ebuild
index c19d231..9404055 100644
--- a/dev-qt/qtcore/qtcore-5.6..ebuild
+++ b/dev-qt/qtcore/qtcore-5.6..ebuild
@@ -20,7 +20,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
-   systemd? ( sys-apps/systemd )
+   systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild 
b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
index df7d48e..1119dc0 100644
--- a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
-   systemd? ( sys-apps/systemd )
+   systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtcore/qtcore-5.7..ebuild 
b/dev-qt/qtcore/qtcore-5.7..ebuild
index df7d48e..1119dc0 100644
--- a/dev-qt/qtcore/qtcore-5.7..ebuild
+++ b/dev-qt/qtcore/qtcore-5.7..ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
-   systemd? ( sys-apps/systemd )
+   systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index df7d48e..1119dc0 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -21,7 +21,7 @@ DEPEND="
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
-   systemd? ( sys-apps/systemd )
+   systemd? ( sys-apps/systemd:= )
 "
 RDEPEND="${DEPEND}"

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

2016-04-24 Thread Davide Pesavento

commit: f1c66749c739db5e7b468af1abc238a29cba8bd0
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Apr 24 15:52:34 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Apr 24 15:52:34 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f1c66749

dev-qt/qtcore: raise libpcre dep and ensure it's built with unicode support

Package-Manager: portage-2.2.28

 dev-qt/qtcore/qtcore-5.6..ebuild   | 2 +-
 dev-qt/qtcore/qtcore-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.7..ebuild   | 2 +-
 dev-qt/qtcore/qtcore-5..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.6..ebuild 
b/dev-qt/qtcore/qtcore-5.6..ebuild
index 9404055..25061d7 100644
--- a/dev-qt/qtcore/qtcore-5.6..ebuild
+++ b/dev-qt/qtcore/qtcore-5.6..ebuild
@@ -16,7 +16,7 @@ IUSE="icu systemd"
 
 DEPEND="
dev-libs/glib:2
-   >=dev-libs/libpcre-8.35[pcre16]
+   >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )

diff --git a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild 
b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
index 1119dc0..b1842b1 100644
--- a/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
+++ b/dev-qt/qtcore/qtcore-5.7.0_beta.ebuild
@@ -17,7 +17,7 @@ IUSE="icu systemd"
 # TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
dev-libs/glib:2
-   >=dev-libs/libpcre-8.35[pcre16]
+   >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )

diff --git a/dev-qt/qtcore/qtcore-5.7..ebuild 
b/dev-qt/qtcore/qtcore-5.7..ebuild
index 1119dc0..b1842b1 100644
--- a/dev-qt/qtcore/qtcore-5.7..ebuild
+++ b/dev-qt/qtcore/qtcore-5.7..ebuild
@@ -17,7 +17,7 @@ IUSE="icu systemd"
 # TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
dev-libs/glib:2
-   >=dev-libs/libpcre-8.35[pcre16]
+   >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 1119dc0..b1842b1 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -17,7 +17,7 @@ IUSE="icu systemd"
 # TODO after bug 581054: dev-libs/double-conversion:=
 DEPEND="
dev-libs/glib:2
-   >=dev-libs/libpcre-8.35[pcre16]
+   >=dev-libs/libpcre-8.38[pcre16,unicode]
>=sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )

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

2016-04-10 Thread Davide Pesavento

commit: 1e739fcf981d6299b73cf6c5611fbbbca611bc66
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Apr 10 13:21:04 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Apr 10 13:21:04 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1e739fcf

dev-qt/qtcore: backport upstream patch fixing build against >=systemd-229-r100

Gentoo-Bug: 578316

Package-Manager: portage-2.2.28

 dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch | 56 +++
 dev-qt/qtcore/qtcore-5.6.0.ebuild |  4 ++
 2 files changed, 60 insertions(+)

diff --git a/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch 
b/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch
new file mode 100644
index 000..edb58d1
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.5.1-libsystemd.patch
@@ -0,0 +1,56 @@
+From c689bcafd3196aad22372e8056fe0ccb13c15f35 Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Fri, 12 Feb 2016 12:37:15 +0100
+Subject: Search for libsystemd first, fall back to libsystemd-journal
+
+systemd >= 209 merged the individual libraries libsystemd-journal,
+libsystemd-login, libsystemd-id128 and libsystemd-daemon into
+a single library, libsystemd. To ease the transition one could pass
+an option to its build to generate stub libraries and matching
+pkg-config files. With systemd >= 229 this option has now been
+removed, causing the build to fail when the journald option is
+enabled.
+
+Change-Id: I26670f207f1a9e79c16be5ce8c8a49353143c5ba
+Reviewed-by: Oswald Buddenhagen 
+Reviewed-by: Robin Burchell 
+---
+ config.tests/unix/journald/journald.pro | 6 +-
+ src/corelib/global/global.pri   | 5 -
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/config.tests/unix/journald/journald.pro 
b/config.tests/unix/journald/journald.pro
+index 2bb50ce..ea76564 100644
+--- a/config.tests/unix/journald/journald.pro
 b/config.tests/unix/journald/journald.pro
+@@ -1,6 +1,10 @@
+ SOURCES = journald.c
+ 
+ CONFIG += link_pkgconfig
+-PKGCONFIG_PRIVATE += libsystemd-journal
++
++packagesExist(libsystemd): \
++PKGCONFIG_PRIVATE += libsystemd
++else: \
++PKGCONFIG_PRIVATE += libsystemd-journal
+ 
+ CONFIG -= qt
+diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
+index aa4945f..dd84695 100644
+--- a/src/corelib/global/global.pri
 b/src/corelib/global/global.pri
+@@ -53,7 +53,10 @@ slog2 {
+ 
+ journald {
+ CONFIG += link_pkgconfig
+-PKGCONFIG_PRIVATE += libsystemd-journal
++packagesExist(libsystemd): \
++PKGCONFIG_PRIVATE += libsystemd
++else: \
++PKGCONFIG_PRIVATE += libsystemd-journal
+ DEFINES += QT_USE_JOURNALD
+ }
+ 
+-- 
+2.8.1
+

diff --git a/dev-qt/qtcore/qtcore-5.6.0.ebuild 
b/dev-qt/qtcore/qtcore-5.6.0.ebuild
index 8bff4ba..ef6a230 100644
--- a/dev-qt/qtcore/qtcore-5.6.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.0.ebuild
@@ -24,6 +24,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-5.5.1-libsystemd.patch" # bug 578316
+)
+
 QT5_TARGET_SUBDIRS=(
src/tools/bootstrap
src/tools/moc

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

2015-05-09 Thread Davide Pesavento

commit: 60509ba13624ef43e3d851a408bbd47824876c02
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Sun May 10 01:15:09 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun May 10 01:15:09 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=60509ba1

[dev-qt/qtcore:4] Sync.

Package-Manager: portage-2.2.18

 dev-qt/qtcore/qtcore-4.8..ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 430907b..2968134 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -11,7 +11,7 @@ DESCRIPTION=Cross-platform application development framework
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=
 else
-   KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 fi
 
 IUSE=+glib iconv icu qt3support ssl
@@ -19,6 +19,7 @@ IUSE=+glib iconv icu qt3support ssl
 DEPEND=
=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+   iconv? ( =virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
ssl? ( =dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )

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

2015-03-25 Thread Davide Pesavento

commit: c64c403ee8aa0ec24c7e9cb52ee04d98a145780c
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Thu Mar 26 01:28:28 2015 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Thu Mar 26 01:28:28 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c64c403e

[dev-qt/qtcore:5] Raise some deps based on the version of bundled copies.

Package-Manager: portage-2.2.18

 dev-qt/qtcore/qtcore-5.4..ebuild | 4 ++--
 dev-qt/qtcore/qtcore-5.5..ebuild | 4 ++--
 dev-qt/qtcore/qtcore-5..ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.4..ebuild 
b/dev-qt/qtcore/qtcore-5.4..ebuild
index 56e57dd..3207c29 100644
--- a/dev-qt/qtcore/qtcore-5.4..ebuild
+++ b/dev-qt/qtcore/qtcore-5.4..ebuild
@@ -20,8 +20,8 @@ IUSE=icu systemd
 
 DEPEND=
dev-libs/glib:2
-   =dev-libs/libpcre-8.30[pcre16]
-   sys-libs/zlib
+   =dev-libs/libpcre-8.35[pcre16]
+   =sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
systemd? ( sys-apps/systemd )

diff --git a/dev-qt/qtcore/qtcore-5.5..ebuild 
b/dev-qt/qtcore/qtcore-5.5..ebuild
index 56e57dd..3207c29 100644
--- a/dev-qt/qtcore/qtcore-5.5..ebuild
+++ b/dev-qt/qtcore/qtcore-5.5..ebuild
@@ -20,8 +20,8 @@ IUSE=icu systemd
 
 DEPEND=
dev-libs/glib:2
-   =dev-libs/libpcre-8.30[pcre16]
-   sys-libs/zlib
+   =dev-libs/libpcre-8.35[pcre16]
+   =sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
systemd? ( sys-apps/systemd )

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 56e57dd..3207c29 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -20,8 +20,8 @@ IUSE=icu systemd
 
 DEPEND=
dev-libs/glib:2
-   =dev-libs/libpcre-8.30[pcre16]
-   sys-libs/zlib
+   =dev-libs/libpcre-8.35[pcre16]
+   =sys-libs/zlib-1.2.5
virtual/libiconv
icu? ( dev-libs/icu:= )
systemd? ( sys-apps/systemd )

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

2014-12-08 Thread Davide Pesavento

commit: f1596fa4dea35a5e05d6400b5163006608ff51a9
Author: Elias Probst mail AT eliasprobst DOT eu
AuthorDate: Tue Nov  4 16:27:29 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Dec  8 21:59:11 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f1596fa4

[dev-qt/qtcore] Add journald logging support (qtbase f81de394)

Package-Manager: portage-2.2.14

---
 dev-qt/qtcore/metadata.xml   | 1 +
 dev-qt/qtcore/qtcore-5.4.0_rc.ebuild | 4 +++-
 dev-qt/qtcore/qtcore-5.4..ebuild | 4 +++-
 dev-qt/qtcore/qtcore-5..ebuild   | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index c0ae526..8cae287 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -8,6 +8,7 @@
flag name=glibEnable pkgdev-libs/glib/pkg eventloop 
support/flag
flag name=qt3supportEnable the Qt3Support libraries for 
Qt4. Note that
this does not mean you can compile pure Qt3 programs 
with Qt4./flag
+   flag name=systemdEnable native journald logging 
support/flag
/use
upstream
bugs-tohttps://bugreports.qt-project.org//bugs-to

diff --git a/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild 
b/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild
index db7311e..4034e13 100644
--- a/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.0_rc.ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS=~amd64 ~x86
 fi
 
-IUSE=icu
+IUSE=icu systemd
 
 DEPEND=
dev-libs/glib:2
@@ -24,6 +24,7 @@ DEPEND=
sys-libs/zlib
virtual/libiconv
icu? ( dev-libs/icu:= )
+   systemd? ( sys-apps/systemd )
 
 RDEPEND=${DEPEND}
 
@@ -38,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
local myconf=(
$(qt_use icu)
+   $(qt_use systemd journald)
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtcore/qtcore-5.4..ebuild 
b/dev-qt/qtcore/qtcore-5.4..ebuild
index db7311e..4034e13 100644
--- a/dev-qt/qtcore/qtcore-5.4..ebuild
+++ b/dev-qt/qtcore/qtcore-5.4..ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS=~amd64 ~x86
 fi
 
-IUSE=icu
+IUSE=icu systemd
 
 DEPEND=
dev-libs/glib:2
@@ -24,6 +24,7 @@ DEPEND=
sys-libs/zlib
virtual/libiconv
icu? ( dev-libs/icu:= )
+   systemd? ( sys-apps/systemd )
 
 RDEPEND=${DEPEND}
 
@@ -38,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
local myconf=(
$(qt_use icu)
+   $(qt_use systemd journald)
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index db7311e..4034e13 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -16,7 +16,7 @@ else
KEYWORDS=~amd64 ~x86
 fi
 
-IUSE=icu
+IUSE=icu systemd
 
 DEPEND=
dev-libs/glib:2
@@ -24,6 +24,7 @@ DEPEND=
sys-libs/zlib
virtual/libiconv
icu? ( dev-libs/icu:= )
+   systemd? ( sys-apps/systemd )
 
 RDEPEND=${DEPEND}
 
@@ -38,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
 src_configure() {
local myconf=(
$(qt_use icu)
+   $(qt_use systemd journald)
)
qt5-build_src_configure
 }

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

2014-11-09 Thread Davide Pesavento

commit: a3f2285b56e55a011290b47af1d016b1a7574195
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Nov 10 03:01:47 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Nov 10 03:01:47 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a3f2285b

[dev-qt/qtcore:4] Drop keepdir.

Package-Manager: portage-2.2.14

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 2 --
 dev-qt/qtcore/qtcore-4.8..ebuild | 2 --
 2 files changed, 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index a3a0370..af8ef25 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -106,6 +106,4 @@ multilib_src_install_all() {
 
dodir ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
mv ${D}${QT4_DATADIR}/mkspecs/{qconfig.pri,gentoo/} || die
-
-   keepdir ${QT4_SYSCONFDIR#${EPREFIX}}
 }

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index a3a0370..af8ef25 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -106,6 +106,4 @@ multilib_src_install_all() {
 
dodir ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
mv ${D}${QT4_DATADIR}/mkspecs/{qconfig.pri,gentoo/} || die
-
-   keepdir ${QT4_SYSCONFDIR#${EPREFIX}}
 }

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

2014-11-09 Thread Davide Pesavento

commit: 148c409cf4462865ce3d496b79ac09b5dfeb14ac
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Nov 10 03:37:15 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Nov 10 03:37:15 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=148c409c

[dev-qt/qtcore:4] Move and simplify env.d file installation to eclass.

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 11 ---
 dev-qt/qtcore/qtcore-4.8..ebuild | 11 ---
 eclass/qt4-build-multilib.eclass |  6 ++
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index af8ef25..e06581e 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -93,17 +93,6 @@ multilib_src_configure() {
 multilib_src_install_all() {
qt4_multilib_src_install_all
 
-   # List all the multilib libdirs
-   local libdirs=
-   for libdir in $(get_all_libdirs); do
-   libdirs+=:${EPREFIX}/usr/${libdir}/qt4
-   done
-
-   cat -EOF  ${T}/44qt4
-   LDPATH=${libdirs:1}
-   EOF
-   doenvd ${T}/44qt4
-
dodir ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
mv ${D}${QT4_DATADIR}/mkspecs/{qconfig.pri,gentoo/} || die
 }

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index af8ef25..e06581e 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -93,17 +93,6 @@ multilib_src_configure() {
 multilib_src_install_all() {
qt4_multilib_src_install_all
 
-   # List all the multilib libdirs
-   local libdirs=
-   for libdir in $(get_all_libdirs); do
-   libdirs+=:${EPREFIX}/usr/${libdir}/qt4
-   done
-
-   cat -EOF  ${T}/44qt4
-   LDPATH=${libdirs:1}
-   EOF
-   doenvd ${T}/44qt4
-
dodir ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
mv ${D}${QT4_DATADIR}/mkspecs/{qconfig.pri,gentoo/} || die
 }

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index eae348f..441371b 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -413,6 +413,12 @@ qt4_multilib_src_install() {
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}

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

2014-10-26 Thread Davide Pesavento

commit: f1c2941f8b40e41e3413f4465c2edec1bb1a78a8
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Oct 27 00:53:22 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Oct 27 00:53:22 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f1c2941f

[dev-qt/qtcore:4] Adjust sed expression to work with multilib-wrapped headers.

Package-Manager: portage-2.2.14

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 11 +--
 dev-qt/qtcore/qtcore-4.8..ebuild | 11 +--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 7089648..841e740 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -107,18 +107,17 @@ multilib_src_install_all() {
dodir ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
mv ${D}${QT4_DATADIR}/mkspecs/{qconfig.pri,gentoo/} || die
 
-   # Framework hacking
if use aqua  [[ ${CHOST#*-darwin} -ge 9 ]]; then
+   # Framework hacking
# TODO: do this better
-   sed -i -e '2a#include QtCore/Gentoo/gentoo-qconfig.h\n' \
-   
${D}${QT4_LIBDIR}/QtCore.framework/Headers/qconfig.h \
+   sed -i -e '1i #include QtCore/Gentoo/gentoo-qconfig.h\n' \
+   ${D}${QT4_LIBDIR}/QtCore.framework/Headers/qconfig.h \
|| die sed for qconfig.h failed
dosym ${QT4_HEADERDIR#${EPREFIX}}/Gentoo \

${QT4_LIBDIR#${EPREFIX}}/QtCore.framework/Headers/Gentoo
else
-   sed -i -e '2a#include Gentoo/gentoo-qconfig.h\n' \
-   ${D}${QT4_HEADERDIR}/QtCore/qconfig.h \
-   ${D}${QT4_HEADERDIR}/Qt/qconfig.h \
+   sed -i -e '1i #include Gentoo/gentoo-qconfig.h\n' \
+   ${D}${QT4_HEADERDIR}/Qt{,Core}/qconfig.h \
|| die sed for qconfig.h failed
fi
 

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 7089648..841e740 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -107,18 +107,17 @@ multilib_src_install_all() {
dodir ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
mv ${D}${QT4_DATADIR}/mkspecs/{qconfig.pri,gentoo/} || die
 
-   # Framework hacking
if use aqua  [[ ${CHOST#*-darwin} -ge 9 ]]; then
+   # Framework hacking
# TODO: do this better
-   sed -i -e '2a#include QtCore/Gentoo/gentoo-qconfig.h\n' \
-   
${D}${QT4_LIBDIR}/QtCore.framework/Headers/qconfig.h \
+   sed -i -e '1i #include QtCore/Gentoo/gentoo-qconfig.h\n' \
+   ${D}${QT4_LIBDIR}/QtCore.framework/Headers/qconfig.h \
|| die sed for qconfig.h failed
dosym ${QT4_HEADERDIR#${EPREFIX}}/Gentoo \

${QT4_LIBDIR#${EPREFIX}}/QtCore.framework/Headers/Gentoo
else
-   sed -i -e '2a#include Gentoo/gentoo-qconfig.h\n' \
-   ${D}${QT4_HEADERDIR}/QtCore/qconfig.h \
-   ${D}${QT4_HEADERDIR}/Qt/qconfig.h \
+   sed -i -e '1i #include Gentoo/gentoo-qconfig.h\n' \
+   ${D}${QT4_HEADERDIR}/Qt{,Core}/qconfig.h \
|| die sed for qconfig.h failed
fi

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

2014-10-13 Thread Davide Pesavento

commit: e6a119eb59b3b67e2587a285a57db4037f4ab907
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Mon Oct 13 14:41:38 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Oct 13 14:41:38 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e6a119eb

[dev-qt/qtcore] Enable multilib header wrapping

Package-Manager: portage-2.2.14_rc1

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 5 +
 dev-qt/qtcore/qtcore-4.8..ebuild | 5 +
 2 files changed, 10 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 24a95a6..7089648 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -28,6 +28,11 @@ PDEPEND=
qt3support? ( 
~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
 
 
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/qt4/Qt/qconfig.h
+   /usr/include/qt4/QtCore/qconfig.h
+)
+
 PATCHES=(
${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch

${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 
# bug 514968

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 24a95a6..7089648 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -28,6 +28,11 @@ PDEPEND=
qt3support? ( 
~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
 
 
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/qt4/Qt/qconfig.h
+   /usr/include/qt4/QtCore/qconfig.h
+)
+
 PATCHES=(
${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch

${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch 
# bug 514968

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

2014-08-31 Thread Davide Pesavento

commit: 1688ef3d4d6e444948812a7877315f52c47b405d
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon Sep  1 00:26:15 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon Sep  1 00:26:15 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1688ef3d

[dev-qt/qtcore:4] Raise minimum deps to ensure correct multilib USE deps.

Package-Manager: portage-2.2.12-r1

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 4 ++--
 dev-qt/qtcore/qtcore-4.8..ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 4ceb304..24a95a6 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -17,10 +17,10 @@ fi
 IUSE=+glib iconv icu qt3support ssl
 
 DEPEND=
-   sys-libs/zlib[${MULTILIB_USEDEP}]
+   =sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-   ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+   ssl? ( =dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
 
 RDEPEND=${DEPEND}
 PDEPEND=

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 4ceb304..24a95a6 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -17,10 +17,10 @@ fi
 IUSE=+glib iconv icu qt3support ssl
 
 DEPEND=
-   sys-libs/zlib[${MULTILIB_USEDEP}]
+   =sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
-   ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+   ssl? ( =dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
 
 RDEPEND=${DEPEND}
 PDEPEND=

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

2014-08-26 Thread Davide Pesavento

commit: dfcc84015c0ef0eb4425d30adfe6323968ce622d
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Wed Aug 27 02:12:25 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Wed Aug 27 02:12:25 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dfcc8401

[dev-qt/qtcore:5] Build qlalr.

Package-Manager: portage-2.2.12

---
 dev-qt/qtcore/qtcore-5.3.1-r1.ebuild | 1 +
 dev-qt/qtcore/qtcore-5.3..ebuild | 1 +
 dev-qt/qtcore/qtcore-5.4..ebuild | 1 +
 dev-qt/qtcore/qtcore-5..ebuild   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild 
b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1-r1.ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+   src/tools/qlalr
 )
 
 src_configure() {

diff --git a/dev-qt/qtcore/qtcore-5.3..ebuild 
b/dev-qt/qtcore/qtcore-5.3..ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5.3..ebuild
+++ b/dev-qt/qtcore/qtcore-5.3..ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+   src/tools/qlalr
 )
 
 src_configure() {

diff --git a/dev-qt/qtcore/qtcore-5.4..ebuild 
b/dev-qt/qtcore/qtcore-5.4..ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5.4..ebuild
+++ b/dev-qt/qtcore/qtcore-5.4..ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+   src/tools/qlalr
 )
 
 src_configure() {

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index ab2aa2e..db7311e 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -32,6 +32,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/moc
src/tools/rcc
src/corelib
+   src/tools/qlalr
 )
 
 src_configure() {

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

2014-07-29 Thread Davide Pesavento

commit: 54ec3ccc928738d3545d0967606215dbd3c4b756
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Tue Jul 29 22:14:22 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Tue Jul 29 22:14:22 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=54ec3ccc

[dev-qt/qtcore:5] Don't define QT_ZLIB.

1) It's qtcore, so we can just use whatever the configure generates.
2) The actual macro for the feature is QT(_NO)_COMPRESS. I believe
   QT_ZLIB is defined only when using the bundled zlib.
3) QT(_NO)_ZLIB isn't used anywhere anyway.

Package-Manager: portage-2.2.10

---
 dev-qt/qtcore/qtcore-5.3.1.ebuild| 4 
 dev-qt/qtcore/qtcore-5.3..ebuild | 4 
 dev-qt/qtcore/qtcore-5..ebuild   | 4 
 3 files changed, 12 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.3.1.ebuild 
b/dev-qt/qtcore/qtcore-5.3.1.ebuild
index 3ed8bb6..f3675ba 100644
--- a/dev-qt/qtcore/qtcore-5.3.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1.ebuild
@@ -34,10 +34,6 @@ QT5_TARGET_SUBDIRS=(
src/corelib
 )
 
-QT5_GENTOO_CONFIG=(
-   ::ZLIB
-)
-
 src_configure() {
local myconf=(
$(qt_use glib)

diff --git a/dev-qt/qtcore/qtcore-5.3..ebuild 
b/dev-qt/qtcore/qtcore-5.3..ebuild
index 3ed8bb6..f3675ba 100644
--- a/dev-qt/qtcore/qtcore-5.3..ebuild
+++ b/dev-qt/qtcore/qtcore-5.3..ebuild
@@ -34,10 +34,6 @@ QT5_TARGET_SUBDIRS=(
src/corelib
 )
 
-QT5_GENTOO_CONFIG=(
-   ::ZLIB
-)
-
 src_configure() {
local myconf=(
$(qt_use glib)

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 3ed8bb6..f3675ba 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -34,10 +34,6 @@ QT5_TARGET_SUBDIRS=(
src/corelib
 )
 
-QT5_GENTOO_CONFIG=(
-   ::ZLIB
-)
-
 src_configure() {
local myconf=(
$(qt_use glib)

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

2014-07-24 Thread Davide Pesavento

commit: 6c66f6520c0c69d32f1e3fc833ac846f67b0d38c
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Wed Jul 23 22:59:29 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Wed Jul 23 22:59:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6c66f652

[dev-qt/qtcore:5] Convert to QT5_GENTOO_CONFIG.

And remove redundant -iconv, now specified by eclass.

Package-Manager: portage-2.2.10

---
 dev-qt/qtcore/qtcore-5.3.1.ebuild| 13 +++
 dev-qt/qtcore/qtcore-5.3..ebuild | 13 +++
 dev-qt/qtcore/qtcore-5..ebuild   | 44 +++-
 3 files changed, 9 insertions(+), 61 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-5.3.1.ebuild 
b/dev-qt/qtcore/qtcore-5.3.1.ebuild
index 8d12ffd..3ed8bb6 100644
--- a/dev-qt/qtcore/qtcore-5.3.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.3.1.ebuild
@@ -33,21 +33,14 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
 )
-QCONFIG_DEFINE=( QT_ZLIB )
 
-pkg_setup() {
-   QCONFIG_REMOVE=(
-   $(usev !glib)
-   $(usev !icu)
-   )
-
-   qt5-build_pkg_setup
-}
+QT5_GENTOO_CONFIG=(
+   ::ZLIB
+)
 
 src_configure() {
local myconf=(
$(qt_use glib)
-   -iconv
$(qt_use icu)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5.3..ebuild 
b/dev-qt/qtcore/qtcore-5.3..ebuild
index 8d12ffd..3ed8bb6 100644
--- a/dev-qt/qtcore/qtcore-5.3..ebuild
+++ b/dev-qt/qtcore/qtcore-5.3..ebuild
@@ -33,21 +33,14 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
 )
-QCONFIG_DEFINE=( QT_ZLIB )
 
-pkg_setup() {
-   QCONFIG_REMOVE=(
-   $(usev !glib)
-   $(usev !icu)
-   )
-
-   qt5-build_pkg_setup
-}
+QT5_GENTOO_CONFIG=(
+   ::ZLIB
+)
 
 src_configure() {
local myconf=(
$(qt_use glib)
-   -iconv
$(qt_use icu)
)
qt5-build_src_configure

diff --git a/dev-qt/qtcore/qtcore-5..ebuild 
b/dev-qt/qtcore/qtcore-5..ebuild
index 0395893..3ed8bb6 100644
--- a/dev-qt/qtcore/qtcore-5..ebuild
+++ b/dev-qt/qtcore/qtcore-5..ebuild
@@ -33,53 +33,15 @@ QT5_TARGET_SUBDIRS=(
src/tools/rcc
src/corelib
 )
-QCONFIG_DEFINE=( QT_ZLIB )
 
-pkg_setup() {
-   QCONFIG_REMOVE=(
-   $(usev !glib)
-   $(usev !icu)
-   )
-
-   qt5-build_pkg_setup
-}
+QT5_GENTOO_CONFIG=(
+   ::ZLIB
+)
 
 src_configure() {
local myconf=(
$(qt_use glib)
-   -iconv
$(qt_use icu)
)
qt5-build_src_configure
 }
-
-# Test dependencies
-#
-# kernel/qobject/test/test.pro: network
-# kernel/qpointer/qpointer.pro: widgets (opt)
-# kernel/qmetaproperty/qmetaproperty.pro: gui
-# kernel/qeventloop/qeventloop.pro: network
-# kernel/qsocketnotifier/qsocketnotifier.pro: network
-# kernel/qsignalmapper/qsignalmapper.pro: gui?
-# kernel/qmetaobject/qmetaobject.pro: gui
-# kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro: gui
-# kernel/qmimedata/qmimedata.pro: gui?
-# codecs/qtextcodec/test/test.pro: gui?
-# xml/qxmlstream/qxmlstream.pro: xml network
-# itemmodels/qabstractitemmodel/qabstractitemmodel.pro: gui?
-# itemmodels/qitemselectionmodel/qitemselectionmodel.pro: widgets
-# itemmodels/qabstractproxymodel/qabstractproxymodel.pro: gui?
-# itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro: gui widgets
-# itemmodels/qidentityproxymodel/qidentityproxymodel.pro: gui?
-# itemmodels/qitemmodel/qitemmodel.pro: widgets sql
-# statemachine/qstatemachine/qstatemachine.pro: gui widgets (opt)
-# animation/qparallelanimationgroup/qparallelanimationgroup.pro: gui
-# animation/qpauseanimation/qpauseanimation.pro: gui
-# animation/qpropertyanimation/qpropertyanimation.pro: gui widgets
-# io/qiodevice/qiodevice.pro: network
-# io/qsettings/qsettings.pro: gui
-# io/qprocess/testGuiProcess/testGuiProcess.pro: widgets
-# io/qprocess/test/test.pro: network
-# io/qtextstream/test/test.pro: network
-# io/qdatastream/qdatastream.pro: gui?
-# io/qfile/test/test.pro: network

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

2014-06-03 Thread Davide Pesavento

commit: 7651be23a9d3c0d0b230001c727b882a9039bbaa
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Tue Jun  3 15:04:19 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Tue Jun  3 15:04:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7651be23

[dev-qt/qtcore:4] Move mkspecs and qmake installation to eclass.

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 2 --
 dev-qt/qtcore/qtcore-4.8..ebuild | 2 --
 eclass/qt4-build-multilib.eclass | 6 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 783bbdb..c446934 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -86,8 +86,6 @@ src_configure() {
 src_install() {
qt4-build-multilib_src_install
 
-   emake INSTALL_ROOT=${D} install_{mkspecs,qmake}
-
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 783bbdb..c446934 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -86,8 +86,6 @@ src_configure() {
 src_install() {
qt4-build-multilib_src_install
 
-   emake INSTALL_ROOT=${D} install_{mkspecs,qmake}
-
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 86285af..5511995 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -396,12 +396,18 @@ multilib_src_install() {
 
qt4_foreach_target_subdir emake INSTALL_ROOT=${D} install
 
+   if [[ ${PN} == qtcore ]]; then
+   einfo Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}
+   emake INSTALL_ROOT=${D} install_{mkspecs,qmake}
+   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

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

2014-05-31 Thread Davide Pesavento

commit: 21a8165cd4a195750ba0c85252ab5506cce5ed6a
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Thu May 29 22:30:22 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Jun  1 02:39:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=21a8165c

[dev-qt/qtcore:4] Explicitly list all codecs in QT4_TARGET_DIRECTORIES.

As a side effect, qmake is run inside each of the codecs dirs,
fixing a pre-stripped files regression introduced in commit
52bcb4af3258474d1be5bd6c24c1126d2b915b86.

Package-Manager: portage-2.2.10

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 5 -
 dev-qt/qtcore/qtcore-4.8..ebuild | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index c40f089..a1fb867 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -40,7 +40,10 @@ QT4_TARGET_DIRECTORIES=
src/corelib
src/network
src/xml
-   src/plugins/codecs
+   src/plugins/codecs/cn
+   src/plugins/codecs/jp
+   src/plugins/codecs/kr
+   src/plugins/codecs/tw
tools/linguist/lconvert
tools/linguist/lrelease
tools/linguist/lupdate

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index c40f089..a1fb867 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -40,7 +40,10 @@ QT4_TARGET_DIRECTORIES=
src/corelib
src/network
src/xml
-   src/plugins/codecs
+   src/plugins/codecs/cn
+   src/plugins/codecs/jp
+   src/plugins/codecs/kr
+   src/plugins/codecs/tw
tools/linguist/lconvert
tools/linguist/lrelease
tools/linguist/lupdate

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

2014-05-31 Thread Davide Pesavento

commit: f7f3815402c3114d0914f575b5b017ede5ece520
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Thu May 29 20:46:27 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Sun Jun  1 02:39:56 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f7f38154

[dev-qt/qtcore:4] Cleanups.

Package-Manager: portage-2.2.10

---
 dev-qt/qtcore/qtcore-4.8.6.ebuild| 21 +++--
 dev-qt/qtcore/qtcore-4.8..ebuild | 21 +++--
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild 
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 577f23a..c40f089 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -38,8 +38,8 @@ QT4_TARGET_DIRECTORIES=
src/tools/rcc
src/tools/uic
src/corelib
-   src/xml
src/network
+   src/xml
src/plugins/codecs
tools/linguist/lconvert
tools/linguist/lrelease
@@ -48,11 +48,11 @@ QT4_TARGET_DIRECTORIES=
 QT4_EXTRACT_DIRECTORIES=${QT4_TARGET_DIRECTORIES}
include
src/3rdparty/des
+   src/3rdparty/easing
src/3rdparty/harfbuzz
src/3rdparty/md4
src/3rdparty/md5
src/3rdparty/sha1
-   src/3rdparty/easing
src/3rdparty/zlib_dependency.pri
src/declarative
src/gui
@@ -68,14 +68,14 @@ src_prepare() {
# bug 172219
sed -i -e s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} : \
-e s:LFLAGS.*=:LFLAGS=${LDFLAGS} : \
-   ${S}/qmake/Makefile.unix || die sed qmake/Makefile.unix 
failed
+   qmake/Makefile.unix || die sed qmake/Makefile.unix failed
 
# bug 427782
-   sed -i -e /^CPPFLAGS/s/-g// \
-   ${S}/qmake/Makefile.unix || die sed qmake/Makefile.unix 
CPPFLAGS failed
-   sed -i -e s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set 
QMAKE_CFLAGS_RELEASE/ \
-   -e s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set 
QMAKE_CXXFLAGS_RELEASE/ \
-   ${S}/configure || die sed configure setBootstrapVariable 
failed
+   sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+   qmake/Makefile.unix || die sed CPPFLAGS in qmake/Makefile.unix 
failed
+   sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set 
QMAKE_CFLAGS_RELEASE/' \
+   -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set 
QMAKE_CXXFLAGS_RELEASE/' \
+   configure || die sed configure setBootstrapVariable failed
 }
 
 src_configure() {
@@ -119,8 +119,9 @@ src_install() {
# TODO: do this better
sed -i -e '2a#include QtCore/Gentoo/gentoo-qconfig.h\n' \

${D}${QT4_LIBDIR}/QtCore.framework/Headers/qconfig.h \
-   || die sed for qconfig.h failed.
-   dosym ${QT4_HEADERDIR#${EPREFIX}}/Gentoo 
${QT4_LIBDIR#${EPREFIX}}/QtCore.framework/Headers/Gentoo
+   || die sed for qconfig.h failed
+   dosym ${QT4_HEADERDIR#${EPREFIX}}/Gentoo \
+   
${QT4_LIBDIR#${EPREFIX}}/QtCore.framework/Headers/Gentoo
else
sed -i -e '2a#include Gentoo/gentoo-qconfig.h\n' \
${D}${QT4_HEADERDIR}/QtCore/qconfig.h \

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 577f23a..c40f089 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -38,8 +38,8 @@ QT4_TARGET_DIRECTORIES=
src/tools/rcc
src/tools/uic
src/corelib
-   src/xml
src/network
+   src/xml
src/plugins/codecs
tools/linguist/lconvert
tools/linguist/lrelease
@@ -48,11 +48,11 @@ QT4_TARGET_DIRECTORIES=
 QT4_EXTRACT_DIRECTORIES=${QT4_TARGET_DIRECTORIES}
include
src/3rdparty/des
+   src/3rdparty/easing
src/3rdparty/harfbuzz
src/3rdparty/md4
src/3rdparty/md5
src/3rdparty/sha1
-   src/3rdparty/easing
src/3rdparty/zlib_dependency.pri
src/declarative
src/gui
@@ -68,14 +68,14 @@ src_prepare() {
# bug 172219
sed -i -e s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} : \
-e s:LFLAGS.*=:LFLAGS=${LDFLAGS} : \
-   ${S}/qmake/Makefile.unix || die sed qmake/Makefile.unix 
failed
+   qmake/Makefile.unix || die sed qmake/Makefile.unix failed
 
# bug 427782
-   sed -i -e /^CPPFLAGS/s/-g// \
-   ${S}/qmake/Makefile.unix || die sed qmake/Makefile.unix 
CPPFLAGS failed
-   sed -i -e s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set 
QMAKE_CFLAGS_RELEASE/ \
-   -e s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set 
QMAKE_CXXFLAGS_RELEASE/ \
-   ${S}/configure || die sed configure setBootstrapVariable 
failed
+   sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+

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

2014-05-27 Thread Davide Pesavento

commit: b909c2828fc465fa6951eed7bbca970cb16d3420
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon May 26 20:02:06 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon May 26 20:02:06 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b909c282

[dev-qt/qtcore:4] Split translations into dev-qt/qttranslations.

---
 dev-qt/qtcore/qtcore-4.8..ebuild   | 19 ++
 .../qttranslations/qttranslations-4.8..ebuild  | 36 ++
 eclass/qt4-build-multilib.eclass   | 43 --
 3 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 12b17dd..cbb48a3 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -24,6 +24,7 @@ DEPEND=
 
 RDEPEND=${DEPEND}
 PDEPEND=
+   ~dev-qt/qttranslations-${PV}
qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
 
 
@@ -48,7 +49,6 @@ QT4_EXTRACT_DIRECTORIES=${QT4_TARGET_DIRECTORIES}
include
src/plugins/plugins.pro
src/plugins/qpluginbase.pri
-   src/src.pro
src/3rdparty/des
src/3rdparty/harfbuzz
src/3rdparty/md4
@@ -59,9 +59,8 @@ QT4_EXTRACT_DIRECTORIES=${QT4_TARGET_DIRECTORIES}
src/declarative
src/gui
src/script
-   tools/shared
-   tools/linguist/shared
-   translations
+   tools/linguist
+   tools/shared
 
 QCONFIG_DEFINE=QT_ZLIB
 
@@ -136,17 +135,5 @@ src_install() {
|| die sed for qconfig.h failed
fi
 
-   # use freshly built libraries
-   local DYLD_FPATH=
-   [[ -d ${S}/lib/QtCore.framework ]] \
-DYLD_FPATH=$(for x in ${S}/lib/*.framework; do echo -n 
:$x; done)
-   DYLD_LIBRARY_PATH=${S}/lib${DYLD_FPATH} \
-   LD_LIBRARY_PATH=${S}/lib \
-   ${S}/bin/lrelease translations/*.ts \
-   || die generating translations failed
-
-   insinto ${QT4_TRANSLATIONDIR#${EPREFIX}}
-   doins translations/*.qm
-
keepdir ${QT4_SYSCONFDIR#${EPREFIX}}
 }

diff --git a/dev-qt/qttranslations/qttranslations-4.8..ebuild 
b/dev-qt/qttranslations/qttranslations-4.8..ebuild
new file mode 100644
index 000..77e8103
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-4.8..ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-build-multilib
+
+DESCRIPTION=Translation files for the Qt toolkit
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+fi
+
+IUSE=
+
+DEPEND=
+   ~dev-qt/qtcore-${PV}
+
+RDEPEND=${DEPEND}
+
+QT4_TARGET_DIRECTORIES=translations
+QT4_EXTRACT_DIRECTORIES=${QT4_TARGET_DIRECTORIES}
+   src
+   tools
+
+src_configure() {
+   cd translations || die
+   ${QT4_BINDIR}/qmake || die
+}
+
+src_compile() {
+   emake -C translations
+}

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index b35f334..acf3166 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -41,8 +41,10 @@ case ${PV} in
;;
 esac
 
-IUSE=aqua debug pch
-[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]]  IUSE+= +exceptions
+if [[ ${PN} != qttranslations ]]; then
+   IUSE=aqua debug pch
+   [[ ${PN} != qtxmlpatterns ]]  IUSE+= +exceptions
+fi
 
 DEPEND=virtual/pkgconfig
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
@@ -93,7 +95,7 @@ qt4-build-multilib_src_unpack() {
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
@@ -153,18 +155,18 @@ qt4-build-multilib_src_prepare() {
QTDIR=. ./bin/syncqt || die syncqt failed
fi
 
-   if [[ ${CATEGORY}/${PN} != dev-qt/qtcore ]]; then
+   if [[ ${PN} != qtcore ]]; then
skip_qmake_build
skip_project_generation
-   symlink_binaries_to_buildtree
+   symlink_tools_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
+   if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest 
qttranslations qtxmlpatterns; then
sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure || 
die
fi
 
-   if use aqua; then
+   if use_if_iuse aqua; then
# provide a proper

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

2014-05-27 Thread Davide Pesavento

commit: 52bcb4af3258474d1be5bd6c24c1126d2b915b86
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Mon May 26 18:16:17 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Mon May 26 18:16:17 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=52bcb4af

[dev-qt/qtcore:4] Remove redundant code.

We always run qmake with CONFIG+=nostrip, so these lines are unnecessary.

Package-Manager: portage-2.2.10

---
 dev-qt/qtcore/qtcore-4.8..ebuild | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 85a3a37..12b17dd 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -19,7 +19,7 @@ IUSE=+glib iconv icu qt3support ssl
 DEPEND=
sys-libs/zlib
glib? ( dev-libs/glib:2 )
-   icu? ( =dev-libs/icu-49:= )
+   icu? ( dev-libs/icu:= )
ssl? ( dev-libs/openssl:0 )
 
 RDEPEND=${DEPEND}
@@ -66,11 +66,6 @@ QT4_EXTRACT_DIRECTORIES=${QT4_TARGET_DIRECTORIES}
 QCONFIG_DEFINE=QT_ZLIB
 
 src_prepare() {
-   # Don't pre-strip, bug 235026
-   for i in kr jp cn tw; do
-   echo CONFIG+=nostrip  
${S}/src/plugins/codecs/${i}/${i}.pro
-   done
-
qt4-build-multilib_src_prepare
 
# bug 172219

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

2014-05-23 Thread Davide Pesavento

commit: 242e23f1f5e8139c644fa60ef100f98a8d8f47d7
Author: Davide Pesavento pesa AT gentoo DOT org
AuthorDate: Fri May 23 18:14:17 2014 +
Commit: Davide Pesavento pesa AT gentoo DOT org
CommitDate: Fri May 23 18:14:17 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=242e23f1

[dev-qt/qtcore:4] Use eclass's src_install rather than internal functions.

So that installation paths are respected.

Package-Manager: portage-2.2.10

---
 dev-qt/qtcore/qtcore-4.8..ebuild | 36 
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/dev-qt/qtcore/qtcore-4.8..ebuild 
b/dev-qt/qtcore/qtcore-4.8..ebuild
index 4c4f5a3..85a3a37 100644
--- a/dev-qt/qtcore/qtcore-4.8..ebuild
+++ b/dev-qt/qtcore/qtcore-4.8..ebuild
@@ -105,29 +105,13 @@ src_configure() {
 }
 
 src_install() {
-   dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
-
-   install_directories src/{corelib,xml,network,plugins/codecs}
-
-   emake INSTALL_ROOT=${D} install_mkspecs
+   emake INSTALL_ROOT=${D} install_{mkspecs,qmake}
 
# install private headers
insinto ${QT4_HEADERDIR#${EPREFIX}}/QtCore/private
find ${S}/src/corelib -type f -name *_p.h -exec doins '{}' +
 
-   # use freshly built libraries
-   local DYLD_FPATH=
-   [[ -d ${S}/lib/QtCore.framework ]] \
-DYLD_FPATH=$(for x in ${S}/lib/*.framework; do echo -n 
:$x; done)
-   DYLD_LIBRARY_PATH=${S}/lib${DYLD_FPATH} \
-   LD_LIBRARY_PATH=${S}/lib \
-   ${S}/bin/lrelease translations/*.ts \
-   || die generating translations failed
-   insinto ${QT4_TRANSLATIONDIR#${EPREFIX}}
-   doins translations/*.qm
-
-   setqtenv
-   fix_library_files
+   qt4-build-multilib_src_install
 
# List all the multilib libdirs
local libdirs=
@@ -157,13 +141,17 @@ src_install() {
|| die sed for qconfig.h failed
fi
 
-   install_qconfigs
-
-   # remove .la files
-   prune_libtool_files
+   # use freshly built libraries
+   local DYLD_FPATH=
+   [[ -d ${S}/lib/QtCore.framework ]] \
+DYLD_FPATH=$(for x in ${S}/lib/*.framework; do echo -n 
:$x; done)
+   DYLD_LIBRARY_PATH=${S}/lib${DYLD_FPATH} \
+   LD_LIBRARY_PATH=${S}/lib \
+   ${S}/bin/lrelease translations/*.ts \
+   || die generating translations failed
 
-   # framework magic
-   fix_includes
+   insinto ${QT4_TRANSLATIONDIR#${EPREFIX}}
+   doins translations/*.qm
 
keepdir ${QT4_SYSCONFDIR#${EPREFIX}}
 }

65 matches

Mail list logo