commit: 1cd433d3b979a852b3a7b1754d754b9adaece714 Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Sat Apr 27 22:43:00 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Mon May 13 22:18:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1cd433d3
dev-util/*: fix variable order I manually went through some entries for `pkgcheck scan -c VariableOrderCheck`. Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> Signed-off-by: Julien Roy <julien <AT> jroy.ca> dev-util/bruno-bin/bruno-bin-1.9.0-r1.ebuild | 4 ++-- dev-util/bruno-bin/bruno-bin-1.9.0.ebuild | 4 ++-- dev-util/exercism/exercism-3.1.0.ebuild | 4 ++-- dev-util/exercism/exercism-3.2.0.ebuild | 4 ++-- dev-util/fortran-test-drive/fortran-test-drive-0.4.0.ebuild | 8 ++++---- dev-util/git-bug/git-bug-0.8.0.ebuild | 8 ++++---- dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.42.0.ebuild | 4 ++-- dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.43.0.ebuild | 4 ++-- dev-util/insomnia-bin/insomnia-bin-2020.5.2.ebuild | 4 ++-- dev-util/insomnia-bin/insomnia-bin-2023.5.8.ebuild | 4 ++-- dev-util/lottieconverter/lottieconverter-0.2.ebuild | 4 ++-- dev-util/mh/mh-1.0.3.ebuild | 7 +++---- dev-util/stripe-cli/stripe-cli-9999.ebuild | 4 +++- dev-util/stylua/stylua-0.20.0.ebuild | 4 ++-- dev-util/xxd/xxd-8.2.4092.ebuild | 4 ++-- 15 files changed, 36 insertions(+), 35 deletions(-) diff --git a/dev-util/bruno-bin/bruno-bin-1.9.0-r1.ebuild b/dev-util/bruno-bin/bruno-bin-1.9.0-r1.ebuild index 26a7952949..ef9d3f9606 100644 --- a/dev-util/bruno-bin/bruno-bin-1.9.0-r1.ebuild +++ b/dev-util/bruno-bin/bruno-bin-1.9.0-r1.ebuild @@ -14,6 +14,8 @@ HOMEPAGE=" " SRC_URI="https://github.com/usebruno/${PN%-*}/releases/download/v${PV}/${PN%-*}_${PV}_amd64_linux.deb"; +S="${WORKDIR}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -56,8 +58,6 @@ QA_PREBUILT=" opt/Bruno/libvulkan.so.1 " -S="$WORKDIR" - src_prepare() { default rm opt/Bruno/LICENSE* || die diff --git a/dev-util/bruno-bin/bruno-bin-1.9.0.ebuild b/dev-util/bruno-bin/bruno-bin-1.9.0.ebuild index abde2b3035..477cdd9c00 100644 --- a/dev-util/bruno-bin/bruno-bin-1.9.0.ebuild +++ b/dev-util/bruno-bin/bruno-bin-1.9.0.ebuild @@ -14,6 +14,8 @@ HOMEPAGE=" " SRC_URI="https://github.com/usebruno/${PN%-*}/releases/download/v${PV}/${PN%-*}_${PV}_amd64_linux.deb"; +S="${WORKDIR}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -57,8 +59,6 @@ QA_PREBUILT=" opt/Bruno/libvulkan.so.1 " -S="$WORKDIR" - src_install() { for size in 16x16 32x32 48x48 128x128 256x256 512x512 1024x1024; do doicon -s "${size}" usr/share/icons/hicolor/"${size}"/apps/bruno.png diff --git a/dev-util/exercism/exercism-3.1.0.ebuild b/dev-util/exercism/exercism-3.1.0.ebuild index 819b2f6f94..d181898e95 100644 --- a/dev-util/exercism/exercism-3.1.0.ebuild +++ b/dev-util/exercism/exercism-3.1.0.ebuild @@ -64,6 +64,8 @@ SRC_URI="https://github.com/${PN}/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz ${EGO_SUM_SRC_URI} " +S="${WORKDIR}/cli-${PV}" + LICENSE="MIT Apache-2.0 BSD-2 BSD MPL-2.0" SLOT="0" KEYWORDS="~amd64" @@ -71,8 +73,6 @@ KEYWORDS="~amd64" RDEPEND="sys-libs/glibc" BDEPEND="dev-lang/go" -S="${WORKDIR}/cli-${PV}" - src_compile() { ego build -o out/exercism exercism/main.go } diff --git a/dev-util/exercism/exercism-3.2.0.ebuild b/dev-util/exercism/exercism-3.2.0.ebuild index eb562edb6a..9b27b8a545 100644 --- a/dev-util/exercism/exercism-3.2.0.ebuild +++ b/dev-util/exercism/exercism-3.2.0.ebuild @@ -64,6 +64,8 @@ SRC_URI="https://github.com/${PN}/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz ${EGO_SUM_SRC_URI} " +S="${WORKDIR}/cli-${PV}" + LICENSE="MIT Apache-2.0 BSD-2 BSD MPL-2.0" SLOT="0" KEYWORDS="~amd64" @@ -71,8 +73,6 @@ KEYWORDS="~amd64" RDEPEND="sys-libs/glibc" BDEPEND="dev-lang/go" -S="${WORKDIR}/cli-${PV}" - src_compile() { ego build -o out/exercism exercism/main.go } diff --git a/dev-util/fortran-test-drive/fortran-test-drive-0.4.0.ebuild b/dev-util/fortran-test-drive/fortran-test-drive-0.4.0.ebuild index 5cff63bbb8..f0f4dca510 100644 --- a/dev-util/fortran-test-drive/fortran-test-drive-0.4.0.ebuild +++ b/dev-util/fortran-test-drive/fortran-test-drive-0.4.0.ebuild @@ -8,20 +8,20 @@ FORTRAN_STANDARD="2003" inherit cmake fortran-2 MY_PN="test-drive" -SRC_URI="https://github.com/fortran-lang/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" DESCRIPTION="The simple testing framework (for Fortran)" HOMEPAGE="https://github.com/fortran-lang/test-drive"; +SRC_URI="https://github.com/fortran-lang/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" + IUSE="test" RESTRICT="mirror !test? ( test )" -S="${WORKDIR}/${MY_PN}-${PV}" - - pkg_setup() { fortran-2_pkg_setup } diff --git a/dev-util/git-bug/git-bug-0.8.0.ebuild b/dev-util/git-bug/git-bug-0.8.0.ebuild index 98ee10a6fd..0f99d62bd1 100644 --- a/dev-util/git-bug/git-bug-0.8.0.ebuild +++ b/dev-util/git-bug/git-bug-0.8.0.ebuild @@ -7,15 +7,15 @@ inherit go-module DESCRIPTION="distributed, offline-first bug tracker" HOMEPAGE="https://github.com/MichaelMure/git-bug"; +SRC_URI="https://github.com/MichaelMure/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"; -SRC_URI="https://github.com/MichaelMure/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"; - -RESTRICT="strip" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" +RESTRICT="strip" + src_compile() { ego generate ego build \ diff --git a/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.42.0.ebuild b/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.42.0.ebuild index 7e5c8ce879..1eb079fa8b 100644 --- a/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.42.0.ebuild +++ b/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.42.0.ebuild @@ -9,6 +9,8 @@ DESCRIPTION="Run gitlab pipelines locally as shell executor or docker executor" HOMEPAGE="https://github.com/firecow/gitlab-ci-local"; SRC_URI="https://github.com/firecow/gitlab-ci-local/releases/download/${PV}/linux.gz -> ${P}.gz" +S="${WORKDIR}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -17,8 +19,6 @@ KEYWORDS="~amd64" # sort of self-introspection. RESTRICT="strip" -S="${WORKDIR}" - MY_PN="${PN/-bin/}" QA_PREBUILT="usr/bin/gitlab-ci-local" diff --git a/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.43.0.ebuild b/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.43.0.ebuild index 7e5c8ce879..1eb079fa8b 100644 --- a/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.43.0.ebuild +++ b/dev-util/gitlab-ci-local-bin/gitlab-ci-local-bin-4.43.0.ebuild @@ -9,6 +9,8 @@ DESCRIPTION="Run gitlab pipelines locally as shell executor or docker executor" HOMEPAGE="https://github.com/firecow/gitlab-ci-local"; SRC_URI="https://github.com/firecow/gitlab-ci-local/releases/download/${PV}/linux.gz -> ${P}.gz" +S="${WORKDIR}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -17,8 +19,6 @@ KEYWORDS="~amd64" # sort of self-introspection. RESTRICT="strip" -S="${WORKDIR}" - MY_PN="${PN/-bin/}" QA_PREBUILT="usr/bin/gitlab-ci-local" diff --git a/dev-util/insomnia-bin/insomnia-bin-2020.5.2.ebuild b/dev-util/insomnia-bin/insomnia-bin-2020.5.2.ebuild index 5cb6b8b25e..5c3591b94a 100644 --- a/dev-util/insomnia-bin/insomnia-bin-2020.5.2.ebuild +++ b/dev-util/insomnia-bin/insomnia-bin-2020.5.2.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="HTTP and GraphQL client for developers" HOMEPAGE="https://insomnia.rest"; SRC_URI="https://github.com/Kong/${MY_PN}/releases/download/core@${PV}/Insomnia.Core-${PV}.deb"; +S="${WORKDIR}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -48,8 +50,6 @@ RDEPEND=" QA_PREBUILT="*" -S="${WORKDIR}" - src_prepare() { default diff --git a/dev-util/insomnia-bin/insomnia-bin-2023.5.8.ebuild b/dev-util/insomnia-bin/insomnia-bin-2023.5.8.ebuild index f9e955389b..9dab20657b 100644 --- a/dev-util/insomnia-bin/insomnia-bin-2023.5.8.ebuild +++ b/dev-util/insomnia-bin/insomnia-bin-2023.5.8.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="HTTP and GraphQL client for developers" HOMEPAGE="https://insomnia.rest"; SRC_URI="https://github.com/Kong/${MY_PN}/releases/download/core@${PV}/Insomnia.Core-${PV}.deb"; +S="$WORKDIR" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" @@ -43,8 +45,6 @@ RDEPEND=" accessibility? ( app-accessibility/at-spi2-core ) " -S="$WORKDIR" - src_install() { for size in 16x16 32x32 48x48 128x128 256x256 512x512 ; do doicon -s "${size}" usr/share/icons/hicolor/"${size}"/apps/insomnia.png diff --git a/dev-util/lottieconverter/lottieconverter-0.2.ebuild b/dev-util/lottieconverter/lottieconverter-0.2.ebuild index 36a674c609..997c31987c 100644 --- a/dev-util/lottieconverter/lottieconverter-0.2.ebuild +++ b/dev-util/lottieconverter/lottieconverter-0.2.ebuild @@ -9,12 +9,12 @@ DESCRIPTION="Simple lottie (telegram animated sticker) converter." HOMEPAGE="https://github.com/sot-tech/LottieConverter"; SRC_URI="https://github.com/sot-tech/${PN}/archive/refs/tags/r${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/LottieConverter-r0.2" + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc64" -S="${WORKDIR}/LottieConverter-r0.2" - DEPEND="media-libs/rlottie media-libs/libpng media-libs/giflib" RDEPEND="${DEPEND}" diff --git a/dev-util/mh/mh-1.0.3.ebuild b/dev-util/mh/mh-1.0.3.ebuild index d2c0f855c1..d3d830e8fc 100644 --- a/dev-util/mh/mh-1.0.3.ebuild +++ b/dev-util/mh/mh-1.0.3.ebuild @@ -6,22 +6,21 @@ EAPI=7 DESCRIPTION="Generate help for Makefile" HOMEPAGE="https://github.com/oz123/mh"; SRC_URI="https://github.com/oz123/mh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + LICENSE="BSD" SLOT=0 +KEYWORDS="~amd64" IUSE="test" -KEYWORDS="~amd64" RESTRICT="!test? ( test )" BDEPEND="virtual/pkgconfig" - RDEPEND="dev-libs/libpcre2" - DEPEND=" ${RDEPEND} test? ( dev-util/cmocka ) - " +" src_compile() { emake mh VERSION="${PV}" diff --git a/dev-util/stripe-cli/stripe-cli-9999.ebuild b/dev-util/stripe-cli/stripe-cli-9999.ebuild index a3bfd95cfe..ab1ee54e95 100644 --- a/dev-util/stripe-cli/stripe-cli-9999.ebuild +++ b/dev-util/stripe-cli/stripe-cli-9999.ebuild @@ -10,9 +10,11 @@ MY_PN=${PN%-cli} DESCRIPTION="A command-line tool for Stripe" HOMEPAGE="https://stripe.com/docs/stripe-cli"; EGIT_REPO_URI="https://${EGO_PN}.git"; + +LICENSE="Apache-2.0" SLOT="0" IUSE="bash-completion" -LICENSE="Apache-2.0" + BDEPEND=">=dev-lang/go-1.18" DEPEND="${BDEPEND}" diff --git a/dev-util/stylua/stylua-0.20.0.ebuild b/dev-util/stylua/stylua-0.20.0.ebuild index 5419b14405..8127a26f9c 100644 --- a/dev-util/stylua/stylua-0.20.0.ebuild +++ b/dev-util/stylua/stylua-0.20.0.ebuild @@ -179,6 +179,8 @@ SRC_URI=" ${CARGO_CRATE_URIS} " +S="${WORKDIR}/StyLua-${PV}" + LICENSE="MPL-2.0" # Dependent crate licenses LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-DFS-2016" @@ -186,8 +188,6 @@ SLOT="0" KEYWORDS="~amd64" IUSE="lua52 lua53 lua54 luau" -S="${WORKDIR}/StyLua-${PV}" - QA_FLAGS_IGNORED=".*" src_configure() { diff --git a/dev-util/xxd/xxd-8.2.4092.ebuild b/dev-util/xxd/xxd-8.2.4092.ebuild index 42fd9b3133..a4bcb1bac7 100644 --- a/dev-util/xxd/xxd-8.2.4092.ebuild +++ b/dev-util/xxd/xxd-8.2.4092.ebuild @@ -14,6 +14,8 @@ SRC_URI=" -> ${P}.1 " +S="${WORKDIR}" + # Attribution in xxd.c differs from vim. LICENSE="GPL-2 MIT" SLOT="0" @@ -21,8 +23,6 @@ KEYWORDS="~amd64 ~x86" RDEPEND="!app-editors/vim-core" -S="${WORKDIR}" - src_unpack() { cp "${DISTDIR}"/${P}.c xxd.c || die "cp failed" cp "${DISTDIR}"/${P}.1 xxd.1 || die "cp failed"
