diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2009-11-28 01:45:43 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-11-28 01:45:43 +0000 |
commit | b5eb9a24d6cf77cc8965547b8d75964912c0958f (patch) | |
tree | 775acc80be4998f37d273d99c366931b789e9b8c /games-emulation/generator | |
parent | Fix src_test(). (diff) | |
download | historical-b5eb9a24d6cf77cc8965547b8d75964912c0958f.tar.gz historical-b5eb9a24d6cf77cc8965547b8d75964912c0958f.tar.bz2 historical-b5eb9a24d6cf77cc8965547b8d75964912c0958f.zip |
newer nasm fails with the old asm (bug #294916)
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-emulation/generator')
-rw-r--r-- | games-emulation/generator/ChangeLog | 8 | ||||
-rw-r--r-- | games-emulation/generator/Manifest | 4 | ||||
-rw-r--r-- | games-emulation/generator/generator-0.35_p3.ebuild | 42 |
3 files changed, 22 insertions, 32 deletions
diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog index f3b23256bb56..abeabde5ddc8 100644 --- a/games-emulation/generator/ChangeLog +++ b/games-emulation/generator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/generator -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.23 2008/06/02 06:33:10 corsair Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.24 2009/11/28 01:45:43 mr_bones_ Exp $ + + 28 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org> + generator-0.35_p3.ebuild: + newer nasm fails with the old asm (bug #294916) 02 Jun 2008; Markus Rothe <corsair@gentoo.org> generator-0.35_p3.ebuild: Stable on ppc; bug #220427 diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest index 9df7dfe727e3..80601af72b81 100644 --- a/games-emulation/generator/Manifest +++ b/games-emulation/generator/Manifest @@ -1,6 +1,6 @@ AUX generator-0.35_p3-configure.patch 3630 RMD160 71ebd4519578be16a2d4efebde10fd118a6b9806 SHA1 a50b39ea9d4871791e0f6b88671b57d0d3273a8a SHA256 229f6624cf3a016124942d5f2a78b425f791e125ddf3aa9cc26473d5e1cdc465 AUX generator-0.35_p3-execstacks.patch 429 RMD160 cfea637a080c669c5901ab7eced001ca28fe4af9 SHA1 10c7cb18bd70d3c8069c6e5642311efae3e6efa3 SHA256 ea7c9d4098007a314c38dc750fea6f2aabd2c1d133027a8fa1502a5902d0f545 DIST generator-0.35-cbiere-r3.tar.bz2 448830 RMD160 9ade032cd4813983494a80ff326da82f888885e4 SHA1 ddbadfa82b6d30ee31da71be3e42ec4623c16e13 SHA256 4d9ae1c2fea72462450ea5dd84b1fe009959e7bf66d9abe8d449572fd78a824b -EBUILD generator-0.35_p3.ebuild 1854 RMD160 1361313419f7028f5ea24f9c4d6a4b36afc4ec59 SHA1 db3d00ba5b11a87f26e3d1be1de57e08b6508ef5 SHA256 5c851808cc3210873c4d8180f460ca8794ce48f7d38ccf22c203d2577cc881b0 -MISC ChangeLog 3955 RMD160 d0e7d909cfa4a447d369779fef0e2b17e4690ee9 SHA1 1e02996b238f658081d675229c4b4611f69d7360 SHA256 3666ef4ee4e63922ac92f365cc51f5eeb2188f7fb359df7b031a4e3d5d6eeb1a +EBUILD generator-0.35_p3.ebuild 1532 RMD160 022b21dca7b6a41e4d1c15421427b4450f5b6f45 SHA1 7ce65249daa416cf7e0cc935897f98f40c6109c3 SHA256 66c126a14a7e9b9d04a11f13b7b923d0b8934aa9f8a7ea9e1ddc7376da85a4de +MISC ChangeLog 4091 RMD160 b98d4cfd7cdd7e655e8da129174f3bbe2173ca80 SHA1 0a0386881fb699cdd2c0813d438b657c5cefe1b8 SHA256 af8f98676bcd3b906ae06b2616dadc1fb5bfa10964810234f28881951f4fb75d MISC metadata.xml 227 RMD160 e810f8f158de15069421f5fa7c0bc9f115e4de49 SHA1 1fe9f24fbc5f39ded950aeefeb92dce53db37326 SHA256 b61bb0d62f0bea4e072577e5e55025be60e706ae532e9c9ad106b04815d09a7e diff --git a/games-emulation/generator/generator-0.35_p3.ebuild b/games-emulation/generator/generator-0.35_p3.ebuild index fea2d1ddc4ce..4072cb96c847 100644 --- a/games-emulation/generator/generator-0.35_p3.ebuild +++ b/games-emulation/generator/generator-0.35_p3.ebuild @@ -1,7 +1,8 @@ -# 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-emulation/generator/generator-0.35_p3.ebuild,v 1.6 2008/06/02 06:33:10 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35_p3.ebuild,v 1.7 2009/11/28 01:45:43 mr_bones_ Exp $ +EAPI=2 inherit autotools eutils toolchain-funcs games MY_P=${PN}-${PV/_p/-cbiere-r} @@ -12,35 +13,21 @@ SRC_URI="http://www.ghostwhitecrab.com/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="sdlaudio svga" +IUSE="+sdlaudio svga" -RDEPEND="media-libs/jpeg - media-libs/libsdl +DEPEND="media-libs/jpeg + media-libs/libsdl[joystick,video] + sdlaudio? ( media-libs/libsdl[audio] ) svga? ( media-libs/svgalib )" -DEPEND="${RDEPEND} - x86? ( dev-lang/nasm )" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { mkdir my-bins epatch \ - "${FILESDIR}"/${P}-execstacks.patch \ "${FILESDIR}"/${P}-configure.patch - # make it yasm-syntax-friendly - sed -i \ - -e 's/-praze/-Praze/' \ - raze/Makefile.am \ - || die 'sed failed' - # USE32 is redundent with elf - sed -i \ - -e 's/USE32//' \ - raze/raze.asm.in \ - || die 'sed failed' sed -i \ -e 's/@GTK_CFLAGS@//g' \ main/Makefile.am \ @@ -48,13 +35,13 @@ src_unpack() { eautoreconf } +src_configure() { + : +} + # builds SDL by default since otherwise -svga builds nothing src_compile() { - local myconf mygui myguis - - use x86 \ - && myconf="--with-raze" \ - || myconf="--with-cmz80" + local mygui myguis myguis="sdl" use svga && myguis="${myguis} svgalib" @@ -62,9 +49,8 @@ src_compile() { for mygui in ${myguis}; do [[ -f Makefile ]] && emake clean egamesconf \ - ${myconf} \ + --with-cmz80 \ --with-${mygui} \ - --without-gtk \ --without-tcltk \ --with-gcc=$(gcc-major-version) \ $(use_with sdlaudio sdl-audio) \ |