gentoo auto-resync : 15:10:2022 - 13:50:34

5 files changed, 110 insertions, 54 deletions

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 3b2a2785610f..3489d82d534d 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,11 +1,12 @@
+AUX hugo-0.104.3-skip-some-tests.patch 3279 BLAKE2B 725dc64acd0949fe019afb3341613b9e0ca0866e1b8a66cd7b6d0e89c11487ece7ed4ac6fdddcc8b8973798c0c11d4a02c22371114569f5c115c161be7bf42fc SHA512 4d911a092d47dd616be6e3bf1932a6cd854ea88b097ff91c42fe75584014631a17b652b91a2de55eed0e73039660ff906e6c2c1b8e81f55c97b1d7d93b4810c9
 AUX hugo-0.96.0-skip-some-tests.patch 4082 BLAKE2B fe22f1c7fe5dd023c21f45b1dca71b50bb51d9ed993687fa7c654b0e0c3b59f760c4270393e7abf46c84db6d9c1e62d56bd2851541ebfd40ac2abd92c132e6e2 SHA512 8be454a559aba28022ea09003dfdac8701f86edd5805f5b15349e1bd8295aacdf81cc8522b250d7fde24b485303e277ab15bd004aba6a2a0ca2717ae824c33ca
 AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
-AUX hugo-0.99.1-fix-testdecodeconfig-basic.patch 1694 BLAKE2B a751d9b4123c48bd8e5e2a6d05f36e6f89793a47ef17093f6b4abb2cdf92d584ca889bf9fd80ccfafa4093ea0410b79db214e703a0a4017bea61d323d78da668 SHA512 43871d36ba3e0fdbc5655d4b5a22de508430888621314bf00ee75bdd95f32e2992803cab606e6e1c17952dc1dd6701cdf84b30307f1af70a40b619fd6cd7660c
 AUX hugo-0.99.1-test-timeout.patch 731 BLAKE2B 677a6ca363f60b875d672df80584734a5feabecea68de57cfe63ebfb97768581372adbe2d171e0f5f746a03b8dc67fad75bd1c0a3bdcb9532f99c1859b31523f SHA512 979161805cc5b7220362b7fefe33d423515b76a366b08500b9765c835399aacff3ff609d6692594739a3f9a078b1708dbfc1c6635416d46d0d8a1279e50417ac
+DIST hugo-0.101.0-libwebp-1.2.3.patch 5197 BLAKE2B ef39ae1d804a96f791031eef87f1e0a51ccf0abc2963c65bb0e86971d0a5079445707af57d14f98c9709a97e148925cb51b676d4009e89b7ff695e633b200443 SHA512 3c8b227f07037048f0191b7ecda1d6c3900b2b515ae2007cbc18d8c9b8d8dd10f70e7b41dd8b81c612c43ae280024538226cd93049c20e9437e774c28b51b45a
 DIST hugo-0.101.0-vendor.tar.xz 5682852 BLAKE2B 130cf9fda4d857e69144147e408a90fd28273d42919c4ea50228b795b7c35f9641857f642be8628b947b213ee42f11f468ca76317d4742d09c60bc5a272e83ff SHA512 07390ebb9daf2097010013f5e7c789f3fcee485952968b0934cc5d625eec9a79784ccda1414e59a21073b66389c75888704f923675f255df5eaa0d43c0cc3048
 DIST hugo-0.101.0.tar.gz 28130925 BLAKE2B ff35c48c39dac61abe56ba4f75bfddcdda700b71157dc4ed75f1c3724b11b8a9f4546e94d3105a724a5493b3baa73056a55d9d90e87ce4237e39213995db636d SHA512 541d0e04e868845119f2b488fd53b92929ea4dc08685d438a2914b41586e204588b193522013e8eed908dc0c3fbc2714aefb1afad0beae875d57d71aadc59c70
-DIST hugo-0.99.1-vendor.tar.xz 5675228 BLAKE2B 80fdd25fe924bcde7f200b805bf6598dbb726bb628b82e9b0d2809414a7a6e33cbfe069e29953e75b8ed4ecdb9c7303b44a8d8195b43540977cd7461295de109 SHA512 88ffb6bea777e3a72dac05941de542acdc6a17faff9e98517e483e17c7a42d1ab5aa7e65ed3a91f6832468d2da3e98e87346118694a8e20f6375fad56d5d7ff0
-DIST hugo-0.99.1.tar.gz 27721831 BLAKE2B 951840055b345f87cca287ad6391787290296dab44ba2295a49e98c6e93ecb344e9591137e8fdd34d7182e2ec334e36b5ff5ebfd17c3f973dbe31d9444d7bf38 SHA512 cebdad62493b1f734fd0346d94f1480a597ea38bf984d8e91a2ae63a4083c1671d81f289a4396a1e1a2c973c8733eba95623dd7d50c31b8c4b096576a06ae03b
-EBUILD hugo-0.101.0.ebuild 2028 BLAKE2B 99072ba6b597df04158298c473a55ff38f436869255d90e4f4cbc2ce7a25ee49be00e0ea59cf2be05c0053587e290999cf455b264432ca1bb859b0da66df163f SHA512 d1e80056f9dc35ea435ad4b2efbc432c9fbdea51c82269262414e8fefe13d4cdd6861fc2e7262a599c704d6ea05618f12d538c8d93be7ab16f0cc0deb52b788e
-EBUILD hugo-0.99.1.ebuild 2082 BLAKE2B f594d9989b55ecfbd73c866ffcfa775bd97f6a50611a85f328690ccab8d37c16e73062f75b5fdf3390b0d9b8ae07584c064a4ac9c8b70fa06611571f211d5dd2 SHA512 1627ac0c42d5c3589cb042f8354c62d27045fbcef7193031e83987943432e10243e2829fc3d26fe24026fc78984460094aa5646c5e5651b2551eb47f472151cf
+DIST hugo-0.104.3-vendor.tar.xz 5785560 BLAKE2B ac96f75bb267cab751e908225654bcf46defe08726087d4959fff5aa66833312ab97448b1cced965f15861d9a5779c55854fd64e3ec618a442680502d9d95c32 SHA512 9d2a8f1adb90ff83a5dd2e21e4ab3ccb398389acfa39da91aa6f320bd390db716c04082c31d26fcc77261a0cb4eff4b4f86b2c6aa9f30fcab452578b48badc50
+DIST hugo-0.104.3.tar.gz 27639976 BLAKE2B a299c7ea5bbdfc819ceba3bbc83646f705f553546fd7c4e18bba26e09f6bc16216cafecabd9e4bdd6f685fe5102394ba205b8d39c873567e8b5bad931062a9c5 SHA512 feb5b610f5c4080c968e5d5f861c4976553d6bcbcca951824f2c14dcf2510e5d9d3a680ef274470d5599f0a270d931b4a4e5dc4c39830226e15c2b2091f8c8f5
+EBUILD hugo-0.101.0-r1.ebuild 2155 BLAKE2B b370b3a96514533a7adf32b18f2b3d8e705ac87319f41b41a0e24576e94b119b8afab1f108b178544c91c1564a8f5338095c18628fc133a1624958354e98b25b SHA512 37a96634d1496979cfefeb7dfb0cd88d35f1d906d47f479d0ef2ce6bec06e03464c16e0c828de47a8df207ebf88c0719c349f382b913ce664b13b7d867545cad
+EBUILD hugo-0.104.3.ebuild 2156 BLAKE2B 406a4cc4f18a7a7029a4a9e5e522827e9fdaa347e537717c82deee3ef88754ca78b106be77fc6809788e4c78d24b5146403e5563bd178ff16881675f34c4157d SHA512 77049581bc541e4839efc3f58eaf4e4fe96153f1a512dde11a5e1a7c58f24634d1fe6c078b084b1eacb55994ee6d2c63fb0b5cccd32f72005e9c8af70f88b985
 MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
diff --git a/www-apps/hugo/files/hugo-0.104.3-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.104.3-skip-some-tests.patch
new file mode 100644
index 000000000000..79d336652307
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.104.3-skip-some-tests.patch
@@ -0,0 +1,91 @@
+From 9d44b5ae62ddb77041ce362c3dbbbe86a5184ce1 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Sun, 2 Oct 2022 16:20:44 +0200
+Subject: [PATCH] skip some tests
+
+reasons:
+  - needs to be in a git repo
+  - needs special test dependencies
+  - needs dart-sass-embedded
+---
+ hugolib/page_test.go                                          | 1 +
+ modules/client_test.go                                        | 4 ++++
+ .../resource_transformers/tocss/dartsass/integration_test.go  | 1 +
+ .../resource_transformers/tocss/scss/integration_test.go      | 1 +
+ 4 files changed, 7 insertions(+)
+
+diff --git a/hugolib/page_test.go b/hugolib/page_test.go
+index 1d9e3e3..e1b3920 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 75e3c2b..235d6ed 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_transformers/tocss/dartsass/integration_test.go b/resources/resource_transformers/tocss/dartsass/integration_test.go
+index c127057..80973d5 100644
+--- a/resources/resource_transformers/tocss/dartsass/integration_test.go
++++ b/resources/resource_transformers/tocss/dartsass/integration_test.go
+@@ -108,6 +108,7 @@ T1: {{ $r.Content | safeHTML }}
+ }
+ 
+ func TestTransformThemeOverrides(t *testing.T) {
++	t.Skip("Needs dart-sass-embedded")
+ 	if !dartsass.Supports() {
+ 		t.Skip()
+ 	}
+diff --git a/resources/resource_transformers/tocss/scss/integration_test.go b/resources/resource_transformers/tocss/scss/integration_test.go
+index 13b664c..b2dfdbc 100644
+--- a/resources/resource_transformers/tocss/scss/integration_test.go
++++ b/resources/resource_transformers/tocss/scss/integration_test.go
+@@ -113,6 +113,7 @@ moo {
+ }
+ 
+ func TestTransformThemeOverrides(t *testing.T) {
++	t.Skip("Needs dart-sass-embedded")
+ 	if !scss.Supports() {
+ 		t.Skip()
+ 	}
+-- 
+2.35.1
+
diff --git a/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch b/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch
deleted file mode 100644
index 5221b86c04fa..000000000000
--- a/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# Upstream commit: https://github.com/gohugoio/hugo/commit/52edea0
-# Trimmed down to patch only the stuff we need.
-
-From 52edea0feccf98700300e98567c5a2ada7604c89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
- <bjorn.erik.pedersen@gmail.com>
-Date: Fri, 27 May 2022 10:06:45 +0200
-Subject: [PATCH] github: Set HUGO_BUILD_TAGS: extended when running tests
-
-Also fix TestDecodeConfig/Basic which started to fail in the extended build in 0.99.1.
-
-Closes #9935
----
-diff --git a/modules/config_test.go b/modules/config_test.go
-index 55d055dcc7d..371aab05617 100644
---- a/modules/config_test.go
-+++ b/modules/config_test.go
-@@ -48,7 +48,7 @@ func TestDecodeConfig(t *testing.T) {
-
- [module.hugoVersion]
- min = "0.54.2"
--max = "0.99.0"
-+max = "0.199.0"
- extended = true
-
- [[module.mounts]]
-diff --git a/resources/resource_transformers/tocss/scss/integration_test.go b/resources/resource_transformers/tocss/scss/integration_test.go
-index 72c0fd988e9..13b664cc723 100644
---- a/resources/resource_transformers/tocss/scss/integration_test.go
-+++ b/resources/resource_transformers/tocss/scss/integration_test.go
-@@ -236,7 +236,7 @@ T1: {{ $r.Content }}
- 			}).BuildE()
-
- 		b.Assert(err, qt.IsNotNil)
--		b.Assert(err.Error(), qt.Contains, filepath.FromSlash(`assets/scss/components/_foo.scss:2:1": expected ':' after $foocolor in assignment statement`))
-+		b.Assert(err.Error(), qt.Contains, `assets/scss/components/_foo.scss:2:1": expected ':' after $foocolor in assignment statement`)
- 		fe := b.AssertIsFileError(err)
- 		b.Assert(fe.ErrorContext(), qt.IsNotNil)
- 		b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 1 */", "$foocolor #ccc;", "", "foo {"})
diff --git a/www-apps/hugo/hugo-0.101.0.ebuild b/www-apps/hugo/hugo-0.101.0-r1.ebuild
index 9a449bde3bbb..76d449330265 100644
--- a/www-apps/hugo/hugo-0.101.0.ebuild
+++ b/www-apps/hugo/hugo-0.101.0-r1.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
 SRC_URI="
 	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
+	https://tastytea.de/files/gentoo/${PN}-0.101.0-libwebp-1.2.3.patch
 "
 
 # NOTE: To create the vendor tarball, run:
@@ -29,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	media-libs/libwebp:=
+	>=media-libs/libwebp-1.2.3-r1:=
 	sass? ( dev-libs/libsass:= )
 "
 DEPEND="${RDEPEND}"
@@ -37,9 +38,10 @@ DEPEND="${RDEPEND}"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
-	"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
-	"${FILESDIR}/${PN}-0.99.1-test-timeout.patch"
+	"${FILESDIR}"/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch
+	"${FILESDIR}"/${PN}-0.96.0-skip-some-tests.patch
+	"${FILESDIR}"/${PN}-0.99.1-test-timeout.patch
+	"${DISTDIR}"/${PN}-0.101.0-libwebp-1.2.3.patch
 )
 
 src_configure() {
diff --git a/www-apps/hugo/hugo-0.99.1.ebuild b/www-apps/hugo/hugo-0.104.3.ebuild
index 16dbceafb579..d3c3a18137bd 100644
--- a/www-apps/hugo/hugo-0.99.1.ebuild
+++ b/www-apps/hugo/hugo-0.104.3.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
 SRC_URI="
 	https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
+	https://tastytea.de/files/gentoo/${PN}-0.101.0-libwebp-1.2.3.patch
 "
 
 # NOTE: To create the vendor tarball, run:
@@ -17,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~loong ~x86"
 IUSE="doc +sass test"
 
 BDEPEND="
@@ -29,7 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	media-libs/libwebp:=
+	>=media-libs/libwebp-1.2.3-r1:=
 	sass? ( dev-libs/libsass:= )
 "
 DEPEND="${RDEPEND}"
@@ -37,10 +38,10 @@ DEPEND="${RDEPEND}"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
-	"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
-	"${FILESDIR}/${PN}-0.99.1-fix-testdecodeconfig-basic.patch"
-	"${FILESDIR}/${PN}-0.99.1-test-timeout.patch"
+	"${FILESDIR}"/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch
+	"${FILESDIR}"/${PN}-0.104.3-skip-some-tests.patch
+	"${FILESDIR}"/${PN}-0.99.1-test-timeout.patch
+	"${DISTDIR}"/${PN}-0.101.0-libwebp-1.2.3.patch
 )
 
 src_configure() {