From fb4198581f00f2d25726df1f2ed4700053ff717e Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Tue, 13 Aug 2019 18:39:55 -0600 Subject: games-util/wit: remove old Signed-off-by: Tim Harder --- games-util/wit/Manifest | 1 - games-util/wit/files/wit-2.30a-makefile.patch | 120 --------------------- .../files/wit-2.40a-sizeof-pointer-memaccess.patch | 20 ---- games-util/wit/wit-2.40a.ebuild | 38 ------- 4 files changed, 179 deletions(-) delete mode 100644 games-util/wit/files/wit-2.30a-makefile.patch delete mode 100644 games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch delete mode 100644 games-util/wit/wit-2.40a.ebuild (limited to 'games-util') diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest index 1ed176cbca3a..65290640ef30 100644 --- a/games-util/wit/Manifest +++ b/games-util/wit/Manifest @@ -1,2 +1 @@ DIST wiimms-iso-tools.source-3.02a.tar.bz2 1645416 BLAKE2B 3ce99b779069d7b845bcf799ee481d63764ba36576adf4c28759e8eb9db9239c158457f84c8e34169b493de94d3c5e3324dc3c2cbd9a9a171ed1b57d2863eb78 SHA512 9bc8c8e078b2932d74a785732ec786ed5b6af86fa951f606a23052c31445e0b1637065858148fb050137f6252ae4ef77676877263513ef3bda33edb42bfed632 -DIST wit-2.40a.tar.xz 723448 BLAKE2B 3201000b86684b781e4dfbd738af22fbf87884110740a3b194028262deaf0617b44bcc4095fa60ee22e510e41cdd336f6bbcdeac076f49eda0d374cef2f457d7 SHA512 f119ed9dffbb42ba9037444aaa992adaa812c176d1e412f9df6c5b59efff51a24cca0141700939efec7845ac1d42cc9a30100e19ef39adee0306872181b28b5b diff --git a/games-util/wit/files/wit-2.30a-makefile.patch b/games-util/wit/files/wit-2.30a-makefile.patch deleted file mode 100644 index d705487cd8ba..000000000000 --- a/games-util/wit/files/wit-2.30a-makefile.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- wit-2.30a/Makefile -+++ wit-2.30a/Makefile -@@ -190,8 +190,8 @@ - endif - - # lib summary --LIB_LIST += libbz2 lzma --LIB_OBJECTS += $(LIBBZ2_OBJ) $(LZMA_OBJ) -+LIB_LIST += lzma -+LIB_OBJECTS += $(LZMA_OBJ) - RM_FILES += $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o}) - - -@@ -273,10 +274,8 @@ - DEFINES1 += -D_LZMA_PROB32=1 # LZMA option - DEFINES = $(strip $(DEFINES1) $(MODE) $(XDEF)) - --CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -funroll-loops - CFLAGS += -Wall -Wno-parentheses -Wno-unused-function --#CFLAGS += -O3 -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork --CFLAGS += -O3 -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork -+CFLAGS += -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork - ifeq ($(SYSTEM),mac) - CFLAGS += -I/usr/local/include - endif -@@ -291,7 +290,7 @@ - ifeq ($(HAVE_ZLIB),1) - LIBS += -lz - endif --LIBS += $(XLIBS) -+LIBS += $(XLIBS) -lbz2 - - DISTRIB_RM = ./wit-v$(VERSION)-r - DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT) -@@ -344,71 +343,60 @@ - # general rules - - $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS) -- @printf "$(LOGFORMAT)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)" -- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ -+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ - $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@ -- @if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi - -- @mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug -- @if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \ -+ mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug -+ if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \ - then cp -p $@ bin/$(SYSTEM)/debug/; \ - else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi - - #-------------------------- - - $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile -- @printf "$(LOGFORMAT)" helper "$@ $(TOBJ_$@)" "$(MODE)" -- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ -+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \ - $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@ - - #-------------------------- - - $(WDF_LINKS): wdf -- @printf "$(LOGFORMAT)" "link" "wdf -> $@" "" -- @ln -f wdf "$@" -+ ln -f wdf "$@" - - #-------------------------- - - $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile -- @printf "$(LOGFORMAT)" +object "$@" "$(MODE)" -- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ -+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ - - #-------------------------- - - $(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES) -- @printf "$(LOGFORMAT)" object "$@" "$(MODE)" -- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ -+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ - - #-------------------------- - - $(ASM_OBJECTS): %.o: %.S Makefile -- @printf "$(LOGFORMAT)" asm "$@" "$(MODE)" -- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ -+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@ - - #-------------------------- - - $(SETUP_FILES): templates.sed $(SETUP_DIR)/$@ -- @printf "$(LOGFORMAT)" create "$@" "" -- @chmod 775 $(GEN_TEMPLATE) -- @$(GEN_TEMPLATE) $@ -+ chmod 775 $(GEN_TEMPLATE) -+ $(GEN_TEMPLATE) $@ - - #-------------------------- - - $(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@ -- @printf "$(LOGFORMAT)" text "$@" "" -- @chmod 775 $(GEN_TEXT_FILE) -- @$(GEN_TEXT_FILE) $(TEXT_DIR) $@ -+ chmod 775 $(GEN_TEXT_FILE) -+ $(GEN_TEXT_FILE) $(TEXT_DIR) $@ - - #-------------------------- - - $(UI_FILES): gen-ui.c tab-ui.c ui.h $(UI_TABS) | gen-ui -- @printf "$(LOGFORMAT)" run gen-ui "" -- @./gen-ui -+ ./gen-ui - - .PHONY : ui - ui : gen-ui -- @printf "$(LOGFORMAT)" run gen-ui "" -- @./gen-ui -+ ./gen-ui - - # - ############################################################################### 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 deleted file mode 100644 index a6083103b857..000000000000 --- a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- wit-2.40a/src/wfuse.c -+++ wit-2.40a/src/wfuse.c -@@ -340,7 +340,7 @@ - } - ResetWBFS(df->wbfs); - FREE(df->wbfs); -- memset(df,0,sizeof(df)); -+ memset(df,0,sizeof(*df)); - n_dfile--; - } - -@@ -352,7 +352,7 @@ - - if (found_df) - { -- memset(found_df,0,sizeof(found_df)); -+ memset(found_df,0,sizeof(*found_df)); - WBFS_t * wbfs = MALLOC(sizeof(*wbfs)); - InitializeWBFS(wbfs); - enumError err = OpenWBFS(wbfs,source_file,false,true,0); diff --git a/games-util/wit/wit-2.40a.ebuild b/games-util/wit/wit-2.40a.ebuild deleted file mode 100644 index cb5a55fdabdc..000000000000 --- a/games-util/wit/wit-2.40a.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -DESCRIPTION="command line tools to manipulate Wii/GameCube ISO images and WBFS containers" -HOMEPAGE="https://wit.wiimm.de/" -SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+fuse +zlib" - -RDEPEND=" - app-arch/bzip2 - fuse? ( sys-fs/fuse ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -DOCS="doc/*.txt" - -PATCHES=( - "${FILESDIR}"/${PN}-2.30a-makefile.patch - "${FILESDIR}"/${PN}-2.30a-no-exec-stack.patch - "${FILESDIR}"/${P}-sizeof-pointer-memaccess.patch -) - -src_compile() { - export NO_FUSE=$(usex fuse 0 1) - export NO_ZLIB=$(usex zlib 0 1) - - emake INSTALL_PATH="${D}"/usr CC="$(tc-getCC)" - emake doc -} -- cgit v1.2.3