public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/
@ 2022-02-23 17:04 Michał Górny
  0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2022-02-23 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     912661fb74f3fc0b05bc750956dd84f805c46368
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Mon Feb 21 01:41:28 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 17:03:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912661fb

www-apps/hugo: Version bump 0.92.2

- Repackaged dependencies
- unbundled media-libs/libwebp and dev-libs/libsass.

Closes: https://bugs.gentoo.org/832304
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-apps/hugo/Manifest                             |  2 +
 .../files/hugo-0.92.2-link-to-webp-and-sass.patch  | 38 +++++++++++
 www-apps/hugo/hugo-0.92.2.ebuild                   | 77 ++++++++++++++++++++++
 3 files changed, 117 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index f17bbb295425..f233da127f36 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1144,6 +1144,8 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST hugo-0.91.2.tar.gz 28416583 BLAKE2B 0f7ad7c7029ac42386a8da68d6ea6efd9982500588b7009f49629472793ea8f62a1a7640a11b5038532cc9a714695cdf849e52856d25cb904f49c9deb9113a03 SHA512 0994cc97c858b15991a5d7705a8f2f83154303d1daf4f3b3019e39d8789707875a0b90cd6f41e34bba42f10b9a13c13942ad06ddcd4b4808a4889b031a7b3d8e
 DIST hugo-0.92.1.tar.gz 28554985 BLAKE2B b34c2601f3d60b0169eb88484270fae4fd49d4227ed097ce4d2e7378bb8a214a6d28402bf6500ae50c24db286c0f09e9b56999eb578029f48a5fb43df6e063d8 SHA512 d5041e89293ec75f2f4622fe3b622ed7a2c920512c39a6fac4364f6e8c033130a09043403dae186b71a78a42118820ae88309e404dd788f77a9bf77fe526759f
+DIST hugo-0.92.2-vendor.tar.xz 5607964 BLAKE2B 290e064ed87189503999e54bcf25c18b698cfb64cbb32d73765267bac19a3de53b739c695d40fa6e553e1052cae620cf15fca3e34e18132b2f9ff5389227ddb2 SHA512 23218cd4e68e2f4a0b6fd5f1b86408290f3ccb619ecc694c536ccc9074bd3ab3e6f68a14189abdd44ec9761f85901cb2c3ae072a98f292a82f00276e763cbe32
+DIST hugo-0.92.2.tar.gz 28559963 BLAKE2B 05d486aa490d9c9350353cb32f1c64133a8c358584efbdc82290e13e963620bf3984ccdf8cd8c6f93216f71e03c061659d5ef4904c35c030c62f1c43d64549dd SHA512 4a4c8ab730c1cc839e3e15a29b1200fa969402efa40774022a70fae11d98819173f6002ed3ee4a84ce1148c0744c82ce16ee0fec409935a903130ae71d62ba24
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863

diff --git a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch b/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
new file mode 100644
index 000000000000..bda6f9bcc3f2
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
@@ -0,0 +1,38 @@
+From b1c99224dc0d318109832531c98ec24ef4c0020e Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Wed, 23 Feb 2022 14:00:36 +0100
+Subject: [PATCH] Link to webp and sass
+
+We need to add the flags because we unbundle media-libs/libwebp and
+dev-libs/libsass.
+---
+ vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go | 2 +-
+ vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go    | 2 +-
+ 2 files changed, 2 insertions(+), 2 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 af51b92..979d9e7 100644
+--- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
++++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+@@ -8,6 +8,6 @@ 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 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 4b105ab..cec2faa 100644
+--- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
++++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+@@ -2,5 +2,5 @@
+ 
+ package libwebp
+ 
+-// #cgo linux LDFLAGS: -lm
++// #cgo linux LDFLAGS: -lm -lwebp
+ import "C"
+-- 
+2.34.1
+

diff --git a/www-apps/hugo/hugo-0.92.2.ebuild b/www-apps/hugo/hugo-0.92.2.ebuild
new file mode 100644
index 000000000000..851d5d9e67b6
--- /dev/null
+++ b/www-apps/hugo/hugo-0.92.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module bash-completion-r1
+
+DESCRIPTION="The world's fastest framework for building websites"
+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/${P}-vendor.tar.xz
+"
+
+# NOTE: To create the vendor tarball, run:
+# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +sass"
+
+BDEPEND=">=dev-lang/go-1.16.0"
+RDEPEND="
+	media-libs/libwebp
+	sass? ( dev-libs/libsass )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" )
+
+src_configure() {
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+
+	default
+}
+
+src_compile() {
+	mkdir -pv bin || die
+	local my_import_path="github.com/gohugoio/hugo/common"
+	local mybuildtags="-tags $(usev sass "extended,")nodeploy"
+	go build -ldflags \
+		"-X ${my_import_path}/hugo.buildDate=$(date --iso-8601=seconds) -X ${my_import_path}/hugo.vendorInfo=Gentoo" \
+		${mybuildtags} -o "${S}/bin/hugo" || die
+
+	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_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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/
@ 2022-04-11 13:12 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-04-11 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e952001587955e058a35908e0c0ff6eb93d9a2dd
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Tue Mar 29 17:54:10 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 13:12:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9520015

www-apps/hugo: add 0.96.0, enable tests

- Enable tests
- Improve unbundling patch
- Don't set buildDate, it is expected to be the time of the git revision
  <https://github.com/gohugoio/hugo/commit/64afb7c>
- Add PVR to vendorInfo to match upstreams expectations
  <https://github.com/gohugoio/hugo/commit/e8df097>

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

 www-apps/hugo/Manifest                             |   2 +
 .../hugo/files/hugo-0.96.0-skip-some-tests.patch   | 120 +++++++++++++++++++++
 .../hugo-0.96.0-unbundle-libwebp-and-libsass.patch |  44 ++++++++
 www-apps/hugo/hugo-0.96.0.ebuild                   |  98 +++++++++++++++++
 4 files changed, 264 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 344172428384..d9c3ee4c6a96 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -2,3 +2,5 @@ DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47
 DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e
 DIST hugo-0.95.0-vendor.tar.xz 4781084 BLAKE2B ead2d42b615fa838995853df38c304c63baccb109f32b5034449cb64c8edacb78e5fac615f2018e8d4acb693f83df0abaa73bc511f5ba31b3a30bdec476420b1 SHA512 941061396433a20b524694c8dd2838d84454fbee98c48aa2860881fd9b31b6d480d22f6fd54bd2e17f1f90b1c9e6c3c5813682131fd01c7d3eabc063dcbb01b2
 DIST hugo-0.95.0.tar.gz 27859168 BLAKE2B 3667ab14c19f586d0f45b76072786a49f2448367cdf4151df2b44a329a57047544dcbbe4db8774433cf2042024c17ccca3269f5eeb508392aed00d31955de55a SHA512 fbe43fc9698325c380d7e7499ee726aba448eebba087f7bdc7cdf14d01e0649869359c07fefaa9a0d9623c910523b82efc2a2b57e152d391443e2b890a29affb
+DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d
+DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde

diff --git a/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch
new file mode 100644
index 000000000000..6f09d1c39660
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.96.0-skip-some-tests.patch
@@ -0,0 +1,120 @@
+From fb829c60a028067b940aaf268362017a73d40e84 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Tue, 29 Mar 2022 22:28:13 +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 ++++
+ releaser/git_test.go                                          | 3 +++
+ .../resource_transformers/tocss/dartsass/integration_test.go  | 1 +
+ .../resource_transformers/tocss/scss/integration_test.go      | 1 +
+ 5 files changed, 10 insertions(+)
+
+diff --git a/hugolib/page_test.go b/hugolib/page_test.go
+index d29a4f8..7cdff73 100644
+--- a/hugolib/page_test.go
++++ b/hugolib/page_test.go
+@@ -1025,6 +1025,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/releaser/git_test.go b/releaser/git_test.go
+index ff77eb8..1f40a6f 100644
+--- a/releaser/git_test.go
++++ b/releaser/git_test.go
+@@ -20,6 +20,7 @@ import (
+ )
+ 
+ func TestGitInfos(t *testing.T) {
++	t.Skip("We are not in a git repo")
+ 	c := qt.New(t)
+ 	skipIfCI(t)
+ 	infos, err := getGitInfos("v0.20", "hugo", "", false)
+@@ -58,6 +59,7 @@ Streets #20.
+ }
+ 
+ func TestGitVersionTagBefore(t *testing.T) {
++	t.Skip("We are not in a git repo")
+ 	skipIfCI(t)
+ 	c := qt.New(t)
+ 	v1, err := gitVersionTagBefore("v0.18")
+@@ -66,6 +68,7 @@ func TestGitVersionTagBefore(t *testing.T) {
+ }
+ 
+ func TestTagExists(t *testing.T) {
++	t.Skip("We are not in a git repo")
+ 	skipIfCI(t)
+ 	c := qt.New(t)
+ 	b1, err := tagExists("v0.18")
+diff --git a/resources/resource_transformers/tocss/dartsass/integration_test.go b/resources/resource_transformers/tocss/dartsass/integration_test.go
+index a1ac1d5..fcd8bf5 100644
+--- a/resources/resource_transformers/tocss/dartsass/integration_test.go
++++ b/resources/resource_transformers/tocss/dartsass/integration_test.go
+@@ -106,6 +106,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 cbc7e19..f2a6034 100644
+--- a/resources/resource_transformers/tocss/scss/integration_test.go
++++ b/resources/resource_transformers/tocss/scss/integration_test.go
+@@ -111,6 +111,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.96.0-unbundle-libwebp-and-libsass.patch b/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch
new file mode 100644
index 000000000000..f9efee48cc48
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.96.0-unbundle-libwebp-and-libsass.patch
@@ -0,0 +1,44 @@
+From 0a44245bf6cfe103bb163f51f230eeccd69ab8c7 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Tue, 29 Mar 2022 21:03:15 +0200
+Subject: [PATCH] Unbundle libwebp and libsass
+
+Use libwebp and libsass from the system instead of the bundled ones.
+---
+ .../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 af51b92..6b5e78b 100644
+--- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
++++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+@@ -5,9 +5,9 @@
+ //
+ 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 4b105ab..33f429e 100644
+--- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
++++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+@@ -2,5 +2,6 @@
+ 
+ package libwebp
+ 
+-// #cgo linux LDFLAGS: -lm
++// #cgo linux LDFLAGS: -lm -lwebp
++// #cgo CFLAGS: -DLIBWEBP_NO_SRC
+ import "C"
+-- 
+2.35.1
+

diff --git a/www-apps/hugo/hugo-0.96.0.ebuild b/www-apps/hugo/hugo-0.96.0.ebuild
new file mode 100644
index 000000000000..03c50c742f9a
--- /dev/null
+++ b/www-apps/hugo/hugo-0.96.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module bash-completion-r1 optfeature
+
+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/${P}-vendor.tar.xz
+"
+
+# NOTE: To create the vendor tarball, run:
+# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +sass test"
+
+BDEPEND="
+	>=dev-lang/go-1.18
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+	)
+"
+RDEPEND="
+	media-libs/libwebp:=
+	sass? ( dev-libs/libsass:= )
+"
+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"
+)
+
+pkg_setup() {
+	if use test; then
+		optfeature_header "Install additional packages for optional tests:"
+		optfeature "pandoc converter tests" "app-text/pandoc"
+	fi
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/
@ 2022-06-06 20:12 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-06-06 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     1e4957ba57761a10f7b55ee08218e4dd2821bb23
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Fri May 27 11:59:17 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 20:12:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4957ba

www-apps/hugo: add 0.99.1

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

 www-apps/hugo/Manifest                             |  2 +
 .../hugo-0.99.1-fix-testdecodeconfig-basic.patch   | 39 +++++++++
 www-apps/hugo/hugo-0.99.1.ebuild                   | 93 ++++++++++++++++++++++
 3 files changed, 134 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 3fa008d8ed0a..90d82f5ec2d5 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -4,3 +4,5 @@ DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719
 DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde
 DIST hugo-0.98.0-vendor.tar.xz 5675060 BLAKE2B d876207dfc7c13ff97249bf72bf5191a0d4adbf82af38b8962a8e66d922f5bdf5298c8ecddb05c8a1d13f95f9e8bbbb84dec8cc37538ad47d8d83da951dfa003 SHA512 7b67920c8adcc8aea3a3dd6880716a79df8081cca17bf2d8cbd0ca3861aa69c29b0320eb86e0942db32e362b22faaade7cb65c9a0e0f88578504bfe4ed666d63
 DIST hugo-0.98.0.tar.gz 27716005 BLAKE2B b3cbc9c616eb79a993bd9ddf07658ff1d3ce0680d3788e37cab78dfb48b33a259514b417d3e657afe89f188b3c0c03b88108dbcbd44d80c4d97004f7aa0185b0 SHA512 9d8a65c49be5b7bb181627bd8b557ddc041dc00a673ac0af8aeacbbfc46441a0045a5ab531087fb866d076297d67823a2eb5b14f57f3ecf57cc7b9e6b90ddf3a
+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

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
new file mode 100644
index 000000000000..5221b86c04fa
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch
@@ -0,0 +1,39 @@
+# 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.99.1.ebuild b/www-apps/hugo/hugo-0.99.1.ebuild
new file mode 100644
index 000000000000..1a189d4c142e
--- /dev/null
+++ b/www-apps/hugo/hugo-0.99.1.ebuild
@@ -0,0 +1,93 @@
+# 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
+"
+
+# 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 ~x86"
+IUSE="doc +sass test test-full"
+
+BDEPEND="
+	>=dev-lang/go-1.18
+	test? (
+		dev-python/docutils
+		dev-ruby/asciidoctor
+		test-full? ( app-text/pandoc )
+	)
+"
+RDEPEND="
+	media-libs/libwebp:=
+	sass? ( dev-libs/libsass:= )
+"
+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"
+)
+
+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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/
@ 2022-06-06 20:12 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-06-06 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f3890607c39c4e79f7679afb5b04cd23bc02619b
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Fri May 27 12:58:04 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 20:12:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3890607

www-apps/hugo: drop 0.93.3, 0.96.0, old patch

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

 www-apps/hugo/Manifest                             |  4 -
 .../files/hugo-0.92.2-link-to-webp-and-sass.patch  | 38 ---------
 www-apps/hugo/hugo-0.93.3.ebuild                   | 77 ------------------
 www-apps/hugo/hugo-0.96.0.ebuild                   | 92 ----------------------
 4 files changed, 211 deletions(-)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 90d82f5ec2d5..3cc46dbf0338 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,7 +1,3 @@
-DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47f9e3aa25240ed6cc9ed9e7faef7425b3f7bdd03293023f103a0b8927ecbdf7fe3d9f36f5a66db580dfc8f0ddb9dc310 SHA512 6c93a8435552553079e856f8a74eef76e23ab7343e6e65ac83f9f1675c5fe44547f5d3f700656c0e666bc668792be38e343cfaebbfb23b5ece28ddfa0896755c
-DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e
-DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d
-DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde
 DIST hugo-0.98.0-vendor.tar.xz 5675060 BLAKE2B d876207dfc7c13ff97249bf72bf5191a0d4adbf82af38b8962a8e66d922f5bdf5298c8ecddb05c8a1d13f95f9e8bbbb84dec8cc37538ad47d8d83da951dfa003 SHA512 7b67920c8adcc8aea3a3dd6880716a79df8081cca17bf2d8cbd0ca3861aa69c29b0320eb86e0942db32e362b22faaade7cb65c9a0e0f88578504bfe4ed666d63
 DIST hugo-0.98.0.tar.gz 27716005 BLAKE2B b3cbc9c616eb79a993bd9ddf07658ff1d3ce0680d3788e37cab78dfb48b33a259514b417d3e657afe89f188b3c0c03b88108dbcbd44d80c4d97004f7aa0185b0 SHA512 9d8a65c49be5b7bb181627bd8b557ddc041dc00a673ac0af8aeacbbfc46441a0045a5ab531087fb866d076297d67823a2eb5b14f57f3ecf57cc7b9e6b90ddf3a
 DIST hugo-0.99.1-vendor.tar.xz 5675228 BLAKE2B 80fdd25fe924bcde7f200b805bf6598dbb726bb628b82e9b0d2809414a7a6e33cbfe069e29953e75b8ed4ecdb9c7303b44a8d8195b43540977cd7461295de109 SHA512 88ffb6bea777e3a72dac05941de542acdc6a17faff9e98517e483e17c7a42d1ab5aa7e65ed3a91f6832468d2da3e98e87346118694a8e20f6375fad56d5d7ff0

diff --git a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch b/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
deleted file mode 100644
index bda6f9bcc3f2..000000000000
--- a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b1c99224dc0d318109832531c98ec24ef4c0020e Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Wed, 23 Feb 2022 14:00:36 +0100
-Subject: [PATCH] Link to webp and sass
-
-We need to add the flags because we unbundle media-libs/libwebp and
-dev-libs/libsass.
----
- vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go | 2 +-
- vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go    | 2 +-
- 2 files changed, 2 insertions(+), 2 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 af51b92..979d9e7 100644
---- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
-+++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
-@@ -8,6 +8,6 @@ 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 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 4b105ab..cec2faa 100644
---- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
-+++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
-@@ -2,5 +2,5 @@
- 
- package libwebp
- 
--// #cgo linux LDFLAGS: -lm
-+// #cgo linux LDFLAGS: -lm -lwebp
- import "C"
--- 
-2.34.1
-

diff --git a/www-apps/hugo/hugo-0.93.3.ebuild b/www-apps/hugo/hugo-0.93.3.ebuild
deleted file mode 100644
index 7dd2072578ca..000000000000
--- a/www-apps/hugo/hugo-0.93.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-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/${P}-vendor.tar.xz
-"
-
-# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass"
-
-BDEPEND=">=dev-lang/go-1.16.0"
-RDEPEND="
-	media-libs/libwebp
-	sass? ( dev-libs/libsass )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" )
-
-src_configure() {
-	export CGO_ENABLED=1
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-
-	default
-}
-
-src_compile() {
-	mkdir -pv bin || die
-	local my_import_path="github.com/gohugoio/hugo/common"
-	local mybuildtags="-tags $(usev sass "extended,")nodeploy"
-	ego build -ldflags \
-		"-X ${my_import_path}/hugo.buildDate=$(date --iso-8601=seconds) -X ${my_import_path}/hugo.vendorInfo=Gentoo" \
-		${mybuildtags} -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_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
-}

diff --git a/www-apps/hugo/hugo-0.96.0.ebuild b/www-apps/hugo/hugo-0.96.0.ebuild
deleted file mode 100644
index 50ae5b3634cf..000000000000
--- a/www-apps/hugo/hugo-0.96.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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/${P}-vendor.tar.xz
-"
-
-# NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass test test-full"
-
-BDEPEND="
-	>=dev-lang/go-1.18
-	test? (
-		dev-python/docutils
-		dev-ruby/asciidoctor
-		test-full? ( app-text/pandoc )
-	)
-"
-RDEPEND="
-	media-libs/libwebp:=
-	sass? ( dev-libs/libsass:= )
-"
-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"
-)
-
-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
-}


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

commit:     374fb3fa4fe3cf2e6ce68b784ffd469fcdf633b2
Author:     Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Oct  5 11:20:25 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 10:52:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=374fb3fa

www-apps/hugo: add 0.104.3

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

 www-apps/hugo/Manifest                             |  2 +
 .../hugo/files/hugo-0.104.3-skip-some-tests.patch  | 91 +++++++++++++++++++++
 .../hugo-0.99.1-fix-testdecodeconfig-basic.patch   | 39 ---------
 www-apps/hugo/hugo-0.104.3.ebuild                  | 95 ++++++++++++++++++++++
 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
+}


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

commit:     fb065376fd2d00089cbd01c670876bff6904cc86
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Sun Jul 23 15:40:34 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 06:39:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb065376

www-apps/hugo: drop 0.111.3

Signed-off-by: tastytea <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/31897
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/hugo/Manifest                             |  2 -
 .../hugo/files/hugo-0.110.0-skip-some-tests.patch  | 78 ------------------
 www-apps/hugo/files/hugo-0.99.1-test-timeout.patch | 25 ------
 www-apps/hugo/hugo-0.111.3.ebuild                  | 92 ----------------------
 4 files changed, 197 deletions(-)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index d70be6e6c098..d3e4594b58cd 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,5 +1,3 @@
-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
 DIST hugo-0.115.4-vendor.tar.xz 6193628 BLAKE2B 427dc6c66a726ff944b0c782b443a6ae3d3ec1b916127db33ebb6789dc1a8271daf00a3bf47f4fbd4f18fc01648b632c5ad9978237d4a11aac0c30406626c107 SHA512 57d3a421eec9909995453aad032f7775722e6ea72c344a31337c62c0aa7b4b669cf5ba5229e3f6819845eed03712e9972328c13c14f93bee0b97a5392b49779b

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.111.3.ebuild
deleted file mode 100644
index 7eb297bafecd..000000000000
--- a/www-apps/hugo/hugo-0.111.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.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}"
-	export MY_BUILD_FLAGS="$(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_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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/
@ 2023-10-19 17:23 Viorel Munteanu
  0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2023-10-19 17:23 UTC (permalink / raw
  To: gentoo-commits

commit:     705dc1c77f909c171cc3771a275d88d403dd802d
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Oct 18 09:35:03 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 17:23:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705dc1c7

www-apps/hugo: drop 0.115.4

Signed-off-by: tastytea <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/33388
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.4.ebuild                  |  98 ---------------
 3 files changed, 238 deletions(-)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 0faa16527bf6..d8c05af9dda3 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,5 +1,3 @@
-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
 DIST hugo-0.119.0-vendor.tar.xz 6642728 BLAKE2B 1a7c3d8acb895f01db97b8583d7d578b0ebb422b9763754dc0e3536b0511ed07af8403d826d9a821b587e56c4d1f584392ea158db72c98caaa941a74de1da19a SHA512 8ec40365efa97b0c6d0dd088b0ee2e44a582841b9b9d5938e6408bcf4fb82c4d1909430c414e5642cd9c3305e159ed2495770b4fb710fabafb5c9cd740ac3d53

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
deleted file mode 100644
index a078a7793265..000000000000
--- a/www-apps/hugo/files/hugo-0.115.2-skip-some-tests.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-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.4.ebuild b/www-apps/hugo/hugo-0.115.4.ebuild
deleted file mode 100644
index b8cc129acc16..000000000000
--- a/www-apps/hugo/hugo-0.115.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/
@ 2024-02-22 15:02 Viorel Munteanu
  0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2024-02-22 15:02 UTC (permalink / raw
  To: gentoo-commits

commit:     96865bb3ba35ade3fa643004326b6392cfca90d0
Author:     tastytea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Tue Feb 20 19:19:30 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 14:52:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96865bb3

www-apps/hugo: add 0.123.0

Signed-off-by: tastytea <gentoo <AT> tastytea.de>
Closes: https://github.com/gentoo/gentoo/pull/35447
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-apps/hugo/Manifest                             |   2 +
 .../hugo/files/hugo-0.123.0-skip-some-tests.patch  |  65 +++++++++++++
 www-apps/hugo/hugo-0.123.0.ebuild                  | 101 +++++++++++++++++++++
 3 files changed, 168 insertions(+)

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 3640d510a87e..e3f2d13edafe 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -2,3 +2,5 @@ DIST hugo-0.121.0-vendor.tar.xz 6682060 BLAKE2B 7aabdd97eada6b83e0e7bebe632f7b46
 DIST hugo-0.121.0.tar.gz 21036266 BLAKE2B a924e2ad2fc4a5c690bf3bdd2e837add543119632f3055117a73455555bc78996b9f3eeb42c94694135a8f174aced72fea359ca39ca3ed76673b2284dc641d60 SHA512 99566167e74e1eda996ca54b0284a56a1bcd6c69f60d4461faa3bcca2f0c2d499b5e4de806a78576b5ec7691aa6d81fb66b6f088a25255fc9496d1f65d37d2ac
 DIST hugo-0.121.2-vendor.tar.xz 6683208 BLAKE2B d4be99aaf686c79cfda28c3ed4d1023b5012f57375835dfca0311761dfc2a47499dc5095d64d010c111a2e09dec92741e6b7bea0f81900749778c0a403c255c2 SHA512 c15d37d0b07cc57425b1be3fdcaf887e13b38e911b355691fae3ba505eed4041dd6fc8c28925d71a4f8fd89900b8d9da105aa489c72109826611aca36dcb88b7
 DIST hugo-0.121.2.tar.gz 21074668 BLAKE2B 06e42bcba49e9e2329ae1b76cc76caf2ac83e13f067533e07cd5471c064ecc402fb7cffaa21df4e20514d96bcfb7f16b4ff078ab23b84506a4ccfc423b21afca SHA512 717da396fa887995e455c1cc7cfc21c535583ba70cb90bcb15ea47e389aa636e9ffa4f66b28bf313f225579e40bc2864ef9da6ebf00d006b3a1ca68f38a47673
+DIST hugo-0.123.0-vendor.tar.xz 6613120 BLAKE2B 4ccf23139eea6cf3d262092234735b9c8faa705b4ffeead73f439ea3703579c3287b82304b201b0ac9d6457c30c9105b77d6ef7916f7a6a814f8763f7c65453a SHA512 21911b4c15e4fd1241f5aaedd307240ca1e90f5fed25363d4cea410c31259fae5d41a6f3a6feaad6a22c596f6aec69095ed11b2194735aeac2a2c8412fdf8042
+DIST hugo-0.123.0.tar.gz 21034964 BLAKE2B 0d1c22d7e8ce71f574cefb1209da82a3de93e6d162ed19cfa950acc159514e5dbc2bd21a6b6116887408a4a257e9f36d6a4a8ad5bb64d5c44db60eccb3238702 SHA512 8835b620d480e86df3a315b101d131b3defde29b21628ba48fe805c1af2625600a5c0fe64ebbab48c8ca56310d5d3aae3c98c27f116a5044ce171a68c072006d

diff --git a/www-apps/hugo/files/hugo-0.123.0-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.123.0-skip-some-tests.patch
new file mode 100644
index 000000000000..c6b075998caf
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.123.0-skip-some-tests.patch
@@ -0,0 +1,65 @@
+From 1a3938e8c133573f35abe58edd42204575aeffeb 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 ++++
+ .../resource_factories/create/create_integration_test.go      | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/modules/client_test.go b/modules/client_test.go
+index ea910580f..b957ba984 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/create_integration_test.go b/resources/resource_factories/create/create_integration_test.go
+index 61bc17adb..13cd6f33f 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.43.0
+

diff --git a/www-apps/hugo/hugo-0.123.0.ebuild b/www-apps/hugo/hugo-0.123.0.ebuild
new file mode 100644
index 000000000000..f7559ea691b9
--- /dev/null
+++ b/www-apps/hugo/hugo-0.123.0.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.21.6
+	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.123.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] 8+ messages in thread
end of thread, other threads:[~2024-02-22 15:02 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-15 10:52 [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-02-22 15:02 Viorel Munteanu
2023-10-19 17:23 Viorel Munteanu
2023-07-24  6:39 Viorel Munteanu
2022-06-06 20:12 Joonas Niilola
2022-06-06 20:12 Joonas Niilola
2022-04-11 13:12 Joonas Niilola
2022-02-23 17:04 Michał Górny

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