Merge remote-tracking branch 'upstream/master' into master

app-portage/euscan-ng/metadata.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <upstream>
-        <remote-id type="github">src_prepare/euscan-ng</remote-id>
+        <remote-id type="gitlab">src_prepare/euscan-ng</remote-id>
     </upstream>
 </pkgmetadata>

app-portage/src_prepare-scripts/metadata.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <upstream>
-        <remote-id type="github">src_prepare/scripts</remote-id>
+        <remote-id type="gitlab">src_prepare/scripts</remote-id>
     </upstream>
 </pkgmetadata>

app-portage/src_prepare-scripts/src_prepare-scripts-9999.ebuild

@@ -25,6 +25,7 @@ RDEPEND="
 
 src_install() {
 	# Install the docs
+	local doc
 	for doc in *.md
 	do
 		dodoc "${doc}"
@@ -42,6 +43,6 @@ src_install() {
 		done
 		popd
 	else
-		die "There is no 'src' directory"
+		die "There is no ${S}/src directory"
 	fi
 }

www-client/brave-bin/Manifest

@@ -1 +1,2 @@
 DIST brave-bin-1.12.70.zip 105197281 BLAKE2B aab94f522e38d7ab76048349dc603adbf8d73f098525f8ccdac51af43cd8182df6075cb3779232bd638a4117e5a5900e58c514baba2e9e1a77c646d6493da0a9 SHA512 8933b846f2f0e09bbf7dfd90beef36c69cf681f3da369694254c55d998fd7c351ecbe989d001e0e9704ceeda293f72896de9ccf4213821bf58abc3383e23fdfc
+DIST brave-bin-1.12.72.zip 105202095 BLAKE2B 84868e315c518f12d1b5a9ae6878a7b626e170ad12b5b08597dc24e6c5f0c6e475c4d95ddf79e4e535c342cb9f060a48c8af87ed45272534a90a1f0b40980372 SHA512 aa848e98ee2eadc645324e8b9b41114287bee5afe0dddbb96a5be7591092f923e0d684dadeea904303280921163cae2cc32e0d99242c88e3e418eb7004bd72cb

www-client/brave-bin/brave-bin-1.12.72.ebuild

@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BRAVE_PN="${PN/-bin/}"
+
+CHROMIUM_LANGS="
+	am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+	hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+	sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop eutils xdg
+
+DESCRIPTION="Brave Web Browser"
+HOMEPAGE="https://brave.com"
+SRC_URI="https://github.com/brave/brave-browser/releases/download/v${PV}/brave-v${PV}-linux-x64.zip -> ${P}.zip"
+
+RESTRICT="mirror"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnome-keyring"
+
+DEPEND="
+	!www-client/brave
+"
+RDEPEND="
+	${DEPEND}
+	>=media-libs/libpng-1.6.34
+	>=net-print/cups-2.0.0
+	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-core
+	app-arch/bzip2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/gmp
+	dev-libs/gobject-introspection
+	dev-libs/libbsd
+	dev-libs/libffi
+	dev-libs/libpcre
+	dev-libs/libpthread-stubs
+	dev-libs/libtasn1
+	dev-libs/libunistring
+	dev-libs/nettle
+	dev-libs/nspr
+	dev-libs/nss
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz
+	media-libs/libepoxy
+	net-dns/libidn2
+	net-libs/gnutls
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+
+	x11-libs/libXScrnSaver
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	x11-libs/libxshmfence
+	x11-libs/pango
+	x11-libs/pixman
+"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	pushd "${S}/locales" >/dev/null || die
+	chromium_remove_language_paks
+	popd >/dev/null || die
+
+	default
+}
+
+src_install() {
+	declare BRAVE_HOME="/opt/${BRAVE_PN}"
+
+	dodir "${BRAVE_HOME%/*}"
+
+	insinto "${BRAVE_HOME}"
+	doins -r *
+
+	exeinto "${BRAVE_HOME}"
+	doexe brave
+
+	dosym "${BRAVE_HOME}/brave" "/usr/bin/${BRAVE_PN}" || die
+	dosym "${BRAVE_HOME}/brave" "/usr/bin/${PN}" || die
+
+	make_desktop_entry "brave" "Brave" "brave" "Network;WebBrowser;"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}

x11-misc/screenkey/Manifest

@@ -1 +1 @@
-DIST screenkey-0.9.tar.gz 58220 BLAKE2B 1f12e01f741148356dd293907aa2ae324f7cdb3c2a31fd4b04cea598ca33d805ebc4a51f71324553ac211dd23c99727240f47069b053bc3b098afb865d28ba93 SHA512 99f069f6f64d0812b526b7550b713bcd99e39756b07591d4e546273efcd085790e44f1586b6562f71f5a8dd22e755f17076f3e6c44bf0ed9b43b05c10d7fcbfa
+DIST screenkey-1.2.tar.gz 65396 BLAKE2B 90795d3a4918a3a35faa13fccdea2060f75f2a258571c4e7e1b173881705b26bcfe6b66858ddf69f3bfc69dc556009cac456b30dd1423e7c7b58488470ffd19d SHA512 06fd59dc23c37402714a461309e6f1bbfd8a59cf6cfc27dbd0f9a0e7bea244149fb37975a612db0d85555e458b3c67eaf8387a84b72a3de1cf5bc5507d3972eb

x11-misc/screenkey/screenkey-1.2.ebuild

@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 xdg
-inherit distutils-r1 xdg-utils
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
@@ -16,18 +16,17 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://www.thregr.org/~wavexx/software/${PN}/releases/${P}.tar.gz"
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 RESTRICT="mirror"
-LICENSE="GPL-3+"
+LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
 BDEPEND="
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -37,6 +36,10 @@ RDEPEND="
 
 src_prepare() {
 	xdg_environment_reset
+
+	# Change the doc install path
+	sed -i "s/share\/doc\/screenkey/share\/doc\/${P}/g" setup.py || die
+
 	default
 }
 

x11-misc/screenkey/screenkey-9999.ebuild

@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 xdg
-inherit distutils-r1 xdg-utils
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
@@ -16,18 +16,17 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://www.thregr.org/~wavexx/software/${PN}/releases/${P}.tar.gz"
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 RESTRICT="mirror"
-LICENSE="GPL-3+"
+LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
 BDEPEND="
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -37,6 +36,10 @@ RDEPEND="
 
 src_prepare() {
 	xdg_environment_reset
+
+	# Change the doc install path
+	sed -i "s/share\/doc\/screenkey/share\/doc\/${P}/g" setup.py || die
+
 	default
 }