From 3cb00878e7f2637ac05ccfbaafad4410be905728 Mon Sep 17 00:00:00 2001 From: Terin Stock Date: Fri, 31 Jul 2026 14:14:17 +0200 Subject: dev-vcs/git-branchless: add 0.11.1, drop 0.10.0 --- dev-vcs/git-branchless/Manifest | 4 +- .../files/git-branchless-vendor-config | 5 --- .../git-branchless/git-branchless-0.10.0.ebuild | 38 ----------------- .../git-branchless/git-branchless-0.11.1.ebuild | 48 ++++++++++++++++++++++ 4 files changed, 50 insertions(+), 45 deletions(-) delete mode 100644 dev-vcs/git-branchless/files/git-branchless-vendor-config delete mode 100644 dev-vcs/git-branchless/git-branchless-0.10.0.ebuild create mode 100644 dev-vcs/git-branchless/git-branchless-0.11.1.ebuild diff --git a/dev-vcs/git-branchless/Manifest b/dev-vcs/git-branchless/Manifest index 8110621..9001b79 100644 --- a/dev-vcs/git-branchless/Manifest +++ b/dev-vcs/git-branchless/Manifest @@ -1,2 +1,2 @@ -DIST git-branchless-0.10.0-vendor.tar.xz 38262148 BLAKE2B e20211a3edf0ea7f227f0a9c504704afe0810bac706032d2edd79f5cc61edcb074221128ec95eac8ee44a0088f3ad30a3b8b57fbf1e304221acab2f5b0d8b051 SHA512 796285cad85fbb89bf66419f0540d82175dc18b71317a6be5b8f39c789debaf7dcfa9a825b05461490edfa6210e0b969bd9792e68352d830cdcfb4a09a5d4786 -DIST git-branchless-0.10.0.tar.gz 539457 BLAKE2B 9c4a3dbd3c86299ae1efa31697f042c21ac78f8c3babc74dd2e2b14c7f2952eb28f0bbb961c5f787cbe4672b3875b910ec4ef31ddb9fb8e4f3b4eeda7ce791fa SHA512 568048b687bb566d46b457643b939c9e7096634979f22082ca4622199437ad497b860ce95f5c459c458a90eeef484858b35d0c9863e745d4500deb0e511ea1cf +DIST git-branchless-0.11.1-vendor.tar.xz 54662364 BLAKE2B 6dc7a70da087c3727608711e9a993b61bde3019402882b50fccea26f783d8d3dadcdb601c835194bfaa28d84e756e4b9e696ce60ddf83aef8053e6e9187d961a SHA512 9cce08c3f1c9e93419733b11f0cbbd30017a8bb2f4785f70b76fb2392eba0fd95df2e7d477171363183d297b431804e5d8f53659b66105da6ae1efc9c0dc2574 +DIST git-branchless-0.11.1.tar.gz 571319 BLAKE2B 72303a49e2563dcfb15898104e018a8a0ecb76e4ab89b631ba01830423731c67c7589d968bd5cfcbc9f7e7f519890b9d66bc701ec638ad3dbd9bee5360655db2 SHA512 6b991391eaf2dca4ea3a5f723a2af5d10d2c3b62fbd4b60521f4d013a4038dbfe1f4c8532527af5c0fe1b8236fd53a0bc74428ca4a138a44a806a482b4f78d82 diff --git a/dev-vcs/git-branchless/files/git-branchless-vendor-config b/dev-vcs/git-branchless/files/git-branchless-vendor-config deleted file mode 100644 index 0236928..0000000 --- a/dev-vcs/git-branchless/files/git-branchless-vendor-config +++ /dev/null @@ -1,5 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" diff --git a/dev-vcs/git-branchless/git-branchless-0.10.0.ebuild b/dev-vcs/git-branchless/git-branchless-0.10.0.ebuild deleted file mode 100644 index fa2b7da..0000000 --- a/dev-vcs/git-branchless/git-branchless-0.10.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" " -inherit cargo - -DESCRIPTION="Branchless workflow for Git" -HOMEPAGE="https://github.com/arxanas/git-branchless" -SRC_URI="https://github.com/arxanas/git-branchless/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://share.terinstock.com/${P}-vendor.tar.xz " - -LICENSE="|| ( MIT Apache-2.0 )" -LICENSE+=" MIT Apache-2.0 Unicode-DFS-2016 0BSD Apache-2.0-with-LLVM-exceptions" -LICENSE+=" BSD-2 BSD ISC Unlicense MPL-2.0 CC0-1.0 Boost-1.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="${DEPEND}" - -src_unpack() { - cargo_src_unpack - mkdir "${S}"/{vendor,.cargo} || die - ln -s "${WORKDIR}/vendor/"* "${S}"/vendor || die - cp "${FILESDIR}"/"${PN}-vendor-config" "${S}/.cargo/config.toml" || die -} - -src_configure() { - cargo_gen_config - cargo_src_configure --no-default-features --bin git-branchless -} - -src_install() { - cargo_src_install --path ./git-branchless -} - -QA_FLAGS_IGNORED="usr/bin/${PN}" diff --git a/dev-vcs/git-branchless/git-branchless-0.11.1.ebuild b/dev-vcs/git-branchless/git-branchless-0.11.1.ebuild new file mode 100644 index 0000000..6122832 --- /dev/null +++ b/dev-vcs/git-branchless/git-branchless-0.11.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +RUST_MIN_VER="1.86.0" +CRATES=" " +inherit cargo + +DESCRIPTION="Branchless workflow for Git" +HOMEPAGE="https://github.com/arxanas/git-branchless" +SRC_URI="https://github.com/arxanas/git-branchless/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://share.terinstock.com/${P}-vendor.tar.xz " + +LICENSE="|| ( MIT Apache-2.0 )" +LICENSE+=" MIT Apache-2.0 Unicode-DFS-2016 0BSD Apache-2.0-with-LLVM-exceptions" +LICENSE+=" BSD-2 BSD ISC Unlicense MPL-2.0 CC0-1.0 Boost-1.0" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND=" + dev-libs/libgit2 + dev-db/sqlite:3 + virtual/pkgconfig +" +RDEPEND="${DEPEND}" + +src_unpack() { + cargo_src_unpack + ln -s "${WORKDIR}/vendor/"* "${CARGO_HOME}/gentoo/" || die +} + +src_prepare() { + default + + export LIBGIT2_NO_VENDOR=1 + export LIBSQLITE3_SYS_USE_PKG_CONFIG=1 + export PKG_CONFIG_ALLOW_CROSS=1 +} + +src_configure() { + cargo_gen_config + cargo_src_configure --no-default-features --bin git-branchless +} + +src_install() { + cargo_src_install --path ./git-branchless +} -- cgit v1.3