From 8ac5c24a4e94bfda7bf8161cd24f2523ac606f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Mon, 22 Jun 2020 20:09:06 +0200
Subject: [PATCH] [www-apps/gitea] add from newest PR

---
 www-apps/gitea/Manifest                       |  2 +-
 www-apps/gitea/files/1.12-fix-vendoring.patch | 13 ++++++++++++
 ...itea-1.12.0.ebuild => gitea-1.12.1.ebuild} | 20 ++++++++++++++-----
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 www-apps/gitea/files/1.12-fix-vendoring.patch
 rename www-apps/gitea/{gitea-1.12.0.ebuild => gitea-1.12.1.ebuild} (86%)

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 5ff09e1..aa1130e 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1 +1 @@
-DIST gitea-1.12.0.tar.gz 135098075 BLAKE2B 95762a13a2875ac08e60b73e40c3d65000f4ceb39b99429ea2c6b97859108bcbe1de7e258bd7d7da0d38d86e995c0bc44c81f56cad636d46cd37ae56d7289e97 SHA512 c5997c982088134e889811417dce8a03cb8febc921fbfe2f08dbdafd4168795bd59cda52c8e52a2503dffc54fc2ebfc13153c66ec71efe54c0326873ee248dcb
+DIST gitea-1.12.1.tar.gz 135104234 BLAKE2B 36510e25e8c2cc1c718702a7cd0be74bbf5448beb33a90732599a4830b0899b37dfc9a58e3a8ffdb5037e93f185ba3b09a0ac7b8acd629c46b1982d6aeab1ec1 SHA512 6ba8a703272e611aac4c214cd818490a9615a9ab9b64ec22ec2c6331e865226324896f600218fb3b39cea7b6649456db7ff18e1857ece6964ab5d3c6d99c3aec
diff --git a/www-apps/gitea/files/1.12-fix-vendoring.patch b/www-apps/gitea/files/1.12-fix-vendoring.patch
new file mode 100644
index 0000000..9baff97
--- /dev/null
+++ b/www-apps/gitea/files/1.12-fix-vendoring.patch
@@ -0,0 +1,13 @@
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index efbc866..1c34104 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
+ # mvdan.cc/xurls/v2 v2.1.0
+ ## explicit
+ mvdan.cc/xurls/v2
++# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
++## explicit
+ # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
+ ## explicit
+ strk.kbt.io/projects/go/libravatar
diff --git a/www-apps/gitea/gitea-1.12.0.ebuild b/www-apps/gitea/gitea-1.12.1.ebuild
similarity index 86%
rename from www-apps/gitea/gitea-1.12.0.ebuild
rename to www-apps/gitea/gitea-1.12.1.ebuild
index 672af64..18b851d 100644
--- a/www-apps/gitea/gitea-1.12.0.ebuild
+++ b/www-apps/gitea/gitea-1.12.1.ebuild
@@ -20,9 +20,9 @@ fi
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
-IUSE="+acct pam sqlite"
+IUSE="+acct build-client pam sqlite"
 
-BDEPEND=">=net-libs/nodejs-10[npm]"
+BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
 COMMON_DEPEND="
 	acct? (
 		acct-group/git
@@ -38,6 +38,9 @@ DOCS=(
 FILECAPS=(
 	cap_net_bind_service+ep usr/bin/gitea
 )
+PATCHES=(
+	"${FILESDIR}/1.12-fix-vendoring.patch"
+)
 
 src_prepare() {
 	default
@@ -67,6 +70,9 @@ src_prepare() {
 	einfo "Remove tests which depend on gitea git-repo."
 	rm ./modules/git/blob_test.go || die
 	rm ./modules/git/repo_test.go || die
+
+	# Remove already build assets (like frontend part)
+	use build-client && emake clean-all
 }
 
 src_compile() {
@@ -86,9 +92,13 @@ src_compile() {
 	)
 	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
 
-	# -j1 as Makefile doesn't handle dependancy correctly, and is not
-	# useful as golang compiler don't use this info.
-	env "${makeenv[@]}" emake -j1 build
+	if use build-client; then
+		# -j1 as Makefile doesn't handle dependancy correctly, and is not
+		# useful as golang compiler don't use this info.
+		env "${makeenv[@]}" emake -j1 build
+	else
+		env "${makeenv[@]}" emake backend
+	fi
 }
 
 src_install() {