Bug #318217: Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 186 insertions, 3 deletions

diff --git a/sys-power/iasl/ChangeLog b/sys-power/iasl/ChangeLog
index b8860752918e..d5fc15d557d7 100644
--- a/sys-power/iasl/ChangeLog
+++ b/sys-power/iasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/iasl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.30 2009/10/23 07:48:13 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.31 2010/05/04 17:32:17 robbat2 Exp $
+
+*iasl-20100428 (04 May 2010)
+
+  04 May 2010; Robin H. Johnson <robbat2@gentoo.org> +iasl-20100428.ebuild,
+  +files/iasl-20100428-parallelmake.patch:
+  Bug #318217: Version bump.
 
 *iasl-20091013 (23 Oct 2009)
 
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index b1550ff3000f..69bbd1c37020 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,6 +1,7 @@
 AUX acpica-unix-20051216-buildfixup.patch 6542 RMD160 7609304a7f74b836f662486d5d0c44644767ea1f SHA1 99f44514a7fa48c10fb8a339b9b0968f2d6d7ea3 SHA256 a6a1dc686dc3ce14fc1035953c3b708474a7e134fd2dc8b4993b2d99f1261ba0
 AUX acpica-unix-20060512-buildfixup.patch 5876 RMD160 9efd45283e2aff4558849ee5f46dcc6d2de5c572 SHA1 5cce3c7617de36457fa72901879f9914f3aabbf4 SHA256 ca1b41b22aed0e9d2ae154e95fc4761f66c40c8d493a3d7163edf75e43c46361
 AUX iasl-20080701-parallelmake.patch 1598 RMD160 9ab6a9799c501cacbd62676057eb060db96a1f98 SHA1 6a683e1c573cb5c655785aec739cec27d0ac9f9c SHA256 77cbcd37bfd9c6804166d58faba53414ac3595ef4e81811915dbbd9a655dfdba
+AUX iasl-20100428-parallelmake.patch 1335 RMD160 fade9371bf132161243f9ae52aab2cecd1b04102 SHA1 60c954ac8625082bec553b487c10288746ac3867 SHA256 8ccf021c61911abb6a72dfe979aea4dfadb9f0d4249894aa6dcc0f17aec58d47
 AUX iasl-locale.patch 199 RMD160 db7cf5eebca6b43a81050c9b9a6c747efdbc4b1e SHA1 36226eba6a456714729b6faaa8ee3f1f94d575e1 SHA256 76cd2b49a00b279770b60fe0e8ba32fddd778e97518d77cf79cc2a9daecda654
 DIST acpica-unix-20060912.tar.gz 859242 RMD160 e8c10dd73912243e2b0e5b13b45342a963772c89 SHA1 77a1bbfaa0ad257e04a2aaa31b54a8ce1da5f2fa SHA256 f9a8bf089a639681f42e2a533b7004d2fdd9a4e3e3b6bbba9bd232c6a5acf773
 DIST acpica-unix-20080514.tar.gz 887758 RMD160 9824cd2643a134db37383849f1dfb1e44beecde0 SHA1 cb0ada08bc4acaaabbf23b7d1f2677bd9861073a SHA256 2b4b078e1234ea65b05db680566e9122c90dc0b754c9df087666bfbd3d70c086
@@ -9,12 +10,14 @@ DIST acpica-unix-20090123.tar.gz 926897 RMD160 a3079a3651f8320bf1411b95c4b46164a
 DIST acpica-unix-20090521.tar.gz 940506 RMD160 a69ee35de241aab09d5df99f47128860ded1e425 SHA1 70ad3dd5d95624dfb7e2f87673e2350052425f3a SHA256 612c58b4ff8dd142d6f1714f11efc174698f3f230abbc0cb7d09c2210873672c
 DIST acpica-unix-20090903.tar.gz 951383 RMD160 8e1520c8650d18d3b565d97af91413efc09cad49 SHA1 4c11d015dd7f1b9c9805588739275869f9b27d64 SHA256 dab28561abdb0a9082fa720e5510c9074cff460724304b5b61b637d4d27f8b64
 DIST acpica-unix-20091013.tar.gz 957187 RMD160 8208761bd280e9c9cafa9538d7ebb21ae947d473 SHA1 d47878529097fc7c2409f4f9f8eae71f21b8078b SHA256 26c105a5d551e76c450a368371394ca09f7dd8b7f876d0500a6ffec37a19bd45
+DIST acpica-unix-20100428.tar.gz 1039493 RMD160 59a8eaea119510cfa7dc0b8de40fbc9e848a015c SHA1 5ff8ec6b672ff71ae27e5ae700684c643d4dbdd6 SHA256 2e0cdd1bdc3c3fd3f701c19a8bb2e089e6feb23d3a19068b102ffa492b1dc4f5
 DIST acpitests-unix-20080514.tar.gz 1898223 RMD160 16075cb2f69ab0ef0b8388b79186c8c000a1722f SHA1 1a2f41fe75cc32d32661fcaa6f1c6e4aca3455eb SHA256 6e43826295874c6dbd17cd7e4fbacfcd6a2d1581626591c797ee5d94d59faa86
 DIST acpitests-unix-20080701.tar.gz 1880102 RMD160 23b7b14c6f518b14ce7786d12a55debe78b997f2 SHA1 6be97af198917a0168f89178316e8b79715a15ac SHA256 8dc21976da4d2ee8e4cff6cd6b807c5dcfbbdbe0ec0562d0d435b7563680bdb5
 DIST acpitests-unix-20090123.tar.gz 1880717 RMD160 a8aea45b2d5ec2050db4cb2d474c55ff14a196b1 SHA1 eccb018d4fad73be67a34ac0848b23be575518be SHA256 d46788816bf677601ad050280260db5f04ddd30f7e2b131e2fc4f26f256de290
 DIST acpitests-unix-20090521.tar.gz 1926171 RMD160 ee3083dc7b2109e0e0b43e0b12eec5865c09f1bb SHA1 9f76943ffdea9e7e4ffc4a4ec15caebfc3f6f447 SHA256 1b1d59bacafbb8b17e8cc5088595232875e2a6b7c2ad14ba716300509ad46d1b
 DIST acpitests-unix-20090903.tar.gz 1949552 RMD160 6efbdc0072c229b98015b9dd4300360984af1dda SHA1 844a84119a377f15e40db7e1a1afe17ed44d4428 SHA256 2b1766ee1e177a0ef397cb1302ae032171c842be4aed7d2cdb50cbeb84e73f06
 DIST acpitests-unix-20091013.tar.gz 1949552 RMD160 4c0b160c920844f19a9fa5d6392b63af7d73ba99 SHA1 4d362e13f1404fe0770d4c5f129f1f1c13a4a5a3 SHA256 1f220bca2e19b9728fc208f4951d37fa5dc5769e986bd91ac72a8b9e0c69e9e3
+DIST acpitests-unix-20100428.tar.gz 1928864 RMD160 9799d136c2a7abbb52d036e5adf2a7a2731ec439 SHA1 d472bb311b5600508f7192badb64f0920f7a6cac SHA256 fbee4a4aff7c82d3209d7320df5a5baae7c0f8167c18fdf7767def652f295bd9
 EBUILD iasl-20060912.ebuild 1164 RMD160 e0f61b613639cbd3d2272809c38ebe132b4fcea0 SHA1 759656f4c2522e274fc3cbcb7e3ac696e81cdc27 SHA256 d3cd2c4929fa374280f48780035854850c53c0bf3c9509bf4ef273fa2f484f36
 EBUILD iasl-20080514.ebuild 3253 RMD160 a903415646a6b1fef3c166b273a6ec43dcb2af71 SHA1 469b416c56a17d2ebb8867f54064e0cdc52e26aa SHA256 ef4a15c6d2db618573d6d237e0c5dc4a97783f6850cea50978cb3e028a564af8
 EBUILD iasl-20080701.ebuild 3346 RMD160 d59b04dd46599a24bfe0dea92c66baa3a440fb9c SHA1 3bd16cecb19a1db271dd76cca3a7620513b60bf3 SHA256 acd03b066ae6d247b6609eaffdd3f3d5e39b2d43040035138c53b56fbe7313a7
@@ -22,5 +25,6 @@ EBUILD iasl-20090123.ebuild 3447 RMD160 aa91fdccfa5dbf9507215cbdc6b483affb9c65d9
 EBUILD iasl-20090521.ebuild 3466 RMD160 7db34753b46723ea486a38ae6f879c10350272ff SHA1 79428ed8310e0b604ca9c8aa0dfc8f94bd9f6a20 SHA256 935d2c8eb13e6a71d6c2e1b2573e7d1cb6b02bc35a00aacf4407381b85bc30ab
 EBUILD iasl-20090903.ebuild 3507 RMD160 6d7b73c5d1e7b37b3f262e824b469c255501fe46 SHA1 74a62d68b17e96923e6122097e076d96d5160aba SHA256 cd34841d6698e168e4abb7397d45c4561094ae4d9e07c1c9ca297124bbc46e08
 EBUILD iasl-20091013.ebuild 3507 RMD160 ad42d1c7671d9b27026ee6d534b70990244a9b28 SHA1 5e5bd186d348635f4bc7d3f0fb8a1bc3a6a80edd SHA256 8b64105b723917e7c7c5da52dae77ef2817962ba5c15d7f48b27ed446e790ff3
-MISC ChangeLog 4821 RMD160 432d11f7e539be72ef87aeece6af4d27c1fdd1d1 SHA1 7dff7194df7a26b4fc4ab494772d8898793143de SHA256 3598596a90065315c70352684a09f04977ff122ce0bf17f13e4fd843ee863d8b
+EBUILD iasl-20100428.ebuild 3507 RMD160 4be7937c199d51741d324e9fb09adb8faee73bc1 SHA1 d7e1cf40a1115a765e9a7b02822176442fde5a3c SHA256 a61ba0fa89524bf64440fe6e4758a6ce6af9823a0b2a34613f48f8ca7f6c9eff
+MISC ChangeLog 5000 RMD160 585141745a8bf0a68f80129717e501ddf559c709 SHA1 cf3b3ec68e8a13dbee6029a6ced559d2642a6973 SHA256 b96dc04e2da634fd649b00471cb2926064201655ac860718e770eeb3d4a39226
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/sys-power/iasl/files/iasl-20100428-parallelmake.patch b/sys-power/iasl/files/iasl-20100428-parallelmake.patch
new file mode 100644
index 000000000000..b38091de3f74
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20100428-parallelmake.patch
@@ -0,0 +1,46 @@
+diff -Nuar acpica-unix-20100428.orig//compiler/Makefile acpica-unix-20100428//compiler/Makefile
+--- acpica-unix-20100428.orig//compiler/Makefile	2010-04-28 19:32:35.000000000 +0000
++++ acpica-unix-20100428//compiler/Makefile	2010-05-04 03:15:17.498007404 +0000
+@@ -1,7 +1,7 @@
+  
+ PROG=	iasl
+ SRCS=	\
+-	aslcompilerparse.c \
++	aslcompiler.y.c \
+ 	aslcompilerlex.c \
+ 	aslanalyze.c \
+ 	aslcodegen.c \
+@@ -117,6 +117,7 @@
+ 	../tables/tbutils.c \
+ 	../tables/tbxface.c \
+ 	../osunixxf.c
++OBJS = $(patsubst %.c,%.o, $(SRCS))
+ 
+ NOMAN=	YES
+ CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include 
+@@ -135,17 +136,19 @@
+ 
+ LDLIBS = -lpthread -lrt
+ 
+-aslmain : $(patsubst %.c,%.o, $(SRCS))
++aslmain : $(OBJS)
+ 	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) \
+ 		$(LOADLIBES) $(LDLIBS) -o iasl
+ 
+++$(OBJS): aslcompiler.y.h
++
+ CLEANFILES= y.output y.tab.c y.tab.h aslcompiler.y.h \
+-	aslcompilerparse.c aslcompilerlex.c iasl
++	aslcompiler.y.c aslcompilerlex.c iasl
++
++aslcompiler.y.h: aslcompiler.y.c
+ 
+-aslcompilerparse.c: aslcompiler.y
+-	${YACC} ${YFLAGS} aslcompiler.y
+-	cp y.tab.c aslcompilerparse.c
+-	cp y.tab.h aslcompiler.y.h
++aslcompiler.y.c: aslcompiler.y
++	${YACC} ${YFLAGS} aslcompiler.y -o aslcompiler.y.c
+ 
+ aslcompilerlex.c: aslcompiler.l
+ 	${LEX} ${LFLAGS} -PAslCompiler -oaslcompilerlex.c aslcompiler.l
diff --git a/sys-power/iasl/iasl-20100428.ebuild b/sys-power/iasl/iasl-20100428.ebuild
new file mode 100644
index 000000000000..9f564a28059c
--- /dev/null
+++ b/sys-power/iasl/iasl-20100428.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20100428.ebuild,v 1.1 2010/05/04 17:32:17 robbat2 Exp $
+
+inherit toolchain-funcs flag-o-matic eutils
+
+MY_PN=acpica-unix
+MY_P=${MY_PN}-${PV}
+MY_TESTS_P=${MY_PN/ca/tests}-${PV}
+DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
+HOMEPAGE="http://www.intel.com/technology/iapc/acpi/"
+SRC_URI="http://www.acpica.org/download/${MY_P}.tar.gz
+	test? ( http://www.acpica.org/download/${MY_TESTS_P}.tar.gz )"
+
+LICENSE="iASL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE="test"
+DEPEND="sys-devel/bison
+		sys-devel/flex"
+
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use test
+	then
+		ewarn 'You have selected USE="test". This will install the test results'
+		ewarn "into /usr/share/${PF}/, compressed as a tarball."
+		ewarn 'The tests themselves will only rarely die, but the test results'
+		ewarn 'are interesting for arch testing. The tests may take quite some'
+		ewarn 'time to complete.'
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/iasl-20100428-parallelmake.patch
+	epatch "${FILESDIR}"/iasl-locale.patch
+
+	sed -i -e 's:LDFLAGS=:LDLIBS+=:' \
+		"${S}"/compiler/Makefile || die "unable to fix compiler Makefile"
+}
+
+src_compile() {
+	local target bin
+	append-flags -fno-strict-aliasing
+
+	for target in compiler tools/acpisrc tools/acpixtract tools/acpiexec
+	do
+		einfo "Compiling in ${target}/"
+		cd "${S}"/${target}
+		case "${target}" in
+			compiler) bin=iasl;;
+			*) bin=${target#*/};;
+		esac
+
+		emake CC="$(tc-getCC)" || die "emake in ${target} failed"
+		einfo "Finished compiling ${target}"
+
+		mv ${bin} "${T}" || die "mv ${bin} failed"
+		einfo "Finished moving ${bin}"
+
+		make clean || die "make clean in ${target} failed"
+		einfo "Finished cleaning ${target}"
+
+		echo ${bin} >>"${T}"/binlist
+	done
+	einfo "$(<"${T}"/binlist)"
+}
+
+src_test() {
+	aslts_test
+	#aapits_test
+	#The aapits test currently fails, missing include probably.
+}
+
+src_install() {
+	local bin
+	for bin in $(<"${T}"/binlist) ; do
+		dobin "${T}"/${bin}
+	done
+	dodoc README changes.txt
+	if use test ; then
+		tb="${T}"/testresults.tar.bz2
+		export ASLTSDIR="$(<"${T}"/asltdir)"
+		ebegin "Creating Test Tarball"
+		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
+		eend $?
+		dodir /usr/share/${PF}
+		insinto /usr/share/${PF}
+		doins ${tb} || die "doins testresults.tar.bz2 failed"
+	fi
+
+}
+
+aslts_test() {
+	export	ASL="${T}"/iasl \
+		acpiexec="${T}"/acpiexec \
+		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
+	export	PATH="${PATH}:${ASLTSDIR}/bin"
+	echo "$ASLTSDIR" >"${T}"/asltdir
+	cd "${ASLTSDIR}"
+	edos2unix $(find . -type 'f') || die "edos2unix failed in aslts"
+	make install || die "make install aslts test failed"
+	chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed"
+
+	#The below Do commands runs the tests twice and then dies if the results aren't
+	#Identical.
+	Do 1 || die "failed Do 1"
+	Do 2 || die "failed Do 2"
+}
+
+aapits_test() {
+	mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed"
+	cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits"
+	edos2unix $(find . -type 'f') || die "edos2unix failed in aapits"
+	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
+	make || die "make in aapits failed"
+	cd asl || die "cd asl failed"
+	make || die "make in asl failed"
+	cd ../bin
+	./aapitsrun || die "aapitsrun failed"
+}