1 |
commit: 8a56069e0873a3c7cea4f80beec3f448973962ac |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 12 17:39:44 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 13 16:07:43 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a56069e |
7 |
|
8 |
games-puzzle/cuyo: EAPI 6->7, drop IUSE and obsolete patches |
9 |
|
10 |
The -gentoo patch was primarily a workaround to support |
11 |
games.eclass but wasn't removed. It also broke prefix. |
12 |
|
13 |
IUSE=music would be a optfeature on sdl-mixer's [mod] but, given |
14 |
music is typically expected to function on a game and it prints |
15 |
error messages, prefer to require. |
16 |
|
17 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
18 |
|
19 |
games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild | 46 ------------------------- |
20 |
games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild | 30 ++++++++++++++++ |
21 |
games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch | 11 ------ |
22 |
games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch | 30 ---------------- |
23 |
games-puzzle/cuyo/metadata.xml | 11 +++--- |
24 |
5 files changed, 34 insertions(+), 94 deletions(-) |
25 |
|
26 |
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index c614a3ea2aa..00000000000 |
29 |
--- a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,46 +0,0 @@ |
32 |
-# Copyright 1999-2019 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
-inherit autotools gnome2-utils versionator |
37 |
- |
38 |
-MY_P="${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)" |
39 |
-DESCRIPTION="highly addictive and remotely related to tetris" |
40 |
-HOMEPAGE="https://www.karimmi.de/cuyo/" |
41 |
-SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz" |
42 |
- |
43 |
-LICENSE="GPL-2" |
44 |
-SLOT="0" |
45 |
-KEYWORDS="~amd64 ~x86" |
46 |
-IUSE="+music" |
47 |
- |
48 |
-DEPEND="sys-libs/zlib |
49 |
- media-libs/libsdl[sound,video] |
50 |
- media-libs/sdl-mixer |
51 |
- music? ( media-libs/sdl-mixer[mod] ) |
52 |
- media-libs/sdl-image |
53 |
-" |
54 |
-RDEPEND="${DEPEND}" |
55 |
- |
56 |
-S="${WORKDIR}/${MY_P}" |
57 |
- |
58 |
-src_prepare() { |
59 |
- default |
60 |
- eapply \ |
61 |
- "${FILESDIR}"/${P}-gcc44.patch \ |
62 |
- "${FILESDIR}"/${P}-gentoo.patch \ |
63 |
- "${FILESDIR}"/${P}-gcc6.patch |
64 |
- eautoreconf |
65 |
-} |
66 |
- |
67 |
-pkg_preinst() { |
68 |
- gnome2_icon_savelist |
69 |
-} |
70 |
- |
71 |
-pkg_postinst() { |
72 |
- gnome2_icon_cache_update |
73 |
-} |
74 |
- |
75 |
-pkg_postrm() { |
76 |
- gnome2_icon_cache_update |
77 |
-} |
78 |
|
79 |
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild |
80 |
new file mode 100644 |
81 |
index 00000000000..1b3790d034e |
82 |
--- /dev/null |
83 |
+++ b/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild |
84 |
@@ -0,0 +1,30 @@ |
85 |
+# Copyright 1999-2021 Gentoo Authors |
86 |
+# Distributed under the terms of the GNU General Public License v2 |
87 |
+ |
88 |
+EAPI=7 |
89 |
+ |
90 |
+inherit xdg |
91 |
+ |
92 |
+# This version (2.~-1.1) should've been 2_pre11 or so, i.e. >=2.0.0 is newer. |
93 |
+# Optimally need upstream to release >=2.1.2, or will need own custom version. |
94 |
+MY_P="${PN}-$(ver_cut 1).~-$(ver_cut 2-3)" |
95 |
+ |
96 |
+DESCRIPTION="Highly addictive and remotely related to tetris" |
97 |
+HOMEPAGE="https://www.karimmi.de/cuyo/" |
98 |
+SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz" |
99 |
+S="${WORKDIR}/${MY_P}" |
100 |
+ |
101 |
+LICENSE="GPL-2+" |
102 |
+SLOT="0" |
103 |
+KEYWORDS="~amd64 ~x86" |
104 |
+ |
105 |
+RDEPEND=" |
106 |
+ media-libs/libsdl[sound,video] |
107 |
+ media-libs/sdl-image |
108 |
+ media-libs/sdl-mixer[mod] |
109 |
+ sys-libs/zlib:=" |
110 |
+DEPEND="${RDEPEND}" |
111 |
+ |
112 |
+PATCHES=( |
113 |
+ "${FILESDIR}"/${P}-gcc6.patch |
114 |
+) |
115 |
|
116 |
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch |
117 |
deleted file mode 100644 |
118 |
index 9ad50b067fb..00000000000 |
119 |
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch |
120 |
+++ /dev/null |
121 |
@@ -1,11 +0,0 @@ |
122 |
---- cuyo-2.~-1.1.orig/src/stringzeug.h |
123 |
-+++ cuyo-2.~-1.1/src/stringzeug.h |
124 |
-@@ -20,7 +20,7 @@ |
125 |
- |
126 |
- #include <config.h> |
127 |
- #include <string> |
128 |
-- |
129 |
-+#include <stdio.h> |
130 |
- |
131 |
- |
132 |
- |
133 |
|
134 |
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch |
135 |
deleted file mode 100644 |
136 |
index 78bafe2ded4..00000000000 |
137 |
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch |
138 |
+++ /dev/null |
139 |
@@ -1,30 +0,0 @@ |
140 |
---- cuyo-2.~-1.1.orig/icons/Makefile.am |
141 |
-+++ cuyo-2.~-1.1/icons/Makefile.am |
142 |
-@@ -1,4 +1,4 @@ |
143 |
--desktopdir = $(datadir)/applications |
144 |
-+desktopdir = /usr/share/applications |
145 |
- desktop_DATA = cuyo.desktop |
146 |
- |
147 |
- |
148 |
-@@ -25,7 +25,7 @@ |
149 |
- # Das vorige war falsch: die png sollen alle cuyo.png heissen |
150 |
- # und nicht cuyo-xxxx.png. Deshalb nachfolgend neue Version: |
151 |
- |
152 |
--iconsdir = $(datadir)/icons/hicolor |
153 |
-+iconsdir = /usr/share/icons/hicolor |
154 |
- icons_DATA = cuyo-32x32.png cuyo-64x64.png |
155 |
- |
156 |
- install-iconsDATA: |
157 |
---- cuyo-2.~-1.1.orig/icons/cuyo.desktop |
158 |
-+++ cuyo-2.~-1.1/icons/cuyo.desktop |
159 |
-@@ -3,9 +3,8 @@ |
160 |
- Icon=cuyo |
161 |
- Type=Application |
162 |
- Terminal=false |
163 |
--MimeType=application/x-executable |
164 |
-+MimeType=application/x-executable; |
165 |
- Categories=Game;BlocksGame; |
166 |
--Encoding=UTF-8 |
167 |
- Comment=A tetris like game with many levels |
168 |
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln |
169 |
- Exec=cuyo |
170 |
|
171 |
diff --git a/games-puzzle/cuyo/metadata.xml b/games-puzzle/cuyo/metadata.xml |
172 |
index 1329ada5712..26079e608be 100644 |
173 |
--- a/games-puzzle/cuyo/metadata.xml |
174 |
+++ b/games-puzzle/cuyo/metadata.xml |
175 |
@@ -1,11 +1,8 @@ |
176 |
<?xml version="1.0" encoding="UTF-8"?> |
177 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
178 |
<pkgmetadata> |
179 |
-<maintainer type="project"> |
180 |
- <email>games@g.o</email> |
181 |
- <name>Gentoo Games Project</name> |
182 |
-</maintainer> |
183 |
-<use> |
184 |
- <flag name="music">Enable playing of background music</flag> |
185 |
-</use> |
186 |
+ <maintainer type="project"> |
187 |
+ <email>games@g.o</email> |
188 |
+ <name>Gentoo Games Project</name> |
189 |
+ </maintainer> |
190 |
</pkgmetadata> |