add patch from Ihar Hrachyshka in bug #419755 at initial support for amd64

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 12 insertions, 8 deletions

diff --git a/games-strategy/heroes3/ChangeLog b/games-strategy/heroes3/ChangeLog
index 33b2c206f800..d72e4903cc9c 100644
--- a/games-strategy/heroes3/ChangeLog
+++ b/games-strategy/heroes3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/heroes3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.25 2015/03/29 08:17:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/ChangeLog,v 1.26 2015/04/29 05:22:05 mr_bones_ Exp $
+
+  29 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> heroes3-1.3.1a-r2.ebuild:
+  add patch from Ihar Hrachyshka in bug #419755 at initial support for amd64
 
   29 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> heroes3-1.3.1a-r2.ebuild:
   EAPI=5
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
index 7a90a6019451..69278cef26c4 100644
--- a/games-strategy/heroes3/Manifest
+++ b/games-strategy/heroes3/Manifest
@@ -1,6 +1,7 @@
 AUX heroes3-wrapper.sh 195 SHA256 982b2c36a167dd99a6bddc14d13122cf73e306e2711147aa059b1dabb4ae1ae5 SHA512 ac1871676ffb0c818ddd9dcadad031d3e296982a989dcc91241b2630eb773e341058e1d4406374a21bcc0f6c8caba94398541ddbc540e7c140660838ef3ed0c8 WHIRLPOOL 990180cd2e28edf3b0118ab744964604b6743f42015cc5fe8cdface011a9a1cd83fa60a9977feac851af5fb8126de94dff94bf04f1bf0b958fbf30ad8445a901
 DIST heroes3-1.3.1a-cdrom-x86.run 3012188 SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e
 DIST heroes3-1.3.1a-ppc.run 2643068 SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137
-EBUILD heroes3-1.3.1a-r2.ebuild 5588 SHA256 9ea2bd1f62766aa4cde6091bd01c93652c01489c0334bb62c8f184b2db2e96e8 SHA512 9ff6ee39f3440e889a60227220b49a845e598b6baa20a1b029260a2433968d450c25d06b7b5ec8d2855b778789a20e2b8623d47e81e97cec1a237375b95ad1db WHIRLPOOL 7c0b00e9087d7b66631b2a2e5976a4186372615ed876ea81da8a129b469e5cef10b25c49f8612aa18c44c46179b68dda3a5e16430c0fc39cfb86ebeeec1a11d5
-MISC ChangeLog 4093 SHA256 2ddfdf73a77b95a752bf3bed8e4308924f5924b774d16822cbaf88e2e5f52249 SHA512 783f88549eeaf82b54f092a41ec3f074c9c5c64c283c1790f78889fef0a514d92c6bc4e7865d31c9f92996e6a79bf0e77f792d94fdc0672116418d476a007255 WHIRLPOOL cbe5175068d2fd7f3ada3842933d9dd58d313bb1ad338f26813accbf9e6ab009e2a7d7c48d4aa1d7cfc494a90e3561031d82be832c8a5724c56ff6620a87a468
+EBUILD heroes3-1.3.1a-r2.ebuild 5642 SHA256 05d59e89eb510befe18dd85e5663f539001aab972d205703f856781abd0161db SHA512 11fb11446d4fabab4b9d6d5d6b2a12050a42e0bdcf1e26828a4ad8b64da20a0282a7914bc81c016778b994c5bc382ea5ceb3146c571793950c56bbea7f8a58d4 WHIRLPOOL 11e93406da2b62acdd6730aab8fb995f2bc6c2ccf2b257583840acc8e0167d59070d9ced0c6e71db1bd3946f24f1ccacf94b4820f8b9ae07b2577a9224f75e5c
+MISC ChangeLog 4252 SHA256 8e998af35de559616d0861f813b65bf3400b61976536af077847906d0dae3ac4 SHA512 c9628e99918f3ab21c5a9b4ef1e62ae63ea6a7c5c1bd12a4ceb664eb193d829aa7b16b23cfecfa2f0a34d4f2bc171cb022f0f12fe69073b042d3b55f4a705ca2 WHIRLPOOL 5399720977f5e71216cd1e6e3d0915ef61e36df35e1c7a17b580d28b57a85fb5da59e7f5f031f53c0931fbace8e5da691d342a0ff81cd134ecb17f9ef14d72f7
+MISC heroes3-1.3.1a-r2.ebuild.orig 5643 SHA256 ff08eaab1f943db54e3f25bdab37f2e26f5dd644f29ca98514e24c2e2aa0ae95 SHA512 8df91cf33df948eb1862a34d27bc29788facbaaed2f6b70acf46da2759446b84b0816edc898aa19d147387692337eff8c58f7838224f363a6c819c0f932461a0 WHIRLPOOL 0a3a1ae9a3723b4a0d438e5f85d4918caf194303b4d4e250cfde10a86ac3c94256e892a70e5b3875a5cf2cf5800c50c9416e1ec64a695fdcbdba6ad2b505ce29
 MISC metadata.xml 352 SHA256 97532bdee3502b348eee8dd1b85a754fb2736f50c1595f6e20b532af1d7a0beb SHA512 e980d80a98e26f27bbbb3fbab6de4fa9d14bffe336de276c93419e7f0a1e4469c030ea203b1e0003a73e928e560ba1b07980b1d86c8df7b4f0600eec34246d32 WHIRLPOOL c106f62c25c4a1b7f5b4cae7e4e73979d1745df4ea22b2a7344c23500318da94cf109977b3119f59303aafc3ff869e01ea69762db5417a5d6a6d06e23984009b
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
index 04afaf9b79fe..bb863b041156 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.17 2015/03/29 08:17:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild,v 1.18 2015/04/29 05:22:05 mr_bones_ Exp $
 
 #	[x] Base Install Required (+4 MB)
 #	[x] Scenarios (+7 MB)
@@ -26,6 +26,7 @@ HOMEPAGE="http://www.lokigames.com/products/heroes3/"
 # here so someone else can stabilize loki_setupdb and loki_patch for PPC and
 # then KEYWORD this appropriately.
 SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
+	amd64? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
 	ppc? ( mirror://lokigames/${PN}/${P}-ppc.run )"
 # This is commented because the server is unreachable.
 #	linguas_es? ( ${LANGPACKPATHPREFIX}-es.tar.gz )
@@ -38,7 +39,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 IUSE="nocd maps music sounds videos"
 #linguas_en linguas_es linguas_pl linguas_de"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 RESTRICT="strip"
 
 DEPEND="=dev-util/xdelta-1*
@@ -91,7 +92,7 @@ pkg_setup() {
 
 src_unpack() {
 	cdrom_get_cds hiscore.tar.gz
-	use x86 && unpack_makeself ${P}-cdrom-x86.run
+	(use x86 || use amd64) && unpack_makeself ${P}-cdrom-x86.run
 	use ppc && unpack_makeself ${P}-ppc.run
 
 #	for i in ${LINGUAS}
@@ -117,7 +118,7 @@ src_install() {
 
 	if use nocd
 	then
-		doins -r "${CDROM_ROOT}"/{data,maps,mp3} || die "copying data"
+		doins -r "${CDROM_ROOT}"/{data,maps,mp3}
 	else
 		if use maps
 		then
@@ -199,7 +200,6 @@ src_install() {
 	cp "${FILESDIR}"/heroes3-wrapper.sh "${T}"/heroes3 || die
 	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${T}"/heroes3 || die
 	dogamesbin "${T}"/heroes3
-
 }
 
 pkg_postinst() {