gentoo resync : 16.02.1018

4 files changed, 231 insertions, 0 deletions

diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 923ed7f45ee9..1424120f9ac3 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest
index ab96e982359c..400894e25bdd 100644
--- a/games-util/wit/Manifest
+++ b/games-util/wit/Manifest
@@ -1,6 +1,9 @@
 AUX wit-2.30a-makefile.patch 3579 BLAKE2B 1aa87c7323c67fb9b35a99cce4eb54332b64e7662410552a9762f8740b23f5674b4cea17145aa302e2ad23875bbb822651670f4010e32826c5f25e797b99ccdd SHA512 e3c98f47e10fe8771dabea091032625448d85adde125a93cc786a49def4f165e164eb71dc7612aee3eea47a9e11dfc0577c223c79eeae5d6832be44b055eed7b
 AUX wit-2.30a-no-exec-stack.patch 232 BLAKE2B 2af2bfe707d22b95f40f2f0e5675fef3e5a153615c327c1638e55651f1fa4cf61b2b868ff86ac899c64f1526f1093e044f32ca853ad0c11c5f505924ee8f1d4d SHA512 958f1fbeda1f29ad704d2eeb3c2a1281f71957fbbb07a7258e6e69af1552e13d135ed61864ef92b9a1334b91990f79366b5b235a8865c424414e46a9305762b0
 AUX wit-2.40a-sizeof-pointer-memaccess.patch 466 BLAKE2B 08c0ac490c63c4d8808ffb06470f96fa6d4f20ddad37662de2cd1c5c535a02b3fb50cbfa65d05b70c3b616522bcaceb37f8ee516abeb5727dc931948ad1bb6d6 SHA512 674052e924d81ab7a893e3ff5367e446e9498f3dbf0900fb7ff33a7c5dafda3c234d60238b1a30aa4865ff0d8f01ea9d3b882b567ac6886f2d875c797c398e3b
+AUX wit-3.02a-makefile.patch 5635 BLAKE2B 0ac9db8629eda6c256a8d728970fce02c47e76dbbf6bc5419e97a96cb3ffee9c42e60d8c629d2915b0ec985631d8785936ca46fe0a2b25c52aba8f5f326fd714 SHA512 c24d6b790220283cd5ae157e8ed5c96f24ea14c70725ec515be342a96b00a1a2f94a390568f9c3c410d511d5e0c3e54a37a7291de16ca5a7f95f285affbfd032
+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
 EBUILD wit-2.40a.ebuild 817 BLAKE2B 5fbe8482f85e44b56dac474f5717d12c7b4d4d5da66fd5f9e6561b434408002585402daea229682b5c821d1e175faa1ea49450369b6867dc62c8c72ec2fb1c84 SHA512 5a7d6d6bb3c43e221c8b1ae606a66e5dab400067a234671ba64e7fcb8701de7f69898d9e937dcf22024c6a27579f4b37dac95f20194945258d4e74f27e89c756
+EBUILD wit-3.02a.ebuild 830 BLAKE2B ce35616d28ae69bcf2cf9bd02d1b366548ad1c8f72a4768d94877fab337025ef16ad69b4c14014dd92f7c91c999bd4649c88dc92314c4d20ffc93cc9c2a5f39a SHA512 a14c52f6526b0a05dd1c1bb7e8c105cb207e907c592e05dbfcf1676d4943b5b1abefe0328ad494de221b5b48205570b7b42e76e9aa435093a482c0ef7ec36d30
 MISC metadata.xml 324 BLAKE2B ac8ddc6d26589b3d1421ae81c7ee04982b7604b91e89c3b39b83253d41ceeb298ff2ba402097438eb49c1fc48e6d673d60172b8c9a1108a53b8381bc5210cecc SHA512 e95891f8df24d69c9a567049fc3bb6888372eb69845cfccd62056fcde57d882f5344934dd3354e79b6b05ebefdd3c1c2183ea1cc4f473633c57becf0fb08a469
diff --git a/games-util/wit/files/wit-3.02a-makefile.patch b/games-util/wit/files/wit-3.02a-makefile.patch
new file mode 100644
index 000000000000..7d3be3fbd57a
--- /dev/null
+++ b/games-util/wit/files/wit-3.02a-makefile.patch
@@ -0,0 +1,187 @@
+Don't link libdl into wfuse as it's unnecessary, use system bzip2, respect user
+CFLAGS, and use verbose build output.
+
+--- wiimms-iso-tools.source-3.02a/Makefile
++++ wiimms-iso-tools.source-3.02a/Makefile
+@@ -171,7 +171,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 +206,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 +297,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),cygwin)
+   CFLAGS	+= -Wno-format-truncation
+ else ifeq ($(SYSTEM),mac)
+@@ -317,7 +315,7 @@
+ ifeq ($(HAVE_ZLIB),1)
+  LIBS		+= -lz
+ endif
+-LIBS		+= -lm -lncurses $(XLIBS)
++LIBS		+= -lm -lncurses -lbz2 $(XLIBS)
+ 
+ DISTRIB_RM	= ./wit-v$(VERSION)-r
+ DISTRIB_BASE	= wit-v$(VERSION)-r$(REVISION_NEXT)
+@@ -370,83 +368,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) $@.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_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
++	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
+ 		$(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 +629,8 @@
+ 
+ .PHONY : gen-doc
+ gen-doc:
+-	@printf "$(LOGFORMAT)" create documentation ""
+-	@chmod ug+x $(GEN_TEMPLATE)
+-	@$(GEN_TEMPLATE)
++	chmod ug+x $(GEN_TEMPLATE)
++	$(GEN_TEMPLATE)
+ 
+ #
+ #--------------------------
+@@ -764,8 +748,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 +811,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
+ 
+ #
+ #--------------------------
diff --git a/games-util/wit/wit-3.02a.ebuild b/games-util/wit/wit-3.02a.ebuild
new file mode 100644
index 000000000000..86555489abac
--- /dev/null
+++ b/games-util/wit/wit-3.02a.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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}"
+
+DOCS="doc/*.txt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${PN}-2.30a-no-exec-stack.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+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
+}