diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2009-09-24 16:17:57 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2009-09-24 16:17:57 +0000 |
| commit | bce0aa13a4cde21e7c44d36d8f55e67af3a01b19 (patch) | |
| tree | b824e8ab7a53b805ee4c676279ef19ad7990add0 | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-bce0aa13a4cde21e7c44d36d8f55e67af3a01b19.tar.gz gentoo-2-bce0aa13a4cde21e7c44d36d8f55e67af3a01b19.tar.bz2 gentoo-2-bce0aa13a4cde21e7c44d36d8f55e67af3a01b19.zip | |
Fix gl_driver path in default.cfg on x86
(Portage version: 2.2_rc41/cvs/Linux x86_64)
| -rw-r--r-- | games-action/heretic2/ChangeLog | 7 | ||||
| -rw-r--r-- | games-action/heretic2/heretic2-1.06c.ebuild | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/games-action/heretic2/ChangeLog b/games-action/heretic2/ChangeLog index aa0d2af4bfe6..0b741f9358d6 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.4 2008/05/05 13:40:29 nyhm Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2/ChangeLog,v 1.5 2009/09/24 16:17:57 nyhm Exp $ + + 24 Sep 2009; Tristan Heaven <nyhm@gentoo.org> heretic2-1.06c.ebuild: + Fix gl_driver path in default.cfg on x86 05 May 2008; Tristan Heaven <nyhm@gentoo.org> heretic2-1.06c.ebuild: Add ~amd64 keyword diff --git a/games-action/heretic2/heretic2-1.06c.ebuild b/games-action/heretic2/heretic2-1.06c.ebuild index 702ebbea7971..1ca988763f5c 100644 --- a/games-action/heretic2/heretic2-1.06c.ebuild +++ b/games-action/heretic2/heretic2-1.06c.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 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.5 2009/04/14 07:24:44 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2/heretic2-1.06c.ebuild,v 1.6 2009/09/24 16:17:57 nyhm Exp $ inherit eutils multilib games @@ -21,7 +21,11 @@ QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/${PN}/base/*.so" DEPEND="games-util/loki_patch" RDEPEND="virtual/opengl - amd64? ( app-emulation/emul-linux-x86-xlibs )" + amd64? ( app-emulation/emul-linux-x86-xlibs ) + x86? ( + x11-libs/libX11 + x11-libs/libXext + )" S=${WORKDIR} @@ -39,6 +43,8 @@ src_unpack() { } src_install() { + has_multilib_profile && ABI=x86 + local dir=${GAMES_PREFIX_OPT}/${PN} cd "${CDROM_ROOT}" @@ -67,7 +73,7 @@ src_install() { rmdir gl_drivers sed -i \ - "128i set gl_driver \"/usr/$(ABI=x86 get_libdir)/libGL.so\"" \ + "128i set gl_driver \"/usr/$(get_libdir)/libGL.so\"" \ base/default.cfg \ || die "sed failed" |