version bump www-apps/gitea-1.12.3

2020-08-05 21:59:31 +02:00 · 2020-08-05 21:59:31 +02:00 · 975a74ea5c
commit 975a74ea5c
parent 9430a8e208
4 changed files with 196 additions and 65 deletions
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@ -1,5 +1,6 @@
+AUX 1.12-fix-vendoring.patch 430 BLAKE2B 897214736e27f49023c8de9da5e7caa3612947f381d10e1bfd9fca2a6f4cfdcefb7fd6a70fb972e9db1c8a84deb592f585d0c6beda66b551b6e65cdce33e73d6 SHA512 9b2678c373dfb18e53be53b99e2cebdb656f777f850c6f9b67e29d52011edc320fb7d14045fef08b0b3b70959784070264f1cdfae70937097977b2865c8c71b5
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
-AUX gitea-logflags.patch 424 BLAKE2B af7c4d5b75a68d96eb3a4b352bd446ad25016093c9acedb1a035e2aa10baf3e451a89f685b9891d6941262523283946539c83e49b432ff7b6040b02a23c10c76 SHA512 df180aba171ef5f12228fa9c420f32a9f2da9125e4ec9517d068bed6c4bd64f4c196da1feb557c40764566fa6238d86c933ea505b8cbbd106102866d720149ca
+AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c39e462e5a63607ef076b116c27d2090f894095193dad33918f1fad1767489d45ae80f9699dddf65141ceb9 SHA512 aa09b233402ecb450cab13ed08786c1b8dc72a944efe69792bcf95d6109dd41b73abae95c3048bf339c8bb7849b3a20edb473388c052d32e00f7fb8b9381138d
 AUX gitea-mod-vendor.patch 1273 BLAKE2B 3067b17a972b92d0c402af4336ee41daa2f09d389a6e8bf218d33b103230bf8bb4b7003977447cc00293f8941f5002676398d4d755548e114e59cbb3840af8cc SHA512 12d8e0d2cb0998d31f8077f1498205bfee07e0df74926251f1ca38b9824c11246c07e413fc20beaed9ae49cac3d329468432f3fd2d5b25292c5bd656a88c7cc8
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
@ -7,5 +8,5 @@ AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2e
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service 472 BLAKE2B 4c728e2987d0c0a86e65d4b9c1a59f6193ff8a3f9b066991a06f495ad1c5586b3497c71fca1cce5b65f167af09343e7bf3215ee5e8fdefa539e384198d2d88d6 SHA512 6666fe3b4cdbb78a58db4a6bf47a15e6be9ab30b666c6eb77a9e8a002d8c0abd510fc75ef463a11ee6892ab12c98943774616072cb64fd9f2fa42ff8f676aa95
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-1.11.4.tar.gz 28240336 BLAKE2B 89fc609b4f12b0c330a812cd9547fdc86768aaa0f5afbe80a41607ad9d41c6f919cee8e4cc686ffe2f24a5b0834f0f31b4e04a97d05fef044402894838fdd219 SHA512 5b7d07fd02f3acf900f1a3d2d9bb99a94487eaaf148d11a9746b309ee97ffc2d208fd47cc7e121ac0b2a6e97c919ea0232898f7f6851248a8407c706edbc904a
-EBUILD gitea-1.11.4.ebuild 3454 BLAKE2B b934ea913f0c367ce1c9eb86cd39bf2f49cfc0198593137c2d1dbe9586033c4496028cc305b85a8bade67d61e039378c3081cf0da3c5488c56e8adaff1366d75 SHA512 3a1563d1837a2d1c9f83d7dd9b895650df849638fb0d04fdc3c6361833eb22e9d9ab711e733ae14ed8722833682b3cc8fa4d87795dcb80e3902be03c530cb9db
+DIST gitea-1.12.3.tar.gz 135139930 BLAKE2B 254f8421412958639aa5a8044fb1a4b9e47fa7231e26d45fdbb3aa2b34b8b9b89ecbf0b4fbae437246ccf7798c61bf62fded945013164995180eed4aedfc00cf SHA512 cc9e9275100389dd12c7b57a1f587a0d75d85faf73291abd0f2cd4d6ea22e776b4d55eafef904b20fddd7333642a32de8464e8c14b2c108fb914bbd62080a62c
+EBUILD gitea-1.12.3.ebuild 3484 BLAKE2B 70484a7472390bced7d383df71160a22e3cecef96811aef7ea29f1e67f46b1e56886c97d5737c37df5b7e1ff341f9909fcb5f6c6ec863730a9479128dffb1230 SHA512 deca4c035589312c00727e997ef9e257bd1dd0450eec83b452d37acff82b562fa95ac06c7d8e6b8713d2d0f1b46fe7e9e6eb7d4db6b909b6c752ff28d5a38053
--- a/www-apps/gitea/files/1.12-fix-vendoring.patch
+++ 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
--- a/www-apps/gitea/files/gitea-logflags.patch
+++ b/www-apps/gitea/files/gitea-logflags.patch
@ -1,5 +1,8 @@
+
+#Patch to make gitea logging less verbose.
+
 diff --git a/modules/log/flags.go b/modules/log/flags.go
-index 992fc62..5578a1b 100644
+index 992fc62dd..5578a1b6b 100644
 --- a/modules/log/flags.go
 +++ b/modules/log/flags.go
@@ -31,7 +31,7 @@ const (
@ -11,3 +14,126 @@ index 992fc62..5578a1b 100644
 )
 
 var flagFromString = map[string]int{
+
+
+#Just patching the tests to keep working with the patch above (avoid using LstdFlags)
+
+diff --git a/modules/log/conn_test.go b/modules/log/conn_test.go
+index cc3d758fa..295bee37f 100644
+--- a/modules/log/conn_test.go
+++ b/modules/log/conn_test.go
+@@ -40,7 +40,7 @@ func TestConnLogger(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 	connLogger := logger.(*ConnLogger)
+@@ -112,7 +112,7 @@ func TestConnLoggerCloseBeforeSend(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 
+@@ -126,7 +126,7 @@ func TestConnLoggerFailConnect(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 
+@@ -169,7 +169,7 @@ func TestConnLoggerClose(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	logger := NewConn()
+ 	connLogger := logger.(*ConnLogger)
+diff --git a/modules/log/console_test.go b/modules/log/console_test.go
+index a028b5b87..e4fec760a 100644
+--- a/modules/log/console_test.go
+++ b/modules/log/console_test.go
+@@ -33,7 +33,7 @@ func TestConsoleLoggerMinimalConfig(t *testing.T) {
+ 			},
+ 		}
+ 		prefix := ""
+-		flags := LstdFlags
+        flags := LstdFlags
+ 
+ 		cw := NewConsoleLogger()
+ 		realCW := cw.(*ConsoleLogger)
+@@ -64,7 +64,7 @@ func TestConsoleLogger(t *testing.T) {
+ 	}
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 
+ 	cw := NewConsoleLogger()
+ 	realCW := cw.(*ConsoleLogger)
+diff --git a/modules/log/file_test.go b/modules/log/file_test.go
+index 38279315a..dc8d291ed 100644
+--- a/modules/log/file_test.go
+++ b/modules/log/file_test.go
+@@ -24,7 +24,7 @@ func TestFileLoggerFails(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	//filename := filepath.Join(tmpDir, "test.log")
+ 
+ 	fileLogger := NewFileLogger()
+@@ -52,7 +52,7 @@ func TestFileLogger(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	filename := filepath.Join(tmpDir, "test.log")
+ 
+ 	fileLogger := NewFileLogger()
+@@ -155,7 +155,7 @@ func TestCompressFileLogger(t *testing.T) {
+ 
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	filename := filepath.Join(tmpDir, "test.log")
+ 
+ 	fileLogger := NewFileLogger()
+diff --git a/modules/log/smtp_test.go b/modules/log/smtp_test.go
+index 216d55521..15075dd41 100644
+--- a/modules/log/smtp_test.go
+++ b/modules/log/smtp_test.go
+@@ -17,7 +17,7 @@ import (
+ func TestSMTPLogger(t *testing.T) {
+ 	prefix := "TestPrefix "
+ 	level := INFO
+-	flags := LstdFlags | LUTC | Lfuncname
+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
+ 	username := "testuser"
+ 	password := "testpassword"
+ 	host := "testhost"
+diff --git a/modules/log/writer_test.go b/modules/log/writer_test.go
+index 886dd58fb..df2f6e698 100644
+--- a/modules/log/writer_test.go
+++ b/modules/log/writer_test.go
+@@ -41,7 +41,7 @@ func TestBaseLogger(t *testing.T) {
+ 	b := WriterLogger{
+ 		out:    c,
+ 		Level:  INFO,
+-		Flags:  LstdFlags | LUTC,
+		Flags:  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC,
+ 		Prefix: prefix,
+ 	}
+ 	location, _ := time.LoadLocation("EST")
--- a/www-apps/gitea/gitea-1.12.3.ebuild
+++ b/www-apps/gitea/gitea-1.12.3.ebuild
@ -2,69 +2,45 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-
-if [[ ${PV} != 9999* ]] ; then
-	SCM="golang-vcs-snapshot"
-else
-	SCM="git-r3"
-fi
-
-inherit golang-base tmpfiles systemd ${SCM}
-unset SCM
-
-EGO_PN="code.gitea.io/gitea"
+inherit fcaps go-module tmpfiles systemd
+MY_PV="${PV/_rc/-rc}"

 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io"

 if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64"
+	S="${WORKDIR}"
 else
 	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 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="dev-lang/go
-	>=net-libs/nodejs-10[npm]"
-DEPEND="pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
+BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
+COMMON_DEPEND="
 	acct? (
 		acct-group/git
-		acct-user/git[gitea]
-	)
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"

-DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
-
-gitea_make() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+DOCS=(
+	custom/conf/app.ini.sample CONTRIBUTING.md README.md
 )
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+FILECAPS=(
+	cap_net_bind_service+ep usr/bin/gitea
 )
-	local makeenv=(
-		TAGS="${gitea_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
-		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
+PATCHES=(
+	"${FILESDIR}/1.12-fix-vendoring.patch"
 )
-	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
-
-	env "${makeenv[@]}" emake "$@"
-}

 src_prepare() {
 	default
@ -88,26 +64,41 @@ src_prepare() {
 		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
 	fi

-	gitea_make generate
-}
-
-src_compile() {
-	gitea_make build
-}
-
-src_test() {
-	if has network-sandbox ${FEATURES}; then
 	einfo "Remove tests which are known to fail with network-sandbox enabled."
 	rm ./modules/migrations/github_test.go || die
-	fi

-	if [[ ${PV} != 9999* ]] ; then
 	einfo "Remove tests which depend on gitea git-repo."
 	rm ./modules/git/blob_test.go || die
 	rm ./modules/git/repo_test.go || die
-	fi

-	default
+	# Remove already build assets (like frontend part)
+	use build-client && emake clean-all
+}
+
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
+
+	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() {