commit: 1afa7a1b4147511d4e2f0bb0b3523d68b8e4565e
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 07:05:35 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 07:05:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1afa7a1b
games-util/wit: drop 3.02a, 3.02a-r1
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
games-util/wit/Manifest | 1 -
games-util/wit/files/wit-3.02a-fno-common.patch | 11 -
games-util/wit/files/wit-3.02a-makefile.patch | 278 ---------------------
games-util/wit/files/wit-3.02a-no-exec-stack.patch | 9 -
games-util/wit/wit-3.02a-r1.ebuild | 56 -----
games-util/wit/wit-3.02a.ebuild | 56 -----
6 files changed, 411 deletions(-)
diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest
index 1594530ad618..460df286b66a 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 wiimms-iso-tools.source-3.05a.txz 1279228 BLAKE2B
af8c0fb938ad9a7f1aa784861bd155c0e2a43e5e94010130dc0e152a0cec0b67745734ab70d54307c7e6135a80bcdfe0f933878e5211c18bd13207576afa5f00
SHA512
7f964a76522e87149a44ff4c0571dafe5702d1d6fa0abb0ae08a9665cb5a3aa489ae608d098835e3da77541b58943747aba997db15f5756eb1e2909c27b12fe2
diff --git a/games-util/wit/files/wit-3.02a-fno-common.patch
b/games-util/wit/files/wit-3.02a-fno-common.patch
deleted file mode 100644
index b930213f1567..000000000000
--- a/games-util/wit/files/wit-3.02a-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dclib/dclib-color.h
-+++ b/dclib/dclib-color.h
-@@ -535,7 +535,7 @@
- /////////////// color helpers
///////////////
-
///////////////////////////////////////////////////////////////////////////////
-
--u32 ColorTab_M0_M15[16]; // first 16 colors of "\e[m"
-+extern u32 ColorTab_M0_M15[16]; // first 16 colors of "\e[m"
-
- // return a m256 index
- u8 ConvertColorRGB3ToM256 ( u8 r, u8 g, u8 b );
diff --git a/games-util/wit/files/wit-3.02a-makefile.patch
b/games-util/wit/files/wit-3.02a-makefile.patch
deleted file mode 100644
index a0172d50f0f7..000000000000
--- a/games-util/wit/files/wit-3.02a-makefile.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-Don't link libdl into wfuse as it's unnecessary, use system bzip2, respect user
-CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output.
-
---- a/Makefile
-+++ b/Makefile
-@@ -111,11 +111,6 @@
-
#-------------------------------------------------------------------------------
- # compiler settings
-
--PRE ?=
--CC = $(PRE)gcc
--CPP = $(PRE)g++
--STRIP = $(PRE)strip
--
-
#-------------------------------------------------------------------------------
- # files
-
-@@ -171,7 +166,7 @@
- TOPT_wit := $(OPT_STATIC)
- TOPT_wwt := $(OPT_STATIC)
- TOPT_wdf := $(OPT_STATIC)
--TOPT_wfuse := -lfuse -lpthread -ldl
-+TOPT_wfuse := -lfuse -lpthread
-
- #TOPT_ALL := $(TOPT_wit) $(TOPT_wwt) $(TOPT_wdf) $(TOPT_wfuse)
-
-@@ -206,8 +201,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})
-
-
-@@ -297,10 +292,9 @@
- DEFINES1 += -D_LZMA_PROB32=1 # LZMA option
- DEFINES = $(strip $(DEFINES1) $(MODE) $(XDEF))
-
--CFLAGS += -fomit-frame-pointer -fno-strict-aliasing
-funroll-loops
-+CFLAGS += -fno-strict-aliasing
- 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),cygwin)
- CFLAGS += -Wno-format-truncation
- else ifeq ($(SYSTEM),mac)
-@@ -311,13 +305,10 @@
-
- DEPFLAGS += -MMD
-
--LDFLAGS += -static-libgcc
--LDFLAGS := $(strip $(LDFLAGS))
--
- ifeq ($(HAVE_ZLIB),1)
- LIBS += -lz
- endif
--LIBS += -lm -lncurses $(XLIBS)
-+LIBS += -lm $(shell $(PKG_CONFIG) --libs ncurses) -lbz2 $(XLIBS)
-
- DISTRIB_RM = ./wit-v$(VERSION)-r
- DISTRIB_BASE = wit-v$(VERSION)-r$(REVISION_NEXT)
-@@ -370,83 +361,70 @@
- # general rules
-
- $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
-- @printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
-- @if test -f [email protected]; then $(STRIP) [email protected]; 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_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
-+ $(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) [email protected] \
- $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
-
- #--------------------------
-
- $(WDF_LINKS): wdf
-- @printf "$(LOGFORMAT_INST)" "link" "wdf -> $@" ""
-- @ln -f wdf "$@"
-+ ln -f wdf "$@"
-
- #--------------------------
-
- $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
-- @printf "$(LOGFORMAT_CC)" +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_CC)" object "$@" "$(MODE)"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-
- #--------------------------
-
- $(ASM_OBJECTS): %.o: %.S Makefile
-- @printf "$(LOGFORMAT_CC)" 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 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
-
- #
-
###############################################################################
- # lib specific rules
-
- $(LIBBZ2_OBJ): %.o: %.c Makefile
-- @printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE)
[libbz2]"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(BZIP2_FLAGS) $(DEFINES) -c $< -o $@
-
- $(LZMA_OBJ): %.o: %.c Makefile
-- @printf "$(LOGFORMAT_CC)" object "$(subst src/lzma/,,$@)" "$(MODE)
[lzma]"
-- @$(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
-+ $(CC) $(CFLAGS) $(DEPFLAGS) $(LZMA_FLAGS) $(DEFINES) -c $< -o $@
-
- #
-
###############################################################################
-@@ -644,9 +622,8 @@
-
- .PHONY : gen-doc
- gen-doc:
-- @printf "$(LOGFORMAT)" create documentation ""
-- @chmod ug+x $(GEN_TEMPLATE)
-- @$(GEN_TEMPLATE)
-+ chmod ug+x $(GEN_TEMPLATE)
-+ $(GEN_TEMPLATE)
-
- #
- #--------------------------
-@@ -750,7 +727,7 @@
-
- .PHONY : predef
- predef:
-- @gcc -E -dM none.c | sort
-+ @$(CC) -E -dM none.c | sort
-
- #
- #--------------------------
-@@ -764,8 +741,7 @@
- #--------------------------
-
- templates.sed: Makefile
-- @printf "$(LOGFORMAT)" create templates.sed ""
-- @echo -e '' \
-+ echo -e '' \
- '/^~/ d;\n' \
- 's|@.@@@|$(VERSION_NUM)|g;\n' \
- 's|@@@@-@@-@@|$(DATE)|g;\n' \
-@@ -828,13 +804,12 @@
-
- .PHONY : test
- test:
-- @printf "$(LOGFORMAT)" enable test "-> define -DTEST"
-- @rm -f *.o $(ALL_TOOLS_X)
-- @echo "-DTEST" >>$(MODE_FILE)
-- @sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp
-+ rm -f *.o $(ALL_TOOLS_X)
-+ echo "-DTEST" >>$(MODE_FILE)
-+ sort $(MODE_FILE) | uniq > $(MODE_FILE).tmp
- # 2 steps to bypass a cygwin mv failure
-- @cp $(MODE_FILE).tmp $(MODE_FILE)
-- @rm -f $(MODE_FILE).tmp
-+ cp $(MODE_FILE).tmp $(MODE_FILE)
-+ rm -f $(MODE_FILE).tmp
-
- #
- #--------------------------
---- a/makefiles-local/Makefile.local.i386
-+++ b/makefiles-local/Makefile.local.i386
-@@ -5,6 +5,3 @@
- # => copy Makefile.local to main directory and remove appropriate comments
-
-
#------------------------------------------------------------------------------
--
--#CFLAGS += -mtune=generic
--CFLAGS += -march=i686
---- a/makefiles-local/Makefile.local.x86_64
-+++ b/makefiles-local/Makefile.local.x86_64
-@@ -5,6 +5,3 @@
- # => copy Makefile.local to main directory and remove appropriate comments
-
-
#------------------------------------------------------------------------------
--
--CFLAGS += -march=x86-64
--
---- a/setup.sh
-+++ b/setup.sh
-@@ -118,6 +118,6 @@
-
- ---EOT---
-
--gcc $xflags system.c -o system.tmp && ./system.tmp >>Makefile.setup
-+${CC} $xflags system.c -o system.tmp && ./system.tmp >>Makefile.setup
- rm -f system.tmp
-
---- a/test-libwbfs/Makefile
-+++ b/test-libwbfs/Makefile
-@@ -7,11 +7,6 @@
-
- SHELL = /bin/bash
-
--PRE ?=
--CC = $(PRE)gcc
--CPP = $(PRE)g++
--STRIP = $(PRE)strip
--
-
#-------------------------------------------------------------------------------
- # files
-
-@@ -46,18 +41,14 @@
- DEFINES = -DLARGE_FILES -D_FILE_OFFSET_BITS=64 $(XDEF)
- DEFINES := $(strip $(DEFINES))
-
--CFLAGS = -fomit-frame-pointer -fno-strict-aliasing
-+CFLAGS += -fno-strict-aliasing
- CFLAGS += -Wall -Wno-parentheses -Wno-unused-function
--CFLAGS += -O3 -I../src/libwbfs -I.
-+CFLAGS += -I../src/libwbfs -I.
- CFLAGS += $(XFLAGS)
- CFLAGS := $(strip $(CFLAGS))
-
- DEPFLAGS += -MMD
-
--LDFLAGS += -static-libgcc
--#LDFLAGS += -static
--LDFLAGS := $(strip $(LDFLAGS))
--
- LIBS += $(XLIBS)
-
- #
diff --git a/games-util/wit/files/wit-3.02a-no-exec-stack.patch
b/games-util/wit/files/wit-3.02a-no-exec-stack.patch
deleted file mode 100644
index db91b45cfcb1..000000000000
--- a/games-util/wit/files/wit-3.02a-no-exec-stack.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- wit-2.30a/src/crypto/ssl-asm.S
-+++ wit-2.30a/src/crypto/ssl-asm.S
-@@ -37,3 +37,6 @@
- #define WIT_INCLUDE_SSL_ASM
- #include "ssl-asm.h"
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-util/wit/wit-3.02a-r1.ebuild
b/games-util/wit/wit-3.02a-r1.ebuild
deleted file mode 100644
index ee7795010df5..000000000000
--- a/games-util/wit/wit-3.02a-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P="wiimms-iso-tools.source-${PV}"
-
-DESCRIPTION="command line tools to manipulate Wii/GameCube ISO images and WBFS
containers"
-HOMEPAGE="https://wit.wiimm.de/";
-SRC_URI="https://download.wiimm.de/source/wiimms-iso-tools/${MY_P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse +zlib"
-
-RDEPEND="
- app-arch/bzip2:0=
- fuse? ( sys-fs/fuse:0= )
- zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-makefile.patch
- "${FILESDIR}"/${P}-no-exec-stack.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
- # -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/859319
- #
- # After investigation, the build system also uses -fno-strict-aliasing
- # so do not trust it with LTO either, even if the type-mismatch gets
fixed.
- filter-lto
-
- export NO_FUSE=$(usex fuse 0 1)
- export NO_ZLIB=$(usex zlib 0 1)
-
- tc-export CC PKG_CONFIG
-}
-
-src_compile() {
- emake INSTALL_PATH="${ED}"/usr
- emake doc
-}
-
-src_install() {
- default
- dodoc doc/*.txt
-}
diff --git a/games-util/wit/wit-3.02a.ebuild b/games-util/wit/wit-3.02a.ebuild
deleted file mode 100644
index aaeaa614fd02..000000000000
--- a/games-util/wit/wit-3.02a.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P="wiimms-iso-tools.source-${PV}"
-
-DESCRIPTION="command line tools to manipulate Wii/GameCube ISO images and WBFS
containers"
-HOMEPAGE="https://wit.wiimm.de/";
-SRC_URI="https://download.wiimm.de/source/wiimms-iso-tools/${MY_P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+fuse +zlib"
-
-RDEPEND="
- app-arch/bzip2:0=
- fuse? ( sys-fs/fuse:0= )
- zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-makefile.patch
- "${FILESDIR}"/${P}-no-exec-stack.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
- # -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/859319
- #
- # After investigation, the build system also uses -fno-strict-aliasing
- # so do not trust it with LTO either, even if the type-mismatch gets
fixed.
- filter-lto
-
- export NO_FUSE=$(usex fuse 0 1)
- export NO_ZLIB=$(usex zlib 0 1)
-
- tc-export CC PKG_CONFIG
-}
-
-src_compile() {
- emake INSTALL_PATH="${ED}"/usr
- emake doc
-}
-
-src_install() {
- default
- dodoc doc/*.txt
-}
