gentoo resync : 23.12.2017

4 files changed, 0 insertions, 180 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 52628b6233be..ce23d447513c 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 3faa4d9ab875..5b83f40f1580 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,5 +1,3 @@
-AUX simutrans-0.120.0.1-Makefile.patch 2048 BLAKE2B 627ba1bed88a3f2cf32d9c67ef413e4c0487d9b9b48d6464c7d773bb30ee51d771bad5378183b030d57509e115b82c1cad0d4f371b5c9b08efce97635b517e9c SHA512 174a93b8bb52273af849d20b32b286a2b16f7392b1572be4f71a430872d030dd829b4b99512c24bc619245e25701a39d233619305775a65e51db3af7298719f4
-AUX simutrans-0.120.1.3-Makefile.patch 2047 BLAKE2B bd93b9f4e2e1201280a05600be5a498e6db5a62950301b78b076cb354cede24d8a17d0400b7d8b2d1073653efe59ca3359e3fba40a0d9197232d32e45661e774 SHA512 154f32aff950973cf33fc05239c50e45196e0d1e22ce2dcca12423362eeaba74d92a15ec99faf2364c3efb9eed16fa53095352ba68a3cec4be4c8bc50ce8ba33
 AUX simutrans-0.120.2.2-Makefile.patch 2015 BLAKE2B 1a3aac151b1ead4355d4206064d1c773813789b0463b2cb90494ce759cfcd31b9ce7db5f8d52c055d9364bd7fec2e8096437e023e1e618f58a53b58666f98cdf SHA512 2d85d4a048a40c6a3581492f50f7d2364cfd36f6d0496fcf89406ed1d7ad091b218700b2e8d1f26e0bdd346b3f449e0c0d30ef4bffed30b351c1e424ce7a4439
 DIST language_pack-Base+texts.zip 1097263 BLAKE2B 08678f36a2425b84bf5f440a546af7ca6507ee17bdcfd3096335c20ce60c23a5375eb133f597806bed28db2d9ed067669e83a4df47443be0cb48bf151ba91ef2 SHA512 015caafaeace03bd5475e66c93bb433d9b07b600c3fcf125a4bda9b2856ba41dc43b923e032920df4a060087ead7180df59092f23ab6dcf12579b580827b1248
 DIST simupak64-120-2.zip 4453079 BLAKE2B 910f7937d5eabe8c97f9b9fb6b1d0a63ffe5c7a897a83d5649581f629c1e6d000442399f3e181c0a6e2b08a6f9948354df1848b84df6c2d37bd65d4c303d1626 SHA512 c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357
diff --git a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
deleted file mode 100644
index d1ff41f33feb..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -81,8 +81,6 @@
-   ifeq ($(findstring $(OSTYPE), amiga haiku mac),)

-     CFLAGS += -minline-all-stringops

-   endif

--else

--  CFLAGS += -O

- endif

- 

- ifdef DEBUG

-@@ -101,6 +99,7 @@
-   endif

- else

-   CFLAGS += -DNDEBUG

-+  CXXFLAGS += -DNDEBUG

- endif

- 

- ifneq ($(PROFILE),)

-@@ -114,6 +113,7 @@
- ifneq ($(MULTI_THREAD),)

-   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)

-     CFLAGS += -DMULTI_THREAD

-+    CXXFLAGS += -DMULTI_THREAD

-     ifeq ($(OSTYPE),mingw)

- #use lpthreadGC2d for debug alternatively

-       LDFLAGS += -lpthreadGC2

-@@ -132,11 +132,13 @@
-     endif

-     ifneq ($(REV),)

-       CFLAGS  += -DREVISION="$(REV)"

-+      CXXFLAGS  += -DREVISION="$(REV)"

-     endif

-   endif

- endif

- 

- CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

-+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

- CCFLAGS  += -Wstrict-prototypes

- 

- 

-@@ -492,6 +494,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -523,6 +526,7 @@
-     SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -538,6 +542,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer

- endif

- 

-@@ -564,6 +569,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lglew32

-   ifeq ($(OSTYPE),mingw)

-     LIBS += -lopengl32

-@@ -579,6 +585,7 @@
- endif

- 

- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

- 

- ifneq ($(findstring $(OSTYPE), cygwin mingw),)

-   SOURCES += simres.rc

-@@ -586,7 +593,6 @@
- endif

- 

- CCFLAGS  += $(CFLAGS)

--CXXFLAGS += $(CFLAGS)

- 

- BUILDDIR ?= build/$(CFG)

- PROGDIR  ?= $(BUILDDIR)

diff --git a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
deleted file mode 100644
index d3d9aae5b4e1..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -81,8 +81,6 @@
-   ifeq ($(findstring $(OSTYPE), amiga haiku mac),)

-     CFLAGS += -minline-all-stringops

-   endif

--else

--  CFLAGS += -O

- endif

- 

- ifdef DEBUG

-@@ -101,6 +99,7 @@
-   endif

- else

-   CFLAGS += -DNDEBUG

-+  CXXFLAGS += -DNDEBUG

- endif

- 

- ifneq ($(PROFILE),)

-@@ -114,6 +113,7 @@
- ifneq ($(MULTI_THREAD),)

-   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)

-     CFLAGS += -DMULTI_THREAD

-+    CXXFLAGS += -DMULTI_THREAD

-     ifeq ($(OSTYPE),mingw)

- #use lpthreadGC2d for debug alternatively

-       LDFLAGS += -lpthreadGC2

-@@ -132,11 +132,13 @@
-     endif

-     ifneq ($(REV),)

-       CFLAGS  += -DREVISION="$(REV)"

-+      CXXFLAGS  += -DREVISION="$(REV)"

-     endif

-   endif

- endif

- 

- CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

-+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

- CCFLAGS  += -Wstrict-prototypes

- 

- 

-@@ -492,6 +494,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -523,6 +526,7 @@
-     SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -538,6 +542,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer

- endif

- 

-@@ -564,6 +569,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lglew32

-   ifeq ($(OSTYPE),mingw)

-     LIBS += -lopengl32

-@@ -579,6 +585,7 @@
- endif

- 

- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

- 

- ifneq ($(findstring $(OSTYPE), cygwin mingw),)

-   SOURCES += simres.rc

-@@ -586,7 +593,6 @@
- endif

- 

- CCFLAGS  += $(CFLAGS)

--CXXFLAGS += $(CFLAGS)

- 

- BUILDDIR ?= build/$(CFG)

- PROGDIR  ?= $(BUILDDIR)