Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/ucon64/files/, games-util/ucon64/
Date: Wed, 23 Jun 2021 02:24:56
Message-Id: 1624414958.b385e934f1bb7beab4e1a1754adbd7caf699b547.ionen@gentoo
1 commit: b385e934f1bb7beab4e1a1754adbd7caf699b547
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 22 23:40:34 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 23 02:22:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b385e934
7
8 games-util/ucon64: drop 2.0.0
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-util/ucon64/Manifest | 1 -
13 games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch | 20 -------
14 games-util/ucon64/files/ucon64-2.0.0-zlib.patch | 45 ---------------
15 games-util/ucon64/ucon64-2.0.0.ebuild | 65 ----------------------
16 4 files changed, 131 deletions(-)
17
18 diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
19 index 2ead28e44b3..190c02eda09 100644
20 --- a/games-util/ucon64/Manifest
21 +++ b/games-util/ucon64/Manifest
22 @@ -1,2 +1 @@
23 -DIST ucon64-2.0.0-src.tar.gz 1188488 BLAKE2B 846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f3cccc0fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64 SHA512 d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
24 DIST ucon64-2.2.1-src.tar.gz 1476080 BLAKE2B 8f7010bde2c7306f6a76dec4ce5e31975c286801e6504bf8bc99287bd7adc4ab10331a8cab308fed83ece9e13bdb01327f6d3439eba776038dbb19eb2b72cf70 SHA512 34453399151e5ed256fdcf387b9d32a052718b264e51b99a2be251b90589337d13cd317f8d1aa7d3c8e39c8e407b22797d4608ec6d14b99c8673ec74f349f6c2
25
26 diff --git a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
27 deleted file mode 100644
28 index 22bb9a9795f..00000000000
29 --- a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
30 +++ /dev/null
31 @@ -1,20 +0,0 @@
32 ---- a/backup/lynxit.c
33 -+++ b/backup/lynxit.c
34 -@@ -561,7 +561,7 @@
35 - return FALSE;
36 - }
37 -
38 -- if (strcmp (header.magic, "LYNX") != 0)
39 -+ if (memcmp (header.magic, "LYNX", sizeof(header.magic)) != 0)
40 - {
41 - MESSAGE (("ERROR : %s is not a lynx image\n", filename));
42 - fclose (fp);
43 -@@ -682,7 +682,7 @@
44 - #endif
45 -
46 - memset (&header, 0, sizeof (st_lnx_header_t));
47 -- strcpy (header.magic, MAGIC_STRING);
48 -+ memcpy (header.magic, MAGIC_STRING, sizeof(header.magic));
49 - strcpy (header.cartname, cartname);
50 - strcpy (header.manufname, manufname);
51 - header.page_size_bank0 = cart_analyse (BANK0);
52
53 diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
54 deleted file mode 100644
55 index d7d3b21c833..00000000000
56 --- a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
57 +++ /dev/null
58 @@ -1,45 +0,0 @@
59 ---- a/misc/unzip.h
60 -+++ b/misc/unzip.h
61 -@@ -49,6 +49,10 @@
62 - #include "zlib.h"
63 - #endif
64 -
65 -+#ifndef OF
66 -+#define OF(x) x
67 -+#endif
68 -+
69 - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
70 - /* like the STRICT of WIN32, we define a pointer that cannot be converted
71 - from (void*) without cast */
72 ---- a/libdiscmage/unzip.h
73 -+++ b/libdiscmage/unzip.h
74 -@@ -48,6 +48,9 @@
75 - #ifndef _ZLIB_H
76 - #include "zlib.h"
77 - #endif
78 -+#ifndef OF
79 -+#define OF(x) x
80 -+#endif
81 -
82 - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
83 - /* like the STRICT of WIN32, we define a pointer that cannot be converted
84 ---- a/libdiscmage/misc_z.c
85 -+++ b/libdiscmage/misc_z.c
86 -@@ -27,6 +27,7 @@
87 - #include <string.h>
88 - #include <errno.h>
89 - #include <sys/stat.h>
90 -+#define Z_SOLO
91 - #include <zlib.h>
92 - #include "misc_z.h"
93 - #include "misc.h"
94 ---- a/misc/archive.c
95 -+++ b/misc/archive.c
96 -@@ -27,6 +27,7 @@
97 - #include <string.h>
98 - #include <errno.h>
99 - #include <sys/stat.h>
100 -+#define Z_SOLO
101 - #include <zlib.h>
102 - #ifdef HAVE_BYTESWAP_H
103 - #include <byteswap.h>
104
105 diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild b/games-util/ucon64/ucon64-2.0.0.ebuild
106 deleted file mode 100644
107 index 64f8177f6f3..00000000000
108 --- a/games-util/ucon64/ucon64-2.0.0.ebuild
109 +++ /dev/null
110 @@ -1,65 +0,0 @@
111 -# Copyright 1999-2021 Gentoo Authors
112 -# Distributed under the terms of the GNU General Public License v2
113 -
114 -EAPI=7
115 -
116 -DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
117 -HOMEPAGE="http://ucon64.sourceforge.net/"
118 -SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
119 -S="${WORKDIR}"/${P}-src/src
120 -
121 -LICENSE="GPL-2"
122 -SLOT="0"
123 -KEYWORDS="~amd64 ~x86"
124 -
125 -PATCHES=(
126 - "${FILESDIR}"/${P}-ovflfix.patch
127 - "${FILESDIR}"/${P}-zlib.patch
128 -)
129 -
130 -src_prepare() {
131 - default
132 -
133 - sed -i \
134 - -e "/^CFLAGS/s/-O3/${CFLAGS}/" \
135 - -e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
136 - {,libdiscmage/}Makefile.in || die
137 -}
138 -
139 -src_configure() {
140 - local myconf
141 -
142 - if [[ ! -e "${ESYSROOT}"/usr/include/sys/io.h ]] ; then
143 - ewarn "Disabling support for parallel port"
144 - myconf="${myconf} --disable-parallel"
145 - fi
146 -
147 - econf ${myconf}
148 -}
149 -
150 -src_install() {
151 - dobin ucon64
152 - dolib.so libdiscmage/discmage.so
153 -
154 - cd .. || die
155 -
156 - docinto html
157 - dodoc *.html
158 - docinto html/images
159 - dodoc images/*
160 -}
161 -
162 -pkg_postinst() {
163 - echo
164 - elog "In order to use ${PN}, please create the directory ~/.ucon64/dat"
165 - elog "The command to do that is:"
166 - elog " mkdir -p ~/.ucon64/dat"
167 - elog "Then, you can copy your DAT file collection to ~/.ucon64/dat"
168 - elog
169 - elog "To enable Discmage support, cp /usr/lib/discmage.so to ~/.ucon64"
170 - elog "The command to do that is:"
171 - elog " cp /usr/lib/discmage.so ~/.ucon64/"
172 - elog
173 - elog "Be sure to check ~/.ucon64rc for some options after"
174 - elog "you've run uCON64 for the first time"
175 -}