[gentoo-commits] proj/lisp:master commit in: dev-scheme/bigloo/

["Cyprien Nicolas" <c.nicolas+gentoo@gmail.com>]

commit:     e675d19653f7be61b7671cfd525ee999cf58ac12
Author:     Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Feb 18 12:01:49 2011 +0000
Commit:     Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Fri Feb 18 12:01:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=e675d196

dev-scheme/bigloo: Fix bug #354751

---
 dev-scheme/bigloo/bigloo-3.5a.ebuild |    3 ++
 dev-scheme/bigloo/bigloo-3.6a.ebuild |   48 +++++++++++----------------------
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/dev-scheme/bigloo/bigloo-3.5a.ebuild b/dev-scheme/bigloo/bigloo-3.5a.ebuild
index 9aa39d6..dd96d62 100644
--- a/dev-scheme/bigloo/bigloo-3.5a.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.5a.ebuild
@@ -79,6 +79,9 @@ src_prepare() {
 	# Removing bundled boehm-gc
 	rm -rf gc || die
 
+	# bug 354751: Fix '[a-z]' sed range for non ascii LC_COLLATE order
+	sed 's/a-z/[:alpha:]/' -i configure autoconf/* || die 'sed s/a-z/[:alpha:]/ failed'
+
 	java-pkg-opt-2_src_prepare
 }
 

diff --git a/dev-scheme/bigloo/bigloo-3.6a.ebuild b/dev-scheme/bigloo/bigloo-3.6a.ebuild
index 171e523..c1603db 100644
--- a/dev-scheme/bigloo/bigloo-3.6a.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.6a.ebuild
@@ -20,6 +20,13 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="bglpkg calendar crypto debug doc emacs gmp gstreamer java mail multimedia openpgp packrat sqlite srfi1 srfi27 ssl text threads web"
+REQUIRED_USE="
+	bglpkg? ( web )
+	gstreamer? ( multimedia threads )
+	openpgp? ( crypto )
+	packrat? ( srfi1 )
+	srfi27? ( x86? ( gmp ) )
+"
 
 # bug 254916 for >=dev-libs/boehm-gc-7.1
 DEPEND=">=dev-libs/boehm-gc-7.1[threads?]
@@ -36,38 +43,11 @@ S=${WORKDIR}/${MY_P/-[ab]*/}
 
 SITEFILE="50bigloo-gentoo.el"
 
-# TODO: Change the following using REQUIRED_USE variable
 pkg_pretend() {
-	if use gstreamer; then
-		if ! use threads; then
-			die "USE Dependency: 'gstreamer' needs 'threads'. You may enable 'threads', or disable 'gstreamer'."
-		fi
-
-		if ! use multimedia; then
-			die "USE Dependency: 'gstreamer' needs 'multimedia'."
-		fi
-	fi
-
-	if use packrat && ! use srfi1; then
-		die "USE Dependency: 'packrat' needs 'srfi1'."
-	fi
-
-	if use srfi27; then
-		# 'dev-scheme/bigloo srfi27' should be added in arch/amd64/package.use.mask
-		if use amd64; then
-			ewarn "srfi27 is known to only work on 32-bit architectures." \
-				"The USE is ignored on amd64."
-		elif ! use gmp; then
-			die "USE Dependency: 'srfi27' needs 'gmp'."
-		fi
-	fi
-
-	if use bglpkg && ! use web; then
-		die "USE Dependency: 'bglpkg' needs 'web'."
-	fi
-
-	if use openpgp && ! use crypto; then
-		die "USE Dependency: 'openpgp' needs 'crypto'."
+	if use srfi27 && use amd64; then
+		#TODO: 'dev-scheme/bigloo srfi27' in arch/amd64/package.use.mask?
+		ewarn "srfi27 is known to only work on 32-bit architectures." \
+			"This IUSE is ignored on amd64."
 	fi
 }
 
@@ -75,6 +55,9 @@ src_prepare() {
 	# Removing bundled boehm-gc
 	rm -rf gc || die
 
+	# bug 354751: Fix '[a-z]' sed range for non ascii LC_COLLATE order
+	sed 's/a-z/[:alpha:]/' -i configure autoconf/* || die 'sed s/a-z/[:alpha:]/ failed'
+
 	java-pkg-opt-2_src_prepare
 }
 
@@ -90,7 +73,8 @@ src_configure() {
 		myconf="--emacs=false"
 	fi
 
-	# api/{crypto,openpgp} jvm tests show failures.
+	# Add JCFLAGS to the configure script
+	# (api/{crypto,openpgp} jvm tests show failures)
 	if use java; then
 		sed -e "s/^\(jcflags=\)\(.*\)/\\1\"\\2 $(java-pkg_javac-args)\"/" \
 			-e 's/jcflags=$jcflags/jcflags="$jcflags"/'\