Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: net-p2p/p2pool/, net-p2p/feather/
Date: Thu, 29 Dec 2022 11:34:06
Message-Id: 1672269571.1f6f6544b20f3350651f7d8c2e6141de9859a919.flow@gentoo
1 commit: 1f6f6544b20f3350651f7d8c2e6141de9859a919
2 Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
3 AuthorDate: Wed Dec 28 23:19:31 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 28 23:19:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1f6f6544
7
8 net-p2p/feather: add additional "die" to pushd/popd
9
10 Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
11
12 net-p2p/feather/feather-2.1.2.ebuild | 4 ++--
13 net-p2p/p2pool/p2pool-2.6-r1.ebuild | 1 -
14 2 files changed, 2 insertions(+), 3 deletions(-)
15
16 diff --git a/net-p2p/feather/feather-2.1.2.ebuild b/net-p2p/feather/feather-2.1.2.ebuild
17 index 697aca1eb..1678afc9e 100644
18 --- a/net-p2p/feather/feather-2.1.2.ebuild
19 +++ b/net-p2p/feather/feather-2.1.2.ebuild
20 @@ -98,9 +98,9 @@ src_prepare() {
21 default
22 echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
23 echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
24 - pushd monero
25 + pushd monero || die
26 eapply "${FILESDIR}"/monero_add_some_includes.patch
27 - popd
28 + popd || die
29 cmake_src_prepare
30 }
31
32
33 diff --git a/net-p2p/p2pool/p2pool-2.6-r1.ebuild b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
34 index 960bce71a..4d2e93547 100644
35 --- a/net-p2p/p2pool/p2pool-2.6-r1.ebuild
36 +++ b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
37 @@ -71,7 +71,6 @@ src_prepare() {
38
39 # Stop their script from overriding flags:
40 cp "${FILESDIR}"/flags.cmake cmake/flags.cmake || die
41 - die
42
43 cmake_src_prepare
44 }