From 8b4d208e08faed6882aee68837f96344a1faf11a Mon Sep 17 00:00:00 2001
From: Ryan Fox <flewkey@2a03.party>
Date: Sun, 19 Jul 2020 20:43:49 +0000
Subject: [PATCH] MultiMC5: Remove dependency on my mirror

This e-build previously downloaded a tarball from my mirror, which
included the modified libraries. It was pretty janky, so I implemented
it the way that the other overlays have by downloading libnbtplusplus
and quazip separately, then copying it in using src_unpack(). Thanks to
whoever figured that out!
---
 games-util/multimc5/Manifest               |  8 +++++---
 games-util/multimc5/multimc5-0.6.11.ebuild | 22 +++++++++++++++-------
 games-util/multimc5/multimc5-0.6.8.ebuild  | 22 +++++++++++++++-------
 games-util/multimc5/multimc5-9999.ebuild   | 10 ++--------
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/games-util/multimc5/Manifest b/games-util/multimc5/Manifest
index 658d47a..6529f13 100644
--- a/games-util/multimc5/Manifest
+++ b/games-util/multimc5/Manifest
@@ -1,6 +1,8 @@
+DIST libnbtplusplus-multimc-0.6.1.tar.gz 47171 BLAKE2B e0e4d2593554dc59605114fcae86c59877da67d3f0888145b9ec2fe3d08decec7345a92c7d37310e021b5719f1371a58a22dc796e719028a478877e6d08982ed SHA512 81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d
 DIST multimc5-0.6.11.tar.gz 2555593 BLAKE2B e615fce5525bef1491fff93fdafac24dafb22fe214501b4e7d7024531c3613cf318e738a21b640f94c0b11c36fd7cabe1bad8b792fc4eb8272d0df67dc0c9e74 SHA512 0b6d0750d91cc69117d8543c5cd0ea48feb15cb97a269aa2f8bcc0341af6f1ae6c963754f60e62660f3bc0c59ec1b96b48fdd97cda56bf0bf01e28eb712c58b1
 DIST multimc5-0.6.8.tar.gz 2555147 BLAKE2B 631a4e4f3b0e8b8320ec0c30cda70eaad33db0ab44188354eaa7857d08122c0d849dc502dc67b62a31af31c296e8db3eb1b25f23f98c4bd5aa4bb978abb4c5be SHA512 d49626730f9f743d29e1e182695b761ee5a5875f27ab8453f69366bf943538189aeb0cdc7ed545da2577a7c03d4d209cd62508dd4f0924778a8baf7ec48bd725
-EBUILD multimc5-0.6.11.ebuild 740 BLAKE2B 3f833949df2ff119aaffe1c304ffceb0187516fc387fb071e1d49cf483e448da65540a9f5086b0385abefb387e3bf5472b78f4ce6a05cc6eb8e770981d289033 SHA512 cab8d8c352fb2f09cf17131f3f0dc450bcf3aae7b17672604b195043d2b71abb576064f591f2f55bf485a281d5048d8407ea61a0ef73c4430f1291e8cbd8da40
-EBUILD multimc5-0.6.8.ebuild 740 BLAKE2B 3f833949df2ff119aaffe1c304ffceb0187516fc387fb071e1d49cf483e448da65540a9f5086b0385abefb387e3bf5472b78f4ce6a05cc6eb8e770981d289033 SHA512 cab8d8c352fb2f09cf17131f3f0dc450bcf3aae7b17672604b195043d2b71abb576064f591f2f55bf485a281d5048d8407ea61a0ef73c4430f1291e8cbd8da40
-EBUILD multimc5-9999.ebuild 740 BLAKE2B 3f833949df2ff119aaffe1c304ffceb0187516fc387fb071e1d49cf483e448da65540a9f5086b0385abefb387e3bf5472b78f4ce6a05cc6eb8e770981d289033 SHA512 cab8d8c352fb2f09cf17131f3f0dc450bcf3aae7b17672604b195043d2b71abb576064f591f2f55bf485a281d5048d8407ea61a0ef73c4430f1291e8cbd8da40
+DIST quazip-multimc-3.tar.gz 103519 BLAKE2B 7a636f9e76cae61cee42131093b56d2a577814b2eb04bdc3c3a7614cf307bbdabe533c66a9f07848bbd929a62b7043dc53f2f85e2e487bfcc820170112f1114b SHA512 2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0
+EBUILD multimc5-0.6.11.ebuild 1175 BLAKE2B 2cedd082f3301bbac9f6264ded135b2245bb4de8754f9f21fa6c16f18966d574f7a20742d4fc46c66c53754abc1074c339397a15e7b485932d3b2ab62f669898 SHA512 4786807d4d1ce9ec99ed25c890f67dbbb4eb8132949bc50b093b27e457635e906bf365cb17cc3b7209f5e9e83f5963290b448d15ce1601bde7a8dc35b278e1b4
+EBUILD multimc5-0.6.8.ebuild 1175 BLAKE2B 2cedd082f3301bbac9f6264ded135b2245bb4de8754f9f21fa6c16f18966d574f7a20742d4fc46c66c53754abc1074c339397a15e7b485932d3b2ab62f669898 SHA512 4786807d4d1ce9ec99ed25c890f67dbbb4eb8132949bc50b093b27e457635e906bf365cb17cc3b7209f5e9e83f5963290b448d15ce1601bde7a8dc35b278e1b4
+EBUILD multimc5-9999.ebuild 605 BLAKE2B b11a4f2ffe32234bfb3978fade847a5b498f3b3a67b718aaf1618e55d37d1201d0e55156bdda7c19ecbf17cb173062e1700c6ceb3606f76aa4b6ea06587f53ac SHA512 f46f59bccb4b8ba5f8863659b37294197399f88e8f57f2af8bba43e50a75825602eb69461e6251901c34ecf24d7abcf220043651752b85eda191902b9354dfa1
 MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80
diff --git a/games-util/multimc5/multimc5-0.6.11.ebuild b/games-util/multimc5/multimc5-0.6.11.ebuild
index 4b8abb1..d26aa36 100644
--- a/games-util/multimc5/multimc5-0.6.11.ebuild
+++ b/games-util/multimc5/multimc5-0.6.11.ebuild
@@ -5,13 +5,14 @@ EAPI=7
 
 inherit cmake
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://files.2a03.party/~flewkey/distfiles/${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MultiMC/MultiMC5.git"
-fi
+V_QUAZIP="multimc-3"
+V_LIBNBTPLUSPLUS="multimc-0.6.1"
+SRC_URI="
+	https://github.com/MultiMC/MultiMC5/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/MultiMC/quazip/archive/${V_QUAZIP}.tar.gz -> quazip-${V_QUAZIP}.tar.gz
+	https://github.com/MultiMC/libnbtplusplus/archive/${V_LIBNBTPLUSPLUS}.tar.gz -> libnbtplusplus-${V_LIBNBTPLUSPLUS}.tar.gz
+"
+KEYWORDS="~amd64"
 
 DESCRIPTION="MultiMC Minecraft Launcher"
 HOMEPAGE="https://multimc.org/"
@@ -29,6 +30,13 @@ BDEPEND="
 	sys-libs/zlib
 "
 
+src_unpack() {
+	default
+	rm -rf "${S}/libraries/libnbtplusplus" "${S}/libraries/quazip" || die
+	cp -r "${WORKDIR}/quazip-${V_QUAZIP}" "${S}/libraries/quazip" || die
+	cp -r "${WORKDIR}/libnbtplusplus-${V_LIBNBTPLUSPLUS}" "${S}/libraries/libnbtplusplus" || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		"-DCMAKE_INSTALL_PREFIX:PATH=/usr"
diff --git a/games-util/multimc5/multimc5-0.6.8.ebuild b/games-util/multimc5/multimc5-0.6.8.ebuild
index 4b8abb1..d26aa36 100644
--- a/games-util/multimc5/multimc5-0.6.8.ebuild
+++ b/games-util/multimc5/multimc5-0.6.8.ebuild
@@ -5,13 +5,14 @@ EAPI=7
 
 inherit cmake
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://files.2a03.party/~flewkey/distfiles/${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MultiMC/MultiMC5.git"
-fi
+V_QUAZIP="multimc-3"
+V_LIBNBTPLUSPLUS="multimc-0.6.1"
+SRC_URI="
+	https://github.com/MultiMC/MultiMC5/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/MultiMC/quazip/archive/${V_QUAZIP}.tar.gz -> quazip-${V_QUAZIP}.tar.gz
+	https://github.com/MultiMC/libnbtplusplus/archive/${V_LIBNBTPLUSPLUS}.tar.gz -> libnbtplusplus-${V_LIBNBTPLUSPLUS}.tar.gz
+"
+KEYWORDS="~amd64"
 
 DESCRIPTION="MultiMC Minecraft Launcher"
 HOMEPAGE="https://multimc.org/"
@@ -29,6 +30,13 @@ BDEPEND="
 	sys-libs/zlib
 "
 
+src_unpack() {
+	default
+	rm -rf "${S}/libraries/libnbtplusplus" "${S}/libraries/quazip" || die
+	cp -r "${WORKDIR}/quazip-${V_QUAZIP}" "${S}/libraries/quazip" || die
+	cp -r "${WORKDIR}/libnbtplusplus-${V_LIBNBTPLUSPLUS}" "${S}/libraries/libnbtplusplus" || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		"-DCMAKE_INSTALL_PREFIX:PATH=/usr"
diff --git a/games-util/multimc5/multimc5-9999.ebuild b/games-util/multimc5/multimc5-9999.ebuild
index 4b8abb1..7cfe40d 100644
--- a/games-util/multimc5/multimc5-9999.ebuild
+++ b/games-util/multimc5/multimc5-9999.ebuild
@@ -3,15 +3,9 @@
 
 EAPI=7
 
-inherit cmake
+EGIT_REPO_URI="https://github.com/MultiMC/MultiMC5.git"
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://files.2a03.party/~flewkey/distfiles/${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MultiMC/MultiMC5.git"
-fi
+inherit git-r3 cmake
 
 DESCRIPTION="MultiMC Minecraft Launcher"
 HOMEPAGE="https://multimc.org/"