add missing patch for bug #508464

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 106 insertions, 24 deletions

diff --git a/games-roguelike/stone-soup/ChangeLog b/games-roguelike/stone-soup/ChangeLog
index 9f8405692445..bdc307f7bc57 100644
--- a/games-roguelike/stone-soup/ChangeLog
+++ b/games-roguelike/stone-soup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/stone-soup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.28 2014/04/22 13:31:00 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/stone-soup/ChangeLog,v 1.29 2014/04/23 06:15:37 mr_bones_ Exp $
+
+  23 Apr 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/stone-soup-0.14.0-build.patch:
+  add missing patch for bug #508464
 
 *stone-soup-0.14.0 (22 Apr 2014)
 
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 23db5ebdf90d..8426aa408782 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX stone-soup-0.11.2-build.patch 3337 SHA256 7553e5133b0afc49c9ed59c270763c02c939de15e11d7bd571f93e8705d7a241 SHA512 c433cdaf55a9f128573f170540fa69b1f2f8720b6338d58d61dc341f65fbf350bb319c2091bfacf591a855c1f9d031f99b946cf3c634a6e3f81ea57a7bb23a2f WHIRLPOOL 66f02948720dc4129c77067029b28da517981e78d27e2b1e5da9863b12e657d41b3cdc99e2ace854133b93d0290abba64ff863c898a5a141ba98a3ecec6d32d9
 AUX stone-soup-0.12.2-build.patch 2576 SHA256 befc3345c2a0ae4fdee5e3a0ac61e78b1d5b9552cd2f4d9e495457e70183c8b5 SHA512 a4d4e5d68d129f15c3f2214d2cc33fe1f5436dfd3be1f4621383f7589ca6d33314c0c891c1ab9575b013fe0d23bf3876c35b2ba9310fd4059caa500bc6e8ff60 WHIRLPOOL 2426d084e79112b6e815f3916cd0b83b4c559afc397573cbe390ce6ace1df8c3ced791ef8e47ef25e3e5f5fbb6021125c88deee1a5244390f46765df4a27e55f
 AUX stone-soup-0.12.3-build.patch 2576 SHA256 befc3345c2a0ae4fdee5e3a0ac61e78b1d5b9552cd2f4d9e495457e70183c8b5 SHA512 a4d4e5d68d129f15c3f2214d2cc33fe1f5436dfd3be1f4621383f7589ca6d33314c0c891c1ab9575b013fe0d23bf3876c35b2ba9310fd4059caa500bc6e8ff60 WHIRLPOOL 2426d084e79112b6e815f3916cd0b83b4c559afc397573cbe390ce6ace1df8c3ced791ef8e47ef25e3e5f5fbb6021125c88deee1a5244390f46765df4a27e55f
 AUX stone-soup-0.13.0-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
 AUX stone-soup-0.13.1-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
 AUX stone-soup-0.13.2-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
+AUX stone-soup-0.14.0-build.patch 2660 SHA256 e1bb697055c3cce3d3d58d13fbb731b3ad215c11acd1b87ff238f55609db6442 SHA512 ec13535360e8224a8354f8ed335a1e1d862d75faca8622ae1536d0a6fdbac750d75f87289b4e5d2eb8031f6b6663b04fd0ab6b0b30249b81d45a2c0004668047 WHIRLPOOL 90575542e59cbc4b568b2d85c2bebb04661018cffb74346b03eaeaecd81456365007536851baffc42f416c1ed97640529391a98f7089d1049df4bdfeafa7f3ae
 DIST stone-soup.png 1351 SHA256 486da51db277817f6fa59c32b131fa4d50cace7d8c9a84995d22f13a92e384e1 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc WHIRLPOOL 621b93f192d9335f57b18a72489450511be993f79ac5ea26529d3424adcddf1c64cb2c996fa1265cbd341a31dabe550253d0302c941fcd751197aff7840acee3
 DIST stone-soup.svg 68546 SHA256 f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4dbe59e7f2f231eb071 SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f WHIRLPOOL 49b7e0ca45319b2f016203e02b1e08207e9f0c18501b17f5922f1983fbb6bfabc12a9ca3199697f78561739e253f200bfbe984082bb99e1c8e289e5c41004bed
 DIST stone_soup-0.11.2-nodeps.tar.xz 7518884 SHA256 ae399a9ef1861918b5cef3224893618167b709d5d72321cc328859e111f8e259 SHA512 28d4fe005727fdc8662581921c33edb325bb561f7be2823bd036bfd84422128a0c85ac774785277f326c92de6ec3743751b86a5f74f12559b77f1fb02f1e1614 WHIRLPOOL 5c65c7efddba01265e9223d90ea539b42750e1d49fc76e7ada94b484244b5fb1301da3b3a883b89e3ebeff92279f92d69999cae69f6cf9de19f4a7d19aeae277
@@ -23,24 +21,5 @@ EBUILD stone-soup-0.13.0.ebuild 3535 SHA256 bc2304243f9fd226ca94d43c146e06db9aaa
 EBUILD stone-soup-0.13.1.ebuild 3538 SHA256 a576194c5d90b0e5cbd99842f7618f60c9805983b61fca26374a07cd020d862f SHA512 5532e74c328de10d7198ebb8f189788b202253e55db42660fd26f5e4927f6d397ea5be6e662f262a96ca5d4a05a88f76bf635c531c8106df7777fa362ebec60e WHIRLPOOL a05cebf5219b20881d01cb3cc44b0b8bb7ea6980d2d9672fe6138791dcff27fa5595bfd22aa9499522cc546fff6c1d3aaa1f902098bbf2ecb498a920c53f835d
 EBUILD stone-soup-0.13.2.ebuild 3542 SHA256 2f818e167009cd52145fccfe5fb88146a87da32c8422478452f1baa4029a4d61 SHA512 5a5ae35bca55c6c45a693e654d95b17413899afba1be336c4b3cbc9740e4059e9dc6ff2814b9012e25ef5a1b0d34a36299e8787801539dd77a2d5ce943630c5b WHIRLPOOL ce460be4669f23cfaf2f3e7af11cad20872c9c5d387896910accd2a5c35dc01360756c8737f82b966538e4b663f114325a79f7393d26f085b1b96917fc9677ac
 EBUILD stone-soup-0.14.0.ebuild 3542 SHA256 0f5f8c18f46a2f13b2c6a1199a923ee2b8d4a5c96de7a8ddffc1e317c7a36129 SHA512 583867ad960feac47672955d4a135342d66aff1f9f6dd13a77b00f882c4c9301ef5d25c70136f2164e40e91632c370b4e70b72fd040c4e55747fbe979b9d6a22 WHIRLPOOL 083185ef1b55744c4a77f6733f7c4a12b3190d595473e5b9a66f736977b628608e8936b47d5cb7c18f81a29d42a538b017f865ade3b2b33706761dd7b4d3d70e
-MISC ChangeLog 4517 SHA256 b1648ff929927fe5e4d2ee3d90e6a8a811473fe7a4e249456a4281403145cfa6 SHA512 4209eed9c9644e8488cf1bbb7398905c9f0cc59d36afb358067a31fcc2aa7091593a2f7c618edffd8c3cd1d5871f124895c7edf9d9930d80cc5d7f50ec061639 WHIRLPOOL 82a5aaaeac79e0f2c88a3e81f0e14c062a0bb54aae8938641c6ef1ee895dbd28b9b9bc62f641792c94375b3eff06a42f7c46f631f6cdeaac0d3edea9c526898a
+MISC ChangeLog 4650 SHA256 b793f55b273f826c3a29f8f71295e78968ef707561a692bd45fb4f1f11321de6 SHA512 e3337f2957b6df1a045ea46046e0503b8d2f9f4d6c5a5f2b0c4003af3a1cf132aeb0e2d38e7149a1c047e58bfd67f4d87e457299d2bc59a6333261e5d0e84971 WHIRLPOOL 2980db4d67a0a5e0eb91321b1d2ec44a02f350a0baac411b4fe490930cd8852338e136b8035663981e4bf0d3a3012b0dc8905625a67beadd657daca29db08a63
 MISC metadata.xml 1503 SHA256 2d765e18464f1454dd60719d89dbbbb7dffd6c36d5e50457a9766fd30ae7be1e SHA512 6b128a5b573a67e6333cd64813489abc4b451ef1fdf7df97ff2aaf4e7b8f3cdf0d7d5afdd6e930372b4af773d6e365e8d2b7552e765e3b1a8fbe081088c4accd WHIRLPOOL 5d4fdb548f52e4fde8643e7bdab7288ec4220f7b6ea30191fef82ae4a4d131929ca73bf0057f6e796dcbedce11b83a829521c8c4f932aafdd20e9d9f1d6cb703
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCABmBQJTVm8XXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgXfMQAMEXBy0QrMBbF5GwSTbDOERQ
-Y61pv+xUDlJZIDf9aqZ3P9UinZPkhxaO+Q/A4z105Nyfms2zWPxw/yb8Odw6XXfp
-W0feJvdZp82+MVJKfNSDgHOFxRhNfnF0O2abpltkx4NwLKYjdHGkrZcBoZrDAK9J
-aRx4wDwLXCxMU55hPZj5PrfN6K/zZOYLpEaPWoGrOPCBDutADtiF9wrrYurwNJUP
-KF5Q+RSCQaHCDmkh6dOjEkoeOWQuFXt0w1wjcl5hcg7YV5R9auzzHr20OSUKz5WJ
-9+htZHMh5+SYrCUjFBoHFr+vgnx2RoQLrNLD0YYv4qTFMNsDLSAhc3Vbr+DvIbBb
-232rie8u12aGfNylEItaB1Jf8o9l1Edvy5Lb8d6BvxDCoUksSR4YmBrUCxPIN7UT
-cCoQrRXcXXRa0iwasRVFywrUN2GCpdI70lpvLlaxRyo4GDcKBMSyvro47w8vn/Nr
-8vMbwvCu1CELmxlOpDRzToWMx9/xaXw/dO5tbXcP6LCJcQNVFUVCLbTTzbDFh5L0
-ZC7TonvOzwBby998xCUI/YCewOoDra4tKVTdCOZ+85g6hm0zYpTfYKOTtw1FOCiE
-CJyuCP4qR9mMV2QEYDbhqg5uFHIf0W/A/y8qVz+52XVpukipnYZIa498ZxQvl49r
-9JoiHVlWFB2v0F1G6wI4
-=mI8Y
------END PGP SIGNATURE-----
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.14.0-build.patch b/games-roguelike/stone-soup/files/stone-soup-0.14.0-build.patch
new file mode 100644
index 000000000000..5409c493780d
--- /dev/null
+++ b/games-roguelike/stone-soup/files/stone-soup-0.14.0-build.patch
@@ -0,0 +1,99 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Oct  5 13:55:07 UTC 2012
+Subject: build system 
+
+	respect flags and compiler
+
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -101,7 +101,7 @@ include Makefile.obj
+ #
+ 
+ 
+-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
++CFOTHERS := $(EXTERNAL_FLAGS)
+ CFWARN := -Wall -Wformat-security
+ CFWARN_L := -Wundef
+ 
+@@ -747,7 +747,6 @@ ifdef FULLDEBUG
+ DEFINES += -DFULLDEBUG
+ endif
+ ifdef DEBUG
+-CFOTHERS := -ggdb $(CFOTHERS)
+ DEFINES += -DDEBUG
+ endif
+ ifndef NOWIZARD
+@@ -1513,7 +1512,7 @@ ifdef ANDROID
+         # prove that tiles were generated properly
+ 	grep tile_info rltiles/*.cc| head
+ else
+-	+$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES)
++	+$(MAKE) -C $(RLTILES) all V=$(V) ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES)
+ endif
+ 
+ $(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles
+--- a/source/rltiles/Makefile
++++ b/source/rltiles/Makefile
+@@ -1,7 +1,7 @@
+ uname_S := $(shell uname -s)
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lmingw32
++LIBS += -lmingw32
+ endif
+ 
+ # Note: since generation of tiles is done on the host, we don't care about
+@@ -10,7 +10,7 @@ endif
+ # Also, cross-compilation with no system libraries for host rather than target
+ # is not supported.  If host=target, contribs are enough.
+ 
+-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
++CXXFLAGS := -Wall -Wextra -Wno-parentheses -Wno-unused-parameter
+ 
+ ifdef ANDROID
+   CXXFLAGS :=
+@@ -35,24 +35,24 @@ ifdef TILES
+     PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a
+   endif
+ 
+-  CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
+-  LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB)
++  CXXFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE)
++  LIBS += $(SDL_LDFLAGS) $(PNG_LIB)
+ 
+-  CFLAGS += -DUSE_TILE
++  CXXFLAGS += -DUSE_TILE
+ endif
+ 
+ ifdef DEBUG
+-CFLAGS += -O0 -DDEBUG -ggdb
++CXXFLAGS += -DDEBUG
+ endif
+ 
+ ifneq (,$(findstring MINGW,$(uname_S)))
+-LDFLAGS += -lgdi32 -lwinmm
++LIBS += -lgdi32 -lwinmm
+ endif
+ ifeq ($(uname_S),Darwin)
+ LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL
+ endif
+ ifeq ($(uname_S),Linux)
+-LDFLAGS += -ldl -lpthread
++LIBS += -ldl -lpthread
+ endif
+ 
+ # Attempt to use a full compiler name, to make
+@@ -137,10 +137,10 @@ clean:
+ 
+ distclean: clean
+ 
+-%.o: %.cc .cflags
+-	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
++%.o: %.cc
++	$(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(TILEGEN): $(OBJECTS)
+-	$(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
+ 
+ .PHONY: all clean distclean