Merge updates from master

app-emulation/dxvk-bin/Manifest

@@ -1 +1,2 @@
 DIST dxvk-bin-1.6.1.tar.gz 7727663 BLAKE2B 92bda9fc1a060d2a16eee9938e245bf0b1e88f4f018dd32252ec6ab1719828b3297fb7c9b54f7f3a323944c116027a161fba6896a6f95aef748a271be019dd91 SHA512 d92c3855204b7c86e7c27cd0db9ba0975b0680ee593074caaa93fc37cb6dd95563ce454747d6acbeb190ddadbb3222fc2c304554b133919de2c19da960213aed
+DIST dxvk-bin-1.7.tar.gz 7734725 BLAKE2B f608a4f228f62b3240a796c2a7fcf514208a1bb421a912405374b4d3a36b17e4172e61bee0722b072f606861325ae988f5ef660ee987c34c9319c1fa1ccf25fe SHA512 c0456c5106ef4a58e7ee1e093557a5769a56430a3907381bccccbaccf17b0af0791b052c41deb2bc7505337d56ef33ba0cfbbfdbb579263ff63ddbf4fbaf1eec

app-emulation/dxvk-bin/dxvk-bin-1.7.ebuild

@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit multilib-minimal
+
+MY_P="dxvk-${PV}"
+DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
+HOMEPAGE="https://github.com/doitsujin/dxvk"
+SRC_URI="https://github.com/doitsujin/dxvk/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="video_cards_nvidia"
+
+DEPEND=""
+RDEPEND="
+	|| (
+		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 )
+		>=media-libs/mesa-19.2
+	)
+	|| (
+		>=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan]
+		>=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# NOTE: Various repos contain dxvk ebuilds that install into …/dxvk.
+# To not clash with them, this ebuild installs into …/dxvk-bin.
+
+src_prepare() {
+	default
+
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+
+	# Delete installation instructions for unused ABIs.
+	if ! use abi_x86_64; then
+		sed -i '/installFile "$win64_sys_path"/d' setup_dxvk.sh || die
+	fi
+	if ! use abi_x86_32; then
+		sed -i '/installFile "$win32_sys_path"/d' setup_dxvk.sh || die
+	fi
+
+	fix_install_dir() {
+		local bits="${MULTILIB_ABI_FLAG:8:2}"
+		# Fix installation directory.
+		sed -i "s|\"x${bits}\"|\"usr/$(get_libdir)/dxvk-bin\"|" \
+			setup_dxvk.sh || die
+	}
+	multilib_foreach_abi fix_install_dir
+}
+
+multilib_src_install() {
+	local bits="${MULTILIB_ABI_FLAG:8:2}"
+	insinto "usr/$(get_libdir)/dxvk-bin"
+	insopts --mode=755
+	doins "${S}/x${bits}/"*.dll
+}
+
+multilib_src_install_all() {
+	newbin setup_dxvk.sh setup_dxvk-bin.sh
+}
+
+pkg_postinst() {
+	elog "dxvk-bin is installed, but not activated. You have to create DLL overrides"
+	elog "in order to make use of it. To do so, set WINEPREFIX and execute"
+	elog "setup_dxvk-bin.sh install --symlink."
+}

dev-R/BH/BH-1.72.0.3.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit R-packages-guru
+
+DESCRIPTION='Boost C++ Header Files'
+HOMEPAGE="
+	https://github.com/eddelbuettel/bh
+	https://cran.r-project.org/package=BH
+"
+SRC_URI="http://cran.r-project.org/src/contrib/BH_1.72.0-3.tar.gz"
+LICENSE='Boost-1.0'
+KEYWORDS="~amd64"
+DEPEND="
+	~dev-libs/boost-1.72.0
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#do not bundle boost
+	rm -rf inst/include/boost || die
+	default
+}

dev-R/BH/Manifest

@@ -0,0 +1 @@
+DIST BH_1.72.0-3.tar.gz 11850400 BLAKE2B 5ff961e3a7fd192b5f3e279f0f29b42d54a9f0cbbab9d0819f18195443d801523702b0ba26515e2507c9e5adf5e1aeff28b0c077e347afaab660e7cc0b7b3fa8 SHA512 a2f85fec45329372fb6e9626a2d150c2ea6da899bb2f74c4bafde07e4eaae5df05d95903e2697dcb9e02731164efcfd2322940e14cb8f8fded2f8f3926d5abdd

dev-R/BH/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+</pkgmetadata>

dev-R/plogr/Manifest

@@ -0,0 +1 @@
+DIST plogr_0.2.0.tar.gz 7795 BLAKE2B 6531caabddb63f3a85ca9f29ae8352dcbab3e84d5c9c9f52c2d6a321aafc04666461c57e0a9ff43d0c6f1a8cb084f7e46f1e4845828075b24fc7f01de7008797 SHA512 2abf84e33265683dd071434adc6a6f440972d1cf923f7549f7217196d4d10c7800dc90645d62c13d9d7e3a380e540c55c6a75ba55c9a90825ec40f5224f85feb

dev-R/plogr/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+</pkgmetadata>

dev-R/plogr/plogr-0.2.0.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit R-packages-guru
+
+DESCRIPTION='The plog C++ Logging Library'
+SRC_URI="http://cran.r-project.org/src/contrib/plogr_0.2.0.tar.gz"
+HOMEPAGE="
+	https://github.com/krlmlr/plogr
+	https://cran.r-project.org/package=plogr
+"
+LICENSE='MIT'
+KEYWORDS="~amd64"
+IUSE="${IUSE-}"
+RDEPEND="
+	dev-cpp/plog
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	#do not bundle plog
+	rm -rf inst/include || die
+	default
+}

dev-python/webpy/Manifest

@@ -1,2 +1,3 @@
 DIST webpy-0.40.tar.gz 103372 BLAKE2B 3c9f9a3a1be57794589321c6845b691e45956cc9a55988e4dd4fe2ba056bb6118258c441ca219ae214a967f27637e26d03c5cc9052e6f869c75e4ce0458b4f20 SHA512 84553c916cdcbf0f994839c9293f881d0eee9450dfbfa571bb208ef47c5308569d8c2b89732ef85be92f9f8c4fb87838e1507566019d5d381fbb51419bfd64f8
 DIST webpy-0.50.tar.gz 105473 BLAKE2B d535016c8e97d06c122e03a3c9888c00415bf9bb12b54812f73d6505eca21ff6f8765d7b3438760ad29f9dbece84e1ccfa5d4aeba8a02298604ca95126643ec5 SHA512 935689e9ee21b41ea942b314c304f934a83dbc522ee99773a74adb7eea2a44bc2fe5e9f28b1c9dfcdd6daa6c6f599b176b31a880520c8f0af64ba89bf76af1f3
+DIST webpy-0.51_p20200405.tar.gz 103748 BLAKE2B 070d08306b1fd32a660cdc77655ce7982f4abeacde95e0c05a59b53170655fad6c76d29bbfe6cd496575f59874ccccef2140ffbe4d7521cb140d71eac8b7f95e SHA512 cedbf05c92eb4688c9854d3cdf99938d4ff076f85da593c762f378de579cd2bd0b29012390c22722a64e1383edd186758fadf4a75d4217d95a0c4de9809bf18d

dev-python/webpy/metadata.xml

@@ -7,6 +7,13 @@
   </maintainer>
   <upstream>
     <remote-id type="github">webpy/web.py</remote-id>
+    <doc lang="en">https://webpy.org/docs</doc>
+    <bugs-to>https://github.com/webpy/webpy/issues</bugs-to>
+    <changelog>https://raw.githubusercontent.com/webpy/webpy/master/ChangeLog.txt</changelog>
+    <maintainer>
+      <name>Anand Chitipothu</name>
+      <email>anandology@gmail.com</email>
+    </maintainer>
   </upstream>
   <longdescription lang="en">
     web.py provides small and simple web framework for

dev-python/webpy/webpy-0.51_p20200405.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+COMMIT="16de3147e61aa4dc735efa116c50603707fb0683"
+
+DESCRIPTION="A web framework for python that is as simple as it is powerful"
+HOMEPAGE="
+	https://www.webpy.org
+	https://github.com/webpy/webpy
+	https://pypi.org/project/web.py
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cheroot-6.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/pytest-5.4.1[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+src_prepare() {
+	#tests require postgresql and mysql running
+	rm tests/test_db.py || die
+	default
+}

media-plugins/qt-heif-image-plugin/Manifest

@@ -0,0 +1 @@
+DIST qt-heif-image-plugin-0.3.3.tar.gz 16449 BLAKE2B f304e26ff60d0fbe840a40c3782543f9db17e7f8fd429b93b0de6663d85110cceff1b67bab996ae63cad12ee06608c74ce9c5e180f154e3df8fee2ccdcd849a9 SHA512 ba617d11e73d73dee5220b668918e313b6d856cabc1567b9221ddb2b3d35c4bfefadcd9e4485bdc7c280be104d09c3580e245d9a8f72c9fac397ebe84fe55e2f

media-plugins/qt-heif-image-plugin/metadata.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>torokhov-s-a@yandex.ru</email>
+    <name>Sergey Torokhov</name>
+  </maintainer>
+  <longdescription>
+    This is a Qt image plugin for HEIF images, wrapping libheif.
+    It enables existing Qt applications to open and save .heic files.
+
+    Any application that (directly or indirectly) uses QImageReader
+    to open image files should automatically be able to use this plugin.
+
+    This has been successfully used with the following:
+    <pkg>media-gfx/lximage-qt</pkg>, <pkg>media-gfx/nomacs</pkg>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">jakar/qt-heif-image-plugin</remote-id>
+  </upstream>
+</pkgmetadata>

media-plugins/qt-heif-image-plugin/qt-heif-image-plugin-0.3.3.ebuild

@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt plugin for HEIF images"
+HOMEPAGE="https://github.com/jakar/qt-heif-image-plugin"
+SRC_URI="https://github.com/jakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	media-libs/libheif:0/1.6
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"