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

dev-python/plyer/Manifest

@@ -0,0 +1 @@
+DIST plyer-1.4.3.tar.gz 281968 BLAKE2B a779eca05ace3cc0bd1809a11b04fe9abfbb91449e875fb2e70e7c80cc3a8a925884578305c5d2f020c02e0b8c42df4d93317abf04e2494bfacf19d12e2e56dc SHA512 4d7bff97714d4222ed0e786e182a8b2e234c978dcc51650fbf5070986c305fb5b076fc127f2bfa24f22b2518f4151b5b70991ebd84007e15d9545ddc40a0e955

dev-python/plyer/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> parona@protonmail.com </email>
+		<name> Alfred Wingate </name>
+	</maintainer>
+	<longdescription>
+		Plyer is a platform-independent api to use features commonly found on various platforms, notably mobile ones, in Python.
+	</longdescription>
+</pkgmetadata>

dev-python/plyer/plyer-1.4.3.ebuild

@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+inherit distutils-r1
+
+DESCRIPTION="Plyer is a platform-independent Python wrapper for platform-dependent APIs"
+HOMEPAGE="https://github.com/kivy/plyer"
+SRC_URI="https://github.com/kivy/plyer/archive/"${PV}".tar.gz -> "${PF}".tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"

games-strategy/mindustry/Manifest

@@ -1 +1,2 @@
-DIST Mindustry.jar 48910370 BLAKE2B 62d6ca658d3a440028b76908a95ff4e8265edfe50caf5c882007bcb8a7105aeb613a07f3dbe71e2bc38bc0daeeeeac20f4a7796c0475b7dd42667c6d7ccdfaae SHA512 9f19d0c8e9b9611a254de12c60c3ab3802631a9e79c518d6039dca18ae80b4d7734f1f39fc17c7d24f249495068301123e2ff4e48a196e63a00d019071a7f398
+DIST mindustry-104.6.jar 48910370 BLAKE2B 62d6ca658d3a440028b76908a95ff4e8265edfe50caf5c882007bcb8a7105aeb613a07f3dbe71e2bc38bc0daeeeeac20f4a7796c0475b7dd42667c6d7ccdfaae SHA512 9f19d0c8e9b9611a254de12c60c3ab3802631a9e79c518d6039dca18ae80b4d7734f1f39fc17c7d24f249495068301123e2ff4e48a196e63a00d019071a7f398
+DIST mindustry-106.jar 59405252 BLAKE2B 9a227bd59be64be37bce2d664ff398b1c140998c17369dba026d4009f5d0f65889d19040c6bfa225fa06d93ed09c767b27723b16037b7d33ad9c31b82ece06c2 SHA512 e481440329224f135ac32894f5ebdd56e4ce4b58ebdda1deebccba8ad46241e6f7add4b8edc111346d9f513055a70cafe67518d6cad60c9284cb65277f2eb688

games-strategy/mindustry/mindustry-104.6.ebuild

@@ -9,7 +9,7 @@ inherit desktop eutils xdg
 
 DESCRIPTION="A sandbox tower defense game"
 HOMEPAGE="https://mindustrygame.github.io"
-SRC_URI="https://github.com/Anuken/${MY_PN}/releases/download/v${PV}/${MY_PN}.jar"
+SRC_URI="https://github.com/Anuken/${MY_PN}/releases/download/v${PV}/${MY_PN}.jar -> ${P}.jar"
 
 RESTRICT="mirror strip"
 LICENSE="GPL-3"
@@ -22,10 +22,10 @@ RDEPEND="
 	>=virtual/jdk-1.7:*
 "
 
-S="${DISTDIR}"
+S="${WORKDIR}"
 
 src_unpack() {
-	:
+	cp "${DISTDIR}/${P}.jar" "${S}/${MY_PN}.jar" || die
 }
 
 src_install() {

games-strategy/mindustry/mindustry-106.ebuild

@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN^}"
+
+inherit desktop eutils xdg
+
+DESCRIPTION="A sandbox tower defense game"
+HOMEPAGE="https://mindustrygame.github.io"
+SRC_URI="https://github.com/Anuken/${MY_PN}/releases/download/v${PV}/${MY_PN}.jar -> ${P}.jar"
+
+RESTRICT="mirror strip"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=virtual/jdk-1.7:*
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${P}.jar" "${S}/${MY_PN}.jar" || die
+}
+
+# src_prepare() {
+# 	cp "${P}.jar" "${MY_PN}.jar"
+# }
+
+src_install() {
+	insinto "/opt/${MY_PN}"
+	doins "${MY_PN}.jar"
+
+	make_wrapper "${PN}" "java -jar /opt/${MY_PN}/${MY_PN}.jar"
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "Game;StrategyGame;"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

net-im/mirage/mirage-9999.ebuild

@@ -27,6 +27,7 @@ if [[ "${PV}" == "9999" ]]
 then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mirukana/mirage.git"
+	EGIT_BRANCH="dev"
 	EGIT_SUBMODULES=( '*' )
 else
 	SRC_URI="
@@ -74,6 +75,7 @@ RDEPEND="
 		>=dev-python/lxml-4.5.1[${PYTHON_USEDEP}]
 		>=dev-python/mistune-0.8.4[${PYTHON_USEDEP}]
 		>=dev-python/pillow-7.0.0[${PYTHON_USEDEP}]
+		>=dev-python/plyer-1.4.3[${PYTHON_USEDEP}]
 		>=dev-python/pymediainfo-4.2.1[${PYTHON_USEDEP}]
 		python_single_target_python3_6? ( >=dev-python/async_generator-1.10[python_targets_python3_6] )
 		python_single_target_python3_6? ( >=dev-python/dataclasses-0.6[python_targets_python3_6] )

www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild

@@ -29,12 +29,12 @@ IUSE=""
 
 DEPEND="
 	!www-servers/jellyfin
-	acct-group/jellyfin
-	acct-user/jellyfin
 "
 RDEPEND="
 	${DEPEND}
 	>=media-video/ffmpeg-4.2.2
+	acct-group/jellyfin
+	acct-user/jellyfin
 	dev-db/sqlite
 	dev-util/lttng-ust
 	media-libs/fontconfig