diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-25 06:11:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-25 06:11:53 +0100 |
| commit | 821eeed50e2a80c0959b8199e364e838d285206c (patch) | |
| tree | c234fb1f6c8f4cd1dbc6bb444e3ad9c6ef90eb7c /dev-vcs/git-extras | |
| parent | 3e837954479e3c2c67afb16e6d997cbd1526c77c (diff) | |
gentoo auto-resync : 25:04:2023 - 06:11:52
Diffstat (limited to 'dev-vcs/git-extras')
| -rw-r--r-- | dev-vcs/git-extras/Manifest | 5 | ||||
| -rw-r--r-- | dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch | 12 | ||||
| -rw-r--r-- | dev-vcs/git-extras/git-extras-7.0.0.ebuild (renamed from dev-vcs/git-extras/git-extras-6.4.0.ebuild) | 19 |
3 files changed, 9 insertions, 27 deletions
diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest index 9932d1582fa4..b25be31cf62a 100644 --- a/dev-vcs/git-extras/Manifest +++ b/dev-vcs/git-extras/Manifest @@ -1,7 +1,6 @@ -AUX git-extras-6.1.0-no-bash-completion-install.patch 556 BLAKE2B 9fbf1516888da9c5952fdaedf28987bcf46e62c6dd1342f810c9150625a78198224855dd18b386076a4fd689418c05d61cc8f0c5c0f747fb96ac6209a4fb402f SHA512 70d25e577174238f5fce6a3810146358904493a7ec3963eef6be8780de7b62bcda7e2c542e8f02cf2dd229acfc7368b72dfd4aff668fbc4e841eb6754b2036f2 AUX git-extras-6.5.0-no-bash-completion-install.patch 803 BLAKE2B b87372a0df3ed314a360ff52eb0cbc01b0cbe52e5ec530ea47ec0bdaacf14a282aa78a1bf4309dba00f8727847b450f0b4d5cdd6deb05e67b2bbcd66394c294c SHA512 c910b8a0f5f4d2d84c6ab679f08fedc74b6625d27e7b72c4fac0fad71f39af3513c4094cdfea4235ae1fa611b3ff305ff48fa6d223638d82216c1dec4276793f -DIST git-extras-6.4.0.tar.gz 163508 BLAKE2B bffbc8efcf1cf030bceb20b953e1cbbc067c8383ced38b786c21eb9bd9b7d3febd3d8aae652c0dd731de688d3cfa225c3aec91d6b9c590459b576db113ca0af0 SHA512 1b28d09d294f6d060b7639401e56c8d5e762614b5f6928ee6267e49af943e349e2399558ebac60008e8240218c13f00f8aea7dc07b71fec1e2dc25487bc847a3 DIST git-extras-6.5.0.tar.gz 167015 BLAKE2B 44331744399f55f9c6bba26bd0eef95e87a5b8ed0a216f3a4a71397fd2ac7aad4325ef787e1970f54c5b8732d0d291c20d6103c8549f3a1eb315bd7fe884337e SHA512 1dbf350ab822f5317d57ca7b90b914a71d3ad83746a79a369e221d20ade606b07a8b0f702610f50d1551c5c3ca12517df18106c6066745b40bf966052bbe9a46 -EBUILD git-extras-6.4.0.ebuild 1133 BLAKE2B ddf932765927787de3c86a2bd7a09cfb6ff694c5780f30f376ab1f47ee8e420178d415c7d548b1848c4a9c5e5a5bc11bbe70b3544238f035121dd7724351c943 SHA512 4b76fad12abcab62bb43c22d676562843d728a3a146236e0dfd3823d9c28e60b6ff1fd8b4875c1e3e2f7c2206f76f6e85da567888ddf9d6cc93150ca427a7bb4 +DIST git-extras-7.0.0.tar.gz 169165 BLAKE2B 8b6ae331b761729d5f92cd350bf21f4f5ebb5098092e224f49db9fe5ef2cbdcd3fc2783af2fb74a8d22008d35675d9a753e753d5fa60e586dbbde919dab7ff80 SHA512 0768ea3de95f5b3de1912dced2c889c2dff823d5c4b8a796c73da043af36b75b3194760a30e8fe7c2525b681fe81fa45a438d0481f4a5166ff6de6d5d7d05927 EBUILD git-extras-6.5.0.ebuild 1104 BLAKE2B 58d5bdcdfe826794e9c253fb862f64dc3e71851ff9fb8f511d867650d0e7d36ee20d5ce0932278e3db1cfd68b4dae619882111e02ccdc5571319efa046f1096d SHA512 c99d725e57b60d695c696c7a98bb0526c90138615a7952a2600743eb4a7825bb54b97b0df3801b8f2865343b50223739e5575b1fce25f66dbd5f6b229321cae3 +EBUILD git-extras-7.0.0.ebuild 1105 BLAKE2B 042f275b96c9398c44c0ecf5d585813c1e5c7f5bd51c81048c788042778199e11c2162847a8f8abae3ec0d743a5a9b1f89bfd97f87f8b9a1c6d444462ce9f80f SHA512 d70445fa3018dff31003e935f61244722471f1b9b0899ef28cda98e206c3c49df4ea8111f41aeeea6a052e2039577d38058d8b7ac02f7bfb1b273734a660f050 MISC metadata.xml 318 BLAKE2B d62d3d04e485a54a0790bbe4390525d6f3ee34ce8ce0c863de54f80c54bfd78f60a32222c0ad101343c3ee7040d5894671a7669c8fc89082bef827cb4edff7ef SHA512 608c0ded622cf20a6d23659fd42295b4c3d70127896b35be659c6d200d649cf496eda5a217deb356754919e0e9d0b635ad38d9b23ae4badd9fdfcf9887f20258 diff --git a/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch deleted file mode 100644 index c1d606c3a38c..000000000000 --- a/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -We shouldn't install this manually via the Makefile - or to that location. ---- a/Makefile -+++ b/Makefile -@@ -69,8 +69,6 @@ install: check - cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \ - echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \ - fi -- @mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d -- cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras - @echo "" - @echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \ - "and put this line into ~/.zshrc to enable zsh completion" diff --git a/dev-vcs/git-extras/git-extras-6.4.0.ebuild b/dev-vcs/git-extras/git-extras-7.0.0.ebuild index 5cf7cb509f5a..1c679d084497 100644 --- a/dev-vcs/git-extras/git-extras-6.4.0.ebuild +++ b/dev-vcs/git-extras/git-extras-7.0.0.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit bash-completion-r1 DESCRIPTION="Git utilities -- repo summary, repl, changelog population, and many more" HOMEPAGE="https://github.com/tj/git-extras" @@ -12,23 +14,15 @@ SLOT="0" KEYWORDS="~amd64 ~x64-macos" RDEPEND=" - app-shells/bash + >=app-shells/bash-4.0:* dev-vcs/git " -PATCHES=( - "${FILESDIR}"/${PN}-6.1.0-no-bash-completion-install.patch -) - src_prepare() { default # For now, don't force including the git completion - # sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die -} - -src_configure() { - return + sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die } src_compile() { @@ -40,6 +34,7 @@ src_install() { DESTDIR="${D}" \ PREFIX="${EPREFIX}/usr" \ SYSCONFDIR="${EPREFIX}/etc" \ + COMPL_DIR="${D}/$(get_bashcompdir)" \ install # TODO: Unfortunately, none of the completion seems to |