Use QA_PREBUILT. Bug #429504

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

3 files changed, 23 insertions, 29 deletions

diff --git a/games-strategy/majesty-demo/ChangeLog b/games-strategy/majesty-demo/ChangeLog
index 924ac781ff7f..c0ee6d2a4fcd 100644
--- a/games-strategy/majesty-demo/ChangeLog
+++ b/games-strategy/majesty-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/majesty-demo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.11 2012/02/08 21:33:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/ChangeLog,v 1.12 2012/12/24 15:36:37 tupone Exp $
+
+  24 Dec 2012; Tupone Alfredo <tupone@gentoo.org> majesty-demo-1.0.0.ebuild:
+  Use QA_PREBUILT. Bug #429504 by Diego Elio Pettenò
 
   08 Feb 2012; Mike Frysinger <vapier@gentoo.org> majesty-demo-1.0.0.ebuild:
   Move to new unpacker eclass for unpack_makeself.
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
index cf88be2a640c..219cdfd53f45 100644
--- a/games-strategy/majesty-demo/Manifest
+++ b/games-strategy/majesty-demo/Manifest
@@ -1,24 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST majesty_demo.run 43170241 RMD160 a792b420c789ae06b7822f935e5c082b1945c38d SHA1 b17d7eb5dac703cf8a7c3a6a5cf9c55cfd8d7e1c SHA256 3d3d1479dde2412804b8c5daa865584d77d5d60b861f2a042255e825decfbffe
-EBUILD majesty-demo-1.0.0.ebuild 1516 RMD160 781164ac4da61a7909003a1e8cf51ce12c6bc3b5 SHA1 f40e29961b5aa23068c3ef5aa29062e7c49e630b SHA256 06406527d7ed39a26ca6e0536e0c73cd81297a396f7a7b3a3589031fe5a1eef5
-MISC ChangeLog 1595 RMD160 82a2d1b64fd3a990c5245e1d54f6fb36b7b4973f SHA1 4b6017197b942941a81269cd550b2c82f2ddb89f SHA256 4377709ac34150f566acad42fba34ae0e4132cf907497fa5dce087dec8daf1d7
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST majesty_demo.run 43170241 SHA256 3d3d1479dde2412804b8c5daa865584d77d5d60b861f2a042255e825decfbffe SHA512 67c74e3c11514649fbf1f2aadf529ce4ee62084c5825a2ec213c28ced6ec1d3ff6b6b2858f6f721c032160df794d62e4a73bcf9696ee4ebbb6ed29df1c024e31 WHIRLPOOL b8311ade80f6ed8c867806c68bfb378c7cd2a59c055df9363fe78c248564efbd110d3e31c229acecce3794f655f2abe4a531dd12f54e03e0f9d3e8e031627714
+EBUILD majesty-demo-1.0.0.ebuild 1439 SHA256 8fbc306c71947abd1eee6447a175f026f63ca60a880c405a6c870fbe236887e4 SHA512 d3f87b82fe70db72de710f020942ea35fc249c956966f935b3a7cae665b0f01d8213a2ff985eec2f37ede32322a8000f1bd1b20f136e50751a00b3d6b1ae81e9 WHIRLPOOL b1dbded149d77340f14fde01c16cf313e1851a2cd95c17dfef2ab03d10764a65d35a7c63c901c4e762832836268f996278cd8ac389ec47fa456c84ee26cc4433
+MISC ChangeLog 1727 SHA256 89e0e3a6c799e5d0de05924ba830f089bcbcd1c8e8efc9ddac5603897fb0ba0c SHA512 f1c04f2ee0c416d87f6835b300997e69b06936b8eb23e05921fd3940012fc87e44c9eeb5d2a8be760e6f06f98284380e870c0a5301c1521268aad1e4aa62e61a WHIRLPOOL b9d491dde4c1b9a43f087a7667f24b0ace068799627768f7f94f2d73678ab85ae65c68f6f61226fdbad239c74d8563c3c09acb495d2b1c13874374330e9f1f89
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPMuoZAAoJELEHsLL7fEFW2nQQAINwUf3YUXr1PsckGItT7uEG
-RI9zDPf68TOOhqRQ3QweuAApQN4v92iem0zq1V5f+G2zwiGC1gzRN4bvAsol//AA
-Uy+ilGDHN44dlfW59fEF9diTSdH9V7odKAE6gfEYduUDnhIexJON38FW5cOfZJ5r
-+M+NZfLVgK8l4PKePDYM9K/tieYZyDfqrbw8yz1HjCW8AAtPVQRyCA8m+3RVNfYF
-g8yV2HBiC2YbfTxRB7CkTg538jjzN668fK5ocVQ08Cgm6BaaNo7THBmsHEMYB5zL
-JmGcyLuezLeapRr8yaY+GZxnGUNcZWJYV/Dz665LPx1E3ike2o1ohxbnXjw6vC2L
-iQmT6K7sqd6pC5T8a6zF7pnJSJNK3sjuMc2XWZKxgPyhIrL9POaJo349QmeXFGwp
-v6Ur+Gyvu/gc622BU1XK2Ootfp56yfxsB28aTu2RBSEdcaMEjEb1WrDHjJ2HRQ6L
-jEDrDaLc313xB5FmSzXcYOL6XkgC4CZ0ZHt+33OmKKStycdT1VXQIWGkDEqQN2Me
-rllN7R7Ebc2AVBwsBZrkOtmplyj3r9/YEIQ3whnddz31tzn9gUOWKJ4jS716FvOH
-Rk7b7ETWUGPQvKGA85sXp6nS4Qhkd8V15DKs4sJK9y0U4lBuSdPB75D5wc/XEt+m
-siP0Ik1UMmNIpHMzFbZK
-=ImQE
+iEYEAREIAAYFAlDYdowACgkQIY77eQFFFC0x6wCbBQynJW2JKKSirEke07/OUZWv
+VPgAoOhHz034dEIrJFhP5RP3cawn7ohR
+=CaMS
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
index e14beddabe15..70cec7d3f176 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.12 2012/02/08 21:33:05 vapier Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild,v 1.13 2012/12/24 15:36:37 tupone Exp $
+EAPI=4
 inherit eutils unpacker games
 
 DESCRIPTION="Control your own kingdom in this simulation."
@@ -33,20 +33,21 @@ S=${WORKDIR}
 
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
+QA_PREBUILT="${dir:1}/maj_demo"
 
 src_install() {
-	dodoc README* || die "dodoc"
+	dodoc README*
 	insinto "${dir}"
 	exeinto "${dir}"
-	doins -r data quests || die "doins data"
-	doins majesty.{bmp,xpm} majestysite.url || die "doins"
-	cp "${S}"/majesty.xpm "${S}"/majesty-demo.xpm || die "copy icon"
-	doicon majesty-demo.xpm || die "doicon"
+	doins -r data quests
+	doins majesty.{bmp,xpm} majestysite.url
+	cp "${S}"/majesty.xpm "${S}"/majesty-demo.xpm
+	doicon majesty-demo.xpm
 	# I am only installing the static version for now
 	if use x86 || use amd64; then
-		doexe bin/Linux/x86/glibc-2.1/maj_demo || die "doexe"
+		doexe bin/Linux/x86/glibc-2.1/maj_demo
 	elif use ppc; then
-		doexe bin/Linux/ppc/glibc-2.1/maj_demo || die "doexe"
+		doexe bin/Linux/ppc/glibc-2.1/maj_demo
 	fi
 	games_make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
 	prepgamesdirs