Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/blobwars/files/, games-arcade/blobwars/
Date: Sat, 04 Feb 2017 15:40:34
Message-Id: 1486222771.7031267bd8f44387def5796e14ba772de79507a0.pacho@gentoo
1 commit: 7031267bd8f44387def5796e14ba772de79507a0
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 4 15:30:02 2017 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 15:39:31 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7031267b
7
8 games-arcade/blobwars: Drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 games-arcade/blobwars/Manifest | 1 -
13 games-arcade/blobwars/blobwars-1.19.ebuild | 75 ----------------------
14 .../blobwars/files/blobwars-1.19-ldflags.patch | 22 -------
15 .../files/blobwars-1.19-linking-order.patch | 36 -----------
16 .../files/blobwars-1.19-zlib-1.2.5.2.patch | 22 -------
17 5 files changed, 156 deletions(-)
18
19 diff --git a/games-arcade/blobwars/Manifest b/games-arcade/blobwars/Manifest
20 index eebf809..cd2954a 100644
21 --- a/games-arcade/blobwars/Manifest
22 +++ b/games-arcade/blobwars/Manifest
23 @@ -1,2 +1 @@
24 -DIST blobwars-1.19.tar.gz 67019647 SHA256 f9bafe59ead9e370ceaba4aae3d280241bf05fa06c8ae006eec0322c2fe9e2ed SHA512 d31dcf5aae13bed849f701923cef7e829a43f199b8cde8dc9c28b283c8f7da6c5c8052387fae9add9f1bfb0c857c5be339b6049b6b19ff4c6c5ccbb6233e2643 WHIRLPOOL 4f4a31e80648696ee564be7b4aafddea666dd9cd7239e6310c03f873cb284a59beb40abaa4e8edd3da9e2dbb4dbf9f88cc1db3232b22aeadfda3cad5f473eea4
25 DIST blobwars-2.00.tar.gz 66982603 SHA256 c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99 SHA512 412afd029554e59e7947466f36b51ef863faf1712898397498d5497e9a38dced92777b7684c1fb231998d893a6ce2c435b8f4278429df41168385de8fa18725b WHIRLPOOL 602a996bb661d8c7f3573220ad2e83e48ef0add898c39a395a2ad8f769fce173f04cb1370fae33e5673485f15d146e7a6b616c3753113b46178e7580b058b0e5
26
27 diff --git a/games-arcade/blobwars/blobwars-1.19.ebuild b/games-arcade/blobwars/blobwars-1.19.ebuild
28 deleted file mode 100644
29 index 3f07d4e..00000000
30 --- a/games-arcade/blobwars/blobwars-1.19.ebuild
31 +++ /dev/null
32 @@ -1,75 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=4
38 -inherit eutils gnome2-utils games
39 -
40 -DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader"
41 -HOMEPAGE="https://sourceforge.net/projects/blobwars/ https://sourceforge.net/apps/mediawiki/blobwars/index.php?title=Main_Page"
42 -SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz"
43 -
44 -LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain"
45 -SLOT="0"
46 -KEYWORDS="amd64 x86"
47 -IUSE=""
48 -
49 -RDEPEND="media-libs/libsdl
50 - media-libs/sdl-mixer
51 - media-libs/sdl-ttf
52 - media-libs/sdl-image
53 - media-libs/sdl-net
54 - sys-libs/zlib
55 - virtual/libintl"
56 -DEPEND="${RDEPEND}
57 - sys-devel/gettext"
58 -
59 -src_prepare() {
60 - epatch \
61 - "${FILESDIR}"/${PN}-1.19-linking-order.patch \
62 - "${FILESDIR}"/${PN}-1.19-ldflags.patch \
63 - "${FILESDIR}"/${PN}-1.19-zlib-1.2.5.2.patch
64 -
65 - sed -i -e "/-Werror/d" makefile || die
66 -}
67 -
68 -src_compile() {
69 - emake \
70 - USEPAK="1" \
71 - DATADIR="${GAMES_DATADIR}/${PN}/" \
72 - DOCDIR="/usr/share/doc/${PF}/html/" \
73 - LOCALEDIR="/usr/share/locale/"
74 -}
75 -
76 -src_install() {
77 - emake \
78 - USEPAK="1" \
79 - DESTDIR="${D}" \
80 - BINDIR="${GAMES_BINDIR}/" \
81 - DATADIR="${GAMES_DATADIR}/${PN}/" \
82 - DOCDIR="/usr/share/doc/${PF}/html/" \
83 - ICONDIR="/usr/share/icons/hicolor/" \
84 - DESKTOPDIR="/usr/share/applications/" \
85 - LOCALEDIR="/usr/share/locale/" \
86 - install
87 -
88 - mv -vf \
89 - "${D}"/usr/share/doc/${PF}/html/{changes,hacking,porting,readme} \
90 - "${D}"/usr/share/doc/${PF}/
91 -
92 - prepgamesdirs
93 -}
94 -
95 -pkg_preinst() {
96 - games_pkg_preinst
97 - gnome2_icon_savelist
98 -}
99 -
100 -pkg_postinst() {
101 - games_pkg_postinst
102 - gnome2_icon_cache_update
103 -}
104 -
105 -pkg_postrm() {
106 - gnome2_icon_cache_update
107 -}
108
109 diff --git a/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch b/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch
110 deleted file mode 100644
111 index 8b006f1..00000000
112 --- a/games-arcade/blobwars/files/blobwars-1.19-ldflags.patch
113 +++ /dev/null
114 @@ -1,22 +0,0 @@
115 ---- makefile~ 2011-08-29 20:32:22.000000000 +0200
116 -+++ makefile 2011-08-29 20:33:27.052159159 +0200
117 -@@ -82,16 +82,16 @@
118 -
119 - # linking the program.
120 - $(PROG): $(GAMEOBJS)
121 -- $(CXX) $(GAMEOBJS) -o $(PROG) $(LIBS)
122 -+ $(CXX) $(LDFLAGS) $(GAMEOBJS) -o $(PROG) $(LIBS)
123 -
124 - pak: $(PAKOBJS)
125 -- $(CXX) $(PAKOBJS) -o pak $(LIBS)
126 -+ $(CXX) $(LDFLAGS) $(PAKOBJS) -o pak $(LIBS)
127 -
128 - %.mo: %.po
129 - msgfmt -c -o $@ $<
130 -
131 - mapeditor: $(MAPOBJS)
132 -- $(CXX) $(MAPOBJS) -o mapeditor $(LIBS)
133 -+ $(CXX) $(LDFLAGS) $(MAPOBJS) -o mapeditor $(LIBS)
134 -
135 - # cleaning everything that can be automatically recreated with "make".
136 - clean:
137
138 diff --git a/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch b/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch
139 deleted file mode 100644
140 index 6b00101..00000000
141 --- a/games-arcade/blobwars/files/blobwars-1.19-linking-order.patch
142 +++ /dev/null
143 @@ -1,36 +0,0 @@
144 -From 896cde549eeb254cc4960f20f54cab845e95b061 Mon Sep 17 00:00:00 2001
145 -From: Andreas Moog <amoog@××××××.com>
146 -Date: Sun, 19 Jun 2011 22:03:10 +0200
147 -Subject: [PATCH] LIBS go after objects to allow linking with ld --as-needed
148 -
149 ----
150 - makefile | 6 +++---
151 - 1 files changed, 3 insertions(+), 3 deletions(-)
152 -
153 -diff --git a/makefile b/makefile
154 -index 0a9cc94..509c2ff 100755
155 ---- a/makefile
156 -+++ b/makefile
157 -@@ -82,16 +82,16 @@ all: $(ALL)
158 -
159 - # linking the program.
160 - $(PROG): $(GAMEOBJS)
161 -- $(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
162 -+ $(CXX) $(GAMEOBJS) -o $(PROG) $(LIBS)
163 -
164 - pak: $(PAKOBJS)
165 -- $(CXX) $(LIBS) $(PAKOBJS) -o pak
166 -+ $(CXX) $(PAKOBJS) -o pak $(LIBS)
167 -
168 - %.mo: %.po
169 - msgfmt -c -o $@ $<
170 -
171 - mapeditor: $(MAPOBJS)
172 -- $(CXX) $(LIBS) $(MAPOBJS) -o mapeditor
173 -+ $(CXX) $(MAPOBJS) -o mapeditor $(LIBS)
174 -
175 - # cleaning everything that can be automatically recreated with "make".
176 - clean:
177 ---
178 -1.7.5.4
179 -
180
181 diff --git a/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch b/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch
182 deleted file mode 100644
183 index cf10117..00000000
184 --- a/games-arcade/blobwars/files/blobwars-1.19-zlib-1.2.5.2.patch
185 +++ /dev/null
186 @@ -1,22 +0,0 @@
187 -http://bugs.gentoo.org/408459
188 -
189 ---- src/pak.cpp
190 -+++ src/pak.cpp
191 -@@ -119,7 +119,7 @@
192 - {
193 - printf("Couldn't open %s for reading!\n", filename);
194 - closedir(dirp);
195 -- gzclose(pak);
196 -+ gzclose((gzFile)pak);
197 - exit(1);
198 - }
199 -
200 -@@ -141,7 +141,7 @@
201 - {
202 - printf("Couldn't open %s for reading!\n", filename);
203 - closedir(dirp);
204 -- gzclose(pak);
205 -+ gzclose((gzFile)pak);
206 - exit(1);
207 - }
208 - else
Report Message
Find on MARC Find on Google Groups