Don't try to create fp config files in /usr during build (bug #274518 by Paul Hartman)

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 17 insertions, 6 deletions

diff --git a/dev-lang/fpc-ide/ChangeLog b/dev-lang/fpc-ide/ChangeLog
index e2247d102d6a..85195b73aaf5 100644
--- a/dev-lang/fpc-ide/ChangeLog
+++ b/dev-lang/fpc-ide/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/fpc-ide
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/ChangeLog,v 1.14 2009/06/09 21:04:09 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/ChangeLog,v 1.15 2009/06/25 20:37:52 truedfx Exp $
+
+  25 Jun 2009; Harald van Dijk <truedfx@gentoo.org> fpc-ide-2.2.4.ebuild:
+  Don't try to create fp config files in /usr during build (bug #274518 by
+  Paul Hartman)
 
   09 Jun 2009; Harald van Dijk <truedfx@gentoo.org> fpc-ide-2.2.4.ebuild:
   Build with clean fpc config, add note about documentation
diff --git a/dev-lang/fpc-ide/fpc-ide-2.2.4.ebuild b/dev-lang/fpc-ide/fpc-ide-2.2.4.ebuild
index be1e339f05b2..3fdb27466494 100644
--- a/dev-lang/fpc-ide/fpc-ide-2.2.4.ebuild
+++ b/dev-lang/fpc-ide/fpc-ide-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/fpc-ide-2.2.4.ebuild,v 1.2 2009/06/09 21:04:09 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc-ide/fpc-ide-2.2.4.ebuild,v 1.3 2009/06/25 20:37:52 truedfx Exp $
 
 S="${WORKDIR}/fpcbuild-${PV}/fpcsrc/ide"
 
@@ -25,7 +25,8 @@ src_unpack() {
 	if ! test ${PPC_CONFIG_PATH+set}; then
 		local FPCVER=$(fpc -iV)
 		export PPC_CONFIG_PATH="${WORKDIR}"
-		/usr/lib/fpc/${FPCVER}/samplecfg /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
 		sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
 	fi
 }
diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index c6aa8f4846bc..e8781616a4f1 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/lazarus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.28 2009/06/09 21:04:09 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.29 2009/06/25 20:36:51 truedfx Exp $
+
+  25 Jun 2009; Harald van Dijk <truedfx@gentoo.org>
+  lazarus-0.9.26-r3.ebuild:
+  Don't try to create fp config files in /usr during build (bug #274518 by
+  Paul Hartman)
 
   09 Jun 2009; Harald van Dijk <truedfx@gentoo.org>
   lazarus-0.9.26-r3.ebuild:
diff --git a/dev-lang/lazarus/lazarus-0.9.26-r3.ebuild b/dev-lang/lazarus/lazarus-0.9.26-r3.ebuild
index 688e14fdbbf3..69fb1b3dea23 100644
--- a/dev-lang/lazarus/lazarus-0.9.26-r3.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.26-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.26-r3.ebuild,v 1.3 2009/06/09 21:08:05 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.26-r3.ebuild,v 1.4 2009/06/25 20:36:51 truedfx Exp $
 
 EAPI=2
 
@@ -34,7 +34,8 @@ src_prepare() {
 	if ! test ${PPC_CONFIG_PATH+set} ; then
 		local FPCVER=$(fpc -iV)
 		export PPC_CONFIG_PATH="${WORKDIR}"
-		/usr/lib/fpc/${FPCVER}/samplecfg /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
 		sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
 	fi
 }