From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2ACBE1382C5 for ; Sun, 21 Jun 2020 11:05:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33CD7E08AC; Sun, 21 Jun 2020 11:05:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 19445E08AC for ; Sun, 21 Jun 2020 11:05:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 900E034F6E4 for ; Sun, 21 Jun 2020 11:05:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0A69253 for ; Sun, 21 Jun 2020 11:04:59 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1592737495.ae95ced0f5b7b2b6057d20068c2857b9c13e3c81.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/diamond/diamond-4.0.515.20200620.ebuild X-VCS-Directories: app-admin/diamond/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: ae95ced0f5b7b2b6057d20068c2857b9c13e3c81 X-VCS-Branch: master Date: Sun, 21 Jun 2020 11:04:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09d900c3-935d-46a4-84ab-a524d8c6838b X-Archives-Hash: a710b9387a21b9434be2d5d02f42ca08 commit: ae95ced0f5b7b2b6057d20068c2857b9c13e3c81 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jun 21 11:04:41 2020 +0000 Commit: Fabian Groffen gentoo 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 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:' \