Merge updates from master

eclass/R-packages-guru.eclass

@@ -11,6 +11,13 @@ IUSE="byte-compile"
 DEPEND="dev-lang/R"
 RDEPEND="${DEPEND}"
 
+dodocrm() {
+	if [ -e "${1}" ]; then
+		dodoc -r "${1}"
+		rm -rf "${1}" || die
+	fi
+}
+
 R-packages-guru_src_unpack() {
 	unpack ${A}
 	if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then
@@ -18,15 +25,11 @@ R-packages-guru_src_unpack() {
 	fi
 }
 
-if has "${EAPI:-0}" 0 1 2 3 4 5; then
-	R-packages-guru_src_prepare() {
-		epatch_user
-	}
-else
-	R-packages-guru_src_prepare() {
-		default
-	}
-fi
+R-packages-guru_src_prepare() {
+	rm -f LICENSE || die
+	default
+}
+
 
 R-packages-guru_src_compile() {
 	MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" \
@@ -34,6 +37,22 @@ R-packages-guru_src_compile() {
 }
 
 R-packages-guru_src_install() {
+	cd "${WORKDIR}"/${PN//_/.} || die
+
+	dodocrm examples || die
+#	dodocrm DESCRIPTION || die #keep this
+	dodocrm NEWS.md || die
+	dodocrm README.md || die
+	dodocrm html || die
+	docinto "${DOCSDIR}/html"
+	if [ -e doc ]; then
+		ls doc/*.html &>/dev/null && dodoc -r doc/*.html
+		rm -rf doc/*.html || die
+		docinto "${DOCSDIR}"
+		dodoc -r doc/.
+		rm -rf doc
+	fi
+
 	insinto /usr/$(get_libdir)/R/site-library
 	doins -r "${WORKDIR}"/${PN//_/.}
 }

games-board/openriichi/openriichi-0.2.1.1.ebuild

@@ -24,6 +24,7 @@ RESTRICT="mirror"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="
+	$(vala_depend)
 	dev-libs/libgee:0.8
 	media-libs/glew:0
 	media-libs/libsdl2[haptic,joystick,opengl,sound,threads,video]

media-libs/libbpg/Manifest

@@ -0,0 +1 @@
+DIST libbpg-0.9.8.tar.gz 2029021 BLAKE2B 827d819d6e392a1a0186a58b16b9b69c41f4a0c94046ff2a1aab0e735e01aae8c10d06ad03c1bf9f0722a7620f50ae7da25bddda681e457ad4cdeec8cb922edc SHA512 2d5f7a035033d8b969c2765a4f1368e1a2c8c5ace12aec5d449ca5cc4ef5eb89431a75f2d6d03fd7117b548801b5554503411f499f497da69ff33ca6e714553d

media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 8364e93..d3fc48f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@ CROSS_PREFIX:=x86_64-w64-mingw32-
+ #CROSS_PREFIX=i686-w64-mingw32-
+ EXE:=.exe
+ else
+-CROSS_PREFIX:=
++CROSS_PREFIX:=${CHOST}-
+ EXE:=
+ endif
+ 

media-libs/libbpg/files/libbpg-0.9.8-add-fpic.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 3a8db4c..eaccfd8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -86,7 +86,7 @@ LIBBPG_JS8_OBJS:=$(patsubst %.o, %.js8.o, $(LIBBPG_OBJS)) tmalloc.js8.o
+ 
+ LIBBPG_JS8A_OBJS:=$(patsubst %.o, %.js8a.o, $(LIBBPG_OBJS)) tmalloc.js8a.o
+ 
+-$(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED
++$(LIBBPG_OBJS): CFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH -DUSE_PRED -fPIC
+ 
+ $(LIBBPG_JS_OBJS): EMCFLAGS+=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DHAVE_AV_CONFIG_H -std=c99 -D_GNU_SOURCE=1 -DUSE_VAR_BIT_DEPTH
+ 

media-libs/libbpg/files/libbpg-0.9.8-dont-strip-bins.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index a5ba63b..8364e93 100644
+--- a/Makefile
++++ b/Makefile
+@@ -214,7 +214,7 @@ size:
+ 	gzip < bpgdec | wc
+ 
+ install: bpgenc bpgdec
+-	install -s -m 755 $^ $(prefix)/bin
++	install -m 755 $^ $(prefix)/bin
+ 
+ CLEAN_DIRS=doc html libavcodec libavutil \
+      jctvc jctvc/TLibEncoder jctvc/TLibVideoIO jctvc/TLibCommon jctvc/libmd5

media-libs/libbpg/files/libbpg-0.9.8-remove-forced-options.patch

@@ -0,0 +1,27 @@
+diff --git a/Makefile b/Makefile
+index 3a8db4c..a5ba63b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,11 +5,11 @@
+ # Enable compilation of Javascript decoder with Emscripten
+ #USE_EMCC=y
+ # Enable x265 for the encoder
+-USE_X265=y
++#USE_X265=y
+ # Enable the JCTVC code (best quality but slow) for the encoder
+ #USE_JCTVC=y
+ # Compile bpgview (SDL and SDL_image libraries needed)
+-USE_BPGVIEW=y
++#USE_BPGVIEW=y
+ # Enable it to use bit depths > 12 (need more tests to validate encoder)
+ #USE_JCTVC_HIGH_BIT_DEPTH=y
+ # Enable the cross compilation for Windows
+@@ -17,7 +17,7 @@ USE_BPGVIEW=y
+ # Enable for compilation on MacOS X
+ #CONFIG_APPLE=y
+ # Installation prefix
+-prefix=/usr/local
++#prefix=/usr/local
+ 
+ 
+ #################################

media-libs/libbpg/libbpg-0.9.8.ebuild

@@ -0,0 +1,73 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Better Portable Graphics reference implementation"
+HOMEPAGE="https://bellard.org/bpg/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+x265 bpgview jctvc emcc static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-forced-options.patch
+	"${FILESDIR}"/${P}-dont-strip-bins.patch
+	"${FILESDIR}"/${P}-add-chost.patch
+	"${FILESDIR}"/${P}-add-fpic.patch
+)
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	media-video/ffmpeg
+	media-libs/libpng
+	virtual/jpeg
+	bpgview? ( media-libs/sdl-image )
+	bpgview? ( media-libs/libsdl )
+"
+
+src_prepare() {
+	default
+
+	cat <<EOF > ${PN}.pc
+prefix="${EPREFIX}/usr"
+libdir="\${prefix}/$(get_libdir)"
+includedir="\${prefix}/include"
+
+Name: ${PN}
+Description: ${DESCRIPTION}
+URL: ${HOMEPAGE}
+Version: ${PV}
+Libs: "-L\${libdir}" -lbpg
+Cflags: "-I\${includedir}"
+EOF
+}
+
+src_compile() {
+	emake \
+		$(usex x265 USE_X265=y '') \
+		$(usex bpgview USE_BPGVIEW=y '') \
+		$(usex jctvc USE_JCTVC=y '') \
+		$(usex emcc USE_EMCC=y '')
+}
+
+src_install() {
+	mkdir -p "${D}"/usr/bin
+	emake prefix="${D}"/usr install
+
+	if use bpgview; then
+		dobin bpgview
+	fi
+
+	if use static-libs; then
+		dolib.a libbpg.a
+		doheader libbpg.h
+		doheader bpgenc.h
+
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins ${PN}.pc
+	fi
+}

media-libs/libbpg/metadata.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		BPG (Better Portable Graphics) is a new image format. Its purpose is
+		to replace the JPEG image format when quality or file size is an issue.
+	</longdescription>
+	<maintainer type="person">
+		<email>m.santullo@posteo.net</email>
+		<name>Michele Santullo</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Fabrice Bellard</name>
+			<email>fabrice@bellard.org</email>
+		</maintainer>
+	</upstream>
+	<use>
+		<flag name="x265"></flag>
+		<flag name="bpgview"></flag>
+		<flag name="jctvc"></flag>
+		<flag name="emcc"></flag>
+	</use>
+</pkgmetadata>

media-sound/ibniz/ibniz-1.18.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="virtual machine designed for extremely compact low-level audiovisual programs"
-HOMEPAGE="http://pelulamu.net/ibniz/"
-SRC_URI="http://pelulamu.net/ibniz/${P}.tar.gz"
+HOMEPAGE="http://viznut.fi/ibniz/"
+SRC_URI="http://viznut.fi/ibniz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"