fix multilib issue bug 182677, thanks to José Romildo Malaquias <j.romildo@gmail.com> and remove old versions

Package-Manager: portage-2.1.3_rc4

12 files changed, 32 insertions, 322 deletions

diff --git a/dev-scheme/bigloo/ChangeLog b/dev-scheme/bigloo/ChangeLog
index 44f6576d1b8b..a07c94154fcc 100644
--- a/dev-scheme/bigloo/ChangeLog
+++ b/dev-scheme/bigloo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/bigloo
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/ChangeLog,v 1.13 2007/06/05 14:38:39 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/ChangeLog,v 1.14 2007/06/20 15:03:52 hkbst Exp $
+
+  20 Jun 2007; Marijn Schouten <hkBst@gentoo.org> -bigloo-2.4c.ebuild,
+  -bigloo-2.5a.ebuild, -bigloo-2.5c.ebuild, -bigloo-2.6a.ebuild,
+  bigloo-2.9a.ebuild, bigloo-3.0a_p2.ebuild:
+  fix multilib issue bug 182677, thanks to José Romildo Malaquias
+  <j.romildo@gmail.com> and remove old versions
 
 *bigloo-3.0a_p2 (05 Jun 2007)
 
diff --git a/dev-scheme/bigloo/Manifest b/dev-scheme/bigloo/Manifest
index c9140419b394..40ad1124fae3 100644
--- a/dev-scheme/bigloo/Manifest
+++ b/dev-scheme/bigloo/Manifest
@@ -2,61 +2,29 @@ AUX 50bigloo-gentoo.el 61 RMD160 66b8c0eccb4e4f95e9780e7a3a7e1f6be3776eeb SHA1 a
 MD5 c7498ad5bbb867af8fa4a146ba67b65b files/50bigloo-gentoo.el 61
 RMD160 66b8c0eccb4e4f95e9780e7a3a7e1f6be3776eeb files/50bigloo-gentoo.el 61
 SHA256 fa7afa5a3bb1d72abc59c3aa2b5e8aa8c7ab6c33883d561463e3f5dc3d031123 files/50bigloo-gentoo.el 61
-DIST bigloo2.4c.tar.gz 7791033 RMD160 91b17283e23c8db23e9ff7fca494b42e0391f048 SHA1 d1631016835987786ef4eae80fea58f64d4372bf SHA256 15e217629df3c8d6a3456854837e067933ed58f146030b7ffd13a78503a7f8d9
-DIST bigloo2.5a.tar.gz 8060988 RMD160 ac51ed6aeb69fe76bd47c2264a7036343ef1346c SHA1 904ddce14b152df1251c6b367530fe4ca8ed8895 SHA256 3ec2a27afc73f1d1f6f344d0deac79867cb02402461be20c29e09ee043a16345
-DIST bigloo2.5c.tar.gz 5345726 RMD160 be3ba4815e2f826064a93aa005406ec4f05373ae SHA1 b1578cdb07f3b322700f0c177bb5d8b7f48c8112 SHA256 71da159749791a7816958b65bff0541e6b384ba6064ef0223d66d141936e53fb
-DIST bigloo2.6a.tar.gz 8208960 RMD160 4ab2395b69b46004b82d6a016b4b7cfe05a1a3ef SHA1 ce17ce781732220c7754aef8f10d587ecb2b641e SHA256 1e93f54eae777df80852d73ecfa1ee4c4460c068e160ee46870221957c99d267
 DIST bigloo2.7a-r2.tar.gz 8704428 RMD160 4fb0fc51663303066d302b743f22fd60b91b0cbb SHA1 7da1eb7f9b7771476ec795fe8ac450be6a9aa30c SHA256 1542ecc8690a462608efaefffeb61987e2b3b7fae0f772d4a0ab2772ca4bd8eb
 DIST bigloo2.9a.tar.gz 10270051 RMD160 e2ac3836ecdc1277e1c43ce2a7d489e8d6112d38 SHA1 3fe614945d52ba05f8a63492fca921e69aaa7af6 SHA256 bce1b3f947ba518620afde075036032a9af084174fa4df561ec97952bc80110a
 DIST bigloo3.0a-2.tar.gz 11352730 RMD160 bcf98d838e3adfc87b7ba07849c3167b252bc628 SHA1 12ae7f5cd9c104a35e08f91d2cc5da1b1a782956 SHA256 6d62285aeb3e721bd01f8ea41c0199b3269e26e35be613b9337fd07a0a4bdd1b
-EBUILD bigloo-2.4c.ebuild 1844 RMD160 5c6c00ff2e60bb86f94ca5db15670112b829b3be SHA1 ef47a2670d7ce73913429549711c8ea63a75e8fa SHA256 6670c04104e46bd328637f89b7541e83602ce265d88efe0f9d90c80c97e463a8
-MD5 1a5600361091a5c7e9361a49643292ce bigloo-2.4c.ebuild 1844
-RMD160 5c6c00ff2e60bb86f94ca5db15670112b829b3be bigloo-2.4c.ebuild 1844
-SHA256 6670c04104e46bd328637f89b7541e83602ce265d88efe0f9d90c80c97e463a8 bigloo-2.4c.ebuild 1844
-EBUILD bigloo-2.5a.ebuild 1845 RMD160 124b6f9b1bdc0ab601bb1e2a81a360a0e855e85a SHA1 2af6026d271f89e2298862859f0a0ab7e2745198 SHA256 36ae1e10d425d4fce33aea9cf372398cc133189dfc172b360ae798fbee6ef73f
-MD5 64faff5f7bc4b247e06c832e94f6a488 bigloo-2.5a.ebuild 1845
-RMD160 124b6f9b1bdc0ab601bb1e2a81a360a0e855e85a bigloo-2.5a.ebuild 1845
-SHA256 36ae1e10d425d4fce33aea9cf372398cc133189dfc172b360ae798fbee6ef73f bigloo-2.5a.ebuild 1845
-EBUILD bigloo-2.5c.ebuild 1485 RMD160 9ee3e3ff21eeec282ddd62d37a7e01b5724ac462 SHA1 4882623e741b23655f19c318229c31821449b408 SHA256 08e08274a6f6b3fea45be2cdaaac112820363e5256dbdd54a5c1f9ac7e83ce92
-MD5 795067e9de99cce81d0a86c97ab5e5bc bigloo-2.5c.ebuild 1485
-RMD160 9ee3e3ff21eeec282ddd62d37a7e01b5724ac462 bigloo-2.5c.ebuild 1485
-SHA256 08e08274a6f6b3fea45be2cdaaac112820363e5256dbdd54a5c1f9ac7e83ce92 bigloo-2.5c.ebuild 1485
-EBUILD bigloo-2.6a.ebuild 1477 RMD160 bfb196ec0a68ce432c2379061761675df95ff3d4 SHA1 0d2921ac794b2a5918e63961d21f42a6640757ee SHA256 e0f099926cc6c4082f66f6edf879be103ac5cebc157f7bbeec9de47b3853ffbd
-MD5 667471ba2e08cfdaf98754894b292077 bigloo-2.6a.ebuild 1477
-RMD160 bfb196ec0a68ce432c2379061761675df95ff3d4 bigloo-2.6a.ebuild 1477
-SHA256 e0f099926cc6c4082f66f6edf879be103ac5cebc157f7bbeec9de47b3853ffbd bigloo-2.6a.ebuild 1477
 EBUILD bigloo-2.7a_p2.ebuild 1935 RMD160 0a3ce2e5d27a23a9248ef01df14aeca317478c21 SHA1 0e2c2eae7e78a5c044817b1d33d2461044dc5753 SHA256 3d086586ef5f43d09fa628b290c6924201a3226a9f8890231a6e0bfb81b3c867
 MD5 46f1db829fc34a474507764ff133c12a bigloo-2.7a_p2.ebuild 1935
 RMD160 0a3ce2e5d27a23a9248ef01df14aeca317478c21 bigloo-2.7a_p2.ebuild 1935
 SHA256 3d086586ef5f43d09fa628b290c6924201a3226a9f8890231a6e0bfb81b3c867 bigloo-2.7a_p2.ebuild 1935
-EBUILD bigloo-2.9a.ebuild 2295 RMD160 0ad948ce0b83e2993268ca0f02e5287b4f812a13 SHA1 b9b6367b37bf0c23801d28fc619a276fcf872ea0 SHA256 925e7334015a57c7f5165eaa636bc65d77ea30ad4daa5a977ebb1f343c1d4b9f
-MD5 19fed13cac4d98b29432394412488d7a bigloo-2.9a.ebuild 2295
-RMD160 0ad948ce0b83e2993268ca0f02e5287b4f812a13 bigloo-2.9a.ebuild 2295
-SHA256 925e7334015a57c7f5165eaa636bc65d77ea30ad4daa5a977ebb1f343c1d4b9f bigloo-2.9a.ebuild 2295
-EBUILD bigloo-3.0a_p2.ebuild 2303 RMD160 1afc4859ed522218a1979e53aaf30e45d8b02a80 SHA1 a3eef07b6a306b3cc76834c309b78477c203b241 SHA256 5b027742844ed6756bd8b0a9742b68ea54563f58483e818076f650d52c6a37de
-MD5 e09e347e2761fbf7ea177c9b919e258a bigloo-3.0a_p2.ebuild 2303
-RMD160 1afc4859ed522218a1979e53aaf30e45d8b02a80 bigloo-3.0a_p2.ebuild 2303
-SHA256 5b027742844ed6756bd8b0a9742b68ea54563f58483e818076f650d52c6a37de bigloo-3.0a_p2.ebuild 2303
-MISC ChangeLog 3040 RMD160 bee07019c9d98867d2b3ccabf5e6e38dedcd6ba6 SHA1 54d16339878fae1e182ab7f6850b2193d3e7bbaf SHA256 23e91caad3cfc804f7687931830b3fb63b92d75c5f8c5c9aea367563d2a7c61d
-MD5 de784c55459392dabb807f47d8553eee ChangeLog 3040
-RMD160 bee07019c9d98867d2b3ccabf5e6e38dedcd6ba6 ChangeLog 3040
-SHA256 23e91caad3cfc804f7687931830b3fb63b92d75c5f8c5c9aea367563d2a7c61d ChangeLog 3040
+EBUILD bigloo-2.9a.ebuild 2333 RMD160 8344b643c4da5713dc0edcfbd2999e2130552c46 SHA1 40f5dc3c3a5501372f5645450132b01f652fe23b SHA256 9746d5ae9ccca0afdd33dbff102da5da2f6c4832ef78b01db1c22e71d7da07f6
+MD5 8d29d6b176bbac972ca94c96c99cea6b bigloo-2.9a.ebuild 2333
+RMD160 8344b643c4da5713dc0edcfbd2999e2130552c46 bigloo-2.9a.ebuild 2333
+SHA256 9746d5ae9ccca0afdd33dbff102da5da2f6c4832ef78b01db1c22e71d7da07f6 bigloo-2.9a.ebuild 2333
+EBUILD bigloo-3.0a_p2.ebuild 2336 RMD160 01983cf29bd90e57a47e04e5211af9ff7f2904fb SHA1 a604f82e1b1013a3f893e8307bef8b3db805b82f SHA256 48507ebc7914d9070e17f30fd0a6709b3addc167ad5396b3bdbe9b8054028aa9
+MD5 fbce4bc7fafa8a48a908aa6d1a8bfc61 bigloo-3.0a_p2.ebuild 2336
+RMD160 01983cf29bd90e57a47e04e5211af9ff7f2904fb bigloo-3.0a_p2.ebuild 2336
+SHA256 48507ebc7914d9070e17f30fd0a6709b3addc167ad5396b3bdbe9b8054028aa9 bigloo-3.0a_p2.ebuild 2336
+MISC ChangeLog 3337 RMD160 071cb67737049475612b018eb8bcdcc98922af8d SHA1 6d73f665c284ae0bbdd3f1c1ad64159fd9b19fde SHA256 5b2527ae94effa648d5d41b05973358a24644c41bbc73aed59ce202398b17456
+MD5 8d213de846ecd5b4f93868b445ee28d2 ChangeLog 3337
+RMD160 071cb67737049475612b018eb8bcdcc98922af8d ChangeLog 3337
+SHA256 5b2527ae94effa648d5d41b05973358a24644c41bbc73aed59ce202398b17456 ChangeLog 3337
 MISC metadata.xml 719 RMD160 4e2a6a685efac9ced879c20d76f4111fb2f32db4 SHA1 6509bfca767cc42810fa67b4d35f6bb78c0117b3 SHA256 95cd496d6657c812395200825f32c672458476433219c4cecf69354e426a596c
 MD5 2295624de810f381fbc3333996e065f3 metadata.xml 719
 RMD160 4e2a6a685efac9ced879c20d76f4111fb2f32db4 metadata.xml 719
 SHA256 95cd496d6657c812395200825f32c672458476433219c4cecf69354e426a596c metadata.xml 719
-MD5 2e3a3ece9f000d79dba89f0a4e5b6e29 files/digest-bigloo-2.4c 235
-RMD160 5af4cb7510862a97f909ec822a0ad69db5f23cba files/digest-bigloo-2.4c 235
-SHA256 1fa85ce4a2d324c9bf73b6537df7b899e4e97a7d321bef722cd1602a8a3c2dac files/digest-bigloo-2.4c 235
-MD5 2e20f93e41fed8248f134a5ff193308a files/digest-bigloo-2.5a 235
-RMD160 f5b57317873e278442d55d1fe470913e1cc07c20 files/digest-bigloo-2.5a 235
-SHA256 337284eb0b248be2a51569d0034491abf037a59e8b62fd79e2d1885a88486614 files/digest-bigloo-2.5a 235
-MD5 a0c98b3a8842f64b117abbcad7e91b02 files/digest-bigloo-2.5c 235
-RMD160 94ed98c84f1a48951818f48e28b332bbb593f154 files/digest-bigloo-2.5c 235
-SHA256 49bb9b7afb71ca5da8425d4fba67db7a348d8549bec378b94413d219cba07040 files/digest-bigloo-2.5c 235
-MD5 844a78d8a53254fc541bcec15493478f files/digest-bigloo-2.6a 235
-RMD160 eaea92e56525594148c1454edf2106bb273e7319 files/digest-bigloo-2.6a 235
-SHA256 cc951608e3222ad19d16630abf639a772192ee9fbbd18585ea32445bebf42403 files/digest-bigloo-2.6a 235
 MD5 29f3d47ac80983eccade41f1cf477049 files/digest-bigloo-2.7a_p2 244
 RMD160 8143965841e15c92e3d46bc0001836dab674f6ea files/digest-bigloo-2.7a_p2 244
 SHA256 16a974c33d55d6dc8be107794330a70a1f8c38b5d7fbcca66903776a99653b7b files/digest-bigloo-2.7a_p2 244
diff --git a/dev-scheme/bigloo/bigloo-2.4c.ebuild b/dev-scheme/bigloo/bigloo-2.4c.ebuild
deleted file mode 100644
index 2b1993299c02..000000000000
--- a/dev-scheme/bigloo/bigloo-2.4c.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-2.4c.ebuild,v 1.4 2005/01/22 21:27:36 karltk Exp $
-
-S=${WORKDIR}/${PN}${PV}
-DESCRIPTION="Bigloo Scheme compiler for x86, sparc, alpha, ppc and JVM"
-SRC_URI="ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo${PV}.tar.gz"
-HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Bigloo/bigloo.html"
-DEPEND=""
-#RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="java"
-
-src_compile() {
-	local myconf
-	local myjava=`java-config --java`
-	local myjavac=`java-config --javac`
-
-	use java &&
-		myconf="--jvm=force --java=$myjava --javac=$myjavac" \
-		|| myconf="--jvm=no"
-
-
-	./configure \
-		--native=yes \
-		--cflags="${CFLAGS}" \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man/man1 \
-		--docdir=/usr/share/doc/${PV} \
-		$myconf || die "./configure failed"
-
-	cp Makefile.config Makefile.config.orig
-	sed "s/JCFLAGS=-O/JCFLAGS=/" \
-		< Makefile.config.orig \
-		> Makefile.config
-	echo LD_LIBRARY_PATH=${S}/lib/2.4c >> Makefile.config
-
-	cp bde/Makefile bde/Makefile.orig
-	sed "s/\$(BOOTBINDIR)\/afile jas/LD_LIBRARY_PATH=\$(LD_LIBRARY_PATH) \$(BOOTBINDIR)\/afile jas/" \
-		< bde/Makefile.orig \
-		> bde/Makefile
-
-	cp Makefile.config Makefile.config.fixed
-
-	make || die
-}
-
-src_install () {
-	dodir /usr/bin
-	dodir /usr/lib
-	dodir /usr/share/doc/${PV}
-	dodir /usr/share/man/man1
-	dodir /usr/share/info
-
-	sed \
-		-e "s:^BINDIR=\(.*\):BINDIR=${D}\1:" \
-		-e "s:^LIBDIR=\(.*\):LIBDIR=${D}\1:" \
-		-e "s:^MANDIR=\(.*\):MANDIR=${D}\1:" \
-		-e "s:^INFODIR=\(.*\):INFODIR=${D}\1:" \
-		-e "s:^DOCDIR=\(.*\):DOCDIR=${D}\1:" \
-		< Makefile.config.fixed \
-		> Makefile.config
-
-	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/bigloo/${PV}/" \
-		> ${D}/etc/env.d/25bigloo
-	make install || die
-}
diff --git a/dev-scheme/bigloo/bigloo-2.5a.ebuild b/dev-scheme/bigloo/bigloo-2.5a.ebuild
deleted file mode 100644
index eac14ac6c46a..000000000000
--- a/dev-scheme/bigloo/bigloo-2.5a.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-2.5a.ebuild,v 1.4 2005/01/22 21:27:36 karltk Exp $
-
-S=${WORKDIR}/${PN}${PV}
-DESCRIPTION="Bigloo Scheme compiler for x86, sparc, alpha, ppc and JVM"
-SRC_URI="ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo${PV}.tar.gz"
-HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Bigloo/bigloo.html"
-DEPEND=""
-#RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="java"
-
-src_compile() {
-	local myconf
-	local myjava=`java-config --java`
-	local myjavac=`java-config --javac`
-
-	use java &&
-		myconf="--jvm=force --java=$myjava --javac=$myjavac" \
-		|| myconf="--jvm=no"
-
-
-	./configure \
-		--native=yes \
-		--cflags="${CFLAGS}" \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man/man1 \
-		--docdir=/usr/share/doc/${PV} \
-		$myconf || die "./configure failed"
-
-	cp Makefile.config Makefile.config.orig
-	sed "s/JCFLAGS=-O/JCFLAGS=/" \
-		< Makefile.config.orig \
-		> Makefile.config
-	echo LD_LIBRARY_PATH=${S}/lib/${PV} >> Makefile.config
-
-	cp bde/Makefile bde/Makefile.orig
-	sed "s/\$(BOOTBINDIR)\/afile jas/LD_LIBRARY_PATH=\$(LD_LIBRARY_PATH) \$(BOOTBINDIR)\/afile jas/" \
-		< bde/Makefile.orig \
-		> bde/Makefile
-
-	cp Makefile.config Makefile.config.fixed
-
-	make || die
-}
-
-src_install () {
-	dodir /usr/bin
-	dodir /usr/lib
-	dodir /usr/share/doc/${PF}
-	dodir /usr/share/man/man1
-	dodir /usr/share/info
-
-	sed \
-		-e "s:^BINDIR=\(.*\):BINDIR=${D}\1:" \
-		-e "s:^LIBDIR=\(.*\):LIBDIR=${D}\1:" \
-		-e "s:^MANDIR=\(.*\):MANDIR=${D}\1:" \
-		-e "s:^INFODIR=\(.*\):INFODIR=${D}\1:" \
-		-e "s:^DOCDIR=\(.*\):DOCDIR=${D}\1:" \
-		< Makefile.config.fixed \
-		> Makefile.config
-
-	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/bigloo/${PV}/" \
-		> ${D}/etc/env.d/25bigloo
-	make install || die
-}
diff --git a/dev-scheme/bigloo/bigloo-2.5c.ebuild b/dev-scheme/bigloo/bigloo-2.5c.ebuild
deleted file mode 100644
index 6d14d8b23a8b..000000000000
--- a/dev-scheme/bigloo/bigloo-2.5c.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-2.5c.ebuild,v 1.4 2005/01/22 21:27:36 karltk Exp $
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${PN}${PV}
-DESCRIPTION="Bigloo Scheme compiler for x86, sparc, alpha, ppc and JVM"
-SRC_URI="ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${MY_P}.tar.gz"
-HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Bigloo/bigloo.html"
-DEPEND=">=sys-apps/sed-4"
-#RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-IUSE="java"
-
-src_compile() {
-	local myconf
-	local myjava=`java-config --java`
-	local myjavac=`java-config --javac`
-
-	use java &&
-		myconf="--jvm=force --java=$myjava --javac=$myjavac" \
-		|| myconf="--jvm=no"
-
-
-	./configure \
-		--native=yes \
-		--cflags="${CFLAGS}" \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man/man1 \
-		--docdir=/usr/share/doc/${PV} \
-		$myconf || die "./configure failed"
-
-	echo LD_LIBRARY_PATH=${S}/lib/${PV} >> Makefile.config
-
-	sed -i "s/JCFLAGS=-O/JCFLAGS=/" Makefile.config || die
-	sed -i "s/\$(BOOTBINDIR)\/afile jas/LD_LIBRARY_PATH=\$(LD_LIBRARY_PATH) \$(BOOTBINDIR)\/afile jas/" \
-		bde/Makefile || die
-
-	make || die
-}
-
-src_install () {
-	dodir /usr/bin
-	dodir /usr/lib/bigloo/2.5c
-	dodir /usr/share/doc/${PF}
-	dodir /usr/share/man/man1
-	dodir /usr/share/info
-
-	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/bigloo/${PV}/" \
-		> ${D}/etc/env.d/25bigloo
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-scheme/bigloo/bigloo-2.6a.ebuild b/dev-scheme/bigloo/bigloo-2.6a.ebuild
deleted file mode 100644
index b0afa691502a..000000000000
--- a/dev-scheme/bigloo/bigloo-2.6a.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-2.6a.ebuild,v 1.4 2005/01/22 21:27:36 karltk Exp $
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${PN}${PV}
-DESCRIPTION="Bigloo Scheme compiler for x86, sparc, alpha, ppc and JVM"
-SRC_URI="ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${MY_P}.tar.gz"
-HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Bigloo/bigloo.html"
-DEPEND=">=sys-apps/sed-4"
-#RDEPEND=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="java"
-
-src_compile() {
-	local myconf
-	local myjava=`java-config --java`
-	local myjavac=`java-config --javac`
-
-	use java &&
-		myconf="--jvm=force --java=$myjava --javac=$myjavac" \
-		|| myconf="--jvm=no"
-
-
-	./configure \
-		--native=yes \
-		--cflags="${CFLAGS}" \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man/man1 \
-		--docdir=/usr/share/doc/${PV} \
-		$myconf || die "./configure failed"
-
-	echo LD_LIBRARY_PATH=${S}/lib/${PV} >> Makefile.config
-
-	sed -i "s/JCFLAGS=-O/JCFLAGS=/" Makefile.config || die
-	sed -i "s/\$(BOOTBINDIR)\/afile jas/LD_LIBRARY_PATH=\$(LD_LIBRARY_PATH) \$(BOOTBINDIR)\/afile jas/" \
-		bde/Makefile || die
-
-	make || die
-}
-
-src_install () {
-	dodir /usr/bin
-	dodir /usr/lib/bigloo/2.5c
-	dodir /usr/share/doc/${PF}
-	dodir /usr/share/man/man1
-	dodir /usr/share/info
-
-	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/bigloo/${PV}/" \
-		> ${D}/etc/env.d/25bigloo
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-scheme/bigloo/bigloo-2.9a.ebuild b/dev-scheme/bigloo/bigloo-2.9a.ebuild
index 6c4d75071f0e..039396cd4cc7 100644
--- a/dev-scheme/bigloo/bigloo-2.9a.ebuild
+++ b/dev-scheme/bigloo/bigloo-2.9a.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-2.9a.ebuild,v 1.2 2007/03/12 22:32:43 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-2.9a.ebuild,v 1.3 2007/06/20 15:03:52 hkbst Exp $
 
-inherit elisp-common
+inherit elisp-common multilib
 
-MY_P=${PN}${PV/_p/-r}
+MY_P=${PN}${PV/_p/-}
 
 DESCRIPTION="Bigloo is a Scheme implementation."
 HOMEPAGE="http://www-sop.inria.fr/mimosa/fp/Bigloo/bigloo.html"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="emacs? ( virtual/emacs )"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${MY_P%-*}
 
 SITEFILE="50bigloo-gentoo.el"
 
@@ -28,7 +28,8 @@ src_compile() {
 
 	# 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 --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libdir=/usr/lib \
+	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+		--libdir=/usr/$(get_libdir) \
 		--docdir=/usr/share/doc/${PF} \
 		--benchmark=yes \
 		--sharedbde=no \
@@ -41,7 +42,7 @@ src_compile() {
 	emake -j1 || die "emake failed"
 }
 
-# make test does something weird so default src_test() in /usr/lib/portage/bin/ebuild.sh fails the following test
+# "make test" does something weird so default src_test() in /usr/lib/portage/bin/ebuild.sh fails the following test
 # elif emake -j1 test -n &> /dev/null; then
 # so copy straight from default src_test() all the stuff which depends on that test passing
 src_test() {
@@ -54,7 +55,7 @@ src_test() {
 
 src_install () {
 #	dodir /etc/env.d
-#	echo "LDPATH=/usr/lib/bigloo/${PV}/" > ${D}/etc/env.d/25bigloo
+#	echo "LDPATH=/usr/$(get_libdir)/bigloo/${PV}/" > ${D}/etc/env.d/25bigloo
 
 	# make the links created not point to DESTDIR, since that is only a temporary home
 	sed 's/ln -s $(DESTDIR)/ln -s /' -i Makefile.misc
diff --git a/dev-scheme/bigloo/bigloo-3.0a_p2.ebuild b/dev-scheme/bigloo/bigloo-3.0a_p2.ebuild
index 181dd9041c7e..966516e7d8d8 100644
--- a/dev-scheme/bigloo/bigloo-3.0a_p2.ebuild
+++ b/dev-scheme/bigloo/bigloo-3.0a_p2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-3.0a_p2.ebuild,v 1.1 2007/06/05 14:38:39 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/bigloo/bigloo-3.0a_p2.ebuild,v 1.2 2007/06/20 15:03:52 hkbst Exp $
 
-inherit elisp-common
+inherit elisp-common multilib
 
 MY_P=${PN}${PV/_p/-}
 
@@ -28,7 +28,8 @@ src_compile() {
 
 	# 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 --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libdir=/usr/lib \
+	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+		--libdir=/usr/$(get_libdir) \
 		--docdir=/usr/share/doc/${PF} \
 		--benchmark=yes \
 		--sharedbde=no \
@@ -54,7 +55,7 @@ src_test() {
 
 src_install () {
 #	dodir /etc/env.d
-#	echo "LDPATH=/usr/lib/bigloo/${PV}/" > ${D}/etc/env.d/25bigloo
+#	echo "LDPATH=/usr/$(get_libdir)/bigloo/${PV}/" > ${D}/etc/env.d/25bigloo
 
 	# make the links created not point to DESTDIR, since that is only a temporary home
 	sed 's/ln -s $(DESTDIR)/ln -s /' -i Makefile.misc
diff --git a/dev-scheme/bigloo/files/digest-bigloo-2.4c b/dev-scheme/bigloo/files/digest-bigloo-2.4c
deleted file mode 100644
index 4445c088582c..000000000000
--- a/dev-scheme/bigloo/files/digest-bigloo-2.4c
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c26ae852bd4ffb88d21ede4d6a395ffc bigloo2.4c.tar.gz 7791033
-RMD160 91b17283e23c8db23e9ff7fca494b42e0391f048 bigloo2.4c.tar.gz 7791033
-SHA256 15e217629df3c8d6a3456854837e067933ed58f146030b7ffd13a78503a7f8d9 bigloo2.4c.tar.gz 7791033
diff --git a/dev-scheme/bigloo/files/digest-bigloo-2.5a b/dev-scheme/bigloo/files/digest-bigloo-2.5a
deleted file mode 100644
index 973bb874801c..000000000000
--- a/dev-scheme/bigloo/files/digest-bigloo-2.5a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3fbf13769c096e5ca2d0f927cfde4eff bigloo2.5a.tar.gz 8060988
-RMD160 ac51ed6aeb69fe76bd47c2264a7036343ef1346c bigloo2.5a.tar.gz 8060988
-SHA256 3ec2a27afc73f1d1f6f344d0deac79867cb02402461be20c29e09ee043a16345 bigloo2.5a.tar.gz 8060988
diff --git a/dev-scheme/bigloo/files/digest-bigloo-2.5c b/dev-scheme/bigloo/files/digest-bigloo-2.5c
deleted file mode 100644
index 21d2f7203d44..000000000000
--- a/dev-scheme/bigloo/files/digest-bigloo-2.5c
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c0ee7bb61472baaf9401dda83e1aadef bigloo2.5c.tar.gz 5345726
-RMD160 be3ba4815e2f826064a93aa005406ec4f05373ae bigloo2.5c.tar.gz 5345726
-SHA256 71da159749791a7816958b65bff0541e6b384ba6064ef0223d66d141936e53fb bigloo2.5c.tar.gz 5345726
diff --git a/dev-scheme/bigloo/files/digest-bigloo-2.6a b/dev-scheme/bigloo/files/digest-bigloo-2.6a
deleted file mode 100644
index 9c098072c66c..000000000000
--- a/dev-scheme/bigloo/files/digest-bigloo-2.6a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a328d44fd1e4fa71ec5ada2a39f990fc bigloo2.6a.tar.gz 8208960
-RMD160 4ab2395b69b46004b82d6a016b4b7cfe05a1a3ef bigloo2.6a.tar.gz 8208960
-SHA256 1e93f54eae777df80852d73ecfa1ee4c4460c068e160ee46870221957c99d267 bigloo2.6a.tar.gz 8208960