public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/
@ 2022-06-25  2:50 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-06-25  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     261411be21e0625b89be16ff906e2a2102341406
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Jun  8 00:19:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 02:50:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=261411be

www-apps/hugo: Increase test timeout

The default test page building timeout is 1 minute, that's a bit too low
for slower computers.

Closes: https://bugs.gentoo.org/850313
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-apps/hugo/files/hugo-0.99.1-test-timeout.patch | 25 ++++++++++++++++++++++
 www-apps/hugo/hugo-0.99.1.ebuild                   |  1 +
 2 files changed, 26 insertions(+)

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
new file mode 100644
index 000000000000..dc0f4898fcf6
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch
@@ -0,0 +1,25 @@
+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.99.1.ebuild b/www-apps/hugo/hugo-0.99.1.ebuild
index 1a189d4c142e..1e707075854f 100644
--- a/www-apps/hugo/hugo-0.99.1.ebuild
+++ b/www-apps/hugo/hugo-0.99.1.ebuild
@@ -40,6 +40,7 @@ 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"
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/
@ 2023-01-29  9:14 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2023-01-29  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     573ece1977621f5842d46c4068e6a87f3e0d3afb
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Jan 25 23:34:46 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 09:14:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=573ece19

www-apps/hugo: add 0.110.0

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/hugo/Manifest                             |  4 +-
 .../hugo/files/hugo-0.110.0-skip-some-tests.patch  | 78 ++++++++++++++++++
 www-apps/hugo/hugo-0.110.0.ebuild                  | 96 ++++++++++++++++++++++
 3 files changed, 176 insertions(+), 2 deletions(-)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index b6e7a78f0cae..744804a5a9f4 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,4 +1,4 @@
-DIST hugo-0.107.0-vendor.tar.xz 5736140 BLAKE2B bca854d21e93b9d6296a6a60d61b800db0be9bdec63e8863f4f96266670ada8ee9e7b072234542c3380b24655c8257c44227c534f65d22b3089608fee3dd78a2 SHA512 0b3fe77d67ad739c8162bd2baff405403a50285ff349826cf5f3b83056f36260288f6efd67f313183e9fd0e27568b2ef6a6e3b3c7ac4d07afc11a179bc80b33c
-DIST hugo-0.107.0.tar.gz 29042775 BLAKE2B c03fd0725b3575471eae54549716897a12f83caea62d4c0561531d940529c4a0fae72f29c3a589ec06087a84003a65f6d4914cb9d704360dab67cd362680134a SHA512 39a2b87e18dd91ac0e423f0009434f76c4228b80511233ee742d22964ff2419954e13745b17f0350f64a557c378942a234ca988ce3add7b2ab9127d66c688919
 DIST hugo-0.108.0-vendor.tar.xz 5759708 BLAKE2B 6b3f93b0f29cb57afcb5a2e05ec2dc5ba276cb5d30cd2c3996fbed20fa2a9e8f464e580dd42302819d18b5cc35b2f2ab16e9e11faa175fc1c56591da56c2be31 SHA512 b4baaa6acc227e8d169362c9adcf60c2365413231beedb3ff21d7d7103e2a3d3bb19d30950e68978841de2923b3cc2171474ea3811f0dbcc1e0f173c453a8441
 DIST hugo-0.108.0.tar.gz 29048088 BLAKE2B dd9654985fe0221ddb6b5f74c4d7f3259e587ee71522d6304d102849e63d2abd926987699fd7bac35c1a3bd5c6a195b4308249039d1a86cadae6dad641b75085 SHA512 450030bd657468bcf62de9d60def0c4f977ed4ba4b8ff830eae146622f678fedf656e3637bbdb44ac4289f857f5a1259ea0cfa66a45a14ea92860eee86dbf9fa
+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

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
new file mode 100644
index 000000000000..3ed70afb80e7
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.110.0-skip-some-tests.patch
@@ -0,0 +1,78 @@
+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/hugo-0.110.0.ebuild b/www-apps/hugo/hugo-0.110.0.ebuild
new file mode 100644
index 000000000000..18b6e28bfd59
--- /dev/null
+++ b/www-apps/hugo/hugo-0.110.0.ebuild
@@ -0,0 +1,96 @@
+# 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 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~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.110.0-skip-some-tests.patch
+	"${FILESDIR}"/${PN}-0.99.1-test-timeout.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() {
+	# workaround for mysteriously added -buildmode=pie
+	# <https://github.com/gentoo/gentoo/pull/29069#discussion_r1085026796>
+	MY_BUILDFLAGS="-buildmode=exe ${MY_BUILDFLAGS}"
+	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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/
@ 2023-07-09  8:08 Viorel Munteanu
  0 siblings, 0 replies; 6+ messages in thread
From: Viorel Munteanu @ 2023-07-09  8:08 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/
@ 2023-09-11  9:37 Viorel Munteanu
  0 siblings, 0 replies; 6+ messages in thread
From: Viorel Munteanu @ 2023-09-11  9:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b71e686b8a07ba5e66a951933f3f603f7b4b3197
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Fri Sep  8 18:41:51 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 09:37:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71e686b

www-apps/hugo: add 0.118.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.118.2-skip-some-tests.patch  | 65 ++++++++++++++
 www-apps/hugo/hugo-0.118.2.ebuild                  | 98 ++++++++++++++++++++++
 3 files changed, 165 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index d3e4594b58cd..be5b2f3abdce 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -2,3 +2,5 @@ DIST hugo-0.115.2-vendor.tar.xz 6196068 BLAKE2B 0d98ed1f3553c5eb28ceb66751c36d4b
 DIST hugo-0.115.2.tar.gz 28547893 BLAKE2B 18496be5d24be6b0b34ff88806b6621cb361f61641efd67ed11fd413379107aad029b241a7b8730ad016c1eb1469b29feee7af33fbf0b94bb0f2fbe2a209c1bb SHA512 4c35d5d6699de1e675fa0c1dfca0f2436ac3ab7a0c164e7662400fb7b81b16ed23a6961e297f262273c18ef2eaa551b813c7d99a8634d0687e78343b23f275f6
 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
+DIST hugo-0.118.2-vendor.tar.xz 6633368 BLAKE2B a88e3422828a98ae220805a5853402b62c2b602de03909187a3694b1546a3fb27f9cb39651342039b5031840fd57e6f00152d5ff023628c6d491ee33245d3b24 SHA512 2e617cccf23931ba20dfac703445c63d0bebdf6178c943315dd7d4983b2a4626c1631751e3bbd925a247599af918638161d13b3e2af474e80ec204aa9ad0e2f6
+DIST hugo-0.118.2.tar.gz 19385307 BLAKE2B c5a4e358b37f41cdbadb12df4657570da249fb8ba70f3c18406431cf8a48287d14598e6c36453a53afe156eb2fdd6c177586136f32e1166d23c856a2fab98bc1 SHA512 decda9097ae3e9942524457527ecd2a1d0c8555b5909c676f2bcc16ca5052453a64366f3dbe5eeb2ef0930b65edd52d9963c967cf28f0b149fb410aa5811ac78

diff --git a/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch
new file mode 100644
index 000000000000..66b5bac5ef87
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch
@@ -0,0 +1,65 @@
+From 416992cf1404a78560a5e718a584c5fa1f2f9143 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Fri, 8 Sep 2023 20:01:03 +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 ++++
+ resources/resource_factories/create/integration_test.go | 1 +
+ 2 files changed, 5 insertions(+)
+
+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 140c5d091..721a9fc5b 100644
+--- a/resources/resource_factories/create/integration_test.go
++++ b/resources/resource_factories/create/integration_test.go
+@@ -25,6 +25,7 @@ import (
+ )
+ 
+ func TestGetRemoteHead(t *testing.T) {
++	t.Skip("Requires network access")
+ 
+ 	files := `
+ -- config.toml --
+-- 
+2.41.0
+

diff --git a/www-apps/hugo/hugo-0.118.2.ebuild b/www-apps/hugo/hugo-0.118.2.ebuild
new file mode 100644
index 000000000000..12937987bc02
--- /dev/null
+++ b/www-apps/hugo/hugo-0.118.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.118.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,__disable}.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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/
@ 2023-12-07  6:49 Viorel Munteanu
  0 siblings, 0 replies; 6+ messages in thread
From: Viorel Munteanu @ 2023-12-07  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     a84833498f04997dbb5b7fed790312c5e2bdbbf7
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Dec  6 13:13:48 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 06:49:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8483349

www-apps/hugo: add 0.121.0

Closes: https://bugs.gentoo.org/919134
Signed-off-by: tastytea <gentoo <AT> tastytea.de>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/hugo/Manifest                             |   2 +
 ...hugo-0.121.0-unbundle-libwebp-and-libsass.patch |  43 +++++++++
 www-apps/hugo/hugo-0.121.0.ebuild                  | 101 +++++++++++++++++++++
 3 files changed, 146 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index d8c05af9dda3..7986a720503e 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -2,3 +2,5 @@ DIST hugo-0.118.2-vendor.tar.xz 6633368 BLAKE2B a88e3422828a98ae220805a5853402b6
 DIST hugo-0.118.2.tar.gz 19385307 BLAKE2B c5a4e358b37f41cdbadb12df4657570da249fb8ba70f3c18406431cf8a48287d14598e6c36453a53afe156eb2fdd6c177586136f32e1166d23c856a2fab98bc1 SHA512 decda9097ae3e9942524457527ecd2a1d0c8555b5909c676f2bcc16ca5052453a64366f3dbe5eeb2ef0930b65edd52d9963c967cf28f0b149fb410aa5811ac78
 DIST hugo-0.119.0-vendor.tar.xz 6642728 BLAKE2B 1a7c3d8acb895f01db97b8583d7d578b0ebb422b9763754dc0e3536b0511ed07af8403d826d9a821b587e56c4d1f584392ea158db72c98caaa941a74de1da19a SHA512 8ec40365efa97b0c6d0dd088b0ee2e44a582841b9b9d5938e6408bcf4fb82c4d1909430c414e5642cd9c3305e159ed2495770b4fb710fabafb5c9cd740ac3d53
 DIST hugo-0.119.0.tar.gz 19579413 BLAKE2B f383f28b054fb78f1e8c972ec84d88fcbc6d8902dcdbe4acaaa081fea2c78247b5345faaec93c708fbcf71fee38a781a2c7c213f042568b3bd6b27e3618713d9 SHA512 ce77d60869173d18d46d91e4f23910c709ccabdf81976c1c96177a9fbad965a13a735fafce37f413a40a5af248510e49f8b2da86c1ba4291fb8b3941e91ee5ea
+DIST hugo-0.121.0-vendor.tar.xz 6682060 BLAKE2B 7aabdd97eada6b83e0e7bebe632f7b465a6d87d376e555325e4309eeed7b286a6e4f7bcb1bdab1884328decb25ee1356b438df9fa1f07a6d85aad36fcd3f2f7b SHA512 c7688f7d32fa0b3fbbaffc154b025eda83b24dcbacff94188c80811692a091498e5e8107715e3b24e497ef56d4e9af843a4c5a4a42a6b28a79146ab2c44344b1
+DIST hugo-0.121.0.tar.gz 21036266 BLAKE2B a924e2ad2fc4a5c690bf3bdd2e837add543119632f3055117a73455555bc78996b9f3eeb42c94694135a8f174aced72fea359ca39ca3ed76673b2284dc641d60 SHA512 99566167e74e1eda996ca54b0284a56a1bcd6c69f60d4461faa3bcca2f0c2d499b5e4de806a78576b5ec7691aa6d81fb66b6f088a25255fc9496d1f65d37d2ac

diff --git a/www-apps/hugo/files/hugo-0.121.0-unbundle-libwebp-and-libsass.patch b/www-apps/hugo/files/hugo-0.121.0-unbundle-libwebp-and-libsass.patch
new file mode 100644
index 000000000000..4dcd86a6040f
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.121.0-unbundle-libwebp-and-libsass.patch
@@ -0,0 +1,43 @@
+From 1237c6c59e4fe777b39ee7c543eb4f8b6ce6a6b1 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Wed, 6 Dec 2023 12:37:26 +0100
+Subject: [PATCH] unbundle libwebp and libsass
+
+---
+ .../github.com/bep/golibsass/internal/libsass/a__cgo.go   | 8 ++++----
+ vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go   | 3 ++-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+index 1de9aeeef..fd565d1a9 100644
+--- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
++++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+@@ -4,9 +4,9 @@
+ // license that can be found in the LICENSE file.
+ package libsass
+ 
+-// #cgo CFLAGS: -O2 -fPIC
+-// #cgo CPPFLAGS: -I../../libsass_src/include
+-// #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC
+-// #cgo LDFLAGS: -lstdc++ -lm
++// #cgo CFLAGS: -fPIC
++// #cgo CPPFLAGS: -DUSE_LIBSASS_SRC
++// #cgo CXXFLAGS: -std=c++0x -fPIC
++// #cgo LDFLAGS: -lstdc++ -lm -lsass
+ // #cgo darwin linux LDFLAGS: -ldl
+ import "C"
+diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+index bcf9bacd0..4cc2aa81c 100644
+--- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
++++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+@@ -3,5 +3,6 @@
+ 
+ package libwebp
+ 
+-// #cgo unix LDFLAGS: -lm
++// #cgo unix LDFLAGS: -lm -lwebp
++// #cgo CFLAGS: -DLIBWEBP_NO_SRC
+ import "C"
+-- 
+2.41.0
+

diff --git a/www-apps/hugo/hugo-0.121.0.ebuild b/www-apps/hugo/hugo-0.121.0.ebuild
new file mode 100644
index 000000000000..d3d9d003c7dd
--- /dev/null
+++ b/www-apps/hugo/hugo-0.121.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion
+
+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 +extended test"
+
+BDEPEND="
+	>=dev-lang/go-1.18
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+		virtual/pandoc
+	)
+"
+RDEPEND="
+	extended? (
+		dev-libs/libsass:=
+		>=media-libs/libwebp-1.3.2:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch
+	"${FILESDIR}"/${PN}-0.118.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 extended "-tags extended")"
+
+	default
+}
+
+src_prepare() {
+	# wants to run command that require network access
+	rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u}.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}
+	dofishcomp completions/${PN}.fish
+	dozshcomp completions/_${PN}
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}
+
+pkg_postinst() {
+	elog "the sass USE-flag was renamed to extended. the functionality is the" \
+		"same, except it also toggles the dependency on libwebp (for encoding)"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/
@ 2024-07-10  5:26 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-07-10  5:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b77acceb4a652da2a47d5b325c08cf855e4a2201
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sun Jun 30 08:37:20 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 05:22:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77acceb

www-apps/hugo: add 0.128.2

Signed-off-by: tastytea <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/37369
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/hugo/Manifest                             |   2 +
 .../hugo/files/hugo-0.128.0-skip-some-tests.patch  |  79 ++++++++++++++++
 www-apps/hugo/hugo-0.128.2.ebuild                  | 101 +++++++++++++++++++++
 3 files changed, 182 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 0008abeac299..83ad12bb79ff 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -4,3 +4,5 @@ DIST hugo-0.125.7-vendor.tar.xz 6760028 BLAKE2B 8ced0fc2c9b5b7a73eb11c31e8d94ddc
 DIST hugo-0.125.7.tar.gz 21062939 BLAKE2B 030171ac009c50e85123a3c4c3573da1b81a2696d2f98b51543fb5c28467d1f5416513dad278063590361ea1611735d41d514ce3226a222d32be6fb16e84630d SHA512 e6202026c7918f885abce338ade2e0a59d3a299030fc3b32af65eb434da31ef90647d14294ce1be5b3c66d2cd950b7a1f826094a2bf0e9538285e8cb2717cb91
 DIST hugo-0.127.0-vendor.tar.xz 6747376 BLAKE2B 28569618b1398effe5eeafe72b43576986a9680371100812b546c5c62936754ebc4ecda2c8fea77ec93761b5e3746509b065bd6e1000815135be31a8ba8077c8 SHA512 f88d7a98d2d012e48beb239941a0a485b3ac761b055c7e76b5823550275e19b4ced6977765a7cc34342c5e9113f208793f483794afefa9689c76b3b4dedca94f
 DIST hugo-0.127.0.tar.gz 21132608 BLAKE2B 6fa8ae09d325292715d94f28e13d3bce8efcecc5e729da3644a054857aa3e11893068bd25524857e7dde6bab92efc9acb5b0de823c8a6246b9f5e83b07c4e279 SHA512 829d118f12f153794ed882572a37ec2a3b3ade9c8160a754d3d411d6aede22c15e44dd75a52443e3cc7fc8ea1f65febecac5a47b4e09cc42006d7badd1a0fa2f
+DIST hugo-0.128.2-vendor.tar.xz 6698936 BLAKE2B 28762e61a7e7452545889f31a751dea236f90c352bc63ac0b33a1e8cf0c7d9091d5ccc7cefc2b47f37db7a10f44636d4fbda02af3ca7be2e9cba64b564b85b87 SHA512 7576830db0a9058117ab5ba0c7269d5d75114695183882af5184a79088235a22aad3691e114892f179e107bf06048c6d302019fb0bb85d492715922a772b2224
+DIST hugo-0.128.2.tar.gz 20239793 BLAKE2B 47d75606053e44a0f863dbb88050ff5323e33c1306a47baff237db7fa41dce0559960785105ad8643dcef1eeb149054b5536da168ff978ac0b5c3c5398379b6f SHA512 4710fceb11872577a1d9c929d296dc79829135af0c509ac0b7b8142568b0e907c2de28c9f482cc1138d9595086363397166eb2ca208fa4fdf1beadd168558787

diff --git a/www-apps/hugo/files/hugo-0.128.0-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.128.0-skip-some-tests.patch
new file mode 100644
index 000000000000..409e267fd709
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.128.0-skip-some-tests.patch
@@ -0,0 +1,79 @@
+From 890a1842ce705c56f71ea661d0d0be43e11d5df1 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Fri, 8 Sep 2023 20:01:03 +0200
+Subject: [PATCH] skip some tests
+
+reasons:
+  - needs to be in a git repo
+  - needs special test dependencies
+  - requires network access
+  - is time sensitive
+---
+ common/para/para_test.go                                      | 1 +
+ modules/client_test.go                                        | 4 ++++
+ .../resource_factories/create/create_integration_test.go      | 1 +
+ 3 files changed, 6 insertions(+)
+
+diff --git a/common/para/para_test.go b/common/para/para_test.go
+index 2d9188e..daf0560 100644
+--- a/common/para/para_test.go
++++ b/common/para/para_test.go
+@@ -69,6 +69,7 @@ func TestPara(t *testing.T) {
+ 	})
+ 
+ 	c.Run("Time", func(c *qt.C) {
++        c.Skip("time sensitive")
+ 		const n = 100
+ 
+ 		p := New(5)
+diff --git a/modules/client_test.go b/modules/client_test.go
+index 0ee7e0d..4bb8843 100644
+--- a/modules/client_test.go
++++ b/modules/client_test.go
+@@ -72,6 +72,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)
+@@ -111,6 +112,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
+@@ -129,6 +131,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(
+@@ -148,6 +151,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/create_integration_test.go b/resources/resource_factories/create/create_integration_test.go
+index 1708457..e81f4de 100644
+--- a/resources/resource_factories/create/create_integration_test.go
++++ b/resources/resource_factories/create/create_integration_test.go
+@@ -25,6 +25,7 @@ import (
+ )
+ 
+ func TestGetRemoteHead(t *testing.T) {
++	t.Skip("Requires network access")
+ 	files := `
+ -- config.toml --
+ [security]
+-- 
+2.44.2
+

diff --git a/www-apps/hugo/hugo-0.128.2.ebuild b/www-apps/hugo/hugo-0.128.2.ebuild
new file mode 100644
index 000000000000..b3f3114af58e
--- /dev/null
+++ b/www-apps/hugo/hugo-0.128.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion
+
+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 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="doc +extended test"
+
+BDEPEND="
+	>=dev-lang/go-1.22.2
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+		virtual/pandoc
+	)
+"
+RDEPEND="
+	extended? (
+		dev-libs/libsass:=
+		>=media-libs/libwebp-1.3.2:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch
+	"${FILESDIR}"/${PN}-0.128.0-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 extended "-tags extended")"
+
+	default
+}
+
+src_prepare() {
+	# wants to run command that require network access
+	rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u,_npm{,_withexisting}}.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}
+	dofishcomp completions/${PN}.fish
+	dozshcomp completions/_${PN}
+
+	if use doc ; then
+		dodoc -r doc/*
+	fi
+}
+
+pkg_postinst() {
+	elog "the sass USE-flag was renamed to extended. the functionality is the" \
+		"same, except it also toggles the dependency on libwebp (for encoding)"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-10  5:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-29  9:14 [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/, www-apps/hugo/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-07-10  5:26 Joonas Niilola
2023-12-07  6:49 Viorel Munteanu
2023-09-11  9:37 Viorel Munteanu
2023-07-09  8:08 Viorel Munteanu
2022-06-25  2:50 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox