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 46C9D13933E for ; Sun, 18 Jul 2021 08:58:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A246E0C7D; Sun, 18 Jul 2021 08:58:33 +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 5C88FE0C7D for ; Sun, 18 Jul 2021 08:58:33 +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 1DAAA342B07 for ; Sun, 18 Jul 2021 08:58:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83EC2581 for ; Sun, 18 Jul 2021 08:58:30 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1626598707.707f933c98950a47f589d97538fb43346e6cd796.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ghc/ghc-8.10.4-r1.ebuild dev-lang/ghc/ghc-8.10.5-r1.ebuild dev-lang/ghc/ghc-8.8.4-r1.ebuild dev-lang/ghc/ghc-9.0.1-r1.ebuild X-VCS-Directories: dev-lang/ghc/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 707f933c98950a47f589d97538fb43346e6cd796 X-VCS-Branch: master Date: Sun, 18 Jul 2021 08:58:30 +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: d504f353-cbe2-4284-8a03-6dbb779e97a3 X-Archives-Hash: 456fe7564cfbfc7351b984a086485a4c commit: 707f933c98950a47f589d97538fb43346e6cd796 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jul 18 08:52:12 2021 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jul 18 08:58:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707f933c dev-lang/ghc: use /usr/share/doc/${PF} Reported-by: Agostino Sarubbo Closes: https://bugs.gentoo.org/802699 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> dev-lang/ghc/ghc-8.10.4-r1.ebuild | 4 ++-- dev-lang/ghc/ghc-8.10.5-r1.ebuild | 4 ++-- dev-lang/ghc/ghc-8.8.4-r1.ebuild | 4 ++-- dev-lang/ghc/ghc-9.0.1-r1.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-lang/ghc/ghc-8.10.4-r1.ebuild b/dev-lang/ghc/ghc-8.10.4-r1.ebuild index 2e9a527ec4b..0e4472b1c7d 100644 --- a/dev-lang/ghc/ghc-8.10.4-r1.ebuild +++ b/dev-lang/ghc/ghc-8.10.4-r1.ebuild @@ -527,8 +527,8 @@ src_configure() { echo '# Gentoo changes' > mk/build.mk # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk + echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk + echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk # We also need to use the GHC_FLAGS flags when building ghc itself echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk diff --git a/dev-lang/ghc/ghc-8.10.5-r1.ebuild b/dev-lang/ghc/ghc-8.10.5-r1.ebuild index 9fbc3261778..79ac41c9b9d 100644 --- a/dev-lang/ghc/ghc-8.10.5-r1.ebuild +++ b/dev-lang/ghc/ghc-8.10.5-r1.ebuild @@ -526,8 +526,8 @@ src_configure() { echo '# Gentoo changes' > mk/build.mk # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk + echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk + echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk # We also need to use the GHC_FLAGS flags when building ghc itself echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk diff --git a/dev-lang/ghc/ghc-8.8.4-r1.ebuild b/dev-lang/ghc/ghc-8.8.4-r1.ebuild index 02ac100382e..6254a54371a 100644 --- a/dev-lang/ghc/ghc-8.8.4-r1.ebuild +++ b/dev-lang/ghc/ghc-8.8.4-r1.ebuild @@ -538,8 +538,8 @@ src_configure() { echo '# Gentoo changes' > mk/build.mk # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk + echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk + echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk # We also need to use the GHC_FLAGS flags when building ghc itself echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk diff --git a/dev-lang/ghc/ghc-9.0.1-r1.ebuild b/dev-lang/ghc/ghc-9.0.1-r1.ebuild index f42fb4d7554..6feaed8be49 100644 --- a/dev-lang/ghc/ghc-9.0.1-r1.ebuild +++ b/dev-lang/ghc/ghc-9.0.1-r1.ebuild @@ -526,8 +526,8 @@ src_configure() { echo '# Gentoo changes' > mk/build.mk # Put docs into the right place, ie /usr/share/doc/ghc-${GHC_PV} - echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk - echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${P}" >> mk/build.mk + echo "docdir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk + echo "htmldir = ${EPREFIX}/usr/share/doc/$(cross)${PF}" >> mk/build.mk # We also need to use the GHC_FLAGS flags when building ghc itself echo "SRC_HC_OPTS+=${HCFLAGS} ${GHC_FLAGS}" >> mk/build.mk