gentoo auto-resync : 07:03:2023 - 11:57:00

3 files changed, 6 insertions, 106 deletions

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 553c59da6058..6317a054333f 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -2,10 +2,7 @@ AUX hugo-0.104.3-skip-some-tests.patch 3279 BLAKE2B 725dc64acd0949fe019afb334161
 AUX hugo-0.110.0-skip-some-tests.patch 2643 BLAKE2B 817e7301c7ce48fe9cff99964a6f081d6709fe70831456e90d0df17e0b48ca844f3261924ab825789e93bef48e42e91b86af6c5b19289a337bb390c23a290b3b SHA512 8f2bebbbea1f8adabcd88198d92d59e3fd6a9c3affef42089f2ce703f7ba385cf263165b9933c215386301cdeac84393aba68f2aeeaa62b8045dfffe2d2f90ac
 AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
 AUX hugo-0.99.1-test-timeout.patch 731 BLAKE2B 677a6ca363f60b875d672df80584734a5feabecea68de57cfe63ebfb97768581372adbe2d171e0f5f746a03b8dc67fad75bd1c0a3bdcb9532f99c1859b31523f SHA512 979161805cc5b7220362b7fefe33d423515b76a366b08500b9765c835399aacff3ff609d6692594739a3f9a078b1708dbfc1c6635416d46d0d8a1279e50417ac
-DIST hugo-0.108.0-vendor.tar.xz 5759708 BLAKE2B 6b3f93b0f29cb57afcb5a2e05ec2dc5ba276cb5d30cd2c3996fbed20fa2a9e8f464e580dd42302819d18b5cc35b2f2ab16e9e11faa175fc1c56591da56c2be31 SHA512 b4baaa6acc227e8d169362c9adcf60c2365413231beedb3ff21d7d7103e2a3d3bb19d30950e68978841de2923b3cc2171474ea3811f0dbcc1e0f173c453a8441
-DIST hugo-0.108.0.tar.gz 29048088 BLAKE2B dd9654985fe0221ddb6b5f74c4d7f3259e587ee71522d6304d102849e63d2abd926987699fd7bac35c1a3bd5c6a195b4308249039d1a86cadae6dad641b75085 SHA512 450030bd657468bcf62de9d60def0c4f977ed4ba4b8ff830eae146622f678fedf656e3637bbdb44ac4289f857f5a1259ea0cfa66a45a14ea92860eee86dbf9fa
 DIST hugo-0.110.0-vendor.tar.xz 5792924 BLAKE2B a70283d9b5764c3340591e40d6472c0f14b029e5bed086c4f294951e00a45041a869868884328ea39b75caccf8e2089250a98502a3ec38c730989a77e55c976b SHA512 c6a0cd262934b6434eac7122a0ec257ca4eec1611b938585e6ee22d56991632fd5e52c061d552772e0e8bd10e13c23aecc461d52c23dff009e8e522b651642da
 DIST hugo-0.110.0.tar.gz 29055652 BLAKE2B d8c9e04c3141f02eeea1a951ba92c552148b604817e60041a3b944ccea37565ab8a6c3a47300877f5497d4575df4cdf598627d8dea65a1c935073b7bd8e99b70 SHA512 b64a6fa50201c0d95bf49fd0193138123163e0dad077491cc4c3e0d851de03ed2cd2e81482c1e6291d9a10d2d99f89c9dbbcfaafcd17f702906901dc6f28b3de
-EBUILD hugo-0.108.0.ebuild 2047 BLAKE2B 9058b679049b52ed6c3f1b5fa03d9e04f2b69bb856c876f676aa09c67fb1e480c1c9d186a84d738b217f095ded0776efb52e827a7bb1192a097d5bdad697eb54 SHA512 47f31fb83f172bf3d7fc080fa0ff9090fb267ac84763f144aabc49883ffd3ceb3c1dc5aba385b749ca603508ffc2ac081cb5b70953824db1226cd59459285158
-EBUILD hugo-0.110.0.ebuild 2227 BLAKE2B 3b5ece4ea2a6044e0dea6c925a82030c27a550a614845ebef36a88b2b6dec8a38b31e3a10cde532893f65840bd3fa3b188bc036a654d2c40e8e6f9e4a0d33a79 SHA512 824fbe77af87b9ae03ebbfa5299160ab88da2d8ccd736e0b0598f65bb77d7badfee7d16b89f5bf31ba70e94bac96464d9cd55054c93350ed4f7e37a995e96947
+EBUILD hugo-0.110.0-r1.ebuild 2022 BLAKE2B 7fb592d1e701a24e2a190bb6064db4643cf1e1b58c749dfe22bf85c18e2e44e9bc71c25287c00e4bd658d0f9f752f47794c43ee462a147c8f678f3e025e8c3b7 SHA512 f46a84d381fe7a3a55bb34787e10384fa63cd1ac344e38bc5545cc369d5cb1cf1618187dacfead58787aa4d05159a7a33811fd57ad8f29ae82991cad9f80ce4c
 MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
diff --git a/www-apps/hugo/hugo-0.108.0.ebuild b/www-apps/hugo/hugo-0.110.0-r1.ebuild
index 8985198b2e7d..2844ad2eecb8 100644
--- a/www-apps/hugo/hugo-0.108.0.ebuild
+++ b/www-apps/hugo/hugo-0.110.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 IUSE="doc +sass test"
 
 BDEPEND="
@@ -38,7 +38,7 @@ 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.110.0-skip-some-tests.patch
 	"${FILESDIR}"/${PN}-0.99.1-test-timeout.patch
 )
 
@@ -48,8 +48,7 @@ src_configure() {
 	export CGO_CPPFLAGS="${CPPFLAGS}"
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
-
-	MY_BUILDFLAGS="$(usev sass "-tags extended")"
+	export EGO_BUILD_FLAGS="$(usev sass "-tags extended")"
 
 	default
 }
@@ -57,7 +56,7 @@ src_configure() {
 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"
+		-o "${S}/bin/hugo"
 
 	bin/hugo gen man --dir man || die
 
@@ -72,7 +71,7 @@ src_compile() {
 }
 
 src_test() {
-	ego test -race "./..." ${MY_BUILDFLAGS}
+	ego test "./..."
 }
 
 src_install() {
diff --git a/www-apps/hugo/hugo-0.110.0.ebuild b/www-apps/hugo/hugo-0.110.0.ebuild
deleted file mode 100644
index 910c8a28804b..000000000000
--- a/www-apps/hugo/hugo-0.110.0.ebuild
+++ /dev/null
@@ -1,96 +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 Unlicense"
-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}"
-
-	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() {
-	# workaround for mysteriously added -buildmode=pie
-	# <https://github.com/gentoo/gentoo/pull/29069#discussion_r1085026796>
-	MY_BUILDFLAGS="-buildmode=exe ${MY_BUILDFLAGS}"
-	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
-}