| 1 |
commit: fe9e34ed36987aa50982b7ed4c6b256b4d76a5be |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Tue Apr 13 15:15:40 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 16 05:39:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9e34ed |
| 7 |
|
| 8 |
media-libs/gegl: >=0.4.30 drop gnome2-utils eclass |
| 9 |
|
| 10 |
Also improve bash variable call. |
| 11 |
|
| 12 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/20367 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
media-libs/gegl/gegl-0.4.30.ebuild | 6 ++---- |
| 17 |
media-libs/gegl/gegl-9999.ebuild | 4 +--- |
| 18 |
2 files changed, 3 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild |
| 21 |
index e99fb1c28e1..db958e5516e 100644 |
| 22 |
--- a/media-libs/gegl/gegl-0.4.30.ebuild |
| 23 |
+++ b/media-libs/gegl/gegl-0.4.30.ebuild |
| 24 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} ) |
| 25 |
# vala and introspection support is broken, bug #468208 |
| 26 |
VALA_USE_DEPEND=vapigen |
| 27 |
|
| 28 |
-inherit meson gnome2-utils optfeature python-any-r1 vala |
| 29 |
+inherit meson optfeature python-any-r1 vala |
| 30 |
|
| 31 |
if [[ ${PV} == *9999* ]]; then |
| 32 |
inherit git-r3 |
| 33 |
@@ -103,14 +103,12 @@ src_prepare() { |
| 34 |
# fix 'build'headers from *.cl on gentoo-hardened, bug 739816 |
| 35 |
pushd "${S}/opencl/" || die |
| 36 |
for file in *.cl; do |
| 37 |
- if [ -f "$file" ]; then |
| 38 |
+ if [[ -f ${file} ]]; then |
| 39 |
"${EPYTHON}" cltostring.py "${file}" || die |
| 40 |
fi |
| 41 |
done |
| 42 |
popd || die |
| 43 |
|
| 44 |
- gnome2_environment_reset |
| 45 |
- |
| 46 |
use vala && vala_src_prepare |
| 47 |
} |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild |
| 51 |
index 31e6ad02e66..72e12f1f01b 100644 |
| 52 |
--- a/media-libs/gegl/gegl-9999.ebuild |
| 53 |
+++ b/media-libs/gegl/gegl-9999.ebuild |
| 54 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 55 |
PYTHON_COMPAT=( python3_{7..9} ) |
| 56 |
VALA_USE_DEPEND=vapigen |
| 57 |
|
| 58 |
-inherit meson gnome2-utils optfeature python-any-r1 vala |
| 59 |
+inherit meson optfeature python-any-r1 vala |
| 60 |
|
| 61 |
if [[ ${PV} == *9999* ]]; then |
| 62 |
inherit git-r3 |
| 63 |
@@ -99,8 +99,6 @@ src_prepare() { |
| 64 |
-e '/composite-transform.xml/d' \ |
| 65 |
-i tests/compositions/meson.build || die |
| 66 |
|
| 67 |
- gnome2_environment_reset |
| 68 |
- |
| 69 |
use vala && vala_src_prepare |
| 70 |
} |
Archives