gentoo auto-resync : 09:07:2023 - 10:24:32

3 files changed, 151 insertions, 6 deletions

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index bfb1edcc2f72..aa7bfb6f3e28 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,10 +1,11 @@
 AUX hugo-0.110.0-skip-some-tests.patch 2643 BLAKE2B 817e7301c7ce48fe9cff99964a6f081d6709fe70831456e90d0df17e0b48ca844f3261924ab825789e93bef48e42e91b86af6c5b19289a337bb390c23a290b3b SHA512 8f2bebbbea1f8adabcd88198d92d59e3fd6a9c3affef42089f2ce703f7ba385cf263165b9933c215386301cdeac84393aba68f2aeeaa62b8045dfffe2d2f90ac
+AUX hugo-0.115.2-skip-some-tests.patch 4709 BLAKE2B c2bfd236e2317f9539dcb96729448f8409e98c317a79ca5ae74e77e38abd7389907aa5f3d3e90e973a76d6fbc39b5290e52a515b196adc46551cebd1323c47ba SHA512 628aac535143f993fbd4c205e40cdb2ee8b33b7e0fb484dba64e5fb69822e680138742c9124e20437620d1463cb13a9b9216e890fcd927f6c98423d5183c0b86
 AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
 AUX hugo-0.99.1-test-timeout.patch 731 BLAKE2B 677a6ca363f60b875d672df80584734a5feabecea68de57cfe63ebfb97768581372adbe2d171e0f5f746a03b8dc67fad75bd1c0a3bdcb9532f99c1859b31523f SHA512 979161805cc5b7220362b7fefe33d423515b76a366b08500b9765c835399aacff3ff609d6692594739a3f9a078b1708dbfc1c6635416d46d0d8a1279e50417ac
-DIST hugo-0.110.0-vendor.tar.xz 5792924 BLAKE2B a70283d9b5764c3340591e40d6472c0f14b029e5bed086c4f294951e00a45041a869868884328ea39b75caccf8e2089250a98502a3ec38c730989a77e55c976b SHA512 c6a0cd262934b6434eac7122a0ec257ca4eec1611b938585e6ee22d56991632fd5e52c061d552772e0e8bd10e13c23aecc461d52c23dff009e8e522b651642da
-DIST hugo-0.110.0.tar.gz 29055652 BLAKE2B d8c9e04c3141f02eeea1a951ba92c552148b604817e60041a3b944ccea37565ab8a6c3a47300877f5497d4575df4cdf598627d8dea65a1c935073b7bd8e99b70 SHA512 b64a6fa50201c0d95bf49fd0193138123163e0dad077491cc4c3e0d851de03ed2cd2e81482c1e6291d9a10d2d99f89c9dbbcfaafcd17f702906901dc6f28b3de
 DIST hugo-0.111.3-vendor.tar.xz 5812152 BLAKE2B c3daccdd3e6841df3a45c4fb7c82cf5ffba0a9267881733898c54814fbc0707f0cb110604de1a0604d986bc8668347b71eb9b845217a6c1a5764a776282caea3 SHA512 ba08add570db8d8f92a31474252470f3b6440884c9d595a8bd128a0c8f9ce066553e28531c331ddc51e8f665acb555ec8f31525ceda94c5542be229b80b1a274
 DIST hugo-0.111.3.tar.gz 29191902 BLAKE2B a5c4bf3f53579b7870e5a0bed247feff016d3a06c0683949ecada5083db07ee2108c712b41b1f15edd42f0a77d5649657d3fe76d8704a8a7668911a56b045e3b SHA512 fd9fa9138cf714572d50328abc332edcdaaa3d45440914705d0d2119fd2a062c8df59732d9f5c23f540076e0c5a4104ac1d332f8633d93ab1479f82dd5ecce39
-EBUILD hugo-0.110.0-r2.ebuild 2057 BLAKE2B 92f46521d16f9a4cdc9817f16e96d964a7b81f18b204ad57c4b1e3523ae8264ca1728a0e22fd0fb6c099fb40582cc3e114d04f2005b62ceb29076a31e0313f7a SHA512 5faf07fc5c1bd04b0c7ceab60514acaffd29b8950a5f374a539c2e402c493644b9f71543e540ccbedfb656196f1393ea7be918b20314a49b04b675ac03ee8ae0
+DIST hugo-0.115.2-vendor.tar.xz 6196068 BLAKE2B 0d98ed1f3553c5eb28ceb66751c36d4b0e6bb5838a37166d1c006e4a05a888bfd850250a77c1786293bc34bad2f731052782e42b0d8c1e6cc158c076d46945d4 SHA512 e1eb88cd8fbb01bb86c265e3416bf236cb6b049467218f5ff66e2702f4304eca4ab43edbfbb4d3972d636d4dcf0fd04375fd4ebce2a40b78c1a3de1f27e08049
+DIST hugo-0.115.2.tar.gz 28547893 BLAKE2B 18496be5d24be6b0b34ff88806b6621cb361f61641efd67ed11fd413379107aad029b241a7b8730ad016c1eb1469b29feee7af33fbf0b94bb0f2fbe2a209c1bb SHA512 4c35d5d6699de1e675fa0c1dfca0f2436ac3ab7a0c164e7662400fb7b81b16ed23a6961e297f262273c18ef2eaa551b813c7d99a8634d0687e78343b23f275f6
 EBUILD hugo-0.111.3.ebuild 2055 BLAKE2B 2ea3b6344b3306ad4b3819af553d5aa6158d997a2f1deaebbbf1ad902dd7cb35edf3d08bb9f9089f271b17d7839c1732691527991d9a39d9141ff58511c40384 SHA512 15d35bf662af0e0270f3e6c83143b2af07095d4f34461c8b5086f20f682a4208df363df29c695a930a9f60906df09a229211909c67d7059064c3b7542efa3d34
+EBUILD hugo-0.115.2.ebuild 2139 BLAKE2B 212e7aa41f17581715b6638039bf2653a2214f0f6e32be73c366a058f9f5a70e1fc65d046e9a2b743360ee3c7963869b92cd06c6251de2cac6d64412c114a2bb SHA512 750a2662ad7268ddf25f55dc4d4addc0ca5bda526fa3ca5ea7fef86e7c88e61d3c07b86cba96cfe35c6eaa889822103a0bde081956871b587aab08d9d165cf1b
 MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
diff --git a/www-apps/hugo/files/hugo-0.115.2-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.115.2-skip-some-tests.patch
new file mode 100644
index 000000000000..a078a7793265
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.115.2-skip-some-tests.patch
@@ -0,0 +1,138 @@
+From e1553fba06ef652c55d0d0775098aeae8dd4139c Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Thu, 15 Jun 2023 22:13:18 +0200
+Subject: [PATCH] skip some tests
+
+reasons:
+  - needs to be in a git repo
+  - needs special test dependencies
+  - requires network access
+---
+ hugo-0.113.0-skip-some-tests.patch            | 65 +++++++++++++++++++
+ modules/client_test.go                        |  4 ++
+ .../create/integration_test.go                |  1 +
+ 3 files changed, 70 insertions(+)
+ create mode 100644 hugo-0.113.0-skip-some-tests.patch
+
+diff --git a/hugo-0.113.0-skip-some-tests.patch b/hugo-0.113.0-skip-some-tests.patch
+new file mode 100644
+index 000000000..846d64c95
+--- /dev/null
++++ b/hugo-0.113.0-skip-some-tests.patch
+@@ -0,0 +1,65 @@
++From 6d1aed716addf79cc1148da704282f65bd0ab26f Mon Sep 17 00:00:00 2001
++From: tastytea <tastytea@tastytea.de>
++Date: Thu, 15 Jun 2023 22:13:18 +0200
++Subject: [PATCH] skip some tests
++
++reasons:
++  - needs to be in a git repo
++  - needs special test dependencies
++  - requires network access
++---
++ modules/client_test.go                        |  4 ++
++ .../create/integration_test.go                |  1 +
++ 3 files changed, 5 insertions(+), 44 deletions(-)
++
++diff --git a/modules/client_test.go b/modules/client_test.go
++index 75e3c2b08..235d6ed32 100644
++--- a/modules/client_test.go
+++++ b/modules/client_test.go
++@@ -68,6 +68,7 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h
++ 	}
++ 
++ 	c.Run("All", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		client, clean := newClient(c, func(cfg *ClientConfig) {
++ 			cfg.ModuleConfig = DefaultModuleConfig
++ 		}, defaultImport)
++@@ -107,6 +108,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
++ 	})
++ 
++ 	c.Run("IgnoreVendor", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		client, clean := newClient(
++ 			c, func(cfg *ClientConfig) {
++ 				cfg.ModuleConfig = DefaultModuleConfig
++@@ -125,6 +127,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
++ 	})
++ 
++ 	c.Run("NoVendor", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		mcfg := DefaultModuleConfig
++ 		mcfg.NoVendor = "**"
++ 		client, clean := newClient(
++@@ -144,6 +147,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
++ 	})
++ 
++ 	c.Run("VendorClosest", func(c *qt.C) {
+++		c.Skip("Test dependencies not available")
++ 		mcfg := DefaultModuleConfig
++ 		mcfg.VendorClosest = true
++ 
++diff --git a/resources/resource_factories/create/integration_test.go b/resources/resource_factories/create/integration_test.go
++index 2d9a700d3..42185d9f7 100644
++--- a/resources/resource_factories/create/integration_test.go
+++++ b/resources/resource_factories/create/integration_test.go
++@@ -20,6 +20,7 @@ import (
++ )
++ 
++ func TestGetResourceHead(t *testing.T) {
+++	t.Skip("Requires network access")
++ 
++ 	files := `
++ -- config.toml --
++-- 
++2.39.3
++
+diff --git a/modules/client_test.go b/modules/client_test.go
+index 75e3c2b08..235d6ed32 100644
+--- a/modules/client_test.go
++++ b/modules/client_test.go
+@@ -68,6 +68,7 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h
+ 	}
+ 
+ 	c.Run("All", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		client, clean := newClient(c, func(cfg *ClientConfig) {
+ 			cfg.ModuleConfig = DefaultModuleConfig
+ 		}, defaultImport)
+@@ -107,6 +108,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
+ 	})
+ 
+ 	c.Run("IgnoreVendor", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		client, clean := newClient(
+ 			c, func(cfg *ClientConfig) {
+ 				cfg.ModuleConfig = DefaultModuleConfig
+@@ -125,6 +127,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
+ 	})
+ 
+ 	c.Run("NoVendor", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		mcfg := DefaultModuleConfig
+ 		mcfg.NoVendor = "**"
+ 		client, clean := newClient(
+@@ -144,6 +147,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
+ 	})
+ 
+ 	c.Run("VendorClosest", func(c *qt.C) {
++		c.Skip("Test dependencies not available")
+ 		mcfg := DefaultModuleConfig
+ 		mcfg.VendorClosest = true
+ 
+diff --git a/resources/resource_factories/create/integration_test.go b/resources/resource_factories/create/integration_test.go
+index 2d9a700d3..42185d9f7 100644
+--- a/resources/resource_factories/create/integration_test.go
++++ b/resources/resource_factories/create/integration_test.go
+@@ -20,6 +20,7 @@ import (
+ )
+ 
+ func TestGetResourceHead(t *testing.T) {
++	t.Skip("Requires network access")
+ 
+ 	files := `
+ -- config.toml --
+-- 
+2.39.3
+
diff --git a/www-apps/hugo/hugo-0.110.0-r2.ebuild b/www-apps/hugo/hugo-0.115.2.ebuild
index 68c6effbbe55..b8cc129acc16 100644
--- a/www-apps/hugo/hugo-0.110.0-r2.ebuild
+++ b/www-apps/hugo/hugo-0.115.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 # NOTE: To create the vendor tarball, run:
 # `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
 
-LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="doc +sass test"
@@ -38,8 +38,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch
-	"${FILESDIR}"/${PN}-0.110.0-skip-some-tests.patch
-	"${FILESDIR}"/${PN}-0.99.1-test-timeout.patch
+	"${FILESDIR}"/${PN}-0.115.2-skip-some-tests.patch
 )
 
 src_configure() {
@@ -53,6 +52,13 @@ src_configure() {
 	default
 }
 
+src_prepare() {
+	# wants to run command that require network access
+	rm testscripts/commands/mod{,_vendor}.txt || die
+
+	default
+}
+
 src_compile() {
 	mkdir -pv bin || die
 	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \