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 EE8FE1396D0 for ; Tue, 15 Aug 2017 11:38:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 406DFE0E40; Tue, 15 Aug 2017 11:38:13 +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 1E283E0E40 for ; Tue, 15 Aug 2017 11:38:12 +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 C1B593416F5 for ; Tue, 15 Aug 2017 11:38:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D624275DD for ; Tue, 15 Aug 2017 11:38:07 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1502797015.944e17caad889864e4884040355e3fd98e74f7b7.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/fpc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/fpc/fpc-3.0.2.ebuild X-VCS-Directories: dev-lang/fpc/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: 944e17caad889864e4884040355e3fd98e74f7b7 X-VCS-Branch: master Date: Tue, 15 Aug 2017 11:38:07 +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-Archives-Salt: 669fa565-2466-461d-a66d-45caf92eef1c X-Archives-Hash: 045f0c670e6e312510b28bf4d0533faf commit: 944e17caad889864e4884040355e3fd98e74f7b7 Author: Horea Christian yandex com> AuthorDate: Mon Aug 14 17:33:17 2017 +0000 Commit: Amy Liffey gentoo org> CommitDate: Tue Aug 15 11:36:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944e17ca dev-lang/fpc: using ${ED} for prefix/RAP compatibility Package-Manager: Portage-2.3.6, Repoman-2.3.3 Closes:#5419 dev-lang/fpc/fpc-3.0.2.ebuild | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dev-lang/fpc/fpc-3.0.2.ebuild b/dev-lang/fpc/fpc-3.0.2.ebuild index 41b229acda5..f8ea1b5b8b4 100644 --- a/dev-lang/fpc/fpc-3.0.2.ebuild +++ b/dev-lang/fpc/fpc-3.0.2.ebuild @@ -107,10 +107,10 @@ src_install() { #${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake" #fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \ - INSTALL_MANDIR="${D}"/usr/share/man \ - INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source + INSTALL_PREFIX="${ED}"/usr \ + INSTALL_DOCDIR="${ED}"/usr/share/doc/${PF} \ + INSTALL_MANDIR="${ED}"/usr/share/man \ + INSTALL_SOURCEDIR="${ED}"/usr/lib/fpc/${PV}/source emake -j1 "$@" compiler_install rtl_install packages_install utils_install @@ -135,23 +135,23 @@ src_install() { if use source ; then cd "${S}" || die shift - emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall - find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; + emake -j1 PP="${ED}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall + find "${ED}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; fi - "${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die + "${ED}"/usr/lib/fpc/${PV}/samplecfg "${ED}"/usr/lib/fpc/${PV} "${ED}"/etc || die - sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die + sed -i "s:${ED}::g" "${ED}"/etc/fpc.cfg || die if use ide ; then - sed -e "s:${D}::g" \ - -i "${D}"/etc/fppkg.cfg \ - -i "${D}"/etc/fppkg/* \ - -i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ + sed -e "s:${ED}::g" \ + -i "${ED}"/etc/fppkg.cfg \ + -i "${ED}"/etc/fppkg/* \ + -i "${ED}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ || die fi - rm -r "${D}"/usr/lib/fpc/lexyacc || die + rm -r "${ED}"/usr/lib/fpc/lexyacc || die } pkg_postinst() {