diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2015-06-01 22:05:46 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-06-01 22:05:46 +0000 |
commit | 0cd5f644f29087125d2bcfec805d16e4156b5909 (patch) | |
tree | 6ff1d2601ab52cb3f407afc8f013b34ea67d3b31 /games-action/heretic2-demo | |
parent | clean up app-emulation/emul-linux which has been removed (diff) | |
download | gentoo-2-0cd5f644f29087125d2bcfec805d16e4156b5909.tar.gz gentoo-2-0cd5f644f29087125d2bcfec805d16e4156b5909.tar.bz2 gentoo-2-0cd5f644f29087125d2bcfec805d16e4156b5909.zip |
clean up app-emulation/emul-linux which has been removed
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-action/heretic2-demo')
-rw-r--r-- | games-action/heretic2-demo/ChangeLog | 8 | ||||
-rw-r--r-- | games-action/heretic2-demo/heretic2-demo-1.06a.ebuild | 23 |
2 files changed, 14 insertions, 17 deletions
diff --git a/games-action/heretic2-demo/ChangeLog b/games-action/heretic2-demo/ChangeLog index 03661de6f600..7424ee8e0649 100644 --- a/games-action/heretic2-demo/ChangeLog +++ b/games-action/heretic2-demo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/heretic2-demo -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 2014/06/27 11:42:54 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.12 2015/06/01 22:05:45 mr_bones_ Exp $ + + 01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org> + heretic2-demo-1.06a.ebuild: + clean up app-emulation/emul-linux which has been removed 27 Jun 2014; Michał Górny <mgorny@gentoo.org> heretic2-demo-1.06a.ebuild: Support multilib packages in dependencies. Update/fix dependencies. Use diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild index ededbb20f643..5a2b256cba4e 100644 --- a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild +++ b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 1.13 2014/06/27 11:42:54 mgorny Exp $ -EAPI=4 +# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 1.14 2015/06/01 22:05:45 mr_bones_ Exp $ +EAPI=5 inherit eutils unpacker multilib games DESCRIPTION="Third-person classic magical action-adventure game" @@ -19,15 +19,8 @@ QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so" DEPEND="games-util/loki_patch" RDEPEND=" - || ( - ( - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - ) - amd64? ( - app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - ) - )" + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)]" S=${WORKDIR} @@ -41,16 +34,16 @@ src_install() { local demo="data/demos/heretic2_demo" local exe="heretic2_demo.x86" - loki_patch patch.dat data/ || die "loki patch failed" + loki_patch patch.dat data/ || die # Remove bad opengl library rm -r "${demo}/gl_drivers/" # Change to safe default of 800x600 and option of normal opengl driver - sed -i "${demo}"/base/default.cfg \ + sed -i \ -e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \ -e "s:libGL:/usr/$(get_libdir)/libGL:" \ - || die "sed failed" + "${demo}"/base/default.cfg || die insinto "${dir}" exeinto "${dir}" |