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 62D01138350 for ; Wed, 18 Mar 2020 11:21:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 361D3E0A6F; Wed, 18 Mar 2020 11:21:58 +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 EB532E0A6F for ; Wed, 18 Mar 2020 11:21:57 +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 2FB9334ED9E for ; Wed, 18 Mar 2020 11:21:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF9E0103 for ; Wed, 18 Mar 2020 11:21:54 +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: <1584524710.093682b5867d4ecab7c1f0e2ff834d6068488210.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-lang/aldor/aldor-1.2.0_p20190730.ebuild X-VCS-Directories: dev-lang/aldor/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 093682b5867d4ecab7c1f0e2ff834d6068488210 X-VCS-Branch: master Date: Wed, 18 Mar 2020 11:21:54 +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: 20bdfb90-8821-43ef-bb12-f241829e980c X-Archives-Hash: d72c329aede42e61f54f36730cd8ba91 commit: 093682b5867d4ecab7c1f0e2ff834d6068488210 Author: Alessandro Barbieri gmail com> AuthorDate: Sun Mar 15 12:19:01 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Mar 18 09:45:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=093682b5 dev-lang/aldor: install headers in a subfolder Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/aldor-1.2.0_p20190730.ebuild | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild index ffecfcf..8386e04 100644 --- a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild +++ b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild @@ -68,7 +68,10 @@ src_prepare() { } src_configure() { + #install headers in a subfolder to avoid collisions with another packages local myconf=( + --prefix="${EPREFIX}/usr" + --includedir="${EPREFIX}/usr/include/aldor" --disable-static --enable-libraries --enable-shared @@ -81,10 +84,11 @@ src_configure() { src_compile() { if use doc ; then - ( cd "${S}/aldorug"; emake aldorug.pdf ) || die "make aldorug.pdf failed" - ( cd "${S}/lib/aldor/tutorial" - pdflatex tutorial.tex - pdflatex tutorial.tex ) || die "make tutorial.pdf failed" + cd "${S}/aldorug" + emake aldorug.pdf || die "make aldorug.pdf failed" + + cd "${S}/lib/aldor/tutorial" + pdflatex tutorial.tex || die "make tutorial.pdf failed" fi cd "${S}" if use emacs ; then @@ -93,7 +97,6 @@ src_compile() { if use doc ; then einfo "Documentation for the aldor emacs mode" noweave "aldor.el.nw" > aldor-mode.tex - pdflatex aldor-mode.tex pdflatex aldor-mode.tex || die "make aldor-mode.pdf failed" fi fi