add static use flag and move the gambcext config file to /etc where it should be automatically config-protected (both after a request from Etienne Bergeron <bergeret@iro.umontreal.ca>). Don't force -O1 anymore and move single-host to big-iron as otherwise it crashes my machine as it runs out of memory. Fix big-iron for beta22.

Package-Manager: portage-2.1.3.7

4 files changed, 45 insertions, 25 deletions

diff --git a/dev-scheme/gambit/ChangeLog b/dev-scheme/gambit/ChangeLog
index 7fc065eec61a..64164bfe37c0 100644
--- a/dev-scheme/gambit/ChangeLog
+++ b/dev-scheme/gambit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-scheme/gambit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/ChangeLog,v 1.10 2007/08/26 09:49:51 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/ChangeLog,v 1.11 2007/09/02 11:43:22 hkbst Exp $
+
+  02 Sep 2007; Marijn Schouten <hkBst@gentoo.org> gambit-4.0_beta22.ebuild,
+  gambit-4.0.0.ebuild:
+  add static use flag and move the gambcext config file to /etc where it
+  should be automatically config-protected (both after a request from Etienne
+  Bergeron <bergeret@iro.umontreal.ca>). Don't force -O1 anymore and move
+  single-host to big-iron as otherwise it crashes my machine as it runs out of
+  memory. Fix big-iron for beta22.
 
 *gambit-4.0.0 (26 Aug 2007)
 
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index 67a547192549..2f1c92318143 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -4,18 +4,18 @@ RMD160 7ee53480cd16e29a347dbe5ba1f46217ee24631b files/50gambit-gentoo.el 351
 SHA256 44572f602f12660a0d6536a621ccbce3be8dd4539f0fd083ed35cb41270035b5 files/50gambit-gentoo.el 351
 DIST gambc-4.0b22.tar.gz 7133092 RMD160 5cba5e532b93802d383d8927cc85a70ccd680cc0 SHA1 3dad264611443991fc36fa0f949a5ff8b864f57a SHA256 14b6715466f9e8c7d5da01e8a066843e02e2101739a0a41ad17f06d903bc4caf
 DIST gambc-v4_0_0.tgz 11645990 RMD160 62f71be66dd6f16a61c92a3e5217a9e41374268d SHA1 d8f31420263a93b470c9abb1c259eab4dbebe66b SHA256 a4be96da0bb4636e98b8851ea10e0ab284169e8e14613a01e4e5e5fd9bc6a5d2
-EBUILD gambit-4.0.0.ebuild 3246 RMD160 68be45609534cb23c684ed464069909f0278dc5b SHA1 cb547c1d7f09b11216ec5cd1d7a759ac7dbb5272 SHA256 ccae35a5328a7583f8a2ae8692b5a778ddca004c5513d839f3135112b6d34396
-MD5 59c1a734a9176f3a3ed9387621fd2669 gambit-4.0.0.ebuild 3246
-RMD160 68be45609534cb23c684ed464069909f0278dc5b gambit-4.0.0.ebuild 3246
-SHA256 ccae35a5328a7583f8a2ae8692b5a778ddca004c5513d839f3135112b6d34396 gambit-4.0.0.ebuild 3246
-EBUILD gambit-4.0_beta22.ebuild 3146 RMD160 7a3e37840a8c30419e624c1ff577b355957a86b7 SHA1 433d1a1fb41674c4bdb87ff5548c11098af832e3 SHA256 f3937af1a5f68de1b7eaf8c504196050de35d63bd1a932c4422bdf9a4f01feb3
-MD5 0612255e9b743b22c7e1c20ef17e06b9 gambit-4.0_beta22.ebuild 3146
-RMD160 7a3e37840a8c30419e624c1ff577b355957a86b7 gambit-4.0_beta22.ebuild 3146
-SHA256 f3937af1a5f68de1b7eaf8c504196050de35d63bd1a932c4422bdf9a4f01feb3 gambit-4.0_beta22.ebuild 3146
-MISC ChangeLog 1685 RMD160 4c929f7919615aa3f379849004f49abb1c57c392 SHA1 551ef598cdf133fbde6d536f204398757798b0b2 SHA256 e11dea4d984b0e7f85a57546e7395c525957e11317129e43a9b3bd2f15326358
-MD5 cf14ab399c2ef08b725841fdd37b9f03 ChangeLog 1685
-RMD160 4c929f7919615aa3f379849004f49abb1c57c392 ChangeLog 1685
-SHA256 e11dea4d984b0e7f85a57546e7395c525957e11317129e43a9b3bd2f15326358 ChangeLog 1685
+EBUILD gambit-4.0.0.ebuild 3729 RMD160 307f837f3631d317f79078790d68939b711302b0 SHA1 d71e13e04d0fcec3d7202e5c817cdb9ae207ee97 SHA256 72275a0c6a2a647c066efada7005d539a5186ec186bb55ed8ccfb9040be5c1b3
+MD5 cdc8f79d3f5c1d8a6c9f9cbbd719cef2 gambit-4.0.0.ebuild 3729
+RMD160 307f837f3631d317f79078790d68939b711302b0 gambit-4.0.0.ebuild 3729
+SHA256 72275a0c6a2a647c066efada7005d539a5186ec186bb55ed8ccfb9040be5c1b3 gambit-4.0.0.ebuild 3729
+EBUILD gambit-4.0_beta22.ebuild 3155 RMD160 8234224efd18b5d95585d64266614bffd5e04dae SHA1 37630b38efe0358379ebc087d44f67450023ec11 SHA256 558c2adefdfc954f10aeba50cb863f4dda9d06f00f8fc12d47c907f95b3dbb23
+MD5 a39cce230469ec519fa9a06b01c3b865 gambit-4.0_beta22.ebuild 3155
+RMD160 8234224efd18b5d95585d64266614bffd5e04dae gambit-4.0_beta22.ebuild 3155
+SHA256 558c2adefdfc954f10aeba50cb863f4dda9d06f00f8fc12d47c907f95b3dbb23 gambit-4.0_beta22.ebuild 3155
+MISC ChangeLog 2124 RMD160 61538647f5470218d8195fbf0ec75d9c36a8604e SHA1 096beb5cd24e81af26ab7d942e3fdd472f573b67 SHA256 160b149b9134d10f068211c3d32cb415f87c5a6386afe15479f6ac99a68132f1
+MD5 64d821cfa2c7adf780b5452546b98e0a ChangeLog 2124
+RMD160 61538647f5470218d8195fbf0ec75d9c36a8604e ChangeLog 2124
+SHA256 160b149b9134d10f068211c3d32cb415f87c5a6386afe15479f6ac99a68132f1 ChangeLog 2124
 MISC metadata.xml 159 RMD160 de517ce4d7d6fd637855d92a257e2c94b8339f43 SHA1 f037b0d8dd3d592d04170d21a1a9b9c594541612 SHA256 61c7b86c8f64d194ff9e03f62b4007e0c69db2054d09e3ccdbbf6dbc0c78024b
 MD5 50b0f9698722324cfb463e8cb165fc87 metadata.xml 159
 RMD160 de517ce4d7d6fd637855d92a257e2c94b8339f43 metadata.xml 159
diff --git a/dev-scheme/gambit/gambit-4.0.0.ebuild b/dev-scheme/gambit/gambit-4.0.0.ebuild
index 746c946411ad..05e28aea7245 100644
--- a/dev-scheme/gambit/gambit-4.0.0.ebuild
+++ b/dev-scheme/gambit/gambit-4.0.0.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-scheme/gambit/gambit-4.0.0.ebuild,v 1.1 2007/08/26 09:49:51 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/gambit-4.0.0.ebuild,v 1.2 2007/09/02 11:43:22 hkbst Exp $
 
 inherit eutils elisp-common check-reqs autotools multilib
 
@@ -22,19 +22,25 @@ SITEFILE="50gambit-gentoo.el"
 
 S=${WORKDIR}/${MY_P}
 
-IUSE="emacs big-iron"
+IUSE="big-iron emacs static"
 
 pkg_setup() {
 	if ! use big-iron; then
-		ewarn "not using gcc specific optimizations and not compiling syntax-case macro system"
+		ewarn "NOT compiling each Scheme module as a single C function"
+		ewarn "NOT using gcc specific optimizations"
+		ewarn "NOT compiling syntax-case macro system"
 		ewarn "approximately 0.5GB ram will be needed"
-		ewarn "if you experience thrashing, try disabling parallel building"
+		ewarn "if you experience thrashing, try disabling parallel building or setting -O1"
 		# need this much memory in MBytes (does *not* check swap)
 		CHECKREQS_MEMORY="768" check_reqs
 	else
-		ewarn "using gcc specific optimizations and compiling syntax-case macro system"
-		ewarn "this will cause approximately 2GB ram to be used instead of 0.5GB."
-		ewarn "this will cause heavy thrashing of your system unless your system is big iron"
+		ewarn "compiling each Scheme module as a single C function"
+		ewarn "using gcc specific optimizations"
+		ewarn "compiling syntax-case macro system"
+		ewarn "approximately 2GB ram will be needed instead of 0.5GB"
+		ewarn "this will cause heavy thrashing of your system"
+		ewarn "and may cause your compiler to crash when it runs out of memory"
+		ewarn "unless your system is BIG IRON"
 		# need this much memory in MBytes (does *not* check swap)
 		CHECKREQS_MEMORY="2560"	check_reqs
 	fi
@@ -45,12 +51,15 @@ src_unpack() {
 #	cp configure.ac configure.ac.old
 	sed -e 's:PACKAGE_SUBDIR="/$PACKAGE_VERSION"::' \
 		-e 's:#PACKAGE_SUBDIR="":PACKAGE_SUBDIR="":' -i configure.ac
+	#don't force -O1
+	sed 's:$DASH_O1::' -i configure.ac
 	eautoreconf
 #	diff -u configure.ac.old configure.ac
 }
 
 src_compile() {
-	econf --enable-shared --enable-single-host $(use_enable big-iron)
+	econf $(if use static; then echo --disable-shared; else echo --enable-shared; fi) \
+		$(use_enable big-iron single-host) $(use_enable big-iron gcc-opts)
 	emake || die "emake failed"
 
 	if use emacs; then
@@ -99,8 +108,11 @@ src_install() {
 	dosym gsi usr/bin/gambit-interpreter
 
 	# automatically load syntax-case for r5rs+ goodness
-	dodir /etc/env.d/ && echo "GAMBCOPT=\"=/usr/\"" > ${D}/etc/env.d/50gambit
-	echo "(load \"/usr/$(get_libdir)/syntax-case\")" > ${D}/usr/gambcext
+#	dodir /etc/env.d/ && echo "GAMBCOPT=\"=/usr/\"" > ${D}/etc/env.d/50gambit
+	echo "GAMBCOPT=\"=/usr/\"" > "${T}/50gambit" && doenvd "${T}/50gambit"
+
+	dosym /etc/gambcext /usr/gambcext
+	echo "(load \"/usr/$(get_libdir)/syntax-case\")" > ${D}/etc/gambcext
 }
 
 pkg_postinst() {
diff --git a/dev-scheme/gambit/gambit-4.0_beta22.ebuild b/dev-scheme/gambit/gambit-4.0_beta22.ebuild
index e2fab9b276a2..b0af7743ad12 100644
--- a/dev-scheme/gambit/gambit-4.0_beta22.ebuild
+++ b/dev-scheme/gambit/gambit-4.0_beta22.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-scheme/gambit/gambit-4.0_beta22.ebuild,v 1.7 2007/07/09 13:37:31 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gambit/gambit-4.0_beta22.ebuild,v 1.8 2007/09/02 11:43:22 hkbst Exp $
 
 inherit eutils elisp-common check-reqs autotools multilib
 
@@ -47,7 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --enable-shared --enable-single-host $(use_enable big-iron)
+	econf --enable-shared --enable-single-host $(use_enable big-iron gcc-opts)
 	emake || die "emake failed"
 
 	if use emacs; then