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:' \
