From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B412C13835A for ; Fri, 16 Apr 2021 05:40:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF478E07FE; Fri, 16 Apr 2021 05:40:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A64FCE07FE for ; Fri, 16 Apr 2021 05:40:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4500F340BDD for ; Fri, 16 Apr 2021 05:40:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9BC2664D for ; Fri, 16 Apr 2021 05:40:04 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1618551597.fe9e34ed36987aa50982b7ed4c6b256b4d76a5be.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gegl/gegl-0.4.30.ebuild media-libs/gegl/gegl-9999.ebuild X-VCS-Directories: media-libs/gegl/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: fe9e34ed36987aa50982b7ed4c6b256b4d76a5be X-VCS-Branch: master Date: Fri, 16 Apr 2021 05:40:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c9a2543-219f-4959-b274-5fa1cd124c27 X-Archives-Hash: f63f8250ecf5b52711d24d355e5665f5 commit: fe9e34ed36987aa50982b7ed4c6b256b4d76a5be Author: Sergey Torokhov yandex ru> AuthorDate: Tue Apr 13 15:15:40 2021 +0000 Commit: Joonas Niilola gentoo 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 yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/20367 Signed-off-by: Joonas Niilola 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 }