diff options
Diffstat (limited to 'www-apps/hugo')
-rw-r--r-- | www-apps/hugo/Manifest | 22 | ||||
-rw-r--r-- | www-apps/hugo/files/hugo-0.128.0-skip-some-tests.patch (renamed from www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch) | 44 | ||||
-rw-r--r-- | www-apps/hugo/hugo-0.127.0.ebuild (renamed from www-apps/hugo/hugo-0.124.1.ebuild) | 2 | ||||
-rw-r--r-- | www-apps/hugo/hugo-0.129.0.ebuild (renamed from www-apps/hugo/hugo-0.125.4.ebuild) | 30 | ||||
-rw-r--r-- | www-apps/hugo/hugo-0.131.0.ebuild (renamed from www-apps/hugo/hugo-0.121.2.ebuild) | 36 | ||||
-rw-r--r-- | www-apps/hugo/metadata.xml | 9 |
6 files changed, 99 insertions, 44 deletions
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest index 3f6e62f1f728..aa1a0b65323d 100644 --- a/www-apps/hugo/Manifest +++ b/www-apps/hugo/Manifest @@ -1,13 +1,13 @@ -AUX hugo-0.118.2-skip-some-tests.patch 2164 BLAKE2B 356a2b9b87a618178dd54bd066166761dd6bd670749c25bfc351ea9eeccdc5ae62211f5b0a7a61012f163925b536c820b8387db9d96f3371af50032a395d1f52 SHA512 329a36f69e8b279bb1fb431414b40b394ae1679b077bee3ff1c02ade257173cb9b53f671753ba66ad55565b00e26388b218055ce2a3c8274d03c860cffa7ecbd AUX hugo-0.121.0-unbundle-libwebp-and-libsass.patch 1541 BLAKE2B 37abecfdb87ff25f28730ac8cba4f9674e5dd46ef0f1152911ced81d894cb334903e6d09b948feb965e6ca466d17289b201f0118b8b6d4147f82bd4fe4a3db9d SHA512 0025d6e69893ce88fd3f6b508f223b4604e54791ca4a635e2cde786a83b78a25265ed07f586e115d0923363f2b73c82528717375b2008593f29d3bd8f5dc98a7 AUX hugo-0.123.0-skip-some-tests.patch 2214 BLAKE2B 418bc4c0eb04355e57420fc47930d154d1f019160607c8ac5e7e2707263c851403902cac7fbc85b297ffca294ce88b75dbd8b0c9507e8c12e7a7913e10137a79 SHA512 26f0f9a33661cebaeaf3fc1e02e83d50c219448012bb361fd08e9a4f9e1dac6a9bda86942506622560a9df74613fd8290e6b8c053ec946073d3db5de2c70e063 -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.124.1-vendor.tar.xz 6740828 BLAKE2B e34cb50eeb22da5f50c8ba7e1318d0f080e6df36f2f1a80e1567d4ccfdd30e4e2ad2153a87c7a18a1d2d6f1e746b5b6c1008d33e41e1900a7e94a42618c5e526 SHA512 2f59a7f2ab199bac5ebf69139b7cc6dd14dc07eab9be39fc39ee5fa41d3332000082407612528d8215a4ebc3a908f28816b19672a28b00bcbad275bea0a9ad35 -DIST hugo-0.124.1.tar.gz 21052060 BLAKE2B 41bd17c3aaf1f137de41957dea049b3d7cdaf101d5bfa128e9412b5ea4eee54a0d30481c059b6982c1b803bbe6634643debf1022079320e653dbb37002f7ea35 SHA512 29f51a08f9e757a716c2f7845efc08b1ca3b0bf8e70fd06491735a123ca7da8e169116fa003c147be08d2d5f9752473e9a569085728ec0a9ed7850bd57ba8f93 -DIST hugo-0.125.4-vendor.tar.xz 6722504 BLAKE2B ceccdb09cb41d730e398664f0fae64067e5043f2b63601917f54b8a34b91a761eccca1abe3789287b071948dc971bc97877120e742720384dec8bdcc768a6f6f SHA512 5f2c76478eedadee6a431b17daabc532a0e641c85115900847193ef6be177daa33b3f95023fd0e9c5091e29ed87f406d5c2bc1be69de900fabe8f509496d433e -DIST hugo-0.125.4.tar.gz 21063288 BLAKE2B 688feac45a0b9c5c7876d28e23b4e1412f4795e866bd1baa06a79f30fe482aea9f7f40a24088c9c252b2528036bd41f3a84c3cb61aa942cf5c56fd9249c000eb SHA512 f76b85e0cb119fa35b8c253ddb05c9f8156aba004b1ec37e0b04d89afa6dec3771417c843594d076c81b1663d0a7677912f9b37ab3ef89ae13824973e6496097 -EBUILD hugo-0.121.2.ebuild 2278 BLAKE2B e26b3d40a1936efdf93c7041fbcf41bcd47261870a8d47ef8043c7f65a2066082a3697c73851aaa80641fcfe0e9c675f721ea29255ca2868cd9abe0427baa254 SHA512 10d1d1827260e33e4e2bc47ed905013398a1cca2efabfe962d25ed1154995d088471fa3ded005a8f3ee35984549d1ec3679a5e88c58e7092f985b36c6491bd78 -EBUILD hugo-0.124.1.ebuild 2299 BLAKE2B 4423386eee760868733688f1045f6ec9bd205af1fbbc678881086feca6ace244a9d7a9db752b744a1af71d2ebae7a61447589409c1f27770c7e4ab1616798e37 SHA512 b7c5c0a3e6691599c2c3cd61cc686804eca701175372bea4412c45e1779693e6e61302fe88e6e7ddbb748f690f6cffac1c289d8edce919854bd0da72b8c522fc -EBUILD hugo-0.125.4.ebuild 2300 BLAKE2B feef967f1a7653abfa9faebfa3ecfc4a823434623b0d2d87ebf12a2b77e53685534d205808b1985c7158a7226dde8c4ec18e1077681ccbac9cb35b57de3a798d SHA512 828eeb7e0bcb7417c24e977d27e6f6001649858284fa2031e68f72eae6159b7d6908c2134b42c5216ae17e770333cfad0dd696d04a7d82bc2d1fd00c4fedfaff -MISC metadata.xml 747 BLAKE2B 41237356c5a48ebde4e351ac73bb1da54fd9553e3949d1abae2f48b5ea193b26d960cb3f01c8fbcf68c7d58d923af6b01e2e629a296daea0b96afb8ad0d93c1b SHA512 ee24abfa9f0c2bda3d4d02339dbe63da7d9753783f7a356c56721a67eaeac68963037803ac41af8d51834ac9437c543c1609216fda6479c3f298fbd1d0896107 +AUX hugo-0.128.0-skip-some-tests.patch 2609 BLAKE2B 556ccc83fa999a4ae39e7f0b77e3cd4ce27a85ac80c740c39df5aa36cb6002cf1718942489b8d3cdefa08f0b07be633910e4b26b27cc38d83c5df308ec7f70d0 SHA512 98553b449de878bedeecc85b75252068ffff4d5bec3ed11310d9d55a4b3e30d0f84845c9d0091f4b6ecc5204ff1ff439bbf7094aba3323d8aa1d560e3473cbce +DIST hugo-0.127.0-vendor.tar.xz 6747376 BLAKE2B 28569618b1398effe5eeafe72b43576986a9680371100812b546c5c62936754ebc4ecda2c8fea77ec93761b5e3746509b065bd6e1000815135be31a8ba8077c8 SHA512 f88d7a98d2d012e48beb239941a0a485b3ac761b055c7e76b5823550275e19b4ced6977765a7cc34342c5e9113f208793f483794afefa9689c76b3b4dedca94f +DIST hugo-0.127.0.tar.gz 21132608 BLAKE2B 6fa8ae09d325292715d94f28e13d3bce8efcecc5e729da3644a054857aa3e11893068bd25524857e7dde6bab92efc9acb5b0de823c8a6246b9f5e83b07c4e279 SHA512 829d118f12f153794ed882572a37ec2a3b3ade9c8160a754d3d411d6aede22c15e44dd75a52443e3cc7fc8ea1f65febecac5a47b4e09cc42006d7badd1a0fa2f +DIST hugo-0.129.0-vendor.tar.xz 6766128 BLAKE2B 31f723bdefd45a8e595c09b2d579ff68e2d3dc2e48c276a7963348c0d791c443b1a7e09c15a6aec955dca4928e695516c3777c6550230f455bb7f9c7ac3b6483 SHA512 97044f53cab10484731fc42aabcb63484759f00e80e29237d9819af49c6ab5fefeddde37fc971f9c47c9f24e607c0691cfb8a564e6de7f5a017b0ef93e8c7d89 +DIST hugo-0.129.0.tar.gz 20241492 BLAKE2B aaa6ced77b936a34e0ebe24f2a2c51cd992464cbfd93b33682f0b0c501e6809d5c13960c1bec82611ebd043631bb2e2bae13348475641e8b7736b4980a3b3a1f SHA512 0845f417af97ee068ad0c971684522fa49fcfca47de5db71f0026fd3c59baddcc03c73560275ff91e4c85286cf855a2b3b0271ee019141d71e04f6b31a91ae87 +DIST hugo-0.131.0-vendor.tar.xz 6925652 BLAKE2B 352cf39d95cf30ab502d91a816b151e2e94e1b57e59e6b3171caf83908dbc8726e03413fdf89a6fa7a360ee8b6ee0a3122f9f1fff2143985e1d33693ee3de114 SHA512 e1265f15e19f531360d447f9fc77da5dc894a3fd1d289df41bfbcfcc740b10e43ce1c872c69d0dfcf32cdff5c5a5edf34df64f107e6c20869eec3bf1668bdea1 +DIST hugo-0.131.0.tar.gz 20323531 BLAKE2B b88be13c6d1008a777114e5c0f42dac0277f37ba36ea601903f9a6e63b06fad3d847950aada082ad32dea544df54f1ad90c2ecbddebbcd70e73a74c416aebaf9 SHA512 53bb387bde6c6e92568036d06db1dfeaa9f897806f7f51cb4b9c3fd93026a41410ea61598370da79abb5df20e81b18616e3ec49e7cec1bb1e470d5035b594ef6 +EBUILD hugo-0.127.0.ebuild 2299 BLAKE2B dd2adaf9923f182e159f6d0470cbc9e19c0002a6ece2f308297841d913ac1fa8145caec5669f41113e8abb90276d4a2a56c1417074ab86f1f50157b26a72685a SHA512 ccdf43d4deabdb758c7780a57504ab94550ae320b4ba162e9497c9eac8f654286eb29661872aa5f61b63cb3f0898a5dccd2eae8469768da34ec27f134c667705 +EBUILD hugo-0.129.0.ebuild 2682 BLAKE2B 525d2ffe0932e1598f14e6ab3dc408fc8636980d9b3c708ee4c13bf46fd935b7fe9ba6e66bdde96f177814fd95f131dce9437ed357a659c2037049f570a0dbd2 SHA512 f6b4374ab6a4607020b5cefd5b70f6260a70d774c1589d45d5ef97d82afe1e3c823cfed5f94a4c629b0adce099cd9beb6ae36a8eba501667493248dcd02991a6 +EBUILD hugo-0.131.0.ebuild 2682 BLAKE2B 525d2ffe0932e1598f14e6ab3dc408fc8636980d9b3c708ee4c13bf46fd935b7fe9ba6e66bdde96f177814fd95f131dce9437ed357a659c2037049f570a0dbd2 SHA512 f6b4374ab6a4607020b5cefd5b70f6260a70d774c1589d45d5ef97d82afe1e3c823cfed5f94a4c629b0adce099cd9beb6ae36a8eba501667493248dcd02991a6 +MISC metadata.xml 509 BLAKE2B 89b778b18e1e1c9dd359a45c69af3a5ad5dedc7284b1475738d1be2aec8f22508a2e369e3ebd3191b20bdf65259be0e886a260ebdf497e522abd34f8685fabc8 SHA512 dc05d984d4466a144cd50a5baaeba609a3cc023c1209e6b3baa69f566b3e1c401747c2c6a706052091499908698ed7422d251c0d5e976dae136f810c25cb8266 diff --git a/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch b/www-apps/hugo/files/hugo-0.128.0-skip-some-tests.patch index 66b5bac5ef87..409e267fd709 100644 --- a/www-apps/hugo/files/hugo-0.118.2-skip-some-tests.patch +++ b/www-apps/hugo/files/hugo-0.128.0-skip-some-tests.patch @@ -1,4 +1,4 @@ -From 416992cf1404a78560a5e718a584c5fa1f2f9143 Mon Sep 17 00:00:00 2001 +From 890a1842ce705c56f71ea661d0d0be43e11d5df1 Mon Sep 17 00:00:00 2001 From: tastytea <tastytea@tastytea.de> Date: Fri, 8 Sep 2023 20:01:03 +0200 Subject: [PATCH] skip some tests @@ -7,16 +7,30 @@ reasons: - needs to be in a git repo - needs special test dependencies - requires network access + - is time sensitive --- - modules/client_test.go | 4 ++++ - resources/resource_factories/create/integration_test.go | 1 + - 2 files changed, 5 insertions(+) + common/para/para_test.go | 1 + + modules/client_test.go | 4 ++++ + .../resource_factories/create/create_integration_test.go | 1 + + 3 files changed, 6 insertions(+) +diff --git a/common/para/para_test.go b/common/para/para_test.go +index 2d9188e..daf0560 100644 +--- a/common/para/para_test.go ++++ b/common/para/para_test.go +@@ -69,6 +69,7 @@ func TestPara(t *testing.T) { + }) + + c.Run("Time", func(c *qt.C) { ++ c.Skip("time sensitive") + const n = 100 + + p := New(5) diff --git a/modules/client_test.go b/modules/client_test.go -index 75e3c2b08..235d6ed32 100644 +index 0ee7e0d..4bb8843 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 +@@ -72,6 +72,7 @@ github.com/gohugoio/hugoTestModules1_darwin/modh2_2@v1.4.0 github.com/gohugoio/h } c.Run("All", func(c *qt.C) { @@ -24,7 +38,7 @@ index 75e3c2b08..235d6ed32 100644 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 +@@ -111,6 +112,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor }) c.Run("IgnoreVendor", func(c *qt.C) { @@ -32,7 +46,7 @@ index 75e3c2b08..235d6ed32 100644 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 +@@ -129,6 +131,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor }) c.Run("NoVendor", func(c *qt.C) { @@ -40,7 +54,7 @@ index 75e3c2b08..235d6ed32 100644 mcfg := DefaultModuleConfig mcfg.NoVendor = "**" client, clean := newClient( -@@ -144,6 +147,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor +@@ -148,6 +151,7 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor }) c.Run("VendorClosest", func(c *qt.C) { @@ -48,18 +62,18 @@ index 75e3c2b08..235d6ed32 100644 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 +diff --git a/resources/resource_factories/create/create_integration_test.go b/resources/resource_factories/create/create_integration_test.go +index 1708457..e81f4de 100644 +--- a/resources/resource_factories/create/create_integration_test.go ++++ b/resources/resource_factories/create/create_integration_test.go @@ -25,6 +25,7 @@ import ( ) func TestGetRemoteHead(t *testing.T) { + t.Skip("Requires network access") - files := ` -- config.toml -- + [security] -- -2.41.0 +2.44.2 diff --git a/www-apps/hugo/hugo-0.124.1.ebuild b/www-apps/hugo/hugo-0.127.0.ebuild index 2f23d67149ac..5a68aca92a7e 100644 --- a/www-apps/hugo/hugo-0.124.1.ebuild +++ b/www-apps/hugo/hugo-0.127.0.ebuild @@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86" IUSE="doc +extended test" BDEPEND=" - >=dev-lang/go-1.22.1 + >=dev-lang/go-1.22.2 test? ( dev-python/docutils dev-ruby/asciidoctor diff --git a/www-apps/hugo/hugo-0.125.4.ebuild b/www-apps/hugo/hugo-0.129.0.ebuild index 93b9e87528d4..e9550f242204 100644 --- a/www-apps/hugo/hugo-0.125.4.ebuild +++ b/www-apps/hugo/hugo-0.129.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module shell-completion +inherit check-reqs go-module shell-completion DESCRIPTION="Fast static HTML and CSS website generator" HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo" @@ -25,7 +25,6 @@ BDEPEND=" test? ( dev-python/docutils dev-ruby/asciidoctor - virtual/pandoc ) " RDEPEND=" @@ -40,9 +39,30 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch - "${FILESDIR}"/${PN}-0.123.0-skip-some-tests.patch + "${FILESDIR}"/${PN}-0.128.0-skip-some-tests.patch ) +_check_reqs() { + if [[ ${MERGE_TYPE} == binary ]] ; then + return 0 + fi + + if has test ${FEATURES}; then + CHECKREQS_DISK_BUILD="4G" + else + CHECKREQS_DISK_BUILD="1500M" + fi + check-reqs_${EBUILD_PHASE_FUNC} +} + +pkg_pretend() { + _check_reqs +} + +pkg_setup() { + _check_reqs +} + src_configure() { export CGO_ENABLED=1 export CGO_CFLAGS="${CFLAGS}" @@ -79,6 +99,10 @@ src_compile() { } src_test() { + if ! has_version -b virtual/pandoc ; then + elog "You're missing virtual/pandoc - some tests will be skipped." + fi + ego test "./..." ${MY_BUILD_FLAGS} } diff --git a/www-apps/hugo/hugo-0.121.2.ebuild b/www-apps/hugo/hugo-0.131.0.ebuild index 48ca0532fc32..e9550f242204 100644 --- a/www-apps/hugo/hugo-0.121.2.ebuild +++ b/www-apps/hugo/hugo-0.131.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module shell-completion +inherit check-reqs go-module shell-completion DESCRIPTION="Fast static HTML and CSS website generator" HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo" @@ -17,15 +17,14 @@ SRC_URI=" LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0 Unlicense" SLOT="0" -KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" IUSE="doc +extended test" BDEPEND=" - >=dev-lang/go-1.21.5 + >=dev-lang/go-1.22.2 test? ( dev-python/docutils dev-ruby/asciidoctor - virtual/pandoc ) " RDEPEND=" @@ -40,9 +39,30 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch - "${FILESDIR}"/${PN}-0.118.2-skip-some-tests.patch + "${FILESDIR}"/${PN}-0.128.0-skip-some-tests.patch ) +_check_reqs() { + if [[ ${MERGE_TYPE} == binary ]] ; then + return 0 + fi + + if has test ${FEATURES}; then + CHECKREQS_DISK_BUILD="4G" + else + CHECKREQS_DISK_BUILD="1500M" + fi + check-reqs_${EBUILD_PHASE_FUNC} +} + +pkg_pretend() { + _check_reqs +} + +pkg_setup() { + _check_reqs +} + src_configure() { export CGO_ENABLED=1 export CGO_CFLAGS="${CFLAGS}" @@ -56,7 +76,7 @@ src_configure() { src_prepare() { # wants to run command that require network access - rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u}.txt || die + rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u,_npm{,_withexisting}}.txt || die default } @@ -79,6 +99,10 @@ src_compile() { } src_test() { + if ! has_version -b virtual/pandoc ; then + elog "You're missing virtual/pandoc - some tests will be skipped." + fi + ego test "./..." ${MY_BUILD_FLAGS} } diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml index 73a889ec1498..899499cbf061 100644 --- a/www-apps/hugo/metadata.xml +++ b/www-apps/hugo/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@tastytea.de</email> - <name>Ronny (tastytea) Gutbrod</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="extended">Enable SASS/SCSS and WebP encoding support</flag> </use> |