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

(Portage version: 2.1.3_rc4)

11 files changed, 20 insertions, 278 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/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