From f7dbd7518022615cf302931eb062eea56145d71d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Sep 2023 16:38:38 +0100 Subject: gentoo auto-resync : 11:09:2023 - 16:38:38 --- www-apps/hugo/Manifest | 7 +- .../hugo/files/hugo-0.118.2-skip-some-tests.patch | 65 ++++++++++++++ www-apps/hugo/hugo-0.115.2.ebuild | 98 ---------------------- www-apps/hugo/hugo-0.118.2.ebuild | 98 ++++++++++++++++++++++ 4 files changed, 167 insertions(+), 101 deletions(-) create mode 100644 www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch delete mode 100644 www-apps/hugo/hugo-0.115.2.ebuild create mode 100644 www-apps/hugo/hugo-0.118.2.ebuild (limited to 'www-apps/hugo') diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest index 9152653cb0f2..fb767bdb9ab3 100644 --- a/www-apps/hugo/Manifest +++ b/www-apps/hugo/Manifest @@ -1,9 +1,10 @@ AUX hugo-0.115.2-skip-some-tests.patch 4709 BLAKE2B c2bfd236e2317f9539dcb96729448f8409e98c317a79ca5ae74e77e38abd7389907aa5f3d3e90e973a76d6fbc39b5290e52a515b196adc46551cebd1323c47ba SHA512 628aac535143f993fbd4c205e40cdb2ee8b33b7e0fb484dba64e5fb69822e680138742c9124e20437620d1463cb13a9b9216e890fcd927f6c98423d5183c0b86 +AUX hugo-0.118.2-skip-some-tests.patch 2164 BLAKE2B 356a2b9b87a618178dd54bd066166761dd6bd670749c25bfc351ea9eeccdc5ae62211f5b0a7a61012f163925b536c820b8387db9d96f3371af50032a395d1f52 SHA512 329a36f69e8b279bb1fb431414b40b394ae1679b077bee3ff1c02ade257173cb9b53f671753ba66ad55565b00e26388b218055ce2a3c8274d03c860cffa7ecbd AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538 -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 DIST hugo-0.115.4.tar.gz 28554509 BLAKE2B b0a8776580b60af5b4e8d023ed2c046fec1d508eaef568fa06f8591653e0f3a2e1bb65352328de421353c02a5856a6cc713d15b6189184150fabc6a5d3a152b9 SHA512 b5a00aa6601a6df2d1cc9244899b26abdc92e0b57d7431409b483e1bbd892a8026b181f2b9dbe273385b5ca95c3564ca6128afa54d33cbda584946eba20d2eb5 -EBUILD hugo-0.115.2.ebuild 2139 BLAKE2B 212e7aa41f17581715b6638039bf2653a2214f0f6e32be73c366a058f9f5a70e1fc65d046e9a2b743360ee3c7963869b92cd06c6251de2cac6d64412c114a2bb SHA512 750a2662ad7268ddf25f55dc4d4addc0ca5bda526fa3ca5ea7fef86e7c88e61d3c07b86cba96cfe35c6eaa889822103a0bde081956871b587aab08d9d165cf1b +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 EBUILD hugo-0.115.4.ebuild 2139 BLAKE2B 212e7aa41f17581715b6638039bf2653a2214f0f6e32be73c366a058f9f5a70e1fc65d046e9a2b743360ee3c7963869b92cd06c6251de2cac6d64412c114a2bb SHA512 750a2662ad7268ddf25f55dc4d4addc0ca5bda526fa3ca5ea7fef86e7c88e61d3c07b86cba96cfe35c6eaa889822103a0bde081956871b587aab08d9d165cf1b +EBUILD hugo-0.118.2.ebuild 2149 BLAKE2B 51a4c3b9735af1e6eb9b3a1b3580080d415cd73139b82965d4a241e9ae7f418dff9f5036ef8bc0c7fd9c47887feb520146a961edd0271d7f79be00e7d7013bed SHA512 92454433060dfc60c0f6b7c83eaf15be5a80ed73594e8f3a2237fbf0f0f97b05090a61495ee275d7ce8f11cf517067e9951b7776d3cada8d478e637c0c79ebd5 MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540 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 +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.115.2.ebuild b/www-apps/hugo/hugo-0.115.2.ebuild deleted file mode 100644 index b8cc129acc16..000000000000 --- a/www-apps/hugo/hugo-0.115.2.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 -} 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 +} -- cgit v1.2.3