1 |
commit: f3890607c39c4e79f7679afb5b04cd23bc02619b |
2 |
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> |
3 |
AuthorDate: Fri May 27 12:58:04 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 6 20:12:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3890607 |
7 |
|
8 |
www-apps/hugo: drop 0.93.3, 0.96.0, old patch |
9 |
|
10 |
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/25658 |
12 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
13 |
|
14 |
www-apps/hugo/Manifest | 4 - |
15 |
.../files/hugo-0.92.2-link-to-webp-and-sass.patch | 38 --------- |
16 |
www-apps/hugo/hugo-0.93.3.ebuild | 77 ------------------ |
17 |
www-apps/hugo/hugo-0.96.0.ebuild | 92 ---------------------- |
18 |
4 files changed, 211 deletions(-) |
19 |
|
20 |
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest |
21 |
index 90d82f5ec2d5..3cc46dbf0338 100644 |
22 |
--- a/www-apps/hugo/Manifest |
23 |
+++ b/www-apps/hugo/Manifest |
24 |
@@ -1,7 +1,3 @@ |
25 |
-DIST hugo-0.93.3-vendor.tar.xz 4828092 BLAKE2B 4df3e876ffcc71f4caa089512510bec47f9e3aa25240ed6cc9ed9e7faef7425b3f7bdd03293023f103a0b8927ecbdf7fe3d9f36f5a66db580dfc8f0ddb9dc310 SHA512 6c93a8435552553079e856f8a74eef76e23ab7343e6e65ac83f9f1675c5fe44547f5d3f700656c0e666bc668792be38e343cfaebbfb23b5ece28ddfa0896755c |
26 |
-DIST hugo-0.93.3.tar.gz 27852078 BLAKE2B 8e21fcbacc55cb304314d24f7a1258c9192655cb603e33c2ac2cac5fcc21f83045c1fc3a3ee7bd227507fd08be54e15dcd9cc9629e320bae9b41f1c87d03e163 SHA512 c65cc776588604a6ca2fbe5c4081db252ec007311eae54ed81ea65e983f1787edf6e10774d8ace82284eb7c42f6cb70650135ec44b2ddc8994ed511ba2a7d55e |
27 |
-DIST hugo-0.96.0-vendor.tar.xz 4721504 BLAKE2B d8516c848be292f2097961a599450b719b2d760ad3464036929a0937ae6b401ec4b7b90df3281f11a70c4f9a7e94d74e821d78639b9cb3a335a59c5f6e645e65 SHA512 d58cbded19c5e2595838725a181e5fcdad94888f1e140e8961d9815c17d7719644483bb9bb34141c26bfccd87412632b1c896c12b85abb76c6448de3d0c8642d |
28 |
-DIST hugo-0.96.0.tar.gz 27853655 BLAKE2B 8161eb31b66a9643e31967629852475496dcabd0ef04e806f0d004f3933de07553a10572c201f8b798c7c257d20d7e0e6381bb2892728f89fd3416cc768d76f2 SHA512 1dc5e9f433953a1ae378d0eeb24e0647a4c096db96a727ece39c1c4e5d3ef40033ca61aa7a9ed322234e41a116f118115e637c0342b52ee60fe47eea5718ffde |
29 |
DIST hugo-0.98.0-vendor.tar.xz 5675060 BLAKE2B d876207dfc7c13ff97249bf72bf5191a0d4adbf82af38b8962a8e66d922f5bdf5298c8ecddb05c8a1d13f95f9e8bbbb84dec8cc37538ad47d8d83da951dfa003 SHA512 7b67920c8adcc8aea3a3dd6880716a79df8081cca17bf2d8cbd0ca3861aa69c29b0320eb86e0942db32e362b22faaade7cb65c9a0e0f88578504bfe4ed666d63 |
30 |
DIST hugo-0.98.0.tar.gz 27716005 BLAKE2B b3cbc9c616eb79a993bd9ddf07658ff1d3ce0680d3788e37cab78dfb48b33a259514b417d3e657afe89f188b3c0c03b88108dbcbd44d80c4d97004f7aa0185b0 SHA512 9d8a65c49be5b7bb181627bd8b557ddc041dc00a673ac0af8aeacbbfc46441a0045a5ab531087fb866d076297d67823a2eb5b14f57f3ecf57cc7b9e6b90ddf3a |
31 |
DIST hugo-0.99.1-vendor.tar.xz 5675228 BLAKE2B 80fdd25fe924bcde7f200b805bf6598dbb726bb628b82e9b0d2809414a7a6e33cbfe069e29953e75b8ed4ecdb9c7303b44a8d8195b43540977cd7461295de109 SHA512 88ffb6bea777e3a72dac05941de542acdc6a17faff9e98517e483e17c7a42d1ab5aa7e65ed3a91f6832468d2da3e98e87346118694a8e20f6375fad56d5d7ff0 |
32 |
|
33 |
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 |
34 |
deleted file mode 100644 |
35 |
index bda6f9bcc3f2..000000000000 |
36 |
--- a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch |
37 |
+++ /dev/null |
38 |
@@ -1,38 +0,0 @@ |
39 |
-From b1c99224dc0d318109832531c98ec24ef4c0020e Mon Sep 17 00:00:00 2001 |
40 |
-From: tastytea <tastytea@××××××××.de> |
41 |
-Date: Wed, 23 Feb 2022 14:00:36 +0100 |
42 |
-Subject: [PATCH] Link to webp and sass |
43 |
- |
44 |
-We need to add the flags because we unbundle media-libs/libwebp and |
45 |
-dev-libs/libsass. |
46 |
---- |
47 |
- vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go | 2 +- |
48 |
- vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go | 2 +- |
49 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
50 |
- |
51 |
-diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go |
52 |
-index af51b92..979d9e7 100644 |
53 |
---- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go |
54 |
-+++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go |
55 |
-@@ -8,6 +8,6 @@ package libsass |
56 |
- // #cgo CFLAGS: -O2 -fPIC |
57 |
- // #cgo CPPFLAGS: -I../../libsass_src/include |
58 |
- // #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC |
59 |
--// #cgo LDFLAGS: -lstdc++ -lm |
60 |
-+// #cgo LDFLAGS: -lstdc++ -lm -lsass |
61 |
- // #cgo darwin linux LDFLAGS: -ldl |
62 |
- import "C" |
63 |
-diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go |
64 |
-index 4b105ab..cec2faa 100644 |
65 |
---- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go |
66 |
-+++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go |
67 |
-@@ -2,5 +2,5 @@ |
68 |
- |
69 |
- package libwebp |
70 |
- |
71 |
--// #cgo linux LDFLAGS: -lm |
72 |
-+// #cgo linux LDFLAGS: -lm -lwebp |
73 |
- import "C" |
74 |
--- |
75 |
-2.34.1 |
76 |
- |
77 |
|
78 |
diff --git a/www-apps/hugo/hugo-0.93.3.ebuild b/www-apps/hugo/hugo-0.93.3.ebuild |
79 |
deleted file mode 100644 |
80 |
index 7dd2072578ca..000000000000 |
81 |
--- a/www-apps/hugo/hugo-0.93.3.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,77 +0,0 @@ |
84 |
-# Copyright 1999-2022 Gentoo Authors |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
- |
87 |
-EAPI=8 |
88 |
- |
89 |
-inherit go-module bash-completion-r1 |
90 |
- |
91 |
-DESCRIPTION="Fast static HTML and CSS website generator" |
92 |
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo" |
93 |
-SRC_URI=" |
94 |
- https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
95 |
- https://tastytea.de/files/${P}-vendor.tar.xz |
96 |
-" |
97 |
- |
98 |
-# NOTE: To create the vendor tarball, run: |
99 |
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor` |
100 |
- |
101 |
-LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense" |
102 |
-SLOT="0" |
103 |
-KEYWORDS="~amd64 ~x86" |
104 |
-IUSE="doc +sass" |
105 |
- |
106 |
-BDEPEND=">=dev-lang/go-1.16.0" |
107 |
-RDEPEND=" |
108 |
- media-libs/libwebp |
109 |
- sass? ( dev-libs/libsass ) |
110 |
-" |
111 |
-DEPEND="${RDEPEND}" |
112 |
- |
113 |
-PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" ) |
114 |
- |
115 |
-src_configure() { |
116 |
- export CGO_ENABLED=1 |
117 |
- export CGO_CFLAGS="${CFLAGS}" |
118 |
- export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC" |
119 |
- export CGO_CXXFLAGS="${CXXFLAGS}" |
120 |
- export CGO_LDFLAGS="${LDFLAGS}" |
121 |
- |
122 |
- default |
123 |
-} |
124 |
- |
125 |
-src_compile() { |
126 |
- mkdir -pv bin || die |
127 |
- local my_import_path="github.com/gohugoio/hugo/common" |
128 |
- local mybuildtags="-tags $(usev sass "extended,")nodeploy" |
129 |
- ego build -ldflags \ |
130 |
- "-X ${my_import_path}/hugo.buildDate=$(date --iso-8601=seconds) -X ${my_import_path}/hugo.vendorInfo=Gentoo" \ |
131 |
- ${mybuildtags} -o "${S}/bin/hugo" |
132 |
- |
133 |
- bin/hugo gen man --dir man || die |
134 |
- |
135 |
- mkdir -pv completions || die |
136 |
- bin/hugo completion bash > completions/hugo || die |
137 |
- bin/hugo completion fish > completions/hugo.fish || die |
138 |
- bin/hugo completion zsh > completions/_hugo || die |
139 |
- |
140 |
- if use doc ; then |
141 |
- bin/hugo gen doc --dir doc || die |
142 |
- fi |
143 |
-} |
144 |
- |
145 |
-src_install() { |
146 |
- dobin bin/* |
147 |
- doman man/* |
148 |
- |
149 |
- dobashcomp completions/${PN} |
150 |
- |
151 |
- insinto /usr/share/fish/vendor_completions.d |
152 |
- doins completions/${PN}.fish |
153 |
- |
154 |
- insinto /usr/share/zsh/site-functions |
155 |
- doins completions/_${PN} |
156 |
- |
157 |
- if use doc ; then |
158 |
- dodoc -r doc/* |
159 |
- fi |
160 |
-} |
161 |
|
162 |
diff --git a/www-apps/hugo/hugo-0.96.0.ebuild b/www-apps/hugo/hugo-0.96.0.ebuild |
163 |
deleted file mode 100644 |
164 |
index 50ae5b3634cf..000000000000 |
165 |
--- a/www-apps/hugo/hugo-0.96.0.ebuild |
166 |
+++ /dev/null |
167 |
@@ -1,92 +0,0 @@ |
168 |
-# Copyright 2018-2022 Gentoo Authors |
169 |
-# Distributed under the terms of the GNU General Public License v2 |
170 |
- |
171 |
-EAPI=8 |
172 |
- |
173 |
-inherit go-module bash-completion-r1 |
174 |
- |
175 |
-DESCRIPTION="Fast static HTML and CSS website generator" |
176 |
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo" |
177 |
-SRC_URI=" |
178 |
- https://github.com/gohugoio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
179 |
- https://tastytea.de/files/${P}-vendor.tar.xz |
180 |
-" |
181 |
- |
182 |
-# NOTE: To create the vendor tarball, run: |
183 |
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor` |
184 |
- |
185 |
-LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense" |
186 |
-SLOT="0" |
187 |
-KEYWORDS="~amd64 ~x86" |
188 |
-IUSE="doc +sass test test-full" |
189 |
- |
190 |
-BDEPEND=" |
191 |
- >=dev-lang/go-1.18 |
192 |
- test? ( |
193 |
- dev-python/docutils |
194 |
- dev-ruby/asciidoctor |
195 |
- test-full? ( app-text/pandoc ) |
196 |
- ) |
197 |
-" |
198 |
-RDEPEND=" |
199 |
- media-libs/libwebp:= |
200 |
- sass? ( dev-libs/libsass:= ) |
201 |
-" |
202 |
-DEPEND="${RDEPEND}" |
203 |
- |
204 |
-RESTRICT="!test? ( test )" |
205 |
- |
206 |
-PATCHES=( |
207 |
- "${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch" |
208 |
- "${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch" |
209 |
-) |
210 |
- |
211 |
-src_configure() { |
212 |
- export CGO_ENABLED=1 |
213 |
- export CGO_CFLAGS="${CFLAGS}" |
214 |
- export CGO_CPPFLAGS="${CPPFLAGS}" |
215 |
- export CGO_CXXFLAGS="${CXXFLAGS}" |
216 |
- export CGO_LDFLAGS="${LDFLAGS}" |
217 |
- |
218 |
- MY_BUILDFLAGS="$(usev sass "-tags extended")" |
219 |
- |
220 |
- default |
221 |
-} |
222 |
- |
223 |
-src_compile() { |
224 |
- mkdir -pv bin || die |
225 |
- ego build -ldflags "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=gentoo:${PVR}" \ |
226 |
- ${MY_BUILDFLAGS} -o "${S}/bin/hugo" |
227 |
- |
228 |
- bin/hugo gen man --dir man || die |
229 |
- |
230 |
- mkdir -pv completions || die |
231 |
- bin/hugo completion bash > completions/hugo || die |
232 |
- bin/hugo completion fish > completions/hugo.fish || die |
233 |
- bin/hugo completion zsh > completions/_hugo || die |
234 |
- |
235 |
- if use doc ; then |
236 |
- bin/hugo gen doc --dir doc || die |
237 |
- fi |
238 |
-} |
239 |
- |
240 |
-src_test() { |
241 |
- ego test -race "./..." ${MY_BUILDFLAGS} |
242 |
-} |
243 |
- |
244 |
-src_install() { |
245 |
- dobin bin/* |
246 |
- doman man/* |
247 |
- |
248 |
- dobashcomp completions/${PN} |
249 |
- |
250 |
- insinto /usr/share/fish/vendor_completions.d |
251 |
- doins completions/${PN}.fish |
252 |
- |
253 |
- insinto /usr/share/zsh/site-functions |
254 |
- doins completions/_${PN} |
255 |
- |
256 |
- if use doc ; then |
257 |
- dodoc -r doc/* |
258 |
- fi |
259 |
-} |