gentoo resync : 14.07.2018

3 files changed, 0 insertions, 95 deletions

diff --git a/games-arcade/blobby/files/blobby-1.0-compile.patch b/games-arcade/blobby/files/blobby-1.0-compile.patch
deleted file mode 100644
index f41601d56375..000000000000
--- a/games-arcade/blobby/files/blobby-1.0-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From eaa17d2ad90de2024fc3a7a59575597d1dc0b171 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2017 18:01:14 +0100
-Subject: [PATCH] Fix compilation
-
----
- src/NetworkMessage.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/NetworkMessage.cpp b/src/NetworkMessage.cpp
-index 9178e74..0c3163b 100644
---- a/src/NetworkMessage.cpp
-+++ b/src/NetworkMessage.cpp
-@@ -109,6 +109,11 @@ bool operator == (const ServerInfo& lval, const ServerInfo& rval)
- 
- std::ostream& operator<<(std::ostream& stream, const ServerInfo& val)
- {
--	return stream << val.name << " (" << val.hostname << ":" << val.port << ")";
-+	return stream
-+                    << std::string(val.name)
-+                    << std::string(" (")
-+                    << std::string(val.hostname)
-+                    << std::string(":") << std::to_string(val.port)
-+                    << std::string(")");
- }
- 
--- 
-2.11.0
-
diff --git a/games-arcade/blobby/files/blobby-1.0-install.patch b/games-arcade/blobby/files/blobby-1.0-install.patch
deleted file mode 100644
index 5bd95c121ed9..000000000000
--- a/games-arcade/blobby/files/blobby-1.0-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0a3ebb368242ed379f4ff7d5eca24be79841d968 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2017 18:55:47 +0100
-Subject: [PATCH] Install missing files
-
----
- data/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index a2454cd..5a2a661 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -25,10 +25,12 @@ set(install_files
- 	${CMAKE_CURRENT_BINARY_DIR}/backgrounds.zip
- 	${CMAKE_CURRENT_BINARY_DIR}/rules.zip
- 	config.xml
-+	Icon.bmp
- 	inputconfig.xml
- 	server/server.xml
- 	lang_de.xml
- 	lang_en.xml
-+	lang_it.xml
- 	lang_fr.xml)
- 
- if (WIN32)
--- 
-2.11.0
-
diff --git a/games-arcade/blobby/files/blobby-1.0-paths.patch b/games-arcade/blobby/files/blobby-1.0-paths.patch
deleted file mode 100644
index 6ddc76877e7d..000000000000
--- a/games-arcade/blobby/files/blobby-1.0-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3dbc91fcfe5412598201e33de80db7b1b01e4ffb Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2017 18:49:04 +0100
-Subject: [PATCH] Use system installation path
-
----
- data/CMakeLists.txt | 2 +-
- src/main.cpp        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index d9029b3..a2454cd 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -34,5 +34,5 @@ set(install_files
- if (WIN32)
- 	install(FILES ${install_files} DESTINATION data)
- elseif (UNIX)
--	install(FILES ${install_files} DESTINATION share/blobby)
-+	install(FILES ${install_files} DESTINATION /usr/share/blobby)
- endif (WIN32)
-diff --git a/src/main.cpp b/src/main.cpp
-index 2628990..15bddf2 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -78,7 +78,7 @@ void setupPHYSFS()
- 	std::string separator = fs.getDirSeparator();
- 	// Game should be playable out of the source package on all
- 	// relevant platforms.
--	std::string baseSearchPath("data" + separator);
-+	std::string baseSearchPath("/usr/share/blobby/");
- 	// Android and iOS are needing a special path
- 	#ifdef __ANDROID__
- 		baseSearchPath = SDL_AndroidGetExternalStoragePath() + separator;
--- 
-2.11.0
-