From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PqP2E-00046E-JF for garchives@archives.gentoo.org; Fri, 18 Feb 2011 12:02:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A84D1C02F; Fri, 18 Feb 2011 12:01:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F0F0B1C02F for ; Fri, 18 Feb 2011 12:01:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 341E61B4020 for ; Fri, 18 Feb 2011 12:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 55D0B8006A for ; Fri, 18 Feb 2011 12:01:57 +0000 (UTC) From: "Cyprien Nicolas" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Cyprien Nicolas" Message-ID: Subject: [gentoo-commits] proj/lisp:master commit in: dev-scheme/bigloo/ X-VCS-Repository: proj/lisp X-VCS-Files: dev-scheme/bigloo/bigloo-3.5a.ebuild dev-scheme/bigloo/bigloo-3.6a.ebuild X-VCS-Directories: dev-scheme/bigloo/ X-VCS-Committer: fulax X-VCS-Committer-Name: Cyprien Nicolas X-VCS-Revision: e675d19653f7be61b7671cfd525ee999cf58ac12 Date: Fri, 18 Feb 2011 12:01:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8e4de953b52a3ec501ace716a673907b commit: e675d19653f7be61b7671cfd525ee999cf58ac12 Author: Cyprien Nicolas (fulax) gmail co= m> AuthorDate: Fri Feb 18 12:01:49 2011 +0000 Commit: Cyprien Nicolas gmail com> CommitDate: Fri Feb 18 12:01:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/lisp.git;a=3D= commit;h=3De675d196 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/big= loo-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 =20 + # 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/[:alph= a:]/ failed' + java-pkg-opt-2_src_prepare } =20 diff --git a/dev-scheme/bigloo/bigloo-3.6a.ebuild b/dev-scheme/bigloo/big= loo-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=3D"GPL-2 LGPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~ppc ~x86" IUSE=3D"bglpkg calendar crypto debug doc emacs gmp gstreamer java mail m= ultimedia openpgp packrat sqlite srfi1 srfi27 ssl text threads web" +REQUIRED_USE=3D" + bglpkg? ( web ) + gstreamer? ( multimedia threads ) + openpgp? ( crypto ) + packrat? ( srfi1 ) + srfi27? ( x86? ( gmp ) ) +" =20 # bug 254916 for >=3Ddev-libs/boehm-gc-7.1 DEPEND=3D">=3Ddev-libs/boehm-gc-7.1[threads?] @@ -36,38 +43,11 @@ S=3D${WORKDIR}/${MY_P/-[ab]*/} =20 SITEFILE=3D"50bigloo-gentoo.el" =20 -# 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 'thr= eads', 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 } =20 @@ -75,6 +55,9 @@ src_prepare() { # Removing bundled boehm-gc rm -rf gc || die =20 + # 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/[:alph= a:]/ failed' + java-pkg-opt-2_src_prepare } =20 @@ -90,7 +73,8 @@ src_configure() { myconf=3D"--emacs=3Dfalse" fi =20 - # 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=3D\)\(.*\)/\\1\"\\2 $(java-pkg_javac-args)\"/" \ -e 's/jcflags=3D$jcflags/jcflags=3D"$jcflags"/'\