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 EEE1D1382C5 for ; Tue, 27 Apr 2021 23:24:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C66F5E0887; Tue, 27 Apr 2021 23:24:25 +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 AF308E0887 for ; Tue, 27 Apr 2021 23:24:25 +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 B46E43410DE for ; Tue, 27 Apr 2021 23:24:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0257075B for ; Tue, 27 Apr 2021 23:24:21 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1619554806.5b3e3ac052dd9fb24c85703b63548b00072449f8.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: media-gfx/grafx2/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild X-VCS-Directories: media-gfx/grafx2/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: 5b3e3ac052dd9fb24c85703b63548b00072449f8 X-VCS-Branch: master Date: Tue, 27 Apr 2021 23:24:21 +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: 641f3944-bb54-4389-82cb-5220c8e78aa8 X-Archives-Hash: d4dc8a82cfd59bceb6f5d7d70c8749df commit: 5b3e3ac052dd9fb24c85703b63548b00072449f8 Author: Marco Scardovi scardovi com> AuthorDate: Tue Apr 27 20:20:06 2021 +0000 Commit: Theo Anderson posteo de> CommitDate: Tue Apr 27 20:20:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b3e3ac0 media-gfx/grafx2: fix build Closes: https://bugs.gentoo.org/259896 ^ this bug is really old and grafx2 is in GURU now Closes: https://bugs.gentoo.org/784419 ^ sed is not required Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild index 32440b6e0..2e5d34f33 100644 --- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild +++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="lua ttf" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + # Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1 RESTRICT="test" @@ -34,16 +35,15 @@ PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" ) src_prepare() { pushd ../ && default && popd - sed -i s/lua5\.1/lua/g Makefile || die "sed failed" } src_compile() { use ttf || MYCNF="NOTTF=1" use lua || MYCNF="${MYCNF} NOLUA=1" - emake ${MYCNF} || die "emake failed" + emake ${MYCNF} } src_install() { - emake ${MYCNF} DESTDIR="${D}" PREFIX="/usr" install || die "Install failed" + emake ${MYCNF} DESTDIR="${ED}" PREFIX="/usr" install }