From 887db10ad3196cd218a14923db799338e6d07407 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Mon, 16 Jan 2023 19:32:34 +0100
Subject: [PATCH] www-apps/misskey: use pnpm wrapper

---
 www-apps/misskey/misskey-13.0.0.ebuild | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/www-apps/misskey/misskey-13.0.0.ebuild b/www-apps/misskey/misskey-13.0.0.ebuild
index 57d04ab..0d2d8f8 100644
--- a/www-apps/misskey/misskey-13.0.0.ebuild
+++ b/www-apps/misskey/misskey-13.0.0.ebuild
@@ -56,13 +56,12 @@ QA_PREBUILT="
 	/opt/misskey/misskey/packages/client/node_modules/microtime/prebuilds/*
 "
 
-enable_pnpm_temp() {
-	# enable pnpm (part of nodejs) temporarily if it isn't available
-	if ! type pnpm > /dev/null 2>&1; then
-		mkdir "${T}"/bin || die
-		ln -s /usr/$(get_libdir)/node_modules/corepack/dist/pnpm.js \
-			"${T}"/bin/pnpm || die "Could not symlink pnpm.js"
-		PATH="${T}/bin:${PATH}"
+pnpm() {
+	# use the pnpm from nodejs if it isn't available otherwise
+	if type pnpm > /dev/null 2>&1; then
+		pnpm "${@}"
+	else
+		/usr/$(get_libdir)/node_modules/corepack/dist/pnpm.js "${@}"
 	fi
 }
 
@@ -79,6 +78,8 @@ src_prepare() {
 	export CYPRESS_CACHE_FOLDER="${T}"/packages-cache
 	export npm_config_cache="${T}"/packages-cache
 	export PNPMFLAGS="--verbose"
+	pnpm config set cache "${T}"/packages-cache
+	pnpm config set store-dir "${T}"/packages-cache
 
 	# use system node-gyp
 	PATH+=":/usr/lib64/node_modules/npm/bin/node-gyp-bin"
@@ -90,10 +91,6 @@ src_prepare() {
 		die "No config file found"
 	fi
 
-	enable_pnpm_temp
-	pnpm config set cache "${T}"/packages-cache
-	pnpm config set store-dir "${T}"/packages-cache
-
 	default
 }
 
@@ -134,7 +131,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	enable_pnpm_temp
 	# Only run migrations if database exists
 	if su --login --command "psql misskey -c ''" postgres; then
 		einfo "Running migration…"
@@ -153,7 +149,6 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	enable_pnpm_temp
 	einfo "Initialising PostgreSQL database"
 	echo -n "password for misskey user: "
 	read -r MY_PASSWORD || die "Reading password failed"