nasty hack to fix buildsystem's and portage variable collision, wrt bug #322527

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 225 insertions, 5 deletions

diff --git a/dev-scheme/chicken/ChangeLog b/dev-scheme/chicken/ChangeLog
index 909bc197fedc..282844ba2148 100644
--- a/dev-scheme/chicken/ChangeLog
+++ b/dev-scheme/chicken/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-scheme/chicken
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.40 2010/06/01 20:16:38 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.41 2010/06/07 19:21:59 pchrist Exp $
+
+  07 Jun 2010; Panagiotis Christopoulos <pchrist@gentoo.org>
+  chicken-4.5.0.ebuild, +files/chicken-4.5.0-r0-ARCH-to-zARCH-hack.patch:
+  nasty hack to fix buildsystem's and portage variable collision, wrt bug
+  #322527
 
 *chicken-4.5.0 (01 Jun 2010)
 
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index 7513d94cff04..80cee807400e 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,7 +1,8 @@
 AUX 50hen-gentoo.el 145 RMD160 88e497b36f696f5a575c02e16b86fc610f4d066c SHA1 eed85cf1aff39a5541e51c3582bef1121dbc8e9d SHA256 5b58b0cc226fd167fa8f2523846fa980c74df77513703dbd63f7f82167ec0f52
+AUX chicken-4.5.0-r0-ARCH-to-zARCH-hack.patch 5441 RMD160 b3aac629ae7e14b84de30167be376b3ccc986b9d SHA1 552215cce26aa60a3bcb68922dc90ead5cc0bf2c SHA256 a887a97531a57585894cae4ac6934ce88073525ef96e5ef5d6201421f93c1e6f
 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
 EBUILD chicken-3.3.0.ebuild 1569 RMD160 d2592ac4ea39f16e66e3a5ab12ea648dc5595564 SHA1 7f25b5d3b4f3ca71a4fe5ef8d2d247e512050558 SHA256 68e958a02a13039359584927a0d15e5b95280bcf1e12da97bad4dada0e8c17e7
-EBUILD chicken-4.5.0.ebuild 1324 RMD160 ac153ed0ac37ef732c8221eebb94158cb419fe2a SHA1 b505eed41e9a0bc9012decde96392d7081e71de2 SHA256 67ca271827638720a63b4d4504c1be3773bd7326426e65eac2fb4fca08768d39
-MISC ChangeLog 5793 RMD160 83bad435814649bfb7f3d71e3331e2ce95dcaade SHA1 e6559249a4936a6c36f069cc5b4220c327e1395b SHA256 e60cb5c129df40e34b00fc0a8733da55bb045d6520fa6dd21e746ba86033efc2
+EBUILD chicken-4.5.0.ebuild 1489 RMD160 127a87e38c2b0c57278c5353024305c81a058af0 SHA1 1b9b6d1589cfa946c3b9903042193ec501600ab5 SHA256 17c96121b7868373a92bd6249a5887bf85e0b8693e627d4a8002591a092d5899
+MISC ChangeLog 6014 RMD160 f7b9443f61b17b62cf88103fbdd95f2eef18a075 SHA1 71b591d8461bfc8cce0bcbe4ff97d8394fe39ff4 SHA256 497b60391e4c54cbe1b3b697632319bb74e365cd52195c9f5d520de2227da794
 MISC metadata.xml 525 RMD160 82f9c47c5af5d6924874670ce17c44c025b130d4 SHA1 935f520a583ad4f32663522537dbbfb1e9af7f07 SHA256 59bdf730d4d0fdfa81186f0876abb06ccfb034bec3dec9dfadcfe2d4321cffc8
diff --git a/dev-scheme/chicken/chicken-4.5.0.ebuild b/dev-scheme/chicken/chicken-4.5.0.ebuild
index a6eead0679df..93b4f2302b06 100644
--- a/dev-scheme/chicken/chicken-4.5.0.ebuild
+++ b/dev-scheme/chicken/chicken-4.5.0.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2010/06/01 20:16:38 chiiph Exp $
+# $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 multilib elisp-common
+inherit eutils multilib
 
 DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
 HOMEPAGE="http://www.call-with-current-continuation.org/"
@@ -20,6 +20,10 @@ DEPEND="sys-apps/texinfo
 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
 }
diff --git a/dev-scheme/chicken/files/chicken-4.5.0-r0-ARCH-to-zARCH-hack.patch b/dev-scheme/chicken/files/chicken-4.5.0-r0-ARCH-to-zARCH-hack.patch
new file mode 100644
index 000000000000..33527cd7f4cf
--- /dev/null
+++ b/dev-scheme/chicken/files/chicken-4.5.0-r0-ARCH-to-zARCH-hack.patch
@@ -0,0 +1,210 @@
+diff -ru a//defaults.make b//defaults.make
+--- a//defaults.make	2010-05-11 18:50:35.000000000 +0300
++++ b//defaults.make	2010-06-07 21:24:55.000000000 +0300
+@@ -31,7 +31,7 @@
+ STACKDIRECTION ?= 1
+ CROSS_CHICKEN ?= 0
+ 
+-ifeq ($(ARCH),x86-64)
++ifeq ($(zARCH),x86-64)
+ NURSERY ?= (256*1024)
+ else
+ NURSERY ?= (128*1024)
+@@ -272,10 +272,10 @@
+ POSIXFILE ?= posixunix
+ CHICKEN_CONFIG_H = chicken-config.h
+ 
+-ifneq ($(ARCH),)
++ifneq ($(zARCH),)
+ HACKED_APPLY ?= 1
+-APPLY_HACK_SRC ?= apply-hack.$(ARCH)$(ASM)
+-APPLY_HACK_OBJECT ?= apply-hack.$(ARCH)$(O)
++APPLY_HACK_SRC ?= apply-hack.$(zARCH)$(ASM)
++APPLY_HACK_OBJECT ?= apply-hack.$(zARCH)$(O)
+ endif
+ 
+ ifeq ($(HACKED_APPLY),)
+diff -ru a//Makefile.bsd b//Makefile.bsd
+--- a//Makefile.bsd	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.bsd	2010-06-07 21:24:25.000000000 +0300
+@@ -33,7 +33,7 @@
+ 
+ # platform configuration
+ 
+-ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
++zARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
+ 
+ # options
+ 
+diff -ru a//Makefile.cross-linux-mingw b//Makefile.cross-linux-mingw
+--- a//Makefile.cross-linux-mingw	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.cross-linux-mingw	2010-06-07 21:23:02.000000000 +0300
+@@ -34,7 +34,7 @@
+ # platform configuration
+ 
+ DLLSINPATH = 1
+-ARCH ?= x86
++zARCH ?= x86
+ HACKED_APPLY = 1
+ WINDOWS = 1
+ 
+@@ -72,7 +72,7 @@
+ 
+ # special files
+ 
+-APPLY_HACK_OBJECT = apply-hack.$(ARCH)$(O)
++APPLY_HACK_OBJECT = apply-hack.$(zARCH)$(O)
+ POSIXFILE = posixwin
+ 
+ # select default and internal settings
+diff -ru a//Makefile.cygwin b//Makefile.cygwin
+--- a//Makefile.cygwin	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.cygwin	2010-06-07 21:24:07.000000000 +0300
+@@ -33,7 +33,7 @@
+ 
+ # platform configuration
+ 
+-ARCH ?= x86
++zARCH ?= x86
+ HACKED_APPLY ?= 1
+ DLLSINPATH = 1
+ 
+@@ -76,7 +76,7 @@
+ # special files
+ 
+ CHICKEN_CONFIG_H = chicken-config.h
+-APPLY_HACK_OBJECT = apply-hack.$(ARCH)$(O)
++APPLY_HACK_OBJECT = apply-hack.$(zARCH)$(O)
+ 
+ # select default and internal settings
+ 
+diff -ru a//Makefile.linux b//Makefile.linux
+--- a//Makefile.linux	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.linux	2010-06-07 21:25:31.000000000 +0300
+@@ -33,7 +33,7 @@
+ 
+ # platform configuration
+ 
+-ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
++zARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
+ 
+ # options
+ 
+diff -ru a//Makefile.macosx b//Makefile.macosx
+--- a//Makefile.macosx	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.macosx	2010-06-07 21:23:51.000000000 +0300
+@@ -33,7 +33,7 @@
+ 
+ # platform configuration
+ 
+-ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
++zARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
+ 
+ # commands
+ 
+@@ -64,19 +64,19 @@
+ # special files
+ 
+ CHICKEN_CONFIG_H = chicken-config.h
+-APPLY_HACK_OBJECT = apply-hack.$(ARCH)$(O)
++APPLY_HACK_OBJECT = apply-hack.$(zARCH)$(O)
+ HACKED_APPLY ?= 1
+ 
+ # architectures
+ 
+-ifeq ($(ARCH),x86-64)
++ifeq ($(zARCH),x86-64)
+ C_COMPILER_OPTIONS += -m64
+ LINKER_OPTIONS += -m64
+ # Avoid bus error in install_name_tool
+ LINKER_LINK_SHARED_DLOADABLE_OPTIONS += -Wl,-headerpad -Wl,128
+ else
+ 
+-ifeq ($(ARCH),universal)
++ifeq ($(zARCH),universal)
+ C_COMPILER_OPTIONS += -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+ LINKER_OPTIONS += -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+ endif
+@@ -126,7 +126,7 @@
+ endif
+ 	cat chicken-defaults.h >>$@
+ 
+-ifeq ($(ARCH),universal)
++ifeq ($(zARCH),universal)
+ ifneq ($(HACKED_APPLY),)
+ # We undefine HACKED_APPLY in order to override rules.make
+ # with our own build rules.
+diff -ru a//Makefile.mingw b//Makefile.mingw
+--- a//Makefile.mingw	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.mingw	2010-06-07 21:25:59.000000000 +0300
+@@ -36,12 +36,12 @@
+ # platform configuration
+ 
+ DLLSINPATH = 1
+-ARCH ?= x86
++zARCH ?= x86
+ WINDOWS = 1
+ WINDOWS_SHELL = 1
+ UNAME_SYS = MinGW
+ 
+-ifeq ($(ARCH),x86)
++ifeq ($(zARCH),x86)
+ HACKED_APPLY ?= 1
+ else
+ HACKED_APPLY =
+@@ -79,7 +79,7 @@
+ # special files
+ 
+ CHICKEN_CONFIG_H = chicken-config.h
+-APPLY_HACK_OBJECT = apply-hack.$(ARCH)$(O)
++APPLY_HACK_OBJECT = apply-hack.$(zARCH)$(O)
+ POSIXFILE = posixwin
+ 
+ # select default and internal settings
+diff -ru a//Makefile.mingw-msys b//Makefile.mingw-msys
+--- a//Makefile.mingw-msys	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.mingw-msys	2010-06-07 21:26:33.000000000 +0300
+@@ -34,8 +34,8 @@
+ # platform configuration
+ 
+ DLLSINPATH = 1
+-ARCH ?= x86
+-ifeq ($(ARCH),x86)
++zARCH ?= x86
++ifeq ($(zARCH),x86)
+ HACKED_APPLY ?= 1
+ else
+ HACKED_APPLY =
+@@ -79,7 +79,7 @@
+ # special files
+ 
+ CHICKEN_CONFIG_H = chicken-config.h
+-APPLY_HACK_OBJECT = apply-hack.$(ARCH)$(O)
++APPLY_HACK_OBJECT = apply-hack.$(zARCH)$(O)
+ POSIXFILE = posixwin
+ 
+ # select default and internal settings
+diff -ru a//Makefile.solaris b//Makefile.solaris
+--- a//Makefile.solaris	2010-05-11 18:50:34.000000000 +0300
++++ b//Makefile.solaris	2010-06-07 21:25:45.000000000 +0300
+@@ -33,7 +33,7 @@
+ 
+ # platform configuration
+ 
+-ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
++zARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
+ 
+ # options
+ 
+diff -ru a//rules.make b//rules.make
+--- a//rules.make	2010-05-11 18:50:36.000000000 +0300
++++ b//rules.make	2010-06-07 21:26:10.000000000 +0300
+@@ -453,7 +453,7 @@
+ # assembler objects
+ 
+ ifneq ($(HACKED_APPLY),)
+-$(APPLY_HACK_OBJECT): $(SRCDIR)apply-hack.$(ARCH)$(ASM)
++$(APPLY_HACK_OBJECT): $(SRCDIR)apply-hack.$(zARCH)$(ASM)
+ 	$(ASSEMBLER) $(ASSEMBLER_OPTIONS) $(ASSEMBLER_COMPILE_OPTION) $< $(ASSEMBLER_OUTPUT)
+ endif
+