Bug #318217: Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 181 insertions, 2 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/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"
+}