dev-scheme/bigloo: Many small changes

 * New use gmp: Bigloo used to link against dev-libs/gmp
 * Change sqlite -> system-sqlite: the flag meaning gets more intuitive
 * Better emacs' specific configure args, uses $EMACS from elisp-common.eclass, remove all references to 'false' in the installed files
 * Little changes on the doc installation commands/order

4 files changed, 77 insertions, 41 deletions

diff --git a/dev-scheme/bigloo/Manifest b/dev-scheme/bigloo/Manifest
index 0d42a210..513b8837 100644
--- a/dev-scheme/bigloo/Manifest
+++ b/dev-scheme/bigloo/Manifest
@@ -6,6 +6,6 @@ AUX bigloo-3.4a-sqltiny_support.patch 2504 RMD160 30ca3cc33f8462b99a9d758aece9a5
 AUX bigloo-3.4b-sqltiny_support.patch 2504 RMD160 30ca3cc33f8462b99a9d758aece9a53818f2e640 SHA1 5683bd73934c26074ae1184da30edfb3a2c7fe73 SHA256 3981a369345aba648f95e0b460c2fd1203b2f85bb15ef35ed34e8385f0bfd129
 DIST bigloo3.4a-3.tar.gz 13631619 RMD160 8c9e5a2b3d4adfa2b28d1554681bda42190d7dd9 SHA1 1e925718c81f4067740ca63eb44e97aae6423397 SHA256 c6bf16a60a16447444dc1e3eadf061d37f2796ebb75f3190415fb14aa06bc4bd
 DIST bigloo3.4b-beta14Sep10.tar.gz 13941015 RMD160 c7f207546f888bd61ec0546a17442f23887fff0f SHA1 a2b0aecd18d84348ac6b119d603a4c8dbcaae334 SHA256 dc8914c9d16f5642b9d67aaca19b0b97ff8f22b347c54f3217651c889021e901
-EBUILD bigloo-3.4a_p3.ebuild 4941 RMD160 fb0e95ffdb6958dcf99eb52ed8f15952bd5956b4 SHA1 93b3eb7058890b843f7bc94f4f36ce6daf900023 SHA256 e49f0f0528eaaaaa30e56b159c77ded330c27cd59d429aeb058e2fd538e0bf49
-EBUILD bigloo-3.4b_beta20100914.ebuild 4944 RMD160 bc19e1018c3c86032ffbffb11a6a747cf5b21ad2 SHA1 f9cc294825cced60e2f000a6d6033a11de5a9831 SHA256 554e1a35bd059047ed245ef8eea857fc1b7a78eadd689e99c3c2be69c9d18aa5
-MISC metadata.xml 2212 RMD160 d8b967be253fa848dd99fe41b4e828b8cbe492e0 SHA1 6e3cd0111857e19dcf4958caddbe80f4d8aae004 SHA256 3091bfd219db6e0b8d3f1e61647f1897be9a9619c3b3ef6b8592c47a8e494b48
+EBUILD bigloo-3.4a_p3.ebuild 5411 RMD160 69fa0c22ab239239972ee6655a4fbb11660a90ec SHA1 789c072a74dd39bb07ced55c15ad8a0dc6a001da SHA256 32b672907241a413b7e6bca0aaec5e5719319569b5832a1c59a07b40d4db98fc
+EBUILD bigloo-3.4b_beta20100914.ebuild 5357 RMD160 786b2a8335363023b89ffcdd41dc26a18a8b2961 SHA1 e99f5b262be79bda958298b37a1688a92833c24f SHA256 a3e7abfd8f8f11f031e6789e00ebdac765ebe2e84f7085f7acc5169fb5dac902
+MISC metadata.xml 2468 RMD160 001a14da8e97c0dffa3595266872dabab7d19666 SHA1 04aa70c55c9c22b62886a8ac14d42582062015c3 SHA256 1433f912971890fb3aa86c4a93fd7433fe647d953627f4e253d79e0d1d3f1b2c
diff --git a/dev-scheme/bigloo/bigloo-3.4a_p3.ebuild b/dev-scheme/bigloo/bigloo-3.4a_p3.ebuild
index c6005855..d138db5d 100644
--- a/dev-scheme/bigloo/bigloo-3.4a_p3.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.4a_p3.ebuild
@@ -19,14 +19,16 @@ SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="calendar crypto debug doc emacs gstreamer java mail multimedia packrat sqlite srfi1 srfi27 ssl text threads web"
+IUSE="calendar crypto debug doc emacs gmp gstreamer java mail multimedia packrat system-sqlite srfi1 srfi27 ssl text threads web"
 
 # bug 254916 for >=dev-libs/boehm-gc-7.1
 DEPEND_COMMON=">=dev-libs/boehm-gc-7.1[threads?]
 	emacs? ( virtual/emacs )
-	sqlite? ( dev-db/sqlite:3 )
+	gmp? ( dev-libs/gmp )
+	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
 	ssl? ( dev-libs/openssl )
-	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )"
+	system-sqlite? ( dev-db/sqlite:3 )
+"
 
 DEPEND="${DEPEND_COMMON}  java? ( >=virtual/jdk-1.5 app-arch/zip )"
 RDEPEND="${DEPEND_COMMON} java? ( >=virtual/jre-1.5 )"
@@ -50,9 +52,15 @@ pkg_setup() {
 		die "USE Dependency: 'packrat' needs 'srfi1'."
 	fi
 
-	if ! use x86 && use srfi27; then
-		ewarn "srfi27 is known to only work on x86 architectures. It is higly suggested that you disable it." \
-			" It is not supported by upstream, and tests *will* fail. You've been warned."
+	if use srfi27; then
+		if ! use x86; then
+			ewarn "srfi27 is known to only work on x86 architectures. It is highly suggested that you disable it." \
+				" It is not supported by upstream, and tests *will* fail."
+		fi
+
+		if ! use gmp; then
+			die "USE Dependency: 'srfi27' needs 'gmp'."
+		fi
 	fi
 }
 
@@ -84,13 +92,17 @@ src_configure() {
 
 	# Filter Zile emacs replacement. Bug #336717
 	if use emacs; then
-		myconf="--emacs=emacs --bee=full"
+		myconf="--emacs=${EMACS} --bee=full --lispdir=${EPREFIX}${SITELISP}/${PN}"
 	else
-		myconf="--emacs=false --bee-=partial"
+		myconf="--emacs=false"
 	fi
 
 	# Sqlite backend
-	myconf="${myconf} --sqlite-backend=$(if use sqlite; then echo sqlite; else echo sqltiny; fi)"
+	if use system-sqlite; then
+		myconf="${myconf} --enable-sqlite --sqlite-backend=sqlite"
+	else
+		myconf="${myconf} --enqble-sqlite --sqlite-backend=sqltiny"
+	fi
 
 	# Need fix for bglpkg, which depends on pkglib, pkgcomp, sqlite and web.
 	# This cannot be disabled for now, working on a fix.
@@ -104,7 +116,6 @@ src_configure() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
 		--lispdir="${SITELISP}/${PN}" \
 		--benchmark=yes \
 		--sharedbde=no \
@@ -117,6 +128,7 @@ src_configure() {
 		${myconf} \
 		$(use_enable calendar) \
 		$(use_enable crypto) \
+		$(use_enable gmp) \
 		$(use_enable gstreamer) \
 		$(use_enable mail) \
 		$(use_enable multimedia) \
@@ -151,20 +163,26 @@ src_install() {
 		einfo "Installing bee..."
 		emake DESTDIR="${D}" install-bee || die "install-bee failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	else
+		# Fix EMACS*=false in Makefile.config
+		dosed 's:^\(EMACS=\).*$:\1:' /usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
+			|| die "dosed EMACS failed"
+		dosed 's:^\(EMACSBRAND=\).*$:\1:' /usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
+			|| die "dosed EMACSBRAND failed"
 	fi
 
+	dodoc ChangeLog README || die "dodoc failed"
+	newdoc LICENSE COPYING || die "newdoc failed"
+
+	cd "${S}/manuals"
 	if use doc; then
-		dohtml -r manuals/ || die "dohtml failed"
-		doinfo manuals/*.info* || die "doinfo failed"
+		dohtml -r  . || die "dohtml failed"
+		doinfo *.info* || die "doinfo failed"
 	fi
 
-	for man in manuals/*.man; do
-		man1=${man#manuals/}
-		newman ${man} ${man1/.man/.1} || die "newman ${man/.man/.1} failed"
+	for man in *.man; do
+		newman ${man} ${man/.man/.1} || die "newman ${man} ${man/.man/.1} failed"
 	done
-
-	dodoc ChangeLog README || die "dodoc failed"
-	newdoc LICENSE COPYING || die "newdoc failed"
 }
 
 pkg_postinst() {
diff --git a/dev-scheme/bigloo/bigloo-3.4b_beta20100914.ebuild b/dev-scheme/bigloo/bigloo-3.4b_beta20100914.ebuild
index e1c2352e..418b5017 100644
--- a/dev-scheme/bigloo/bigloo-3.4b_beta20100914.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.4b_beta20100914.ebuild
@@ -20,14 +20,17 @@ SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}14Sep10.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="calendar crypto debug doc emacs gstreamer java mail multimedia openpgp packrat sqlite srfi1 srfi27 ssl text threads web"
+IUSE="calendar crypto debug doc emacs gmp gstreamer java mail multimedia openpgp packrat system-sqlite srfi1 srfi27 ssl text threads web"
 
 # bug 254916 for >=dev-libs/boehm-gc-7.1
 DEPEND_COMMON=">=dev-libs/boehm-gc-7.1[threads?]
 	emacs? ( virtual/emacs )
-	sqlite? ( dev-db/sqlite:3 )
+	gmp? ( dev-libs/gmp )
+	gstreamer? ( media-libs/gstreamer
+		media-libs/gst-plugins-base )
 	ssl? ( dev-libs/openssl )
-	gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )"
+	system-sqlite? ( dev-db/sqlite:3 )
+"
 
 DEPEND="${DEPEND_COMMON}  java? ( >=virtual/jdk-1.5 app-arch/zip )"
 RDEPEND="${DEPEND_COMMON} java? ( >=virtual/jre-1.5 )"
@@ -51,9 +54,15 @@ pkg_setup() {
 		die "USE Dependency: 'packrat' needs 'srfi1'."
 	fi
 
-	if ! use x86 && use srfi27; then
-		ewarn "srfi27 is known to only work on x86 architectures. It is higly suggested that you disable it." \
-			" It is not supported by upstream, and tests *will* fail. You've been warned."
+	if use srfi27; then
+		if ! use x86; then
+			ewarn "srfi27 is known to only work on x86 architectures. It is highly suggested that you disable it." \
+				" It is not supported by upstream, and tests *will* fail."
+		fi
+
+		if ! use gmp; then
+			die "USE Dependency: 'srfi27' needs 'gmp'."
+		fi
 	fi
 
 	if ! use crypto && use openpgp; then
@@ -82,13 +91,13 @@ src_configure() {
 
 	# Filter Zile emacs replacement. Bug #336717
 	if use emacs; then
-		myconf="--emacs=emacs --bee=full"
+		myconf="--emacs=${EMACS} --bee=full --lispdir=${EPREFIX}${SITELISP}/${PN}"
 	else
-		myconf="--emacs=false --bee-=partial"
+		myconf="--emacs=false"
 	fi
 
 	# Sqlite backend
-	myconf="${myconf} --sqlite-backend=$(if use sqlite; then echo sqlite; else echo sqltiny; fi)"
+	myconf="${myconf} --sqlite-backend=$(if use system-sqlite; then echo sqlite; else echo sqltiny; fi)"
 
 	# Need fix for bglpkg, which depends on pkglib, pkgcomp, sqlite and web.
 	# This cannot be disabled for now, working on a fix.
@@ -103,7 +112,6 @@ src_configure() {
 		--infodir=/usr/share/info \
 		--libdir=/usr/$(get_libdir) \
 		--docdir=/usr/share/doc/${PF} \
-		--lispdir="${SITELISP}/${PN}" \
 		--benchmark=yes \
 		--sharedbde=no \
 		--sharedcompiler=no \
@@ -115,6 +123,7 @@ src_configure() {
 		${myconf} \
 		$(use_enable calendar) \
 		$(use_enable crypto) \
+		$(use_enable gmp) \
 		$(use_enable gstreamer) \
 		$(use_enable mail) \
 		$(use_enable multimedia) \
@@ -150,20 +159,26 @@ src_install() {
 		einfo "Installing bee..."
 		emake DESTDIR="${D}" install-bee || die "install-bee failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	else
+		# Fix EMACS*=false in Makefile.config
+		dosed 's:^\(EMACS=\).*$:\1:' /usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
+			|| die "dosed EMACS failed"
+		dosed 's:^\(EMACSBRAND=\).*$:\1:' /usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
+			|| die "dosed EMACSBRAND failed"
 	fi
 
+	dodoc ChangeLog README || die "dodoc failed"
+	newdoc LICENSE COPYING || die "newdoc failed"
+
+	cd "${S}/manuals"
 	if use doc; then
-		dohtml -r manuals/ || die "dohtml failed"
-		doinfo manuals/*.info* || die "doinfo failed"
+		dohtml -r  . || die "dohtml failed"
+		doinfo *.info* || die "doinfo failed"
 	fi
 
-	for man in manuals/*.man; do
-		man1=${man#manuals/}
-		newman ${man} ${man1/.man/.1} || die "newman ${man/.man/.1} failed"
+	for man in *.man; do
+		newman ${man} ${man/.man/.1} || die "newman ${man} ${man/.man/.1} failed"
 	done
-
-	dodoc ChangeLog README || die "dodoc failed"
-	newdoc LICENSE COPYING || die "newdoc failed"
 }
 
 pkg_postinst() {
diff --git a/dev-scheme/bigloo/metadata.xml b/dev-scheme/bigloo/metadata.xml
index dd4674bc..28892aef 100644
--- a/dev-scheme/bigloo/metadata.xml
+++ b/dev-scheme/bigloo/metadata.xml
@@ -15,10 +15,11 @@
   <use>
     <flag name="calendar">Build the embedded library for calendar programming</flag>
     <flag name="crypto">Build the embedded cryptographic library</flag>
-    <flag name="debug">Build the compiler with debug symbols</flag>
+    <flag name="debug">Enable extra debug codepaths</flag>
     <flag name="doc">Install Bigloo Manual (HTML docs of Bigloo and r5rs)</flag>
     <flag name="emacs">Build and install the Bigloo Developement Environment for Emacs (aka bee-mode)</flag>
-    <flag name="gstreamer">Build support for <pkg>media-libs/gstreamer</pkg></flag>
+    <flag name="gmp">Adds support for <pkg>dev-libs/gmp</pkg> (GNU MP library)</flag>
+    <flag name="gstreamer">Adds support for <pkg>media-libs/gstreamer</pkg></flag>
     <flag name="java">Enable the JVM backend for the Bigloo compiler</flag>
     <flag name="mail">Mail library for email management (e.g. maildir and imap support)</flag>
     <flag name="multimedia">Build multimedia library (e.g. for managing images). Needed for <pkg>dev-scheme/hop</pkg></flag>
@@ -26,6 +27,8 @@
     <flag name="packrat">Bigloo port of Tony Garnock-Jones' packrat parser</flag>
     <flag name="srfi1">Build the srfi1 library: List library</flag>
     <flag name="srfi27">Build the srfi27 library: Source of Random Bits (32bit-arch only)</flag>
+    <flag name="ssl">Adds support for SSL connections through <pkg>dev-libs/openssl</pkg></flag>
+    <flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg></flag>
     <flag name="threads">Enable thread support, it depends on <pkg>dev-libs/boehm-gc</pkg> built with threads use flag</flag>
     <flag name="text">Library for dealing with text (e.g. BibTeX parser)</flag>
     <flag name="web">Library for web programming (e.g. XML, CGI parsers). Needed for <pkg>dev-scheme/hop</pkg></flag>