Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/xapps/
Date: Sat, 12 Jun 2021 05:40:29
Message-Id: 1623476411.84c1c6ba650d5d79271c86a509633ce693b23686.sam@gentoo
1 commit: 84c1c6ba650d5d79271c86a509633ce693b23686
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Tue Jun 1 04:45:47 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 12 05:40:11 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c1c6ba
7
8 x11-libs/xapps: fix prefix install
9
10 PYTHON_GI_OVERRIDESDIR contains the fully qualified python
11 path, so no need to prefix it with $ED.
12
13 Closes: https://bugs.gentoo.org/793092
14 Package-Manager: Portage-3.0.18, Repoman-3.0.2
15 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
16 Closes: https://github.com/gentoo/gentoo/pull/21079
17 Signed-off-by: Sam James <sam <AT> gentoo.org>
18
19 x11-libs/xapps/xapps-2.0.6.ebuild | 6 +++---
20 1 file changed, 3 insertions(+), 3 deletions(-)
21
22 diff --git a/x11-libs/xapps/xapps-2.0.6.ebuild b/x11-libs/xapps/xapps-2.0.6.ebuild
23 index b62fa4e6f2c..bade1ef0d30 100644
24 --- a/x11-libs/xapps/xapps-2.0.6.ebuild
25 +++ b/x11-libs/xapps/xapps-2.0.6.ebuild
26 @@ -74,9 +74,9 @@ src_install() {
27 install_pygobject_override() {
28 PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
29 einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
30 - mkdir -p "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die
31 - cp -r "${D}"/pygobject/* "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die
32 - python_optimize "${ED}/${PYTHON_GI_OVERRIDESDIR}/"
33 + mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
34 + cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
35 + python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
36 }
37 python_foreach_impl install_pygobject_override
38 rm -r "${D}/pygobject" || die