commit: f3890607c39c4e79f7679afb5b04cd23bc02619b Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> AuthorDate: Fri May 27 12:58:04 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Jun 6 20:12:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3890607
www-apps/hugo: drop 0.93.3, 0.96.0, old patch Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> Closes: https://github.com/gentoo/gentoo/pull/25658 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> www-apps/hugo/Manifest | 4 - .../files/hugo-0.92.2-link-to-webp-and-sass.patch | 38 --------- www-apps/hugo/hugo-0.93.3.ebuild | 77 ------------------ www-apps/hugo/hugo-0.96.0.ebuild | 92 ---------------------- 4 files changed, 211 deletions(-) diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest index 90d82f5ec2d5..3cc46dbf0338 100644 --- a/www-apps/hugo/Manifest +++ b/www-apps/hugo/Manifest @@ -1,7 +1,3 @@ -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.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 DIST hugo-0.99.1-vendor.tar.xz 5675228 BLAKE2B 80fdd25fe924bcde7f200b805bf6598dbb726bb628b82e9b0d2809414a7a6e33cbfe069e29953e75b8ed4ecdb9c7303b44a8d8195b43540977cd7461295de109 SHA512 88ffb6bea777e3a72dac05941de542acdc6a17faff9e98517e483e17c7a42d1ab5aa7e65ed3a91f6832468d2da3e98e87346118694a8e20f6375fad56d5d7ff0 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 deleted file mode 100644 index bda6f9bcc3f2..000000000000 --- a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b1c99224dc0d318109832531c98ec24ef4c0020e Mon Sep 17 00:00:00 2001 -From: tastytea <[email protected]> -Date: Wed, 23 Feb 2022 14:00:36 +0100 -Subject: [PATCH] Link to webp and sass - -We need to add the flags because we unbundle media-libs/libwebp and -dev-libs/libsass. ---- - vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go | 2 +- - vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go | 2 +- - 2 files changed, 2 insertions(+), 2 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 af51b92..979d9e7 100644 ---- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go -+++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go -@@ -8,6 +8,6 @@ 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 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 4b105ab..cec2faa 100644 ---- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go -+++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go -@@ -2,5 +2,5 @@ - - package libwebp - --// #cgo linux LDFLAGS: -lm -+// #cgo linux LDFLAGS: -lm -lwebp - import "C" --- -2.34.1 - diff --git a/www-apps/hugo/hugo-0.93.3.ebuild b/www-apps/hugo/hugo-0.93.3.ebuild deleted file mode 100644 index 7dd2072578ca..000000000000 --- a/www-apps/hugo/hugo-0.93.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2022 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/${P}-vendor.tar.xz -" - -# NOTE: To create the vendor tarball, run: -# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor` - -LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc +sass" - -BDEPEND=">=dev-lang/go-1.16.0" -RDEPEND=" - media-libs/libwebp - sass? ( dev-libs/libsass ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-0.92.2-link-to-webp-and-sass.patch" ) - -src_configure() { - export CGO_ENABLED=1 - export CGO_CFLAGS="${CFLAGS}" - export CGO_CPPFLAGS="${CPPFLAGS} -DLIBWEBP_NO_SRC -DUSE_LIBSASS_SRC" - export CGO_CXXFLAGS="${CXXFLAGS}" - export CGO_LDFLAGS="${LDFLAGS}" - - 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" - - 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_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 -} diff --git a/www-apps/hugo/hugo-0.96.0.ebuild b/www-apps/hugo/hugo-0.96.0.ebuild deleted file mode 100644 index 50ae5b3634cf..000000000000 --- a/www-apps/hugo/hugo-0.96.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2018-2022 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/${P}-vendor.tar.xz -" - -# NOTE: To create the vendor tarball, run: -# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor` - -LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense" -SLOT="0" -KEYWORDS="~amd64 ~x86" -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}" - -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}" - 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() { - 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 -}
