commit: 26f87db2f9784ed22a74cf1cc16f3ee13d1b212f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 4 04:00:26 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 4 04:00:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f87db2
net-misc/spice-gtk: make gtk-doc conditional; sync live Bug: https://bugs.gentoo.org/906904 Signed-off-by: Sam James <sam <AT> gentoo.org> ...gtk-0.42-r1.ebuild => spice-gtk-0.42-r2.ebuild} | 22 +++++++++------ net-misc/spice-gtk/spice-gtk-9999.ebuild | 33 ++++++++++++++-------- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild similarity index 93% rename from net-misc/spice-gtk/spice-gtk-0.42-r1.ebuild rename to net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild index 9c0ef059a36d..fe18fb9f4736 100644 --- a/net-misc/spice-gtk/spice-gtk-0.42-r1.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild @@ -24,7 +24,7 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" # TODO: # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h @@ -65,25 +65,28 @@ RDEPEND=" # configure knob. The package is relatively lightweight so we just depend # on it unconditionally for now. It would be cleaner to transform this into # a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} - valgrind? ( dev-util/valgrind )" + valgrind? ( dev-util/valgrind ) +" BDEPEND=" + $(python_gen_any_dep ' + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') dev-perl/Text-CSV dev-util/glib-utils - dev-util/gtk-doc >=sys-devel/gettext-0.17 virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) vala? ( $(vala_depend) ) - $(python_gen_any_dep ' - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - ') " python_check_deps() { @@ -101,6 +104,7 @@ src_prepare() { src_configure() { local emesonargs=( + $(meson_feature gtk-doc gtk_doc) $(meson_feature gtk3 gtk) $(meson_feature introspection) $(meson_use mjpeg builtin-mjpeg) diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index 1c112cadb3cb..1f2e35fdf1d5 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -17,14 +17,14 @@ if [[ ${PV} == *9999* ]] ; then SPICE_PROTOCOL_VER=9999 else SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" SPICE_PROTOCOL_VER=0.14.3 fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav" +IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav" # TODO: # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h @@ -45,6 +45,9 @@ RDEPEND=" introspection? ( dev-libs/gobject-introspection ) dev-libs/openssl:= lz4? ( app-arch/lz4 ) + policykit? ( + >=sys-auth/polkit-0.110-r1 + ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( @@ -52,9 +55,6 @@ RDEPEND=" >=sys-apps/usbredir-0.4.2 virtual/acl virtual/libusb:1 - policykit? ( - >=sys-auth/polkit-0.110-r1 - ) ) webdav? ( net-libs/phodav:3.0 @@ -65,23 +65,28 @@ RDEPEND=" # configure knob. The package is relatively lightweight so we just depend # on it unconditionally for now. It would be cleaner to transform this into # a USE="vaapi" conditional and patch the buildsystem... -RDEPEND="${RDEPEND} +RDEPEND=" + ${RDEPEND} amd64? ( media-libs/libva:= ) arm64? ( media-libs/libva:= ) x86? ( media-libs/libva:= ) " -DEPEND="${RDEPEND} - >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}" +DEPEND=" + ${RDEPEND} + >=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER} + valgrind? ( dev-util/valgrind ) +" BDEPEND=" + $(python_gen_any_dep ' + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ') dev-perl/Text-CSV dev-util/glib-utils >=sys-devel/gettext-0.17 virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) vala? ( $(vala_depend) ) - $(python_gen_any_dep ' - dev-python/six[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - ') " python_check_deps() { @@ -92,11 +97,14 @@ python_check_deps() { src_prepare() { default + python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen + use vala && vala_setup } src_configure() { local emesonargs=( + $(meson_feature gtk-doc gtk_doc) $(meson_feature gtk3 gtk) $(meson_feature introspection) $(meson_use mjpeg builtin-mjpeg) @@ -106,6 +114,7 @@ src_configure() { $(meson_feature smartcard) $(meson_feature usbredir) $(meson_feature vala vapi) + $(meson_use valgrind) $(meson_feature webdav) $(meson_feature wayland wayland-protocols) )
