Migrate to EAPI=5.

Use QA_PREBUILT as per bug #426836

Package-Manager: portage-2.1.11.38/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D

3 files changed, 30 insertions, 14 deletions

diff --git a/games-strategy/defcon-demo/ChangeLog b/games-strategy/defcon-demo/ChangeLog
index 65bc92820d8c..29c922c1c055 100644
--- a/games-strategy/defcon-demo/ChangeLog
+++ b/games-strategy/defcon-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/defcon-demo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/defcon-demo/ChangeLog,v 1.5 2011/10/19 21:40:06 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/defcon-demo/ChangeLog,v 1.6 2012/12/20 07:25:37 tupone Exp $
+
+  20 Dec 2012; Tupone Alfredo <tupone@gentoo.org> defcon-demo-1.42.ebuild:
+  Migrate to EAPI=5.
+  Use QA_PREBUILT as per bug #426836 by Diego
 
   19 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> defcon-demo-1.42.ebuild:
   EAPI=2
diff --git a/games-strategy/defcon-demo/Manifest b/games-strategy/defcon-demo/Manifest
index 8e42d76defd2..f4cf002e068d 100644
--- a/games-strategy/defcon-demo/Manifest
+++ b/games-strategy/defcon-demo/Manifest
@@ -1,5 +1,15 @@
-AUX defcon 400 RMD160 e8de936155647e0e1642f003d0be3d08abf587f0 SHA1 1da24de208675313a2fcb70a5d594e1de71b571e SHA256 132840e1a669b6e5fc31eb3ad67bc2e95f0b34970a25e1b9fae13578cdf933d1
-DIST defcon-v1.42.tar.gz 63093946 RMD160 0de1cd9daf80269c47a27387e326461ab6657cff SHA1 2385fbaff4c772ea7b9c6c4e125748112ba44cc4 SHA256 5973c32ef55d245b9adfbce33bb7c503d3f0ad7bf5deb55eba8754f9850cdf40
-EBUILD defcon-demo-1.42.ebuild 1865 RMD160 5f0b8b0b8afa7e0742c5fe6ee0022a7112a24efb SHA1 756ce999ce63b58969dc170e8cc2585a4726a0e5 SHA256 1209e004293f862d9f677fd818491231bc603488a95c93930503db15e65fc10b
-MISC ChangeLog 876 RMD160 60e8f0ffa3c12c47810a8df009505c664e66d224 SHA1 ad73228de1469e7234135171dc2c2cec7ed25060 SHA256 2c9a845b85c32c9b0d446bd7a253329be000a92a4e079afc1d46c6b662cfc42d
-MISC metadata.xml 291 RMD160 574f63287adddb7ae033c53a3a29f2c1e37e1497 SHA1 dff5e35df378d220e5975ad0de8087a11d29cf42 SHA256 84b3534a5e435f20efd3845269de9e1f51c68bab6ca580d70314259e17b937bd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX defcon 400 SHA256 132840e1a669b6e5fc31eb3ad67bc2e95f0b34970a25e1b9fae13578cdf933d1 SHA512 d417fcf9560a3b3a7232e3c86b4315f0de6ed86ce8263348520910ff6bc1d14e649f31d500f52c70c2be655836261219ca9dce4f8df9a32d5ca2b00421667058 WHIRLPOOL e6cc0a31324cfc965cc9279a8bd7d43d5ddd52393786aeb9c244ec9bcfec14c375b436cca14abbd47342a96f73248a57e596cc7e185ed4b534433feff8828dea
+DIST defcon-v1.42.tar.gz 63093946 SHA256 5973c32ef55d245b9adfbce33bb7c503d3f0ad7bf5deb55eba8754f9850cdf40 SHA512 1072a2c7fb9c7694b4fab9e7475222f9eb3f6f41fa4cac18f6fc9d1bee23678c236eb6ec5dafaeeba87ddc4b07c51fca51d49d8489a6c3268b9f8c87765a2635 WHIRLPOOL c6cfaaba5f19f0b11b02094c9730a9fa1d491700332cc69017cee2fa4407db502a5027c4a823a5679a4a3114aceeffa36574c923adc518adbdd924732b043369
+EBUILD defcon-demo-1.42.ebuild 1899 SHA256 b33e1b0e5406b7acd7093fa414954c5aa38317e83c348872befeaf3978dfb0c1 SHA512 a66ec86fa875bd00c88298d073e7fc3a0a27fbd454272bbeda2c9c7914d9da9bc0628c3bd638a4845aa69055f73f992a0b70b90cf4742f609870b2f694308b9b WHIRLPOOL 0601baa83f9e154eb498381bb9d5b278899a7ee9f081d39a8e9047e6fc3f1a76c2d32920c248645ae30612a5a733a275f3380a0295f0c50605932451c42b8ebf
+MISC ChangeLog 1016 SHA256 6e734baac81db3f107093021c7c9725764ede1a02a33f61a20f5938e48c3230f SHA512 6f5037dd9c89cae03cb501f2145ac2a0d5022a231f41c631c2fbff4a4172090946ca58f1d38d1e018d3f9e3c040a21f10d4c00ba8befc79176ec32ad266462b5 WHIRLPOOL 6e051a5688cd514f9b90c2f3aa011cc56058d3e71e4d4fb240f9ce56a621609b88f7953a0996ef81d8566df582be67e37b48e06599e4e70bc09640efb26895ff
+MISC metadata.xml 291 SHA256 84b3534a5e435f20efd3845269de9e1f51c68bab6ca580d70314259e17b937bd SHA512 633084f8ad90457b753a5cf80ed500e16045f42df905e2346504957ca8efcc72256b93cc24f04ff2c52f97f16cc62b7ec3ff8eacb603fe8c79937fb3563b8c58 WHIRLPOOL 237a86aed76b75d230a7826563d355457c63b4759434f2e5bcc3245b8c2d7d66d5f6eed907b8e7202d427a612d6ea6493f9511303815d4da1fb6a6686b9a10fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDSvXcACgkQIY77eQFFFC3K2QCfRbXy8DkgjeOOgnL6pxlPjXSA
+ZrsAn0mPV0u+D9H4pwxsaNoKADPcIB7V
+=wIW/
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/defcon-demo/defcon-demo-1.42.ebuild b/games-strategy/defcon-demo/defcon-demo-1.42.ebuild
index 33ae69455017..f09d0614e820 100644
--- a/games-strategy/defcon-demo/defcon-demo-1.42.ebuild
+++ b/games-strategy/defcon-demo/defcon-demo-1.42.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/defcon-demo/defcon-demo-1.42.ebuild,v 1.5 2011/10/19 21:40:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/defcon-demo/defcon-demo-1.42.ebuild,v 1.6 2012/12/20 07:25:37 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils toolchain-funcs games
 
 MY_PN=defcon
@@ -32,6 +32,8 @@ RDEPEND=">=sys-libs/glibc-2.3
 		x11-libs/libXdmcp"
 DEPEND=""
 
+QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/lib/defcon.bin.x86"
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -49,23 +51,23 @@ src_prepare() {
 }
 
 src_compile() {
-	$(tc-getCC) -fPIC -shared -ldl -o lib/chdir.so chdir.c || die
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c || die
 }
 
 src_install() {
 	local dir=${GAMES_PREFIX_OPT}/${PN}
 
 	insinto "${dir}/lib"
-	doins lib/*.dat || die
+	doins lib/*.dat
 
 	exeinto "${dir}"/lib
-	doexe lib/*.{sh,x86,so} || die
+	doexe lib/*.{sh,x86,so}
 
 	dodoc manual.pdf doc/*txt
 	doicon doc/defcon.ico
 
 	# Can be upgraded to full version, so is not installed as "demo"
-	dogamesbin "${T}"/defcon || die "dogamesbin failed"
+	dogamesbin "${T}"/defcon
 	make_desktop_entry ${MY_PN} "Defcon" /usr/share/pixmaps/defcon.ico
 
 	prepgamesdirs