commit: fe9e34ed36987aa50982b7ed4c6b256b4d76a5be Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Tue Apr 13 15:15:40 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Apr 16 05:39:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9e34ed
media-libs/gegl: >=0.4.30 drop gnome2-utils eclass Also improve bash variable call. Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/20367 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-libs/gegl/gegl-0.4.30.ebuild | 6 ++---- media-libs/gegl/gegl-9999.ebuild | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild index e99fb1c28e1..db958e5516e 100644 --- a/media-libs/gegl/gegl-0.4.30.ebuild +++ b/media-libs/gegl/gegl-0.4.30.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit meson gnome2-utils optfeature python-any-r1 vala +inherit meson optfeature python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -103,14 +103,12 @@ src_prepare() { # fix 'build'headers from *.cl on gentoo-hardened, bug 739816 pushd "${S}/opencl/" || die for file in *.cl; do - if [ -f "$file" ]; then + if [[ -f ${file} ]]; then "${EPYTHON}" cltostring.py "${file}" || die fi done popd || die - gnome2_environment_reset - use vala && vala_src_prepare } diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index 31e6ad02e66..72e12f1f01b 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) VALA_USE_DEPEND=vapigen -inherit meson gnome2-utils optfeature python-any-r1 vala +inherit meson optfeature python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -99,8 +99,6 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/meson.build || die - gnome2_environment_reset - use vala && vala_src_prepare }
