gentoo auto-resync : 24:07:2023 - 08:55:05

4 files changed, 11 insertions, 110 deletions

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index aa7bfb6f3e28..9152653cb0f2 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,11 +1,9 @@
-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.111.3-vendor.tar.xz 5812152 BLAKE2B c3daccdd3e6841df3a45c4fb7c82cf5ffba0a9267881733898c54814fbc0707f0cb110604de1a0604d986bc8668347b71eb9b845217a6c1a5764a776282caea3 SHA512 ba08add570db8d8f92a31474252470f3b6440884c9d595a8bd128a0c8f9ce066553e28531c331ddc51e8f665acb555ec8f31525ceda94c5542be229b80b1a274
-DIST hugo-0.111.3.tar.gz 29191902 BLAKE2B a5c4bf3f53579b7870e5a0bed247feff016d3a06c0683949ecada5083db07ee2108c712b41b1f15edd42f0a77d5649657d3fe76d8704a8a7668911a56b045e3b SHA512 fd9fa9138cf714572d50328abc332edcdaaa3d45440914705d0d2119fd2a062c8df59732d9f5c23f540076e0c5a4104ac1d332f8633d93ab1479f82dd5ecce39
 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
+DIST hugo-0.115.4-vendor.tar.xz 6193628 BLAKE2B 427dc6c66a726ff944b0c782b443a6ae3d3ec1b916127db33ebb6789dc1a8271daf00a3bf47f4fbd4f18fc01648b632c5ad9978237d4a11aac0c30406626c107 SHA512 57d3a421eec9909995453aad032f7775722e6ea72c344a31337c62c0aa7b4b669cf5ba5229e3f6819845eed03712e9972328c13c14f93bee0b97a5392b49779b
+DIST hugo-0.115.4.tar.gz 28554509 BLAKE2B b0a8776580b60af5b4e8d023ed2c046fec1d508eaef568fa06f8591653e0f3a2e1bb65352328de421353c02a5856a6cc713d15b6189184150fabc6a5d3a152b9 SHA512 b5a00aa6601a6df2d1cc9244899b26abdc92e0b57d7431409b483e1bbd892a8026b181f2b9dbe273385b5ca95c3564ca6128afa54d33cbda584946eba20d2eb5
 EBUILD hugo-0.115.2.ebuild 2139 BLAKE2B 212e7aa41f17581715b6638039bf2653a2214f0f6e32be73c366a058f9f5a70e1fc65d046e9a2b743360ee3c7963869b92cd06c6251de2cac6d64412c114a2bb SHA512 750a2662ad7268ddf25f55dc4d4addc0ca5bda526fa3ca5ea7fef86e7c88e61d3c07b86cba96cfe35c6eaa889822103a0bde081956871b587aab08d9d165cf1b
+EBUILD hugo-0.115.4.ebuild 2139 BLAKE2B 212e7aa41f17581715b6638039bf2653a2214f0f6e32be73c366a058f9f5a70e1fc65d046e9a2b743360ee3c7963869b92cd06c6251de2cac6d64412c114a2bb SHA512 750a2662ad7268ddf25f55dc4d4addc0ca5bda526fa3ca5ea7fef86e7c88e61d3c07b86cba96cfe35c6eaa889822103a0bde081956871b587aab08d9d165cf1b
 MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
diff --git a/www-apps/hugo/files/hugo-0.110.0-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.110.0-skip-some-tests.patch
deleted file mode 100644
index 3ed70afb80e7..000000000000
--- a/www-apps/hugo/files/hugo-0.110.0-skip-some-tests.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d2adde5cff8cca3feb630336e706fcb60bfffa7d Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Wed, 11 Jan 2023 19:30:15 +0100
-Subject: [PATCH] skip some tests
-
-reasons:
-  - needs to be in a git repo
-  - needs special test dependencies
-  - requires network access
----
- hugolib/page_test.go                                    | 1 +
- modules/client_test.go                                  | 4 ++++
- resources/resource_factories/create/integration_test.go | 1 +
- 3 files changed, 6 insertions(+)
-
-diff --git a/hugolib/page_test.go b/hugolib/page_test.go
-index 1d9e3e34..e1b3920a 100644
---- a/hugolib/page_test.go
-+++ b/hugolib/page_test.go
-@@ -995,6 +995,7 @@ func TestPageWithDate(t *testing.T) {
- }
- 
- func TestPageWithLastmodFromGitInfo(t *testing.T) {
-+	t.Skip("We are not in a git repo")
- 	if htesting.IsCI() {
- 		// TODO(bep) figure out why this fails on GitHub actions.
- 		t.Skip("Skip GitInfo test on CI")
-diff --git a/modules/client_test.go b/modules/client_test.go
-index 75e3c2b0..235d6ed3 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 2d9a700d..42185d9f 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.1
-
diff --git a/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch
deleted file mode 100644
index dc0f4898fcf6..000000000000
--- a/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 92ceabab139262750cc6b61ffc3a6341dedfbbd4 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Wed, 8 Jun 2022 04:10:27 +0200
-Subject: [PATCH] Set default test timeout to 2 minutes
-
-Bug: https://bugs.gentoo.org/850313
----
- config/configProvider.go | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/configProvider.go b/config/configProvider.go
-index 01a2e8c5..c8f199eb 100644
---- a/config/configProvider.go
-+++ b/config/configProvider.go
-@@ -57,6 +57,7 @@ func SetBaseTestDefaults(cfg Provider) Provider {
- 	setIfNotSet(cfg, "publishDir", "public")
- 	setIfNotSet(cfg, "workingDir", "")
- 	setIfNotSet(cfg, "defaultContentLanguage", "en")
-+	setIfNotSet(cfg, "timeout", "2m")
- 	return cfg
- }
- 
--- 
-2.35.1
-
diff --git a/www-apps/hugo/hugo-0.111.3.ebuild b/www-apps/hugo/hugo-0.115.4.ebuild
index 7eb297bafecd..b8cc129acc16 100644
--- a/www-apps/hugo/hugo-0.111.3.ebuild
+++ b/www-apps/hugo/hugo-0.115.4.ebuild
@@ -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}" \