diff options
| -rw-r--r-- | dev-scheme/chicken/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-scheme/chicken/chicken-4.5.0.ebuild | 48 | ||||
| -rw-r--r-- | dev-scheme/chicken/chicken-4.7.3-r1.ebuild (renamed from dev-scheme/chicken/chicken-4.7.3.ebuild) | 14 |
3 files changed, 16 insertions, 55 deletions
diff --git a/dev-scheme/chicken/ChangeLog b/dev-scheme/chicken/ChangeLog index 59d037096d11..a029a7d5b819 100644 --- a/dev-scheme/chicken/ChangeLog +++ b/dev-scheme/chicken/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-scheme/chicken # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.43 2011/12/07 19:31:03 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.44 2011/12/10 13:41:55 maksbotan Exp $ + +*chicken-4.7.3-r1 (10 Dec 2011) + + 10 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> -chicken-4.5.0.ebuild, + -chicken-4.7.3.ebuild, +chicken-4.7.3-r1.ebuild: + Fix bug #393561 with variable. Delete some old versions. Thanks to Erik Falor + <ewfalor@gmail.com> *chicken-4.7.3 (07 Dec 2011) diff --git a/dev-scheme/chicken/chicken-4.5.0.ebuild b/dev-scheme/chicken/chicken-4.5.0.ebuild deleted file mode 100644 index 93b4f2302b06..000000000000 --- a/dev-scheme/chicken/chicken-4.5.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.5.0.ebuild,v 1.2 2010/06/07 19:21:59 pchrist Exp $ - -EAPI="3" - -inherit eutils multilib - -DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler" -HOMEPAGE="http://www.call-with-current-continuation.org/" -SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86" -IUSE="emacs" - -DEPEND="sys-apps/texinfo - emacs? ( virtual/emacs )" -RDEPEND="emacs? ( virtual/emacs app-emacs/scheme-complete )" - -src_prepare() { - #Because chicken's Upstream have a custom to use variables that also - #portage uses :( eg. $ARCH in this case - epatch "${FILESDIR}/${P}-${PR}-ARCH-to-zARCH-hack.patch" - - sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make - sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make -} - -src_compile() { - OPTIONS="PLATFORM=linux PREFIX=/usr" - #upstream does not support parallel builds, bug 265881 - emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \ - HOSTSYSTEM="${CBUILD}" || die "emake failed" -} - -# chicken's testsuite is not runnable before install -# upstream has been notified of the issue -RESTRICT=test - -src_install() { - # bug #283158 - emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" install || die - - rm "${D}"/usr/share/doc/${P}/LICENSE || die - dodoc NEWS || die -} diff --git a/dev-scheme/chicken/chicken-4.7.3.ebuild b/dev-scheme/chicken/chicken-4.7.3-r1.ebuild index 0e5c7551b3e3..f8ccd20e1a7f 100644 --- a/dev-scheme/chicken/chicken-4.7.3.ebuild +++ b/dev-scheme/chicken/chicken-4.7.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.7.3.ebuild,v 1.1 2011/12/07 19:31:03 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.7.3-r1.ebuild,v 1.1 2011/12/10 13:41:55 maksbotan Exp $ EAPI="3" @@ -26,13 +26,15 @@ src_prepare() { fi #Because chicken's Upstream is in the habit of using variables that - #portage also uses :( eg. $ARCH in this case + #portage also uses :( eg. $ARCH and $A for f in defaults.make Makefile.bsd Makefile.cross-linux-mingw Makefile.cygwin \ Makefile.linux Makefile.macosx Makefile.mingw-msys Makefile.solaris \ rules.make - do - sed "s,ARCH,zARCH," -i ${f} || die "sed failed" - done + do + sed "s,ARCH,zARCH," -i ${f} || die "sed failed" + # bug #393561: installs /usr/lib/libchickenchicken-4.7.3.tar.gz (portage pollutes ${A} variable) + sed 's,A\(\s?=\|)\),chicken&,p' -i ${f} || die "sed failed" + done sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make || die "sed failed" sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make || die "sed failed" @@ -42,7 +44,7 @@ src_compile() { OPTIONS="PLATFORM=linux PREFIX=/usr" if use "parallel-build" then - ewarn "You enabled parralel-build use flag. This future is still" + ewarn "You enabled parralel-build use flag. This feature is still" ewarn "in testing, try without it before filing bugs" emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \ HOSTSYSTEM="${CBUILD}" || die "emake failed" |