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-puzzle/monsterz/files/, games-puzzle/monsterz/
Date: Wed, 25 Dec 2019 19:30:38
Message-Id: 1577302224.bdd1fec26fcad4ca842c4ce12a8daf815e5f37ef.pacho@gentoo
1 commit: bdd1fec26fcad4ca842c4ce12a8daf815e5f37ef
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 25 19:30:12 2019 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 25 19:30:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd1fec2
7
8 games-puzzle/monsterz: Drop old
9
10 Package-Manager: Portage-2.3.82, Repoman-2.3.20
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 .../monsterz/files/monsterz-0.7.1-64bit.patch | 26 ------------
14 .../monsterz/files/monsterz-0.7.1-blit.patch | 32 ---------------
15 .../monsterz/files/monsterz-0.7.1-gentoo.patch | 20 ---------
16 games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild | 47 ----------------------
17 4 files changed, 125 deletions(-)
18
19 diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
20 deleted file mode 100644
21 index 64d6527768f..00000000000
22 --- a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
23 +++ /dev/null
24 @@ -1,26 +0,0 @@
25 -Index: monsterz-0.7.1/monsterz.py
26 -===================================================================
27 ---- monsterz-0.7.1.orig/monsterz.py 2008-05-09 16:35:25.000000000 +0000
28 -+++ monsterz-0.7.1/monsterz.py 2008-05-09 16:35:33.000000000 +0000
29 -@@ -108,7 +108,9 @@
30 - M = int(max(r, g, b))
31 - m = int(min(r, g, b))
32 - val = (2 * M + r + g + b) / 5
33 -- p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
34 -+ p[0] = (val + r) / 2
35 -+ p[1] = (val + g) / 2
36 -+ p[2] = (val + b) / 2
37 - if alpha[y][x] >= 250:
38 - alpha[y][x] = 255 - (M - m) * 3 / 4
39 - del pixels
40 -@@ -129,7 +131,9 @@
41 - r, g, b = p
42 - M = int(max(r, g, b))
43 - m = int(min(r, g, b))
44 -- p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
45 -+ p[0] = (m + r) / 2
46 -+ p[1] = (m + g) / 2
47 -+ p[2] = (m + b) / 2
48 - if alpha[y][x] >= 250:
49 - alpha[y][x] = 255 - M * 2 / 3
50 - del pixels
51
52 diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
53 deleted file mode 100644
54 index d0847d6c2c1..00000000000
55 --- a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
56 +++ /dev/null
57 @@ -1,32 +0,0 @@
58 ---- a/monsterz.py
59 -+++ b/monsterz.py
60 -@@ -829,10 +829,10 @@
61 - pass
62 - else:
63 - for x in range(4):
64 -- for y, p in enumerate(alpha[x]):
65 -- alpha[x][y] = p * x / 4
66 -- for y, p in enumerate(alpha[406 - x - 1]):
67 -- alpha[406 - x - 1][y] = p * x / 4
68 -+ for y in range(len(alpha[x])):
69 -+ alpha[x][y] = alpha[x][y] * x / 4
70 -+ for y in range(len(alpha[406 - x - 1])):
71 -+ alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 4
72 - for col in alpha:
73 - l = len(col)
74 - for y in range(4):
75 -@@ -1287,10 +1287,10 @@
76 - pass
77 - else:
78 - for x in range(10):
79 -- for y, p in enumerate(alpha[x]):
80 -- alpha[x][y] = p * x / 12
81 -- for y, p in enumerate(alpha[406 - x - 1]):
82 -- alpha[406 - x - 1][y] = p * x / 12
83 -+ for y in range(len(alpha[x])):
84 -+ alpha[x][y] = alpha[x][y] * x / 12
85 -+ for y in range(len(alpha[406 - x - 1])):
86 -+ alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 12
87 - del alpha
88 - scroll.unlock()
89 - system.blit(scroll, (13, 437))
90
91 diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
92 deleted file mode 100644
93 index 6920e0e3697..00000000000
94 --- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
95 +++ /dev/null
96 @@ -1,20 +0,0 @@
97 ---- a/monsterz.py.orig 2006-05-12 18:55:51.000000000 -0400
98 -+++ b/monsterz.py 2006-05-12 18:57:44.000000000 -0400
99 -@@ -1907,7 +1906,7 @@
100 - print ' (C) Mike Kershaw <dragorn@××××××××××××××.net>'
101 -
102 - print 'This program is free software; you can redistribute it and/or modify it under'
103 -- print 'the terms of the Do What The Fuck You Want To Public License, Version 2, as'
104 -+ print 'the terms of the WTFPL, Version 2, as'
105 - print 'published by Sam Hocevar. See http://sam.zoy.org/wtfpl/ for more details.'
106 - print 'The sound effects are released under their own licences: applause.wav and'
107 - print 'pop.wav are covered by the LGPL, the others are covered by the GPL.'
108 -@@ -1932,7 +1931,7 @@
109 - global system, data, settings, fonter, monsterz
110 - override = {}
111 - scorefile = None
112 -- sharedir = dirname(argv[0])
113 -+ sharedir = "GENTOO_DATADIR"
114 - outfd = None
115 - try:
116 - long = ['help', 'version', 'music', 'sound', 'fullscreen',
117
118 diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
119 deleted file mode 100644
120 index 4cff31b75f8..00000000000
121 --- a/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
122 +++ /dev/null
123 @@ -1,47 +0,0 @@
124 -# Copyright 1999-2018 Gentoo Foundation
125 -# Distributed under the terms of the GNU General Public License v2
126 -
127 -EAPI=6
128 -PYTHON_COMPAT=( python2_7 )
129 -
130 -inherit desktop python-r1
131 -
132 -DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
133 -HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
134 -SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
135 -
136 -LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
137 -SLOT="0"
138 -KEYWORDS="~amd64 ~hppa ~x86"
139 -
140 -IUSE=""
141 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
142 -
143 -RDEPEND="${PYTHON_DEPS}
144 - dev-python/pygame[${PYTHON_USEDEP}]
145 - media-libs/sdl-image[png]
146 - media-libs/sdl-mixer[mod]
147 -"
148 -DEPEND="${RDEPEND}"
149 -
150 -src_prepare() {
151 - default
152 - eapply \
153 - "${FILESDIR}"/${P}-gentoo.patch \
154 - "${FILESDIR}"/${P}-64bit.patch \
155 - "${FILESDIR}"/${P}-blit.patch
156 - sed -i \
157 - -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
158 - monsterz.py || die "sed failed"
159 - rm Makefile || die
160 -}
161 -
162 -src_install() {
163 - insinto /usr/share/${PN}
164 - doins -r graphics sound
165 - newbin monsterz.py ${PN}
166 - newicon graphics/icon.png ${PN}.png
167 - make_desktop_entry ${PN} Monsterz
168 - einstalldocs
169 - python_replicate_script "${ED%/}"/usr/bin/monsterz
170 -}