gentoo resync : 23.09.2020

2 files changed, 0 insertions, 140 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 62561e1b3569..c53e535261cf 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,5 +1,4 @@
 AUX 1.12-fix-vendoring.patch 430 BLAKE2B 897214736e27f49023c8de9da5e7caa3612947f381d10e1bfd9fca2a6f4cfdcefb7fd6a70fb972e9db1c8a84deb592f585d0c6beda66b551b6e65cdce33e73d6 SHA512 9b2678c373dfb18e53be53b99e2cebdb656f777f850c6f9b67e29d52011edc320fb7d14045fef08b0b3b70959784070264f1cdfae70937097977b2865c8c71b5
-AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c39e462e5a63607ef076b116c27d2090f894095193dad33918f1fad1767489d45ae80f9699dddf65141ceb9 SHA512 aa09b233402ecb450cab13ed08786c1b8dc72a944efe69792bcf95d6109dd41b73abae95c3048bf339c8bb7849b3a20edb473388c052d32e00f7fb8b9381138d
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
diff --git a/www-apps/gitea/files/gitea-logflags.patch b/www-apps/gitea/files/gitea-logflags.patch
deleted file mode 100644
index bbe6e5501c81..000000000000
--- a/www-apps/gitea/files/gitea-logflags.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-
-#Patch to make gitea logging less verbose.
-
-diff --git a/modules/log/flags.go b/modules/log/flags.go
-index 992fc62dd..5578a1b6b 100644
---- a/modules/log/flags.go
-+++ b/modules/log/flags.go
-@@ -31,7 +31,7 @@ const (
- 	Lmedfile = Lshortfile | Llongfile
- 
- 	// LstdFlags is the initial value for the standard logger
--	LstdFlags = Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial
-+	LstdFlags = Ldate | Ltime | Llevelinitial
- )
- 
- 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")