Add ~amd64 keyword

Package-Manager: portage-2.1.5_rc6

3 files changed, 33 insertions, 16 deletions

diff --git a/games-action/heretic2/ChangeLog b/games-action/heretic2/ChangeLog
index 78f1966f302b..aa0d2af4bfe6 100644
--- a/games-action/heretic2/ChangeLog
+++ b/games-action/heretic2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/heretic2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2/ChangeLog,v 1.3 2008/02/29 18:04:06 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2/ChangeLog,v 1.4 2008/05/05 13:40:29 nyhm Exp $
+
+  05 May 2008; Tristan Heaven <nyhm@gentoo.org> heretic2-1.06c.ebuild:
+  Add ~amd64 keyword
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> heretic2-1.06c.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-action/heretic2/Manifest b/games-action/heretic2/Manifest
index 0a1bdab7f771..bd09d14cd426 100644
--- a/games-action/heretic2/Manifest
+++ b/games-action/heretic2/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST heretic2-1.06b-unified-x86.run 4718161 RMD160 7803cf65a62f4da2afacd2464c9d0e9250ad6bd6 SHA1 3f48b4c869700b80a267af0d2de13a82a71e4211 SHA256 5fccb3ed0948af96b8f92232dc0e89f700b32a753ef303f707b82189d9d2b4fb
 DIST heretic2-1.06c-unified-x86.run 3667873 RMD160 5a38e3a3af8813e071f0b89948e145170e29f699 SHA1 1dc48a49e23e55bd2cc6d6e83e8316164e433b57 SHA256 0e8fbd4a9df001a7b2df7e860f5506069ffaae2f898e066b7b72fbc83e1496f0
 DIST heretic2-maps-1.0.run 6257076 RMD160 b9716e075400ea5816869faff871bbb99d355322 SHA1 c11a56d45dc991d27c2bba89fb1babedcce4093b SHA256 c4dc02af9c426ecaf59ce3a4c487c3e452b430eca1bb0e3a33f98f9d2ac47543
-EBUILD heretic2-1.06c.ebuild 1629 RMD160 821e8f29aa35a628012828e652e4db02a959ab11 SHA1 20d722a73ddaa42e2ae8d8a82730238681c14e1d SHA256 8bb9255ef22fef837cf6180aad212a91f520083d93241d6be1b0e2313309d870
-MISC ChangeLog 770 RMD160 7bf35d5431e6975cefd9ce963a084e4660404513 SHA1 28a9b991abdc3f0a10523f5ad464a06ed62384ba SHA256 03642bb83d403ef3c416410fac44bed47c8c25e43e94c0262d00041cb489d3a2
+EBUILD heretic2-1.06c.ebuild 1726 RMD160 a5442bb654019dde19b3c7573c8cf9e3b54bb2e3 SHA1 41132e04fe4ac066d8d25f2c0b94707a0c1b246d SHA256 8b2b1b64800d0e50964a41c56e2bf73078c3d89928a950e899b5dcff663056c7
+MISC ChangeLog 862 RMD160 25e9bed82955470c891451f162aeb217f289f1b5 SHA1 43db920f6272afbfedfcff36ab7fa9a10b43e138 SHA256 805dce8639a99c9b2835e020d4e5d07db1a2e74b992fd5552758b76035422891
 MISC metadata.xml 251 RMD160 06f6da1d444a200da939f3a66efda69e106d437a SHA1 33620e22c3208afee5b6c4641a7fcfe30bfc2009 SHA256 1ee2ce2802a2ce864b396d3300b3a8f7bea466b1280840097c29265e2ad4a7b2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgfDlMACgkQdz7hIScOURHoAwCg21yyuD7/fDfDHU7tTdft21Qk
+GBoAoOo8Jrs8/lPPvxa4VtksV2bXDSzq
+=jssU
+-----END PGP SIGNATURE-----
diff --git a/games-action/heretic2/heretic2-1.06c.ebuild b/games-action/heretic2/heretic2-1.06c.ebuild
index 9acd02a3f4b8..9aeab205707a 100644
--- a/games-action/heretic2/heretic2-1.06c.ebuild
+++ b/games-action/heretic2/heretic2-1.06c.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2/heretic2-1.06c.ebuild,v 1.3 2008/02/29 18:04:06 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2/heretic2-1.06c.ebuild,v 1.4 2008/05/05 13:40:29 nyhm Exp $
 
-inherit eutils games
+inherit eutils multilib games
 
 DESCRIPTION="Third-person classic magical action-adventure game"
 HOMEPAGE="http://lokigames.com/products/heretic2/
@@ -13,19 +13,18 @@ SRC_URI="mirror://lokigames/${PN}/${P/%?/b}-unified-x86.run
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/${PN}/base/*.so"
 
 DEPEND="games-util/loki_patch"
-RDEPEND="virtual/opengl"
+RDEPEND="virtual/opengl
+	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 
 S=${WORKDIR}
 
 GAMES_CHECK_LICENSE="yes"
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
 
 src_unpack() {
 	cdrom_get_cds bin/x86/glibc-2.1/${PN}
@@ -39,6 +38,8 @@ src_unpack() {
 }
 
 src_install() {
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+
 	cd "${CDROM_ROOT}"
 
 	insinto "${dir}"
@@ -49,22 +50,25 @@ src_install() {
 
 	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
 	newicon icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Heretic II" ${PN}
+	make_desktop_entry ${PN} "Heretic II"
 
-	cd "${Ddir}"
+	cd "${D}/${dir}"
 	ln -s "${CDROM_ROOT}"/*.gz .
 	unpack ./*.gz
 	rm -f *.gz
 
 	local d
 	for d in "${S}"/* ; do
-		cd "${d}"
-		loki_patch patch.dat "${Ddir}" || die "loki_patch ${d} failed"
+		pushd "${d}" > /dev/null
+		loki_patch patch.dat "${D}/${dir}" || die "loki_patch ${d} failed"
+		popd > /dev/null
 	done
 
-	rmdir "${Ddir}"/gl_drivers
-	sed -i '128i set gl_driver "/usr/lib/libGL.so"' \
-		"${Ddir}"/base/default.cfg || die "sed failed"
+	rmdir gl_drivers
+	sed -i \
+		"128i set gl_driver \"/usr/$(ABI=x86 get_libdir)/libGL.so\"" \
+		base/default.cfg \
+		|| die "sed failed"
 
 	prepgamesdirs
 }