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

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

commit:     bf0db0ac6d36598858d1ceb157fd54b54931ed83
Author:     Cyprien Nicolas (fulax) <gentoo <AT> fulax <DOT> fr>
AuthorDate: Sun Feb  3 13:56:32 2013 +0000
Commit:     Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Sun Feb  3 13:56:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=bf0db0ac

dev-scheme/bigloo: Update manifest and add amd64-linux keyword (works fine here, but no jvm support yet)

---
 dev-scheme/bigloo/bigloo-3.6a-r1.ebuild |  210 -------------------------------
 dev-scheme/bigloo/bigloo-4.0a.ebuild    |   43 ++++---
 2 files changed, 24 insertions(+), 229 deletions(-)

diff --git a/dev-scheme/bigloo/bigloo-3.6a-r1.ebuild b/dev-scheme/bigloo/bigloo-3.6a-r1.ebuild
deleted file mode 100644
index 1569e7f..0000000
--- a/dev-scheme/bigloo/bigloo-3.6a-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit elisp-common multilib eutils flag-o-matic java-pkg-opt-2
-
-MY_P=${PN}${PV/_p/-}
-MY_P=${MY_P/_alpha*/-alpha}
-MY_P=${MY_P/_beta*/-beta}
-
-BGL_RELEASE=${PV/_*/}
-
-DESCRIPTION="Bigloo is a Scheme implementation."
-HOMEPAGE="http://www-sop.inria.fr/indes/fp/Bigloo/bigloo.html"
-SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz"
-
-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?]
-	emacs? ( virtual/emacs )
-	gmp? ( dev-libs/gmp )
-	gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
-	java? ( >=virtual/jdk-1.5 app-arch/zip )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P/-[ab]*/}
-
-SITEFILE="50bigloo-gentoo.el"
-
-pkg_pretend() {
-	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
-}
-
-src_prepare() {
-	# Removing bundled boehm-gc
-	rm -rf gc || die
-
-	# Fix some printf format warnings
-	epatch "${FILESDIR}/${PN}-${BGL_RELEASE}-fix_printf_format_warnings.patch"
-
-	# 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
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf=""
-
-	# Filter Zile emacs replacement. Bug #336717
-	if use emacs; then
-		myconf="--bee=full --emacs=${EMACS} --lispdir=${SITELISP}/${PN}"
-	else
-		myconf="--emacs=false"
-	fi
-
-	# 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"/'\
-			-i configure
-		myconf="${myconf}
-		--jvm=yes"
-	fi
-
-	# No pkglib/pkgcomp in IUSE, I don't see any need besides bglpkg
-	# One or the other could be added upon user request
-	if use bglpkg; then
-		myconf="${myconf}
-		--enable-bglpkg --enable-pkgcomp --enable-pkglib"
-	else
-		myconf="${myconf}
-		--disable-bglpkg --disable-pkgcomp --disable-pkglib"
-	fi
-
-	# srfi27 management
-	if use amd64; then
-		myconf="${myconf}
-		--disable-srfi27"
-	else
-		myconf="${myconf}
-		$(use_enable srfi27)"
-	fi
-
-	# Put every non quoted configure opt into myconf, for the einfo below
-	myconf="
-		--prefix=/usr
-		--libdir=/usr/$(get_libdir)
-		--benchmark=yes
-		--coflags=
-		--customgc=no
-		--sharedbde=no
-		--sharedcompiler=no
-		--strip=no
-		$(use debug && echo --debug)
-		${myconf}
-		$(use_enable calendar)
-		$(use_enable crypto)
-		$(use_enable gmp)
-		$(use_enable gstreamer)
-		$(use_enable mail)
-		$(use_enable multimedia)
-		$(use_enable openpgp)
-		$(use_enable packrat)
-		--disable-phone
-		$(use_enable sqlite)
-		$(use_enable srfi1)
-		$(use_enable ssl)
-		$(use_enable text)
-		$(use_enable threads)
-		$(use_enable web)
-"
-
-	einfo "Configuring bigloo with:" \
-		"--ldflags=\"${LDFLAGS}\" $(echo ${myconf} | sed 's/\n\t\t/ /g')"
-
-	# Bigloo doesn't use autoconf and consequently a lot of options used by econf give errors
-	# Manuel Serrano says: "Please, dont talk to me about autoconf. I simply dont want to hear about it..."
-	./configure --ldflags="${LDFLAGS}" ${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake EFLAGS='-ldopt "$(LDFLAGS)"' || die "emake failed"
-
-	if use emacs; then
-		einfo "Compiling bee..."
-		emake compile-bee EFLAGS='-ldopt "$(LDFLAGS)"' || die "compiling bee failed"
-	fi
-}
-
-# default thinks that target doesn't exist
-src_test() {
-	emake -j1 test || die "emake test failed"
-}
-
-src_install() {
-	# Makefile:671:install: install-progs install-docs
-	emake DESTDIR="${D}" install-progs || die "install failed"
-
-	if use emacs; then
-		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
-		sed -i \
-			-e 's:^\(EMACS=\).*$:\1:' \
-			-e 's:^\(EMACSBRAND=\).*$:\1:' \
-			"${D}"/usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
-			|| die "sed !emacs in Makefile.config failed"
-	fi
-
-	dodoc ChangeLog README || die "dodoc failed"
-
-	pushd "${S}/manuals" &>/dev/null
-	if use doc; then
-		dohtml -r  . || die "dohtml failed"
-		doinfo *.info* || die "doinfo failed"
-	fi
-
-	for man in *.man; do
-		newman ${man} ${man/.man/.1} || die "newman ${man} ${man/.man/.1} failed"
-	done
-	popd &>/dev/null
-
-	# Remove created directories which remains empty
-	pushd "${D}/usr" &>/dev/null
-	rmdir -p doc/bigloo-${BGL_RELEASE} info man/man1 || die "rm empty dirs failed"
-	popd &>/dev/null
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "In order to use the bee-mode, add"
-		elog "  (require 'bmacs)"
-		elog "to your ~/.emacs file"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/dev-scheme/bigloo/bigloo-4.0a.ebuild b/dev-scheme/bigloo/bigloo-4.0a.ebuild
index ae00010..2209f16 100644
--- a/dev-scheme/bigloo/bigloo-4.0a.ebuild
+++ b/dev-scheme/bigloo/bigloo-4.0a.ebuild
@@ -36,7 +36,7 @@ SRC_URI="ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${MY_P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/${BGL_RELEASE}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 IUSE="alsa avahi bglpkg calendar crypto csv debug doc emacs flac gmp gstreamer java mail mp3 multimedia openpgp packrat sqlite srfi1 srfi27 ssl text threads web"
 REQUIRED_USE="
 	alsa? ( multimedia )
@@ -76,6 +76,11 @@ pkg_pretend() {
 		ewarn "srfi27 is known to only work on 32-bit architectures." \
 			"This IUSE is ignored on amd64."
 	fi
+
+	if use java && use prefix; then
+		die "Bigloo's JVM backend won't build on prefix." \
+			"Please remove 'java' from bigloo USE flags."
+	fi
 }
 
 src_prepare() {
@@ -95,7 +100,7 @@ src_configure() {
 
 	# Filter Zile emacs replacement. Bug #336717
 	if use emacs; then
-		myconf="--bee=full --emacs=${EMACS} --lispdir=${SITELISP}/${PN}"
+		myconf="--bee=full --emacs=${EMACS} --lispdir=${EPREFIX}${SITELISP}/${PN}"
 	else
 		myconf="--emacs=false"
 	fi
@@ -131,8 +136,8 @@ src_configure() {
 
 	# Put every non quoted configure opt into myconf, for the einfo below
 	myconf="
-		--prefix=/usr
-		--libdir=/usr/$(get_libdir)
+		--prefix=\"${EPREFIX}\"/usr
+		--libdir=\"${EPREFIX}\"/usr/$(get_libdir)
 		--benchmark=yes
 		--coflags=
 		--customgc=no
@@ -172,54 +177,54 @@ src_configure() {
 }
 
 src_compile() {
-	emake EFLAGS='-ldopt "$(LDFLAGS)"' || die "emake failed"
+	emake EFLAGS='-ldopt "$(LDFLAGS)"'
 
 	if use emacs; then
 		einfo "Compiling bee..."
-		emake compile-bee EFLAGS='-ldopt "$(LDFLAGS)"' || die "compiling bee failed"
+		emake compile-bee EFLAGS='-ldopt "$(LDFLAGS)"'
 	fi
 }
 
 # default thinks that target doesn't exist
 src_test() {
-	emake -j1 test || die "emake test failed"
+	emake -j1 test
 }
 
 src_install() {
 	# Makefile:671:install: install-progs install-docs
-	emake DESTDIR="${D}" install-progs || die "install failed"
+	emake DESTDIR="${D}" install-progs
 
 	if use emacs; then
 		einfo "Installing bee..."
-		emake DESTDIR="${D}" install-bee || die "install-bee failed"
-		einfo "Installing API-specific emacs files"
-		cp -v "${S}"/api/*/emacs/*.el "${D}/${SITELISP}/${PN}"
+		emake DESTDIR="${D}" install-bee
+		#einfo "Installing API-specific emacs files"
+		#cp -v "${S}"/api/*/emacs/*.el "${ED}/${SITELISP}/${PN}"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	else
 		# Fix EMACS*=false in Makefile.config
 		sed -i \
 			-e 's:^\(EMACS=\).*$:\1:' \
 			-e 's:^\(EMACSBRAND=\).*$:\1:' \
-			"${D}"/usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
-			|| die "sed !emacs in Makefile.config failed"
+			"${ED}"/usr/$(get_libdir)/bigloo/${BGL_RELEASE}/Makefile.config \
+			|| die "sed emacs in Makefile.config failed"
 	fi
 
-	dodoc ChangeLog README || die "dodoc failed"
-	newdoc LICENSE COPYING || die "newdoc failed"
+	dodoc ChangeLog README
+	newdoc LICENSE COPYING
 
 	pushd "${S}/manuals" &>/dev/null
 	if use doc; then
-		dohtml -r  . || die "dohtml failed"
-		doinfo *.info* || die "doinfo failed"
+		dohtml -r  .
+		doinfo *.info*
 	fi
 
 	for man in *.man; do
-		newman ${man} ${man/.man/.1} || die "newman ${man} ${man/.man/.1} failed"
+		newman ${man} ${man/.man/.1}
 	done
 	popd &>/dev/null
 
 	# Remove created directories which remains empty
-	pushd "${D}/usr" &>/dev/null
+	pushd "${ED}/usr" &>/dev/null
 	rmdir -p doc/bigloo-${BGL_RELEASE} info man/man1 || die "rm empty dirs failed"
 	popd &>/dev/null
 }