From: Tristan Heaven Date: Wed, 21 Mar 2007 20:56:02 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95ae75e46eb0ebcbb4a4b1df0914dd5c1e30e910;p=gentoo.git Version bump Package-Manager: portage-2.1.2.2 --- diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog index b9e9b920662d..30e4b9f36823 100644 --- a/games-strategy/widelands/ChangeLog +++ b/games-strategy/widelands/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-strategy/widelands -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.10 2006/03/21 21:57:17 jokey Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.11 2007/03/21 20:56:02 nyhm Exp $ + +*widelands-0.0.10 (21 Mar 2007) + + 21 Mar 2007; Tristan Heaven + +files/widelands-0.0.10-build.patch, +widelands-0.0.10.ebuild: + Version bump *widelands-0.0.9.5-r1 (21 Mar 2006) diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest index 4364287a8172..8f8b8a7d9091 100644 --- a/games-strategy/widelands/Manifest +++ b/games-strategy/widelands/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX widelands-0.0.10-build.patch 1717 RMD160 201795c2d318dd248d5c0c20bdf495c96daa2c41 SHA1 c2d0de29276ed9d26c63a87937f04e41fc8851e4 SHA256 c8f0f9a112ab18c88e5d9b02a35c4395a5cafb9340c1d5bb30c9e42f244e62b1 +MD5 f24263b7613d77c1fcc65c93c337dfbd files/widelands-0.0.10-build.patch 1717 +RMD160 201795c2d318dd248d5c0c20bdf495c96daa2c41 files/widelands-0.0.10-build.patch 1717 +SHA256 c8f0f9a112ab18c88e5d9b02a35c4395a5cafb9340c1d5bb30c9e42f244e62b1 files/widelands-0.0.10-build.patch 1717 AUX widelands-0.0.9-amd64.patch 425 RMD160 02a4dcb0c0bb5d962df8347ee4cb6804ac08b3bd SHA1 358de9b0558b5e4643588f33a7a2a1f5d493467f SHA256 878939c6809b5de1e530d4770a9efd8ca309cd45d985e261b566ff159922d3b3 MD5 839d74b86a5e329cbfb77e61c65d6921 files/widelands-0.0.9-amd64.patch 425 RMD160 02a4dcb0c0bb5d962df8347ee4cb6804ac08b3bd files/widelands-0.0.9-amd64.patch 425 @@ -14,25 +18,33 @@ MD5 45ff0d915b222f2ba2a3915c5c01aa1f files/widelands-makefile.patch 1334 RMD160 a9f809392532b757a8b5a30a1ca16b7a5cd29245 files/widelands-makefile.patch 1334 SHA256 3141758eb4fe913fe49c1332e576c68f2cc2a85e2d30d9b8ee9209fd7547038b files/widelands-makefile.patch 1334 DIST widelands-b9half-source.tar.bz2 10989969 RMD160 b9382690dfec3f789c0db7f0163f7392d889cfb0 SHA1 5aea1a225760265cd2b2d34a2fb35a7b875488c5 SHA256 a883b410fbe3089233926f3b2314fb3ccc9262b00a1aadbda9f7d73ea572ea9b +DIST widelands-build10-source.tar.bz2 28526726 RMD160 65f85d7b7ab756560bd0bc1a470ac2b8775caadc SHA1 8d3d12d7d45e44b9fb4be5696ccc8f76c0ed667b SHA256 f67508066db1739839945f8c814a71a0e4a43904ff4a7f4e7cd3c269bcda18af +EBUILD widelands-0.0.10.ebuild 1702 RMD160 d6c1e6513abe578c98f91564363fe1235e1e071a SHA1 985429797daf9c1d80b7d307edfb2927a551effe SHA256 141936ab163a238e39cf68b9ec8a1037b0440d6fba8c1fa463decd0d570f8646 +MD5 37537d4f1679c8dd2d71d8680f7e8278 widelands-0.0.10.ebuild 1702 +RMD160 d6c1e6513abe578c98f91564363fe1235e1e071a widelands-0.0.10.ebuild 1702 +SHA256 141936ab163a238e39cf68b9ec8a1037b0440d6fba8c1fa463decd0d570f8646 widelands-0.0.10.ebuild 1702 EBUILD widelands-0.0.9.5-r1.ebuild 1710 RMD160 280302530b869e9e270236be6cdd347501b5b949 SHA1 3d58300a838351a410677cea6d277fd33cd6cd72 SHA256 494a7a8df2947c982747a1f838274c0c449a43f34999c57f52d7f4f842d686e4 MD5 143648ef0b197860c9a93621f80df3e6 widelands-0.0.9.5-r1.ebuild 1710 RMD160 280302530b869e9e270236be6cdd347501b5b949 widelands-0.0.9.5-r1.ebuild 1710 SHA256 494a7a8df2947c982747a1f838274c0c449a43f34999c57f52d7f4f842d686e4 widelands-0.0.9.5-r1.ebuild 1710 -MISC ChangeLog 2150 RMD160 d6556518dab74a51b5011605afe0f5621622d745 SHA1 c9c17898d40e0570a6fc16fecc8d8a6a227143a7 SHA256 56ef1a738484539db33cf4ac26e1f90196aad58f9c4d2d7249ec6c054f8441ec -MD5 3b412efdabdc470d25d06689a05342c6 ChangeLog 2150 -RMD160 d6556518dab74a51b5011605afe0f5621622d745 ChangeLog 2150 -SHA256 56ef1a738484539db33cf4ac26e1f90196aad58f9c4d2d7249ec6c054f8441ec ChangeLog 2150 +MISC ChangeLog 2311 RMD160 34456cceea11f01421757a232d312ebd6f85c2e5 SHA1 c6ca9247f5dd6f4a350602e2ba80d073685473ef SHA256 57c5b46994134dacfeb1ab24f1aace25d01430a5ad685ea64a1ab2a0e1979d49 +MD5 d4c85c30db8f58c77ff443d6ba0ef862 ChangeLog 2311 +RMD160 34456cceea11f01421757a232d312ebd6f85c2e5 ChangeLog 2311 +SHA256 57c5b46994134dacfeb1ab24f1aace25d01430a5ad685ea64a1ab2a0e1979d49 ChangeLog 2311 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 +MD5 4389515945a809d447098460bf963563 files/digest-widelands-0.0.10 283 +RMD160 13dd3c54eda4674fda3d8b1492b20d3ee702e075 files/digest-widelands-0.0.10 283 +SHA256 b05d2231539bc02bca620853817058465a3591de3a3daf1d26291c7b338252aa files/digest-widelands-0.0.10 283 MD5 e10d5f329e0eb06f44b8569526772ee8 files/digest-widelands-0.0.9.5-r1 280 RMD160 c9e6d18caecb85ff113b76c18da754e0da8c0af8 files/digest-widelands-0.0.9.5-r1 280 SHA256 65b319119c6b4b8653cadf0d12609cfdbb02d3126444a6a2621b99b569ad784a files/digest-widelands-0.0.9.5-r1 280 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFyvU+dz7hIScOURERAswuAKCb+Mv+G6Kxc35M3UGGsIty6NyiPgCdGZSs -Wq/bFC6hr5kTy4zH1QRkfBI= -=HhCj +iD8DBQFGAZvrdz7hIScOURERAj5vAJ9yWVvaIejKQ1IC8eYR4pnPOaLAJQCg0Z/H +1NrnSp+Sh4UJL0TG/6es6nI= +=3hFQ -----END PGP SIGNATURE----- diff --git a/games-strategy/widelands/files/digest-widelands-0.0.10 b/games-strategy/widelands/files/digest-widelands-0.0.10 new file mode 100644 index 000000000000..02b6abd30744 --- /dev/null +++ b/games-strategy/widelands/files/digest-widelands-0.0.10 @@ -0,0 +1,3 @@ +MD5 9e452baf7b8f22a27b4e371e2150e017 widelands-build10-source.tar.bz2 28526726 +RMD160 65f85d7b7ab756560bd0bc1a470ac2b8775caadc widelands-build10-source.tar.bz2 28526726 +SHA256 f67508066db1739839945f8c814a71a0e4a43904ff4a7f4e7cd3c269bcda18af widelands-build10-source.tar.bz2 28526726 diff --git a/games-strategy/widelands/files/widelands-0.0.10-build.patch b/games-strategy/widelands/files/widelands-0.0.10-build.patch new file mode 100644 index 000000000000..2695b9d393e6 --- /dev/null +++ b/games-strategy/widelands/files/widelands-0.0.10-build.patch @@ -0,0 +1,51 @@ +--- Makefile ++++ Makefile +@@ -26,7 +26,7 @@ + + #most current glibc systems implicitly contain libintl.so + ifndef IMPLICIT_LIBINTL +-IMPLICIT_LIBINTL:=NO ++IMPLICIT_LIBINTL:=YES + endif + + # Is this a cross compile? +@@ -106,11 +106,9 @@ + BUILD:=$(strip $(BUILD)) + + ifeq ($(BUILD),release) +-OPTIMIZE:=yes + # heavy optimization + #ADD_CFLAGS:=$(ADD_CFLAGS) -fomit-frame-pointer -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations + # !!!! -fomit-frame-pointer breaks execeptions !!!! +-ADD_CFLAGS:=$(ADD_CFLAGS) -finline-functions -ffast-math -funroll-loops -funroll-all-loops -fexpensive-optimizations + else + ifeq ($(BUILD),profile) + OPTIMIZE:=yes +@@ -160,9 +158,8 @@ + # Object files and directories, final compilation flags + + OBJECT_DIR:=src/$(TARGET)-$(BUILD) +-CFLAGS:=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) +-CXXFLAGS:=$(CFLAGS) +-LDFLAGS:=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net ++CXXFLAGS+=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS) ++LDFLAGS+=$(shell $(SDL_CONFIG) --libs) $(ADD_LDFLAGS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net + + ############################################################################## + # Building +@@ -217,13 +214,13 @@ + + $(OBJECT_DIR)/widelands: $(OBJ) + @echo "===> LD $@" +- $(Q)$(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CFLAGS) ++ $(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CXXFLAGS) + + -include $(DEP) + + $(OBJECT_DIR)/%.o: src/%.cc src/build_id.h src/config.h + @echo "===> CXX $<" +- $(Q)$(CXX) -pipe $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< ++ $(CXX) $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $< + $(Q)sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' $@.d > $(OBJECT_DIR)/$*.d + $(Q)rm $@.d + diff --git a/games-strategy/widelands/widelands-0.0.10.ebuild b/games-strategy/widelands/widelands-0.0.10.ebuild new file mode 100644 index 000000000000..ed870d3471c5 --- /dev/null +++ b/games-strategy/widelands/widelands-0.0.10.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.10.ebuild,v 1.1 2007/03/21 20:56:02 nyhm Exp $ + +inherit eutils flag-o-matic toolchain-funcs versionator games + +MY_PV=$(get_version_component_range 3) +DESCRIPTION="A game similar to Settlers 2" +HOMEPAGE="http://www.widelands.org/" +SRC_URI="mirror://sourceforge/${PN}/${PN}-build${MY_PV}-source.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="nls" + +RDEPEND="media-libs/libsdl + media-libs/sdl-image + media-libs/sdl-mixer + media-libs/sdl-net + media-libs/sdl-ttf + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${PN} + +src_unpack() { + unpack ${A} + cd "${S}" + rm -f $(find -name SConscript) + + epatch "${FILESDIR}"/${P}-build.patch + + sed -i 's:__ppc__:__PPC__:' src/s2map.cc \ + || die "sed s2map.cc failed" + sed -i "s:/usr/share/games:${GAMES_DATADIR}:" src/wlapplication.cc \ + || die "sed wlapplication.cc failed" +} + +src_compile() { + filter-flags -fomit-frame-pointer + emake CXX=$(tc-getCXX) || die "emake failed" + + if use nls ; then + cd locale + ../utils/buildcat.py || die + fi +} + +src_install() { + dogamesbin ${PN} || die "dogamesbin failed" + + insinto "${GAMES_DATADIR}"/${PN} + doins -r campaigns fonts maps music pics sound tribes txts worlds \ + || die "doins failed" + + insinto "${GAMES_DATADIR}"/${PN}/locale + local d + for d in locale/* ; do + if [[ -d ${d} ]] ; then + doins -r ${d} || die "doins ${d} failed" + fi + done + + newicon pics/wl-ico-48.png ${PN}.png + make_desktop_entry ${PN} Widelands + + dodoc ChangeLog CREDITS README.developers + prepgamesdirs +}