Version bump, added features for building wrt bug 259922. Clean up old ebuilds

(Portage version: 2.2_rc67/cvs/Linux i686)

8 files changed, 275 insertions, 240 deletions

diff --git a/dev-scheme/scm/ChangeLog b/dev-scheme/scm/ChangeLog
index 0a97a216bf45..23d23c38f71e 100644
--- a/dev-scheme/scm/ChangeLog
+++ b/dev-scheme/scm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-scheme/scm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/ChangeLog,v 1.9 2009/02/03 16:34:28 hkbst Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/ChangeLog,v 1.10 2010/04/16 19:17:20 chiiph Exp $
+
+*scm-5.5.6 (16 Apr 2010)
+
+  16 Apr 2010; Tomas Touceda <chiiph@gentoo.org> -scm-5.5.3.ebuild,
+  -scm-5.5.4.ebuild, -scm-5.5.5.ebuild, -scm-5.5.5-r1.ebuild,
+  +scm-5.5.6.ebuild, +files/scm-5.5.6-multiplefixes.patch, metadata.xml:
+  Version bump, added features for building wrt bug 259922. Clean up old
+  ebuilds
 
 *scm-5.5.5-r1 (03 Feb 2009)
 
diff --git a/dev-scheme/scm/files/scm-5.5.6-multiplefixes.patch b/dev-scheme/scm/files/scm-5.5.6-multiplefixes.patch
new file mode 100644
index 000000000000..8636c47c7185
--- /dev/null
+++ b/dev-scheme/scm/files/scm-5.5.6-multiplefixes.patch
@@ -0,0 +1,81 @@
+diff -Naur scm.old//build.scm scm//build.scm
+--- scm.old//build.scm	2009-08-03 15:35:57.000000000 -0300
++++ scm//build.scm	2010-04-16 15:52:25.000000000 -0300
+@@ -540,7 +540,7 @@
+      (graphics *unknown* "-I/usr/X11/include -DX11" "-lX11"
+ 	       "/usr/X11/lib/libX11.sa" () ())
+      (editline *unknown* "" "-lreadline" "/usr/lib/libreadline.a" () ())
+-     (termcap *unknown* "" "-ltermcap" "/usr/lib/libtermcap.a" () ())
++     (termcap *unknown* "" "-lncurses" "/usr/lib/libncurses.a" () ())
+      (debug *unknown* "-g" "-g" #f () ())
+      (socket *unknown* "" "" #f () ())
+      (lib *unknown* "" "" #f () ("scmmain.c"))
+diff -Naur scm.old//Makefile scm//Makefile
+--- scm.old//Makefile	2009-08-03 15:38:21.000000000 -0300
++++ scm//Makefile	2010-04-16 15:51:11.000000000 -0300
+@@ -178,18 +178,9 @@
+ 	$(BUILD) -f udscm4.opt -o udscm4 -s $(IMPLPATH)
+ 	-rm $(ofiles) scmmain.o
+ dscm4:	udscm4 $(ifiles) require.scm
+-	if [ -f /proc/sys/kernel/randomize_va_space -a\
+-	     "`cat /proc/sys/kernel/randomize_va_space`" != "0" ]; then {\
+-	   cat /proc/sys/kernel/randomize_va_space > randomize_va_space.tmp;\
+-	   echo 0 > /proc/sys/kernel/randomize_va_space;\
+-	} fi
+ 	-rm -f slibcat implcat scm~
+ 	-mv scm scm~
+ 	echo "(quit)" | $(SETARCH) ./udscm4 -no-init-file -o scm
+-	if [ -f randomize_va_space.tmp ]; then {\
+-	   cat randomize_va_space.tmp > /proc/sys/kernel/randomize_va_space;\
+-	   rm randomize_va_space.tmp;\
+-	} fi
+ 
+ # dumpable R5RS interpreter
+ udscm5.opt:
+@@ -199,20 +190,10 @@
+ udscm5:	$(cfiles) $(ufiles) $(hfiles) build.scm build udscm5.opt
+ 	$(BUILD) -f udscm5.opt -o udscm5 -s $(IMPLPATH)
+ 	-rm $(ofiles) scmmain.o
+-	strip udscm5
+ dscm5:	udscm5 $(ifiles) require.scm
+-	if [ -f /proc/sys/kernel/randomize_va_space -a\
+-	     "`cat /proc/sys/kernel/randomize_va_space`" != "0" ]; then {\
+-	   cat /proc/sys/kernel/randomize_va_space > randomize_va_space.tmp;\
+-	   echo 0 > /proc/sys/kernel/randomize_va_space;\
+-	} fi
+ 	-rm -f slibcat implcat scm~
+ 	-mv scm scm~
+ 	echo "(quit)" | $(SETARCH) ./udscm5 -no-init-file -r5 -o scm
+-	if [ -f randomize_va_space.tmp ]; then {\
+-	   cat randomize_va_space.tmp > /proc/sys/kernel/randomize_va_space;\
+-	   rm randomize_va_space.tmp;\
+-	} fi
+ 	$(MAKE) check
+ 	$(MAKE) checkmacro
+ 
+@@ -394,7 +375,7 @@
+ PREVDOCS = prevdocs/
+ html:	$(htmldir)scm_toc.html $(htmldir)Xlibscm_toc.html $(htmldir)hobbit_toc.html
+ 
+-TEXI2HTML = /usr/local/bin/texi2html -split -verbose
++TEXI2HTML = /usr/bin/texi2html -split -verbose
+ 
+ $(htmldir)scm_toc.html:	Makefile $(texifiles)
+ 	${TEXI2HTML} scm.texi
+@@ -431,7 +412,7 @@
+ 
+ rpm_prefix=$(HOME)/rpmbuild/
+ 
+-prefix = /usr/local/
++prefix = /usr/
+ exec_prefix = $(prefix)
+ # directory where `make install' will put executable.
+ bindir = $(exec_prefix)bin/
+@@ -498,7 +479,6 @@
+ 	mkdir -p $(DESTDIR)$(bindir)
+ 	mkdir -p $(DESTDIR)$(man1dir)
+ 	-cp scm scmlit $(DESTDIR)$(bindir)
+-	-strip $(DESTDIR)$(bindir)scmlit
+ 	-cp scm.1 $(DESTDIR)$(man1dir)
+ 	mkdir -p $(DESTDIR)$(libscmdir)
+ 	test -f $(DESTDIR)$(libscmdir)require.scm || \
diff --git a/dev-scheme/scm/metadata.xml b/dev-scheme/scm/metadata.xml
index 7a1a8aebe518..23e9e06607ba 100644
--- a/dev-scheme/scm/metadata.xml
+++ b/dev-scheme/scm/metadata.xml
@@ -9,4 +9,26 @@
 	<longdescription lang="en">
 SCM is a  Scheme implementation conforming to  Revised5 Report on the Algorithmic Language Scheme and the IEEE P1178 specification.
 	</longdescription>
-</pkgmetadata>
\ No newline at end of file
+	<use>
+		<flag name='arrays'>Support for  arrays, uniform-arrays and
+			uniform-vectors.</flag>
+		<flag name='bignums'>Support for large precision integers.</flag>
+		<flag name='cautious'>SCM will always check the number of arguments to
+			interpreted closures.</flag>
+		<flag name='dynamic-linking'>Be able to load compiled files while
+			running.</flag>
+		<flag name='engineering-notation'>Floats to display in engineering
+			notation (exponents always multiples of 3) instead of scientific
+			notation.</flag>
+		<flag name='gsubr'>generalized c arguments: for arbitrary 
+			(more then 11) arguments to C functions.</flag>
+		<flag name='inexact'>Support for floating point numbers.</flag>
+		<flag name='ioext'>Commonly available I/O extensions: line I/O, file
+			positioning, file delete and rename, and directory functions.</flag>
+		<flag name='macro'>C level support for hygienic and referentially 
+			transparent macros (syntax-rules macros).</flag>
+		<flag name='regex'>String regular expression matching.</flag>
+		<flag name='unix'>Support for: nice, acct, lstat, readlink, symlink,
+			mknod and sync.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-scheme/scm/scm-5.5.3.ebuild b/dev-scheme/scm/scm-5.5.3.ebuild
deleted file mode 100644
index 54f3cc49b7db..000000000000
--- a/dev-scheme/scm/scm-5.5.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.3.ebuild,v 1.5 2007/06/25 10:25:57 hkbst Exp $
-
-inherit versionator eutils
-
-#version magic thanks to masterdriverz and UberLord using bash array instead of tr
-trarr="0abcdefghi"
-MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
-
-MY_P=${PN}${MY_PV}
-S=${WORKDIR}/${PN}
-DESCRIPTION="Scheme implementation from author of slib"
-SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${MY_P}.zip"
-
-HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
-
-SLOT="0"
-LICENSE="GPL-2-with-linking-exception"
-KEYWORDS="~amd64"
-IUSE=""
-
-#unzip for unpacking
-RDEPEND=""
-DEPEND="app-arch/unzip
-		>=dev-scheme/slib-3.1.4-r2"
-
-src_compile() {
-	einfo "Making scmlit"
-	#parallel make fails sometimes
-	emake -j1 scmlit
-	einfo "Building"
-	echo "srcdir=/usr/share/scm/" > srcdir.mk
-	./build --compiler-options="${CFLAGS}" --linker-options="${LDFLAGS}" -F macro
-	emake
-}
-
-src_install() {
-#	emake DESTDIR=${D} install
-	insinto /usr/share/scm/
-	doins *.scm
-	dodoc ANNOUNCE QUICKREF README
-	dobin scm
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	einfo "Regenerating catalog..."
-	scm -e "(require 'new-catalog)"
-}
diff --git a/dev-scheme/scm/scm-5.5.4.ebuild b/dev-scheme/scm/scm-5.5.4.ebuild
deleted file mode 100644
index c194109bbbf7..000000000000
--- a/dev-scheme/scm/scm-5.5.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.4.ebuild,v 1.3 2008/11/17 13:40:07 pchrist Exp $
-
-inherit versionator eutils
-
-#version magic thanks to masterdriverz and UberLord using bash array instead of tr
-trarr="0abcdefghi"
-MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
-
-MY_P=${PN}${MY_PV}
-S=${WORKDIR}/${PN}
-DESCRIPTION="Scheme implementation from author of slib"
-SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${MY_P}.zip"
-
-HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
-
-SLOT="0"
-LICENSE="GPL-2-with-linking-exception"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#unzip for unpacking
-RDEPEND=""
-DEPEND="app-arch/unzip
-		>=dev-scheme/slib-3.1.5"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-#	cp Makefile Makefile.old
-
-	sed "s#local/##" -i Makefile
-
-	#sent upstream again
-	sed "s#mkdir#mkdir -p#" -i Makefile
-	sed "s#-p -p#-p#" -i Makefile
-	sed -i -e 's/mandir = $(prefix)man\//mandir = $(prefix)share\/man\//' Makefile
-
-#	diff -u Makefile.old Makefile
-}
-
-src_compile() {
-	einfo "Making scmlit"
-	#parallel make fails sometimes
-	emake -j1 scmlit
-	einfo "Creating script to build scm"
-	echo "srcdir=/usr/share/scm/" > srcdir.mk
-	./build --compiler-options="${CFLAGS}" --linker-options="${LDFLAGS}" -F macro -F inexact &> _compile.sh || die
-	einfo "Building scm"
-	sh _compile.sh || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	einfo "Regenerating catalog..."
-	scm -e "(require 'new-catalog)"
-}
diff --git a/dev-scheme/scm/scm-5.5.5-r1.ebuild b/dev-scheme/scm/scm-5.5.5-r1.ebuild
deleted file mode 100644
index 1efdd842b263..000000000000
--- a/dev-scheme/scm/scm-5.5.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.5-r1.ebuild,v 1.1 2009/02/03 16:34:28 hkbst Exp $
-
-inherit versionator eutils
-
-#version magic thanks to masterdriverz and UberLord using bash array instead of tr
-trarr="0abcdefghi"
-MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
-
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${PN}
-DESCRIPTION="Scheme implementation from author of slib"
-SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${MY_P}.zip"
-HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#unzip for unpacking
-RDEPEND=""
-DEPEND="app-arch/unzip
-		>=dev-scheme/slib-3.1.5"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	cp Makefile Makefile.old
-
-	sed "s#local/##" -i Makefile
-	sed 's:man1dir = $(prefix)man/man1/:man1dir = $(prefix)share/man/man1/:' -i Makefile # bug 247182
-
-	diff -u Makefile.old Makefile
-}
-
-src_compile() {
-	einfo "Making scmlit"
-	#parallel make fails sometimes
-	emake -j1 scmlit || die
-	einfo "Creating script to build scm"
-	echo "srcdir=/usr/share/scm/" > srcdir.mk
-	./build --compiler-options="${CFLAGS}" --linker-options="${LDFLAGS}" -F macro -F inexact &> _compile.sh || die
-	einfo "Building scm"
-	sh _compile.sh || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	einfo "Regenerating catalog..."
-	scm -e "(require 'new-catalog)"
-}
diff --git a/dev-scheme/scm/scm-5.5.5.ebuild b/dev-scheme/scm/scm-5.5.5.ebuild
deleted file mode 100644
index 94ecee3bb945..000000000000
--- a/dev-scheme/scm/scm-5.5.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.5.ebuild,v 1.1 2009/02/02 22:19:35 hkbst Exp $
-
-inherit versionator eutils
-
-#version magic thanks to masterdriverz and UberLord using bash array instead of tr
-trarr="0abcdefghi"
-MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
-
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${PN}
-DESCRIPTION="Scheme implementation from author of slib"
-SRC_URI="http://swiss.csail.mit.edu/ftpdir/scm/${MY_P}.zip"
-HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-#unzip for unpacking
-RDEPEND=""
-DEPEND="app-arch/unzip
-		>=dev-scheme/slib-3.1.5"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-#	cp Makefile Makefile.old
-
-	sed "s#local/##" -i Makefile
-
-#	diff -u Makefile.old Makefile
-}
-
-src_compile() {
-	einfo "Making scmlit"
-	#parallel make fails sometimes
-	emake -j1 scmlit || die
-	einfo "Creating script to build scm"
-	echo "srcdir=/usr/share/scm/" > srcdir.mk
-	./build --compiler-options="${CFLAGS}" --linker-options="${LDFLAGS}" -F macro -F inexact &> _compile.sh || die
-	einfo "Building scm"
-	sh _compile.sh || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	einfo "Regenerating catalog..."
-	scm -e "(require 'new-catalog)"
-}
diff --git a/dev-scheme/scm/scm-5.5.6.ebuild b/dev-scheme/scm/scm-5.5.6.ebuild
new file mode 100644
index 000000000000..df3d953f008b
--- /dev/null
+++ b/dev-scheme/scm/scm-5.5.6.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scm/scm-5.5.6.ebuild,v 1.1 2010/04/16 19:17:20 chiiph Exp $
+
+EAPI="2"
+
+inherit versionator eutils flag-o-matic
+
+#version magic thanks to masterdriverz and UberLord using bash array instead of tr
+trarr="0abcdefghi"
+MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
+
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${PN}
+DESCRIPTION="SCM is a Scheme implementation from the author of slib"
+SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip"
+HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact
+ioext macro ncurses posix readline regex sockets unix"
+
+#unzip for unpacking
+DEPEND="app-arch/unzip
+	>=dev-scheme/slib-3.1.5
+	dev-util/cproto
+	ncurses? ( sys-libs/ncurses )
+	readline? ( sys-libs/libtermcap-compat )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-multiplefixes.patch
+}
+
+src_compile() {
+	# SLIB is required to build SCM.
+	local slibpath="/usr/share/slib/"
+	if [ -n "$SCHEME_LIBRARY_PATH" ]; then
+		einfo "using SLIB $SCHEME_LIBRARY_PATH"
+	elif [ -d ${slibpath} ]; then
+		export SCHEME_LIBRARY_PATH=${slibpath}
+	fi
+
+	einfo "Making scmlit"
+	emake -j1 scmlit clean || die "faild to build scmlit"
+
+	einfo "Building scm"
+	local features=""
+	use arrays && features+="arrays"
+	use bignums && features+=" bignums"
+	use cautious && features+=" cautious"
+	use engineering-notation && features+=" engineering-notation"
+	use inexact && features+=" inexact"
+	use macro && features+=" macro"
+
+	( use readline ||
+	  use ncurses ||
+	  use regex ||
+	  use posix ||
+	  use ioext ||
+	  use gsubr ||
+	  use sockets ||
+	  use unix ||
+	  use dynamic-linking ) && features=" dynamic-linking"
+
+	./build \
+		--compiler-options="${CFLAGS}" \
+		--linker-options="${LDFLAGS} -L/lib" \
+		-s /usr/lib/scm \
+		-F ${features:="none"} \
+		-h system \
+		-o scm || die
+
+	einfo "Building DLLs"
+	if use readline; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-h system \
+			-F edit-line \
+			-t dll || die
+	fi
+	if use ncurses ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-F curses \
+			-h system \
+			-t dll || die
+	fi
+	if use regex ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c rgx.c \
+			-h system \
+			-t dll || die
+	fi
+	if use gsubr ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c gsubr.c \
+			-h system \
+			-t dll || die
+	fi
+	if use ioext ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c ioext.c \
+			-h system \
+			-t dll || die
+	fi
+	if use posix; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c posix.c \
+			-h system \
+			-t dll || die
+	fi
+	if use sockets ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c socket.c \
+			-h system \
+			-t dll || die
+	fi
+	if use unix ; then
+		./build \
+			--compiler-options="${CFLAGS}" \
+			--linker-options="${LDFLAGS}" \
+			-c unix.c \
+			-h system \
+			-t dll || die
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	doinfo scm.info
+	doinfo hobbit.info
+}
+
+pkg_postinst() {
+	[ "${ROOT}" == "/" ] && pkg_config
+}
+
+pkg_config() {
+	einfo "Regenerating catalog..."
+	scm -e "(require 'new-catalog)"
+}