From ae95ced0f5b7b2b6057d20068c2857b9c13e3c81 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 21 Jun 2020 13:04:41 +0200 Subject: 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 --- app-admin/diamond/diamond-4.0.515.20200620.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app-admin/diamond') diff --git a/app-admin/diamond/diamond-4.0.515.20200620.ebuild b/app-admin/diamond/diamond-4.0.515.20200620.ebuild index 8438dac5e0ba..938b0d14ce90 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:' \ -- cgit v1.2.3-65-gdbad