From: Harald van Dijk <truedfx@gentoo.org>
Date: Sun, 1 Apr 2007 11:39:48 +0000 (+0000)
Subject: Add sanity check for bad fpc.cfg
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dfa73b1caee77a34138aa999571838602c7fe580;p=gentoo.git

Add sanity check for bad fpc.cfg
Package-Manager: portage-2.1.2.3
---

diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 7fad63e3a4cb..fbf89de068d1 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -14,10 +14,10 @@ MD5 c24d1e618b5b6d3d1a1948b12d40491c files/lazarus-0.9.20-lclintf.patch 266
 RMD160 0e3e711034be39f7cda9375a5df5b7f0dd150a1c files/lazarus-0.9.20-lclintf.patch 266
 SHA256 400c2e5bf2183d2e21a930a752701d62a4d75fc552111cf7a5c366f6e745eee5 files/lazarus-0.9.20-lclintf.patch 266
 DIST lazarus-0.9.20-0.tar.gz 10241274 RMD160 5a2c061e42306008858cf8b3a51ecaa1aa3f0bca SHA1 6f72cda6ed67d4855118c9147d46ff575232bed1 SHA256 c3416c557e510c9fcca5de59f128854eb5605f69fc7472cea11fc09ed5f8285e
-EBUILD lazarus-0.9.20-r1.ebuild 2099 RMD160 47d7e5a8b5e874ba2456c3f6584d2797c62c00d4 SHA1 92642336bf0d0427c6af580662354fe753f31718 SHA256 fdb72a167dffdff85acd15d1ce08933f05f9cc37309d59d6a52ff1dab137b2ba
-MD5 7059db350b7eb5bde9e5394c2c8347bb lazarus-0.9.20-r1.ebuild 2099
-RMD160 47d7e5a8b5e874ba2456c3f6584d2797c62c00d4 lazarus-0.9.20-r1.ebuild 2099
-SHA256 fdb72a167dffdff85acd15d1ce08933f05f9cc37309d59d6a52ff1dab137b2ba lazarus-0.9.20-r1.ebuild 2099
+EBUILD lazarus-0.9.20-r1.ebuild 2442 RMD160 eb446d920764cb288b01b09985ca84c74234e201 SHA1 3cad7e32cd67aa19920d7c0353d506631eedb5e2 SHA256 b26c18c6a3c9579c699c2454867797e3db860c13f61b06fee0e4334842af0c14
+MD5 c5de263ff404148ed4b8cdd609b02d76 lazarus-0.9.20-r1.ebuild 2442
+RMD160 eb446d920764cb288b01b09985ca84c74234e201 lazarus-0.9.20-r1.ebuild 2442
+SHA256 b26c18c6a3c9579c699c2454867797e3db860c13f61b06fee0e4334842af0c14 lazarus-0.9.20-r1.ebuild 2442
 MISC ChangeLog 2315 RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 SHA1 002b4ee6b3f8e4b48fa6a77cb25a72d5d45ab788 SHA256 dc35eb0570e5c2e48df29261463e4a1986f6af55eb07862421788e0e4cadfdad
 MD5 95db940b66ec4fbaefb5841f3d676695 ChangeLog 2315
 RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 ChangeLog 2315
@@ -32,7 +32,7 @@ SHA256 49f58ce799154ff503040c5f74a333cbf4e2b2eac6005a1516a466aa8f597c96 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGAuvbwnQyISwouHwRAo6qAKCK+zGxWvSs2NnOrUARyNvXFl/tzwCfTZHC
-DKp2jsCaCDDridg7Yg2u7lU=
-=z/mA
+iD8DBQFGD5oIwnQyISwouHwRArb3AJ9ZBCa4twuYCzk51ahxiBed9OD7NACfcHRp
+cyflKCqj9+nDQi0uVNkO2Tw=
+=dJjH
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild b/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
index 594949908681..d8c91e428e22 100644
--- a/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild,v 1.2 2007/03/22 20:49:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild,v 1.3 2007/04/01 11:39:48 truedfx Exp $
 
 inherit eutils
 
@@ -29,6 +29,16 @@ pkg_setup() {
 }
 
 src_unpack() {
+	# check for broken fpc.cfg
+	# don't check in pkg_setup since it won't harm binpkgs
+	if grep -q '^[ 	]*-Fu.*/lcl$' /etc/fpc.cfg
+	then
+		eerror "Your /etc/fpc.cfg automatically adds a LCL directory"
+		eerror "to the list of unit directories. This will break the"
+		eerror "build of lazarus."
+		die "don't set the LCL path in /etc/fpc.cfg"
+	fi
+
 	unpack ${A}
 	sed -e "s/@FPCVER@/${FPCVER}/" "${FILESDIR}"/${P}-fpcsrc.patch \
 		> "${T}"/fpcsrc.patch || die "could not sed fpcsrc patch"