Fix bug #393561 with variable. Delete some old versions. Thanks to Erik Falor <ewfalor@gmail.com>

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 18 insertions, 59 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/Manifest b/dev-scheme/chicken/Manifest
index b14eb36a63af..07db1d1e86bd 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -2,12 +2,10 @@ AUX 50hen-gentoo.el 145 RMD160 88e497b36f696f5a575c02e16b86fc610f4d066c SHA1 eed
 AUX chicken-4.5.0-r0-ARCH-to-zARCH-hack.patch 5441 RMD160 b3aac629ae7e14b84de30167be376b3ccc986b9d SHA1 552215cce26aa60a3bcb68922dc90ead5cc0bf2c SHA256 a887a97531a57585894cae4ac6934ce88073525ef96e5ef5d6201421f93c1e6f
 AUX chicken-4.7.3-parallel-build.patch 3122 RMD160 7404d2a0475b1d1303cca8ccc7ab697de88b4e08 SHA1 59b79076259c8255e8a0403d507eeedd125e2169 SHA256 ae1be72f78144daf010d07a5c88e94c977f0288f1c95a3410da6a5120f2a7bfb
 DIST chicken-3.3.0.tar.gz 4228441 RMD160 74035304164d5c8c2f2ed7571662452df86725f2 SHA1 3af69007f664ccdef988863f1c6ac24405c5500c SHA256 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
-DIST chicken-4.5.0.tar.gz 2914920 RMD160 03d511d4a78add4fb3505a3c8eea5594fe9bb705 SHA1 67c1d791b59dc77fe5f41f19dc70fa2d5b86e4c3 SHA256 95919725411268614022ffc2426c826290cbebb6d574c1f2ebcaee5ac3ef9fd9
 DIST chicken-4.6.0.tar.gz 3019126 RMD160 f279b39b8294496a6e22b39b56d3fcf108d55405 SHA1 a801383786908022223c32337fb1c5814e6c26a5 SHA256 c55d1dadf9941b3efbc7be9181d5c7cbc304a20c614625fbf710c0acaa1cd245
 DIST chicken-4.7.3.tar.gz 3316152 RMD160 150cdd093e3a375db99f83a90ee1305c70f8f88c SHA1 47b139f8c4c6fa10af891ce36db24744973321c3 SHA256 00c82bc2208d74463a69356d2a30a3771f87048ea87fb9c024d464b3c9d4e230
 EBUILD chicken-3.3.0.ebuild 1569 RMD160 d2592ac4ea39f16e66e3a5ab12ea648dc5595564 SHA1 7f25b5d3b4f3ca71a4fe5ef8d2d247e512050558 SHA256 68e958a02a13039359584927a0d15e5b95280bcf1e12da97bad4dada0e8c17e7
-EBUILD chicken-4.5.0.ebuild 1489 RMD160 127a87e38c2b0c57278c5353024305c81a058af0 SHA1 1b9b6d1589cfa946c3b9903042193ec501600ab5 SHA256 17c96121b7868373a92bd6249a5887bf85e0b8693e627d4a8002591a092d5899
 EBUILD chicken-4.6.0.ebuild 1693 RMD160 8abcf4b00fd685d44ce984e0781266e5e6af409f SHA1 9ada0956d7cfe263d478375a07182f7fc01cf441 SHA256 baac199e060815f232b8947c00fea3d39e6e42622095111b0370f9d5c7187d6a
-EBUILD chicken-4.7.3.ebuild 2055 RMD160 2cb82cfeea65cfccf26bfc88f1db3fa446dd4f09 SHA1 ffbf340538cd142fac4dddd656c395ead87c9ed9 SHA256 9a1cedbebfd904268107bc4ce8f38277c824df2141932934be5570ffba55e0fb
-MISC ChangeLog 6403 RMD160 de2c702d7b5df47c321df9addf608d2d36341e15 SHA1 c0aab1fbff14979039c5c53ad69f028d213985a6 SHA256 21af65cb630a2cd880d47930d29619b58e3ecd8c4b0f71fb1cb9241111e8c0e7
+EBUILD chicken-4.7.3-r1.ebuild 2211 RMD160 cb7a50420a57303178349f9415de28f5808b2cdf SHA1 39862b2ddea037011fdf4865c581f6df68205659 SHA256 ec496c450194858301e12d6a2bc4fe265bed39a139b581d54fc5411e6fbed3c6
+MISC ChangeLog 6665 RMD160 8cd1974c4dba2dfbf4d0a4311a0f841a44f187f1 SHA1 91d1402d73a50f12f3294b0035342744a32fd8eb SHA256 be1bc7d6672e96f2607030d22c4a49ff6dc7f4e4634d091f0541e48d9416b4a4
 MISC metadata.xml 870 RMD160 c61ae7dfb522088d9aa3acaf785653754d6fb719 SHA1 082210ceb45222653d4a5203fadf26972f4e9333 SHA256 8608f5461e3c84d4034d7fdb21f85cfcaa7afdbf7603fce4f8b817edcd99da94
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"