diff options
| -rw-r--r-- | sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild | 69 | ||||
| -rw-r--r-- | sys-libs/snapd-glib/snapd-glib-1.65-r2.ebuild (renamed from sys-libs/snapd-glib/snapd-glib-1.65-r1.ebuild) | 28 |
2 files changed, 73 insertions, 24 deletions
diff --git a/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild new file mode 100644 index 000000000000..4a9410b58007 --- /dev/null +++ b/sys-libs/snapd-glib/snapd-glib-1.65-r102.ebuild @@ -0,0 +1,69 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson vala + +DESCRIPTION="glib library for communicating with snapd" +HOMEPAGE="https://snapcraft.io/" +SRC_URI="https://github.com/snapcore/snapd-glib/releases/download/${PV}/${P}.tar.xz" + +LICENSE="LGPL-3" +SLOT="0/1" +KEYWORDS="~amd64" + +IUSE="doc introspection qml qt6 vala" +REQUIRED_USE=" + qml? ( qt6 ) + vala? ( introspection ) +" + +BDEPEND=" + virtual/pkgconfig + sys-devel/gettext + qt6? ( dev-qt/qttools:6[linguist] ) +" + +DEPEND=" + dev-libs/json-glib + dev-libs/glib:2 + dev-util/glib-utils + net-libs/libsoup:3.0 + doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + qml? ( + qt6? ( dev-qt/qtdeclarative:6 ) + ) + qt6? ( + dev-qt/qtbase:6[network,widgets] + ) + vala? ( $(vala_depend) ) +" + +RDEPEND="${DEPEND} + app-containers/snapd +" + +PATCHES=( + # https://github.com/snapcore/snapd-glib/pull/152 + "${FILESDIR}/${P}-install-missing-header.patch" +) + +pkg_setup() { + vala_setup +} + +src_configure() { + local emesonargs=( + "$(meson_use doc docs)" + "$(meson_use introspection)" + "$(meson_use qml qml-bindings)" + "$(meson_use qt6)" + "$(meson_use vala vala-bindings)" + -Dsoup2=false + -Dqt5=false + ) + + 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 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 } |