commit: 98740b2afe921b80e9ea842ac68ec46b76581537 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Mon May 25 02:32:49 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Jun 25 08:07:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98740b2a
media-libs/babl: 9999, fix build: ['vapigen'] not found or not executable Add new dependency "vala" Closes: https://bugs.gentoo.org/723868 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-libs/babl/babl-9999.ebuild | 19 ++++++++++++++++--- media-libs/gegl/gegl-9999.ebuild | 5 ++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild index 16fe9b5de13..be6f45add6b 100644 --- a/media-libs/babl/babl-9999.ebuild +++ b/media-libs/babl/babl-9999.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit meson +VALA_USE_DEPEND=vapigen + +inherit meson gnome2-utils vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -19,15 +21,25 @@ HOMEPAGE="http://www.gegl.org/babl/"; LICENSE="LGPL-3" SLOT="0" -IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" +IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" +REQUIRED_USE="vala? ( introspection )" -BDEPEND="virtual/pkgconfig" +BDEPEND=" + virtual/pkgconfig + vala? ( $(vala_depend) ) +" RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) " DEPEND="${RDEPEND}" +src_prepare() { + default + gnome2_environment_reset + use vala && vala_src_prepare +} + src_configure() { # Automagic rsvg support is just for website generation we do not call, # so we don't need to fix it @@ -37,6 +49,7 @@ src_configure() { -Dwith-docs=false $(meson_use introspection enable-gir) $(meson_use lcms with-lcms) + $(meson_use vala enable-vapi) $(meson_use cpu_flags_x86_avx2 enable-avx2) $(meson_use cpu_flags_x86_f16c enable-f16c) $(meson_use cpu_flags_x86_mmx enable-mmx) diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index 7b1deef5bdb..c854f48fae0 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -4,7 +4,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -# vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen inherit meson gnome2-utils python-any-r1 vala @@ -15,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"; - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" @@ -39,7 +38,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.74[introspection?,lcms?] + >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0
