Bump to 1.41 contains various fixes for bug #334649, bug #455294, bug #455296, bug #455298, bug #455300 and bug #493694, thanks to Agostino Sarubbo (ago at gentoo dot org) for reporting the QA issues. Special thanks to Michael Mair-Keimberger (iamnr3) who made the patches in bug #455296. Prefix (darwin) keywords dropped cause logic inside the ebuild has changed and the ebuild needs rekeywording.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 3AC579B91BC03656)

3 files changed, 125 insertions, 1 deletions

diff --git a/dev-scheme/tinyscheme/ChangeLog b/dev-scheme/tinyscheme/ChangeLog
index 089bc6ba1420..5c8da1fa359f 100644
--- a/dev-scheme/tinyscheme/ChangeLog
+++ b/dev-scheme/tinyscheme/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-scheme/tinyscheme
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/ChangeLog,v 1.13 2013/09/07 15:05:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/ChangeLog,v 1.14 2013/12/11 13:27:11 pchrist Exp $
+
+*tinyscheme-1.41 (11 Dec 2013)
+
+  11 Dec 2013; Panagiotis Christopoulos <pchrist@gentoo.org>
+  +tinyscheme-1.41.ebuild, +files/tinyscheme-1.41-makefile.patch:
+  Bump to 1.41 contains various fixes for bug #334649, bug #455294, bug
+  #455296, bug #455298, bug #455300 and bug #493694, thanks to Agostino Sarubbo
+  (ago at gentoo dot org) for reporting the QA issues. Special thanks to
+  Michael Mair-Keimberger (iamnr3) who made the patches in bug #455296. Prefix
+  (darwin) keywords dropped cause logic inside the ebuild has changed and the
+  ebuild needs rekeywording.
 
   07 Sep 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Newline.
diff --git a/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch b/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch
new file mode 100644
index 000000000000..69fccb5e537a
--- /dev/null
+++ b/dev-scheme/tinyscheme/files/tinyscheme-1.41-makefile.patch
@@ -0,0 +1,50 @@
+diff -ru a/makefile b/makefile
+--- a/makefile	2013-04-14 20:08:33.000000000 +0000
++++ b/makefile	2013-12-11 11:59:58.688782748 +0000
+@@ -18,8 +18,7 @@
+ #AR= echo
+ 
+ # Unix, generally
+-CC = gcc -fpic -pedantic
+-DEBUG=-g -Wall -Wno-char-subscripts -O
++#CC = $(CC)
+ Osuf=o
+ SOsuf=so
+ LIBsuf=a
+@@ -27,12 +26,11 @@
+ LIBPREFIX=lib
+ OUT = -o $@
+ RM= -rm -f
+-AR= ar crs
++#AR= $(AR)
++ARFLAGS = crs
+ 
+ # Linux
+-LD = gcc
+-LDFLAGS = -shared
+-DEBUG=-g -Wno-char-subscripts -O
++#LD = $(CC)
+ SYS_LIBS= -ldl -lm
+ PLATFORM_FEATURES= -DSUN_DL=1
+ 
+@@ -71,16 +69,16 @@
+ all: $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)
+ 
+ %.$(Osuf): %.c
+-	$(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<
++	$(CC) -fpic $(CFLAGS) -I. -c $(FEATURES) $(DL_FLAGS) $<
+ 
+ $(LIBTARGET): $(OBJS)
+-	$(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)
++	$(CC) -shared $(LDFLAGS) -Wl,-soname=$@ -o $@ $(OUT) $(OBJS) $(SYS_LIBS)
+ 
+ scheme$(EXE_EXT): $(OBJS)
+-	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(SYS_LIBS)
+ 
+ $(STATICLIBTARGET): $(OBJS)
+-	$(AR) $@ $(OBJS)
++	$(AR) $(ARFLAGS) $@ $(OBJS)
+ 
+ $(OBJS): scheme.h scheme-private.h opdefines.h
+ dynload.$(Osuf): dynload.h
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
new file mode 100644
index 000000000000..f7334f9de0f0
--- /dev/null
+++ b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild,v 1.1 2013/12/11 13:27:11 pchrist Exp $
+
+EAPI="5"
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="Lightweight scheme interpreter"
+HOMEPAGE="http://tinyscheme.sourceforge.net"
+SRC_URI="mirror://sourceforge/tinyscheme/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+#KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-flags -DOSX
+		sed -i \
+			-e 's/SOsuf=so/SOsuf=dylib/' \
+			-e "s|-Wl,-soname=|-Wl,-install_name=${EPREFIX}/usr/lib/|" \
+			makefile || die
+	fi
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"\
+		AR=$(tc-getAR) CC=$(tc-getCC)
+}
+
+src_install() {
+
+	local tslib=libtinyscheme$(get_libname)
+	local tslibx=libtinyscheme$(get_libname ${PV})
+
+	newbin scheme ${PN}
+
+	newlib.so ${tslib} ${tslibx}
+	dosym ${tslibx} /usr/$(get_libdir)/${tslib}
+	dodoc Manual.txt || die "dodoc failed"
+
+	if use static-libs; then
+		dolib.a libtinyscheme.a
+	fi
+
+	# Bug 328967: dev-scheme/tinyscheme-1.39-r1 doesn't install header file
+	insinto /usr/include/
+	newins scheme.h tinyscheme.h
+
+	local INIT_DIR=/usr/share/${PN}/
+	insinto ${INIT_DIR}
+	doins init.scm
+	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}init.scm\"" > "${ED}"/etc/env.d/50tinyscheme
+}