From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
Date: Sun, 21 Jun 2020 11:04:59 +0000 (UTC) [thread overview]
Message-ID: <1592737495.ae95ced0f5b7b2b6057d20068c2857b9c13e3c81.grobian@gentoo> (raw)
commit: ae95ced0f5b7b2b6057d20068c2857b9c13e3c81
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:04:41 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 11:04:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae95ced0
app-admin/diamond-4.0.515.20200620: fix installation with python3.8
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
app-admin/diamond/diamond-4.0.515.20200620.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app-admin/diamond/diamond-4.0.515.20200620.ebuild b/app-admin/diamond/diamond-4.0.515.20200620.ebuild
index 8438dac5e0b..938b0d14ce9 100644
--- a/app-admin/diamond/diamond-4.0.515.20200620.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20200620.ebuild
@@ -64,7 +64,11 @@ python_install() {
export VIRTUAL_ENV=1
distutils-r1_python_install
python_optimize
- mv "${ED}"/usr/etc "${ED}"/ || die
+ # since python3.8 installation goes straight into /etc
+ [[ -d ${ED}/etc ]] && [[ -d ${ED}/usr/etc ]] && rm -Rf "${ED}"/usr/etc
+ if [[ -d ${ED}/usr/etc ]] ; then
+ mv "${ED}"/usr/etc "${ED}"/ || die
+ fi
rm "${ED}"/etc/diamond/*.windows # won't need these
sed -i \
-e '/pid_file =/s:/var/run:/run:' \
next reply other threads:[~2020-06-21 11:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-21 11:04 Fabian Groffen [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-06 12:46 [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/ Fabian Groffen
2020-06-21 6:23 Michał Górny
2020-04-25 17:52 Fabian Groffen
2020-02-10 10:02 Fabian Groffen
2020-02-10 8:18 Agostino Sarubbo
2020-02-09 8:43 Mikle Kolyada
2019-12-10 20:15 Aaron Bauman
2019-12-08 10:31 Fabian Groffen
2019-12-07 14:38 Fabian Groffen
2019-06-21 11:07 Agostino Sarubbo
2019-06-20 18:06 Mikle Kolyada
2019-02-21 18:37 Fabian Groffen
2017-12-03 11:27 Fabian Groffen
2017-09-17 9:59 Fabian Groffen
2017-07-11 9:22 Fabian Groffen
2017-05-09 9:42 Mikle Kolyada
2016-08-02 18:47 Fabian Groffen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1592737495.ae95ced0f5b7b2b6057d20068c2857b9c13e3c81.grobian@gentoo \
--to=grobian@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox