summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-09-24 08:14:30 -0400
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-09-24 08:14:30 -0400
commit5f133d91103b35aa7d6a096e34b520f987543be0 (patch)
tree95d546c8ee5a88c1be4cbc983f173dd5ec9091bf
parent1efb774c7fe48a48805da427a834d653cca982c6 (diff)
downloadgentoo-overlay-master.tar.xz
gentoo-overlay-master.zip
dev-qt/qtgui: bumpHEADmaster
-rw-r--r--dev-qt/qtgui/qtgui-5.15.2-r13.ebuild (renamed from dev-qt/qtgui/qtgui-5.15.2-r12.ebuild)24
1 files changed, 11 insertions, 13 deletions
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
index 161da7c..47f2df9 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
QT5_MODULE="qtbase"
inherit qt5-build
@@ -26,21 +26,19 @@ REQUIRED_USE="
RDEPEND="
dev-libs/glib:2
- ~dev-qt/qtcore-${PV}:5=
+ =dev-qt/qtcore-${QT5_PV}*:5=
dev-util/gtk-update-icon-cache
media-libs/fontconfig
>=media-libs/freetype-2.6.1:2
>=media-libs/harfbuzz-1.6.0:=
+ media-libs/libglvnd
sys-libs/zlib:=
- dbus? ( ~dev-qt/qtdbus-${PV} )
- egl? ( media-libs/mesa[egl] )
+ dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
eglfs? (
media-libs/mesa[gbm]
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
- gles2-only? ( media-libs/mesa[gles2] )
- !gles2-only? ( virtual/opengl )
jpeg? ( virtual/jpeg:0 )
libinput? (
dev-libs/libinput:=
@@ -48,9 +46,9 @@ RDEPEND="
)
png? ( media-libs/libpng:0= )
tslib? ( >=x11-libs/tslib-1.21 )
- tuio? ( ~dev-qt/qtnetwork-${PV} )
+ tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
udev? ( virtual/libudev:= )
- vnc? ( ~dev-qt/qtnetwork-${PV} )
+ vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
vulkan? ( dev-util/vulkan-headers )
X? (
x11-libs/libICE
@@ -70,7 +68,7 @@ DEPEND="${RDEPEND}
"
PDEPEND="
ibus? ( app-i18n/ibus )
- wayland? ( ~dev-qt/qtwayland-${PV} )
+ wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
"
QT5_TARGET_SUBDIRS=(
@@ -154,15 +152,15 @@ src_prepare() {
src_configure() {
local myconf=(
- $(usex dbus -dbus-linked '')
+ $(usev dbus -dbus-linked)
$(qt_use egl)
$(qt_use eglfs)
- $(usex eglfs '-gbm -kms' '')
+ $(usev eglfs '-gbm -kms')
$(qt_use evdev)
$(qt_use evdev mtdev)
-fontconfig
-system-freetype
- $(usex gif '' -no-gif)
+ $(usev !gif -no-gif)
-gui
-system-harfbuzz
$(qt_use jpeg libjpeg system)
@@ -174,7 +172,7 @@ src_configure() {
$(qt_use udev libudev)
$(qt_use vulkan)
$(qt_use X xcb)
- $(usex X '-xcb-xlib -DUSE_X11' '')
+ $(usev X '-xcb-xlib')
)
if use libinput || use X; then
myconf+=( -xkbcommon )