Version bump, with new version of build cleanup patch.

Package-Manager: portage-2.1_rc3

5 files changed, 265 insertions, 16 deletions

diff --git a/sys-power/iasl/ChangeLog b/sys-power/iasl/ChangeLog
index 45516e0ca1c1..170018feb966 100644
--- a/sys-power/iasl/ChangeLog
+++ b/sys-power/iasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/iasl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.7 2006/02/20 04:04:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.8 2006/05/29 23:46:08 robbat2 Exp $
+
+*iasl-20060512 (29 May 2006)
+
+  29 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/acpica-unix-20060512-buildfixup.patch, +iasl-20060512.ebuild:
+  Version bump, with new version of build cleanup patch.
 
 *iasl-20060127 (20 Feb 2006)
 
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index 791034f3f6ff..b9fd88277c89 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,33 +1,56 @@
-MD5 c4c6ed000d51a2f2d8cdbeea7c15af5f ChangeLog 1364
-RMD160 629557446b9f50d6373f68ee36f39edf71050de4 ChangeLog 1364
-SHA256 596fed55b5e6ad870c0f60c70539c275d14d791a98fc882253463adaf97d53c2 ChangeLog 1364
+AUX acpica-unix-20051216-buildfixup.patch 6542 RMD160 7609304a7f74b836f662486d5d0c44644767ea1f SHA1 99f44514a7fa48c10fb8a339b9b0968f2d6d7ea3 SHA256 a6a1dc686dc3ce14fc1035953c3b708474a7e134fd2dc8b4993b2d99f1261ba0
 MD5 56a331d92e6f09c331eb8a7ddd2f603a files/acpica-unix-20051216-buildfixup.patch 6542
 RMD160 7609304a7f74b836f662486d5d0c44644767ea1f files/acpica-unix-20051216-buildfixup.patch 6542
 SHA256 a6a1dc686dc3ce14fc1035953c3b708474a7e134fd2dc8b4993b2d99f1261ba0 files/acpica-unix-20051216-buildfixup.patch 6542
-MD5 ada16f2385fb76e4e3ed7c37844211b3 files/digest-iasl-20050309 72
-RMD160 f88ed8a7a21877076f40b451ec0c3f10331d62d7 files/digest-iasl-20050309 72
-SHA256 86c95bfc5e7fca077a813bd3238d9508a93903bd603741b4b213f2a5737ec64f files/digest-iasl-20050309 72
-MD5 dd925783a88732c34474964006307d32 files/digest-iasl-20050513 72
-RMD160 d6921ae41cb2b1b4b66b469f52fbe3d9f3c90e02 files/digest-iasl-20050513 72
-SHA256 47af849c02d5a300fde743f6da89f85e8566301761eb88a35f2d589d19e4def6 files/digest-iasl-20050513 72
-MD5 8c9da9f366d0d2e4c6aeee492b735660 files/digest-iasl-20051216 72
-RMD160 fcc7fc554cdf9e0c55b409e53b8066948d8aa66a files/digest-iasl-20051216 72
-SHA256 904f3362a30dcee710356e9e79b74cc1c084e86b6577ac670f8b73885fb53a81 files/digest-iasl-20051216 72
-MD5 ff3ce0d64e337477b579331c645b1d96 files/digest-iasl-20060127 262
-RMD160 ab7c9857be8d259eb6551cbb90d323034466ca73 files/digest-iasl-20060127 262
-SHA256 9b81069a3aa11d325b59098360d621caefe94479e5367f59d80494af8010d14d files/digest-iasl-20060127 262
+AUX acpica-unix-20060512-buildfixup.patch 5876 RMD160 9efd45283e2aff4558849ee5f46dcc6d2de5c572 SHA1 5cce3c7617de36457fa72901879f9914f3aabbf4 SHA256 ca1b41b22aed0e9d2ae154e95fc4761f66c40c8d493a3d7163edf75e43c46361
+MD5 38b101b704dd1916cde3e301696257b2 files/acpica-unix-20060512-buildfixup.patch 5876
+RMD160 9efd45283e2aff4558849ee5f46dcc6d2de5c572 files/acpica-unix-20060512-buildfixup.patch 5876
+SHA256 ca1b41b22aed0e9d2ae154e95fc4761f66c40c8d493a3d7163edf75e43c46361 files/acpica-unix-20060512-buildfixup.patch 5876
+DIST acpica-unix-20050309.tar.gz 678656
+DIST acpica-unix-20050513.tar.gz 703127
+DIST acpica-unix-20051216.tar.gz 818242
+DIST acpica-unix-20060127.tar.gz 796319 RMD160 c083de89c78fddb9c42228c15dbc7f36d6055c94 SHA256 2a583ea24b04e44fba70cadff18d4c0d46a1d11ab5cb257e897c358b930d6129
+DIST acpica-unix-20060512.tar.gz 839039 RMD160 2ea95f7f46038c41cdf5cb56149c6a3207c45532 SHA1 eee21b225923c8e5c93b31073572b0f1dc2eb40e SHA256 29d35ce1f22c93983b91c07cc6c39ad522e77a9153cbb321fd32a9838e21eb3b
+EBUILD iasl-20050309.ebuild 700 RMD160 3f9be6c8ddacb46b818a62b33ebce938c2e10853 SHA1 8fb63b405d1cc0c82a4ebde6ebd79e82333abb9d SHA256 5579f0758d7fb4d2826febf1530141a764740e8e82625c3cfa8bef290b655793
 MD5 e6d1bf87bf02c26164239f9e31cb41ad iasl-20050309.ebuild 700
 RMD160 3f9be6c8ddacb46b818a62b33ebce938c2e10853 iasl-20050309.ebuild 700
 SHA256 5579f0758d7fb4d2826febf1530141a764740e8e82625c3cfa8bef290b655793 iasl-20050309.ebuild 700
+EBUILD iasl-20050513.ebuild 736 RMD160 3fb1b778c76e80f8db63b8191bb8278af852809d SHA1 b4f686a596a2d7a042ebb7d4553a7de39228b751 SHA256 88f77b0b72202710dfee64b7419e27fff2d03ac50b548f31847fc4319c8dd1f6
 MD5 ffd86cd542fe8e32753b4ad3c879259c iasl-20050513.ebuild 736
 RMD160 3fb1b778c76e80f8db63b8191bb8278af852809d iasl-20050513.ebuild 736
 SHA256 88f77b0b72202710dfee64b7419e27fff2d03ac50b548f31847fc4319c8dd1f6 iasl-20050513.ebuild 736
+EBUILD iasl-20051216.ebuild 922 RMD160 f24055cbd5bc94add86794a8d02e8d4b8caa6104 SHA1 551db306b8c0c0ee76b7b872aa9cd77a1ce87295 SHA256 bd2dffb9c79c42e14d85ab6d98e8d50ad1f5ed7071e647f2db83b54d3a3ffebf
 MD5 f71d0860e670723f7e964fd98b79e35f iasl-20051216.ebuild 922
 RMD160 f24055cbd5bc94add86794a8d02e8d4b8caa6104 iasl-20051216.ebuild 922
 SHA256 bd2dffb9c79c42e14d85ab6d98e8d50ad1f5ed7071e647f2db83b54d3a3ffebf iasl-20051216.ebuild 922
+EBUILD iasl-20060127.ebuild 1145 RMD160 01ae5cf43c949a0382adafc2a329f8fc13759b58 SHA1 25a6fe52261a7debd6ab8579a203bce3499bd067 SHA256 ee15a5b296ec893fad099ca1124ac4afc56936529e4c1c0b782899e8eace064b
 MD5 3fb8dc14207efab0a21862db3ae4ddcd iasl-20060127.ebuild 1145
 RMD160 01ae5cf43c949a0382adafc2a329f8fc13759b58 iasl-20060127.ebuild 1145
 SHA256 ee15a5b296ec893fad099ca1124ac4afc56936529e4c1c0b782899e8eace064b iasl-20060127.ebuild 1145
+EBUILD iasl-20060512.ebuild 1153 RMD160 0c7e96ae3212bb43f74ef124af508512f19adcda SHA1 52f9b8e5cfb464152615fa002549e6b7ff052abc SHA256 2497425de172f8030ff59328a2bceb5028cdffe004a165495e8098a0abb0a893
+MD5 af7eb4784da4367468e43395172dc73b iasl-20060512.ebuild 1153
+RMD160 0c7e96ae3212bb43f74ef124af508512f19adcda iasl-20060512.ebuild 1153
+SHA256 2497425de172f8030ff59328a2bceb5028cdffe004a165495e8098a0abb0a893 iasl-20060512.ebuild 1153
+MISC ChangeLog 1576 RMD160 5e5a5406cd51d0e1d2bb0b1d285a0542b1c64ee2 SHA1 e4fbfa55f07735b3a0f72173b47df8e2ca024b15 SHA256 5c23b13ee29c595d5df9f976413447e7c6298cff4a74490e3da1e64256258dbc
+MD5 c4521fbd9665de6da7f33b3d40ca29b4 ChangeLog 1576
+RMD160 5e5a5406cd51d0e1d2bb0b1d285a0542b1c64ee2 ChangeLog 1576
+SHA256 5c23b13ee29c595d5df9f976413447e7c6298cff4a74490e3da1e64256258dbc ChangeLog 1576
+MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223
+MD5 ada16f2385fb76e4e3ed7c37844211b3 files/digest-iasl-20050309 72
+RMD160 f88ed8a7a21877076f40b451ec0c3f10331d62d7 files/digest-iasl-20050309 72
+SHA256 86c95bfc5e7fca077a813bd3238d9508a93903bd603741b4b213f2a5737ec64f files/digest-iasl-20050309 72
+MD5 dd925783a88732c34474964006307d32 files/digest-iasl-20050513 72
+RMD160 d6921ae41cb2b1b4b66b469f52fbe3d9f3c90e02 files/digest-iasl-20050513 72
+SHA256 47af849c02d5a300fde743f6da89f85e8566301761eb88a35f2d589d19e4def6 files/digest-iasl-20050513 72
+MD5 8c9da9f366d0d2e4c6aeee492b735660 files/digest-iasl-20051216 72
+RMD160 fcc7fc554cdf9e0c55b409e53b8066948d8aa66a files/digest-iasl-20051216 72
+SHA256 904f3362a30dcee710356e9e79b74cc1c084e86b6577ac670f8b73885fb53a81 files/digest-iasl-20051216 72
+MD5 ff3ce0d64e337477b579331c645b1d96 files/digest-iasl-20060127 262
+RMD160 ab7c9857be8d259eb6551cbb90d323034466ca73 files/digest-iasl-20060127 262
+SHA256 9b81069a3aa11d325b59098360d621caefe94479e5367f59d80494af8010d14d files/digest-iasl-20060127 262
+MD5 aec61d95ffa95d87ec9f48016843333c files/digest-iasl-20060512 262
+RMD160 fd8b98d0b096d655a162f74494beedc701c8da68 files/digest-iasl-20060512 262
+SHA256 3b7d50d55a767197b910b4b5b5dd3bc5d04167d741894fb074ebe8e10d4280f9 files/digest-iasl-20060512 262
diff --git a/sys-power/iasl/files/acpica-unix-20060512-buildfixup.patch b/sys-power/iasl/files/acpica-unix-20060512-buildfixup.patch
new file mode 100644
index 000000000000..5a08da4f5aa6
--- /dev/null
+++ b/sys-power/iasl/files/acpica-unix-20060512-buildfixup.patch
@@ -0,0 +1,177 @@
+Patches by Robin H. Johnson <robbat2@gentoo.org> - 2006/05/29
+
+Previously using GCC you had to do make clean between making each of the
+seperate utilities. This was due to the fact that depending on what compiler
+defines were passed, the output was different.
+The following patch makes the output files reflect which utility they are
+compiled for, so they don't conflict, and no make clean is needed.
+
+This patch also adds a top level Makefile to allow quick building of the entire
+package.
+
+Also fixes parallel build issues in compiler/, where the yacc generated data
+might used before it was ready.
+
+diff -Nuar --exclude '*~' acpica-unix-20060512.orig/Makefile acpica-unix-20060512/Makefile
+--- acpica-unix-20060512.orig/Makefile	1969-12-31 16:00:00.000000000 -0800
++++ acpica-unix-20060512/Makefile	2006-05-29 16:28:55.560238471 -0700
+@@ -0,0 +1,31 @@
++PROGS= compiler/iasl  tools/acpiexec/acpiexec tools/acpixtract/acpixtract tools/acpisrc/acpisrc
++ifndef CFLAGS
++CFLAGS= -O2 -g
++endif
++# warnings always important
++CFLAGS += -Wall -Wstrict-prototypes
++
++all: $(PROGS)
++
++iasl: compiler
++acpiexec: tools/acpiexec
++acpixtract: tools/acpixtract
++acpisrc: tools/acpisrc
++
++SUBDIRS = $(dir $(PROGS))
++.PHONY: $(SUBDIRS) all
++
++compiler: compiler/iasl
++tools/acpiexec: tools/acpiexec/acpiexec
++tools/acpixtract: tools/acpixtract/acpixtract
++tools/acpisrc: tools/acpisrc/acpisrc
++
++
++$(PROGS):
++	CFLAGS="$(CFLAGS)" $(MAKE) -C $(dir $(@))
++
++clean: clean-subdirs
++clean-subdirs:
++	for dir in $(SUBDIRS); do \
++	  $(MAKE) -C $$dir clean; \
++	done
+diff -Nuar --exclude '*~' acpica-unix-20060512.orig/compiler/Makefile acpica-unix-20060512/compiler/Makefile
+--- acpica-unix-20060512.orig/compiler/Makefile	2006-05-12 14:13:31.000000000 -0700
++++ acpica-unix-20060512/compiler/Makefile	2006-05-29 16:34:25.050744637 -0700
+@@ -87,7 +87,7 @@
+ 	../osunixxf.c
+ 
+ NOMAN=	YES
+-CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include 
++CFLAGS+= -D_LINUX -DACPI_ASL_COMPILER -I../include 
+ 
+ #YACC=	yacc
+ YACC=	bison
+@@ -101,14 +101,22 @@
+ #CFLAGS+= -D_USE_BERKELEY_YACC
+ #.endif
+ 
+-aslmain : $(patsubst %.c,%.o, $(SRCS))
+-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) \
+-		$(LOADLIBES) $(LDLIBS) -o iasl
++OBJNAME = iasl
++OBJS= $(patsubst %.c,%.$(OBJNAME).o, $(SRCS))
++%.$(OBJNAME).o: %.c
++	$(COMPILE.c) $(OUTPUT_OPTION) $<
++
++$(PROG) : $(OBJS)
++	$(CC) $(LDFLAGS) $(OBJS) \
++		$(LOADLIBES) $(LDLIBS) -o $(PROG)
+ 
+ CLEANFILES= y.output y.tab.c y.tab.h aslcompiler.y.h \
+-	aslcompilerparse.c aslcompilerlex.c iasl
++	aslcompilerparse.c aslcompilerlex.c $(PROG)
+ 
+-aslcompilerparse.c: aslcompiler.y
++# force the YACC work to be done before any sources
++# as they all depend on it.
++$(SRCS): aslcompiler.y.h
++aslcompiler.y.h: aslcompiler.y
+ 	${YACC} ${YFLAGS} aslcompiler.y
+ 	cp y.tab.c aslcompilerparse.c
+ 	cp y.tab.h aslcompiler.y.h
+@@ -117,5 +125,5 @@
+ 	${LEX} ${LFLAGS} -PAslCompiler -oaslcompilerlex.c aslcompiler.l
+ 
+ clean : 
+-	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
++	rm -f $(CLEANFILES) $(OBJS)
+ 
+diff -Nuar --exclude '*~' acpica-unix-20060512.orig/tools/acpiexec/Makefile acpica-unix-20060512/tools/acpiexec/Makefile
+--- acpica-unix-20060512.orig/tools/acpiexec/Makefile	2006-05-12 14:13:43.000000000 -0700
++++ acpica-unix-20060512/tools/acpiexec/Makefile	2006-05-29 16:33:43.551484557 -0700
+@@ -131,14 +131,19 @@
+ 	../../osunixxf.c
+ 
+ 
+-CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../include 
++CFLAGS+= -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -I../../include 
+ 
++OBJNAME = acpiexec
++OBJS= $(patsubst %.c,%.$(OBJNAME).o, $(SRCS))
+ 
+-acpiexec : $(patsubst %.c,%.o, $(SRCS))
+-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
++%.$(OBJNAME).o: %.c
++	$(COMPILE.c) $(OUTPUT_OPTION) $<
++
++$(PROG): $(OBJS)
++	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+ 
+ clean : 
+-	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
++	rm -f $(CLEANFILES) $(OBJS)
+ 
+diff -Nuar --exclude '*~' acpica-unix-20060512.orig/tools/acpisrc/Makefile acpica-unix-20060512/tools/acpisrc/Makefile
+--- acpica-unix-20060512.orig/tools/acpisrc/Makefile	2006-05-12 14:13:44.000000000 -0700
++++ acpica-unix-20060512/tools/acpisrc/Makefile	2006-05-29 16:33:03.300322581 -0700
+@@ -4,14 +4,19 @@
+ SRCS=	ascase.c asconvrt.c asfile.c asmain.c asremove.c astable.c \
+         asutils.c osunixdir.c ../../common/getopt.c
+ 
+-CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
++CFLAGS+= -D_LINUX -DACPI_APPLICATION -I../../include 
+ 
++OBJNAME = acpi_application
++OBJS= $(patsubst %.c,%.$(OBJNAME).o, $(SRCS))
+ 
+-aslmain : $(patsubst %.c,%.o, $(SRCS))
+-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
++%.$(OBJNAME).o: %.c
++	$(COMPILE.c) $(OUTPUT_OPTION) $<
++
++$(PROG) : $(OBJS)
++	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+ 
+ clean : 
+-	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
++	rm -f $(CLEANFILES) $(OBJS)
+ 
+diff -Nuar --exclude '*~' acpica-unix-20060512.orig/tools/acpixtract/Makefile acpica-unix-20060512/tools/acpixtract/Makefile
+--- acpica-unix-20060512.orig/tools/acpixtract/Makefile	2006-05-12 14:13:44.000000000 -0700
++++ acpica-unix-20060512/tools/acpixtract/Makefile	2006-05-29 16:32:50.047281484 -0700
+@@ -3,14 +3,19 @@
+ PROG=	acpixtract
+ SRCS=	acpixtract.c
+ 
+-CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
++CFLAGS+= -D_LINUX -DACPI_APPLICATION -I../../include 
+ 
++OBJNAME = acpi_application
++OBJS= $(patsubst %.c,%.$(OBJNAME).o, $(SRCS))
+ 
+-acpixtract : $(patsubst %.c,%.o, $(SRCS))
+-	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
++%.$(OBJNAME).o: %.c
++	$(COMPILE.c) $(OUTPUT_OPTION) $<
++ 
++$(PROG) : $(OBJS)
++	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
+ 
+ CLEANFILES= $(PROG)
+ 
+ clean : 
+-	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
++	rm -f $(CLEANFILES) $(OBJS)
+ 
diff --git a/sys-power/iasl/files/digest-iasl-20060512 b/sys-power/iasl/files/digest-iasl-20060512
new file mode 100644
index 000000000000..a41ce607b35e
--- /dev/null
+++ b/sys-power/iasl/files/digest-iasl-20060512
@@ -0,0 +1,3 @@
+MD5 a1431c0be209b02b4d117c814aad8b44 acpica-unix-20060512.tar.gz 839039
+RMD160 2ea95f7f46038c41cdf5cb56149c6a3207c45532 acpica-unix-20060512.tar.gz 839039
+SHA256 29d35ce1f22c93983b91c07cc6c39ad522e77a9153cbb321fd32a9838e21eb3b acpica-unix-20060512.tar.gz 839039
diff --git a/sys-power/iasl/iasl-20060512.ebuild b/sys-power/iasl/iasl-20060512.ebuild
new file mode 100644
index 000000000000..4ab01da5fdeb
--- /dev/null
+++ b/sys-power/iasl/iasl-20060512.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20060512.ebuild,v 1.1 2006/05/29 23:46:08 robbat2 Exp $
+
+inherit toolchain-funcs eutils
+
+MY_PN=acpica-unix
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
+HOMEPAGE="http://www.intel.com/technology/iapc/acpi/"
+SRC_URI="http://www.intel.com/technology/iapc/acpi/downloads/${MY_P}.tar.gz"
+
+LICENSE="iASL"
+SLOT="0"
+KEYWORDS="~ppc ~x86 ~amd64"
+
+IUSE=""
+DEPEND="sys-devel/bison
+		sys-devel/flex"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${MY_PN}-20060512-buildfixup.patch
+}
+
+src_compile() {
+	# fix stupid flex 2.5.31 bug
+	emake -C compiler aslcompilerlex.c || die "emake aslcompilerlex.c failed"
+	sed -i.orig -e '/#define unput/s,yytext_ptr,AslCompilertext,' \
+		${S}/compiler/aslcompilerlex.c || die "sed failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin compiler/iasl tools/acpixtract/acpixtract tools/acpiexec/acpiexec tools/acpisrc/acpisrc
+	dodoc README changes.txt
+}