Gentoo Archives: gentoo-commits

From: "Azamat H. Hackimov" <winterheart@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-strategy/curseofwar/files/, games-strategy/curseofwar/
Date: Mon, 12 Jul 2021 20:47:22
Message-Id: 1626122759.75d40c70188a7ada863876894569a4eecacca863.winterheart@gentoo
1 commit: 75d40c70188a7ada863876894569a4eecacca863
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Mon Jul 12 20:37:38 2021 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Mon Jul 12 20:45:59 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=75d40c70
7
8 games-strategy/curseofwar: remove old
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.2
11 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
12
13 .../curseofwar/curseofwar-1.2.0-r1.ebuild | 59 ----------------------
14 ...urseofwar-1.2.0-fix-gcc-error-compilation.patch | 30 -----------
15 2 files changed, 89 deletions(-)
16
17 diff --git a/games-strategy/curseofwar/curseofwar-1.2.0-r1.ebuild b/games-strategy/curseofwar/curseofwar-1.2.0-r1.ebuild
18 deleted file mode 100644
19 index 86934a4..0000000
20 --- a/games-strategy/curseofwar/curseofwar-1.2.0-r1.ebuild
21 +++ /dev/null
22 @@ -1,59 +0,0 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=6
27 -
28 -inherit cmake-utils
29 -
30 -DESCRIPTION="A fast-paced action strategy game implemented using ncurses user interface."
31 -HOMEPAGE="https://github.com/a-nikolaev/curseofwar/wiki"
32 -SRC_URI="https://github.com/a-nikolaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
33 -
34 -LICENSE="GPL-3"
35 -SLOT="0"
36 -KEYWORDS="~amd64 ~x86"
37 -IUSE="ncurses sdl"
38 -REQUIRED_USE="|| ( ncurses sdl )"
39 -
40 -DEPEND="ncurses? ( sys-libs/ncurses:0 )
41 - sdl? ( media-libs/libsdl )"
42 -RDEPEND="${DEPEND}"
43 -
44 -src_prepare() {
45 - default
46 - sed -i -e "s:%VERSION%:${PV}:g" ${PN}{,-sdl}.6
47 - sed -i -e "s:/usr/local/share/:/usr/share/:g" path.c
48 - sed -i -e "s:TARGET_LINK_LIBRARIES( curseofwar \${COMMON_LIBS} ncurses ):TARGET_LINK_LIBRARIES( curseofwar \${COMMON_LIBS} ncurses tinfo ):g" CMakeLists.txt
49 - epatch "${FILESDIR}/${P}-fix-gcc-error-compilation.patch"
50 - cmake-utils_src_prepare
51 -}
52 -
53 -src_configure() {
54 - mycmakeargs=(
55 - -DCW_NCURSE_FRONTEND=$(usex ncurses)
56 - -DCW_SDL_FRONTEND=$(usex sdl)
57 - -DCW_SDL_MULTIPLAYER=$(usex sdl)
58 - )
59 - cmake-utils_src_configure
60 -}
61 -
62 -src_compile() {
63 - cmake-utils_src_compile
64 -}
65 -
66 -src_install() {
67 - doicon pixmaps/${PN}-32x32.xpm
68 - if use ncurses ; then
69 - dobin "${BUILD_DIR}/${PN}"
70 - make_desktop_entry ${PN} "Curse of War" ${PN}-32x32 "Game;StrategyGame" "Terminal=true"
71 - doman ${PN}.6
72 - fi
73 - if use sdl ; then
74 - dobin "${BUILD_DIR}/${PN}-sdl"
75 - make_desktop_entry ${PN}-sdl "Curse of War (SDL)" ${PN}-32x32
76 - doman ${PN}-sdl.6
77 - insinto "/usr/share/${PN}"
78 - doins -r images
79 - fi
80 - dodoc CHANGELOG README
81 -}
82
83 diff --git a/games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch b/games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch
84 deleted file mode 100644
85 index d2593c7..0000000
86 --- a/games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch
87 +++ /dev/null
88 @@ -1,30 +0,0 @@
89 -From 5d4865e03f96b73af602c6fb11a618195dc6d00c Mon Sep 17 00:00:00 2001
90 -From: "Azamat H. Hackimov" <azamat.hackimov@×××××.com>
91 -Date: Wed, 30 Oct 2013 23:19:29 +0600
92 -Subject: [PATCH] =?UTF-8?q?Fixed=20GCC=20error=20compilation=20Fixed=20"ex?=
93 - =?UTF-8?q?pected=20primary-expression=20before=20=C2=AB.=C2=BB=20token"?=
94 - =?UTF-8?q?=20error.?=
95 -MIME-Version: 1.0
96 -Content-Type: text/plain; charset=UTF-8
97 -Content-Transfer-Encoding: 8bit
98 -
99 ----
100 - output-sdl.c | 2 +-
101 - 1 file changed, 1 insertion(+), 1 deletion(-)
102 -
103 -diff --git a/output-sdl.c b/output-sdl.c
104 -index 7f67c5c..54f652b 100644
105 ---- a/output-sdl.c
106 -+++ b/output-sdl.c
107 -@@ -380,7 +380,7 @@ void output_sdl (SDL_Surface *tileset, SDL_Surface *typeface, SDL_Surface *uisur
108 - /* line */
109 - int line_width=555;
110 - struct SDL_Rect src_line_rect = {0, 0, line_width, 1};
111 -- struct SDL_Rect dst_line_rect = {.x=TILE_WIDTH + 75*TYPE_WIDTH/2 - line_width/2, .y=screen_y + (TYPE_HEIGHT*5/2), .w=line_width, .h=1};
112 -+ struct SDL_Rect dst_line_rect = {TILE_WIDTH + 75*TYPE_WIDTH/2 - line_width/2, screen_y + (TYPE_HEIGHT*5/2), line_width, 1};
113 - SDL_BlitSurface(uisurf, &src_line_rect, screen, &dst_line_rect);
114 -
115 - }
116 ---
117 -1.8.1.5
118 -