diff options
Diffstat (limited to 'dev-qt')
66 files changed, 528 insertions, 527 deletions
diff --git a/dev-qt/qt3d/qt3d-6.5.2.ebuild b/dev-qt/qt3d/qt3d-6.5.2.ebuild index d62b749fbe0a..a3eb24978595 100644 --- a/dev-qt/qt3d/qt3d-6.5.2.ebuild +++ b/dev-qt/qt3d/qt3d-6.5.2.ebuild @@ -11,16 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - RDEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,gui,network,opengl,vulkan,widgets] - =dev-qt/qtdeclarative-${PV}*[widgets] - =dev-qt/qtmultimedia-${PV}* - =dev-qt/qtshadertools-${PV}* + =dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan,widgets] + =dev-qt/qtdeclarative-${PV}*:6[widgets] + =dev-qt/qtmultimedia-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 media-libs/assimp:= " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-util/vulkan-headers " diff --git a/dev-qt/qt3d/qt3d-6.5.9999.ebuild b/dev-qt/qt3d/qt3d-6.5.9999.ebuild index d62b749fbe0a..a3eb24978595 100644 --- a/dev-qt/qt3d/qt3d-6.5.9999.ebuild +++ b/dev-qt/qt3d/qt3d-6.5.9999.ebuild @@ -11,16 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - RDEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,gui,network,opengl,vulkan,widgets] - =dev-qt/qtdeclarative-${PV}*[widgets] - =dev-qt/qtmultimedia-${PV}* - =dev-qt/qtshadertools-${PV}* + =dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan,widgets] + =dev-qt/qtdeclarative-${PV}*:6[widgets] + =dev-qt/qtmultimedia-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 media-libs/assimp:= " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-util/vulkan-headers " diff --git a/dev-qt/qt3d/qt3d-6.9999.ebuild b/dev-qt/qt3d/qt3d-6.9999.ebuild index d62b749fbe0a..a3eb24978595 100644 --- a/dev-qt/qt3d/qt3d-6.9999.ebuild +++ b/dev-qt/qt3d/qt3d-6.9999.ebuild @@ -11,16 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - RDEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,gui,network,opengl,vulkan,widgets] - =dev-qt/qtdeclarative-${PV}*[widgets] - =dev-qt/qtmultimedia-${PV}* - =dev-qt/qtshadertools-${PV}* + =dev-qt/qtbase-${PV}*:6[concurrent,gui,network,opengl,vulkan,widgets] + =dev-qt/qtdeclarative-${PV}*:6[widgets] + =dev-qt/qtmultimedia-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 media-libs/assimp:= " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-util/vulkan-headers " diff --git a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2.ebuild index 54dca83e10d2..dd0e129fe6b5 100644 --- a/dev-qt/qt5compat/qt5compat-6.5.2.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,network] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild index 54dca83e10d2..dd0e129fe6b5 100644 --- a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,network] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9999.ebuild index 54dca83e10d2..dd0e129fe6b5 100644 --- a/dev-qt/qt5compat/qt5compat-6.9999.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,network] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtbase/qtbase-6.5.2.ebuild b/dev-qt/qtbase/qtbase-6.5.2.ebuild index 5e1b328fd988..f5cbdbc51849 100644 --- a/dev-qt/qtbase/qtbase-6.5.2.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.2.ebuild @@ -16,7 +16,6 @@ IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd" REQUIRED_USE=" opengl? ( gui ) widgets? ( gui ) - X? ( || ( evdev libinput ) ) " QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X" @@ -24,26 +23,31 @@ QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc" QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite" IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev wayland" # QtPrintSupport = QtGui + QtWidgets enabled. -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X +# ibus = xkbcommon + dbus, and xkbcommon needs either X or libinput REQUIRED_USE+=" - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/}) - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/}) - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/}) - accessibility? ( dbus X ) + $( + printf '%s? ( gui ) ' ${QTGUI_IUSE//+/} + printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/} + printf '%s? ( sql ) ' ${QTSQL_IUSE//+/} + ) + X? ( + || ( evdev libinput ) + gles2-only? ( egl ) + ) + accessibility? ( X dbus ) cups? ( gui widgets ) eglfs? ( egl ) gtk? ( widgets ) - gui? ( || ( eglfs X ) || ( libinput X ) ) + gui? ( || ( X eglfs ) || ( X libinput ) ) libinput? ( udev ) sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) ) vnc? ( gui ) - X? ( gles2-only? ( egl ) ) " # TODO: # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c # qtnetwork: connman, networkmanager -DEPEND=" +RDEPEND=" app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 @@ -55,6 +59,19 @@ DEPEND=" media-libs/tiff:= >=sys-apps/dbus-1.4.20 sys-libs/zlib:= + X? ( + x11-libs/libdrm + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/libxcb-1.12:= + >=x11-libs/libxkbcommon-0.5.0[X] + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) @@ -86,41 +103,30 @@ DEPEND=" tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libdrm - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:= - >=x11-libs/libxkbcommon-0.5.0[X] - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) zstd? ( app-arch/zstd:= ) " -RDEPEND="${DEPEND}" -PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )" +DEPEND="${RDEPEND}" +PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}*:6 )" #864509 -PATCHES=( "${FILESDIR}/${PN}-6.5.2-CVE-2023-38197.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-CVE-2023-38197.patch +) src_configure() { local mycmakeargs=( - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} - -DINSTALL_BINDIR=${QT6_BINDIR} - -DINSTALL_DATADIR=${QT6_DATADIR} - -DINSTALL_DOCDIR=${QT6_DOCDIR} - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} - -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR} - -DINSTALL_LIBDIR=${QT6_LIBDIR} - -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR} - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} - -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_ARCHDATADIR}"/mkspecs + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" -DQT_FEATURE_androiddeployqt=OFF $(qt_feature concurrent) $(qt_feature dbus) @@ -135,6 +141,8 @@ src_configure() { $(qt_feature zstd) ) use gui && mycmakeargs+=( + $(qt_feature X xcb) + $(qt_feature X xcb_xlib) $(qt_feature accessibility accessibility_atspi_bridge) $(qt_feature egl) $(qt_feature egl xcb_egl_plugin) @@ -143,22 +151,20 @@ src_configure() { $(qt_feature evdev) $(qt_feature evdev mtdev) -DQT_FEATURE_gif=ON - $(qt_feature jpeg) - $(qt_feature opengl) $(qt_feature gles2-only opengles2) + $(qt_feature jpeg) $(qt_feature libinput) + $(qt_feature opengl) $(qt_feature tslib) $(qt_feature tuio tuiotouch) $(qt_feature vulkan) $(qt_feature widgets) - $(qt_feature X xcb) - $(qt_feature X xcb_xlib) ) use widgets && mycmakeargs+=( $(qt_feature cups) $(qt_feature gtk gtk3) ) - if use libinput || use X; then + if use X || use libinput; then mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) fi use network && mycmakeargs+=( @@ -185,6 +191,5 @@ src_configure() { src_install() { qt6-build_src_install - # https://bugs.gentoo.org/863395 - qt6_symlink_binary_to_path qmake 6 + qt6_symlink_binary_to_path qmake 6 #863395 } diff --git a/dev-qt/qtbase/qtbase-6.5.9999.ebuild b/dev-qt/qtbase/qtbase-6.5.9999.ebuild index c29d890f2c32..06772a77b8a5 100644 --- a/dev-qt/qtbase/qtbase-6.5.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.9999.ebuild @@ -16,7 +16,6 @@ IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd" REQUIRED_USE=" opengl? ( gui ) widgets? ( gui ) - X? ( || ( evdev libinput ) ) " QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X" @@ -24,26 +23,31 @@ QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc" QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite" IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev wayland" # QtPrintSupport = QtGui + QtWidgets enabled. -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X +# ibus = xkbcommon + dbus, and xkbcommon needs either X or libinput REQUIRED_USE+=" - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/}) - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/}) - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/}) - accessibility? ( dbus X ) + $( + printf '%s? ( gui ) ' ${QTGUI_IUSE//+/} + printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/} + printf '%s? ( sql ) ' ${QTSQL_IUSE//+/} + ) + X? ( + || ( evdev libinput ) + gles2-only? ( egl ) + ) + accessibility? ( X dbus ) cups? ( gui widgets ) eglfs? ( egl ) gtk? ( widgets ) - gui? ( || ( eglfs X ) || ( libinput X ) ) + gui? ( || ( X eglfs ) || ( X libinput ) ) libinput? ( udev ) sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) ) vnc? ( gui ) - X? ( gles2-only? ( egl ) ) " # TODO: # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c # qtnetwork: connman, networkmanager -DEPEND=" +RDEPEND=" app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 @@ -55,6 +59,19 @@ DEPEND=" media-libs/tiff:= >=sys-apps/dbus-1.4.20 sys-libs/zlib:= + X? ( + x11-libs/libdrm + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/libxcb-1.12:= + >=x11-libs/libxkbcommon-0.5.0[X] + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) @@ -86,39 +103,26 @@ DEPEND=" tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libdrm - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:= - >=x11-libs/libxkbcommon-0.5.0[X] - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) zstd? ( app-arch/zstd:= ) " -RDEPEND="${DEPEND}" -PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )" +DEPEND="${RDEPEND}" +PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}*:6 )" #864509 src_configure() { local mycmakeargs=( - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} - -DINSTALL_BINDIR=${QT6_BINDIR} - -DINSTALL_DATADIR=${QT6_DATADIR} - -DINSTALL_DOCDIR=${QT6_DOCDIR} - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} - -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR} - -DINSTALL_LIBDIR=${QT6_LIBDIR} - -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR} - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} - -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_ARCHDATADIR}"/mkspecs + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" -DQT_FEATURE_androiddeployqt=OFF $(qt_feature concurrent) $(qt_feature dbus) @@ -133,6 +137,8 @@ src_configure() { $(qt_feature zstd) ) use gui && mycmakeargs+=( + $(qt_feature X xcb) + $(qt_feature X xcb_xlib) $(qt_feature accessibility accessibility_atspi_bridge) $(qt_feature egl) $(qt_feature egl xcb_egl_plugin) @@ -141,22 +147,20 @@ src_configure() { $(qt_feature evdev) $(qt_feature evdev mtdev) -DQT_FEATURE_gif=ON - $(qt_feature jpeg) - $(qt_feature opengl) $(qt_feature gles2-only opengles2) + $(qt_feature jpeg) $(qt_feature libinput) + $(qt_feature opengl) $(qt_feature tslib) $(qt_feature tuio tuiotouch) $(qt_feature vulkan) $(qt_feature widgets) - $(qt_feature X xcb) - $(qt_feature X xcb_xlib) ) use widgets && mycmakeargs+=( $(qt_feature cups) $(qt_feature gtk gtk3) ) - if use libinput || use X; then + if use X || use libinput; then mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) fi use network && mycmakeargs+=( @@ -183,6 +187,5 @@ src_configure() { src_install() { qt6-build_src_install - # https://bugs.gentoo.org/863395 - qt6_symlink_binary_to_path qmake 6 + qt6_symlink_binary_to_path qmake 6 #863395 } diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index c29d890f2c32..06772a77b8a5 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -16,7 +16,6 @@ IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd" REQUIRED_USE=" opengl? ( gui ) widgets? ( gui ) - X? ( || ( evdev libinput ) ) " QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X" @@ -24,26 +23,31 @@ QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc" QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite" IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev wayland" # QtPrintSupport = QtGui + QtWidgets enabled. -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X +# ibus = xkbcommon + dbus, and xkbcommon needs either X or libinput REQUIRED_USE+=" - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/}) - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/}) - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/}) - accessibility? ( dbus X ) + $( + printf '%s? ( gui ) ' ${QTGUI_IUSE//+/} + printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/} + printf '%s? ( sql ) ' ${QTSQL_IUSE//+/} + ) + X? ( + || ( evdev libinput ) + gles2-only? ( egl ) + ) + accessibility? ( X dbus ) cups? ( gui widgets ) eglfs? ( egl ) gtk? ( widgets ) - gui? ( || ( eglfs X ) || ( libinput X ) ) + gui? ( || ( X eglfs ) || ( X libinput ) ) libinput? ( udev ) sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) ) vnc? ( gui ) - X? ( gles2-only? ( egl ) ) " # TODO: # qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c # qtnetwork: connman, networkmanager -DEPEND=" +RDEPEND=" app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 @@ -55,6 +59,19 @@ DEPEND=" media-libs/tiff:= >=sys-apps/dbus-1.4.20 sys-libs/zlib:= + X? ( + x11-libs/libdrm + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/libxcb-1.12:= + >=x11-libs/libxkbcommon-0.5.0[X] + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) @@ -86,39 +103,26 @@ DEPEND=" tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libdrm - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:= - >=x11-libs/libxkbcommon-0.5.0[X] - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) zstd? ( app-arch/zstd:= ) " -RDEPEND="${DEPEND}" -PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}* )" +DEPEND="${RDEPEND}" +PDEPEND="wayland? ( =dev-qt/qtwayland-${PV}*:6 )" #864509 src_configure() { local mycmakeargs=( - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} - -DINSTALL_BINDIR=${QT6_BINDIR} - -DINSTALL_DATADIR=${QT6_DATADIR} - -DINSTALL_DOCDIR=${QT6_DOCDIR} - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} - -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR} - -DINSTALL_LIBDIR=${QT6_LIBDIR} - -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR} - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} - -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_ARCHDATADIR}"/mkspecs + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" -DQT_FEATURE_androiddeployqt=OFF $(qt_feature concurrent) $(qt_feature dbus) @@ -133,6 +137,8 @@ src_configure() { $(qt_feature zstd) ) use gui && mycmakeargs+=( + $(qt_feature X xcb) + $(qt_feature X xcb_xlib) $(qt_feature accessibility accessibility_atspi_bridge) $(qt_feature egl) $(qt_feature egl xcb_egl_plugin) @@ -141,22 +147,20 @@ src_configure() { $(qt_feature evdev) $(qt_feature evdev mtdev) -DQT_FEATURE_gif=ON - $(qt_feature jpeg) - $(qt_feature opengl) $(qt_feature gles2-only opengles2) + $(qt_feature jpeg) $(qt_feature libinput) + $(qt_feature opengl) $(qt_feature tslib) $(qt_feature tuio tuiotouch) $(qt_feature vulkan) $(qt_feature widgets) - $(qt_feature X xcb) - $(qt_feature X xcb_xlib) ) use widgets && mycmakeargs+=( $(qt_feature cups) $(qt_feature gtk gtk3) ) - if use libinput || use X; then + if use X || use libinput; then mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) fi use network && mycmakeargs+=( @@ -183,6 +187,5 @@ src_configure() { src_install() { qt6-build_src_install - # https://bugs.gentoo.org/863395 - qt6_symlink_binary_to_path qmake 6 + qt6_symlink_binary_to_path qmake 6 #863395 } diff --git a/dev-qt/qtcharts/qtcharts-6.5.2.ebuild b/dev-qt/qtcharts/qtcharts-6.5.2.ebuild index 92c6cf414b07..4a6f9651a9d7 100644 --- a/dev-qt/qtcharts/qtcharts-6.5.2.ebuild +++ b/dev-qt/qtcharts/qtcharts-6.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,opengl,widgets] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild index 92c6cf414b07..4a6f9651a9d7 100644 --- a/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild +++ b/dev-qt/qtcharts/qtcharts-6.5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,opengl,widgets] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtcharts/qtcharts-6.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.9999.ebuild index 92c6cf414b07..4a6f9651a9d7 100644 --- a/dev-qt/qtcharts/qtcharts-6.9999.ebuild +++ b/dev-qt/qtcharts/qtcharts-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,opengl,widgets] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild index 8c9a771cc98e..216613d338c5 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.2.ebuild @@ -13,11 +13,11 @@ fi IUSE="opengl +sql +widgets" -DEPEND=" - =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network,opengl=,sql=,widgets=] + =dev-qt/qtshadertools-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild index 8c9a771cc98e..216613d338c5 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.9999.ebuild @@ -13,11 +13,11 @@ fi IUSE="opengl +sql +widgets" -DEPEND=" - =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network,opengl=,sql=,widgets=] + =dev-qt/qtshadertools-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 8c9a771cc98e..216613d338c5 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -13,11 +13,11 @@ fi IUSE="opengl +sql +widgets" -DEPEND=" - =dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=] - =dev-qt/qtshadertools-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network,opengl=,sql=,widgets=] + =dev-qt/qtshadertools-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild index ffa831e51aa5..90f3f24d0d6f 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,13 +13,13 @@ fi IUSE="mng" -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild index ffa831e51aa5..90f3f24d0d6f 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,13 +13,13 @@ fi IUSE="mng" -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild index ffa831e51aa5..90f3f24d0d6f 100644 --- a/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild +++ b/dev-qt/qtimageformats/qtimageformats-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,13 +13,13 @@ fi IUSE="mng" -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui] media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtlocation/qtlocation-6.5.2.ebuild b/dev-qt/qtlocation/qtlocation-6.5.2.ebuild index 0862902e101f..0ada78b606c3 100644 --- a/dev-qt/qtlocation/qtlocation-6.5.2.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.5.2.ebuild @@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtpositioning-${PV}* - =dev-qt/qtshadertools-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtpositioning-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild index 0862902e101f..0ada78b606c3 100644 --- a/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.5.9999.ebuild @@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtpositioning-${PV}* - =dev-qt/qtshadertools-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtpositioning-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtlocation/qtlocation-6.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.9999.ebuild index 0862902e101f..0ada78b606c3 100644 --- a/dev-qt/qtlocation/qtlocation-6.9999.ebuild +++ b/dev-qt/qtlocation/qtlocation-6.9999.ebuild @@ -11,10 +11,10 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtpositioning-${PV}* - =dev-qt/qtshadertools-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtpositioning-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild index 1091cf2d5cf6..b32ed30ddadd 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild @@ -12,18 +12,17 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi" - REQUIRED_USE=" || ( ffmpeg gstreamer ) vaapi? ( ffmpeg ) " RDEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtquick3d-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtsvg-${PV}* + =dev-qt/qtbase-${PV}*:6[gui,network,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtquick3d-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 + =dev-qt/qtsvg-${PV}*:6 alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-libs/libva:= @@ -34,19 +33,20 @@ RDEPEND=" ) gstreamer? ( dev-libs/glib:2 - media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse[glib] ) vaapi? ( - =dev-qt/qtbase-${PV}*[opengl] + =dev-qt/qtbase-${PV}*:6[opengl] media-libs/libglvnd media-libs/libva:= ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} gstreamer? ( x11-base/xorg-proto ) v4l? ( sys-kernel/linux-headers ) " @@ -56,8 +56,8 @@ src_configure() { $(qt_feature alsa) $(qt_feature ffmpeg) $(qt_feature gstreamer) - $(qt_feature v4l linux_v4l) $(qt_feature pulseaudio) + $(qt_feature v4l linux_v4l) $(qt_feature vaapi) ) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild index 1091cf2d5cf6..b32ed30ddadd 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild @@ -12,18 +12,17 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi" - REQUIRED_USE=" || ( ffmpeg gstreamer ) vaapi? ( ffmpeg ) " RDEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtquick3d-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtsvg-${PV}* + =dev-qt/qtbase-${PV}*:6[gui,network,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtquick3d-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 + =dev-qt/qtsvg-${PV}*:6 alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-libs/libva:= @@ -34,19 +33,20 @@ RDEPEND=" ) gstreamer? ( dev-libs/glib:2 - media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse[glib] ) vaapi? ( - =dev-qt/qtbase-${PV}*[opengl] + =dev-qt/qtbase-${PV}*:6[opengl] media-libs/libglvnd media-libs/libva:= ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} gstreamer? ( x11-base/xorg-proto ) v4l? ( sys-kernel/linux-headers ) " @@ -56,8 +56,8 @@ src_configure() { $(qt_feature alsa) $(qt_feature ffmpeg) $(qt_feature gstreamer) - $(qt_feature v4l linux_v4l) $(qt_feature pulseaudio) + $(qt_feature v4l linux_v4l) $(qt_feature vaapi) ) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index 1091cf2d5cf6..b32ed30ddadd 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -12,18 +12,17 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi" - REQUIRED_USE=" || ( ffmpeg gstreamer ) vaapi? ( ffmpeg ) " RDEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtquick3d-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtsvg-${PV}* + =dev-qt/qtbase-${PV}*:6[gui,network,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtquick3d-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 + =dev-qt/qtsvg-${PV}*:6 alsa? ( media-libs/alsa-lib ) ffmpeg? ( media-libs/libva:= @@ -34,19 +33,20 @@ RDEPEND=" ) gstreamer? ( dev-libs/glib:2 - media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 media-libs/libglvnd ) pulseaudio? ( media-libs/libpulse[glib] ) vaapi? ( - =dev-qt/qtbase-${PV}*[opengl] + =dev-qt/qtbase-${PV}*:6[opengl] media-libs/libglvnd media-libs/libva:= ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} gstreamer? ( x11-base/xorg-proto ) v4l? ( sys-kernel/linux-headers ) " @@ -56,8 +56,8 @@ src_configure() { $(qt_feature alsa) $(qt_feature ffmpeg) $(qt_feature gstreamer) - $(qt_feature v4l linux_v4l) $(qt_feature pulseaudio) + $(qt_feature v4l linux_v4l) $(qt_feature vaapi) ) diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild index 90c313132402..aa10483ba1ed 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network,widgets] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild index 90c313132402..aa10483ba1ed 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network,widgets] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild index 90c313132402..aa10483ba1ed 100644 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild +++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network,widgets] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild index 60873b452acc..9e3e94e0c22a 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.5.2.ebuild @@ -11,9 +11,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[dbus,gui,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtserialport-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[dbus,gui,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtserialport-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild index 60873b452acc..9e3e94e0c22a 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild @@ -11,9 +11,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[dbus,gui,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtserialport-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[dbus,gui,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtserialport-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild index 60873b452acc..9e3e94e0c22a 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild @@ -11,9 +11,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[dbus,gui,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtserialport-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[dbus,gui,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtserialport-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild index 92a82e63dc8d..29145014dd7f 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.5.2.ebuild @@ -14,14 +14,14 @@ elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtquicktimeline-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[concurrent,network,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtquicktimeline-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 media-libs/assimp:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild index 92a82e63dc8d..29145014dd7f 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.5.9999.ebuild @@ -14,14 +14,14 @@ elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtquicktimeline-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[concurrent,network,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtquicktimeline-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 media-libs/assimp:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild index 92a82e63dc8d..29145014dd7f 100644 --- a/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild +++ b/dev-qt/qtquick3d/qtquick3d-6.9999.ebuild @@ -14,14 +14,14 @@ elif [[ ${QT6_BUILD_TYPE} == live ]]; then EGIT_SUBMODULES=() fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent,network,widgets] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtshadertools-${PV}* - =dev-qt/qtquicktimeline-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[concurrent,network,widgets] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtquicktimeline-${PV}*:6 + =dev-qt/qtshadertools-${PV}*:6 media-libs/assimp:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild index 3b0370aab04e..76d4c78cfff9 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}* - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6 + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild index 3b0370aab04e..76d4c78cfff9 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.5.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}* - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6 + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild index 3b0370aab04e..76d4c78cfff9 100644 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild +++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}* - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6 + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild b/dev-qt/qtscxml/qtscxml-6.5.2.ebuild index 2fedc64db025..4c3ca1b8eb07 100644 --- a/dev-qt/qtscxml/qtscxml-6.5.2.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.5.2.ebuild @@ -11,10 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,network,opengl,widgets] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild index 2fedc64db025..4c3ca1b8eb07 100644 --- a/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.5.9999.ebuild @@ -11,10 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,network,opengl,widgets] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtscxml/qtscxml-6.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.9999.ebuild index 2fedc64db025..4c3ca1b8eb07 100644 --- a/dev-qt/qtscxml/qtscxml-6.9999.ebuild +++ b/dev-qt/qtscxml/qtscxml-6.9999.ebuild @@ -11,10 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,network,opengl,widgets] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,network,opengl,widgets] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild index bf569254cd0a..feddddb8c459 100644 --- a/dev-qt/qtserialport/qtserialport-6.5.2.ebuild +++ b/dev-qt/qtserialport/qtserialport-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,widgets] virtual/libudev:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild index bf569254cd0a..feddddb8c459 100644 --- a/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild +++ b/dev-qt/qtserialport/qtserialport-6.5.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,widgets] virtual/libudev:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtserialport/qtserialport-6.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.9999.ebuild index bf569254cd0a..feddddb8c459 100644 --- a/dev-qt/qtserialport/qtserialport-6.9999.ebuild +++ b/dev-qt/qtserialport/qtserialport-6.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,widgets] virtual/libudev:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild index 88a20ffbb689..863e74db774d 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.5.2.ebuild @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild index 88a20ffbb689..863e74db774d 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild index 88a20ffbb689..863e74db774d 100644 --- a/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild +++ b/dev-qt/qtshadertools/qtshadertools-6.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui] " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsvg/qtsvg-6.5.2.ebuild b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild index 960a981395e2..a1387c292a22 100644 --- a/dev-qt/qtsvg/qtsvg-6.5.2.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,widgets] sys-libs/zlib:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild index 960a981395e2..a1387c292a22 100644 --- a/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.5.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,widgets] sys-libs/zlib:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtsvg/qtsvg-6.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.9999.ebuild index 960a981395e2..a1387c292a22 100644 --- a/dev-qt/qtsvg/qtsvg-6.9999.ebuild +++ b/dev-qt/qtsvg/qtsvg-6.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[gui,widgets] +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[gui,widgets] sys-libs/zlib:= " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qttools/qttools-6.5.2.ebuild b/dev-qt/qttools/qttools-6.5.2.ebuild index e75eadff55af..2d917d3aaffa 100644 --- a/dev-qt/qttools/qttools-6.5.2.ebuild +++ b/dev-qt/qttools/qttools-6.5.2.ebuild @@ -13,23 +13,23 @@ fi IUSE=" assistant designer distancefieldgenerator +linguist pixeltool - qattributionsscanner qdbus qdoc qdiag qplugininfo + qattributionsscanner qdbus qdiag qdoc qplugininfo " -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] ) - designer? ( =dev-qt/qtbase-${PV}*[widgets] ) +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + assistant? ( =dev-qt/qtbase-${PV}*:6[sql,widgets] ) + designer? ( =dev-qt/qtbase-${PV}*:6[widgets] ) distancefieldgenerator? ( - =dev-qt/qtbase-${PV}*[widgets] - =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtbase-${PV}*:6[widgets] + =dev-qt/qtdeclarative-${PV}*:6 ) - pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] ) - qdbus? ( =dev-qt/qtbase-${PV}*[widgets] ) + pixeltool? ( =dev-qt/qtbase-${PV}*:6[widgets] ) + qdbus? ( =dev-qt/qtbase-${PV}*:6[widgets] ) + qdiag? ( =dev-qt/qtbase-${PV}*:6[opengl,widgets] ) qdoc? ( sys-devel/clang:= ) - qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( @@ -41,8 +41,8 @@ src_configure() { $(qt_feature pixeltool) $(qt_feature qattributionsscanner qtattributionsscanner) $(qt_feature qdbus) - $(qt_feature qdoc clang) $(qt_feature qdiag qtdiag) + $(qt_feature qdoc clang) $(qt_feature qplugininfo qtplugininfo) -DQT_FEATURE_thread=ON ) @@ -60,7 +60,7 @@ src_install() { use pixeltool && qt6_symlink_binary_to_path pixeltool 6 use qdbus && qt6_symlink_binary_to_path qdbus 6 use qdbus && qt6_symlink_binary_to_path qdbusviewer 6 - use qdoc && qt6_symlink_binary_to_path qdoc 6 use qdiag && qt6_symlink_binary_to_path qtdiag 6 + use qdoc && qt6_symlink_binary_to_path qdoc 6 use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6 } diff --git a/dev-qt/qttools/qttools-6.5.9999.ebuild b/dev-qt/qttools/qttools-6.5.9999.ebuild index e75eadff55af..2d917d3aaffa 100644 --- a/dev-qt/qttools/qttools-6.5.9999.ebuild +++ b/dev-qt/qttools/qttools-6.5.9999.ebuild @@ -13,23 +13,23 @@ fi IUSE=" assistant designer distancefieldgenerator +linguist pixeltool - qattributionsscanner qdbus qdoc qdiag qplugininfo + qattributionsscanner qdbus qdiag qdoc qplugininfo " -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] ) - designer? ( =dev-qt/qtbase-${PV}*[widgets] ) +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + assistant? ( =dev-qt/qtbase-${PV}*:6[sql,widgets] ) + designer? ( =dev-qt/qtbase-${PV}*:6[widgets] ) distancefieldgenerator? ( - =dev-qt/qtbase-${PV}*[widgets] - =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtbase-${PV}*:6[widgets] + =dev-qt/qtdeclarative-${PV}*:6 ) - pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] ) - qdbus? ( =dev-qt/qtbase-${PV}*[widgets] ) + pixeltool? ( =dev-qt/qtbase-${PV}*:6[widgets] ) + qdbus? ( =dev-qt/qtbase-${PV}*:6[widgets] ) + qdiag? ( =dev-qt/qtbase-${PV}*:6[opengl,widgets] ) qdoc? ( sys-devel/clang:= ) - qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( @@ -41,8 +41,8 @@ src_configure() { $(qt_feature pixeltool) $(qt_feature qattributionsscanner qtattributionsscanner) $(qt_feature qdbus) - $(qt_feature qdoc clang) $(qt_feature qdiag qtdiag) + $(qt_feature qdoc clang) $(qt_feature qplugininfo qtplugininfo) -DQT_FEATURE_thread=ON ) @@ -60,7 +60,7 @@ src_install() { use pixeltool && qt6_symlink_binary_to_path pixeltool 6 use qdbus && qt6_symlink_binary_to_path qdbus 6 use qdbus && qt6_symlink_binary_to_path qdbusviewer 6 - use qdoc && qt6_symlink_binary_to_path qdoc 6 use qdiag && qt6_symlink_binary_to_path qtdiag 6 + use qdoc && qt6_symlink_binary_to_path qdoc 6 use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6 } diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index e75eadff55af..2d917d3aaffa 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -13,23 +13,23 @@ fi IUSE=" assistant designer distancefieldgenerator +linguist pixeltool - qattributionsscanner qdbus qdoc qdiag qplugininfo + qattributionsscanner qdbus qdiag qdoc qplugininfo " -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] ) - designer? ( =dev-qt/qtbase-${PV}*[widgets] ) +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + assistant? ( =dev-qt/qtbase-${PV}*:6[sql,widgets] ) + designer? ( =dev-qt/qtbase-${PV}*:6[widgets] ) distancefieldgenerator? ( - =dev-qt/qtbase-${PV}*[widgets] - =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtbase-${PV}*:6[widgets] + =dev-qt/qtdeclarative-${PV}*:6 ) - pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] ) - qdbus? ( =dev-qt/qtbase-${PV}*[widgets] ) + pixeltool? ( =dev-qt/qtbase-${PV}*:6[widgets] ) + qdbus? ( =dev-qt/qtbase-${PV}*:6[widgets] ) + qdiag? ( =dev-qt/qtbase-${PV}*:6[opengl,widgets] ) qdoc? ( sys-devel/clang:= ) - qdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( @@ -41,8 +41,8 @@ src_configure() { $(qt_feature pixeltool) $(qt_feature qattributionsscanner qtattributionsscanner) $(qt_feature qdbus) - $(qt_feature qdoc clang) $(qt_feature qdiag qtdiag) + $(qt_feature qdoc clang) $(qt_feature qplugininfo qtplugininfo) -DQT_FEATURE_thread=ON ) @@ -60,7 +60,7 @@ src_install() { use pixeltool && qt6_symlink_binary_to_path pixeltool 6 use qdbus && qt6_symlink_binary_to_path qdbus 6 use qdbus && qt6_symlink_binary_to_path qdbusviewer 6 - use qdoc && qt6_symlink_binary_to_path qdoc 6 use qdiag && qt6_symlink_binary_to_path qtdiag 6 + use qdoc && qt6_symlink_binary_to_path qdoc 6 use qplugininfo && qt6_symlink_binary_to_path qtplugininfo 6 } diff --git a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild index 1e3a9009724f..68276df35635 100644 --- a/dev-qt/qttranslations/qttranslations-6.5.2.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,5 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND="=dev-qt/qtbase-${PV}*" -BDEPEND="=dev-qt/qttools-${PV}*[linguist]" +DEPEND="=dev-qt/qtbase-${PV}*:6" +BDEPEND="=dev-qt/qttools-${PV}*:6[linguist]" diff --git a/dev-qt/qttranslations/qttranslations-6.5.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.5.9999.ebuild index 1e3a9009724f..68276df35635 100644 --- a/dev-qt/qttranslations/qttranslations-6.5.9999.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,5 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND="=dev-qt/qtbase-${PV}*" -BDEPEND="=dev-qt/qttools-${PV}*[linguist]" +DEPEND="=dev-qt/qtbase-${PV}*:6" +BDEPEND="=dev-qt/qttools-${PV}*:6[linguist]" diff --git a/dev-qt/qttranslations/qttranslations-6.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.9999.ebuild index 1e3a9009724f..68276df35635 100644 --- a/dev-qt/qttranslations/qttranslations-6.9999.ebuild +++ b/dev-qt/qttranslations/qttranslations-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,5 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="" - -DEPEND="=dev-qt/qtbase-${PV}*" -BDEPEND="=dev-qt/qttools-${PV}*[linguist]" +DEPEND="=dev-qt/qtbase-${PV}*:6" +BDEPEND="=dev-qt/qttools-${PV}*:6[linguist]" diff --git a/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild index 4fbc8c272b2c..5930aec5f988 100644 --- a/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,14 +11,16 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -BDEPEND="dev-util/wayland-scanner" -DEPEND=" +RDEPEND=" dev-libs/wayland - =dev-qt/qtbase-${PV}*[egl,gui,opengl] - =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtbase-${PV}*:6[egl,gui,opengl] + =dev-qt/qtdeclarative-${PV}*:6 media-libs/libglvnd x11-libs/libxkbcommon " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/wayland-scanner" -PATCHES=( "${FILESDIR}/${P}-drag-drop-segfault.patch" ) +PATCHES=( + "${FILESDIR}"/${P}-drag-drop-segfault.patch +) diff --git a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild index 14d6b705e8ef..9946e9eb4584 100644 --- a/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,12 +11,12 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -BDEPEND="dev-util/wayland-scanner" -DEPEND=" +RDEPEND=" dev-libs/wayland - =dev-qt/qtbase-${PV}*[egl,gui,opengl] - =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtbase-${PV}*:6[egl,gui,opengl] + =dev-qt/qtdeclarative-${PV}*:6 media-libs/libglvnd x11-libs/libxkbcommon " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/wayland-scanner" diff --git a/dev-qt/qtwayland/qtwayland-6.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.9999.ebuild index 14d6b705e8ef..9946e9eb4584 100644 --- a/dev-qt/qtwayland/qtwayland-6.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-6.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,12 +11,12 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -BDEPEND="dev-util/wayland-scanner" -DEPEND=" +RDEPEND=" dev-libs/wayland - =dev-qt/qtbase-${PV}*[egl,gui,opengl] - =dev-qt/qtdeclarative-${PV}* + =dev-qt/qtbase-${PV}*:6[egl,gui,opengl] + =dev-qt/qtdeclarative-${PV}*:6 media-libs/libglvnd x11-libs/libxkbcommon " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/wayland-scanner" diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild index e82c78f55aca..ef9718de3a46 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.2.ebuild @@ -11,9 +11,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebsockets-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[concurrent] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtwebsockets-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild index e82c78f55aca..ef9718de3a46 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild @@ -11,9 +11,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebsockets-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[concurrent] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtwebsockets-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild index e82c78f55aca..ef9718de3a46 100644 --- a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild +++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild @@ -11,9 +11,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[concurrent] - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebsockets-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[concurrent] + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtwebsockets-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild index 36bdb9c96769..db3e7be77375 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" -CHROMIUM_VER="108.0.5359.181" -CHROMIUM_PATCHES_VER="114.0.5735.133" - inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build +CHROMIUM_VER=108.0.5359.181 +CHROMIUM_PATCHES_VER=114.0.5735.133 + DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -17,20 +17,11 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-icu widgets + alsa bindist designer geolocation +jumbo-build kerberos + pulseaudio screencast +system-icu widgets " REQUIRED_USE="designer? ( widgets )" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" RDEPEND=" app-arch/snappy:= dev-libs/glib:2 @@ -41,8 +32,8 @@ RDEPEND=" dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebchannel-${PV}* + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtwebchannel-${PV}*:6 media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= @@ -74,18 +65,28 @@ RDEPEND=" x11-libs/libxshmfence:= x11-libs/libXtst alsa? ( media-libs/alsa-lib ) - geolocation? ( =dev-qt/qtpositioning-${PV}* ) + geolocation? ( =dev-qt/qtpositioning-${PV}*:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( - =dev-qt/qtbase-${PV}*[widgets] + =dev-qt/qtbase-${PV}*:6[widgets] ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} media-libs/libglvnd " +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + dev-util/ninja + dev-util/re2c + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" PATCHES=( "${FILESDIR}"/${PN}-5.15.10_p20230623-ffmpeg-binutils-2.41.patch @@ -96,6 +97,8 @@ python_check_deps() { } qtwebengine_check-reqs() { + [[ ${MERGE_TYPE} == binary ]] && return + # bug #307861 eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then @@ -105,8 +108,6 @@ qtwebengine_check-reqs() { fi eshopts_pop - [[ ${MERGE_TYPE} == binary ]] && return - # (check-reqs added for bug #570534) # # Estimate the amount of RAM required @@ -190,8 +191,8 @@ src_prepare() { } src_configure() { - export NINJA_PATH="${BROOT}"/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + export NINJA_PATH=${BROOT}/usr/bin/ninja + export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v} local mycmakeargs=( #-DQT_FEATURE_accessibility=off diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild index 062731444eb5..e99b4903d045 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" -CHROMIUM_VER="108.0.5359.181" -CHROMIUM_PATCHES_VER="113.0.5672.126" - inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build +CHROMIUM_VER=108.0.5359.181 +CHROMIUM_PATCHES_VER=113.0.5672.126 + DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -17,20 +17,11 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-icu widgets + alsa bindist designer geolocation +jumbo-build kerberos + pulseaudio screencast +system-icu widgets " REQUIRED_USE="designer? ( widgets )" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" RDEPEND=" app-arch/snappy:= dev-libs/glib:2 @@ -41,8 +32,8 @@ RDEPEND=" dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebchannel-${PV}* + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtwebchannel-${PV}*:6 media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= @@ -74,24 +65,36 @@ RDEPEND=" x11-libs/libxshmfence:= x11-libs/libXtst alsa? ( media-libs/alsa-lib ) - geolocation? ( =dev-qt/qtpositioning-${PV}* ) + geolocation? ( =dev-qt/qtpositioning-${PV}*:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( - =dev-qt/qtbase-${PV}*[widgets] + =dev-qt/qtbase-${PV}*:6[widgets] ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} media-libs/libglvnd " +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + dev-util/ninja + dev-util/re2c + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" } qtwebengine_check-reqs() { + [[ ${MERGE_TYPE} == binary ]] && return + # bug #307861 eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then @@ -101,8 +104,6 @@ qtwebengine_check-reqs() { fi eshopts_pop - [[ ${MERGE_TYPE} == binary ]] && return - # (check-reqs added for bug #570534) # # Estimate the amount of RAM required @@ -186,8 +187,8 @@ src_prepare() { } src_configure() { - export NINJA_PATH="${BROOT}"/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + export NINJA_PATH=${BROOT}/usr/bin/ninja + export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v} local mycmakeargs=( #-DQT_FEATURE_accessibility=off diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index bad90757778b..c7527f95be63 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -3,13 +3,13 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" -CHROMIUM_VER="108.0.5359.181" -CHROMIUM_PATCHES_VER="114.0.5735.133" - inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build +CHROMIUM_VER=108.0.5359.181 +CHROMIUM_PATCHES_VER=114.0.5735.133 + DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -17,20 +17,11 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast - +system-icu widgets + alsa bindist designer geolocation +jumbo-build kerberos + pulseaudio screencast +system-icu widgets " REQUIRED_USE="designer? ( widgets )" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" RDEPEND=" app-arch/snappy:= dev-libs/glib:2 @@ -41,8 +32,8 @@ RDEPEND=" dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= - =dev-qt/qtdeclarative-${PV}* - =dev-qt/qtwebchannel-${PV}* + =dev-qt/qtdeclarative-${PV}*:6 + =dev-qt/qtwebchannel-${PV}*:6 media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= @@ -74,24 +65,36 @@ RDEPEND=" x11-libs/libxshmfence:= x11-libs/libXtst alsa? ( media-libs/alsa-lib ) - geolocation? ( =dev-qt/qtpositioning-${PV}* ) + geolocation? ( =dev-qt/qtpositioning-${PV}*:6 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( - =dev-qt/qtbase-${PV}*[widgets] + =dev-qt/qtbase-${PV}*:6[widgets] ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} media-libs/libglvnd " +BDEPEND=" + $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') + dev-util/gperf + dev-util/ninja + dev-util/re2c + net-libs/nodejs[ssl] + sys-devel/bison + sys-devel/flex +" python_check_deps() { python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" } qtwebengine_check-reqs() { + [[ ${MERGE_TYPE} == binary ]] && return + # bug #307861 eshopts_push -s extglob if is-flagq '-g?(gdb)?([1-9])'; then @@ -101,8 +104,6 @@ qtwebengine_check-reqs() { fi eshopts_pop - [[ ${MERGE_TYPE} == binary ]] && return - # (check-reqs added for bug #570534) # # Estimate the amount of RAM required @@ -186,8 +187,8 @@ src_prepare() { } src_configure() { - export NINJA_PATH="${BROOT}"/usr/bin/ninja - export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + export NINJA_PATH=${BROOT}/usr/bin/ninja + export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v} local mycmakeargs=( #-DQT_FEATURE_accessibility=off diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild index abdcffa9a067..ca93248189ef 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.2.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild index abdcffa9a067..ca93248189ef 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.5.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild index abdcffa9a067..ca93248189ef 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-6.9999.ebuild @@ -11,8 +11,8 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -DEPEND=" - =dev-qt/qtbase-${PV}*[network] - =dev-qt/qtdeclarative-${PV}* +RDEPEND=" + =dev-qt/qtbase-${PV}*:6[network] + =dev-qt/qtdeclarative-${PV}*:6 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" |