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 206AA138334 for ; Mon, 23 Dec 2019 16:56:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42619E0A07; Mon, 23 Dec 2019 16:56:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 22778E09F2 for ; Mon, 23 Dec 2019 16:56:38 +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 9DF6234DAFA for ; Mon, 23 Dec 2019 16:56:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54D59755AC for ; Mon, 23 Dec 2019 16:56:34 +0000 (UTC) From: "Marco Leise" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marco Leise" Message-ID: <1576939606.1d5b5e9126a455a974b6e6c21f6cdee09e952b8f.mleise@gentoo> Subject: [gentoo-commits] repo/user/dlang:master commit in: dev-lang/ldc2/ X-VCS-Repository: repo/user/dlang X-VCS-Files: dev-lang/ldc2/ldc2-1.18.0.ebuild X-VCS-Directories: dev-lang/ldc2/ X-VCS-Committer: mleise X-VCS-Committer-Name: Marco Leise X-VCS-Revision: 1d5b5e9126a455a974b6e6c21f6cdee09e952b8f X-VCS-Branch: master Date: Mon, 23 Dec 2019 16:56:34 +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: 23b2195f-0b35-493b-8ae5-65dfc613edc4 X-Archives-Hash: 4bcdca899dae46d66ce06ba92d07fe32 commit: 1d5b5e9126a455a974b6e6c21f6cdee09e952b8f Author: Marco Leise gmx de> AuthorDate: Sat Dec 21 14:46:46 2019 +0000 Commit: Marco Leise gmx de> CommitDate: Sat Dec 21 14:46:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=1d5b5e91 Fixes #80: eninja fails in installing phase with ACCESS DENIED Signed-off-by: Marco Leise gmx.de> dev-lang/ldc2/ldc2-1.18.0.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-lang/ldc2/ldc2-1.18.0.ebuild b/dev-lang/ldc2/ldc2-1.18.0.ebuild index 0c75a56..d15013d 100644 --- a/dev-lang/ldc2/ldc2-1.18.0.ebuild +++ b/dev-lang/ldc2/ldc2-1.18.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib-build cmake-utils ninja-utils eapi7-ver llvm +inherit multilib-build cmake-utils llvm MY_PV="${PV//_/-}" MY_P="ldc-${MY_PV}-src" @@ -54,7 +54,6 @@ d_src_configure() { # Make sure libphobos2 is installed into ldc2's directory. export LIBDIR_${ABI}="${LIBDIR_HOST}" local mycmakeargs=( - -G Ninja -DD_VERSION=2 -DCMAKE_INSTALL_PREFIX=/usr/lib/ldc2/$(ver_cut 1-2) -DD_COMPILER="${DMD}" @@ -67,11 +66,11 @@ d_src_configure() { } d_src_compile() { - eninja -C "${BUILD_DIR}" + cmake-utils_src_make } d_src_install() { - eninja -C "${BUILD_DIR}" install + cmake-utils_src_install rm -rf "${ED}"/usr/share/bash-completion }