gentoo resync : 22.12.2021

3 files changed, 21 insertions, 11 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index dac035e1655f..ce0a98505e7b 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/multimc-bin/Manifest b/games-action/multimc-bin/Manifest
index 0cb23f1c4145..737b49771a4f 100644
--- a/games-action/multimc-bin/Manifest
+++ b/games-action/multimc-bin/Manifest
@@ -1,3 +1,3 @@
 DIST multimc_1.6-1.deb 7672 BLAKE2B 21df885937c137d7f0c2460b10aeffefd5ea010ea4de3c73168660b7b5041fbe38a764ea62d549e52aec0183901aacdf9cf6fe580607bb05e5bd19cbf383e7f0 SHA512 0e603ae0ef1e8a3dd8e6f92a5a9d32b96b9b0901cb88e368d3c97888e2cae747808e831c1598286de42de102a06631521682bfd15078c1cae663993706ec2810
-EBUILD multimc-bin-1.6.1.ebuild 1407 BLAKE2B a4f6fdaa8216fd755a8d6a40f5b32786dfb23f38de7d37174e0cfc3d787d12f391a048c99b6dd1a5dbd8bbd0f64fb19b80730648f161167cb30c9d13c65e968e SHA512 92a34fb0c65b18990caf82db32ebc05f2d4fc05ce2b242020fbfea4e46beefdaa9dc17c0457743edf36dc64e6a5d42874e4bf584229c6c237eed14402b707522
+EBUILD multimc-bin-1.6.1-r1.ebuild 1557 BLAKE2B e3bef490374364abefdb793e3d2f4322007414eefe1c2cb2db927dea288690aa1b03635cab480029565e4aee51b84cf52cbf1ff3f6cdc2e77e2a33e74de52ddc SHA512 6a6d048bc152395d2952e79c4fca516acf8d2a14fbaaf4312140e27d113de06b934837f9cc2fb51e71181f90ba9b0990fe529f6478a926aa7a9a7184b78052b6
 MISC metadata.xml 1352 BLAKE2B 189531e3ff153ed11bdeaac27d3c5756fc9df8ff97e8cfa2d9e85609072978170e32ab289892dceb3ac8ac8a74c305c32a61ac2c5986f916adaad64810aeb1e1 SHA512 ce09871fec8aa42ed63d8389c76a910e2b2ee9794a7129fa46227510609f03b5ee6a3f75c6392ec6b62e070213a305aab201feeeb94671ca8faa13c5be49b1ba
diff --git a/games-action/multimc-bin/multimc-bin-1.6.1.ebuild b/games-action/multimc-bin/multimc-bin-1.6.1-r1.ebuild
index 073f7213e4fa..a1e59d727d3e 100644
--- a/games-action/multimc-bin/multimc-bin-1.6.1.ebuild
+++ b/games-action/multimc-bin/multimc-bin-1.6.1-r1.ebuild
@@ -14,10 +14,16 @@ SRC_URI="https://files.multimc.org/downloads/multimc_$(ver_rs 2 -).deb"
 # https://bugs.gentoo.org/814404
 S="${WORKDIR}"
 
-KEYWORDS="-* ~amd64"
-LICENSE="Apache-2.0 Boost-1.0 BSD-2 BSD GPL-2+ LGPL-2.1-with-linking-exception LGPL-3 OFL-1.1 MIT"
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="Apache-2.0 Boost-1.0 BSD-2 BSD GPL-3 GPL-2+ LGPL-2.1-with-linking-exception LGPL-3 OFL-1.1 MIT"
 SLOT="0"
 
+# Despite the open source nature of the app, there is quite a large discrepancy
+# between the sources and the prebuilt binaries (source built versions of the
+# app are not usable due to missing keys/files). We restrict bindist to be on
+# the safe side (added files/keys are of unknown license).
+RESTRICT="bindist"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtwidgets:5
@@ -26,23 +32,27 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qttest:5
 	dev-qt/qtxml:5
+	gnome-extra/zenity
 	sys-libs/zlib
 	>=virtual/jre-1.8.0
 	virtual/opengl
 	x11-libs/libXrandr
+	!games-action/multimc
 "
 
 QA_PREBUILT="*"
 
-src_install() {
-	mv "${S}"/* "${ED}" || die
-	# Rename the .desktop file to avoid file conflict with non-bin version
-	mv "${ED}/usr/share/applications/multimc.desktop" "${ED}/usr/share/applications/multimc-bin.desktop" || die
-	# Change the name so we can differentiate from the non-bin version in app menu
-	# and remove empty options
+src_prepare() {
+	default
+	# Remove empty/deprecated options
 	sed -i \
-		-e 's/Name=MultiMC 5/Name=MultiMC Official Binary/g' \
 		-e '/Path=/d' \
 		-e '/TerminalOptions=/d' \
-		"${ED}/usr/share/applications/multimc-bin.desktop" || die
+		"usr/share/applications/multimc.desktop" || die
+}
+
+src_install() {
+	mv "${S}"/* "${ED}" || die
+	# add link to launch from PATH
+	dosym ../multimc/run.sh /opt/bin/multimc
 }