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?= + <[email protected]> +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 +}
