Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-sound/nulloy/
Date: Mon, 26 Sep 2022 10:05:52
Message-Id: 1664186741.ec50e400b8152d61320a85542a5fa66c593a63bc.andrewammerlaan@gentoo
1 commit: ec50e400b8152d61320a85542a5fa66c593a63bc
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 26 10:03:44 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 10:05:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ec50e400
7
8 media-sound/nulloy: quote S/FILESDIR/WORKDIR vars
9
10 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
11
12 media-sound/nulloy/nulloy-0.9.5.ebuild | 6 +++---
13 media-sound/nulloy/nulloy-9999.ebuild | 10 +++++-----
14 2 files changed, 8 insertions(+), 8 deletions(-)
15
16 diff --git a/media-sound/nulloy/nulloy-0.9.5.ebuild b/media-sound/nulloy/nulloy-0.9.5.ebuild
17 index 34f21704c..199eb6dd5 100644
18 --- a/media-sound/nulloy/nulloy-0.9.5.ebuild
19 +++ b/media-sound/nulloy/nulloy-0.9.5.ebuild
20 @@ -40,7 +40,7 @@ src_prepare() {
21 if use skins ; then
22 eapply "${FILESDIR}"/add-dark-theme.patch
23
24 - cp -r $WORKDIR/$NAME src/skins/night
25 + cp -r "${WORKDIR}/${NAME}" src/skins/night
26 fi
27
28 default
29 @@ -64,10 +64,10 @@ src_configure() {
30 # because Portage does it when the install phase is run to be able
31 # to support the `splitdebug` and `installsources` FEATURES.
32 # See related issue https://bugs.gentoo.org/856292
33 - echo "CONFIG += nostrip" >> $WORKDIR/$P/.qmake.cache
34 + echo "CONFIG += nostrip" >> "${WORKDIR}/${P}/.qmake.cache"
35 }
36
37 src_install() {
38 - emake INSTALL_ROOT="${D}" install
39 + emake INSTALL_ROOT="${ED}" install
40 einstalldocs
41 }
42
43 diff --git a/media-sound/nulloy/nulloy-9999.ebuild b/media-sound/nulloy/nulloy-9999.ebuild
44 index 161074f39..b3e9b8b53 100644
45 --- a/media-sound/nulloy/nulloy-9999.ebuild
46 +++ b/media-sound/nulloy/nulloy-9999.ebuild
47 @@ -39,7 +39,7 @@ src_unpack() {
48
49 if use skins ; then
50 EGIT_REPO_URI=https://gitlab.com/vitaly-zdanevich/nulloy-theme-night.git
51 - EGIT_CHECKOUT_DIR=${WORKDIR}/night
52 + EGIT_CHECKOUT_DIR="${WORKDIR}/night"
53 git-r3_src_unpack
54 fi
55 }
56 @@ -48,8 +48,8 @@ src_prepare() {
57 default
58
59 if use skins ; then
60 - eapply $FILESDIR/add-dark-theme.patch
61 - cp -r $WORKDIR/night src/skins
62 + eapply "${FILESDIR}/add-dark-theme.patch"
63 + cp -r "${WORKDIR}/night" src/skins
64 fi
65 }
66
67 @@ -71,10 +71,10 @@ src_configure() {
68 # because Portage does it when the install phase is run to be able
69 # to support the `splitdebug` and `installsources` FEATURES.
70 # See related issue https://bugs.gentoo.org/856292
71 - echo "CONFIG += nostrip" >> $WORKDIR/$P/.qmake.cache
72 + echo "CONFIG += nostrip" >> "${WORKDIR}/${P}/.qmake.cache"
73 }
74
75 src_install() {
76 - emake INSTALL_ROOT="${D}" install
77 + emake INSTALL_ROOT="${ED}" install
78 einstalldocs
79 }