gentoo resync : 25.10.2021

3 files changed, 19 insertions, 12 deletions

diff --git a/games-action/multimc/Manifest b/games-action/multimc/Manifest
index ed27f527d478..2f3c03f9de26 100644
--- a/games-action/multimc/Manifest
+++ b/games-action/multimc/Manifest
@@ -1,5 +1,5 @@
 DIST libnbtplusplus-multimc-0.6.1.tar.gz 47171 BLAKE2B e0e4d2593554dc59605114fcae86c59877da67d3f0888145b9ec2fe3d08decec7345a92c7d37310e021b5719f1371a58a22dc796e719028a478877e6d08982ed SHA512 81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d
 DIST multimc-0.6.13.tar.gz 2493423 BLAKE2B 8dd64f3b07ff2faeda25bba14f1b19fd0854534e50d589325c19386c96ac3e4b04af8b2262fbf9796e67a869a8d98bf828617dadf2e270801970bc182a6d7175 SHA512 c897f75d01c0e7f73a860166bce3b4efccb3e3f8ec8b811c7e465ac97986c67c0d1149130429fcccb4bdd9af323d01e687f3d7afb5cb7d2c0299e61c0298cad9
 DIST quazip-multimc-3.tar.gz 103519 BLAKE2B 7a636f9e76cae61cee42131093b56d2a577814b2eb04bdc3c3a7614cf307bbdabe533c66a9f07848bbd929a62b7043dc53f2f85e2e487bfcc820170112f1114b SHA512 2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0
-EBUILD multimc-0.6.13.ebuild 1917 BLAKE2B 05845e6a283e1afe4d9a28c23a3a5822bd0f215618195ba712b0f38004e96ba71cfd7abd7fea10cfae1120d7d26c573473b0a4551b95638917b61a6db1af7881 SHA512 84cff08a6f4b4e2de13c809d4c96e8cc7b799d919ec0b81d3468685a79d937dc9891ce1c44c2e375c169274201009029e5eb7abcc0fef3982992fe2ba55c130a
-MISC metadata.xml 1352 BLAKE2B 61d0cb2977513e27455c82f355c3e3138594c6c52da901cb6543ae78e2189007ab5188e72f1477950ac7844bd0e5201a98b37a1f088ca4e3b9a32abb074b4540 SHA512 1c63a1947008aea378f548443cd8af55dc7bc1cf9d4179aa01a8c815b5fb778eb2ca5e09e912473f0a1335d58add88a1e819207eb8461438b1da5a0ce45760f6
+EBUILD multimc-0.6.13.ebuild 2241 BLAKE2B 8029b8f2261e33f5ce99d119fc720152f6a7baf4e0f6b745b457e0af84f97f8dc771a3795138bc618e46775c33cc1b158a1a49416b065c00d2ce544768638e58 SHA512 55136fb1a9786fe699247efd3a3d5d8a04992e4b31ecc26415038f3bd95e1ba72d33c0dcebcc2c18330f77b3bb9798c94acd8e8b3df4709bbba22065f6915379
+MISC metadata.xml 1352 BLAKE2B 189531e3ff153ed11bdeaac27d3c5756fc9df8ff97e8cfa2d9e85609072978170e32ab289892dceb3ac8ac8a74c305c32a61ac2c5986f916adaad64810aeb1e1 SHA512 ce09871fec8aa42ed63d8389c76a910e2b2ee9794a7129fa46227510609f03b5ee6a3f75c6392ec6b62e070213a305aab201feeeb94671ca8faa13c5be49b1ba
diff --git a/games-action/multimc/metadata.xml b/games-action/multimc/metadata.xml
index 9246e9cd3415..3907aa588cee 100644
--- a/games-action/multimc/metadata.xml
+++ b/games-action/multimc/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
-		<remote-id type="github">MultiMC/MultiMC5</remote-id>
-		<bugs-to>https://github.com/MultiMC/MultiMC5/issues</bugs-to>
+		<remote-id type="github">MultiMC/Launcher</remote-id>
+		<bugs-to>https://github.com/MultiMC/Launcher/issues</bugs-to>
 	</upstream>
 	<maintainer type="person">
 		<email>andrewammerlaan@gentoo.org</email>
diff --git a/games-action/multimc/multimc-0.6.13.ebuild b/games-action/multimc/multimc-0.6.13.ebuild
index 350fecbdb5b2..25107ac520de 100644
--- a/games-action/multimc/multimc-0.6.13.ebuild
+++ b/games-action/multimc/multimc-0.6.13.ebuild
@@ -5,21 +5,19 @@ EAPI=7
 
 inherit desktop java-pkg-2 xdg cmake
 
-MY_PN="MultiMC5"
-MY_P="${MY_PN}-${PV}"
-
 QUAZIP_VER="multimc-3"
 LIBNBTPLUSPLUS_VER="multimc-0.6.1"
 
 DESCRIPTION="An advanced Qt5-based open-source launcher for Minecraft"
 HOMEPAGE="https://multimc.org
-	https://github.com/MultiMC/MultiMC5"
+	https://github.com/MultiMC/Launcher"
 BASE_URI="https://github.com/MultiMC"
 SRC_URI="
-	${BASE_URI}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${BASE_URI}/Launcher/archive/${PV}.tar.gz -> ${P}.tar.gz
 	${BASE_URI}/libnbtplusplus/archive/${LIBNBTPLUSPLUS_VER}.tar.gz -> libnbtplusplus-${LIBNBTPLUSPLUS_VER}.tar.gz
 	${BASE_URI}/quazip/archive/${QUAZIP_VER}.tar.gz -> quazip-${QUAZIP_VER}.tar.gz
 "
+S="${WORKDIR}/MultiMC5-${PV}"
 
 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"
@@ -27,7 +25,7 @@ SLOT="0"
 
 # Author has indicated that he is unhappy with redistributing custom builds
 # under the MultiMC name/logo
-# https://github.com/MultiMC/MultiMC5/issues/4087
+# https://github.com/MultiMC/Launcher/issues/4087
 RESTRICT="bindist"
 
 COMMON_DEPEND="
@@ -49,8 +47,6 @@ RDEPEND="${COMMON_DEPEND}
 	x11-libs/libXrandr
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
 	default
 	rm -r "${S}/libraries/libnbtplusplus" "${S}/libraries/quazip" || die
@@ -75,3 +71,14 @@ src_install() {
 	domenu launcher/package/linux/multimc.desktop
 	doicon -s scalable launcher/resources/multimc/scalable/multimc.svg
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog ""
+	elog "In order to use Microsoft accounts instead of Mojang accounts"
+	elog "either use the official binary packaged in games-action/multimc-bin,"
+	elog "or patch your own secret API key into the MSAClientID variable in"
+	elog "notsecrets/Secrets.cpp."
+	elog "See Also: https://bugs.gentoo.org/814404"
+	elog ""
+}