[QA] Revision bump to 0.8.29-r2. EAPI 5.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 35 insertions, 29 deletions

diff --git a/app-emulation/uae/ChangeLog b/app-emulation/uae/ChangeLog
index 8c6c7ea0152f..01de5281b88f 100644
--- a/app-emulation/uae/ChangeLog
+++ b/app-emulation/uae/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/uae
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.41 2013/02/27 09:15:15 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/ChangeLog,v 1.42 2014/04/02 11:55:44 tomwij Exp $
+
+*uae-0.8.29-r2 (02 Apr 2014)
+
+  02 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +uae-0.8.29-r2.ebuild,
+  -uae-0.8.29-r1.ebuild:
+  [QA] Revision bump to 0.8.29-r2. EAPI 5.
 
   27 Feb 2013; Michael Palimaka <kensington@gentoo.org> -files/split_cpuemu.pl:
   Remove unused file wrt bug #340731.
diff --git a/app-emulation/uae/Manifest b/app-emulation/uae/Manifest
index 16d07d166215..925ba5a27dd8 100644
--- a/app-emulation/uae/Manifest
+++ b/app-emulation/uae/Manifest
@@ -6,17 +6,17 @@ AUX uae-0.8.25-allow_spaces_in_zip_filenames.diff 651 SHA256 13f4377de98fba7758b
 AUX uae-0.8.25-struct_uae_wrong_fields_name.diff 613 SHA256 ac020eacef32f92b82740022c0383fb5746c6a6d205a96c2564805063ad9035a SHA512 553150271c42ca76f414fd19e482230dedc7ea9c466d5bffb31ef5e729a92d558c020f91aae3a91570b1ef5cef5af5f6872bdaf009db17517651b5e106323270 WHIRLPOOL 62158ba7d9af4fa7952723a601eeb0937bddd1368422a6505e88ca45e6beeab0ec75b2d7a69396134f2ba93ba878db9bc4ff7bf13f35922f14b8468e3234781a
 AUX uae-0.8.26-uae_reset_args.diff 3216 SHA256 c7223329a49a6fc4545fcc9606fc66f1b9c0e011cfad2f75a6198c146bc8d536 SHA512 04d404efa4d63fa89eb537e9c0f6b964e5dad031305abdf6ba08339d1aa5d211b51c37599202e52210b5805ebb5c1109b5b04092e2484001b7f630b268e59a21 WHIRLPOOL ffd0d154fd750a332ab1d059167119758847d3e8121eed97cf9ff59491d48e43b29de8cfbd1287a8acd91ea106bd1ba067063b9ac504c8b64bf70d37a8bd9ca2
 DIST uae-0.8.29.tar.bz2 925508 SHA256 2463524b19b36ab44de158c5f24871878eda05230ea391343849959643634317 SHA512 2b8f362f9ba7171cf9ce71938b0a4f22c5d90d518524d50023792f4dc9f75a1b1e17e55966926e1138801b4d9ffbc2f1ae4c4b5dfa42e98a8e6ec688adb84064 WHIRLPOOL 0fcf540415b4434f59f8df97de6c49db03f088d219267eb19647afad483ffc99c48cba7cbf704e86e3d2f25ab184f19119d5a1c578df6dcbe53f7e6c25d1648c
-EBUILD uae-0.8.29-r1.ebuild 1853 SHA256 794fd85b33d8957cfaa5edbb91257c06aafd06dc868ca1707eba0e8d3845b345 SHA512 042401edf84a4d26c51d4f604ae8a491da980b04293a76893485e73ce3cf863e82799be7c2fb84406ad2c297420ecf01cbcd1cf551a53a049370d28c575ac436 WHIRLPOOL 64c7cc9dc22b233cf66478d1c496e480a83b8651960e3f4c6463608b788d05e576cfdaa341964450220bc5b398cc215868b6c572841dec5c13ac193318b2ac2e
-MISC ChangeLog 7450 SHA256 ae6b5e4394c3e758d9d816fc891eaaf114bded6cb41b7011f7bdc48f59337db0 SHA512 262e243a5aafd2c525e4bda5a8e3b069ea94a7c96c8516aa64172622554c1196b8e68b82883289645581fb7d880f549d85d9254301a0c3878b0b17bbf2efd77c WHIRLPOOL 507a7e8bde6e4e2b46a6da898f93f080cab8461dc08974f09183d35fe6760172e7bc6352456b0eb334622392ee9a1a398277cbc2a75463846c8f566f994386ae
+EBUILD uae-0.8.29-r2.ebuild 1822 SHA256 150a14de94eb4ba3cedc6392fd98393fc5b387e7b61d866a953f1915522311ff SHA512 2c7b0ea00d29d9791f9eb6fbafe4884bd33d62534ef25cfd44aa6d0f18c65db0592444f97da13218a6318893e96a9000826ca321102fba52c7b818fdb637af84 WHIRLPOOL 459c55c7218ac9cebef529d734ada6fd63d829e794c5084144d8f5f6fef53f721b73177694482bfe2fbdbadfc4aabd7ba0c752db42d0f8a2e492ce84ff78bca8
+MISC ChangeLog 7615 SHA256 7e3ad8b25c1504c4a4bd4a6dee59aa82c89ef9510758c4d77116bdbb037642d6 SHA512 3b1387540a206146992b6af94715b6f9ef7bec44c54dd93bc3e9de5c6df6339243cfa7d35a1c04674897eb61afbd7dca84324cbac6e678553db33017426b790b WHIRLPOOL 8c4570c70ced1d80351d949ca94c3ea0ff0f0207ee07c17ee0962bf31183aac2d4eff7c8fab2e8800ee1ab4fa6f8fc5c6a9e76e646b4229650cd068f4553bc6f
 MISC metadata.xml 720 SHA256 c6f3b414102c0aac64c1ae570a1b7dc407a55ce4161ed3d66fe983a32c46b9b8 SHA512 554421e6cc288e5bcb8ad1a74dc7d45fe5077f3b8eb01bdfe71c02fe95c1d4e6187414faa86fe933559ee4e8c8a259579fd3c4d4cd3da1fe69f9a5676c43806d WHIRLPOOL 4734f87221b5eb07820b411f79f9dcdbd8992d2e574fb44f684779a8cd9e7aa72e244c116509442940521937a5ef652bba00326a19a58d72e25916ac7abb661f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRLc6oAAoJEMbwO6tnXQ0sr0AIAJtjCjpILluj2OjaH7vfrFRz
-RntHlPc9JSqA2pEu2Rv9JxkCJrXRT8ku1/epl4g9I4zUOLT/X8cGxxQrYAADVSon
-hy+5ui6uexr+g+iGvLlT0TPmzP519NQYxm8cmYiGu/Z04Rc9vcG2S0XFaWe3Jmit
-CXOXEWnC+HMPdGkOhwVkNilR407YvwNCz5ecxqbY+jL1mgv2udsZ7HHHe72HCpQH
-jz54WA+KqCTjRTsTb71VDgHmhqFcAxGUJGW3lyLBBpeCo/RctrvIfvkChzB1uRO6
-RkeUU3BIe+Cc1+kdVt8iwrUH7yVg3M6FKkM5yuYfa6v7+MH7JxRSXxjD81AtBuc=
-=GYtB
+iQEcBAEBCAAGBQJTO/qtAAoJEJWyH81tNOV9vC0IALClGPfdMQvkmUKSidg7y8De
+++O7rCTsyqkbaDjh0RDUGxmHbZ5HClGMcz7h2NHsIvqVMsEGrDd6cMW/JPVJacSa
+p7BekJDpqDJMZ+NQecrFrzrqx5YDBkK4PawUnvhzSwxYmR0IhCjCfUxiWnZH1+x5
+sXnF34cHl7g015OBZaoUe7/FYjnXLteLgld8KXnTgwiQKYhKmiRRtk3UMsVBNwlx
+xZYTEzErJ5Gp3DItx4zPRxpQQk1HEtxTehXtjn2Zz4aEl9bp0w6KAfCHnsBHQmoq
+vkHuHjs0ejEF/EnZbiZyFCui18e9ikCsd93eAE2nvfKFadjQN0GN8n5CH8xRHC8=
+=jIT0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/uae/uae-0.8.29-r1.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild
index f7cb14784d08..8f0c3b0c758c 100644
--- a/app-emulation/uae/uae-0.8.29-r1.ebuild
+++ b/app-emulation/uae/uae-0.8.29-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.29-r1.ebuild,v 1.3 2011/03/27 10:31:29 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/uae/uae-0.8.29-r2.ebuild,v 1.1 2014/04/02 11:55:44 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.amigaemulator.org/pub/uae/sources/develop/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="sdl alsa scsi"
 
 DEPEND="sdl? ( media-libs/libsdl
@@ -27,17 +27,15 @@ DEPEND="sdl? ( media-libs/libsdl
 	scsi? ( app-cdr/cdrtools )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/uae-0.8.25-allow_spaces_in_zip_filenames.diff
-	epatch "${FILESDIR}"/uae-0.8.25-struct_uae_wrong_fields_name.diff
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.25-allow_spaces_in_zip_filenames.diff
+	epatch "${FILESDIR}"/${PN}-0.8.25-struct_uae_wrong_fields_name.diff
 	epatch "${FILESDIR}"/${PN}-0.8.26-uae_reset_args.diff
-	cp "${FILESDIR}"/sdlgfx.h "${S}"/src
+
+	cp "${FILESDIR}"/sdlgfx.h "${S}"/src || die
 }
 
-src_compile() {
+src_configure() {
 	# disabling lots of options, cause many code-paths are broken, these should compile,
 	# if you want/need other options, please test if they work with other combinations
 	# before opening a bug
@@ -45,15 +43,17 @@ src_compile() {
 		--without-asciiart --without-sdl-sound --enable-threads \
 		$(use_with sdl) $(use_with sdl sdl-gfx) \
 		$(use_with alsa) \
-		$(use_enable scsi scsi-device) || die "econf failed"
+		$(use_enable scsi scsi-device)
+}
 
-	emake -j1 || die "emake failed"
+src_compile() {
+	emake -j1
 }
 
 src_install() {
-	dobin uae readdisk || die
-	cp docs/unix/README docs/README.unix
-	rm -r docs/{AmigaOS,BeOS,pOS,translated,unix}
+	dobin uae readdisk
+	cp docs/unix/README docs/README.unix || die
+	rm -r docs/{AmigaOS,BeOS,pOS,translated,unix} || die
 	dodoc docs/*
 
 	insinto /usr/share/uae/amiga-tools