diff options
| -rw-r--r-- | dev-scheme/scheme48/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch | 13 | ||||
| -rw-r--r-- | dev-scheme/scheme48/files/scheme48-1.5-as-needed.patch | 14 | ||||
| -rw-r--r-- | dev-scheme/scheme48/files/scheme48-1.8-as-needed+fix_destdir.patch | 31 | ||||
| -rw-r--r-- | dev-scheme/scheme48/scheme48-1.8-r1.ebuild | 61 | ||||
| -rw-r--r-- | dev-scheme/scheme48/scheme48-1.8.ebuild | 87 |
6 files changed, 103 insertions, 115 deletions
diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog index ba8d0fcdad5a..1cd381597659 100644 --- a/dev-scheme/scheme48/ChangeLog +++ b/dev-scheme/scheme48/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-scheme/scheme48 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.10 2008/04/27 12:09:44 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.11 2008/07/09 18:15:46 pchrist Exp $ + +*scheme48-1.8-r1 (09 Jul 2008) + + 09 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org> + -files/scheme48-1.3-as-needed.patch, -files/scheme48-1.5-as-needed.patch, + +files/scheme48-1.8-as-needed+fix_destdir.patch, -scheme48-1.8.ebuild, + +scheme48-1.8-r1.ebuild: + Apply patch for bug 227673, fixes DESTDIR, --as-needed and adds + -D_GNU_SOURCE.Thanks to Shaughan Lavine <shaughan@arizona.edu>. Upstream + informed. Old patches in FILESDIR, removed. 27 Apr 2008; Marijn Schouten <hkBst@gentoo.org> -scheme48-1.3-r1.ebuild, -scheme48-1.5.ebuild, -scheme48-1.6.ebuild: diff --git a/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch b/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch deleted file mode 100644 index bbabf1239b12..000000000000 --- a/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2007-01-06 12:12:17.000000000 +0000 -+++ Makefile.in 2007-01-06 12:13:11.000000000 +0000 -@@ -222,8 +222,8 @@ - $(EXTERNAL_INITIALIZERS) && \ - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ c/main.o $(OBJS) $(UNIX_OBJS) \ - /tmp/s48_external_$$$$.c \ -- $(LIBOBJS) $(LIBS) \ -- $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) && \ -+ $(LIBOBJS) \ -+ $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) $(LIBS) && \ - rm -f /tmp/s48_external_$$$$.c - - script-interpreter: c/script-interpreter.o diff --git a/dev-scheme/scheme48/files/scheme48-1.5-as-needed.patch b/dev-scheme/scheme48/files/scheme48-1.5-as-needed.patch deleted file mode 100644 index c9e9a48ca4ce..000000000000 --- a/dev-scheme/scheme48/files/scheme48-1.5-as-needed.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urwpN scheme48-1.5/Makefile.in scheme48-1.5.chg/Makefile.in ---- scheme48-1.5/Makefile.in 2007-01-06 14:14:10.000000000 -0400 -+++ scheme48-1.5.chg/Makefile.in 2007-01-20 00:54:53.000000000 -0400 -@@ -231,8 +231,8 @@ $(VM): c/main.o $(OBJS) $(UNIX_OBJS) $(L - $(EXTERNAL_INITIALIZERS) && \ - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ c/main.o $(OBJS) $(UNIX_OBJS) \ - /tmp/s48_external_$$$$.c \ -- $(LIBOBJS) $(LIBS) \ -- $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) && \ -+ $(LIBOBJS) \ -+ $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) $(LIBS) && \ - rm -f /tmp/s48_external_$$$$.c - - script-interpreter: c/script-interpreter.o diff --git a/dev-scheme/scheme48/files/scheme48-1.8-as-needed+fix_destdir.patch b/dev-scheme/scheme48/files/scheme48-1.8-as-needed+fix_destdir.patch new file mode 100644 index 000000000000..a6e050326871 --- /dev/null +++ b/dev-scheme/scheme48/files/scheme48-1.8-as-needed+fix_destdir.patch @@ -0,0 +1,31 @@ +--- Makefile.in.orig 2008-06-30 20:01:49.000000000 +0300 ++++ Makefile.in 2008-06-30 20:08:12.000000000 +0300 +@@ -8,7 +8,7 @@ + VPATH = @srcdir@ + CC = @CC@ + LD = @LD@ +-DEFS = @DEFS@ -D__COMPILING_SCHEME48_ITSELF__ -DS48_HOST_ARCHITECTURE=\"$(HOST_ARCHITECTURE)\" ++DEFS = @DEFS@ -D_GNU_SOURCE -D__COMPILING_SCHEME48_ITSELF__ -DS48_HOST_ARCHITECTURE=\"$(HOST_ARCHITECTURE)\" + LIBS = @LIBS@ + CFLAGS = @CFLAGS@ + CPPFLAGS = +@@ -286,8 +286,8 @@ + c/scheme48.exp c/scheme48.def + $(CC) $(LDFLAGS) $(LDFLAGS_VM) $(CFLAGS) -o $@ c/main.o \ + $(OBJS) $(GC_OBJS) $(UNIX_OBJS) \ +- $(LIBOBJS) $(LIBS) \ +- $(EXTERNAL_OBJECTS) ++ $(LIBOBJS) \ ++ $(EXTERNAL_OBJECTS) $(LIBS) + # Cygwin + if test -x /usr/bin/dlltool; then \ + dlltool --dllname $(VM).exe --output-lib $(VM).a --def $(srcdir)/c/scheme48.def; \ +@@ -409,7 +409,7 @@ + done + + inst-config-script: +- config_script=$(bindir)/$(CONFIG_SCRIPT) && \ ++ config_script=$(DESTDIR)$(bindir)/$(CONFIG_SCRIPT) && \ + sed -e 's,@incdir\@,$(incdir),g' \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@CC\@,$(CC),g' \ diff --git a/dev-scheme/scheme48/scheme48-1.8-r1.ebuild b/dev-scheme/scheme48/scheme48-1.8-r1.ebuild new file mode 100644 index 000000000000..c18f9bbb7d15 --- /dev/null +++ b/dev-scheme/scheme48/scheme48-1.8-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.8-r1.ebuild,v 1.1 2008/07/09 18:15:47 pchrist Exp $ + +inherit elisp-common multilib eutils flag-o-matic + +DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language." +HOMEPAGE="http://www.s48.org/" +SRC_URI="http://www.s48.org/${PV}/${P}.tgz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc emacs" + +DEPEND="emacs? ( virtual/emacs )" +RDEPEND="${DEPEND}" +SITEFILE=50scheme48-gentoo.el + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-as-needed+fix_destdir.patch" +} + +src_compile() { + econf || die "econf failed" + emake || die "emake failed" + if use emacs; then + elisp-compile "${S}"/emacs/cmuscheme48.el + fi +} + +src_install() { + # weird parallel failures! + emake -j1 DESTDIR="${D}" install || die + + if use emacs; then + elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + dodoc README INSTALL + if use doc; then + dodoc doc/manual.ps doc/manual.pdf doc/*.txt + dohtml -r doc/html/* + docinto src + dodoc doc/src/* + fi + + #this symlink clashes with gambit + rm "${D}"/usr/bin/scheme-r5rs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-scheme/scheme48/scheme48-1.8.ebuild b/dev-scheme/scheme48/scheme48-1.8.ebuild deleted file mode 100644 index e20d1628597a..000000000000 --- a/dev-scheme/scheme48/scheme48-1.8.ebuild +++ /dev/null @@ -1,87 +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/scheme48/scheme48-1.8.ebuild,v 1.1 2008/02/29 16:40:33 hkbst Exp $ - -inherit elisp-common multilib eutils flag-o-matic - -DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language." -HOMEPAGE="http://www.s48.org/" -SRC_URI="http://www.s48.org/${PV}/${P}.tgz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="doc emacs" - -DEPEND="emacs? ( virtual/emacs )" -RDEPEND="${DEPEND}" -SITEFILE=50scheme48-gentoo.el - -src_unpack() { - unpack ${A} - cd "${S}" - -# cp Makefile.in Makefile.in.old -# sed "s:lib=\\\\\"\`pwd\`\\\\\":lib=\$(libdir):" -i Makefile.in -# sed "/SHARE = /iecho \$(LIB)" -i Makefile.in -# sed "/LIB = /a@echo \$(LIB)" -i Makefile.in -# sed "/\t>\$\$script/a\tmkdir -p \$(DESTDIR)\$(bindir) \\" -i Makefile.in - - #improve parallel install -# sed "s:echo \"#!/bin/sh\":mkdir -p \$(DESTDIR)\$(bindir); echo \"#!/bin/sh\":" -i Makefile.in - - sed "s:config_script=:config_script=\$(DESTDIR):" -i Makefile.in -# sed "s:echo \"#!/bin/sh\":mkdir -p \$(dir $$script; echo \"#!/bin/sh\":" -i Makefile.in - - sed "s:\[-e \$(VM).a\];:\[ -e \$(VM).a \];:g" -i Makefile.in - -# sed "/for stub in env/amkdir -p \$(DESTDIR)\$(SHARE)/\$\$stub; \\\\" -i Makefile.in -# diff -u Makefile.in.old Makefile.in - -# sed -i "s:\`pwd\`:/usr/$(get_libdir)/scheme48:" Makefile.in -# sed -i "s:lib=\$(LIB):lib=/usr/$(get_libdir)/scheme48:" Makefile.in - # Set the correct values for the paths show by the man pages -# sed -i "s:=\$(bindir)=:=/usr/bin/=:" Makefile.in -# sed -i "s:=\$(LIB)=:=/usr/$(get_libdir)/scheme48=:" Makefile.in - # From Bug #127105 -# sed -i 's:`(cd $(srcdir) && echo $$PWD)`/scheme:'"/usr/$(get_libdir)/scheme48/:" Makefile.in -# sed -i "s:'\$(LIB)':'/usr/$(get_libdir)/\$(RUNNABLE)':" Makefile.in -# epatch "${FILESDIR}/scheme48-1.5-as-needed.patch" -} - -src_compile() { - econf || die "econf failed" - emake || die "emake failed" - if use emacs; then - elisp-compile "${S}"/emacs/cmuscheme48.el - fi -} - -src_install() { - # weird parallel failures! - emake -j1 DESTDIR="${D}" install || die - - if use emacs; then - elisp-install ${PN} emacs/cmuscheme48.el emacs/*.elc - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - dodoc README INSTALL - if use doc; then - dodoc doc/manual.ps doc/manual.pdf doc/*.txt - dohtml -r doc/html/* - docinto src - dodoc doc/src/* - fi - - #this symlink clashes with gambit - rm "${D}"/usr/bin/scheme-r5rs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} |