gentoo auto-resync : 07:12:2023 - 11:08:00

4 files changed, 69 insertions, 23 deletions

diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index af9e64ebceb2..475eef5e3bc6 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,9 +1,10 @@
 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.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
-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
 DIST hugo-0.119.0-vendor.tar.xz 6642728 BLAKE2B 1a7c3d8acb895f01db97b8583d7d578b0ebb422b9763754dc0e3536b0511ed07af8403d826d9a821b587e56c4d1f584392ea158db72c98caaa941a74de1da19a SHA512 8ec40365efa97b0c6d0dd088b0ee2e44a582841b9b9d5938e6408bcf4fb82c4d1909430c414e5642cd9c3305e159ed2495770b4fb710fabafb5c9cd740ac3d53
 DIST hugo-0.119.0.tar.gz 19579413 BLAKE2B f383f28b054fb78f1e8c972ec84d88fcbc6d8902dcdbe4acaaa081fea2c78247b5345faaec93c708fbcf71fee38a781a2c7c213f042568b3bd6b27e3618713d9 SHA512 ce77d60869173d18d46d91e4f23910c709ccabdf81976c1c96177a9fbad965a13a735fafce37f413a40a5af248510e49f8b2da86c1ba4291fb8b3941e91ee5ea
-EBUILD hugo-0.118.2.ebuild 2149 BLAKE2B 51a4c3b9735af1e6eb9b3a1b3580080d415cd73139b82965d4a241e9ae7f418dff9f5036ef8bc0c7fd9c47887feb520146a961edd0271d7f79be00e7d7013bed SHA512 92454433060dfc60c0f6b7c83eaf15be5a80ed73594e8f3a2237fbf0f0f97b05090a61495ee275d7ce8f11cf517067e9951b7776d3cada8d478e637c0c79ebd5
+DIST hugo-0.121.0-vendor.tar.xz 6682060 BLAKE2B 7aabdd97eada6b83e0e7bebe632f7b465a6d87d376e555325e4309eeed7b286a6e4f7bcb1bdab1884328decb25ee1356b438df9fa1f07a6d85aad36fcd3f2f7b SHA512 c7688f7d32fa0b3fbbaffc154b025eda83b24dcbacff94188c80811692a091498e5e8107715e3b24e497ef56d4e9af843a4c5a4a42a6b28a79146ab2c44344b1
+DIST hugo-0.121.0.tar.gz 21036266 BLAKE2B a924e2ad2fc4a5c690bf3bdd2e837add543119632f3055117a73455555bc78996b9f3eeb42c94694135a8f174aced72fea359ca39ca3ed76673b2284dc641d60 SHA512 99566167e74e1eda996ca54b0284a56a1bcd6c69f60d4461faa3bcca2f0c2d499b5e4de806a78576b5ec7691aa6d81fb66b6f088a25255fc9496d1f65d37d2ac
 EBUILD hugo-0.119.0.ebuild 2149 BLAKE2B 1fb25257dffb858f8a93a972d7a0498fba4f542e7c80e4c17908a4f7a448c876ae0ec8733db292035f2f713c1d3aa6467fbab21947d95f6712070bd2ceadb15e SHA512 b0c4b69ab483a5012a9dba18997662c4dab764ebd339f4aaefdebabecfc1f4470676529165ff085fc57c6275500f3ac06500b21205f6f6fcdd0afc7a45977a18
-MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
+EBUILD hugo-0.121.0.ebuild 2267 BLAKE2B eca27fdb21a6a65b85fd91c22a313a42b71c8e31f41e6b207c0483738ac2758adb0291d7eb65458be33826fddd34addfad8d156c61a8e872935036e81effa464 SHA512 93efead10a6ae1ff2fcac0318d07d6711b369284a02d0386922665392a882c93acaabab18f238031b57011887c6b5d31b1b3aeb7f60f155666e9fe5c895c229c
+MISC metadata.xml 812 BLAKE2B 78ef69f1ee2a912879e539f4bc982a89288e6b3af3af0cc6b1ff7413c9044686008b1cde9d6c655e0daed6fae53a2a28149bb3f907eb19f2f38d7429086ddf33 SHA512 60f1c3e8fb870ce2b3870eb8ecfbf9bb9e9dfc82be8e0f22a383378602c8efca68f734d6ddc5b0fb15e7b7c7ec9988ab590c7685cb4009b70fa25d509538092b
diff --git a/www-apps/hugo/files/hugo-0.121.0-unbundle-libwebp-and-libsass.patch b/www-apps/hugo/files/hugo-0.121.0-unbundle-libwebp-and-libsass.patch
new file mode 100644
index 000000000000..4dcd86a6040f
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.121.0-unbundle-libwebp-and-libsass.patch
@@ -0,0 +1,43 @@
+From 1237c6c59e4fe777b39ee7c543eb4f8b6ce6a6b1 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Wed, 6 Dec 2023 12:37:26 +0100
+Subject: [PATCH] unbundle libwebp and libsass
+
+---
+ .../github.com/bep/golibsass/internal/libsass/a__cgo.go   | 8 ++++----
+ vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go   | 3 ++-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+index 1de9aeeef..fd565d1a9 100644
+--- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
++++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
+@@ -4,9 +4,9 @@
+ // license that can be found in the LICENSE file.
+ package libsass
+ 
+-// #cgo CFLAGS: -O2 -fPIC
+-// #cgo CPPFLAGS: -I../../libsass_src/include
+-// #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC
+-// #cgo LDFLAGS: -lstdc++ -lm
++// #cgo CFLAGS: -fPIC
++// #cgo CPPFLAGS: -DUSE_LIBSASS_SRC
++// #cgo CXXFLAGS: -std=c++0x -fPIC
++// #cgo LDFLAGS: -lstdc++ -lm -lsass
+ // #cgo darwin linux LDFLAGS: -ldl
+ import "C"
+diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+index bcf9bacd0..4cc2aa81c 100644
+--- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
++++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
+@@ -3,5 +3,6 @@
+ 
+ package libwebp
+ 
+-// #cgo unix LDFLAGS: -lm
++// #cgo unix LDFLAGS: -lm -lwebp
++// #cgo CFLAGS: -DLIBWEBP_NO_SRC
+ import "C"
+-- 
+2.41.0
+
diff --git a/www-apps/hugo/hugo-0.118.2.ebuild b/www-apps/hugo/hugo-0.121.0.ebuild
index 12937987bc02..d3d9d003c7dd 100644
--- a/www-apps/hugo/hugo-0.118.2.ebuild
+++ b/www-apps/hugo/hugo-0.121.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module bash-completion-r1
+inherit go-module shell-completion
 
 DESCRIPTION="Fast static HTML and CSS website generator"
 HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="doc +sass test"
+IUSE="doc +extended test"
 
 BDEPEND="
 	>=dev-lang/go-1.18
@@ -29,15 +29,17 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	>=media-libs/libwebp-1.2.3-r1:=
-	sass? ( dev-libs/libsass:= )
+	extended? (
+		dev-libs/libsass:=
+		>=media-libs/libwebp-1.3.2:=
+	)
 "
 DEPEND="${RDEPEND}"
 
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch
+	"${FILESDIR}"/${PN}-0.121.0-unbundle-libwebp-and-libsass.patch
 	"${FILESDIR}"/${PN}-0.118.2-skip-some-tests.patch
 )
 
@@ -47,14 +49,14 @@ src_configure() {
 	export CGO_CPPFLAGS="${CPPFLAGS}"
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
-	export MY_BUILD_FLAGS="$(usev sass "-tags extended")"
+	export MY_BUILD_FLAGS="$(usev extended "-tags extended")"
 
 	default
 }
 
 src_prepare() {
 	# wants to run command that require network access
-	rm testscripts/commands/mod{,_vendor,__disable}.txt || die
+	rm testscripts/commands/mod{,_vendor,__disable,_get,_get_u}.txt || die
 
 	default
 }
@@ -85,14 +87,15 @@ src_install() {
 	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}
+	dofishcomp completions/${PN}.fish
+	dozshcomp completions/_${PN}
 
 	if use doc ; then
 		dodoc -r doc/*
 	fi
 }
+
+pkg_postinst() {
+	elog "the sass USE-flag was renamed to extended. the functionality is the" \
+		"same, except it also toggles the dependency on libwebp (for encoding)"
+}
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index d3bce6b51931..d3297372315d 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -10,13 +10,12 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="sass">Enable SASS/SCSS support</flag>
+		<flag name="sass">(deprecated) Enable SASS/SCSS support</flag>
+		<flag name="extended">Enable SASS/SCSS and WebP encoding support</flag>
 	</use>
 	<upstream>
-	<remote-id type="github">gohugoio/hugo</remote-id>
+		<remote-id type="github">gohugoio/hugo</remote-id>
 	</upstream>
-	<longdescription lang="en">
-		Hugo is a static HTML and CSS website generator written in Go.
-		It is optimized for speed, ease of use, and configurability.
-	</longdescription>
+	<longdescription lang="en"> Hugo is a static HTML and CSS website generator written in Go. It is
+		optimized for speed, ease of use, and configurability. </longdescription>
 </pkgmetadata>