| 1 |
commit: fb4198581f00f2d25726df1f2ed4700053ff717e |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 14 00:39:55 2019 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 14 00:40:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb419858 |
| 7 |
|
| 8 |
games-util/wit: remove old |
| 9 |
|
| 10 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
| 11 |
|
| 12 |
games-util/wit/Manifest | 1 - |
| 13 |
games-util/wit/files/wit-2.30a-makefile.patch | 120 --------------------- |
| 14 |
.../files/wit-2.40a-sizeof-pointer-memaccess.patch | 20 ---- |
| 15 |
games-util/wit/wit-2.40a.ebuild | 38 ------- |
| 16 |
4 files changed, 179 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest |
| 19 |
index 1ed176cbca3..65290640ef3 100644 |
| 20 |
--- a/games-util/wit/Manifest |
| 21 |
+++ b/games-util/wit/Manifest |
| 22 |
@@ -1,2 +1 @@ |
| 23 |
DIST wiimms-iso-tools.source-3.02a.tar.bz2 1645416 BLAKE2B 3ce99b779069d7b845bcf799ee481d63764ba36576adf4c28759e8eb9db9239c158457f84c8e34169b493de94d3c5e3324dc3c2cbd9a9a171ed1b57d2863eb78 SHA512 9bc8c8e078b2932d74a785732ec786ed5b6af86fa951f606a23052c31445e0b1637065858148fb050137f6252ae4ef77676877263513ef3bda33edb42bfed632 |
| 24 |
-DIST wit-2.40a.tar.xz 723448 BLAKE2B 3201000b86684b781e4dfbd738af22fbf87884110740a3b194028262deaf0617b44bcc4095fa60ee22e510e41cdd336f6bbcdeac076f49eda0d374cef2f457d7 SHA512 f119ed9dffbb42ba9037444aaa992adaa812c176d1e412f9df6c5b59efff51a24cca0141700939efec7845ac1d42cc9a30100e19ef39adee0306872181b28b5b |
| 25 |
|
| 26 |
diff --git a/games-util/wit/files/wit-2.30a-makefile.patch b/games-util/wit/files/wit-2.30a-makefile.patch |
| 27 |
deleted file mode 100644 |
| 28 |
index d705487cd8b..00000000000 |
| 29 |
--- a/games-util/wit/files/wit-2.30a-makefile.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,120 +0,0 @@ |
| 32 |
---- wit-2.30a/Makefile |
| 33 |
-+++ wit-2.30a/Makefile |
| 34 |
-@@ -190,8 +190,8 @@ |
| 35 |
- endif |
| 36 |
- |
| 37 |
- # lib summary |
| 38 |
--LIB_LIST += libbz2 lzma |
| 39 |
--LIB_OBJECTS += $(LIBBZ2_OBJ) $(LZMA_OBJ) |
| 40 |
-+LIB_LIST += lzma |
| 41 |
-+LIB_OBJECTS += $(LZMA_OBJ) |
| 42 |
- RM_FILES += $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o}) |
| 43 |
- |
| 44 |
- |
| 45 |
-@@ -273,10 +274,8 @@ |
| 46 |
- DEFINES1 += -D_LZMA_PROB32=1 # LZMA option |
| 47 |
- DEFINES = $(strip $(DEFINES1) $(MODE) $(XDEF)) |
| 48 |
- |
| 49 |
--CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -funroll-loops |
| 50 |
- CFLAGS += -Wall -Wno-parentheses -Wno-unused-function |
| 51 |
--#CFLAGS += -O3 -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork |
| 52 |
--CFLAGS += -O3 -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork |
| 53 |
-+CFLAGS += -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork |
| 54 |
- ifeq ($(SYSTEM),mac) |
| 55 |
- CFLAGS += -I/usr/local/include |
| 56 |
- endif |
| 57 |
-@@ -291,7 +290,7 @@ |
| 58 |
- ifeq ($(HAVE_ZLIB),1) |
| 59 |
- LIBS += -lz |
| 60 |
- endif |
| 61 |
--LIBS += $(XLIBS) |
| 62 |
-+LIBS += $(XLIBS) -lbz2 |
| 63 |
- |
| 64 |
- DISTRIB_RM = ./wit-v$(VERSION)-r |
| 65 |
- DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT) |
| 66 |
-@@ -344,71 +343,60 @@ |
| 67 |
- # general rules |
| 68 |
- |
| 69 |
- $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS) |
| 70 |
-- @printf "$(LOGFORMAT)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)" |
| 71 |
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ |
| 72 |
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ |
| 73 |
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@ |
| 74 |
-- @if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi |
| 75 |
- |
| 76 |
-- @mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug |
| 77 |
-- @if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \ |
| 78 |
-+ mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug |
| 79 |
-+ if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \ |
| 80 |
- then cp -p $@ bin/$(SYSTEM)/debug/; \ |
| 81 |
- else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi |
| 82 |
- |
| 83 |
- #-------------------------- |
| 84 |
- |
| 85 |
- $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile |
| 86 |
-- @printf "$(LOGFORMAT)" helper "$@ $(TOBJ_$@)" "$(MODE)" |
| 87 |
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ |
| 88 |
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ |
| 89 |
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@ |
| 90 |
- |
| 91 |
- #-------------------------- |
| 92 |
- |
| 93 |
- $(WDF_LINKS): wdf |
| 94 |
-- @printf "$(LOGFORMAT)" "link" "wdf -> $@" "" |
| 95 |
-- @ln -f wdf "$@" |
| 96 |
-+ ln -f wdf "$@" |
| 97 |
- |
| 98 |
- #-------------------------- |
| 99 |
- |
| 100 |
- $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile |
| 101 |
-- @printf "$(LOGFORMAT)" +object "$@" "$(MODE)" |
| 102 |
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ |
| 103 |
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ |
| 104 |
- |
| 105 |
- #-------------------------- |
| 106 |
- |
| 107 |
- $(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES) |
| 108 |
-- @printf "$(LOGFORMAT)" object "$@" "$(MODE)" |
| 109 |
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ |
| 110 |
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ |
| 111 |
- |
| 112 |
- #-------------------------- |
| 113 |
- |
| 114 |
- $(ASM_OBJECTS): %.o: %.S Makefile |
| 115 |
-- @printf "$(LOGFORMAT)" asm "$@" "$(MODE)" |
| 116 |
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ |
| 117 |
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ |
| 118 |
- |
| 119 |
- #-------------------------- |
| 120 |
- |
| 121 |
- $(SETUP_FILES): templates.sed $(SETUP_DIR)/$@ |
| 122 |
-- @printf "$(LOGFORMAT)" create "$@" "" |
| 123 |
-- @chmod 775 $(GEN_TEMPLATE) |
| 124 |
-- @$(GEN_TEMPLATE) $@ |
| 125 |
-+ chmod 775 $(GEN_TEMPLATE) |
| 126 |
-+ $(GEN_TEMPLATE) $@ |
| 127 |
- |
| 128 |
- #-------------------------- |
| 129 |
- |
| 130 |
- $(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@ |
| 131 |
-- @printf "$(LOGFORMAT)" text "$@" "" |
| 132 |
-- @chmod 775 $(GEN_TEXT_FILE) |
| 133 |
-- @$(GEN_TEXT_FILE) $(TEXT_DIR) $@ |
| 134 |
-+ chmod 775 $(GEN_TEXT_FILE) |
| 135 |
-+ $(GEN_TEXT_FILE) $(TEXT_DIR) $@ |
| 136 |
- |
| 137 |
- #-------------------------- |
| 138 |
- |
| 139 |
- $(UI_FILES): gen-ui.c tab-ui.c ui.h $(UI_TABS) | gen-ui |
| 140 |
-- @printf "$(LOGFORMAT)" run gen-ui "" |
| 141 |
-- @./gen-ui |
| 142 |
-+ ./gen-ui |
| 143 |
- |
| 144 |
- .PHONY : ui |
| 145 |
- ui : gen-ui |
| 146 |
-- @printf "$(LOGFORMAT)" run gen-ui "" |
| 147 |
-- @./gen-ui |
| 148 |
-+ ./gen-ui |
| 149 |
- |
| 150 |
- # |
| 151 |
- ############################################################################### |
| 152 |
|
| 153 |
diff --git a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch b/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch |
| 154 |
deleted file mode 100644 |
| 155 |
index a6083103b85..00000000000 |
| 156 |
--- a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch |
| 157 |
+++ /dev/null |
| 158 |
@@ -1,20 +0,0 @@ |
| 159 |
---- wit-2.40a/src/wfuse.c |
| 160 |
-+++ wit-2.40a/src/wfuse.c |
| 161 |
-@@ -340,7 +340,7 @@ |
| 162 |
- } |
| 163 |
- ResetWBFS(df->wbfs); |
| 164 |
- FREE(df->wbfs); |
| 165 |
-- memset(df,0,sizeof(df)); |
| 166 |
-+ memset(df,0,sizeof(*df)); |
| 167 |
- n_dfile--; |
| 168 |
- } |
| 169 |
- |
| 170 |
-@@ -352,7 +352,7 @@ |
| 171 |
- |
| 172 |
- if (found_df) |
| 173 |
- { |
| 174 |
-- memset(found_df,0,sizeof(found_df)); |
| 175 |
-+ memset(found_df,0,sizeof(*found_df)); |
| 176 |
- WBFS_t * wbfs = MALLOC(sizeof(*wbfs)); |
| 177 |
- InitializeWBFS(wbfs); |
| 178 |
- enumError err = OpenWBFS(wbfs,source_file,false,true,0); |
| 179 |
|
| 180 |
diff --git a/games-util/wit/wit-2.40a.ebuild b/games-util/wit/wit-2.40a.ebuild |
| 181 |
deleted file mode 100644 |
| 182 |
index cb5a55fdabd..00000000000 |
| 183 |
--- a/games-util/wit/wit-2.40a.ebuild |
| 184 |
+++ /dev/null |
| 185 |
@@ -1,38 +0,0 @@ |
| 186 |
-# Copyright 1999-2017 Gentoo Foundation |
| 187 |
-# Distributed under the terms of the GNU General Public License v2 |
| 188 |
- |
| 189 |
-EAPI=6 |
| 190 |
- |
| 191 |
-inherit eutils toolchain-funcs |
| 192 |
- |
| 193 |
-DESCRIPTION="command line tools to manipulate Wii/GameCube ISO images and WBFS containers" |
| 194 |
-HOMEPAGE="https://wit.wiimm.de/" |
| 195 |
-SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz" |
| 196 |
- |
| 197 |
-LICENSE="GPL-2" |
| 198 |
-SLOT="0" |
| 199 |
-KEYWORDS="amd64 x86" |
| 200 |
-IUSE="+fuse +zlib" |
| 201 |
- |
| 202 |
-RDEPEND=" |
| 203 |
- app-arch/bzip2 |
| 204 |
- fuse? ( sys-fs/fuse ) |
| 205 |
- zlib? ( sys-libs/zlib ) |
| 206 |
-" |
| 207 |
-DEPEND="${RDEPEND}" |
| 208 |
- |
| 209 |
-DOCS="doc/*.txt" |
| 210 |
- |
| 211 |
-PATCHES=( |
| 212 |
- "${FILESDIR}"/${PN}-2.30a-makefile.patch |
| 213 |
- "${FILESDIR}"/${PN}-2.30a-no-exec-stack.patch |
| 214 |
- "${FILESDIR}"/${P}-sizeof-pointer-memaccess.patch |
| 215 |
-) |
| 216 |
- |
| 217 |
-src_compile() { |
| 218 |
- export NO_FUSE=$(usex fuse 0 1) |
| 219 |
- export NO_ZLIB=$(usex zlib 0 1) |
| 220 |
- |
| 221 |
- emake INSTALL_PATH="${D}"/usr CC="$(tc-getCC)" |
| 222 |
- emake doc |
| 223 |
-} |
Archives