From e8b21584e74ff9e048bc1b5c864e61bdb842e6dc Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Fri, 27 Apr 2007 17:20:57 +0000 Subject: [PATCH] Version bump, add ~x86-fbsd keyword with Nathan Smith patch for hardcore make in Makefile. add my patch to Makefile to repect LDFLAGS Package-Manager: portage-2.1.2.4 --- games-arcade/wop/ChangeLog | 12 +++- games-arcade/wop/Manifest | 29 ++++++-- games-arcade/wop/files/digest-wop-0.4.3-r1 | 6 ++ .../wop/files/wop-0.4.3-Makefile.patch | 54 +++++++++++++++ games-arcade/wop/wop-0.4.3-r1.ebuild | 67 +++++++++++++++++++ 5 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 games-arcade/wop/files/digest-wop-0.4.3-r1 create mode 100644 games-arcade/wop/files/wop-0.4.3-Makefile.patch create mode 100644 games-arcade/wop/wop-0.4.3-r1.ebuild diff --git a/games-arcade/wop/ChangeLog b/games-arcade/wop/ChangeLog index ddd401136e50..4b8fca73ab1a 100644 --- a/games-arcade/wop/ChangeLog +++ b/games-arcade/wop/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-arcade/wop -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/wop/ChangeLog,v 1.4 2006/06/06 16:31:51 wolf31o2 Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/wop/ChangeLog,v 1.5 2007/04/27 17:20:57 drizzt Exp $ + +*wop-0.4.3-r1 (27 Apr 2007) + + 27 Apr 2007; Timothy Redaelli + +files/wop-0.4.3-Makefile.patch, +wop-0.4.3-r1.ebuild: + Version bump, + add ~x86-fbsd keyword with Nathan Smith patch for hardcore make in Makefile. + add my patch to Makefile to repect LDFLAGS 06 Jun 2006; Chris Gianelloni wop-0.4.3.ebuild: Added ~amd64 and closing bug #125876. diff --git a/games-arcade/wop/Manifest b/games-arcade/wop/Manifest index b48baa673622..2c03c1a96f99 100644 --- a/games-arcade/wop/Manifest +++ b/games-arcade/wop/Manifest @@ -1,13 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX wop-0.4.3-Makefile.patch 1476 RMD160 dda50bcf7c8b67a8d7baba8a48435d6d94166bcf SHA1 ce428667aa10559045c3875c27a0ca028cb85d5e SHA256 298c2d1b4ad5c93f61ddad162d50482fd5f6214401121fc6252c4915eb61c370 +MD5 dc0ce5a1d3743ba7e72d2f855be3542b files/wop-0.4.3-Makefile.patch 1476 +RMD160 dda50bcf7c8b67a8d7baba8a48435d6d94166bcf files/wop-0.4.3-Makefile.patch 1476 +SHA256 298c2d1b4ad5c93f61ddad162d50482fd5f6214401121fc6252c4915eb61c370 files/wop-0.4.3-Makefile.patch 1476 DIST wop-0.4.3-src.tar.bz2 280974 RMD160 9e7dc590557a7fbf9f00691d70c520155ca9a6a7 SHA1 b5556d83e6855e50fe439b57978c4c5c0521d4a8 SHA256 7e7213e5e5f5af9154c255132ca772c8e6d7815a1a1915fc5faa443c8f40ff23 DIST wopdata-2005-12-21.tar.bz2 4217006 RMD160 3ea35cca0b28bbd0ff278899b5cc1d8dd83e0602 SHA1 8a1b3c7dfcc1c938aa18afb938caa2ce6e4c1b28 SHA256 cd6b8eb9f77f709d7a52b913d8a665bd202c53ceca9cf96b4c9f9adc17d8a6b2 +EBUILD wop-0.4.3-r1.ebuild 1693 RMD160 24a6128ddbd27c62004db77e31903808dfca7cba SHA1 513ef6a0435c476dbccf37bd3b8aa34a27c4be72 SHA256 45795e48c82d7f8bf0c8dd1659b82a8a25084532f3ad505676df473cc964afed +MD5 f51b34d2de6bad0cae4998a125f4a01e wop-0.4.3-r1.ebuild 1693 +RMD160 24a6128ddbd27c62004db77e31903808dfca7cba wop-0.4.3-r1.ebuild 1693 +SHA256 45795e48c82d7f8bf0c8dd1659b82a8a25084532f3ad505676df473cc964afed wop-0.4.3-r1.ebuild 1693 EBUILD wop-0.4.3.ebuild 1545 RMD160 d0181583caf7447cb7644aafca0f38750a9921b0 SHA1 212f97e9d4abcf9297575f3ef1944641839306b0 SHA256 f6475d689ab1fd05e44d374c6cc135e96421212ff47afdfbf3e7e91263843948 MD5 919c13e0447dc46916323b13f62b42d9 wop-0.4.3.ebuild 1545 RMD160 d0181583caf7447cb7644aafca0f38750a9921b0 wop-0.4.3.ebuild 1545 SHA256 f6475d689ab1fd05e44d374c6cc135e96421212ff47afdfbf3e7e91263843948 wop-0.4.3.ebuild 1545 -MISC ChangeLog 741 RMD160 57193d5110527336a45a09c58b1a70c089483024 SHA1 9e5708b41a37de8b5d64f1b85ab4019ac35e14a1 SHA256 17d311b3e4fb6c640d25b7f957e8b9866d59de930ad62cd81477aaa221c326c2 -MD5 ef100bf339756633953fe19227554051 ChangeLog 741 -RMD160 57193d5110527336a45a09c58b1a70c089483024 ChangeLog 741 -SHA256 17d311b3e4fb6c640d25b7f957e8b9866d59de930ad62cd81477aaa221c326c2 ChangeLog 741 +MISC ChangeLog 1018 RMD160 6c8d73bdc662187aed644de873cf7a00cad92fb6 SHA1 16f49a0c5670b6afdef046e74f7827719e5e811e SHA256 218daac71055f6ee3838add32d6f01905adb02dc300bba0c03a5c9a8905c010e +MD5 342ebd58152ed56e7bbc2bde205a99c5 ChangeLog 1018 +RMD160 6c8d73bdc662187aed644de873cf7a00cad92fb6 ChangeLog 1018 +SHA256 218daac71055f6ee3838add32d6f01905adb02dc300bba0c03a5c9a8905c010e ChangeLog 1018 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -15,3 +26,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 73e83448c8d2a296b35efc4961245556 files/digest-wop-0.4.3 506 RMD160 d771ef5fd36f9c82f2e08b4a00a841da65a92454 files/digest-wop-0.4.3 506 SHA256 12f00bed4e96464709185e03db1fffa1bcb97c217118f63b85a0481712f27368 files/digest-wop-0.4.3 506 +MD5 73e83448c8d2a296b35efc4961245556 files/digest-wop-0.4.3-r1 506 +RMD160 d771ef5fd36f9c82f2e08b4a00a841da65a92454 files/digest-wop-0.4.3-r1 506 +SHA256 12f00bed4e96464709185e03db1fffa1bcb97c217118f63b85a0481712f27368 files/digest-wop-0.4.3-r1 506 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGMjD/jJyKLBkBVroRAiLjAKCP0R94YY5JuRJXKtpM15BCkOTG5ACeNVsg +vd7P+VUwN+cl+QvdRmdnpIE= +=iRE0 +-----END PGP SIGNATURE----- diff --git a/games-arcade/wop/files/digest-wop-0.4.3-r1 b/games-arcade/wop/files/digest-wop-0.4.3-r1 new file mode 100644 index 000000000000..cbcf96e3a790 --- /dev/null +++ b/games-arcade/wop/files/digest-wop-0.4.3-r1 @@ -0,0 +1,6 @@ +MD5 ae07e9e1092de6c447a9af2cf8e90959 wop-0.4.3-src.tar.bz2 280974 +RMD160 9e7dc590557a7fbf9f00691d70c520155ca9a6a7 wop-0.4.3-src.tar.bz2 280974 +SHA256 7e7213e5e5f5af9154c255132ca772c8e6d7815a1a1915fc5faa443c8f40ff23 wop-0.4.3-src.tar.bz2 280974 +MD5 0bf42f28e03dcac5c8066b46d7733907 wopdata-2005-12-21.tar.bz2 4217006 +RMD160 3ea35cca0b28bbd0ff278899b5cc1d8dd83e0602 wopdata-2005-12-21.tar.bz2 4217006 +SHA256 cd6b8eb9f77f709d7a52b913d8a665bd202c53ceca9cf96b4c9f9adc17d8a6b2 wopdata-2005-12-21.tar.bz2 4217006 diff --git a/games-arcade/wop/files/wop-0.4.3-Makefile.patch b/games-arcade/wop/files/wop-0.4.3-Makefile.patch new file mode 100644 index 000000000000..a7d2e67f9dc6 --- /dev/null +++ b/games-arcade/wop/files/wop-0.4.3-Makefile.patch @@ -0,0 +1,54 @@ +--- Makefile.orig 2007-04-23 18:27:32 +0000 ++++ Makefile 2007-04-23 18:27:50 +0000 +@@ -3,22 +3,22 @@ + sinclude Makefile.local + + all: +- +cd sdlwidgets; make +- +cd src; make ++ +cd sdlwidgets; $(MAKE) ++ +cd src; $(MAKE) + runc: +- +cd src; make runc ++ +cd src; $(MAKE) runc + runs: +- +cd src; make runs ++ +cd src; $(MAKE) runs + doc: +- cd src; make doc ++ cd src; $(MAKE) doc + clean: +- cd sdlwidgets; make clean +- cd src; make clean ++ cd sdlwidgets; $(MAKE) clean ++ cd src; $(MAKE) clean + cd doc; rm -rf html + unison: +- cd src; make unison ++ cd src; $(MAKE) unison + gunison: +- cd src; make gunison ++ cd src; $(MAKE) gunison + snapshot-src: + ln -s . wop; \ + tar cjvf wop-`date +%F`.tar.bz2 \ +--- src/Makefile.orig 2006-02-13 10:14:01.000000000 +0100 ++++ src/Makefile 2007-04-27 18:36:22.000000000 +0200 +@@ -18,7 +18,7 @@ + -DUSE_SDL -DNEW=new\(std::nothrow\) \ + -I../sdlwidgets \ + $(shell sdl-config --cflags) # -g +-LDFLAGS = -L../sdlwidgets -lsdlwidgets -lz \ ++LIBS = -L../sdlwidgets -lsdlwidgets -lz \ + -lm -lSDL_net -lSDL_mixer -lSDL_ttf -lSDL_image \ + $(shell sdl-config --libs) # -g + +@@ -56,7 +56,7 @@ + + $(TARGET): $(OBJECT_FILES) Makefile ../sdlwidgets/libsdlwidgets.a + -mkdir ../bin +- $(CXX) $(OBJECT_FILES) -o $(TARGET) $(LDFLAGS) ++ $(CXX) $(LDFLAGS) $(OBJECT_FILES) -o $(TARGET) $(LIBS) + + %.o: %.cpp Makefile + $(CXX) $(CXXFLAGS) -c $< -o $@ \ No newline at end of file diff --git a/games-arcade/wop/wop-0.4.3-r1.ebuild b/games-arcade/wop/wop-0.4.3-r1.ebuild new file mode 100644 index 000000000000..acb45d66fe6c --- /dev/null +++ b/games-arcade/wop/wop-0.4.3-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/wop/wop-0.4.3-r1.ebuild,v 1.1 2007/04/27 17:20:57 drizzt Exp $ + +inherit eutils toolchain-funcs games + +MY_DATA_V="2005-12-21" +MY_DATA_P="${PN}data-${MY_DATA_V}" + +DESCRIPTION="Worms of Prey - A multi-player, real-time clone of Worms" +HOMEPAGE="http://wormsofprey.org/" +SRC_URI="http://wormsofprey.org/download/${P}-src.tar.bz2 + http://wormsofprey.org/download/${MY_DATA_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="sys-libs/zlib + >=media-libs/libsdl-1.2 + >=media-libs/sdl-net-1.2.5 + >=media-libs/sdl-image-1.2 + >=media-libs/sdl-mixer-1.2 + >=media-libs/sdl-ttf-2.0" + +MY_DATA_S=${WORKDIR}/${MY_DATA_P} + +src_unpack() { + unpack ${A} + + # correct path to global woprc + sed -i \ + -e "s:/etc/woprc:${GAMES_SYSCONFDIR}/woprc:g" \ + "${S}/src/wopsettings.cpp" \ + || die "sed failed" + + # patch global woprc with the correct data files location and install it + sed -i \ + -e "s:^data =.*$:data = ${GAMES_DATADIR}/${PN}:" \ + "${S}/woprc" \ + || die "sed failed" + + cd "${S}" + epatch "${FILESDIR}"/${P}-Makefile.patch +} + +src_compile() { + emake CXX=$(tc-getCXX) || die "emake failed" +} + +src_install() { + dogamesbin bin/${PN} || die "dogamesbin failed" + + newicon "${MY_DATA_S}/images/misc/icons/wop16.png" ${PN}.png + make_desktop_entry wop "Worms of Prey" + + insinto "${GAMES_DATADIR}/${PN}" + doins -r "${MY_DATA_S}"/* || die "doins failed" + + dodoc AUTHORS ChangeLog PACKAGE_MAINTAINERS README{,-Libraries.txt} REVIEWS + + insinto "${GAMES_SYSCONFDIR}" + doins "${S}/woprc" || die "doins failed" + + prepgamesdirs +} -- 2.26.2