Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, games-arcade/triplexinvaders/, games-arcade/triplexinvaders/files/
Date: Mon, 03 Feb 2020 06:13:49
Message-Id: 1580710318.da9ad894a3ed02492cfeb658d5bd21da3be41fb8.mgorny@gentoo
1 commit: da9ad894a3ed02492cfeb658d5bd21da3be41fb8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 3 06:11:58 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 3 06:11:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9ad894
7
8 games-arcade/triplexinvaders: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/703772
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 games-arcade/triplexinvaders/Manifest | 1 -
14 .../files/triplexinvaders-1.08-gentoo.patch | 62 ----------------------
15 games-arcade/triplexinvaders/metadata.xml | 12 -----
16 .../triplexinvaders/triplexinvaders-1.08-r1.ebuild | 46 ----------------
17 profiles/package.mask | 5 --
18 5 files changed, 126 deletions(-)
19
20 diff --git a/games-arcade/triplexinvaders/Manifest b/games-arcade/triplexinvaders/Manifest
21 deleted file mode 100644
22 index 6c7c14e76e8..00000000000
23 --- a/games-arcade/triplexinvaders/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST triplexinvaders-1.08.zip 354188 BLAKE2B 5bce384ab55edd1dc0e3ed385002447c6cc81da95091b38e654fcb28c4df8f3c39907dfb23afadceaacd51491c53d4a8c937e09079905df2dd63ebe10a403164 SHA512 c763cf650046612152c9305a2067f52feedfeac5f16dd292031a184563f40efc9d95553bc01d59c5c6382394fd2a2d3fe971471cf775fe64c3b1f3c4842a0780
27
28 diff --git a/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch b/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch
29 deleted file mode 100644
30 index 85c88afcfe8..00000000000
31 --- a/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch
32 +++ /dev/null
33 @@ -1,62 +0,0 @@
34 ---- a/sound.py.old 2007-04-14 21:52:02.000000000 +0200
35 -+++ b/sound.py 2007-04-14 21:52:27.000000000 +0200
36 -@@ -16,7 +16,7 @@
37 -
38 -
39 - def reloadMusic():
40 -- pygame.mixer.music.load(os.path.join('sound', choice(music)))
41 -+ pygame.mixer.music.load(os.path.join('@GENTOO_DATADIR@/sound', choice(music)))
42 - pygame.mixer.music.set_endevent(ENDMUSIC)
43 - pygame.mixer.music.play()
44 -
45 -@@ -24,7 +24,7 @@
46 -
47 - def getSound(name, volume=0.4):
48 - if name not in LoadedSounds:
49 -- sound = pygame.mixer.Sound(os.path.join('sound', '%s.ogg' % name))
50 -+ sound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@/sound', '%s.ogg' % name))
51 - sound.set_volume(volume)
52 - LoadedSounds[name] = sound
53 - return LoadedSounds[name]
54 ---- a/util.py.old 2007-04-14 21:56:30.000000000 +0200
55 -+++ b/util.py 2007-04-14 21:56:48.000000000 +0200
56 -@@ -30,7 +30,7 @@
57 - LoadedTextures = weakref.WeakValueDictionary()
58 -
59 - def loadTexture(name):
60 -- filename = os.path.join('textures', '%s.png' % name)
61 -+ filename = os.path.join('@GENTOO_DATADIR@/textures', '%s.png' % name)
62 - textureSurface = pygame.image.load(filename)
63 - textureData = pygame.image.tostring(textureSurface, "RGBA", True)
64 - texid = glGenTextures(1)
65 -@@ -47,7 +47,7 @@
66 -
67 - def getModel(name):
68 - if name not in LoadedModels:
69 -- model = wavefront.load(os.path.join('models', '%s.obj' % name), name)
70 -+ model = wavefront.load(os.path.join('@GENTOO_DATADIR@/models', '%s.obj' % name), name)
71 - LoadedModels[name] = model
72 - return LoadedModels[name]
73 -
74 ---- a/hiscore.py.old 2007-04-14 22:04:04.000000000 +0200
75 -+++ b/hiscore.py 2007-04-14 22:04:25.000000000 +0200
76 -@@ -5,7 +5,7 @@
77 - # copy the highscores to the user's homedir
78 - highscorefile = os.path.join(configdir, 'hiscores')
79 - if not os.path.exists(highscorefile):
80 -- oldpath = 'hiscores'
81 -+ oldpath = '@GENTOO_DATADIR@/hiscores'
82 - shutil.copy(oldpath, highscorefile)
83 -
84 - def write(score, name):
85 ---- a/options.py.old 2007-04-14 22:05:23.000000000 +0200
86 -+++ b/options.py 2007-04-14 22:05:42.000000000 +0200
87 -@@ -5,7 +5,7 @@
88 - # copy the options to the user's homedir
89 - optionfile = os.path.join(configdir, 'options.conf')
90 - if not os.path.exists(optionfile):
91 -- oldpath = 'options.conf'
92 -+ oldpath = '@GENTOO_DATADIR@/options.conf'
93 - shutil.copy(oldpath, optionfile)
94 -
95 - execfile(optionfile)
96
97 diff --git a/games-arcade/triplexinvaders/metadata.xml b/games-arcade/triplexinvaders/metadata.xml
98 deleted file mode 100644
99 index 6ae220aaf94..00000000000
100 --- a/games-arcade/triplexinvaders/metadata.xml
101 +++ /dev/null
102 @@ -1,12 +0,0 @@
103 -<?xml version="1.0" encoding="UTF-8"?>
104 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
105 -<pkgmetadata>
106 - <maintainer type="project">
107 - <email>games@g.o</email>
108 - <name>Gentoo Games Project</name>
109 - </maintainer>
110 - <longdescription lang="en">
111 -In Triplex Invaders, the player pilots a spaceship against a never ending horde
112 -of enemy ships. It has psychedelic 3d graphics (but 2d gameplay).
113 -</longdescription>
114 -</pkgmetadata>
115
116 diff --git a/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild b/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild
117 deleted file mode 100644
118 index 7b95c1773d9..00000000000
119 --- a/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild
120 +++ /dev/null
121 @@ -1,46 +0,0 @@
122 -# Copyright 1999-2018 Gentoo Foundation
123 -# Distributed under the terms of the GNU General Public License v2
124 -
125 -EAPI=6
126 -PYTHON_COMPAT=( python2_7 )
127 -
128 -inherit desktop eutils python-single-r1
129 -
130 -DESCRIPTION="An Alien Invaders style game with 3d graphics"
131 -HOMEPAGE="http://triplexinvaders.infogami.com"
132 -SRC_URI="http://acm.jhu.edu/~arthur/invaders/${P}.zip"
133 -
134 -LICENSE="MIT"
135 -SLOT="0"
136 -KEYWORDS="~amd64 ~x86"
137 -
138 -IUSE=""
139 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
140 -
141 -RDEPEND="${PYTHON_DEPS}
142 - dev-python/pygame[${PYTHON_USEDEP}]
143 - dev-python/pyopengl[${PYTHON_USEDEP}]
144 -"
145 -DEPEND="app-arch/unzip"
146 -
147 -src_prepare() {
148 - default
149 - eapply "${FILESDIR}/${P}"-gentoo.patch
150 - sed -i -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
151 - sound.py \
152 - util.py \
153 - hiscore.py \
154 - options.py || die "sed failed"
155 -}
156 -
157 -src_install() {
158 - local libdir=/usr/$(get_libdir)
159 -
160 - insinto "${libdir}/${PN}"
161 - doins -r *.py
162 - insinto "/usr/share/${PN}"
163 - doins -r models sound options.conf hiscores
164 - make_wrapper ${PN} "python2 ./invaders.py" "${libdir}/${PN}"
165 - einstalldocs
166 - make_desktop_entry ${PN}
167 -}
168
169 diff --git a/profiles/package.mask b/profiles/package.mask
170 index 80993a6f10a..f2c6758dbeb 100644
171 --- a/profiles/package.mask
172 +++ b/profiles/package.mask
173 @@ -753,11 +753,6 @@ games-puzzle/4stattack
174 # Removal in 30 days. Bug #703774.
175 games-arcade/watermelons
176
177 -# David Seifert <soap@g.o> (2019-12-25)
178 -# Py2 only, dead upstream, no py3 port in sight.
179 -# Removal in 30 days. Bug #703772.
180 -games-arcade/triplexinvaders
181 -
182 # Tomáš Mózes <hydrapolic@g.o> (2019-12-19)
183 # Needs more testing.
184 =app-emulation/xen-4.13.0