Update to EAPI=5.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 60 insertions, 40 deletions

diff --git a/sys-boot/yaboot-static/ChangeLog b/sys-boot/yaboot-static/ChangeLog
index 4731e9dcb7bc..5270940165a3 100644
--- a/sys-boot/yaboot-static/ChangeLog
+++ b/sys-boot/yaboot-static/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/yaboot-static
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.33 2015/05/17 03:58:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/ChangeLog,v 1.34 2015/05/17 03:59:27 vapier Exp $
+
+  17 May 2015; Mike Frysinger <vapier@gentoo.org>
+  files/new-ofpath-devspec.patch, yaboot-static-1.3.14-r1.ebuild,
+  yaboot-static-1.3.16-r1.ebuild, yaboot-static-1.3.17-r1.ebuild:
+  Update to EAPI=5.
 
   17 May 2015; Mike Frysinger <vapier@gentoo.org>
   yaboot-static-1.3.14-r1.ebuild, yaboot-static-1.3.16-r1.ebuild,
diff --git a/sys-boot/yaboot-static/Manifest b/sys-boot/yaboot-static/Manifest
index 48ab058a00a4..cf3ac4ab7b6a 100644
--- a/sys-boot/yaboot-static/Manifest
+++ b/sys-boot/yaboot-static/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX new-ofpath-devspec.patch 944 SHA256 8723dc88c09028e0724976aecad6f6b2a383996f74dcb1fc39ea70b171c2bc91 SHA512 c415c8cdda17c3a45a0eedddfc1c6a0426429cf285166358cba59b3efa47cce3a8a9bcf89bfcd3f58f2a14e7fa2a8f51f3e3f520f73377e5a8f133806ff50de7 WHIRLPOOL fe2144e6e6e2a3e459506f7107cf872c7be253acc0a553cea59a9dbc1df6c7a0c38ca323c847ccbf12f59fc4577fe34ba68a4d1739d5edddfe105316429d68b5
+AUX new-ofpath-devspec.patch 906 SHA256 cf71eb58b94d7aaa359a5e915c2fac1e2dc098cdfabf03e0c3c7eca69ec0f7f4 SHA512 e609c8bf8efc9a131f9706e2c6d9978b4b2759e25d11705dfde06f01954054c0217620db156cd3547284ffbcae5bb19e1adff5dc9c590ada05d716ff2286d203 WHIRLPOOL 181c004dc88b44bf22762e9cd6f783af6b79663055390f9cfb86ab0ac8cea23aad0d5460a4c10db5f00cdd84e166987276a091fdcb2b527277f20af2b04902f3
 AUX sysfs-ofpath.patch 3440 SHA256 6fe57d768b400cdbf7774ec127dcc61a1a7a098869c9708785cfbf16d6c72c45 SHA512 a4c9f89fb09e116f5f4bd0dfacd8b1d2e5f88733892f3f5041466380d499a2ade6fa0d96a0e7870c94ad1ef94cd7f4c609f6b6886a93e5e1b125c30f86a6a660 WHIRLPOOL 7d1f9d7240c8e2ccef922e440b9175089e72e06f2e435803309b009f3728ff1ad1463e13f2cbba8f4135eb0619cb0f612a22fc44e51aa3d1aec9e3f06d9838ac
 DIST yaboot-static-1.3.14.tbz2 154587 SHA256 e9632c87b4982cfbc614c6cc58e64740d8af5bd3c52ae78c0a9e0b1d062825f0 SHA512 e175fd3b31c8e26dd7177ab3c995015ebeb34f2877e1e64eabb3cbb21d0cb0e41e9c60c423e07ebb48f43ccd60ff1ff95a2001d0af220531be1bd25e04cf9bdc WHIRLPOOL 12841791df9e2a0a981d1f43ef7653629b5b3bddfa38426b398d662f0957739b50ac0ef7314f4a45eb354e95a85e99c89ba329bd8024fb54d1363f8d3fec4c6f
 DIST yaboot-static-1.3.16.tbz2 159798 SHA256 17ef850e3cdf614d45fff7d837960227d40f09071c418d3b69dd6b82d06f3135 SHA512 9aaf4432764631db923638d11d87868e9774ea6bec875110af1cd21a818c59781b7beebac4848a6a32aa592816fded214f5c6b159ecbd1654a0c6051c42dd580 WHIRLPOOL 7c80cb8d0f7238d0b21a34cae938cca30fa5f911dcf862d06a3af5bf591b3d997222fc4dfa9ee3727a51c43f8ecd630f8d392fe926aeecf789aaab594919ddf1
 DIST yaboot-static-1.3.17.tbz2 162142 SHA256 88f5f080bf99624c969bbf7e04cee86a1699142bd58396f1c2ac027b3385ae3f SHA512 23caf8d7308aba7402f13fc558e2182f63317fa7cf502899503247d2d2b8741b8327b447a50edce775eed0ea02fed5b675f4b40c8bafd956cbd25662c9f2ad72 WHIRLPOOL 9a38838c746c058c036f9ce755f2d573aca548a2a2c6a036ffd7f059e911f7e482779bc0bc0ad2f27039358564762705f09278f367e5fbc05828959d7e1b963f
-EBUILD yaboot-static-1.3.14-r1.ebuild 999 SHA256 1e8fb3903101d414375c52861350d0c4887a0e81c2d6c96012a9d204150ecdb1 SHA512 47a6ec3c4e8474edffff8d16ec774325d7190fd724a7815c333a424144beb9cfc3938da5971bc1e61de41cb9997d20ae3507c1e15faf242fbfe02a353fd6eb9a WHIRLPOOL f7b2a3255e87af5d997d88793e87bf97941cc3bbbb68095c9f3be6e7453aa40cc09b4994cbde69f950e40db3254bb536f43508929ce6e7d02c43eec325fbee4e
-EBUILD yaboot-static-1.3.16-r1.ebuild 850 SHA256 e2d368fb4de4594f4bcc4a223f900c0adedc7a29b74c2aea3be95ecbc877066f SHA512 b280ce1bb42bedc9b84491f314f5811356770a58271529521f0fbb00dba120b131cb856713e46213806462f85d16034761a4da5f7593ef74bcd451ce734fd83c WHIRLPOOL 31ba583f5b23d91f8b49ec41b515ca588ce84d30ac5e6775d9ed77c62f6e37176da739592dd50033470aa69329c2891d4924aed6604b00f694c2ab792168e25a
-EBUILD yaboot-static-1.3.17-r1.ebuild 965 SHA256 0add8c1f6831fa0d89dd74fc59ab008b1d349b396dc47ad8ee090754f277b040 SHA512 7601dcc9a87ab7709090f06c0000dc8c106c92817493529e0859db9829f3fc4c841dfd8e46bbe62dd98c7ff90b65b82e8222b8d34d102386a24e53a64cb8842e WHIRLPOOL 7cfd466d05dfedc8cc84e914934d3c4540155eb9e564a166dbd6d57ec05b51622f0eabc70476b1ead0c7426e94b44f3825b2697f86473f458cf8416473f657c2
-MISC ChangeLog 5454 SHA256 2a7af531038631371ab9d13ddcae8c2c6a64aa5cd2bf059e95ef746c500b6b5e SHA512 335bd4e653d7623ac114388ebd42eb286660747de2b80d3694b1ffe2d6df055018dacf0a88f70aa423ac325700eb3142d17bcf28f59c0a27cce46b3627a86867 WHIRLPOOL c4bc271e17503f5a7fb0139f99ef814197465d4614de1d86204034eb4f9be753092348d26392945dbffcd711c7c4feb8665101564afab9bc9d4fc04327d3228f
+EBUILD yaboot-static-1.3.14-r1.ebuild 1017 SHA256 b22448be13dd87b2d3309474bf00f0a44e14465c7d9f0a4215c592a478cbd6cb SHA512 0f730ead05f4c53693aea667ce96662d9dcfd72f7e734e7687dac4d7637ba2539eca9421b1630e56e90c76935c3cfe390ef5799944ba013e0f7bbdee673506f3 WHIRLPOOL ab9e610f0dd6d11f4a61e2fb8bca53407d9846b6b7a4f998a9c35ffe978fb1beb37c2c4913e3000d963a0fdd231f2b66d662c65842b0e8b9bba41c827c2b37a0
+EBUILD yaboot-static-1.3.16-r1.ebuild 863 SHA256 73f7b2b7e794f8a7f6e4a90211771d88d9f976c4ebe76b84474f958fa9b8c347 SHA512 bc178c81d8731b277c068d6700b747c02421de47ebc2bb565c1af1a2415ddfdce75f56eb3792529a253ae6c8d8eb618e1d3e72e89a693693f02420931e850411 WHIRLPOOL c11bea77d1e051493227f45d12950210f7bc9e0a45074d8f71a5ff2f3fa517e97e15f9f0401e9b21b08e9ef620a936d4c6a599aa5e2ad992be33dc70a0035b4c
+EBUILD yaboot-static-1.3.17-r1.ebuild 929 SHA256 16e70fbdf0eeb056140b1762db763eeb20613a74ba75d7df7ab3df57389ad75a SHA512 c9f8e36a78427326da477c9728cab88f1d7ad05e38714b475499b70050bc8d5b2852cc32219b81a50999f8325505411dbb67579dbda3e59da994f0cb98ed25c7 WHIRLPOOL 769b3540944f5e82146a14b9f4bc524ada71bd89e29223cb09ca830b2255d5081999b4ae999a7011e50b6a3ad35518bde3f8ff21e66fb62671f9495549e8cea5
+MISC ChangeLog 5657 SHA256 58d3d77fd5ad6ac6ab8e73d719f51e85e63a1bd06505d165c0819ca8c3ce7948 SHA512 64f8674fd371c0979ec1c02c11ad451dfbdb2146967c1f4fe103532392eafada2f59d1e94e5ba8c45534b437f3656885e6662121a076bc334e7e62a1ae8aea0b WHIRLPOOL 2f1921d656f2e4419d5533260ede918d3defa5f3d90dcb79205134e0b92decb9bf9df1b7f3eeb0cf6a969cccdebd788504e01f7fd80947fbe16b6d58c847b3ce
 MISC metadata.xml 158 SHA256 32350539e29186f246efdc4907b750f94365676eaf013b11832b2a7015e8e218 SHA512 2b3864962e76bbd67cfb69646b7d711d56b4683d06affa2a6368a2f929cc7a07519db67aeba222992481ff45f933685af3ece8c14369564758c1415159bcd67d WHIRLPOOL b385a4234685513271b55e7533c02a268c12138467441c9fbf2e2f4bc7516d04495fbc006fba3022244f0a5f71a7e85136166195a6355a9a7f2bf763d0857b77
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVWBHaAAoJEPGu1DbS6WIAoPkP/0dq4+uWkjzVwGGWljXdlPWt
-off0VjEraoGfaNyy7krNefL7Baan5O41GEbzV+1nR/CzO7GoILYCuWIUzGPTa60H
-0fKKjNCRRKjT3mr6GL4/sWA6e9/iIvAJGylwVXR93Wglkhpv4wU2kehqevcTwwiE
-/APgZT1XkolL4J1GrpNpBrByDLkaGfZ4whx/bGUoMnVOoRsqRLwaxjjo/vEx86/d
-D2TJUNbae9nShhwzYJQk8CWfVEV0vFa1JbVzNYAnb/IQbT7EOT5ehB1SIo06n6rP
-J9ENX7iU4DBq2OsaHeeWvU8XQnMtEdpcOIYrhGXu0E8RZfPJH6ShX9hyvw2Mv61s
-c9RMRYcnhimFQ/krfdleoeRrs4wqpxnGVHU/iuJHpgxWeixUUrx+2oZOyL+61y6+
-s0IE+4j+RPm3dMunB3WIyyzqagxqxgjw0XmrUAHBzbNpz0gpZUWSStTWbBcsAy3C
-9AwFuItuwvp8FhdxX9H7y9VxsVrJ/086Ve2F5ypzkIISz0YZV1Q51VIWLSiF40rO
-nMG931kZq22KhVvZWTE6Dxl7O7ol/meOUGBWyIDW9jmvqSHfkCNLn6/aC0QK4SOW
-BnofKemxcCMaNwGVIIWCbhaeEhh2hhZXkf20fm0mrYJgXge1Itt3/aGBAo+sTWeu
-quHjd65HtCKfWzkZosTq
-=dSTU
+iQIcBAEBCAAGBQJVWBIgAAoJEPGu1DbS6WIAAr8P/1gxQTAQqFvqNupTeuu23/vA
+kyHfIwbV7csOt0jR3QISptAWwce1Jl936l1xyppD60Uyr+FH4Cf/PdTsdpXZ9H9P
+RYASvxCJwr3aqjZAMSevpnEPmpj2x1UTsnbODwmrUuvthARCPuHY+naspgnbRLf1
+qmXxz3dDiVvrzOVPsOERj1N3Q4LN1UVKO3nhK8tfEcj/8+GV92jrFwLIPcWjv916
+emzH6QhfwHvopnTFX2StdaY60NmMoqzB+okeAvZlBiwELeE9j6LtrpPcX9UnEcxv
+hoDcD3rzmYAQdC+4mKffTzhZ0qcfDB4rjo7LryrB1qqfi7WEh5OLM1fIenB8KbNA
+n18LV34DLULQtEEkGsldI//yeRzsz+fDS5vbXwFBIwd4+boac25MBhB942nkOqDE
+EJVYi7r/druGCUZL29RGlYSA6Jr1ST0dC0gX7/hxWmPQaCKhtvGzBmjiVzaqqS/e
+Qiut3mjS0whlxq78mvFg3PcbxWzf6tzovN91B4LD4XkqXazbOKjC7/3sBFduv4nI
+Yjyz5wfm9dk5IaQwB3JC3rKL5qZDo4qfoGYC91d/ID8J0jVjW+M49M+eMWJkjFB7
+5P9TXI/9+TaxPmaGJSGcf73YP695Oz/lCOVDRGNvjoZ0rAj5X5JQhXMS4XJDqryB
+Do0dDVVzG8OfTD7BA5/+
+=IPAo
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
index eec840ee10fe..f225e8e1bb4b 100644
--- a/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
+++ b/sys-boot/yaboot-static/files/new-ofpath-devspec.patch
@@ -1,5 +1,7 @@
---- usr/sbin/ofpath.bak	2012-05-09 12:24:51.709911981 -0400
-+++ usr/sbin/ofpath	2012-05-09 12:32:19.661560544 -0400
+Fix the devspec path on newer kernels
+
+--- usr/sbin/ofpath
++++ usr/sbin/ofpath
 @@ -85,11 +85,20 @@
  [ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
  
@@ -16,7 +18,7 @@
 +	### /dev/sd* on kernel <3.3
 +	CONTROLLER_PATH=$(cat ${DEVPATH}/../../../devspec);
 +elif [ -e "${DEVPATH}/../../../../devspec" ]; then
-+	### /dev/sd* on kernel 3.3+	
++	### /dev/sd* on kernel 3.3+
 +	CONTROLLER_PATH=$(cat ${DEVPATH}/../../../../devspec);
 +else
 +	### None of the above...
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild
index c6c6ecce8dda..9a6df03362b2 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild
@@ -1,17 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild,v 1.7 2015/05/17 03:58:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.14-r1.ebuild,v 1.8 2015/05/17 03:59:27 vapier Exp $
+
+# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
+
+EAPI="5"
 
 inherit eutils
 
 DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-
 HOMEPAGE="http://yaboot.ozlabs.org/"
 SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ppc ppc64"
 IUSE="ibm"
+
 DEPEND="sys-apps/powerpc-utils"
 RDEPEND="!sys-boot/yaboot
 	!ibm? (
@@ -20,21 +25,20 @@ RDEPEND="!sys-boot/yaboot
 		sys-fs/mac-fdisk
 	)"
 
+S=${WORKDIR}
+
 QA_PRESTRIPPED="
 	/usr/lib/yaboot/yaboot
 	/usr/lib/yaboot/yaboot.chrp
 	/usr/lib/yaboot/addnote
 "
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/sysfs-ofpath.patch
 }
 
 src_install() {
 	# don't blow away the user's old conf file
-	mv "${WORKDIR}/etc/yaboot.conf" "${WORKDIR}/etc/yaboot.conf.unconfigured" \
-		|| die "mv failed"
-	cp -pPR "${WORKDIR}"/* "${D}" || die "cp failed"
+	mv "${WORKDIR}"/etc/yaboot.conf{,.sample} || die
+	cp -pPR "${WORKDIR}"/* "${D}" || die
 }
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild
index 2a54cc199229..0912e6e04c56 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild
@@ -1,18 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild,v 1.5 2015/05/17 03:58:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.16-r1.ebuild,v 1.6 2015/05/17 03:59:27 vapier Exp $
+
+# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
+
+EAPI="5"
 
 inherit eutils
 
 DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-### Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe
-
 HOMEPAGE="http://yaboot.ozlabs.org/"
 SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ppc ppc64"
 IUSE="ibm"
+
 DEPEND="sys-apps/powerpc-utils"
 RDEPEND="!sys-boot/yaboot
 	!ibm? (
@@ -21,6 +25,8 @@ RDEPEND="!sys-boot/yaboot
 		sys-fs/mac-fdisk
 	)"
 
+S=${WORKDIR}
+
 QA_PRESTRIPPED="
 	/usr/lib/yaboot/yaboot
 	/usr/lib/yaboot/yaboot.chrp
@@ -28,5 +34,5 @@ QA_PRESTRIPPED="
 "
 
 src_install() {
-	cp -pPR "${WORKDIR}"/* "${D}" || die "cp failed"
+	cp -pPR "${WORKDIR}"/* "${D}" || die
 }
diff --git a/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild b/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild
index 83b650394146..4a5bad3c67d1 100644
--- a/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild
+++ b/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild,v 1.6 2015/05/17 03:58:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/yaboot-static/yaboot-static-1.3.17-r1.ebuild,v 1.7 2015/05/17 03:59:27 vapier Exp $
 
-EAPI=2
+# Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe.
+
+EAPI="5"
 
 inherit eutils
 
 DESCRIPTION="Static yaboot ppc boot loader for machines with open firmware"
-### Generated by using quickpkg on a ppc32 machine, compiled with -O2 -pipe
-
 HOMEPAGE="http://yaboot.ozlabs.org/"
 SRC_URI="mirror://gentoo/yaboot-static-${PV}.tbz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ppc ppc64"
 IUSE="ibm"
+
 DEPEND="sys-apps/powerpc-utils"
 RDEPEND="!sys-boot/yaboot
 	!ibm? (
@@ -23,6 +25,8 @@ RDEPEND="!sys-boot/yaboot
 		sys-fs/mac-fdisk
 	)"
 
+S=${WORKDIR}
+
 QA_PRESTRIPPED="
 	/usr/lib/yaboot/yaboot
 	/usr/lib/yaboot/yaboot.chrp
@@ -30,10 +34,9 @@ QA_PRESTRIPPED="
 "
 
 src_prepare() {
-	# Fix the devspec path on newer kernels
 	epatch "${FILESDIR}/new-ofpath-devspec.patch"
 }
 
 src_install() {
-	cp -pPR "${WORKDIR}"/* "${D}" || die "cp failed"
+	cp -pPR "${WORKDIR}"/* "${D}" || die
 }