[gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/

["Viorel Munteanu" <ceamac@gentoo.org>]

commit:     aca4df0fd994dc850ca88521159595f51f9515f5
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sat Jul  8 20:18:44 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 08:08:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca4df0f

www-apps/hugo: add 0.115.2

Signed-off-by: tastytea <gentoo <AT> tastytea.de>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/hugo/Manifest                             |   2 +
 .../hugo/files/hugo-0.115.2-skip-some-tests.patch  | 138 +++++++++++++++++++++
 www-apps/hugo/hugo-0.115.2.ebuild                  |  98 +++++++++++++++
 3 files changed, 238 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 82e456ea2c2a..4a92014cd7b1 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -2,3 +2,5 @@ DIST hugo-0.110.0-vendor.tar.xz 5792924 BLAKE2B a70283d9b5764c3340591e40d6472c0f
 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
+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

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.115.2.ebuild b/www-apps/hugo/hugo-0.115.2.ebuild
new file mode 100644
index 000000000000..b8cc129acc16
--- /dev/null
+++ b/www-apps/hugo/hugo-0.115.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2018-2023 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
+"
+
+# 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 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~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.115.2-skip-some-tests.patch
+)
+
+src_configure() {
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export MY_BUILD_FLAGS="$(usev sass "-tags extended")"
+
+	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}" \
+		${MY_BUILD_FLAGS} -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 "./..." ${MY_BUILD_FLAGS}
+}
+
+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
+}