commit: f0192a8ad25133375026974e056861058015abbd
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 00:16:20 2019 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 00:58:52 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f0192a8a
dev-qt/qt{core,gui,network}: drop several obsolete flags from qconfig.h
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/qtcore/qtcore-5.12.0.ebuild | 6 ++----
dev-qt/qtcore/qtcore-5.12.9999.ebuild | 6 ++----
dev-qt/qtcore/qtcore-5.9999.ebuild | 6 ++----
dev-qt/qtgui/qtgui-5.12.0.ebuild | 17 ++++++++---------
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 17 ++++++++---------
dev-qt/qtgui/qtgui-5.9999.ebuild | 17 ++++++++---------
dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild | 2 +-
dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild | 2 +-
dev-qt/qtnetwork/qtnetwork-5.9999.ebuild | 2 +-
9 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild
b/dev-qt/qtcore/qtcore-5.12.0.ebuild
index 290fc94e..f6a45867 100644
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild
@@ -56,10 +56,8 @@ 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 WIDGETS
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+ OPENGL OPENSSL SSL WIDGETS
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.12.9999.ebuild
b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
index 290fc94e..f6a45867 100644
--- a/dev-qt/qtcore/qtcore-5.12.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.9999.ebuild
@@ -56,10 +56,8 @@ 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 WIDGETS
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+ OPENGL OPENSSL SSL WIDGETS
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild
b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 290fc94e..f6a45867 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -56,10 +56,8 @@ 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 WIDGETS
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+ OPENGL OPENSSL SSL WIDGETS
)
for flag in ${flags[@]}; do
diff --git a/dev-qt/qtgui/qtgui-5.12.0.ebuild b/dev-qt/qtgui/qtgui-5.12.0.ebuild
index b1ec9e40..03ab3544 100644
--- a/dev-qt/qtgui/qtgui-5.12.0.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.0.ebuild
@@ -84,20 +84,20 @@ QT5_TARGET_SUBDIRS=(
QT5_GENTOO_CONFIG=(
accessibility:accessibility-atspi-bridge
- egl
- eglfs
+ egl:egl:
+ eglfs:eglfs:
eglfs:eglfs_egldevice:
eglfs:eglfs_gbm:
- evdev
+ evdev:evdev:
evdev:mtdev:
- :fontconfig
- :system-freetype:FREETYPE
+ :fontconfig:
+ :system-freetype:
!:no-freetype:
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
!:no-gui:
- :system-harfbuzz:HARFBUZZ
+ :system-harfbuzz:
!:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
@@ -107,7 +107,7 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
- tslib
+ tslib:tslib:
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -116,7 +116,6 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-sm:
xcb:xcb-xlib:
xcb:xcb-xinput:
- xcb::XKB
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -125,7 +124,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild
b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
index 4a416148..b2f05a81 100644
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
@@ -84,20 +84,20 @@ QT5_TARGET_SUBDIRS=(
QT5_GENTOO_CONFIG=(
accessibility:accessibility-atspi-bridge
- egl
- eglfs
+ egl:egl:
+ eglfs:eglfs:
eglfs:eglfs_egldevice:
eglfs:eglfs_gbm:
- evdev
+ evdev:evdev:
evdev:mtdev:
- :fontconfig
- :system-freetype:FREETYPE
+ :fontconfig:
+ :system-freetype:
!:no-freetype:
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
!:no-gui:
- :system-harfbuzz:HARFBUZZ
+ :system-harfbuzz:
!:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
@@ -107,7 +107,7 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
- tslib
+ tslib:tslib:
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -116,7 +116,6 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-sm:
xcb:xcb-xlib:
xcb:xcb-xinput:
- xcb::XKB
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -125,7 +124,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 4a416148..b2f05a81 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -84,20 +84,20 @@ QT5_TARGET_SUBDIRS=(
QT5_GENTOO_CONFIG=(
accessibility:accessibility-atspi-bridge
- egl
- eglfs
+ egl:egl:
+ eglfs:eglfs:
eglfs:eglfs_egldevice:
eglfs:eglfs_gbm:
- evdev
+ evdev:evdev:
evdev:mtdev:
- :fontconfig
- :system-freetype:FREETYPE
+ :fontconfig:
+ :system-freetype:
!:no-freetype:
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
!:no-gui:
- :system-harfbuzz:HARFBUZZ
+ :system-harfbuzz:
!:no-harfbuzz:
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
@@ -107,7 +107,7 @@ QT5_GENTOO_CONFIG=(
png:png:
png:system-png:IMAGEFORMAT_PNG
!png:no-png:
- tslib
+ tslib:tslib:
udev:libudev:
xcb:xcb:
xcb:xcb-glx:
@@ -116,7 +116,6 @@ QT5_GENTOO_CONFIG=(
xcb:xcb-sm:
xcb:xcb-xlib:
xcb:xcb-xinput:
- xcb::XKB
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -125,7 +124,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
src_prepare() {
# egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11)
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) ||
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
index 25f63002..b7da112b 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild
@@ -32,7 +32,7 @@ QT5_TARGET_SUBDIRS=(
)
QT5_GENTOO_CONFIG=(
- libproxy
+ libproxy:libproxy:
ssl::SSL
ssl::OPENSSL
ssl:openssl-linked:LINKED_OPENSSL
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild
index 25f63002..b7da112b 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild
@@ -32,7 +32,7 @@ QT5_TARGET_SUBDIRS=(
)
QT5_GENTOO_CONFIG=(
- libproxy
+ libproxy:libproxy:
ssl::SSL
ssl::OPENSSL
ssl:openssl-linked:LINKED_OPENSSL
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
index 25f63002..b7da112b 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild
@@ -32,7 +32,7 @@ QT5_TARGET_SUBDIRS=(
)
QT5_GENTOO_CONFIG=(
- libproxy
+ libproxy:libproxy:
ssl::SSL
ssl::OPENSSL
ssl:openssl-linked:LINKED_OPENSSL
