gentoo resync : 14.07.2018

6 files changed, 218 insertions, 0 deletions

diff --git a/games-arcade/wop/Manifest b/games-arcade/wop/Manifest
new file mode 100644
index 000000000000..dde18551c81b
--- /dev/null
+++ b/games-arcade/wop/Manifest
@@ -0,0 +1,7 @@
+AUX wop-0.4.3-fix-build-system.patch 2381 BLAKE2B 8115f6da93c503b1f5271bf0f8cf40c0513b0a3d74ec2387201d4ed2ec52a1518171e382518541315964b3dc6ca19ed99562c660653dcfefb0f5057f5c35d936 SHA512 73c7196caeeaf247bcc70336c8ce105b43ff08948d0f959487fa497c540e3a7447eadabdc8cc9753e7436ae86aad2fbdeb6190e2da75e7f0bf5bd23ff57b0d33
+AUX wop-0.4.3-gcc43.patch 761 BLAKE2B 7800d46a067f23ac40f9fca23699579fbbbe644550394fc41fe6dc8fde9103a8d456c35d29114829f388244dc2410309fbfc5bc26eecf01883d4034e23618bc0 SHA512 24ecbb265e9b38c8515b50a5f897c295e3573d6f5ca2a0f463db178d404456875af65c5ce0e9ea72bebffae3250dec44e4ae86da6558ea60db0760ce5247014a
+AUX wop-0.4.3-gcc6.patch 673 BLAKE2B 0c535efe1aa0b005f30bbf17a075de0f51822d4d0474f635bd0c23e0e667d2e5e94f0735079498d23e0be9035545e09f0b394bf3b4102372159db21775caf17e SHA512 7e0624b4a7a99eacbb854b1e0075ecc06c7b4b10d8a7ad18e01d5908cab7a7c222d8d15d833a2cd85f49d75d3b6aa1709bb7ec6ba69f29ed98ea17778df1a057
+DIST wop-0.4.3-src.tar.bz2 280974 BLAKE2B 8a24aa604ba0eab141e9a59b595ea882a5b0fb22662bb10752d2fdac79e00be4bce4721cdfca479d8f55bcaee5f1f33e7af57573dbd4c7994c88124ac35fd551 SHA512 259f9f455e6fbfae2ffb6e169dcf1661f1353e28a5e51b6e907f2868a50c5f54982b4d383dcfcec201c9a2d0429fb468c44c974695364c5fd28d25328e10c6b8
+DIST wopdata-2005-12-21.tar.bz2 4217006 BLAKE2B 0ebe5dd4ee8ca2ea026313ec9ee6a283699ad144e39a7d1f6984c37720b0beafb98a8864a0695484427c3398969908f3ca16909ef07601046540accb3cfbe103 SHA512 6ebc264d1811091550d664a77aeae68184a058c666db486e4ae411e0849abbd02dd2037a3a1a9a31a73774e5f616c21840b0c1de58636dde0e59bd0e952cb505
+EBUILD wop-0.4.3-r2.ebuild 1117 BLAKE2B 669cb80cf2020b122c7472e7af59231658701b8014e8d4c125a8b1a814e838d2f43a984d916ba6f6f25d20ad71a724274a717ab8fceebcd82f16e7f75e710dd3 SHA512 077eeb187309698d84c354deda455f27212bdf11e7d57f296ba39b08fb7caaa1abace85b16630bed68ca9dd5823e6ab6ab7640b16a1ccdfa7d6c33dd29cbff62
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch b/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch
new file mode 100644
index 000000000000..5af16960a95a
--- /dev/null
+++ b/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch
@@ -0,0 +1,100 @@
+* Remove hardcoded user variables
+* Respect LDFLAGS and CPPFLAGS
+* Fix installation dir for arch-independent files
+
+--- a/Makefile
++++ b/Makefile
+@@ -3,22 +3,22 @@
+ sinclude Makefile.local
+ 
+ all:
+-	+cd sdlwidgets; make
+-	+cd src; make
++	$(MAKE) -C sdlwidgets
++	$(MAKE) -C src
+ runc:
+-	+cd src; make runc
++	$(MAKE) -C src runc
+ runs:
+-	+cd src; make runs
++	$(MAKE) -C src runs
+ doc:
+-	cd src; make doc
++	$(MAKE) -C src doc
+ clean:
+-	cd sdlwidgets; make clean
+-	cd src; make clean
++	$(MAKE) -C sdlwidgets clean
++	$(MAKE) -C src clean
+ 	cd doc; rm -rf html
+ unison:
+-	cd src; make unison
++	$(MAKE) -C src unison
+ gunison:
+-	cd src; make gunison
++	$(MAKE) -C src gunison
+ snapshot-src:
+ 	ln -s . wop;                                           \
+ 	tar cjvf wop-`date +%F`.tar.bz2                        \
+--- a/sdlwidgets/Makefile
++++ b/sdlwidgets/Makefile
+@@ -9,16 +9,12 @@
+ CXXFLAGS ?= -Wall -Wshadow -Wsign-compare -Wparentheses -Wconversion -g -O3 -ansi
+ CXXFLAGS += $(shell sdl-config --cflags)
+ 
+-CXX = g++
+-AR = ar cru
+-RANLIB = ranlib
+-
+ sinclude ../src/Makefile.local
+ 
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJECT_FILES) Makefile
+-	$(AR) $(TARGET) $(OBJECT_FILES)
++	$(AR) cru $(TARGET) $(OBJECT_FILES)
+ 	$(RANLIB) $(TARGET)
+ 
+ %.o: %.cpp Makefile
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -18,14 +18,13 @@
+             -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
+ 
+ WOPFLAGS = data=../data
+ DOXYGENFLAGS = ../doc/doxygen.rc
+ 
+-CXX = g++
+ DOXYGEN = doxygen
+ UNISON_SOURCE = ssh://131.188.67.22//homes/staff/pohlt/wop/.unison_data
+ 
+@@ -56,10 +55,10 @@
+ 
+ $(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 $@
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ clean:
+ 	-rm -f $(TARGET) *.o Makefile.depend*
+--- a/woprc
++++ b/woprc
+@@ -30,7 +30,7 @@
+ 
+ ## path of the data directory
+ ##  - optional, default "./data"
+-data = ./data
++data = /usr/share/wop
+ 
+ ## server name or IP address
+ ##  - optional, default "localhost"
diff --git a/games-arcade/wop/files/wop-0.4.3-gcc43.patch b/games-arcade/wop/files/wop-0.4.3-gcc43.patch
new file mode 100644
index 000000000000..d4273f18ff6e
--- /dev/null
+++ b/games-arcade/wop/files/wop-0.4.3-gcc43.patch
@@ -0,0 +1,32 @@
+--- a/src/scusibot.cpp
++++ b/src/scusibot.cpp
+@@ -5,6 +5,7 @@
+ #include "stationarygun.hpp"
+ #include "global.hpp"
+ #include <vector>
++#include <algorithm>
+ 
+ ScusiBot::ScusiBot()
+ 	: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
+--- a/src/gameinfowindow.cpp
++++ b/src/gameinfowindow.cpp
+@@ -10,6 +10,8 @@
+ #include "avatarworm.hpp"
+ #include "wopsprites.hpp"
+ #include "wopsprites.cpp"
++#include "spriteset.cpp"
++#include "spritesequence.cpp"
+ #include "scorekeeper.hpp"
+ #include "wopgui.hpp"
+ 
+--- a/src/map.cpp
++++ b/src/map.cpp
+@@ -9,6 +9,8 @@
+ #include "world.hpp"
+ #include "wopsettings.hpp"
+ #include "objectpaths.hpp"
++#include "spriteset.cpp"
++#include "spritesequence.cpp"
+ 
+ /**********************************************************/
+ 
diff --git a/games-arcade/wop/files/wop-0.4.3-gcc6.patch b/games-arcade/wop/files/wop-0.4.3-gcc6.patch
new file mode 100644
index 000000000000..14eea98c1a4e
--- /dev/null
+++ b/games-arcade/wop/files/wop-0.4.3-gcc6.patch
@@ -0,0 +1,17 @@
+--- a/src/global.cpp
++++ b/src/global.cpp
+@@ -44,10 +44,10 @@
+ #define GREEN(s)                 s
+ #define RED(s)                   s
+ #else
+-#define BLACK(s)                 "\033[0;1m"s"\033[0m"
+-#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m"s"\033[0m"
+-#define GREEN(s)                 "\033[32m"s"\033[0m"
+-#define RED(s)                   "\033[31m"s"\033[0m"
++#define BLACK(s)                 "\033[0;1m" s "\033[0m"
++#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m" s "\033[0m"
++#define GREEN(s)                 "\033[32m" s "\033[0m"
++#define RED(s)                   "\033[31m" s "\033[0m"
+ #endif
+ 
+ /**********************************************************/
diff --git a/games-arcade/wop/metadata.xml b/games-arcade/wop/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-arcade/wop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-arcade/wop/wop-0.4.3-r2.ebuild b/games-arcade/wop/wop-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..f0ef50085b68
--- /dev/null
+++ b/games-arcade/wop/wop-0.4.3-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+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=""
+
+RDEPEND="
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-net
+	media-libs/sdl-ttf"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_configure() {
+	tc-export AR CXX RANLIB
+}
+
+src_install() {
+	dobin bin/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/${MY_DATA_P}"/.
+
+	insinto /etc
+	doins woprc
+
+	newicon "${WORKDIR}/${MY_DATA_P}"/images/misc/icons/wop16.png ${PN}.png
+	make_desktop_entry wop "Worms of Prey"
+
+	dodoc AUTHORS ChangeLog README{,-Libraries.txt} REVIEWS
+}