summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-06-21 13:04:41 +0200
committerFabian Groffen <grobian@gentoo.org>2020-06-21 13:04:55 +0200
commitae95ced0f5b7b2b6057d20068c2857b9c13e3c81 (patch)
tree9cf5ea7f66ca61c30c36b260ae2b9bd1628e6246 /app-admin
parentprofiles/base: mask media-gfx/inkscape[jemalloc] (diff)
downloadgentoo-ae95ced0f5b7b2b6057d20068c2857b9c13e3c81.tar.gz
gentoo-ae95ced0f5b7b2b6057d20068c2857b9c13e3c81.tar.bz2
gentoo-ae95ced0f5b7b2b6057d20068c2857b9c13e3c81.zip
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@gentoo.org>
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/diamond/diamond-4.0.515.20200620.ebuild6
1 files changed, 5 insertions, 1 deletions
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:' \