commit: 7b3db06ab0bbc0e3ab97ada6c5b1d7398ca8a50a Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sun Apr 28 13:07:31 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sun Apr 28 13:07:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3db06a
sys-libs/snapd-glib: split 1.65 into qt5 and qt6 revision See-also: https://github.com/gentoo/kde/pull/991 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> ...-1.65-r1.ebuild => snapd-glib-1.65-r102.ebuild} | 30 +++------------------- ...ib-1.65-r1.ebuild => snapd-glib-1.65-r2.ebuild} | 28 +++----------------- 2 files changed, 8 insertions(+), 50 deletions(-) diff --git a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild similarity index 74% copy from sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild copy to sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild index 558bca6c7442..4a9410b58007 100644 --- a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild +++ b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild @@ -13,16 +13,15 @@ LICENSE="LGPL-3" SLOT="0/1" KEYWORDS="~amd64" -IUSE="doc introspection qml qt5 qt6 vala" +IUSE="doc introspection qml qt6 vala" REQUIRED_USE=" - qml? ( || ( qt5 qt6 ) ) + qml? ( qt6 ) vala? ( introspection ) " BDEPEND=" virtual/pkgconfig sys-devel/gettext - qt5? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) " @@ -34,14 +33,8 @@ DEPEND=" doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) qml? ( - qt5? ( dev-qt/qtdeclarative:5 ) qt6? ( dev-qt/qtdeclarative:6 ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) qt6? ( dev-qt/qtbase:6[network,widgets] ) @@ -66,26 +59,11 @@ src_configure() { "$(meson_use doc docs)" "$(meson_use introspection)" "$(meson_use qml qml-bindings)" + "$(meson_use qt6)" "$(meson_use vala vala-bindings)" -Dsoup2=false + -Dqt5=false ) - if use qt5; then - emesonargs+=( - -Dqt5=true - -Dqt6=false - ) - elif use qt6; then - emesonargs+=( - -Dqt5=false - -Dqt6=true - ) - else - emesonargs+=( - -Dqt5=false - -Dqt6=false - ) - fi - meson_src_configure } diff --git a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild similarity index 75% rename from sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild rename to sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild index 558bca6c7442..be44bfbc7a6a 100644 --- a/sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild +++ b/sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild @@ -13,9 +13,9 @@ LICENSE="LGPL-3" SLOT="0/1" KEYWORDS="~amd64" -IUSE="doc introspection qml qt5 qt6 vala" +IUSE="doc introspection qml qt5 vala" REQUIRED_USE=" - qml? ( || ( qt5 qt6 ) ) + qml? ( qt5 ) vala? ( introspection ) " @@ -23,7 +23,6 @@ BDEPEND=" virtual/pkgconfig sys-devel/gettext qt5? ( dev-qt/linguist-tools:5 ) - qt6? ( dev-qt/qttools:6[linguist] ) " DEPEND=" @@ -35,16 +34,12 @@ DEPEND=" introspection? ( dev-libs/gobject-introspection ) qml? ( qt5? ( dev-qt/qtdeclarative:5 ) - qt6? ( dev-qt/qtdeclarative:6 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) - qt6? ( - dev-qt/qtbase:6[network,widgets] - ) vala? ( $(vala_depend) ) " @@ -66,26 +61,11 @@ src_configure() { "$(meson_use doc docs)" "$(meson_use introspection)" "$(meson_use qml qml-bindings)" + "$(meson_use qt5)" "$(meson_use vala vala-bindings)" -Dsoup2=false + -Dqt6=false ) - if use qt5; then - emesonargs+=( - -Dqt5=true - -Dqt6=false - ) - elif use qt6; then - emesonargs+=( - -Dqt5=false - -Dqt6=true - ) - else - emesonargs+=( - -Dqt5=false - -Dqt6=false - ) - fi - meson_src_configure }
