diff options
| -rw-r--r-- | games-fps/duke3d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/duke3d/Manifest | 10 | ||||
| -rw-r--r-- | games-fps/duke3d/duke3d-20040817.ebuild | 15 |
3 files changed, 16 insertions, 15 deletions
diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog index 84eeca9e751f..fa5fa886b981 100644 --- a/games-fps/duke3d/ChangeLog +++ b/games-fps/duke3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/duke3d # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.19 2005/03/28 13:17:51 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.20 2005/06/23 16:01:40 mr_bones_ Exp $ + + 23 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> + duke3d-20040817.ebuild: + don't use asm for hardened (bug #96696) 28 Mar 2005; Guy Martin <gmsoft@gentoo.org> duke3d-20040817.ebuild: OMG ! This thing runs on hppa ! diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest index 1a929bc33323..db1eaceb6d8e 100644 --- a/games-fps/duke3d/Manifest +++ b/games-fps/duke3d/Manifest @@ -1,10 +1,10 @@ -MD5 957fa2180aef27ecd3bd575395c302de ChangeLog 2803 -MD5 5d948e845cd3dec902f52090bc5715c4 duke3d-20040817.ebuild 2948 MD5 3a1f336e4cfd9b74bc9bacb21ea0b300 metadata.xml 2684 -MD5 6ba6bae3aa96076fbb7dc72e06d93d3d files/20040817-credits.patch 1267 +MD5 10d8b6bb26d3655b2cf0ccea8c37e4bf duke3d-20040817.ebuild 2977 +MD5 22934c1bff0375b6c8c053a79b0405de ChangeLog 2930 +MD5 ccf71074bb15e3a511194a887a3a7040 files/duke3d.cfg 4314 +MD5 7c796eee05f2a392dd0449339bc37804 files/digest-duke3d-20040817 69 MD5 50643150138fd99d9cfb2ed68df15e7d files/20040817-duke3d-makefile-opts.patch 863 MD5 8832de2aa57847fefffa6b1f0695603f files/20040817-endian.patch 772 MD5 b5f62f5d9c612de0355e3ca3db6c5875 files/20040817-gcc34.patch 1886 -MD5 7c796eee05f2a392dd0449339bc37804 files/digest-duke3d-20040817 69 -MD5 ccf71074bb15e3a511194a887a3a7040 files/duke3d.cfg 4314 MD5 d9b4e6eca1f10d7502ce7c8b360ba16b files/network.cfg 398 +MD5 6ba6bae3aa96076fbb7dc72e06d93d3d files/20040817-credits.patch 1267 diff --git a/games-fps/duke3d/duke3d-20040817.ebuild b/games-fps/duke3d/duke3d-20040817.ebuild index 4b57dd69df08..5f2fdea49a6b 100644 --- a/games-fps/duke3d/duke3d-20040817.ebuild +++ b/games-fps/duke3d/duke3d-20040817.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.5 2005/03/28 13:17:51 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20040817.ebuild,v 1.6 2005/06/23 16:01:40 mr_bones_ Exp $ fromcvs=0 ECVS_MODULE="duke3d" @@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ppc hppa" -IUSE="perl opengl" # nophysfs" +IUSE="hardened perl opengl" # nophysfs" RDEPEND="virtual/x11 media-libs/libsdl @@ -29,8 +29,7 @@ RDEPEND="virtual/x11 perl? ( dev-lang/perl ) opengl? ( virtual/opengl )" DEPEND="${RDEPEND} - x86? ( dev-lang/nasm ) - >=sys-apps/sed-4" + !hardened? ( x86? ( dev-lang/nasm ) )" S="${WORKDIR}/${ECVS_MODULE}" @@ -69,7 +68,7 @@ src_unpack() { -e "/^use_physfs := / s:=.*:= false:" \ Makefile \ || die "sed duke3d Makefile failed" - if use x86 ; then + if ! use hardened && use x86 ; then sed -i \ -e 's:^#USE_ASM:USE_ASM:' buildengine/Makefile \ || die "sed failed" @@ -83,10 +82,8 @@ src_unpack() { } src_compile() { - cd source/buildengine - emake OPTFLAGS="${CFLAGS}" || die "buildengine failed" - cd .. - emake OPTIMIZE="${CFLAGS}" || die "duke3d failed" + emake -C source/buildengine OPTFLAGS="${CFLAGS}" || die "buildengine failed" + emake -C source OPTIMIZE="${CFLAGS}" || die "duke3d failed" } src_install() { |