Version bump, bug #273043

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 182 insertions, 3 deletions

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index 24b386921353..6c65f49a042f 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/widelands
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.16 2008/09/01 20:19:27 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.17 2009/07/15 12:34:23 nyhm Exp $
+
+*widelands-0.0.13 (15 Jul 2009)
+
+  15 Jul 2009; Tristan Heaven <nyhm@gentoo.org> +widelands-0.0.13.ebuild,
+  +files/widelands-0.0.13-build.patch:
+  Version bump, bug #273043
 
   01 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org>
   -files/widelands-0.0.11-build.patch, +files/widelands-0.0.12-build.patch,
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index f337f0184817..03ae99f49489 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX widelands-0.0.12-build.patch 1873 RMD160 fe038d69b72813fe779cab3579ca857842a35042 SHA1 2658e12493f26c27bcb50a4f0cde23b9ae0e58c1 SHA256 7acee54e4d3b9eb69e55868e85357f760c7e7da3b03770e5d710ff8a871c7b69
+AUX widelands-0.0.13-build.patch 2510 RMD160 ffb9bb5f5c89e52d9ddad82851ed0ae3d6dd11c8 SHA1 b2f7126ec90b85f92f3c7b23694c0187652bd061 SHA256 fe730bf0f9cb109fe10334ac948671f4f00cda504d79c28e7b7a9f836f306499
+DIST Widelands-Build13-src.tar.bz2 59030617 RMD160 d900401a27d3d98c447d5bf18037f35d4c74d740 SHA1 1634a536a45c52f656020168d1529d7e5ff092f3 SHA256 acbb4f6405e7429a8510eae5414a51cff198c1d4bef374303e3b4a47aae930b3
 DIST widelands-build-12-source.tar.bz2 41442971 RMD160 1f44fa6be78d545ffeeb19020c9fa1dc934d610f SHA1 b8d927dd44e82d357a9c05dd26d8ec386e4dce96 SHA256 3640ab4a5147ebd826accb013e2013563759ad13b31e9e41193e203c94ee6384
 EBUILD widelands-0.0.12.ebuild 1875 RMD160 61c207d6559b90ab0e130cdca009ed0fa1ba7bd5 SHA1 729cf00e5a3d39c2b888b7a959eeb66312a63bc0 SHA256 c5a4ae59c6068c785239355736ffa77d5abf1ebbc8ef6bf3a22b28f1c87a935b
-MISC ChangeLog 3094 RMD160 e38cc820c3d9a0c6329133cc04983f18451aba75 SHA1 2069eb29f6f494df7c6db1bf967de9219b206659 SHA256 654a3cafe00fafcce6808a476a30bd7c15c8edafb0678463fe893c5378f89297
+EBUILD widelands-0.0.13.ebuild 1920 RMD160 54defb6152036ae8781038738c2addddb4ee9e32 SHA1 5dcea00eab3c81d3543ef8b3c3f005c9efe62d86 SHA256 14a23fb23dd6411f58320bb980e6a7acda14f75a2cc3a120880852166c81890c
+MISC ChangeLog 3264 RMD160 3c193d1116e14ef028cd503e70713c9261d86369 SHA1 c7d341096408eeabe8e60ccdcfa01e627e25230d SHA256 2e3565db9c8b90d79625843a4ced4c56ea90538c25865eebcfddd7541f759ed5
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpdzNUACgkQdz7hIScOURG/nQCg4iYBmeP/VoOms4U3x7HuBjN6
+qQMAoLv3DND/CxxF+D5CTWxVTxoa3UHa
+=CBKS
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/widelands/files/widelands-0.0.13-build.patch b/games-strategy/widelands/files/widelands-0.0.13-build.patch
new file mode 100644
index 000000000000..2ae88df69501
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.0.13-build.patch
@@ -0,0 +1,84 @@
+--- 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?
+@@ -64,7 +64,7 @@
+ #  profile    optimized, debugging symbols, profiling
+ #
+ ifndef BUILD
+-BUILD:=debug
++BUILD:=release
+ endif
+ 
+ endif
+@@ -80,7 +80,7 @@
+ # COMPILE TIME configuration
+ ifeq ($(USE_GGZ),YES)
+ ADD_CFLAGS:= $(ADD_CFLAGS) -DUSE_GGZ
+-ADD_LDFLAGS:=-lggzmod -lggzcore -lggz
++ADD_LIBS:=-lggzmod -lggzcore -lggz
+ endif
+ 
+ ##############################################################################
+@@ -108,11 +108,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
+@@ -144,16 +142,16 @@
+ endif
+ 
+ ifeq ($(IMPLICIT_LIBINTL),NO)
+-ADD_LDFLAGS += -lintl
++ADD_LIBS += -lintl
+ endif
+ 
+ ##############################################################################
+ # 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 -lSDL_gfx
++CXXFLAGS+=-Wall $(shell $(SDL_CONFIG) --cflags) $(ADD_CFLAGS)
++LDFLAGS+=$(ADD_LDFLAGS)
++LIBS=$(shell $(SDL_CONFIG) --libs) $(ADD_LIBS) -lz -lpng -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lSDL_gfx
+ 
+ ##############################################################################
+ # Building
+@@ -215,14 +213,12 @@
+ 	$(Q)-mkdir -p $(OBJECT_DIR) $(patsubst src/%,$(OBJECT_DIR)/%,$(SUBDIRS))
+ 
+ $(OBJECT_DIR)/widelands: $(OBJ)
+-	@echo "===> LD $@"
+-	$(Q)$(CXX) $(OBJ) -o $@ $(LDFLAGS) $(CFLAGS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ -include $(DEP)
+ 
+ $(OBJECT_DIR)/%.o: src/%.cc 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
+ 
+@@ -237,4 +233,3 @@
+ 
+ src/build_id.cc:
+ 	sed -e "s/UNKNOWN/$(VERSION)/" src/build_id.cc.default > $@
+-
diff --git a/games-strategy/widelands/widelands-0.0.13.ebuild b/games-strategy/widelands/widelands-0.0.13.ebuild
new file mode 100644
index 000000000000..e41f0c73e2f2
--- /dev/null
+++ b/games-strategy/widelands/widelands-0.0.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.13.ebuild,v 1.1 2009/07/15 12:34:23 nyhm Exp $
+
+inherit eutils flag-o-matic 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}/Widelands-Build${MY_PV}-src.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
+	media-libs/sdl-gfx
+	media-libs/libpng
+	dev-libs/boost
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-b${MY_PV}
+
+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"
+	sed -i "s:/l/WiLa/Setup:${GAMES_DATADIR}/${PN}:" src/config.h.default \
+		|| die "sed config.h.default failed"
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+	emake src/build_id.cc || die "emake src/build_id.cc failed"
+	emake all || die "emake all failed"
+
+	if use nls ; then
+		utils/buildlocale.py || die "buildlocale.py failed"
+	fi
+}
+
+src_install() {
+	dogamesbin ${PN} || die "dogamesbin failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r campaigns fonts global 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-128.png ${PN}.png
+	make_desktop_entry ${PN} Widelands
+
+	dodoc ChangeLog CREDITS
+	prepgamesdirs
+}