commit:     5fc24844a2084d667c64b473a1fc403f24cfec83
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Wed Jan 27 03:32:22 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 13:02:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc24844

x11-libs/xapps: Fix meson script shebangs

Also, xdg_environment_reset is handled by EAPI-7.

Bug: https://bugs.gentoo.org/766935
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-libs/xapps/xapps-1.8.9.ebuild | 5 ++++-
 x11-libs/xapps/xapps-2.0.6.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild 
b/x11-libs/xapps/xapps-1.8.9.ebuild
index da3eb4f5ac9..6245bcf0201 100644
--- a/x11-libs/xapps/xapps-1.8.9.ebuild
+++ b/x11-libs/xapps/xapps-1.8.9.ebuild
@@ -45,9 +45,12 @@ BDEPEND="
 "
 
 src_prepare() {
-       xdg_environment_reset
        vala_src_prepare
        default
+
+       # Fix meson helpers
+       python_setup
+       python_fix_shebang meson-scripts schemas
 }
 
 src_configure() {

diff --git a/x11-libs/xapps/xapps-2.0.6.ebuild 
b/x11-libs/xapps/xapps-2.0.6.ebuild
index 0dc60ed6384..3059ed0a95c 100644
--- a/x11-libs/xapps/xapps-2.0.6.ebuild
+++ b/x11-libs/xapps/xapps-2.0.6.ebuild
@@ -47,12 +47,15 @@ BDEPEND="
 "
 
 src_prepare() {
-       xdg_environment_reset
        vala_src_prepare
        default
 
        # don't install distro specific tools
        sed -i "/subdir('scripts')/d" meson.build || die
+
+       # Fix meson helpers
+       python_setup
+       python_fix_shebang meson-scripts
 }
 
 src_configure() {

Reply via email to