Version bump and add patch to respect LDFLAGS wrt bug 333665

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

9 files changed, 80 insertions, 193 deletions

diff --git a/dev-scheme/stklos/ChangeLog b/dev-scheme/stklos/ChangeLog
index 6a6df3a0ee71..e689edd11533 100644
--- a/dev-scheme/stklos/ChangeLog
+++ b/dev-scheme/stklos/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-scheme/stklos
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/ChangeLog,v 1.8 2008/05/18 19:53:36 hkbst Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/ChangeLog,v 1.9 2010/10/06 03:15:06 chiiph Exp $
+
+*stklos-1.00 (06 Oct 2010)
+
+  06 Oct 2010; Tomas Touceda <chiiph@gentoo.org> -stklos-0.82.ebuild,
+  -stklos-0.95.ebuild, -stklos-0.96.ebuild, -stklos-0.97.ebuild,
+  stklos-0.98.ebuild, +stklos-1.00.ebuild, +files/stklos-ldflags.patch,
+  metadata.xml:
+  Version bump, add patch to respect LDFLAGS wrt bug 333665, and old
+  version clean up
+
+  29 Jun 2010; Tomas Touceda <chiiph@gentoo.org> -stklos-0.82.ebuild,
+  -stklos-0.95.ebuild, -stklos-0.96.ebuild, stklos-0.97.ebuild,
+  stklos-0.98.ebuild:
+  Old version cleanup, updated homepage.
 
 *stklos-0.98 (18 May 2008)
 
diff --git a/dev-scheme/stklos/files/stklos-ldflags.patch b/dev-scheme/stklos/files/stklos-ldflags.patch
new file mode 100644
index 000000000000..7f17bf421a26
--- /dev/null
+++ b/dev-scheme/stklos/files/stklos-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Naur stklos-0.98.orig/extensions/Makefile.in stklos-0.98/extensions/Makefile.in
+--- stklos-0.98.orig/extensions/Makefile.in	2008-05-03 22:43:28.000000000 +0200
++++ stklos-0.98/extensions/Makefile.in	2010-08-22 00:13:29.000000000 +0200
+@@ -423,7 +423,7 @@
+ ##############################################################################
+ # Specific rules for ldap.so
+ ldap.@SH_SUFFIX@: ldap.o
+-	@SH_LOADER@ @SH_LOAD_FLAGS@ $*.@SH_SUFFIX@ $< @LDAP_LIB@
++	$(CC) $(LDFLAGS) @SH_LOAD_FLAGS@ $*.@SH_SUFFIX@ $< @LDAP_LIB@
+ 	if test -f a.out  ;then mv a.out $*.@SH_SUFFIX@; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dev-scheme/stklos/metadata.xml b/dev-scheme/stklos/metadata.xml
index 06604f55e8ec..28121fec7862 100644
--- a/dev-scheme/stklos/metadata.xml
+++ b/dev-scheme/stklos/metadata.xml
@@ -7,6 +7,10 @@
 		<name>Marijn Schouten</name>
 	</maintainer>
 	<longdescription lang="en">
-STklos is a free Scheme system supporting most of the languages features defined in R5RS. The aim of this implementation is to be fast as well as light. The implementation is based on an ad-hoc Virtual Machine. STklos can also be compiled as a library and embedded in an application.
+		STklos is a free Scheme system supporting most of the languages 
+		features defined in R5RS. The aim of this implementation is to 
+		be fast as well as light. The implementation is based on an ad-hoc 
+		Virtual Machine. STklos can also be compiled as a library and 
+		embedded in an application.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-scheme/stklos/stklos-0.82.ebuild b/dev-scheme/stklos/stklos-0.82.ebuild
deleted file mode 100644
index adc222e7a53c..000000000000
--- a/dev-scheme/stklos/stklos-0.82.ebuild
+++ /dev/null
@@ -1,44 +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/stklos/stklos-0.82.ebuild,v 1.4 2007/04/24 14:52:06 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="http://www.stklos.org"
-SRC_URI="http://www.stklos.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="threads ldap gtk gnome"
-DEPEND="dev-libs/gmp dev-libs/libpcre dev-libs/boehm-gc
-		ldap? ( net-nds/openldap )
-		gtk? ( x11-libs/gtk+ )"
-#		gnome? ( )" # some using gnome should figure out what package will enable gnome support
-#silex and ``The Dominique Boucher LALR Package'' may also be deps, not in tree though
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use threads; then
-		built_with_use dev-libs/boehm-gc threads || die "boehm-gc must be built with threads use flag"
-	fi
-}
-
-src_compile() {
-# Inverses of options are treated like the options themselves.
-# Therefore don't use use_enable or use_with or manually invert options.
-
-#anyone interested in lurc threads? not in tree though
-	econf $(use_enable threads threads pthreads) $(use ldap && echo --enable-ldap) $(use !gtk && echo --disable-gtk) $(use !gnome && echo --disable-gnome)
-
-# Thus unfortunately the following doesn't work
-#	econf --enable-threads=pthreads $(use_enable ldap) $(use_enable gtk) $(use_enable gnome) \
-#		--without-gmp-light --without-provided-gc --without-provided-regexp
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-scheme/stklos/stklos-0.95.ebuild b/dev-scheme/stklos/stklos-0.95.ebuild
deleted file mode 100644
index 15233980dff3..000000000000
--- a/dev-scheme/stklos/stklos-0.95.ebuild
+++ /dev/null
@@ -1,41 +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/stklos/stklos-0.95.ebuild,v 1.1 2007/06/08 11:48:39 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="http://www.stklos.org"
-SRC_URI="http://www.stklos.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="threads ldap gtk gnome"
-DEPEND="dev-libs/gmp dev-libs/libpcre dev-libs/boehm-gc
-		ldap? ( net-nds/openldap )
-		gtk? ( x11-libs/gtk+ )"
-#		gnome? ( )" # someone using gnome should figure out what package will enable gnome support
-#silex and ``The Dominique Boucher LALR Package'' may also be deps, not in tree though
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use threads; then
-		built_with_use dev-libs/boehm-gc threads || die "boehm-gc must be built with threads use flag"
-	fi
-}
-
-src_compile() {
-#this used to be necessary
-#	econf $(use_enable threads threads pthreads) $(use ldap && echo --enable-ldap) $(use !gtk && echo --disable-gtk) $(use !gnome && echo --disable-gnome)
-
-#anyone interested in lurc threads? not in tree though
-	econf $(use_enable threads threads pthreads) $(use_enable ldap) $(use_enable gtk) $(use_enable gnome) \
-		--without-gmp-light --without-provided-gc --without-provided-regexp
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-scheme/stklos/stklos-0.96.ebuild b/dev-scheme/stklos/stklos-0.96.ebuild
deleted file mode 100644
index eee6a685f4a0..000000000000
--- a/dev-scheme/stklos/stklos-0.96.ebuild
+++ /dev/null
@@ -1,48 +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/stklos/stklos-0.96.ebuild,v 1.2 2007/11/29 07:15:27 opfer Exp $
-
-inherit eutils
-
-DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="http://www.stklos.org"
-SRC_URI="http://www.stklos.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="threads ldap gtk gnome"
-DEPEND="dev-libs/gmp dev-libs/libpcre dev-libs/boehm-gc
-		ldap? ( net-nds/openldap )
-		gtk? ( x11-libs/gtk+ )"
-#		gnome? ( )" # someone using gnome should figure out what package will enable gnome support
-#silex and ``The Dominique Boucher LALR Package'' may also be deps, not in tree though
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use threads; then
-		built_with_use dev-libs/boehm-gc threads || die "boehm-gc must be built with threads use flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	cp cinvoke/Makefile.templ cinvoke/Makefile.templ.old
-	sed "s:\[PREFIX\]:\$\(DESTDIR\)\[PREFIX\]:g" -i cinvoke/Makefile.templ
-	diff -u cinvoke/Makefile.templ.old cinvoke/Makefile.templ
-
-	epatch "${FILESDIR}"/multilib.patch
-}
-
-src_compile() {
-#anyone interested in lurc threads? not in tree though
-	econf $(use_enable threads threads pthreads) $(use_enable ldap) $(use_enable gtk) $(use_enable gnome) \
-		--without-gmp-light --without-provided-gc --without-provided-regexp
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-scheme/stklos/stklos-0.97.ebuild b/dev-scheme/stklos/stklos-0.97.ebuild
deleted file mode 100644
index 0bc209389c1d..000000000000
--- a/dev-scheme/stklos/stklos-0.97.ebuild
+++ /dev/null
@@ -1,40 +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/stklos/stklos-0.97.ebuild,v 1.1 2007/12/16 12:51:11 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="http://www.stklos.org"
-SRC_URI="http://www.stklos.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="threads ldap gtk gnome"
-DEPEND="dev-libs/gmp dev-libs/libpcre dev-libs/boehm-gc
-		ldap? ( net-nds/openldap )
-		gtk? ( x11-libs/gtk+ )"
-#		gnome? ( )" # someone using gnome should figure out what package will enable gnome support
-#silex and ``The Dominique Boucher LALR Package'' may also be deps, not in tree though
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use threads; then
-		built_with_use dev-libs/boehm-gc threads || die "boehm-gc must be built with threads use flag"
-	fi
-}
-
-src_compile() {
-#anyone interested in lurc threads? not in tree though
-	econf $(use_enable threads threads pthreads) $(use_enable ldap) $(use_enable gtk) $(use_enable gnome) \
-		--without-gmp-light --without-provided-gc --without-provided-regexp
-
-	emake || die "emake failed"
-}
-
-# call/cc & dynamic-wind test fails on amd64. already upstream
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-scheme/stklos/stklos-0.98.ebuild b/dev-scheme/stklos/stklos-0.98.ebuild
index 130ab740a9d4..235c5cac02e3 100644
--- a/dev-scheme/stklos/stklos-0.98.ebuild
+++ b/dev-scheme/stklos/stklos-0.98.ebuild
@@ -1,41 +1,37 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/stklos-0.98.ebuild,v 1.1 2008/05/18 19:53:36 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/stklos-0.98.ebuild,v 1.2 2010/10/06 03:15:06 chiiph Exp $
+
+EAPI="3"
 
 inherit eutils
 
 DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="http://www.stklos.org"
+HOMEPAGE="http://www.stklos.net"
 SRC_URI="http://www.stklos.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="threads ldap gtk gnome"
-DEPEND="dev-libs/gmp dev-libs/libpcre dev-libs/boehm-gc
-		ldap? ( net-nds/openldap )
-		gtk? ( x11-libs/gtk+ )"
+DEPEND="dev-libs/gmp
+	dev-libs/libpcre
+	dev-libs/boehm-gc[threads]
+	ldap? ( net-nds/openldap )
+	gtk? ( x11-libs/gtk+ )"
 #		gnome? ( )" # someone using gnome should figure out what package will enable gnome support
 #silex and ``The Dominique Boucher LALR Package'' may also be deps, not in tree though
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if use threads; then
-		built_with_use dev-libs/boehm-gc threads || die "boehm-gc must be built with threads use flag"
-	fi
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-ldflags.patch
 }
 
-src_compile() {
+src_configure() {
 #anyone interested in lurc threads? not in tree though
 #disable ffi while only bundled can be used
 	econf $(use_enable threads threads pthreads) $(use_enable ldap) $(use_enable gtk) $(use_enable gnome) \
 		--without-gmp-light --without-provided-gc --without-provided-regexp --disable-ffi
-# $(use_enable ffi) \
-	emake || die "emake failed"
 }
 
 # call/cc & dynamic-wind test fails on amd64. already upstream
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-scheme/stklos/stklos-1.00.ebuild b/dev-scheme/stklos/stklos-1.00.ebuild
new file mode 100644
index 000000000000..8e8a31fc3f79
--- /dev/null
+++ b/dev-scheme/stklos/stklos-1.00.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/stklos-1.00.ebuild,v 1.1 2010/10/06 03:15:06 chiiph Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="fast and light Scheme implementation"
+HOMEPAGE="http://www.stklos.net"
+SRC_URI="http://www.stklos.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="threads"
+
+# stklos bundles libffi, libgmp and libpcre is no system one is available, enforcing dependencies
+# PACKAGE-USED talks about boehm-gc 7.2alpha4, but 7.1 seems fine
+# Other deps are set according to that file
+DEPEND=">=dev-libs/boehm-gc-7.1[threads?]
+		dev-libs/gmp
+		dev-libs/libffi
+		dev-libs/libpcre
+"
+RDEPEND="${DEPEND}"
+
+# call/cc & dynamic-wind test fails on amd64. already upstream
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS \
+		|| die "dodocs failed"
+}