Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/hugo/files/, www-apps/hugo/
Date: Wed, 23 Feb 2022 17:04:19
Message-Id: 1645635838.912661fb74f3fc0b05bc750956dd84f805c46368.mgorny@gentoo
1 commit: 912661fb74f3fc0b05bc750956dd84f805c46368
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Mon Feb 21 01:41:28 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 23 17:03:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912661fb
7
8 www-apps/hugo: Version bump 0.92.2
9
10 - Repackaged dependencies
11 - unbundled media-libs/libwebp and dev-libs/libsass.
12
13 Closes: https://bugs.gentoo.org/832304
14 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
15 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
16
17 www-apps/hugo/Manifest | 2 +
18 .../files/hugo-0.92.2-link-to-webp-and-sass.patch | 38 +++++++++++
19 www-apps/hugo/hugo-0.92.2.ebuild | 77 ++++++++++++++++++++++
20 3 files changed, 117 insertions(+)
21
22 diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
23 index f17bbb295425..f233da127f36 100644
24 --- a/www-apps/hugo/Manifest
25 +++ b/www-apps/hugo/Manifest
26 @@ -1144,6 +1144,8 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e
27 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
28 DIST hugo-0.91.2.tar.gz 28416583 BLAKE2B 0f7ad7c7029ac42386a8da68d6ea6efd9982500588b7009f49629472793ea8f62a1a7640a11b5038532cc9a714695cdf849e52856d25cb904f49c9deb9113a03 SHA512 0994cc97c858b15991a5d7705a8f2f83154303d1daf4f3b3019e39d8789707875a0b90cd6f41e34bba42f10b9a13c13942ad06ddcd4b4808a4889b031a7b3d8e
29 DIST hugo-0.92.1.tar.gz 28554985 BLAKE2B b34c2601f3d60b0169eb88484270fae4fd49d4227ed097ce4d2e7378bb8a214a6d28402bf6500ae50c24db286c0f09e9b56999eb578029f48a5fb43df6e063d8 SHA512 d5041e89293ec75f2f4622fe3b622ed7a2c920512c39a6fac4364f6e8c033130a09043403dae186b71a78a42118820ae88309e404dd788f77a9bf77fe526759f
30 +DIST hugo-0.92.2-vendor.tar.xz 5607964 BLAKE2B 290e064ed87189503999e54bcf25c18b698cfb64cbb32d73765267bac19a3de53b739c695d40fa6e553e1052cae620cf15fca3e34e18132b2f9ff5389227ddb2 SHA512 23218cd4e68e2f4a0b6fd5f1b86408290f3ccb619ecc694c536ccc9074bd3ab3e6f68a14189abdd44ec9761f85901cb2c3ae072a98f292a82f00276e763cbe32
31 +DIST hugo-0.92.2.tar.gz 28559963 BLAKE2B 05d486aa490d9c9350353cb32f1c64133a8c358584efbdc82290e13e963620bf3984ccdf8cd8c6f93216f71e03c061659d5ef4904c35c030c62f1c43d64549dd SHA512 4a4c8ab730c1cc839e3e15a29b1200fa969402efa40774022a70fae11d98819173f6002ed3ee4a84ce1148c0744c82ce16ee0fec409935a903130ae71d62ba24
32 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
33 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
34 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
35
36 diff --git a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch b/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
37 new file mode 100644
38 index 000000000000..bda6f9bcc3f2
39 --- /dev/null
40 +++ b/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch
41 @@ -0,0 +1,38 @@
42 +From b1c99224dc0d318109832531c98ec24ef4c0020e Mon Sep 17 00:00:00 2001
43 +From: tastytea <tastytea@××××××××.de>
44 +Date: Wed, 23 Feb 2022 14:00:36 +0100
45 +Subject: [PATCH] Link to webp and sass
46 +
47 +We need to add the flags because we unbundle media-libs/libwebp and
48 +dev-libs/libsass.
49 +---
50 + vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go | 2 +-
51 + vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go | 2 +-
52 + 2 files changed, 2 insertions(+), 2 deletions(-)
53 +
54 +diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
55 +index af51b92..979d9e7 100644
56 +--- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
57 ++++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go
58 +@@ -8,6 +8,6 @@ package libsass
59 + // #cgo CFLAGS: -O2 -fPIC
60 + // #cgo CPPFLAGS: -I../../libsass_src/include
61 + // #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC
62 +-// #cgo LDFLAGS: -lstdc++ -lm
63 ++// #cgo LDFLAGS: -lstdc++ -lm -lsass
64 + // #cgo darwin linux LDFLAGS: -ldl
65 + import "C"
66 +diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
67 +index 4b105ab..cec2faa 100644
68 +--- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
69 ++++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go
70 +@@ -2,5 +2,5 @@
71 +
72 + package libwebp
73 +
74 +-// #cgo linux LDFLAGS: -lm
75 ++// #cgo linux LDFLAGS: -lm -lwebp
76 + import "C"
77 +--
78 +2.34.1
79 +
80
81 diff --git a/www-apps/hugo/hugo-0.92.2.ebuild b/www-apps/hugo/hugo-0.92.2.ebuild
82 new file mode 100644
83 index 000000000000..851d5d9e67b6
84 --- /dev/null
85 +++ b/www-apps/hugo/hugo-0.92.2.ebuild
86 @@ -0,0 +1,77 @@
87 +# Copyright 1999-2022 Gentoo Authors
88 +# Distributed under the terms of the GNU General Public License v2
89 +
90 +EAPI=8
91 +
92 +inherit go-module bash-completion-r1
93 +
94 +DESCRIPTION="The world's fastest framework for building websites"
95 +HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
96 +SRC_URI="
97 + https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
98 + https://tastytea.de/files/${P}-vendor.tar.xz
99 +"
100 +
101 +# NOTE: To create the vendor tarball, run:
102 +# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
103 +
104 +LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
105 +SLOT="0"
106 +KEYWORDS="~amd64 ~x86"
107 +IUSE="doc +sass"
108 +
109 +BDEPEND=">=dev-lang/go-1.16.0"
110 +RDEPEND="
111 + media-libs/libwebp
112 + sass? ( dev-libs/libsass )
113 +"
114 +DEPEND="${RDEPEND}"
115 +
116 +PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" )
117 +
118 +src_configure() {
119 + export CGO_ENABLED=1
120 + export CGO_CFLAGS="${CFLAGS}"
121 + export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC"
122 + export CGO_CXXFLAGS="${CXXFLAGS}"
123 + export CGO_LDFLAGS="${LDFLAGS}"
124 +
125 + default
126 +}
127 +
128 +src_compile() {
129 + mkdir -pv bin || die
130 + local my_import_path="github.com/gohugoio/hugo/common"
131 + local mybuildtags="-tags $(usev sass "extended,")nodeploy"
132 + go build -ldflags \
133 + "-X ${my_import_path}/hugo.buildDate=$(date --iso-8601=seconds) -X ${my_import_path}/hugo.vendorInfo=Gentoo" \
134 + ${mybuildtags} -o "${S}/bin/hugo" || die
135 +
136 + bin/hugo gen man --dir man || die
137 +
138 + mkdir -pv completions || die
139 + bin/hugo completion bash > completions/hugo || die
140 + bin/hugo completion fish > completions/hugo.fish || die
141 + bin/hugo completion zsh > completions/_hugo || die
142 +
143 + if use doc ; then
144 + bin/hugo gen doc --dir doc || die
145 + fi
146 +}
147 +
148 +src_install() {
149 + dobin bin/*
150 + doman man/*
151 +
152 + dobashcomp completions/${PN}
153 +
154 + insinto /usr/share/fish/vendor_completions.d
155 + doins completions/${PN}.fish
156 +
157 + insinto /usr/share/zsh/site-functions
158 + doins completions/_${PN}
159 +
160 + if use doc ; then
161 + dodoc -r doc/*
162 + fi
163 +}