[gentoo-commits] gentoo-x86 commit in games-action/heretic2: heretic2-1.06c.ebuild ChangeLog

[Tristan Heaven (nyhm)]

nyhm        08/05/05 13:40:30

  Modified:             heretic2-1.06c.ebuild ChangeLog
  Log:
  Add ~amd64 keyword
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.4                  games-action/heretic2/heretic2-1.06c.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/heretic2/heretic2-1.06c.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/heretic2/heretic2-1.06c.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/heretic2/heretic2-1.06c.ebuild?r1=1.3&r2=1.4

Index: heretic2-1.06c.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2/heretic2-1.06c.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- heretic2-1.06c.ebuild	29 Feb 2008 18:04:06 -0000	1.3
+++ heretic2-1.06c.ebuild	5 May 2008 13:40:29 -0000	1.4
@@ -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 @@
 
 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_install() {
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+
 	cd "${CDROM_ROOT}"
 
 	insinto "${dir}"
@@ -49,22 +50,25 @@
 
 	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
 }



1.4                  games-action/heretic2/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/heretic2/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/heretic2/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/heretic2/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-action/heretic2/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog	29 Feb 2008 18:04:06 -0000	1.3
+++ ChangeLog	5 May 2008 13:40:29 -0000	1.4
@@ -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@g.o> heretic2-1.06c.ebuild:
+  Add ~amd64 keyword
 
   29 Feb 2008; Carsten Lohrke <carlo@g.o> heretic2-1.06c.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.



-- 
gentoo-commits@l.g.o mailing list