iasl: upgraded package to upstream
Upgraded sys-power/iasl to version 20180810 on amd64
BUG=None
TEST=iasl run on DUT
Change-Id: I5ec63fac7d03db847581acfc861191f05264fce3
Reviewed-on: https://chromium-review.googlesource.com/1754742
Tested-by: Justin TerAvest <teravest@chromium.org>
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@google.com>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
diff --git a/metadata/md5-cache/sys-power/iasl-20150717 b/metadata/md5-cache/sys-power/iasl-20180810
similarity index 77%
rename from metadata/md5-cache/sys-power/iasl-20150717
rename to metadata/md5-cache/sys-power/iasl-20180810
index a8b50c4..ee995e6 100644
--- a/metadata/md5-cache/sys-power/iasl-20150717
+++ b/metadata/md5-cache/sys-power/iasl-20180810
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare setup test
DEPEND=sys-devel/bison sys-devel/flex
DESCRIPTION=Intel ACPI Source Language (ASL) compiler
-EAPI=5
+EAPI=7
HOMEPAGE=https://www.acpica.org/downloads/
IUSE=test
KEYWORDS=*
LICENSE=iASL
SLOT=0
-SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20150717.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20150717.tar.gz )
+SRC_URI=http://www.acpica.org/sites/acpica/files/acpica-unix-20180810.tar.gz test? ( http://www.acpica.org/sites/acpica/files/acpitests-unix-20180810.tar.gz )
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e59c97a942db2b3cc88b160eb77d5799
+_md5_=08921df0ec3454cfcb11a158201f46f7
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index e46bf11..2e08a8d 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,2 +1,2 @@
-DIST acpica-unix-20150717.tar.gz 1502551 SHA256 74c906a9b38cd0690d1bb2c53b432367bc6f7573d925b7b3b0b0c6124cf31a10 SHA512 5f5dce50c2133623f80b92a5d2130d8515a82d59eb572a7055217de277d52c4fb4b770e632ef9f8dc9db20c727b758c95d5a877546ad93c375d86016cb56e088 WHIRLPOOL 856983d0f485a6193030d85f879944f7bf625b2a06cdfccdff101d410b8f5d8f8c812adc6f89317004de35ba2f4337bd700f71b32e01914db5decd3dc2ca6fbc
-DIST acpitests-unix-20150717.tar.gz 2008493 SHA256 dd12ae7b6122caeab6a89f23764ac559555ce461857f08fcabc1ed2f447a5350 SHA512 46b8bead2e5fee307c3eb1ac9a008b5dc598e07d71d66865628aec0d957e724c295066625d291dec20ed6eb13212dd847973481e8ee5fa98eff5a1cd30523922 WHIRLPOOL ff9c4541addfcdbda499823c12e1482849b4a1a2051266157995fdb9da5f16a869edf84a173893daa4b44c13e7e6a1b087e77acc895f8805d63211c0597fda5f
+DIST acpica-unix-20180810.tar.gz 1797634 BLAKE2B 66b1c53874a7fa898fb042d0aac6001e623bb056ef17de46fc5a8e3ee5667178c47b5d8ecec194ebd8d2b0bdf947b5c85a1874c5d11a9ba3307a85418856ebdb SHA512 f37d8e0f1393b87cbfd9c6607104b05f85386583e4e5a5bcdbd2f049c122592a53e7cd56fe7da75e93bf3a424921fbc9291e7a39e06de80e6403abe042f869cd
+DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54
diff --git a/sys-power/iasl/files/iasl-20080701-parallelmake.patch b/sys-power/iasl/files/iasl-20080701-parallelmake.patch
deleted file mode 100644
index ce51efe..0000000
--- a/sys-power/iasl/files/iasl-20080701-parallelmake.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: acpica-unix-20080701.old/compiler/Makefile
-===================================================================
---- acpica-unix-20080701.old.orig/compiler/Makefile
-+++ acpica-unix-20080701.old/compiler/Makefile
-@@ -1,7 +1,7 @@
-
-
- PROG= iasl
--SRCS= aslcompilerparse.c aslcompilerlex.c aslanalyze.c aslcodegen.c \
-+SRCS= aslcompiler.y.c aslcompilerlex.c aslanalyze.c aslcodegen.c \
- aslcompile.c aslerror.c aslfiles.c asllength.c \
- asllisting.c aslload.c asllookup.c aslmain.c aslmap.c aslopcodes.c \
- asloperands.c aslresource.c aslrestype1.c aslrestype2.c aslstartup.c \
-@@ -89,6 +89,7 @@ SRCS= aslcompilerparse.c aslcompilerlex.
- ../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
-@@ -105,17 +106,19 @@ YFLAGS+= -y -pAslCompiler
- #CFLAGS+= -D_USE_BERKELEY_YACC
- #.endif
-
--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-20120816-locale.patch b/sys-power/iasl/files/iasl-20120816-locale.patch
deleted file mode 100644
index 4255133..0000000
--- a/sys-power/iasl/files/iasl-20120816-locale.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar acpica-unix-20120816.orig/generate/unix/Makefile.config acpica-unix-20120816/generate/unix/Makefile.config
---- acpica-unix-20120816.orig/generate/unix/Makefile.config 2012-08-16 15:51:15.000000000 +0000
-+++ acpica-unix-20120816/generate/unix/Makefile.config 2012-09-07 18:31:41.887229126 +0000
-@@ -161,9 +161,9 @@
- #YACC= byacc
- #YFLAGS += -v -d
- #
--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-20140214-locale.patch b/sys-power/iasl/files/iasl-20140214-locale.patch
deleted file mode 100644
index 53a4d7c..0000000
--- a/sys-power/iasl/files/iasl-20140214-locale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/iasl-20150717.ebuild b/sys-power/iasl/iasl-20180810.ebuild
similarity index 87%
rename from sys-power/iasl/iasl-20150717.ebuild
rename to sys-power/iasl/iasl-20180810.ebuild
index e7ca1ae..a0f78d7 100644
--- a/sys-power/iasl/iasl-20150717.ebuild
+++ b/sys-power/iasl/iasl-20180810.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
+EAPI=7
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
+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/"
SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
@@ -23,7 +22,7 @@
sys-devel/flex"
RDEPEND=""
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
pkg_setup() {
if use test && has test ${FEATURES}; then
@@ -35,9 +34,13 @@
fi
}
+PATCHES=(
+ "${FILESDIR}/${PN}-20140828-locale.patch"
+ "${FILESDIR}/${PN}-20140214-nostrip.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}/${PN}-20140828-locale.patch" \
- "${FILESDIR}/${PN}-20140214-nostrip.patch"
+ default
find "${S}" -type f -name 'Makefile*' -print0 | \
xargs -0 -I '{}' \
@@ -57,20 +60,20 @@
}
src_compile() {
- cd acpica/generate/unix
+ cd generate/unix || die
emake BITS=${BITS}
}
src_test() {
aslts_test
- #aapits_test
#The aapits test currently fails, missing include probably.
+ #aapits_test
}
src_install() {
- cd acpica/generate/unix
+ cd generate/unix || die
emake install DESTDIR="${D}" BITS=${BITS}
- default_src_install
+ default
#local bin
#for bin in $(<"${T}"/binlist) ; do
# dobin "${T}"/${bin}
@@ -96,11 +99,12 @@
aslts_test() {
export ASL="${S}"/generate/unix/bin/iasl \
+ acpibin="${S}"/generate/unix/bin/acpibin \
acpiexec="${S}"/generate/unix/bin/acpiexec \
ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
export PATH="${PATH}:${ASLTSDIR}/bin"
echo "$ASLTSDIR" >"${T}"/asltdir
- cd "${ASLTSDIR}"
+ cd "${ASLTSDIR}" || die
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"
@@ -119,6 +123,6 @@
make || die "make in aapits failed"
cd asl || die "cd asl failed"
make || die "make in asl failed"
- cd ../bin
+ cd ../bin || die
./aapitsrun || die "aapitsrun failed"
}
diff --git a/sys-power/iasl/metadata.xml b/sys-power/iasl/metadata.xml
index f56b9a3..1673359 100644
--- a/sys-power/iasl/metadata.xml
+++ b/sys-power/iasl/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>robbat2@gentoo.org</email>
- </maintainer>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
</pkgmetadata>
