From b62381b18b4bf2e919cbfbae11ebcad391e38e77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Dec 2022 03:35:12 +0000 Subject: gentoo auto-resync : 16:12:2022 - 03:35:12 --- dev-qt/Manifest.gz | Bin 11179 -> 11184 bytes dev-qt/qtbase/Manifest | 2 +- dev-qt/qtbase/qtbase-6.4.0-r1.ebuild | 185 +++++++++++++++++++++ dev-qt/qtbase/qtbase-6.4.0.ebuild | 185 --------------------- dev-qt/qtimageformats/Manifest | 4 +- .../qtimageformats/qtimageformats-5.15.7-r1.ebuild | 32 ++++ dev-qt/qtimageformats/qtimageformats-5.15.7.ebuild | 32 ---- .../qtimageformats/qtimageformats-6.4.0-r1.ebuild | 35 ++++ dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild | 35 ---- 9 files changed, 255 insertions(+), 255 deletions(-) create mode 100644 dev-qt/qtbase/qtbase-6.4.0-r1.ebuild delete mode 100644 dev-qt/qtbase/qtbase-6.4.0.ebuild create mode 100644 dev-qt/qtimageformats/qtimageformats-5.15.7-r1.ebuild delete mode 100644 dev-qt/qtimageformats/qtimageformats-5.15.7.ebuild create mode 100644 dev-qt/qtimageformats/qtimageformats-6.4.0-r1.ebuild delete mode 100644 dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index aa98e5fa5b51..0c2f7e4b0cb4 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 9f556e752cd0..5ecf611e972b 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,3 +1,3 @@ DIST qtbase-everywhere-src-6.4.0.tar.xz 47957680 BLAKE2B 488843aa5a7373a517aa993c4fd9ddf6b9926941ee1af2e337cea3dee035cf3bf237aa040705328d2b33e1c60d1cdbe72844621f8f2f79259e53a4a28f6c6267 SHA512 7c9430da115529fa5697d134bf53d185259de23529d6db17398d91d48a0b7a95acd1fbe55189a2d2b3a2ecdafb27065ea99f29f7022110c95a45d6c04ebf46a3 -EBUILD qtbase-6.4.0.ebuild 4921 BLAKE2B db13c472793e0793029219de70a1bb0081699f707694d69b761fc905c47976bc5f489beeea3a563fc28ed34d7ce1d917e4633c522332ad53f7cf93ce2e42e784 SHA512 141f5ec9868aede29ab3614b845038fe22e5afdf5a6ce37cee88ba1732356fa2fad3921c609047fcef72344165ce461e4b62501d2e080c53e723e98e64265c74 +EBUILD qtbase-6.4.0-r1.ebuild 4920 BLAKE2B a94b5b9a52fdafddf2ab6683bbcacceb9c7007a17e4b1d328dccca2fecc87b9d751d07689bab62eab7a157909d8d5c7847d9bb37296db556e53cc415600d0ede SHA512 8e261b6d2c13e9ff6680609db18105c817debae77b01f243c5a44342976aa9526a06cc27a8041517b3ee79f03c0af6b75a7592f013d5cc9987685dc61c94fcc9 MISC metadata.xml 1817 BLAKE2B 8f5b89970837847b5a81326445309f706316943d65ab909c0f0407e95dd5770d9d02a16ad1380a8b1eaee3d251bdc79fba4fee49be688f6db84c1c598de959e0 SHA512 1e650288d6f9e53560163e911ac9f80017e35eaed6b77031f66996e7f7bc3811735e5d9fccd6cddead4c5aaa88ccc032277bb4db45df227ca3a34a643d41c918 diff --git a/dev-qt/qtbase/qtbase-6.4.0-r1.ebuild b/dev-qt/qtbase/qtbase-6.4.0-r1.ebuild new file mode 100644 index 000000000000..8398b9b52361 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.4.0-r1.ebuild @@ -0,0 +1,185 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Cross-platform application development framework" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +# Qt Modules +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" +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" +# QtPrintSupport = QtGui + QtWidgets enabled. +# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X +REQUIRED_USE+=" + $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/}) + $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/}) + $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/}) + accessibility? ( dbus X ) + cups? ( gui widgets ) + eglfs? ( egl ) + gtk? ( widgets ) + gui? ( || ( eglfs X ) || ( libinput X ) ) + 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=" + app-crypt/libb2 + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2:=[pcre16,unicode] + dev-util/gtk-update-icon-cache + media-libs/fontconfig + >=media-libs/freetype-2.6.1:2 + >=media-libs/harfbuzz-1.6.0:= + media-libs/tiff:= + >=sys-apps/dbus-1.4.20 + sys-libs/zlib:= + brotli? ( app-arch/brotli:= ) + evdev? ( sys-libs/mtdev ) + freetds? ( dev-db/freetds ) + gles2-only? ( media-libs/libglvnd ) + !gles2-only? ( media-libs/libglvnd[X] ) + gssapi? ( virtual/krb5 ) + gtk? ( + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + ) + gui? ( media-libs/libpng:= ) + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + jpeg? ( media-libs/libjpeg-turbo:= ) + libinput? ( + dev-libs/libinput:= + >=x11-libs/libxkbcommon-0.5.0 + ) + libproxy? ( net-libs/libproxy ) + mysql? ( dev-db/mysql-connector-c:= ) + oci8? ( dev-db/oracle-instantclient:=[sdk] ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql:* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd:= ) + 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-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND}" + +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} + -DQT_FEATURE_androiddeployqt=OFF + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature gui testlib) + $(qt_feature icu) + $(qt_feature network) + $(qt_feature sql) + $(qt_feature systemd journald) + $(qt_feature udev libudev) + $(qt_feature xml) + $(qt_feature zstd) + ) + use gui && mycmakeargs+=( + $(qt_feature accessibility accessibility_atspi_bridge) + $(qt_feature egl) + $(qt_feature eglfs eglfs_egldevice) + $(qt_feature eglfs eglfs_gbm) + $(qt_feature evdev) + $(qt_feature evdev mtdev) + -DQT_FEATURE_gif=ON + $(qt_feature jpeg) + $(qt_feature opengl) + $(qt_feature gles2-only opengles2) + $(qt_feature libinput) + $(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 + mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) + fi + use network && mycmakeargs+=( + $(qt_feature brotli) + $(qt_feature gssapi) + $(qt_feature libproxy) + $(qt_feature sctp) + $(qt_feature ssl openssl) + $(qt_feature vnc) + ) + use sql && mycmakeargs+=( + $(qt_feature freetds sql_tds) + $(qt_feature mysql sql_mysql) + $(qt_feature oci8 sql_oci) + $(qt_feature odbc sql_odbc) + $(qt_feature postgres sql_psql) + $(qt_feature sqlite sql_sqlite) + $(qt_feature sqlite system_sqlite) + ) + + qt6-build_src_configure +} + +src_install() { + qt6-build_src_install + + # https://bugs.gentoo.org/863395 + dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6 +} diff --git a/dev-qt/qtbase/qtbase-6.4.0.ebuild b/dev-qt/qtbase/qtbase-6.4.0.ebuild deleted file mode 100644 index 7139d94a1678..000000000000 --- a/dev-qt/qtbase/qtbase-6.4.0.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -# Qt Modules -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" -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" -# QtPrintSupport = QtGui + QtWidgets enabled. -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X -REQUIRED_USE+=" - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/}) - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/}) - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/}) - accessibility? ( dbus X ) - cups? ( gui widgets ) - eglfs? ( egl ) - gtk? ( widgets ) - gui? ( || ( eglfs X ) || ( libinput X ) ) - 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=" - app-crypt/libb2 - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2:=[pcre16,unicode] - dev-util/gtk-update-icon-cache - media-libs/fontconfig - >=media-libs/freetype-2.6.1:2 - >=media-libs/harfbuzz-1.6.0:= - media-libs/tiff:0 - >=sys-apps/dbus-1.4.20 - sys-libs/zlib:= - brotli? ( app-arch/brotli:= ) - evdev? ( sys-libs/mtdev ) - freetds? ( dev-db/freetds ) - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X] ) - gssapi? ( virtual/krb5 ) - gtk? ( - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) - gui? ( media-libs/libpng:0= ) - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - jpeg? ( media-libs/libjpeg-turbo:= ) - libinput? ( - dev-libs/libinput:= - >=x11-libs/libxkbcommon-0.5.0 - ) - libproxy? ( net-libs/libproxy ) - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl:= ) - systemd? ( sys-apps/systemd:= ) - 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-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND="${DEPEND}" - -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} - -DQT_FEATURE_androiddeployqt=OFF - $(qt_feature concurrent) - $(qt_feature dbus) - $(qt_feature gui) - $(qt_feature gui testlib) - $(qt_feature icu) - $(qt_feature network) - $(qt_feature sql) - $(qt_feature systemd journald) - $(qt_feature udev libudev) - $(qt_feature xml) - $(qt_feature zstd) - ) - use gui && mycmakeargs+=( - $(qt_feature accessibility accessibility_atspi_bridge) - $(qt_feature egl) - $(qt_feature eglfs eglfs_egldevice) - $(qt_feature eglfs eglfs_gbm) - $(qt_feature evdev) - $(qt_feature evdev mtdev) - -DQT_FEATURE_gif=ON - $(qt_feature jpeg) - $(qt_feature opengl) - $(qt_feature gles2-only opengles2) - $(qt_feature libinput) - $(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 - mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) - fi - use network && mycmakeargs+=( - $(qt_feature brotli) - $(qt_feature gssapi) - $(qt_feature libproxy) - $(qt_feature sctp) - $(qt_feature ssl openssl) - $(qt_feature vnc) - ) - use sql && mycmakeargs+=( - $(qt_feature freetds sql_tds) - $(qt_feature mysql sql_mysql) - $(qt_feature oci8 sql_oci) - $(qt_feature odbc sql_odbc) - $(qt_feature postgres sql_psql) - $(qt_feature sqlite sql_sqlite) - $(qt_feature sqlite system_sqlite) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - # https://bugs.gentoo.org/863395 - dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6 -} diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index 3c688fe7838f..d70c988a88e7 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -1,6 +1,6 @@ DIST qtimageformats-5.15.7-gentoo-kde-1.tar.xz 4996 BLAKE2B 6d7d3fe4ef38f3e10227ebade69033c90c361982663265a70f457885521c339dd3ac2e6eecb1c081aeb802cdeee72f72fe52c069493155ccc1d7844a4b55c492 SHA512 2f5ccf7b3712497e47427caf7adeec2bacfa301fb2dfed8b4bb9140372771e24585a3d4d4bebd586912ecc05f4830451ecb22a9233ba873d8160bf9bb3f55ea1 DIST qtimageformats-everywhere-opensource-src-5.15.7.tar.xz 1842728 BLAKE2B 12eba086a2a216addfbdddc07d3171e7f9901a2fd0cdf30bc37b9f70a62cfc82f0443d42d1f0ab4c777332ee791fadf52579f72d7ddab50ff9f2152e0b6c7310 SHA512 6e899aa975856eb2b9b113dbcf75692fedfbb31559ecf09dd128886d77dcde68848403144e1f0e73b9b9f909a46e082f24a29db2fcc5bc5810bb93a88ad7150d DIST qtimageformats-everywhere-src-6.4.0.tar.xz 1861400 BLAKE2B be2d99999a29b5876981d0768d63dab6a70181a1643be73e83cb7bf6771bd35462165e1a848206d4f69018c3388118f4bd94a336ff28ab19dbc75973eb86463b SHA512 3a7302cfbe9187ffb753c7171c62bbf43223c9c876bb0df20de8b593d51ef775bffeff124d269ed8d4ce7e1fb3d55790acd75bce0b5d5bfa223e5e83dfb41f01 -EBUILD qtimageformats-5.15.7.ebuild 698 BLAKE2B f7f6bac296ad3b02390ba0d0178cd1c8e007946716a42deca490ed69fb93638434662bbb8fbce90f742ca7c26e90b84e1fc0fa84e15c14ca0bb6b9a985b4c38a SHA512 029c2555271925d01d0b7679d5f658c4032dc5c772f3685badc048205ba47d9781c10abdc56c21b4b01f8b75dc853ab5e0739af0ad67bbfd8f522a96775ff101 -EBUILD qtimageformats-6.4.0.ebuild 631 BLAKE2B ae1993a0a35341ec1e9573fedb84f4a57887f3479fb62f63aa93b00087cfdd13c0d6e7c1c69ccfee664129d699b018f305da4dca54fb98529e8b80146a10828f SHA512 e316edc6f699ce26e11e5036b32c04b49dda78d744cec47ca700d4db49a50a4f9fb3c90145e08a1ccc6cddfbf608c51d5ffb8bf6d3942fb61b4259815e76ea7f +EBUILD qtimageformats-5.15.7-r1.ebuild 698 BLAKE2B ace4fa78fd6283dea8df5ef4648a65c8bb2341e7651c2a75bbc36abf33da76b66a342eb13ce362d3d3faa0025e61e3c3767b01ce9a8d06add28b7ceff4056424 SHA512 5a85379b914d9ced5615438db12fa2c7f06ca441aea9b98fd1fcb6bca7e827ffa56d88400fb4b5f74e8fcb1c39360c6441280629dc3daa91657b90fc7857f8bd +EBUILD qtimageformats-6.4.0-r1.ebuild 633 BLAKE2B 1d17b7e376cdab0291450c0fce5da50f5ce7882670f3a6e02b4660ba2f6ffdfba8e4c8df51f15cd77ca8567e0fb01ab56af6f1772ec6d36a96cf5f20ffa0c227 SHA512 47d854a16b2af5c5fe487a8d4ca8052c49f3e5fbb4ffeccea85bec59d2926d640812e15aeab89d0ee807a8efa5c2e2aa85e1e089ed48568f827fb167ee8665d3 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.7-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.7-r1.ebuild new file mode 100644 index 000000000000..c29d2fe6359f --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-5.15.7-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86" +fi + +inherit qt5-build + +DESCRIPTION="Additional format plugins for the Qt image I/O system" + +IUSE="mng" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}* + =dev-qt/qtgui-${QT5_PV}* + media-libs/libwebp:= + media-libs/tiff:= + mng? ( media-libs/libmng:= ) +" +RDEPEND="${DEPEND}" + +src_configure() { + sed -e 's/qtConfig(jasper)/false:/' \ + -i src/plugins/imageformats/imageformats.pro || die + qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro + + qt5-build_src_configure +} diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.7.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.7.ebuild deleted file mode 100644 index e492a970fa44..000000000000 --- a/dev-qt/qtimageformats/qtimageformats-5.15.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86" -fi - -inherit qt5-build - -DESCRIPTION="Additional format plugins for the Qt image I/O system" - -IUSE="mng" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}* - =dev-qt/qtgui-${QT5_PV}* - media-libs/libwebp:= - media-libs/tiff:0 - mng? ( media-libs/libmng:= ) -" -RDEPEND="${DEPEND}" - -src_configure() { - sed -e 's/qtConfig(jasper)/false:/' \ - -i src/plugins/imageformats/imageformats.pro || die - qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro - - qt5-build_src_configure -} diff --git a/dev-qt/qtimageformats/qtimageformats-6.4.0-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-6.4.0-r1.ebuild new file mode 100644 index 000000000000..a59b77b65daa --- /dev/null +++ b/dev-qt/qtimageformats/qtimageformats-6.4.0-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qt6-build + +DESCRIPTION="Additional format plugins for the Qt image I/O system" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE="mng" + +DEPEND=" + =dev-qt/qtbase-${PV}*[gui] + media-libs/libwebp:= + media-libs/tiff:= + mng? ( media-libs/libmng:= ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DQT_FEATURE_jasper=OFF + $(qt_feature mng) + -DQT_FEATURE_tiff=ON + -DQT_FEATURE_webp=ON + -DQT_FEATURE_system-tiff=ON + -DQT_FEATURE_system-webp=ON + ) + + qt6-build_src_configure +} diff --git a/dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild b/dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild deleted file mode 100644 index f1a8354ec61c..000000000000 --- a/dev-qt/qtimageformats/qtimageformats-6.4.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Additional format plugins for the Qt image I/O system" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="mng" - -DEPEND=" - =dev-qt/qtbase-${PV}*[gui] - media-libs/libwebp:= - media-libs/tiff - mng? ( media-libs/libmng:= ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DQT_FEATURE_jasper=OFF - $(qt_feature mng) - -DQT_FEATURE_tiff=ON - -DQT_FEATURE_webp=ON - -DQT_FEATURE_system-tiff=ON - -DQT_FEATURE_system-webp=ON - ) - - qt6-build_src_configure -} -- cgit v1.2.3