reinit the tree, so we can have metadata

6 files changed, 206 insertions, 0 deletions

diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest
new file mode 100644
index 000000000000..487a20357537
--- /dev/null
+++ b/games-util/wit/Manifest
@@ -0,0 +1,8 @@
+AUX wit-2.30a-makefile.patch 3579 SHA256 addb45e745ec54ed3ad199af128b09775927d26d252ac202cffa4cba3df74717 SHA512 e3c98f47e10fe8771dabea091032625448d85adde125a93cc786a49def4f165e164eb71dc7612aee3eea47a9e11dfc0577c223c79eeae5d6832be44b055eed7b WHIRLPOOL 65bb3556c054d66d00822d1eae180d9fa946d4abac619fd0efc7da9a82463334bbcc31d3b7a9efb4f9beb299a1c05ed33c6c2778407b49cdf10d49009985d73d
+AUX wit-2.30a-no-exec-stack.patch 232 SHA256 6208b50aa8bcda69be9241285f107deac484c4ce084aa314485aa56de2d8214b SHA512 958f1fbeda1f29ad704d2eeb3c2a1281f71957fbbb07a7258e6e69af1552e13d135ed61864ef92b9a1334b91990f79366b5b235a8865c424414e46a9305762b0 WHIRLPOOL 5fe6df0d36f10d75679b9d26e5b54a3aa2522f6853f8a75aa10038ed60fcabb2ecc51d4fc6f2cd19f3e2d58d871c686a12c09bbb2ea06247ca05750e8a8234bb
+AUX wit-2.40a-sizeof-pointer-memaccess.patch 466 SHA256 932a106126c8dd0b0a7134a3dcf698dab9c4365a09c84b45e9f4d18a10fed06e SHA512 674052e924d81ab7a893e3ff5367e446e9498f3dbf0900fb7ff33a7c5dafda3c234d60238b1a30aa4865ff0d8f01ea9d3b882b567ac6886f2d875c797c398e3b WHIRLPOOL bca5b5b62c4b9ed309ab4d8eabcc41e100a161169c35e0529d8ce6e6b8f05dbf4af5c103579545752c43ce91a51d3ec5620d39598d779759133cb17564a2ce8a
+DIST wit-2.40a.tar.xz 723448 SHA256 75b03490e8f72497bebd584a5c1e5d0813828e14413df89c97857072f860319a SHA512 f119ed9dffbb42ba9037444aaa992adaa812c176d1e412f9df6c5b59efff51a24cca0141700939efec7845ac1d42cc9a30100e19ef39adee0306872181b28b5b WHIRLPOOL 16ef0fad03f82228c776deeba8920f1b193d958ec1583623eeb78296323b19e8478e057ae95bf82452e685c7690c5c9ce8883a24f3a45d4770aa044c1ac85248
+EBUILD wit-2.40a.ebuild 817 SHA256 80e9181820ca59ce69c9a14560bf0c529ad3ec7e93d028eafc8cf2412173cef5 SHA512 5a7d6d6bb3c43e221c8b1ae606a66e5dab400067a234671ba64e7fcb8701de7f69898d9e937dcf22024c6a27579f4b37dac95f20194945258d4e74f27e89c756 WHIRLPOOL 7342fd49e4d0ec54fbbb5898d5bd35d79b12fe73a02310a5754f5082ce9b609d6183a9effb2a406fcee3e154c5bbd34cb52d3f9a34d203f4bd27ca824111be11
+MISC ChangeLog 2765 SHA256 312d868e063f12c7111d39c1ef266e719342f12507991833ea96bc4bbbf1d803 SHA512 ce238835c09f885e15a0f5ba755902d4d956b64260dbd6b9268147c198b4c2b60e0f6b7523a87a57ce5eb70be5325d983a7a68988160fb0100768a958e6a7ce6 WHIRLPOOL c1a4ead1327f40617c969cc1287df13a28e55758135e5b1d8f06bda268675addfc2540efd050016d055e0f1234b7aade42aa777008b8d1004690aedfa84cf6e3
+MISC ChangeLog-2015 587 SHA256 8d4a2e1553c7a55bea6bc7b47eeebd306d183cff95bb21e5cd89c76f6b77bf92 SHA512 462875024ca74b044579f6c15c0a215f37df6230e4d5864ea948ebd7f1c3a27c0855d4a60fe14642a44e72f8b1765bf9847f2d0c7f390ad3eb23026b2e19d8b6 WHIRLPOOL 1ff756bbdbb20ef0ac36ab901e2d284f8b5b2facfe9fe76b88d5c9b19b25e03e609b03ab712588ef173d0967a920fcf1aa54ec1da45b53a9bbe88dcf193ed894
+MISC metadata.xml 324 SHA256 37a6a78b1ea801b0f2141289acfae8ff7d1041305fc619274c5e4a3b8faca0b8 SHA512 e95891f8df24d69c9a567049fc3bb6888372eb69845cfccd62056fcde57d882f5344934dd3354e79b6b05ebefdd3c1c2183ea1cc4f473633c57becf0fb08a469 WHIRLPOOL c158d44d0a5550ba8a307be13e67780f845c51e393a106cb5506d6a0ef1317f176e3f155b0b11670b55d79bd6a00dcf6a457e04a9057a070a9c770b74e5e9842
diff --git a/games-util/wit/files/wit-2.30a-makefile.patch b/games-util/wit/files/wit-2.30a-makefile.patch
new file mode 100644
index 000000000000..d705487cd8ba
--- /dev/null
+++ b/games-util/wit/files/wit-2.30a-makefile.patch
@@ -0,0 +1,120 @@
+--- 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.30a-no-exec-stack.patch b/games-util/wit/files/wit-2.30a-no-exec-stack.patch
new file mode 100644
index 000000000000..db91b45cfcb1
--- /dev/null
+++ b/games-util/wit/files/wit-2.30a-no-exec-stack.patch
@@ -0,0 +1,9 @@
+--- 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/files/wit-2.40a-sizeof-pointer-memaccess.patch b/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch
new file mode 100644
index 000000000000..a6083103b857
--- /dev/null
+++ b/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch
@@ -0,0 +1,20 @@
+--- 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/metadata.xml b/games-util/wit/metadata.xml
new file mode 100644
index 000000000000..baf90ff6dc62
--- /dev/null
+++ b/games-util/wit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Enable image mount support via fuse</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-util/wit/wit-2.40a.ebuild b/games-util/wit/wit-2.40a.ebuild
new file mode 100644
index 000000000000..cb5a55fdabdc
--- /dev/null
+++ b/games-util/wit/wit-2.40a.ebuild
@@ -0,0 +1,38 @@
+# 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
+}