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 1295513835A for ; Thu, 12 Nov 2020 20:04:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1C1EE0971; Thu, 12 Nov 2020 20:04:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 9279CE0970 for ; Thu, 12 Nov 2020 20:04:08 +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 AA62D340DA7 for ; Thu, 12 Nov 2020 20:04:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC879445 for ; Thu, 12 Nov 2020 20:04:05 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1605210904.148609f464fc9b27262dd5f971ef31d0f0ab4417.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/kristall/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/kristall/kristall-0.3.ebuild X-VCS-Directories: net-misc/kristall/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 148609f464fc9b27262dd5f971ef31d0f0ab4417 X-VCS-Branch: master Date: Thu, 12 Nov 2020 20:04:05 +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: 69d27eec-4fd6-4cd6-a752-8886bd70f579 X-Archives-Hash: d7a0068af1733083569ab89e91ce9762 commit: 148609f464fc9b27262dd5f971ef31d0f0ab4417 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Thu Nov 12 19:51:48 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Nov 12 19:55:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=148609f4 net-misc/kristall: Fix building a second time in src_install Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> net-misc/kristall/kristall-0.3.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net-misc/kristall/kristall-0.3.ebuild b/net-misc/kristall/kristall-0.3.ebuild index c3b48ce2..77ffd42a 100644 --- a/net-misc/kristall/kristall-0.3.ebuild +++ b/net-misc/kristall/kristall-0.3.ebuild @@ -20,13 +20,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" -src_configure() { - # qmake overwrites Makefile but it is needed for installing. - mv Makefile{,.tmp} || die - eqmake5 src/kristall.pro +src_compile() { + emake } src_install() { - mv Makefile{.tmp,} || die - INSTALL="install -D" PREFIX="${EPREFIX}/usr" default + emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install }