[gentoo-commits] repo/proj/guru:master commit in: www-apps/forgejo/

["Viorel Munteanu" <ceamac@gentoo.org>]

commit:     aca70b0f4e06ba0dcc7a914d9a4807a18fd7aa1f
Author:     Artemis Everfree <artemis <AT> artemis <DOT> sh>
AuthorDate: Tue Jul 25 19:34:49 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 19:36:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aca70b0f

www-apps/forgejo: add 1.20.1.0, drop 1.18.0.1

Signed-off-by: Artemis Everfree <artemis <AT> artemis.sh>

 www-apps/forgejo/Manifest                          |  3 ++-
 ...ejo-1.18.0.1.ebuild => forgejo-1.20.1.0.ebuild} | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/www-apps/forgejo/Manifest b/www-apps/forgejo/Manifest
index f87409daa..deebbb604 100644
--- a/www-apps/forgejo/Manifest
+++ b/www-apps/forgejo/Manifest
@@ -1,2 +1,3 @@
-DIST forgejo-1.18.0.1.tar.gz 58980172 BLAKE2B c5e9b276c9446f8f4ceb9dc00d502fe13b92d1c812526252315cc478148c3438fa3ecc8ef883f0dc092a09f812480e4c3166ca474e7f013a12596a02381488ca SHA512 f1d6989cdf4df981e0c0d9f3abe49686c4ee5ddebfd2e54b384a8f52357b556c7bf48ea79cf7a8f9e32cda35e319a9c486c66d2d7a5e5d75fb0d1ad1a6e23598
 DIST forgejo-1.19.4.0.tar.gz 60635393 BLAKE2B 7fe8e10f7aae8371c4a540290bb24c67a0521080eb58c7749c95d977320781e2e11ba754a42a333c706d243cf0170178dd62da5338540576d214f281b3da6daa SHA512 4870a7804c3cefab4aac38f30ac60874d9a7359b29e8f765ee9a1f41bc543fdd445a21c6e808f864c56ce22f79f6038b15eec4325c556ef6288ad6635977533f
+DIST forgejo-1.20.1.0.tar.gz 30700591 BLAKE2B d794a8a121e8e01bdd643122f1c1be8d046e3a50137b00abf1cae43b24f32040fc82f088b694c617d8f20853d1d9b21a3ce99395b776a58ff7a37f717fbf431f SHA512 642b4ae14c1cedfcf856e0fad67e9825becce002c12d0431d247082c2e2f193ea8d8459a40a3fa69497fa3da6dca46ced5a855fb4dc1e52a34211e8938666cb0
+DIST forgejo-node-modules-cache-1.20.1.0.tar.gz 152983555 BLAKE2B e626ab10122c9105ae7861fbe869fcbd3203ef81152b4ac7a4521106303d7a80929c2fac1cde0eabe587f527aaa55b089973ec5019234127fb5024265f8a9928 SHA512 41eb9e09165e65cbb8a04e8b45e34a92b821343539549295dda6ae78995e89fb6341182555c2815754b8e6a8476c037a1ee89625a934e9f711109162d42c4b16

diff --git a/www-apps/forgejo/forgejo-1.18.0.1.ebuild b/www-apps/forgejo/forgejo-1.20.1.0.ebuild
similarity index 82%
rename from www-apps/forgejo/forgejo-1.18.0.1.ebuild
rename to www-apps/forgejo/forgejo-1.20.1.0.ebuild
index e9010e5d9..093ab08a1 100644
--- a/www-apps/forgejo/forgejo-1.18.0.1.ebuild
+++ b/www-apps/forgejo/forgejo-1.20.1.0.ebuild
@@ -9,14 +9,11 @@ MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
 DESCRIPTION="A self-hosted lightweight software forge"
 HOMEPAGE="https://forgejo.org/ https://codeberg.org/forgejo/forgejo"
 
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://codeberg.org/forgejo/forgejo"
-else
-	SRC_URI="https://codeberg.org/forgejo/forgejo/releases/download/v${MY_PV}/forgejo-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
+SRC_URI="
+	https://codeberg.org/forgejo/forgejo/releases/download/v${MY_PV}/forgejo-src-${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://pkg.artemis.sh/gentoo/pkg-deps/www-apps/forgejo/forgejo-node-modules-cache-${PV}.tar.gz
+"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 S="${WORKDIR}/${PN}-src-${MY_PV}"
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
@@ -28,6 +25,9 @@ DEPEND="
 		acct-group/git
 		acct-user/git[gitea] )
 	pam? ( sys-libs/pam )"
+BDEPEND="
+	net-libs/nodejs[npm]
+"
 RDEPEND="${DEPEND}
 	dev-vcs/git
 	!www-apps/gitea" # until acct-user/git[forgejo]
@@ -82,6 +82,7 @@ src_compile() {
 		DRONE_TAG="${PV}"
 		LDFLAGS="-extldflags \"${LDFLAGS}\" ${forgejo_settings[*]}"
 		TAGS="${forgejo_tags[*]}"
+		npm_config_cache="${WORKDIR}/node-modules-cache"
 	)
 
 	GOFLAGS=""
@@ -89,7 +90,10 @@ src_compile() {
 		GOFLAGS+="-buildmode=pie"
 	fi
 
-	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
+	# need to set -j1 or build fails due to a race condition between MAKE jobs.
+	# this does not actually impact build parallelism, because the go compiler
+	# will still build everything in parallel when it's invoked.
+	env "${makeenv[@]}" emake -j1 EXTRA_GOFLAGS="${GOFLAGS}"
 }
 
 src_install() {