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 <tasty...@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 <tasty...@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 -}
