gentoo resync : 08.10.2021

6 files changed, 8 insertions, 78 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 4016585d5902..c4f81329f9c9 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 2857e995da0b..e354f03dfb29 100644
--- a/games-action/multimc-bin/Manifest
+++ b/games-action/multimc-bin/Manifest
@@ -1,3 +1,3 @@
-DIST multimc_1.5-1.deb 7692 BLAKE2B c5b4de864c95cccd96b071d4d551e322eb5c78e17a8da361ee69a82405691c6d9fc81c7eef9dcf855a8e2145fbb362d31c7f63682c7a66edbc37dbf9215e7c1b SHA512 26fe11eff406efd09612002e4c53fc1ea0b3f7d0aca389475a7afff454efa52ed52097f6a0bbc27de61fba3fed252321754738a0f79b0d8a7308a39701087e67
-EBUILD multimc-bin-1.5.1.ebuild 1407 BLAKE2B c7524f67d2cf2005ad4626efa2d69ad078aedd65c9b2888c05d1e1d01ce758bf4b85a239d1efe923341126e217f64b461274a8253096d92fae8aa5cd3b0a648a SHA512 81d5cb1dc9b09aeea7017a4327391245dfff3e9eae8a4d805aeaa0e40994916cfc566e784ee27c455e31fd50e768b1b4ec2d0c77fadc63dbc4db4863678a0808
+DIST multimc_1.6-1.deb 7672 BLAKE2B 21df885937c137d7f0c2460b10aeffefd5ea010ea4de3c73168660b7b5041fbe38a764ea62d549e52aec0183901aacdf9cf6fe580607bb05e5bd19cbf383e7f0 SHA512 0e603ae0ef1e8a3dd8e6f92a5a9d32b96b9b0901cb88e368d3c97888e2cae747808e831c1598286de42de102a06631521682bfd15078c1cae663993706ec2810
+EBUILD multimc-bin-1.6.1.ebuild 1407 BLAKE2B c7524f67d2cf2005ad4626efa2d69ad078aedd65c9b2888c05d1e1d01ce758bf4b85a239d1efe923341126e217f64b461274a8253096d92fae8aa5cd3b0a648a SHA512 81d5cb1dc9b09aeea7017a4327391245dfff3e9eae8a4d805aeaa0e40994916cfc566e784ee27c455e31fd50e768b1b4ec2d0c77fadc63dbc4db4863678a0808
 MISC metadata.xml 1352 BLAKE2B 61d0cb2977513e27455c82f355c3e3138594c6c52da901cb6543ae78e2189007ab5188e72f1477950ac7844bd0e5201a98b37a1f088ca4e3b9a32abb074b4540 SHA512 1c63a1947008aea378f548443cd8af55dc7bc1cf9d4179aa01a8c815b5fb778eb2ca5e09e912473f0a1335d58add88a1e819207eb8461438b1da5a0ce45760f6
diff --git a/games-action/multimc-bin/multimc-bin-1.5.1.ebuild b/games-action/multimc-bin/multimc-bin-1.6.1.ebuild
index 2e4e4a210532..2e4e4a210532 100644
--- a/games-action/multimc-bin/multimc-bin-1.5.1.ebuild
+++ b/games-action/multimc-bin/multimc-bin-1.6.1.ebuild
diff --git a/games-action/multimc/Manifest b/games-action/multimc/Manifest
index d8095c1ecc1e..5a4e28ba7cbe 100644
--- a/games-action/multimc/Manifest
+++ b/games-action/multimc/Manifest
@@ -1,8 +1,6 @@
 AUX multimc-0.6.12-gcc11.patch 443 BLAKE2B 866a6219c2a5ddc21cbe84ed4158174afced6b8689dddcd65c372678cc81fc13105e5416e27a41c69fef41a8b9b3cca6d73860a8e41721f8b09f56b72c16a7f4 SHA512 a97879fbc807e805d55c19007774f1698f717c021be1ba2ba9084a87341d9588be72d5b07779a57b2ea2d15015c100801289d782f2c0d27fe7a0da4ccd97f5d8
 DIST libnbtplusplus-multimc-0.6.1.tar.gz 47171 BLAKE2B e0e4d2593554dc59605114fcae86c59877da67d3f0888145b9ec2fe3d08decec7345a92c7d37310e021b5719f1371a58a22dc796e719028a478877e6d08982ed SHA512 81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d
-DIST multimc-0.6.12.tar.gz 2389805 BLAKE2B d7b7660578d78d5d1cbaae607bf340c0c0a0aab5b0d2460218e1e468f450a3ac7030cb235c3e25f61d27d8c1e3cca71a1abbea22f9759726d34e495fe49de180 SHA512 334b0996b7b49a0f4a46a3e5b08d50d5f7aa398b8d5871772c751c1f98438d9584ffcdaf27ad6d2e84b2776415bd38910dffb8e746c4b343916c6849df2146da
 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.12.ebuild 1761 BLAKE2B e74216f056d010ee75ef6f79ddab98be66f5e94c4a933f0ecd8f48bfaaf5407c4dcc94023b97ab731a9e8057040823aa955763aab16a339ef867dc45df64bff5 SHA512 6b31371ea25c1d50bd6cd518cb98884841150be42015f2e9551472fb4b49a0bb078d17fb0b94f2f88f9333fd2d55f539c2eb04187e8af61f5057b018e1e666cd
-EBUILD multimc-0.6.13.ebuild 1741 BLAKE2B 95bb0948a2dabf0fa47937ebe8585e07543afc8550ff300c016261665cff224f1d5026e170ba06a7b9ed0c59e51efe68c17c02620971ef0dd63a99d522c78c8d SHA512 0cf8fd8948eb27a005e1aa71b599afa7c1e82d44f1d5eec63252c958e6896ac4181359bca667dd9e21ff10fe9ca815014ca62ed8ba0a060ed89a57e9b596413e
+EBUILD multimc-0.6.13.ebuild 1917 BLAKE2B 05845e6a283e1afe4d9a28c23a3a5822bd0f215618195ba712b0f38004e96ba71cfd7abd7fea10cfae1120d7d26c573473b0a4551b95638917b61a6db1af7881 SHA512 84cff08a6f4b4e2de13c809d4c96e8cc7b799d919ec0b81d3468685a79d937dc9891ce1c44c2e375c169274201009029e5eb7abcc0fef3982992fe2ba55c130a
 MISC metadata.xml 1352 BLAKE2B 61d0cb2977513e27455c82f355c3e3138594c6c52da901cb6543ae78e2189007ab5188e72f1477950ac7844bd0e5201a98b37a1f088ca4e3b9a32abb074b4540 SHA512 1c63a1947008aea378f548443cd8af55dc7bc1cf9d4179aa01a8c815b5fb778eb2ca5e09e912473f0a1335d58add88a1e819207eb8461438b1da5a0ce45760f6
diff --git a/games-action/multimc/multimc-0.6.12.ebuild b/games-action/multimc/multimc-0.6.12.ebuild
deleted file mode 100644
index 5535354b2292..000000000000
--- a/games-action/multimc/multimc-0.6.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-BASE_URI="https://github.com/MultiMC"
-SRC_URI="
-	${BASE_URI}/${MY_PN}/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
-"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0 LGPL-2.1-with-linking-exception LGPL-3"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtgui:5
-	dev-qt/qttest:5
-	dev-qt/qtxml:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.8.0
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-libs/zlib
-	>=virtual/jre-1.8.0
-	virtual/opengl
-	x11-libs/libXrandr
-"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/multimc-0.6.12-gcc11.patch )
-
-src_unpack() {
-	default
-	rm -r "${S}/libraries/libnbtplusplus" "${S}/libraries/quazip" || die
-	mv "${WORKDIR}/libnbtplusplus-${LIBNBTPLUSPLUS_VER}" "${S}/libraries/libnbtplusplus" || die
-	mv "${WORKDIR}/quazip-${QUAZIP_VER}" "${S}/libraries/quazip" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -r -i 's/-Werror([a-z=-]+)?//g' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMultiMC_LAYOUT=lin-system
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	domenu application/package/linux/multimc.desktop
-	doicon -s scalable application/resources/multimc/scalable/multimc.svg
-}
diff --git a/games-action/multimc/multimc-0.6.13.ebuild b/games-action/multimc/multimc-0.6.13.ebuild
index 5004bf93d813..350fecbdb5b2 100644
--- a/games-action/multimc/multimc-0.6.13.ebuild
+++ b/games-action/multimc/multimc-0.6.13.ebuild
@@ -25,6 +25,11 @@ 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"
 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
+RESTRICT="bindist"
+
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtwidgets:5