www-apps/hugo: add 0.104.3

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo@tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/27118
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

4 files changed, 188 insertions, 39 deletions

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 1041d1b077c1..2376d0c78f71 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,3 +1,5 @@
 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.104.3-vendor.tar.xz 5785560 BLAKE2B ac96f75bb267cab751e908225654bcf46defe08726087d4959fff5aa66833312ab97448b1cced965f15861d9a5779c55854fd64e3ec618a442680502d9d95c32 SHA512 9d2a8f1adb90ff83a5dd2e21e4ab3ccb398389acfa39da91aa6f320bd390db716c04082c31d26fcc77261a0cb4eff4b4f86b2c6aa9f30fcab452578b48badc50
+DIST hugo-0.104.3.tar.gz 27639976 BLAKE2B a299c7ea5bbdfc819ceba3bbc83646f705f553546fd7c4e18bba26e09f6bc16216cafecabd9e4bdd6f685fe5102394ba205b8d39c873567e8b5bad931062a9c5 SHA512 feb5b610f5c4080c968e5d5f861c4976553d6bcbcca951824f2c14dcf2510e5d9d3a680ef274470d5599f0a270d931b4a4e5dc4c39830226e15c2b2091f8c8f5
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.104.3.ebuild b/www-apps/hugo/hugo-0.104.3.ebuild
new file mode 100644
index 000000000000..d3c3a18137bd
--- /dev/null
+++ b/www-apps/hugo/hugo-0.104.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Fast static HTML and CSS website generator"
+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:
+# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="doc +sass test"
+
+BDEPEND="
+	>=dev-lang/go-1.18
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+		virtual/pandoc
+	)
+"
+RDEPEND="
+	>=media-libs/libwebp-1.2.3-r1:=
+	sass? ( dev-libs/libsass:= )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${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() {
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+
+	MY_BUILDFLAGS="$(usev sass "-tags extended")"
+
+	default
+}
+
+src_compile() {
+	mkdir -pv bin || die
+	ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \
+		${MY_BUILDFLAGS} -o "${S}/bin/hugo"
+
+	bin/hugo gen man --dir man || die
+
+	mkdir -pv completions || die
+	bin/hugo completion bash > completions/hugo || die
+	bin/hugo completion fish > completions/hugo.fish || die
+	bin/hugo completion zsh > completions/_hugo || die
+
+	if use doc ; then
+		bin/hugo gen doc --dir doc || die
+	fi
+}
+
+src_test() {
+	ego test -race "./..." ${MY_BUILDFLAGS}
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+
+	dobashcomp completions/${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/${PN}.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/_${PN}
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}