gentoo resync : 12.05.2022

2 files changed, 30 insertions, 15 deletions

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 95cfea5081cf..f632bfe4ae09 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -3,11 +3,11 @@ AUX hugo-0.96.0-skip-some-tests.patch 4082 BLAKE2B fe22f1c7fe5dd023c21f45b1dca71
 AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
 DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47f9e3aa25240ed6cc9ed9e7faef7425b3f7bdd03293023f103a0b8927ecbdf7fe3d9f36f5a66db580dfc8f0ddb9dc310 SHA512 6c93a8435552553079e856f8a74eef76e23ab7343e6e65ac83f9f1675c5fe44547f5d3f700656c0e666bc668792be38e343cfaebbfb23b5ece28ddfa0896755c
 DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e
-DIST hugo-0.95.0-vendor.tar.xz 4781084 BLAKE2B ead2d42b615fa838995853df38c304c63baccb109f32b5034449cb64c8edacb78e5fac615f2018e8d4acb693f83df0abaa73bc511f5ba31b3a30bdec476420b1 SHA512 941061396433a20b524694c8dd2838d84454fbee98c48aa2860881fd9b31b6d480d22f6fd54bd2e17f1f90b1c9e6c3c5813682131fd01c7d3eabc063dcbb01b2
-DIST hugo-0.95.0.tar.gz 27859168 BLAKE2B 3667ab14c19f586d0f45b76072786a49f2448367cdf4151df2b44a329a57047544dcbbe4db8774433cf2042024c17ccca3269f5eeb508392aed00d31955de55a SHA512 fbe43fc9698325c380d7e7499ee726aba448eebba087f7bdc7cdf14d01e0649869359c07fefaa9a0d9623c910523b82efc2a2b57e152d391443e2b890a29affb
 DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d
 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
 EBUILD hugo-0.93.3.ebuild 1887 BLAKE2B f0351fc4bc20ed692378b5a8ad6ebb5622971ffca2832e50b21b39592e9dc891b8cdf4e8c7aa01cb349bfb39db9070ee8f768b17a8d30b774cec4b98f4693347 SHA512 0b345e1b12d4488660f3c8ab1baef7e886ccb57bb49c3ee177f902fafd1e9f5e2affbaeeb195f5537dfe8179f2d8fe081906343c05fe6c9e9ed5a515ab248416
-EBUILD hugo-0.95.0.ebuild 1889 BLAKE2B edaa1f15ca6ef22537b4f200c1a3e46784f6a28dae79b5c9fadd6a87a2bb50554b34d202f087e61822dd650b1613d2923989a33fd66dc67826686082822a926b SHA512 b247dd4cbc3d1df67e9608dc3ecc173886e698cbd82ad0836d7af2716d1d929440c3d43222b6435f3f6e2f9a62017819ee0313f65428c2a779d79b757d6302b0
 EBUILD hugo-0.96.0.ebuild 1993 BLAKE2B 8f4e9fd025c5b55911c1313144069bae7e3bac29008901937026513867a867d87067ee3b7e668d20640e062042fe58811e9f3fb77eb3ef6cd1721323e3f0b306 SHA512 2faae5f367ac1d83b851bc8a042ab8da3363e359a359e8d84fddb93690f396b82d8775a9156bcbd6c5e5a930fa279573a7f8b37be89105eec2ad435c48a18870
+EBUILD hugo-0.98.0.ebuild 2000 BLAKE2B 88f98e70ae87ba9bd50cea3abeecefdfe79990aaab98fb07dde14736164a74513f256a2ca2875bec3056985db96fb16979bca0e6b3335df72a7d00bb681f9cb0 SHA512 fb60f6591a2ebf1f13293d012a575317ac5c427ecd8677fff9cb0489684656435ef55e9c820e528589bea107bcc7022c3b0cb92268588e5a2c023522f9ae9758
 MISC metadata.xml 806 BLAKE2B 94596b9097f4f1277d81c88292eecfaab2480476807edf680350158e704226d335787029f7e898c6cc6ad0452af4266d2aedcfa38209201b48cde75efa88965e SHA512 26e3674ec6775f073d0e10f87b9bbc8364e0c4d1e946a415002bdc11aa62909b2792c6cb7a90ac163860e569fdf6ed303173887c214531f50ae63dc0f9b4e69e
diff --git a/www-apps/hugo/hugo-0.95.0.ebuild b/www-apps/hugo/hugo-0.98.0.ebuild
index 9a628528735b..455ae3474bd6 100644
--- a/www-apps/hugo/hugo-0.95.0.ebuild
+++ b/www-apps/hugo/hugo-0.98.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ 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/${P}-vendor.tar.xz
+	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
 "
 
 # NOTE: To create the vendor tarball, run:
@@ -18,34 +18,45 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass"
-
-BDEPEND=">=dev-lang/go-1.18"
+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}"
 
-PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" )
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
+	"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
+)
 
 src_configure() {
 	export CGO_ENABLED=1
 	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC"
+	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
-	local my_import_path="github.com/gohugoio/hugo/common"
-	local mybuildtags="-tags $(usev sass "extended,")nodeploy"
-	ego build -ldflags \
-		"-X ${my_import_path}/hugo.buildDate=$(date --iso-8601=seconds) -X ${my_import_path}/hugo.vendorInfo=Gentoo" \
-		${mybuildtags} -o "${S}/bin/hugo"
+	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
 
@@ -59,6 +70,10 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	ego test -race "./..." ${MY_BUILDFLAGS}
+}
+
 src_install() {
 	dobin bin/*
 	doman man/*