From: Tristan Heaven Date: Mon, 2 Apr 2007 14:57:48 +0000 (+0000) Subject: keyword ~x86, bug #173092 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=202c6085a2c5e8a2dbec6fe6af17fabc01b78457;p=gentoo.git keyword ~x86, bug #173092 Package-Manager: portage-2.1.2.3 --- diff --git a/games-arcade/snake3d/ChangeLog b/games-arcade/snake3d/ChangeLog index 40563e779afd..b91773898cf4 100644 --- a/games-arcade/snake3d/ChangeLog +++ b/games-arcade/snake3d/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for games-arcade/snake3d # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/snake3d/ChangeLog,v 1.1 2007/03/31 09:36:23 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/snake3d/ChangeLog,v 1.2 2007/04/02 14:57:48 nyhm Exp $ + + 02 Apr 2007; Tristan Heaven + +files/snake3d-0.9-build.patch, snake3d-0.9.ebuild: + keyword ~x86, bug #173092 *snake3d-0.9 (31 Mar 2007) - 31 Mar 2007; +files/snake3d-0.9-amd64.patch, + 31 Mar 2007; +files/snake3d-0.9-amd64.patch, +metadata.xml, +snake3d-0.9.ebuild: New package. Bug #117079 by roma1390 diff --git a/games-arcade/snake3d/Manifest b/games-arcade/snake3d/Manifest index 8e2dc43e96cb..16153cd1c823 100644 --- a/games-arcade/snake3d/Manifest +++ b/games-arcade/snake3d/Manifest @@ -5,15 +5,19 @@ AUX snake3d-0.9-amd64.patch 860 RMD160 249c741e20c672ef1a4d0f378756d3d58b01d690 MD5 0baa0ebd556d601cda885189f9843834 files/snake3d-0.9-amd64.patch 860 RMD160 249c741e20c672ef1a4d0f378756d3d58b01d690 files/snake3d-0.9-amd64.patch 860 SHA256 5b282bdc85808e66c65351394a6c1c08fa33766e6b9cb1d35bc53513d8e4dedf files/snake3d-0.9-amd64.patch 860 +AUX snake3d-0.9-build.patch 881 RMD160 b83575faa307b5b63d5de7c92675d9f78c3837a7 SHA1 562b0ca2fa87ade9ab2853af7ef430959bd2b01e SHA256 562c7dc2ddb45e8603094815747e2b2eaeeca52b662a17f2357ca161343b097c +MD5 ec1a4d53aaf5ad0ab19134acb94d0f57 files/snake3d-0.9-build.patch 881 +RMD160 b83575faa307b5b63d5de7c92675d9f78c3837a7 files/snake3d-0.9-build.patch 881 +SHA256 562c7dc2ddb45e8603094815747e2b2eaeeca52b662a17f2357ca161343b097c files/snake3d-0.9-build.patch 881 DIST snake3d-0.9.tar.gz 62900 RMD160 40c625995535ef634d50cec3d9407781a3c1a816 SHA1 4d0e76bf4e987fab6a4172d95479986e81f01956 SHA256 38f7a8020044f331da2b718df5ec65d9cca95eaa1866acce3ea8772ac27ec16b -EBUILD snake3d-0.9.ebuild 781 RMD160 a181e07b2d8cdbf32d1785aabefea65c34456901 SHA1 95b91d882c3eb4eff67292a319e4603ad4d94100 SHA256 f83cd9325c975e87a95d4ab02831e5d244eaa922d40a9de0ba3bd97fb44223f6 -MD5 8cb3a6b753d7b9ad52793b794ada2ebf snake3d-0.9.ebuild 781 -RMD160 a181e07b2d8cdbf32d1785aabefea65c34456901 snake3d-0.9.ebuild 781 -SHA256 f83cd9325c975e87a95d4ab02831e5d244eaa922d40a9de0ba3bd97fb44223f6 snake3d-0.9.ebuild 781 -MISC ChangeLog 387 RMD160 31f8c74ddf9bdd3572541714549207a9e3a5ffc5 SHA1 97b01a51034177427a7fe898442df570c0bba7fd SHA256 5d3c702d5f5e4443a337295291f367dd9c438e489bbf67d8ef7270f08e18ca2b -MD5 fd8cc3132308fb48ae746351a9ceb9f5 ChangeLog 387 -RMD160 31f8c74ddf9bdd3572541714549207a9e3a5ffc5 ChangeLog 387 -SHA256 5d3c702d5f5e4443a337295291f367dd9c438e489bbf67d8ef7270f08e18ca2b ChangeLog 387 +EBUILD snake3d-0.9.ebuild 883 RMD160 f4b0fc25568128e642a6e65149fa9cdc854f6c2a SHA1 85816020d1fb815ac02fcb59594ac2757b4aa3a4 SHA256 5bedf4ee57b6657e3c256adfd0a258eaa4ffa516dd848cb590a6b15f321ddd01 +MD5 c609354259f0443dca2e8dbc179e8fff snake3d-0.9.ebuild 883 +RMD160 f4b0fc25568128e642a6e65149fa9cdc854f6c2a snake3d-0.9.ebuild 883 +SHA256 5bedf4ee57b6657e3c256adfd0a258eaa4ffa516dd848cb590a6b15f321ddd01 snake3d-0.9.ebuild 883 +MISC ChangeLog 515 RMD160 282e95c0923106c898d9cbf77b95e0ba69c8143f SHA1 801b08bcdac2ec0154f792bbe4cb63f132596270 SHA256 6772da8e480d0f957f6611a5ca9ed7a2429ddb5f317683005af0060e39a89d25 +MD5 03e2b3e0a26d16ce43122197339ffdcb ChangeLog 515 +RMD160 282e95c0923106c898d9cbf77b95e0ba69c8143f ChangeLog 515 +SHA256 6772da8e480d0f957f6611a5ca9ed7a2429ddb5f317683005af0060e39a89d25 ChangeLog 515 MISC metadata.xml 435 RMD160 69890f55b0eec6c0f4d80ebab36e638ccb7b7b54 SHA1 ed54a61f28614ea3a36f9e054c08cbc817fe52ae SHA256 97deab27d14ae43173bede46b49d45eb69e65162bb2f253da13e9a2f76bcdf8a MD5 e65ae91c9a0eb247ed2139ccd928740a metadata.xml 435 RMD160 69890f55b0eec6c0f4d80ebab36e638ccb7b7b54 metadata.xml 435 @@ -22,9 +26,9 @@ MD5 8d812b33e21764827560449456fd5fa6 files/digest-snake3d-0.9 232 RMD160 770e8486485deaa732a5eaea8240ba2cdbc13090 files/digest-snake3d-0.9 232 SHA256 eda83f6d29878d5bc6b6a1be893e90a96d8c7bff68cc9fe7fedf50ae29981339 files/digest-snake3d-0.9 232 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGDiuiRmMZkarFlIwRArjxAJ4z8JEzHY1o9giN+hgZfCpehsW5wgCeOsw1 -terYdzCIJ35iGELJPxxaQcM= -=HkrX +iD8DBQFGERnzdz7hIScOURERApLCAKCXr/da/hELkBiKN85mDCtXrkgypQCfcU7H +A5EFx9vw2aL68D987n1ENFg= +=idFa -----END PGP SIGNATURE----- diff --git a/games-arcade/snake3d/files/snake3d-0.9-build.patch b/games-arcade/snake3d/files/snake3d-0.9-build.patch new file mode 100644 index 000000000000..f7d8c4404df4 --- /dev/null +++ b/games-arcade/snake3d/files/snake3d-0.9-build.patch @@ -0,0 +1,24 @@ +--- src/Makefile ++++ src/Makefile +@@ -1,10 +1,10 @@ + OBJ = board.o snake.o game.o menu.o snake3d.o global.o consts.o cube.o functions.o preferences.o rooms2.o network.o userInput.o server.o packets.o client.o classic2d.o +-CXXFLAGS = -g -Wall -I/usr/X11R6/include/ `sdl-config --cflags` ++CXXFLAGS += -Wall $(shell sdl-config --cflags) + CXX = g++ + CC = g++ + #LDFLAGSMAC = -framework GLUT -framework OpenGL -framework Cocoa -bind_at_load -L/sw/lib/ -lSDL -lSDLmain + LDFLAGSMAC = `sdl-config --libs` -framework GLUT -framework OpenGL -lSDL_net +-LDFLAGS = -L/usr/X11R6/lib/ -lGL -lglut -lGLU -lSDL -lSDL_net ++LIBS = -lGL -lglut -lGLU $(shell sdl-config --libs) -lSDL_net + + all: snake3d + +@@ -18,7 +18,7 @@ + g++ $(LDFLAGSMAC) $(OBJ) -o ../snake3d + + snake3d.linux: $(OBJ) +- g++ $(LDFLAGS) $(OBJ) -o ../snake3d ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o ../snake3d + + + clean: diff --git a/games-arcade/snake3d/snake3d-0.9.ebuild b/games-arcade/snake3d/snake3d-0.9.ebuild index f30e331715bd..8e4e1e1b3004 100644 --- a/games-arcade/snake3d/snake3d-0.9.ebuild +++ b/games-arcade/snake3d/snake3d-0.9.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/snake3d/snake3d-0.9.ebuild,v 1.1 2007/03/31 09:36:23 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/snake3d/snake3d-0.9.ebuild,v 1.2 2007/04/02 14:57:48 nyhm Exp $ -inherit eutils games +inherit eutils toolchain-funcs games DESCRIPTION="variant of the snake game" HOMEPAGE="http://sourceforge.net/projects/worms3d/" @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/worms3d/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="media-libs/sdl-net @@ -24,11 +24,17 @@ S=${WORKDIR}/${PN} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}"-amd64.patch + epatch \ + "${FILESDIR}"/${P}-amd64.patch \ + "${FILESDIR}"/${P}-build.patch +} + +src_compile() { + emake CXX=$(tc-getCXX) -C src snake3d.linux || die "emake failed" } src_install() { - dodoc ChangeLog README TODO || die "failed installing doc" - dogamesbin ${PN} || die "failed installing executable" + dogamesbin ${PN} || die "dogamesbin failed" + dodoc ChangeLog README TODO prepgamesdirs }