Version bump. Removed old. Added myself as maintainer

(Portage version: 2.2.9-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

25 files changed, 69 insertions, 1981 deletions

diff --git a/sys-power/iasl/ChangeLog b/sys-power/iasl/ChangeLog
index df4975794d65..c1a94547064d 100644
--- a/sys-power/iasl/ChangeLog
+++ b/sys-power/iasl/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-power/iasl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.41 2013/03/05 04:36:19 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/ChangeLog,v 1.42 2014/03/26 07:48:25 polynomial-c Exp $
+
+*iasl-20140214 (26 Mar 2014)
+
+  26 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -iasl-20060912.ebuild,
+  -iasl-20080514.ebuild, -iasl-20080701.ebuild, -iasl-20090521.ebuild,
+  -iasl-20090903.ebuild, -iasl-20091013.ebuild, -iasl-20100428.ebuild,
+  -iasl-20100528.ebuild, -iasl-20110922.ebuild, -iasl-20111123.ebuild,
+  -iasl-20120816.ebuild, -iasl-20121018.ebuild, +iasl-20140214.ebuild,
+  -files/acpica-unix-20051216-buildfixup.patch,
+  -files/acpica-unix-20060512-buildfixup.patch,
+  -files/iasl-20100428-parallelmake.patch,
+  -files/iasl-20110922-as-needed.patch, -files/iasl-20110922-locale.patch,
+  -files/iasl-20110922-parallelmake-001.patch,
+  -files/iasl-20110922-parallelmake-002.patch,
+  -files/iasl-20110922-parallelmake-003.patch,
+  +files/iasl-20140214-locale.patch, +files/iasl-20140214-nostrip.patch,
+  -files/iasl-locale.patch, metadata.xml:
+  Version bump. Removed old. Added myself as maintainer.
 
 *iasl-20130117-r1 (05 Mar 2013)
 
diff --git a/sys-power/iasl/files/acpica-unix-20051216-buildfixup.patch b/sys-power/iasl/files/acpica-unix-20051216-buildfixup.patch
deleted file mode 100644
index 27056b355689..000000000000
--- a/sys-power/iasl/files/acpica-unix-20051216-buildfixup.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-Patches by Robin H. Johnson <robbat2@gentoo.org> - 2005/12/27
-
-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/ and two compile issues with
-acpibin.
-diff -Naur acpica-unix-20051216/Makefile acpica-unix-20051216.new/Makefile
---- acpica-unix-20051216/Makefile	1969-12-31 16:00:00.000000000 -0800
-+++ acpica-unix-20051216.new/Makefile	2005-12-27 10:15:13.000000000 -0800
-@@ -0,0 +1,29 @@
-+PROGS= compiler/iasl  tools/acpiexec/acpiexec tools/acpibin/acpibin tools/acpisrc/acpisrc
-+ifndef CFLAGS
-+CFLAGS= -O2
-+endif
-+
-+all: $(PROGS)
-+
-+iasl: compiler
-+acpiexec: tools/acpiexec
-+acpibin: tools/acpibin
-+acpisrc: tools/acpisrc
-+
-+SUBDIRS = $(dir $(PROGS))
-+.PHONY: $(SUBDIRS) all
-+
-+compiler: compiler/iasl
-+tools/acpiexec: tools/acpiexec/acpiexec
-+tools/acpibin: tools/acpibin/acpibin
-+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 -Naur acpica-unix-20051216/compiler/Makefile acpica-unix-20051216.new/compiler/Makefile
---- acpica-unix-20051216/compiler/Makefile	2005-12-16 14:11:58.000000000 -0800
-+++ acpica-unix-20051216.new/compiler/Makefile	2005-12-27 10:07:34.000000000 -0800
-@@ -81,7 +81,7 @@
- 	../osunixxf.c
- 
- NOMAN=	YES
--CFLAGS+= -Wall -O2 -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include 
-+CFLAGS+= -Wall -Wstrict-prototypes -D_LINUX -DACPI_ASL_COMPILER -I../include 
- 
- #YACC=	yacc
- YACC=	bison
-@@ -95,14 +95,22 @@
- #CFLAGS+= -D_USE_BERKELEY_YACC
- #.endif
- 
--aslmain : $(patsubst %.c,%.o, $(SRCS))
--	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) \
-+%.iasl.o: %.c
-+	$(COMPILE.c) $(OUTPUT_OPTION) $<
-+
-+OBJS= $(patsubst %.c,%.iasl.o, $(SRCS))
-+
-+aslmain : $(OBJS)
-+	$(CC) $(LDFLAGS) $(OBJS) \
- 		$(LOADLIBES) $(LDLIBS) -o iasl
- 
- CLEANFILES= y.output y.tab.c y.tab.h aslcompiler.y.h \
- 	aslcompilerparse.c aslcompilerlex.c iasl
- 
--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
-@@ -111,5 +119,5 @@
- 	${LEX} ${LFLAGS} -PAslCompiler -oaslcompilerlex.c aslcompiler.l
- 
- clean : 
--	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
-+	rm -f $(CLEANFILES) $(OBJS)
- 
-diff -Naur acpica-unix-20051216/tools/acpibin/Makefile acpica-unix-20051216.new/tools/acpibin/Makefile
---- acpica-unix-20051216/tools/acpibin/Makefile	2005-12-16 14:12:10.000000000 -0800
-+++ acpica-unix-20051216.new/tools/acpibin/Makefile	2005-12-27 09:43:28.000000000 -0800
-@@ -12,14 +12,18 @@
- 	../../osunixxf.c \
-     ../../common/getopt.c
- 
--CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
-+CFLAGS+= -Wall -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
- 
-+%.acpibinsrc.o: %.c
-+	$(COMPILE.c) $(OUTPUT_OPTION) $<
- 
--acpibin : $(patsubst %.c,%.o, $(SRCS))
--	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
-+OBJS= $(patsubst %.c,%.acpibinsrc.o, $(SRCS))
-+
-+acpibin : $(OBJS)
-+	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
- 
- CLEANFILES= $(PROG)
- 
- clean : 
--	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
-+	rm -f $(CLEANFILES) $(OBJS)
- 
-diff -Naur acpica-unix-20051216/tools/acpibin/abcompare.c acpica-unix-20051216.new/tools/acpibin/abcompare.c
---- acpica-unix-20051216/tools/acpibin/abcompare.c	2005-12-16 14:12:10.000000000 -0800
-+++ acpica-unix-20051216.new/tools/acpibin/abcompare.c	2005-12-26 23:44:16.000000000 -0800
-@@ -116,6 +116,7 @@
-  *****************************************************************************/
- 
- #include "acpibin.h"
-+#define O_BINARY 0
- #include <stdlib.h>
- 
- 
-diff -Naur acpica-unix-20051216/tools/acpibin/acpibin.h acpica-unix-20051216.new/tools/acpibin/acpibin.h
---- acpica-unix-20051216/tools/acpibin/acpibin.h	2005-12-16 14:12:10.000000000 -0800
-+++ acpica-unix-20051216.new/tools/acpibin/acpibin.h	2005-12-26 23:44:02.000000000 -0800
-@@ -120,9 +120,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <fcntl.h>
--#include <io.h>
-+#include <sys/io.h>
- #include <ctype.h>
--#include <direct.h>
-+//#include <direct.h>
- #include <errno.h>
- 
- #include "acpi.h"
-diff -Naur acpica-unix-20051216/tools/acpiexec/Makefile acpica-unix-20051216.new/tools/acpiexec/Makefile
---- acpica-unix-20051216/tools/acpiexec/Makefile	2005-12-16 14:12:10.000000000 -0800
-+++ acpica-unix-20051216.new/tools/acpiexec/Makefile	2005-12-27 09:41:46.000000000 -0800
-@@ -130,14 +130,18 @@
- 	../../osunixxf.c
- 
- 
--CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../include 
-+CFLAGS+= -Wall -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../include 
- 
-+%.acpiexec.o: %.c
-+	$(COMPILE.c) $(OUTPUT_OPTION) $<
- 
--acpiexec : $(patsubst %.c,%.o, $(SRCS))
--	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
-+OBJS = $(patsubst %.c,%.acpiexec.o, $(SRCS))
-+
-+acpiexec : $(OBJS)
-+	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG)
- 
- CLEANFILES= $(PROG)
- 
- clean : 
--	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
-+	rm -f $(CLEANFILES) $(OBJS)
- 
-diff -Naur acpica-unix-20051216/tools/acpisrc/Makefile acpica-unix-20051216.new/tools/acpisrc/Makefile
---- acpica-unix-20051216/tools/acpisrc/Makefile	2005-12-16 14:12:11.000000000 -0800
-+++ acpica-unix-20051216.new/tools/acpisrc/Makefile	2005-12-27 09:43:21.000000000 -0800
-@@ -4,14 +4,18 @@
- SRCS=	ascase.c asconvrt.c asfile.c asmain.c asremove.c asutils.c osunixdir.c \
-         ../../common/getopt.c
- 
--CFLAGS+= -Wall -O2 -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
-+CFLAGS+= -Wall -D_LINUX -DACPI_APPLICATION -Wstrict-prototypes -I../../include 
- 
-+%.acpibinsrc.o: %.c
-+	$(COMPILE.c) $(OUTPUT_OPTION) $<
- 
--aslmain : $(patsubst %.c,%.o, $(SRCS))
--	$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
-+OBJS= $(patsubst %.c,%.acpibinsrc.o, $(SRCS))
-+
-+aslmain : $(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/acpica-unix-20060512-buildfixup.patch b/sys-power/iasl/files/acpica-unix-20060512-buildfixup.patch
deleted file mode 100644
index 5a08da4f5aa6..000000000000
--- a/sys-power/iasl/files/acpica-unix-20060512-buildfixup.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-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/iasl-20100428-parallelmake.patch b/sys-power/iasl/files/iasl-20100428-parallelmake.patch
deleted file mode 100644
index b38091de3f74..000000000000
--- a/sys-power/iasl/files/iasl-20100428-parallelmake.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/files/iasl-20110922-as-needed.patch b/sys-power/iasl/files/iasl-20110922-as-needed.patch
deleted file mode 100644
index a507f74ea9b2..000000000000
--- a/sys-power/iasl/files/iasl-20110922-as-needed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- tools/acpiexec/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/acpiexec/Makefile b/tools/acpiexec/Makefile
-index ba6b534..8435985 100644
---- a/tools/acpiexec/Makefile
-+++ b/tools/acpiexec/Makefile
-@@ -269,7 +269,7 @@ CWARNINGFLAGS += \
- # Rules
- #
- $(PROG) : $(OBJECTS)
--	$(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-+	$(CC) $(OBJECTS) $(LDFLAGS) -o $(PROG)
- 	$(COPYPROG)
- 
- %.o : %.c $(HEADERS) $(ACPICA_HEADERS)
diff --git a/sys-power/iasl/files/iasl-20110922-locale.patch b/sys-power/iasl/files/iasl-20110922-locale.patch
deleted file mode 100644
index 920c409b76d2..000000000000
--- a/sys-power/iasl/files/iasl-20110922-locale.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nuar acpica-unix-20110922.orig/compiler/Makefile acpica-unix-20110922/compiler/Makefile
---- acpica-unix-20110922.orig/compiler/Makefile	2011-09-22 15:59:34.000000000 +0000
-+++ acpica-unix-20110922/compiler/Makefile	2011-11-07 03:36:49.103281798 +0000
-@@ -258,10 +258,10 @@
- #
- # Bison/Flex configuration
- #
--YACC=    bison
-+YACC=    LC_ALL=C bison
- YFLAGS+= -v -d -y
- 
--LEX=     flex
-+LEX=     LC_ALL=C flex
- LFLAGS+= -i -s
- 
- #
diff --git a/sys-power/iasl/files/iasl-20110922-parallelmake-001.patch b/sys-power/iasl/files/iasl-20110922-parallelmake-001.patch
deleted file mode 100644
index b739dd8ab8e4..000000000000
--- a/sys-power/iasl/files/iasl-20110922-parallelmake-001.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 95b2e4c8cecc4ea469d4fd5cfe6927d631aade3a Mon Sep 17 00:00:00 2001
-From: Alphat <AlphatPC@gmail.com>
-Date: Sun, 9 Oct 2011 08:11:36 +0800
-Subject: [PATCH 1/2] iasl-20110922-parallelmake-001
-
----
- compiler/Makefile |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/compiler/Makefile b/compiler/Makefile
-index e08941a..c831064 100644
---- a/compiler/Makefile
-+++ b/compiler/Makefile
-@@ -276,14 +276,14 @@ $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
- aslcompilerlex.c :   $(ASL_COMPILER)/aslcompiler.l
- 	${LEX} ${LFLAGS} -PAslCompiler -o$@ $?
- 
--aslcompilerparse.c aslcompilerparse.h : $(ASL_COMPILER)/aslcompiler.y
--	${YACC} ${YFLAGS} -pAslCompiler -o$@ $?
-+aslcompilerparse.c aslcompilerparse.h aslcompilerparse.output : $(ASL_COMPILER)/aslcompiler.y
-+	${YACC} ${YFLAGS} -pAslCompiler -oaslcompilerparse.c $?
- 
- dtparserlex.c :      $(ASL_COMPILER)/dtparser.l
- 	${LEX} ${LFLAGS} -PDtParser -o$@ $?
- 
--dtparserparse.c dtparserparse.h : $(ASL_COMPILER)/dtparser.y
--	${YACC} ${YFLAGS} -pDtParser -o$@ $?
-+dtparserparse.c dtparserparse.h dtparserparse.output : $(ASL_COMPILER)/dtparser.y
-+	${YACC} ${YFLAGS} -pDtParser -odtparserparse.c $?
- 
- # Rename headers produced by bison/yacc
- 
-@@ -302,14 +302,14 @@ aslcompiler.y.h : aslcompilerparse.h
- # Cannot use the common compile warning flags since the C files are created
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
--aslcompilerlex.o :   aslcompilerlex.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+aslcompilerlex.o :   aslcompilerlex.c aslcompilerparse.h
-+	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
- aslcompilerparse.o : aslcompilerparse.c
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
- 
--dtparserlex.o :      dtparserlex.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+dtparserlex.o :      dtparserlex.c dtparserparse.h
-+	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
- dtparserparse.o :    dtparserparse.c
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
--- 
-1.7.7
-
diff --git a/sys-power/iasl/files/iasl-20110922-parallelmake-002.patch b/sys-power/iasl/files/iasl-20110922-parallelmake-002.patch
deleted file mode 100644
index 071ebd047d45..000000000000
--- a/sys-power/iasl/files/iasl-20110922-parallelmake-002.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 2a6a29863c735fd26bf12b1b55aff4f8bf736535 Mon Sep 17 00:00:00 2001
-From: Alphat <AlphatPC@gmail.com>
-Date: Sun, 9 Oct 2011 08:14:12 +0800
-Subject: [PATCH 2/2] iasl-20110922-parallelmake-002
-
----
- compiler/Makefile |   39 ++++++++++++++-------------------------
- 1 files changed, 14 insertions(+), 25 deletions(-)
-
-diff --git a/compiler/Makefile b/compiler/Makefile
-index c831064..b795e16 100644
---- a/compiler/Makefile
-+++ b/compiler/Makefile
-@@ -67,9 +67,9 @@ HEADERS = \
- 
- OBJECTS = \
- 	aslcompilerlex.o \
--	aslcompilerparse.o \
-+	aslcompiler.y.o \
- 	dtparserlex.o \
--	dtparserparse.o \
-+	dtparser.y.o \
- 	adfile.o \
- 	adisasm.o \
- 	adwalk.o \
-@@ -203,17 +203,15 @@ OBJECTS = \
- 
- INTERMEDIATES = \
- 	aslcompilerlex.c \
--	aslcompilerparse.c \
-+	aslcompiler.y.c \
- 	dtparserlex.c \
--	dtparserparse.c
-+	dtparser.y.c
- 
- MISC = \
--    aslcompilerparse.h \
- 	aslcompiler.y.h \
--	aslcompilerparse.output \
--    dtparserparse.h \
-+	aslcompiler.y.output \
- 	dtparser.y.h \
--	dtparserparse.output
-+	dtparser.y.output
- 
- CFLAGS+= \
-     -D$(HOST) \
-@@ -276,42 +274,33 @@ $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
- aslcompilerlex.c :   $(ASL_COMPILER)/aslcompiler.l
- 	${LEX} ${LFLAGS} -PAslCompiler -o$@ $?
- 
--aslcompilerparse.c aslcompilerparse.h aslcompilerparse.output : $(ASL_COMPILER)/aslcompiler.y
--	${YACC} ${YFLAGS} -pAslCompiler -oaslcompilerparse.c $?
-+aslcompiler.y.c aslcompiler.y.h aslcompiler.y.output : $(ASL_COMPILER)/aslcompiler.y
-+	${YACC} ${YFLAGS} -pAslCompiler -oaslcompiler.y.c $?
- 
- dtparserlex.c :      $(ASL_COMPILER)/dtparser.l
- 	${LEX} ${LFLAGS} -PDtParser -o$@ $?
- 
--dtparserparse.c dtparserparse.h dtparserparse.output : $(ASL_COMPILER)/dtparser.y
--	${YACC} ${YFLAGS} -pDtParser -odtparserparse.c $?
-+dtparser.y.c dtparser.y.h dtparser.y.output : $(ASL_COMPILER)/dtparser.y
-+	${YACC} ${YFLAGS} -pDtParser -odtparser.y.c $?
- 
- # Rename headers produced by bison/yacc
- 
--dtparser.y.h: dtparserparse.h
--	@echo Copy intermediate file:
--	@cp -f -v dtparserparse.h dtparser.y.h
--
--aslcompiler.y.h : aslcompilerparse.h
--	@echo Copy intermediate file:
--	@cp -f -v aslcompilerparse.h aslcompiler.y.h
--
--
- #
- # Parsers and Lexers - final object files
- #
- # Cannot use the common compile warning flags since the C files are created
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
--aslcompilerlex.o :   aslcompilerlex.c aslcompilerparse.h
-+aslcompilerlex.o :   aslcompilerlex.c aslcompiler.y.h
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
--aslcompilerparse.o : aslcompilerparse.c
-+aslcompiler.y.o : aslcompiler.y.c
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
- 
--dtparserlex.o :      dtparserlex.c dtparserparse.h
-+dtparserlex.o :      dtparserlex.c dtparser.y.h
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
--dtparserparse.o :    dtparserparse.c
-+dtparser.y.o :    dtparser.y.c
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
- 
- 
--- 
-1.7.7
-
diff --git a/sys-power/iasl/files/iasl-20110922-parallelmake-003.patch b/sys-power/iasl/files/iasl-20110922-parallelmake-003.patch
deleted file mode 100644
index 6eb18a810c6d..000000000000
--- a/sys-power/iasl/files/iasl-20110922-parallelmake-003.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Previous parallel make patches from user submission were not quite enough.
-
-Include this bit as well to fix up bison being invoked multiple times.
-
-X-Gentoo-Bug: 389799
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/389799
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar acpica-unix-20110922.orig/compiler/Makefile acpica-unix-20110922/compiler/Makefile
---- acpica-unix-20110922.orig/compiler/Makefile	2011-11-07 11:14:51.200026000 +0000
-+++ acpica-unix-20110922/compiler/Makefile	2011-11-07 11:20:03.490637284 +0000
-@@ -274,14 +274,18 @@
- aslcompilerlex.c :   $(ASL_COMPILER)/aslcompiler.l
- 	${LEX} ${LFLAGS} -PAslCompiler -o$@ $?
- 
--aslcompiler.y.c aslcompiler.y.h aslcompiler.y.output : $(ASL_COMPILER)/aslcompiler.y
--	${YACC} ${YFLAGS} -pAslCompiler -oaslcompiler.y.c $?
-+aslcompiler.y.c : $(ASL_COMPILER)/aslcompiler.y
-+	${YACC} ${YFLAGS} -pAslCompiler -o aslcompiler.y.c $?
-+aslcompiler.y.h : aslcompiler.y.c
-+aslcompiler.y.output : aslcompiler.y.c
- 
- dtparserlex.c :      $(ASL_COMPILER)/dtparser.l
- 	${LEX} ${LFLAGS} -PDtParser -o$@ $?
- 
--dtparser.y.c dtparser.y.h dtparser.y.output : $(ASL_COMPILER)/dtparser.y
--	${YACC} ${YFLAGS} -pDtParser -odtparser.y.c $?
-+dtparser.y.c : $(ASL_COMPILER)/dtparser.y
-+	${YACC} ${YFLAGS} -pDtParser -o dtparser.y.c $?
-+dtparser.y.h : dtparser.y.c
-+dtparser.y.output : dtparser.y.c
- 
- # Rename headers produced by bison/yacc
- 
-@@ -294,14 +298,14 @@
- aslcompilerlex.o :   aslcompilerlex.c aslcompiler.y.h
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
--aslcompiler.y.o : aslcompiler.y.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+aslcompiler.y.o : aslcompiler.y.c aslcompiler.y.h
-+	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
- dtparserlex.o :      dtparserlex.c dtparser.y.h
- 	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
--dtparser.y.o :    dtparser.y.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
-+dtparser.y.o :    dtparser.y.c dtparser.y.h
-+	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $<
- 
- 
- %.o : %.c $(HEADERS) $(ACPICA_HEADERS)
diff --git a/sys-power/iasl/files/iasl-20140214-locale.patch b/sys-power/iasl/files/iasl-20140214-locale.patch
new file mode 100644
index 000000000000..53a4d7c5efb1
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20140214-locale.patch
@@ -0,0 +1,14 @@
+--- acpica-unix-20140214/generate/unix/Makefile.config
++++ acpica-unix-20140214/generate/unix/Makefile.config
+@@ -211,9 +211,9 @@
+ #YACC=      byacc
+ #YFLAGS +=
+ #
+-YACC=       bison
++YACC=       LC_ALL=C bison
+ YFLAGS +=   -y
+ 
+-LEX=        flex
++LEX=        LC_ALL=C flex
+ LFLAGS +=   -i -s
+ 
diff --git a/sys-power/iasl/files/iasl-20140214-nostrip.patch b/sys-power/iasl/files/iasl-20140214-nostrip.patch
new file mode 100644
index 000000000000..0bb82df38c3c
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20140214-nostrip.patch
@@ -0,0 +1,11 @@
+--- acpica-unix-20140214/generate/unix/Makefile.config
++++ acpica-unix-20140214/generate/unix/Makefile.config
+@@ -52,7 +52,7 @@
+ INSTALLFLAGS ?= -f
+ else
+ INSTALL =    install
+-INSTALLFLAGS ?= -m 555 -s
++INSTALLFLAGS ?= -m 555
+ endif
+ 
+ INSTALLPROG = \
diff --git a/sys-power/iasl/files/iasl-locale.patch b/sys-power/iasl/files/iasl-locale.patch
deleted file mode 100644
index 5b9bd618dcbf..000000000000
--- a/sys-power/iasl/files/iasl-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acpica-unix/compiler/Makefile
-+++ acpica-unix/compiler/Makefile
-@@ -97,7 +97,7 @@
- #YACC=	yacc
- YACC=	bison
- YFLAGS+= -v -d
--LEX=	flex
-+LEX=	LC_ALL=C flex
- LFLAGS+= -i
- 
- #.if $(YACC) == "bison"
diff --git a/sys-power/iasl/iasl-20060912.ebuild b/sys-power/iasl/iasl-20060912.ebuild
deleted file mode 100644
index cffa6862a0c0..000000000000
--- a/sys-power/iasl/iasl-20060912.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20060912.ebuild,v 1.8 2011/09/30 16:56:57 vapier 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="amd64 ppc x86 ~x86-fbsd"
-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
-}
diff --git a/sys-power/iasl/iasl-20080514.ebuild b/sys-power/iasl/iasl-20080514.ebuild
deleted file mode 100644
index 72fe83972abc..000000000000
--- a/sys-power/iasl/iasl-20080514.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20080514.ebuild,v 1.6 2011/12/25 22:45:59 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 && has test ${FEATURES}; 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_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 -j1 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 && has test ${FEATURES}; 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')
-	make install || die "make install aslts test failed"
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || 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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20080701.ebuild b/sys-power/iasl/iasl-20080701.ebuild
deleted file mode 100644
index 25d0a0423734..000000000000
--- a/sys-power/iasl/iasl-20080701.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20080701.ebuild,v 1.5 2011/12/25 22:45:59 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 && has test ${FEATURES}; 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-20080701-parallelmake.patch
-}
-
-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 && has test ${FEATURES}; 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')
-	make install || die "make install aslts test failed"
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || 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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20090521.ebuild b/sys-power/iasl/iasl-20090521.ebuild
deleted file mode 100644
index 66276e9701a6..000000000000
--- a/sys-power/iasl/iasl-20090521.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20090521.ebuild,v 1.4 2011/12/25 22:45:59 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 && has test ${FEATURES}; 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-20080701-parallelmake.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 && has test ${FEATURES}; 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')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20090903.ebuild b/sys-power/iasl/iasl-20090903.ebuild
deleted file mode 100644
index 2c199247c557..000000000000
--- a/sys-power/iasl/iasl-20090903.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20090903.ebuild,v 1.3 2011/12/25 22:45:59 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 && has test ${FEATURES}; 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-20080701-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 && has test ${FEATURES}; 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')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20091013.ebuild b/sys-power/iasl/iasl-20091013.ebuild
deleted file mode 100644
index 3e879edde706..000000000000
--- a/sys-power/iasl/iasl-20091013.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20091013.ebuild,v 1.3 2011/12/25 22:45:59 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 && has test ${FEATURES}; 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-20080701-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 && has test ${FEATURES}; 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')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20100428.ebuild b/sys-power/iasl/iasl-20100428.ebuild
deleted file mode 100644
index 3aa1294e926f..000000000000
--- a/sys-power/iasl/iasl-20100428.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 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.3 2011/12/25 22:45:59 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 && has test ${FEATURES}; 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 && has test ${FEATURES}; 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')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20100528.ebuild b/sys-power/iasl/iasl-20100528.ebuild
deleted file mode 100644
index 0c9f6fb54577..000000000000
--- a/sys-power/iasl/iasl-20100528.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20100528.ebuild,v 1.3 2011/12/25 22:45:59 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 && has test ${FEATURES}; 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 && has test ${FEATURES}; 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')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20110922.ebuild b/sys-power/iasl/iasl-20110922.ebuild
deleted file mode 100644
index 751acb8cd8ed..000000000000
--- a/sys-power/iasl/iasl-20110922.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20110922.ebuild,v 1.3 2011/12/25 22:45:59 robbat2 Exp $
-
-EAPI=4
-
-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 && has test ${FEATURES}; 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_prepare() {
-	epatch "${FILESDIR}/${PN}-20110922-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-20110922-locale.patch"
-	epatch "${FILESDIR}/${PN}-20110922-parallelmake-001.patch"
-	epatch "${FILESDIR}/${PN}-20110922-parallelmake-002.patch"
-	epatch "${FILESDIR}/${PN}-20110922-parallelmake-003.patch"
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
-		|| die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local target bin
-
-	for target in compiler tools/acpi{bin,exec,help,names,src,xtract}
-	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 && has test ${FEATURES}; 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')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20111123.ebuild b/sys-power/iasl/iasl-20111123.ebuild
deleted file mode 100644
index 340859bb62c0..000000000000
--- a/sys-power/iasl/iasl-20111123.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20111123.ebuild,v 1.3 2012/04/26 16:38:16 aballier Exp $
-
-EAPI=4
-
-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 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use test && has test ${FEATURES}; 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_prepare() {
-	epatch "${FILESDIR}/${PN}-20110922-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-20110922-locale.patch"
-	epatch "${FILESDIR}/${PN}-20110922-parallelmake-001.patch"
-	epatch "${FILESDIR}/${PN}-20110922-parallelmake-002.patch"
-	epatch "${FILESDIR}/${PN}-20110922-parallelmake-003.patch"
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
-		|| die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local target bin
-
-	for target in compiler tools/acpi{bin,exec,help,names,src,xtract}
-	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 && has test ${FEATURES}; 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')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20120816.ebuild b/sys-power/iasl/iasl-20120816.ebuild
deleted file mode 100644
index b76d0335b97c..000000000000
--- a/sys-power/iasl/iasl-20120816.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20120816.ebuild,v 1.1 2012/09/07 23:11:29 robbat2 Exp $
-
-EAPI=4
-
-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="https://www.acpica.org/downloads/index.php"
-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 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use test && has test ${FEATURES}; 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_prepare() {
-	#epatch "${FILESDIR}/${PN}-20110922-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-20120816-locale.patch"
-	# Upstream has changed the buildsystem a lot, not sure if these are still
-	# needed
-	#epatch "${FILESDIR}/${PN}-20120816-parallelmake-001.patch"
-	#epatch "${FILESDIR}/${PN}-20110922-parallelmake-002.patch"
-	#epatch "${FILESDIR}/${PN}-20110922-parallelmake-003.patch"
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
-		|| die
-
-	export BITS=64
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cd acpica/generate/unix
-	emake BITS=${BITS}
-}
-
-src_test() {
-	aslts_test
-	#aapits_test
-	#The aapits test currently fails, missing include probably.
-}
-
-src_install() {
-	cd acpica/generate/unix
-	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
-	#local bin
-	#for bin in $(<"${T}"/binlist) ; do
-	#	dobin "${T}"/${bin}
-	#done
-	dodoc "${S}"/changes.txt
-	newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt
-	newdoc "${S}"/generate/unix/readme.txt unix-readme.txt
-	newdoc "${S}"/generate/lint/readme.txt lint-readme.txt
-	newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt
-
-	if use test && has test ${FEATURES}; 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="${S}"/generate/unix/bin${BITS}/iasl \
-		acpiexec="${S}"/generate/unix/bin${BITS}/acpiexec \
-		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
-	export	PATH="${PATH}:${ASLTSDIR}/bin"
-	echo "$ASLTSDIR" >"${T}"/asltdir
-	cd "${ASLTSDIR}"
-	edos2unix $(find . -type 'f')
-	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')
-	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"
-}
diff --git a/sys-power/iasl/iasl-20121018.ebuild b/sys-power/iasl/iasl-20140214.ebuild
index 2fdd552f4db6..4aea5c547f1a 100644
--- a/sys-power/iasl/iasl-20121018.ebuild
+++ b/sys-power/iasl/iasl-20140214.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20121018.ebuild,v 1.1 2013/01/31 09:37:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/iasl/iasl-20140214.ebuild,v 1.1 2014/03/26 07:48:25 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -10,9 +10,9 @@ 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="https://www.acpica.org/downloads/index.php"
-SRC_URI="http://www.acpica.org/download/${MY_P}.tar.gz
-	test? ( http://www.acpica.org/download/${MY_TESTS_P}.tar.gz )"
+HOMEPAGE="https://www.acpica.org/downloads/"
+SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
+	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
 
 LICENSE="iASL"
 SLOT="0"
@@ -36,20 +36,20 @@ pkg_setup() {
 }
 
 src_prepare() {
-	#epatch "${FILESDIR}/${PN}-20110922-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-20120816-locale.patch"
-	# Upstream has changed the buildsystem a lot, not sure if these are still
-	# needed
-	#epatch "${FILESDIR}/${PN}-20120816-parallelmake-001.patch"
-	#epatch "${FILESDIR}/${PN}-20110922-parallelmake-002.patch"
-	#epatch "${FILESDIR}/${PN}-20110922-parallelmake-003.patch"
+	epatch "${FILESDIR}/${PN}-20140214-locale.patch" \
+		"${FILESDIR}/${PN}-20140214-nostrip.patch"
 
 	find "${S}" -type f -name 'Makefile*' -print0 | \
 		xargs -0 -I '{}' \
 		sed -r -e 's:-\<Werror\>::g' -i '{}' \
 		|| die
 
-	export BITS=64
+	# BITS is tied to ARCH - please set appropriately if you add new keywords
+	if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then
+		export BITS=64
+	else
+		export BITS=32
+	fi
 }
 
 src_configure() {
@@ -89,14 +89,14 @@ src_install() {
 		eend $?
 		dodir /usr/share/${PF}
 		insinto /usr/share/${PF}
-		doins ${tb} || die "doins testresults.tar.bz2 failed"
+		doins ${tb}
 	fi
 
 }
 
 aslts_test() {
-	export	ASL="${S}"/generate/unix/bin${BITS}/iasl \
-		acpiexec="${S}"/generate/unix/bin${BITS}/acpiexec \
+	export	ASL="${S}"/generate/unix/bin/iasl \
+		acpiexec="${S}"/generate/unix/bin/acpiexec \
 		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
 	export	PATH="${PATH}:${ASLTSDIR}/bin"
 	echo "$ASLTSDIR" >"${T}"/asltdir
diff --git a/sys-power/iasl/metadata.xml b/sys-power/iasl/metadata.xml
index c6d862855eb5..bcbf77ce0ecd 100644
--- a/sys-power/iasl/metadata.xml
+++ b/sys-power/iasl/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+    <maintainer>
+	<email>robbat2@gentoo.org</email>
+    </maintainer>
+    <maintainer>
+	<email>polynomial-c@gentoo.org</email>
+	<name>Lars Wendler</name>
+    </maintainer>
 </pkgmetadata>