| 1 |
commit: e0078976f674e5584e44b6a470191a048f1c59d6 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 30 23:11:32 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 1 00:03:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0078976 |
| 7 |
|
| 8 |
games-strategy/s25rttr: EAPI-6 bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../s25rttr/files/s25rttr-0.8.1-cmake.patch | 24 +++++++++++----------- |
| 13 |
.../s25rttr/files/s25rttr-0.8.1-format.patch | 4 ++-- |
| 14 |
.../files/s25rttr-0.8.1-soundconverter.patch | 4 ++-- |
| 15 |
games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild | 17 ++++++++------- |
| 16 |
4 files changed, 24 insertions(+), 25 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch |
| 19 |
index d8cdfedbb9a..14f2edb52df 100644 |
| 20 |
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch |
| 21 |
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch |
| 22 |
@@ -4,8 +4,8 @@ Date: Fri Oct 5 13:33:05 UTC 2012 |
| 23 |
make build system gentoo-compatible |
| 24 |
provide options for SDL and GLFW video drivers |
| 25 |
|
| 26 |
---- CMakeLists.txt |
| 27 |
-+++ CMakeLists.txt |
| 28 |
+--- a/CMakeLists.txt |
| 29 |
++++ b/CMakeLists.txt |
| 30 |
@@ -19,12 +19,19 @@ |
| 31 |
|
| 32 |
################################################################################ |
| 33 |
@@ -83,8 +83,8 @@ provide options for SDL and GLFW video drivers |
| 34 |
INSTALL(CODE "INCLUDE(src/cmake_install.cmake)") |
| 35 |
|
| 36 |
# and then dont let him install anything |
| 37 |
---- driver/video/CMakeLists.txt |
| 38 |
-+++ driver/video/CMakeLists.txt |
| 39 |
+--- a/driver/video/CMakeLists.txt |
| 40 |
++++ b/driver/video/CMakeLists.txt |
| 41 |
@@ -3,7 +3,11 @@ |
| 42 |
################################################################################# |
| 43 |
|
| 44 |
@@ -99,8 +99,8 @@ provide options for SDL and GLFW video drivers |
| 45 |
+ENDIF(BUILD_SDL_DRIVER) |
| 46 |
|
| 47 |
################################################################################# |
| 48 |
---- driver/video/SDL/src/CMakeLists.txt |
| 49 |
-+++ driver/video/SDL/src/CMakeLists.txt |
| 50 |
+--- a/driver/video/SDL/src/CMakeLists.txt |
| 51 |
++++ b/driver/video/SDL/src/CMakeLists.txt |
| 52 |
@@ -30,9 +30,9 @@ |
| 53 |
ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX}) |
| 54 |
|
| 55 |
@@ -114,8 +114,8 @@ provide options for SDL and GLFW video drivers |
| 56 |
) |
| 57 |
ELSE (SDL_FOUND) |
| 58 |
MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver") |
| 59 |
---- driver/video/GLFW/src/CMakeLists.txt |
| 60 |
-+++ driver/video/GLFW/src/CMakeLists.txt |
| 61 |
+--- a/driver/video/GLFW/src/CMakeLists.txt |
| 62 |
++++ b/driver/video/GLFW/src/CMakeLists.txt |
| 63 |
@@ -2,7 +2,7 @@ |
| 64 |
### $Id$ |
| 65 |
################################################################################# |
| 66 |
@@ -133,8 +133,8 @@ provide options for SDL and GLFW video drivers |
| 67 |
+ENDIF ("${COMPILEFOR}" STREQUAL "linux" ) |
| 68 |
|
| 69 |
################################################################################# |
| 70 |
---- driver/audio/SDL/src/CMakeLists.txt |
| 71 |
-+++ driver/audio/SDL/src/CMakeLists.txt |
| 72 |
+--- a/driver/audio/SDL/src/CMakeLists.txt |
| 73 |
++++ b/driver/audio/SDL/src/CMakeLists.txt |
| 74 |
@@ -34,9 +34,9 @@ |
| 75 |
ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX}) |
| 76 |
|
| 77 |
@@ -148,8 +148,8 @@ provide options for SDL and GLFW video drivers |
| 78 |
) |
| 79 |
ELSE (SDLMIXER_FOUND) |
| 80 |
MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver") |
| 81 |
---- build_paths.h.cmake |
| 82 |
-+++ build_paths.h.cmake |
| 83 |
+--- a/build_paths.h.cmake |
| 84 |
++++ b/build_paths.h.cmake |
| 85 |
@@ -41,6 +41,7 @@ |
| 86 |
|
| 87 |
// set game directory (normal $(datadir)/s25rttr/S2) |
| 88 |
|
| 89 |
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch |
| 90 |
index 588a755e829..3d50543b9c0 100644 |
| 91 |
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch |
| 92 |
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch |
| 93 |
@@ -1,5 +1,5 @@ |
| 94 |
---- src/dskGameInterface.cpp.old 2016-02-15 21:11:58.308899794 +0100 |
| 95 |
-+++ src/dskGameInterface.cpp 2016-02-15 21:12:24.564433584 +0100 |
| 96 |
+--- a/src/dskGameInterface.cpp.old 2016-02-15 21:11:58.308899794 +0100 |
| 97 |
++++ b/src/dskGameInterface.cpp 2016-02-15 21:12:24.564433584 +0100 |
| 98 |
@@ -1349,7 +1349,7 @@ |
| 99 |
snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str()); |
| 100 |
break; |
| 101 |
|
| 102 |
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch |
| 103 |
index 493d7cb404b..1cc7686b850 100644 |
| 104 |
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch |
| 105 |
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch |
| 106 |
@@ -4,8 +4,8 @@ Date: Mon Apr 30 20:42:28 UTC 2012 |
| 107 |
relocate executables sound-convert and s-c_resample which get installed |
| 108 |
into datadir by default |
| 109 |
|
| 110 |
---- libutil/src/files.h |
| 111 |
-+++ libutil/src/files.h |
| 112 |
+--- a/libutil/src/files.h |
| 113 |
++++ b/libutil/src/files.h |
| 114 |
@@ -140,7 +140,7 @@ |
| 115 |
/* 54 */RTTRDIR "", // unbenutzt |
| 116 |
/* 55 */SETTINGSDIR "/LSTS/SOUND.LST", // Die konvertierte sound.lst |
| 117 |
|
| 118 |
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild |
| 119 |
index 00187684759..47531d7e1d9 100644 |
| 120 |
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild |
| 121 |
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild |
| 122 |
@@ -1,8 +1,9 @@ |
| 123 |
# Copyright 1999-2018 Gentoo Foundation |
| 124 |
# Distributed under the terms of the GNU General Public License v2 |
| 125 |
|
| 126 |
-EAPI=5 |
| 127 |
-inherit eutils cmake-utils gnome2-utils readme.gentoo-r1 |
| 128 |
+EAPI=6 |
| 129 |
+ |
| 130 |
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1 |
| 131 |
|
| 132 |
DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)" |
| 133 |
HOMEPAGE="https://www.siedler25.org/" |
| 134 |
@@ -29,6 +30,10 @@ DEPEND="${RDEPEND} |
| 135 |
sys-devel/gettext |
| 136 |
" |
| 137 |
|
| 138 |
+DOCS=( RTTR/texte/{keyboardlayout.txt,readme.txt} ) |
| 139 |
+ |
| 140 |
+DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2" |
| 141 |
+ |
| 142 |
PATCHES=( |
| 143 |
"${FILESDIR}"/${P}-cmake.patch |
| 144 |
"${FILESDIR}"/${P}-soundconverter.patch |
| 145 |
@@ -39,8 +44,6 @@ PATCHES=( |
| 146 |
"${FILESDIR}"/${P}-gcc6.patch |
| 147 |
) |
| 148 |
|
| 149 |
-DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2" |
| 150 |
- |
| 151 |
src_configure() { |
| 152 |
local arch |
| 153 |
case ${ARCH} in |
| 154 |
@@ -94,14 +97,10 @@ src_install() { |
| 155 |
dobin src/s25client |
| 156 |
make_desktop_entry "s25client" "Settlers RTTR" "${PN}" |
| 157 |
|
| 158 |
- dodoc RTTR/texte/{keyboardlayout.txt,readme.txt} |
| 159 |
+ einstalldocs |
| 160 |
readme.gentoo_create_doc |
| 161 |
} |
| 162 |
|
| 163 |
-pkg_preinst() { |
| 164 |
- gnome2_icon_savelist |
| 165 |
-} |
| 166 |
- |
| 167 |
pkg_postinst() { |
| 168 |
gnome2_icon_cache_update |
| 169 |
readme.gentoo_print_elog |
Archives