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 AE447138334 for ; Wed, 5 Sep 2018 14:04:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E53FE07D0; Wed, 5 Sep 2018 14:04:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 32C11E07D0 for ; Wed, 5 Sep 2018 14:04:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 ED0BC335C9F for ; Wed, 5 Sep 2018 14:04:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECD273BE for ; Wed, 5 Sep 2018 14:04:08 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1536156239.d0c2e3314fb21e805502c41e23b6e6e784389d63.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-1.0.2p.ebuild dev-libs/openssl/openssl-1.1.1_pre9.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: d0c2e3314fb21e805502c41e23b6e6e784389d63 X-VCS-Branch: master Date: Wed, 5 Sep 2018 14:04:08 +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-Archives-Salt: 04709f91-a3fb-40ef-923a-5cb7242212ef X-Archives-Hash: 7866f42c148608baf13e3af6fcbe37b2 commit: d0c2e3314fb21e805502c41e23b6e6e784389d63 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 5 14:03:19 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Sep 5 14:03:59 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c2e331 dev-libs/openssl: fix broken prefix support Commit ed7230d4486049fdd155ac6b86e07578d624aeb0 has broken prefix support which this commit will fix. Closes: https://bugs.gentoo.org/665272 Package-Manager: Portage-2.3.48, Repoman-2.3.10 dev-libs/openssl/openssl-1.0.2p.ebuild | 6 +++--- dev-libs/openssl/openssl-1.1.1_pre9.ebuild | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.2p.ebuild b/dev-libs/openssl/openssl-1.0.2p.ebuild index ddc45aa8700..ef70b21c1d7 100644 --- a/dev-libs/openssl/openssl-1.0.2p.ebuild +++ b/dev-libs/openssl/openssl-1.0.2p.ebuild @@ -239,10 +239,10 @@ multilib_src_test() { } multilib_src_install() { - # We need to create $D/usr on our own to avoid a race condition #665130 - if [[ ! -d "${D%/}/usr" ]]; then + # We need to create $ED/usr on our own to avoid a race condition #665130 + if [[ ! -d "${ED%/}/usr" ]]; then # We can only create this directory once - mkdir "${D%/}"/usr || die + mkdir "${ED%/}"/usr || die fi emake INSTALL_PREFIX="${D%/}" install diff --git a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild index e694ab91d16..4c92eedb393 100644 --- a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild +++ b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild @@ -185,13 +185,13 @@ multilib_src_test() { } multilib_src_install() { - # We need to create $D/usr on our own to avoid a race condition #665130 - if [[ ! -d "${D%/}/usr" ]]; then + # We need to create $ED/usr on our own to avoid a race condition #665130 + if [[ ! -d "${ED%/}/usr" ]]; then # We can only create this directory once - mkdir "${D%/}"/usr || die + mkdir "${ED%/}"/usr || die fi - emake DESTDIR="${D%}" install + emake DESTDIR="${D%/}" install } multilib_src_install_all() {