diff options
Diffstat (limited to 'dev-vcs')
48 files changed, 343 insertions, 3135 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex f07c1542801f..70a9d7e4e4cd 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/easygit/Manifest b/dev-vcs/easygit/Manifest index 245488fcbb5e..15676b6b75aa 100644 --- a/dev-vcs/easygit/Manifest +++ b/dev-vcs/easygit/Manifest @@ -1,3 +1,3 @@ DIST easygit-1.7.5.2 283887 BLAKE2B 978e60add4f9a3e982010a002bad74d88fd7b00b544a9150d6926aae24430e833f56115fce80568b9095d2b1896bd45838312012609c47a4499a7e67b05e9d91 SHA512 fa798a18b3d9ae8394faa3a5772ad21c6c439835de977dbce077b79823e022f9aa15e2d603ab16ea592048dab039aed2d647018cd83f7b3ec0b6c0e7679d0eec EBUILD easygit-1.7.5.2.ebuild 517 BLAKE2B 200072df1a75b28ba5dbe45c5482a4aea0ad923d1b30934ae303c32e918a72051a21d1d8c1e2ff97b84e376427cf86abbe11af9ac9f8a090b28a9547d8e57884 SHA512 20344edec75e386df8a23a902f1051b29cdffad1bd727ef3450e18f3862046355fb6249275115ae468ed275486a0b08c5f23c45746e91c68a0eff795bff05e72 -MISC metadata.xml 363 BLAKE2B ee398b88367b0004f371ce5afc8580a4a2e115485a1e3f882369f9046c49519891b6ea6fa50fb4a33079c0c63639efe1fed8ee5d286dcfbebe216a06d4e1b173 SHA512 a19c917a1e76ae139fba6a947b896783c6c700c350e56bd1ed32ccbfbc9e28bf8cbdd074ec29aadfc98eee1339926582bae8eea87e8b596c6368e298b7a44bc1 +MISC metadata.xml 393 BLAKE2B 4e6384d199282453f5abaeb4b3fc89a44a3eae88d7084e6619c2ca3abb7162b476adfb9dfa938c20a24c84f879962455922082a9ee4765791531afd4b8366781 SHA512 610ff6d76acaee2a052ebe59b637f1baa26293b675683f4322d5364b0bb0a41294e654fa848eac866cf0e25788c72cb5d32fc1aba3bcfc5eb2275b4892a504fa diff --git a/dev-vcs/easygit/metadata.xml b/dev-vcs/easygit/metadata.xml index e8523f5eab18..efcefa58be0f 100644 --- a/dev-vcs/easygit/metadata.xml +++ b/dev-vcs/easygit/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>gentoo@culot.org</email> <name>Frederic Culot</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-vcs/git-big-picture/Manifest b/dev-vcs/git-big-picture/Manifest index d66b6f1b8d67..792d18844df6 100644 --- a/dev-vcs/git-big-picture/Manifest +++ b/dev-vcs/git-big-picture/Manifest @@ -2,4 +2,4 @@ DIST git-big-picture-1.0.0.tar.gz 2952246 BLAKE2B caf28b57399bbdc2c80feda70e2a04 DIST git-big-picture-1.1.1.tar.gz 2960674 BLAKE2B 00b3117f810b78965e5a260000689c3275f078307f8e5ef90e6a032036eeedcda743c6eff3e3a1f53744d71d9b3bf2692efc558d5f5b20eada9a9b2e21559796 SHA512 1bf1b620d73cccb058034bc8920adcab117fbda8b921937aac6b90e2162cf4b334cae934b0395efdf40b5e9a363e7ec69090ca943c839829dedaa40428dbdb13 EBUILD git-big-picture-1.0.0.ebuild 716 BLAKE2B 8783643bfe34e5b43efb9545bd901d022d984cf000c6eb04a182e493df52e7713db667a476d20dd9db1df9a492b1740eb4193a0771eb03bb2b39e40792dedfab SHA512 b234296687ceb1aae19757d42d4baa822233889087dcea91fd71efae7f5759cd4006b4d9bbb884049261c499828f7a8e3fae83a926b4423d48b35cd8f8eb8792 EBUILD git-big-picture-1.1.1.ebuild 876 BLAKE2B 5c43832dc4e02c9164a6ae4c9b4488eabdee730572b5a5535fc0519be22c0b3ca97670ce675dfb9b92d6498e171252cae0348a9091a8b356746181d4db120c98 SHA512 0fe6e14a0c7c3bd76ad1c659f0094210240ce25403068e86d74991b6c4f17701a19a0c8bcdd8c18ee65e311d56205614cb74cf09d626ad8bc1ade515b7ddda05 -MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138 +MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273 diff --git a/dev-vcs/git-big-picture/metadata.xml b/dev-vcs/git-big-picture/metadata.xml index ab886b7f0382..6d2298876faa 100644 --- a/dev-vcs/git-big-picture/metadata.xml +++ b/dev-vcs/git-big-picture/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index 579ed4b41cd9..332d8415f249 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -7,4 +7,4 @@ DIST git-cola-3.9.tar.gz 992335 BLAKE2B ab591d953173aa69773a82eb91ebcc6fa5bc5e31 EBUILD git-cola-3.5-r1.ebuild 2706 BLAKE2B ae347bfb42eef709c9620900f8dae3e215fcffdf2e6a2bd6eadb9eb9054cbfbef814b08be395a1dcb8bdfa77ce9fa17510b65219a0e728a523730271b9d30dd3 SHA512 83765a40e7217641dd6a6819f1dfe72d829ee2652398e249a6b40c5c7d874567d5d49027340aef999e3ef9935ba797eae2e1b9eab178583a072a1197949f9bb3 EBUILD git-cola-3.8.ebuild 2525 BLAKE2B 141b9770a44592c08ca6da7ffa26e96fc078b7510a21a14e4a2a573ccd483c916e0b725f5e2aafdf43d05f0ede948afe328be4b61dbbdc747c336c8ae06e15bb SHA512 2e60b40364b5b336bbf349937eec3cce2e521c5ce8631b70520bfc6dab52b7bccb4afc1a2c9f5535bd6f7185f8d9f11fb89da499d195fb1c86ce341738755a17 EBUILD git-cola-3.9.ebuild 2485 BLAKE2B d38134cc923f23c0f83a0d93688d5216f56ad9948318e709e1f6a6bfd70d1dd274c0855e3f3e95816c177150b50ae781eea47508ff498216922bb851d2114582 SHA512 d5a6fedca17d935ab671358fbbac0b8ccd27fba133af3011c4ce3b74f45f4e7768079d6bd985d609b22487709658c8b380288eaca5fcf880035b069924fb4548 -MISC metadata.xml 550 BLAKE2B 65feeb544a556d9202adda4f760b622c21bc03e04ae40428a49f3c53f253065cb923bbdf70c10187935895d5afc47ed9e49d8789d616503963689fdac06e860c SHA512 92a636e729d3d000e04773b2debb015b399f0b87f32a14c259c915975864e1d40114e68c7434fbe055913fbdc9f73c3f1d400807c25e83cf0b49f354b302e657 +MISC metadata.xml 594 BLAKE2B 13b00c0c9e670e5144d90689403127d05c55306213d7aa8fcc04c84a4006ee507542ff89a29c0f969ce97f930fc511e1e8d8f453ad0e6d39340449c530d8f3f3 SHA512 a6eeb13098e2e39aeaa150afd71e8b52405238021943c45335e1bd5cc70eafa79d2bdcb4564db32b9e1b96ef78c5740abac358d72ea64dbe90f279e72c8fe4f8 diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml index 4f507e2ec3d4..60cd890892bf 100644 --- a/dev-vcs/git-cola/metadata.xml +++ b/dev-vcs/git-cola/metadata.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>davidroman96@gmail.com</email> <name>David Roman</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>me@bearsh.org</email> <name>Martin Gysel</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest new file mode 100644 index 000000000000..91e7029915b9 --- /dev/null +++ b/dev-vcs/git-extras/Manifest @@ -0,0 +1,4 @@ +AUX git-extras-6.1.0-no-bash-completion-install.patch 556 BLAKE2B 9fbf1516888da9c5952fdaedf28987bcf46e62c6dd1342f810c9150625a78198224855dd18b386076a4fd689418c05d61cc8f0c5c0f747fb96ac6209a4fb402f SHA512 70d25e577174238f5fce6a3810146358904493a7ec3963eef6be8780de7b62bcda7e2c542e8f02cf2dd229acfc7368b72dfd4aff668fbc4e841eb6754b2036f2 +DIST git-extras-6.1.0.tar.gz 153503 BLAKE2B 3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747 SHA512 098415339177f802299d93947e2979a2fc6c2935eb2d735cd71ad76e035d5489e4c8d9009e2673c109b28e393319745be249cc195814087d59b436f4a56dabab +EBUILD git-extras-6.1.0.ebuild 1160 BLAKE2B 85d0d2077e00e01276b55f5ed70f9cff1d69546abcb93678e3f92e188190871058c75ec80594cbea5acf34bb972b7f3f2206b29863032ac01ffe88b7283bd822 SHA512 656f125a60213ac1d9e1477753fd110e5d78b3dd6e6852ae347114acf8b0518179105e5f46e2c71fe05b122d2e11e825aae38781ffd19f5fd07c1d016119df6b +MISC metadata.xml 317 BLAKE2B 81e94ccb8505cef2f0dd08b3cfa09c0f00f8ec7ba52f507cdb85467d48d10d7edf311beddb8f766fbcf10a49f62245839dda84a194268a0a5fdfb66ace18015e SHA512 b9353731d4665fe680aed7ffd9236177651ce2bbf6a7210652055cacf5fea38ee5fb7caecaa7cdeefcd7068fdfac85a1fa504135eccc6dda56929a5c1c2dde1b 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 new file mode 100644 index 000000000000..c1d606c3a38c --- /dev/null +++ b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch @@ -0,0 +1,12 @@ +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.1.0.ebuild b/dev-vcs/git-extras/git-extras-6.1.0.ebuild new file mode 100644 index 000000000000..7ee7468ae07c --- /dev/null +++ b/dev-vcs/git-extras/git-extras-6.1.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Git utilities -- repo summary, repl, changelog population, author commit percentages and more" +HOMEPAGE="https://github.com/tj/git-extras" +SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x64-macos" + +RDEPEND=" + app-shells/bash + 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 +} + +src_compile() { + return +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + SYSCONFDIR="${EPREFIX}/etc" \ + install + + # TODO: Unfortunately, none of the completion seems to + # actually work for me yet(?) + + #newbashcomp "${S}"/etc/bash_completion.sh ${PN} + + #insinto /usr/share/zsh/site-functions + #newins "${S}"/etc/${PN}-completion.zsh _${PN} + + #insinto /usr/share/fish/vendor_completions.d + #doins "${S}"/etc/${PN}.fish +} diff --git a/dev-vcs/git-extras/metadata.xml b/dev-vcs/git-extras/metadata.xml new file mode 100644 index 000000000000..a74e708790bf --- /dev/null +++ b/dev-vcs/git-extras/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <upstream> + <remote-id type="github">tj/git-extras</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest index 2a98335737d3..92f63d19ed1a 100644 --- a/dev-vcs/git-lfs/Manifest +++ b/dev-vcs/git-lfs/Manifest @@ -3,4 +3,4 @@ DIST git-lfs-2.13.1.tar.gz 2526962 BLAKE2B 3f3af1c0f976a17c108159fff15a065600f32 EBUILD git-lfs-2.11.0.ebuild 1392 BLAKE2B d6e33aa99c265dd3e2fd889c5bd9a70b751e15cc9757343e1e1bd7bec432e8015611e7b3009d1cd291eaa6b69e0a6fb7581d50f744f1a164d52936095ee5c03d SHA512 497ae5f9fa85cc412cb1708f13e75acaafc4087c5243aee8bdc9ff4567756cd60602cda6092ea1f98fe560a7ae9a6a05f69ffbb862136d2782b2850d8512ad15 EBUILD git-lfs-2.13.1.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69 EBUILD git-lfs-9999.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69 -MISC metadata.xml 446 BLAKE2B f6678414b5292ac89330446f6e140a70f998e9932dc0852a0de0bdcfd6406fa9bbc0aa479973ef0cebedf6bfa6a041bf9c3deb94df0e58c2bf57655b0d5f30aa SHA512 f63de45e71c0b09ef762289665523c39f5d89687b1d92e8ef632e8fa74af3a2150ef29a05e30846a8378f100360ddd275f4a0f63f57c480abf21adfa60b81d81 +MISC metadata.xml 476 BLAKE2B 19aa325991d7694677a8d5e50154404b678416fc4b446c33fdeb9ae3db078c06845fbfe11ebf37bd1afcc1c35f19233bcc290b5f47ff16ec0305ceb7829758b0 SHA512 ddb583c724ba2b948f66c3568352a10cb09067a66ec98596f8dba11001f5101cb69e9fdb74b29278aead3b123ee6bd69a4a4f785d72bb1a2977fb129c89ecf02 diff --git a/dev-vcs/git-lfs/metadata.xml b/dev-vcs/git-lfs/metadata.xml index 0b79785e6d58..ce896675e9ac 100644 --- a/dev-vcs/git-lfs/metadata.xml +++ b/dev-vcs/git-lfs/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>holgersson@posteo.de</email> <name>Nils Freydank</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-vcs/git-publish/Manifest b/dev-vcs/git-publish/Manifest new file mode 100644 index 000000000000..1131beed3d62 --- /dev/null +++ b/dev-vcs/git-publish/Manifest @@ -0,0 +1,3 @@ +DIST git-publish-1.7.0.tar.gz 21569 BLAKE2B 1438e5018ebe7d258fee2527597e56080b574765a87b03d814b6d0d41c68397cba6099866382e9f2c560d8bab58214fb9e5f54f0127433917178337df81ff789 SHA512 dbf343e0284c52edd42ba8d844a9db90810ddd02e7a98bcd1c2af72cd9f5242e9c0a9ea921edf47583bfe05943288286e57a018a7a6b2dcf25bae4f663225025 +EBUILD git-publish-1.7.0.ebuild 913 BLAKE2B 8a95cd61903dd64675c3fcde220b41170aedd9f19e79fd6fd9a435e03c8b887717a0fcb82cf18d599adeaa82feecbf4300c00a5580a392f4469c9978bb8affe0 SHA512 7dbcfd568e2186c352f495ac27d79798df4f0aeb039acb5feb0d6df851ba028e127f636e0befa012db47907778e28a86cc7df278615d1723ed4c1c8e9bcc8bee +MISC metadata.xml 576 BLAKE2B 1dfa47470c8ff5c1fb852d1e16a8acf4984d08be910e666b8910b95dd693f08bc0507bbd83c885f28af1777838eff713906f33c991a7b08de6ff82ec3f2cec2e SHA512 a342fa5037d547429908fdc3b61b6acd153896a3875164555226bfe8d11d6d4c465c69b217c2c29cc5a6b35504c784f1c706e87fe18bb68f2c5099a4fec1a083 diff --git a/dev-vcs/git-publish/git-publish-1.7.0.ebuild b/dev-vcs/git-publish/git-publish-1.7.0.ebuild new file mode 100644 index 000000000000..7a000d781109 --- /dev/null +++ b/dev-vcs/git-publish/git-publish-1.7.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) +inherit python-single-r1 + +DESCRIPTION="Tool for preparing and storing patch revisions as git tag" +HOMEPAGE="https://github.com/stefanha/git-publish" +SRC_URI="https://github.com/stefanha/git-publish/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+man" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-vcs/git +" +BDEPEND="${PYTHON_DEPS} + man? ( dev-lang/perl ) +" + +src_prepare() { + default + python_fix_shebang git-publish +} + +src_compile() { + if use man; then + pod2man --center "git-publish Documentation" --release "${PV}" \ + git-publish.pod git-publish.1 || die + fi +} + +src_install() { + dobin git-publish + use man && doman git-publish.1 + insinto /usr/share/${PN}/hooks + doins hooks/pre-publish-send-email.example +} diff --git a/dev-vcs/git-publish/metadata.xml b/dev-vcs/git-publish/metadata.xml new file mode 100644 index 000000000000..b97d2e99f3b7 --- /dev/null +++ b/dev-vcs/git-publish/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <longdescription> + git-publish prepares patches and stores them as git tags for future reference. + It works with individual patches as well as patch series. Revision numbering + is handled automatically. + </longdescription> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="github">stefanha/git-publish</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest new file mode 100644 index 000000000000..3fe043e08608 --- /dev/null +++ b/dev-vcs/git-pw/Manifest @@ -0,0 +1,4 @@ +AUX git-pw-2.0.0-version.patch 278 BLAKE2B 8ff5fc1f4928449095b5b644a5d933ffac72feec36b47972ae9206416e75b2e8355defa1e15a4e3a75b4a6ed6b35c634b4ba9c93d2d1d1a0d1e35d5c9223465c SHA512 02ee7fd042f9ac2869da210c90a11a2d98c7d22d3c5f416aadd7bbb2d1faaf01a76ab12d575ad646a78979fe047c8e005af7cc7031012a9ce1b7d229db13f8f8 +DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc +EBUILD git-pw-2.0.0.ebuild 1013 BLAKE2B fa1c26120c84e82d9426ca31a6817cbd6034a02d27e8cf816b150a7b2e356c5dc252c0519c6611372713845479a8f3b6376e725e83d5393f9a0e26187a369910 SHA512 f7384c234dc3fe17a3111c5f09ecb9f0de5758c90f50f905c4a964fc8b3b42b86cd771f2ab7706c0981f1f3d728511634ac1cedcaa7f3fd904f6da82930311d6 +MISC metadata.xml 572 BLAKE2B e9bc2b6775ef17fe1a1975e40e374a9ee1b3f98e51e140acee6f3a9caae0eddad1aee41cd417f36847fccd75da5505ffed28daa0680e15177fea3e8c6255f88b SHA512 021c311570c06714ed3ee803e8139790205f57d8731796e43f83212c84ffe4cd3462f29cff53489255f0518f561da26adde8c13ee3858ff5738d923b0f2109ca diff --git a/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch b/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch new file mode 100644 index 000000000000..92706506c697 --- /dev/null +++ b/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch @@ -0,0 +1,11 @@ +diff --git a/PKG-INFO b/PKG-INFO +new file mode 100644 +index 0000000..9748ce5 +--- /dev/null ++++ b/PKG-INFO +@@ -0,0 +1,5 @@ ++Metadata-Version: 2.1 ++Name: git-pw ++Version: 2.0.0 ++Summary: A tool for integrating Git with Patchwork ++Home-page: https://github.com/getpatchwork/git-pw diff --git a/dev-vcs/git-pw/git-pw-2.0.0.ebuild b/dev-vcs/git-pw/git-pw-2.0.0.ebuild new file mode 100644 index 000000000000..8efc99b1623b --- /dev/null +++ b/dev-vcs/git-pw/git-pw-2.0.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) + +inherit distutils-r1 +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/getpatchwork/git-pw.git" +else + SRC_URI="https://github.com/getpatchwork/git-pw/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="A tool for integrating Git with Patchwork" +HOMEPAGE="https://github.com/getpatchwork/git-pw" + +LICENSE="MIT" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-python/arrow-0.10[${PYTHON_USEDEP}] + <dev-python/click-8.0[${PYTHON_USEDEP}] + dev-python/pbr[${PYTHON_USEDEP}] + <dev-python/requests-3.0[${PYTHON_USEDEP}] + >=dev-python/tabulate-0.8[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/pbr[${PYTHON_USEDEP}] + test? ( + >=dev-python/mock-3.0.0[${PYTHON_USEDEP}] + <dev-python/pytest-6.0[${PYTHON_USEDEP}] + >=dev-python/pytest-cov-2.5[${PYTHON_USEDEP}] + ) +" + +PATCHES=( "${FILESDIR}/${P}-version.patch" ) + +distutils_enable_tests pytest diff --git a/dev-vcs/git-pw/metadata.xml b/dev-vcs/git-pw/metadata.xml new file mode 100644 index 000000000000..2845f37880c9 --- /dev/null +++ b/dev-vcs/git-pw/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <longdescription> + git-pw is a tool for integrating Git with Patchwork, the web-based patch + tracking system. It only supports Patchwork 2.0+ and REST API support + must be enabled on the server end. + </longdescription> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="github">getpatchwork/git-pw</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 2119e917949b..7055dcf33cec 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -2,6 +2,7 @@ AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a1 AUX git-2.2.0-svn-fe-linking.patch 418 BLAKE2B 5030e0dfd7fef0157fd4532aa14bfdb4f2ed09a2e35ca960e0133d8e84ea07a472ddc111ea9c0033158be6e90283b76c9880c08cb7af7de53757dbf9b5d79a64 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df781c77f4e5fea1f5f6f42a0a5c9ff74d08909790dc961abe4896016128a01992c1ceeb61236d4d11c9ccfdd4b8257ecd89829aaac435 SHA512 1fd1a3af27e2945d25cb24a60678c05aaa32edf312d2750d7aafa26bfcce1877d88e49f649c3ac572f75e8631fc979f82d75b3e8abbc02d1750421d4cda41321 AUX git-2.22.0_rc0-optional-cvs.patch 14182 BLAKE2B ec4273646e5b45dc8877e0e41e03be4a2e6f1591f90834e5521f4322abcd9ebd75021ada8992fe90a3572dce7b87b4c8cfef772367cab8a49df67369a7d2638d SHA512 ce155bf2b1515ba59f4186265d679acb0975b4e3e658de80e03776308d00e508b0776af3a946ebc19c963e455206ba54b68f60d94e491570966581db3d94d28e +AUX git-2.31.0-darwin-prefix-gettext.patch 893 BLAKE2B d350b752473346991e1ed38a39ffa06dc828e180b49e47a4c0c23e9e152d6f9ae85e3c6975d4f23a86a1c11e08496e4017dfaa6458099dee2ffd81ee4499c45d SHA512 66950d46383dd91addda04bf675b81755f13d60c419798858acd56045b470abe6c19116308d382e12b5a860b332e926a2d11ec6cf333fa35a6fbbd5e44c62af0 AUX git-2.31.0_rc0-optional-cvs.patch 14184 BLAKE2B 6f4d56487fda1e9b9f20a77b0c6ba4c01fcc0341c2ed37756a8fd7edeea7760be9455ec5ed695f76debee3cea894ced0a988b4baac80e14cbc918106be36dc7a SHA512 35221088fe49254d9fa9186d12b40c58b20f58289a119e64071cf20d0952c52238f546bac4d16e634a768559587f0acc6567a546bd79c9f709dc9b158938c81f AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f @@ -13,46 +14,30 @@ AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570 SHA512 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc DIST git-2.26.3.tar.xz 6009184 BLAKE2B 12c0b8fb460024e7767919cac3e36ecb215e25566eb907e11495c086e1d43d790c2aa8edd178d53abc3f7eaee968a6c89e92a6575d4d11f9740567b357056aee SHA512 a88f8ab156f12770590110b30da83631f19a349f3b7af25fd0a5e8f03c78daec0a4935e9a1a5637f100c147cc57fca4aa3386e18756a6382983e7baa7456e398 -DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a DIST git-2.28.1.tar.xz 6119248 BLAKE2B 69999a39d1c5c1dc69b8c7721a594104b51d2af691e1f2ef6a2f2bee99bd5b319c856cfccc4166cfd3426cf8eb58b3b4aea5ed2ae15061fba0f0f3e44c7d24e4 SHA512 6acd7f42eeaf4fcb085fe2ab3d65f53a264fd38ef84321b77eb7c21bbb146e42ec9f27cc36cd9f3569f6d1758742119efd0af9bf6414fe7c577c434ed154fb8f -DIST git-2.29.2.tar.xz 6187988 BLAKE2B 15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa SHA512 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62 DIST git-2.29.3.tar.xz 6189996 BLAKE2B 9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617 SHA512 3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd -DIST git-2.30.0.tar.xz 6325652 BLAKE2B c5a67ccb7790f1747d714b402f22de6bd5cf783de8765fade7af0ad51ac780c80d43ab22b33431b57db246a11ef073dfd291961476a3c9414339f133221cbea6 SHA512 2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d -DIST git-2.30.1.tar.xz 6327976 BLAKE2B 3b459d10a2b8d601e0882da8346bba1c0fb9aa01823e9cf9f6d50557d7cd6b6b89eea17209a5b3bfb199c37ae8bf33b730784686a166d7ed9ef36dd0975d5624 SHA512 b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95 SHA512 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e -DIST git-2.31.0.rc2.tar.xz 6394212 BLAKE2B 749b2d18969bdd3fd5d72273b9068775cf9c1042553879f8e7abcbbf3c0b8e9d99a5365939b8df5012dcc499c2bccb5651f7943f76389ae315bc1fbaa08298eb SHA512 0e717c27320d6747e5f7c928765c91859a22f5a5de02a99bab2f0923283b5da2fd755a50ba527160ca23ffa8daf087dc4014441a58100cffbabe58fb7d9b64c3 +DIST git-2.31.0.tar.xz 6414252 BLAKE2B c9186c0e212767956cbabc685989408860600a19ff56637453f9cd45e143b6fb5b7104b188726506481782fcdfe3e7b28d5c9cf374172b81e5bfedf249292793 SHA512 b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6 -DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909 -DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa SHA512 d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2 -DIST git-htmldocs-2.30.0.tar.xz 1340536 BLAKE2B 2204b276b941497e0ff5f1710c55b42f573b4eebd96619041db7afabb5a5d36252b2582b29e3d083abaf5da478810d056df83bdfa1d08c5396ffe03d0d858820 SHA512 3fc53a508497621c8af5ea26337407ed9489e768160c7063cfcc4bb53f51631ef968057f1498e37a901313aa08b4153533ca15a9bdfcbd04d2ed11256007db3e -DIST git-htmldocs-2.30.1.tar.xz 1341796 BLAKE2B b282d16af234256ccb4e1099d42800d674b5ff4ea1e365557aa6672aac573b4e98e43ddbeb02291cd6925bfd217d2e8e99aae47e9f46fd06ad013fec87b8d3fe SHA512 e2debb0dde49f1e6a5944ed35dfa62d6d2e6f71d745e6f6adfb477513f21004f04cd5de8e8444d4a24d9818c3cb85f5720848991a763fbc3541e89cfdf21dd49 DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237 SHA512 7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297 -DIST git-htmldocs-2.31.0.rc2.tar.xz 1357684 BLAKE2B 8ea0ebc11650bf4f67e15fcdb1c6a7b8e33b5740e50c5817d09c6d4dfc23556b8735347807ec08d56c4124a38e3892c4690984a57d9f24b80a919b5a9820c5f2 SHA512 dfe7f2ef385ddfcdebe83f4f785bcf9c710357635cbc26702c6dcdd056e62075f937d92802c056dda678db3d9258ad7f75b8cc1d11ca86a26c022827c22ea10a +DIST git-htmldocs-2.31.0.tar.xz 1357332 BLAKE2B 06fe5fdde4193ffccf243eae8c112b6bf74b3a554283e0f688a47275a47de4c1c4dce9fe6dfa550885786ab8df46fa83fadd22746bc64e430af42785eda30583 SHA512 31a7d715454060bbc260a6001d971df0eea16c819de96a9316bb465a67661ebe805a8ea2f5f223c070b6aa1affd1e72970b223474e6221bf87ac3b233d229fdd DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9 -DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd -DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf SHA512 f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8 DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941 -DIST git-manpages-2.30.0.tar.xz 481792 BLAKE2B 9f6273e36e06a0296506d43b25a826cef9e459fdd25ad2f844de323b998fe9b5a7e5181b21257e7b297ea4ce2e16cfaacf7f1c7486ce26b59e39e643361d4745 SHA512 9593d9bef8b3bdcd5645cf89e0f0c53989342414363ce85cfd46da181750c92e8f6dbd860c6badc9d871b383bb9cf273b4fb3af7f6d46a8df6b95fddeab578ae -DIST git-manpages-2.30.1.tar.xz 482128 BLAKE2B 2e7f3943b5e95a3b00dda95f74c519889218e908aa3872f5ae93d88ac9602ad389e9be9df99ec7daafb0a324c03a3a50c7f3c697a1a7e9f35f795682ba85fb4c SHA512 1cd535fff2a658d9ecb99c1f26663e2b37df429dfcff417c298e00fb5de107ef54848447ad63c2f78d8621f431f8f8b92bc871474a701db48deff04a0b595d07 DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7 -DIST git-manpages-2.31.0.rc2.tar.xz 487804 BLAKE2B fb146efbf7f31b45e6c1a15e8fac1c6cc75d067ad16e588fa8a71bdbf970d26b123a6453cfc0210a454374fe319a83cc94b0df95134b602b67c2f1e1f895715f SHA512 b4b776ea9281557d3a521de7437723217178422998f81bb81b4843f02fadf38a743c7d74abb36d1354ca87fc352b442fae02bed11d2612b1f35dddac89ff8e64 +DIST git-manpages-2.31.0.tar.xz 487764 BLAKE2B e5acc25fe28c666afd017d29a9cce7b0e37d2b1dee93f911683c5e54972fe4def59964409bd232666963b4509d4ca30fb9b95757e2fdfe308559e455bf8160d3 SHA512 9bf426d5aadd4ac011f9b3694547da795bf5e8bc77a79ef69de56d6f39c3a0fdc039db25d4671810a5320a6c057f2364ec096413eebbbeabc26a7d3b65c9c787 EBUILD git-2.26.2.ebuild 19084 BLAKE2B 4348be0cbf86af5f34de7b2ee0dcf3b02df62d195f65c5ce7eb09076702300e0d333217c4864b14ac6df705380d2a7b619834f0b13e60494bdd2246ece72a22a SHA512 f27c49be5bc8a168f6adc14694d638fe4c1fbf52308f25d28a11879d9c6e5c68e4a06636587fa3956d905a72cbeb24d4f179249c0266d89cfc6a0eac025a926a -EBUILD git-2.26.3.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a -EBUILD git-2.28.0.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a +EBUILD git-2.26.3.ebuild 19091 BLAKE2B 67e8d52c690cc75858ad7196dd221827f6e7749d37e9b711335c5db3ec1c35fcaeeb6ecddd47dbd01b5fb6a36a4ff7caaccead3dfcb2318731c411810443342f SHA512 10fc52f037962124c665f169df5ec7ffa9169abee0ac937c4e027438764b54092f33daab2a9024f9979cdab12de0a5c17eccaca054e4363ca1b922db36b286bb EBUILD git-2.28.1.ebuild 19093 BLAKE2B ef265e1ff00542f4a2aa454b6151dfc5d01f1632b4456026734543a545b0f7917f5c59a659092dce86e23a6e3726a7b23c2691c60faf67dbacc22c85e7dc7e19 SHA512 08fb8198ba4e1971ae039bd8a692ff6a44f6f5e1bcc3389532bca9abf39db43165bd91a28fd11c1e2b74cfefa4a670dd534525d2dd74c755a31720d9b91e045a -EBUILD git-2.29.2.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4 EBUILD git-2.29.3.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4 -EBUILD git-2.30.0.ebuild 18150 BLAKE2B 1c9f0d4c815f9bcc7c1f1c166de9863873198d4da153105c299643ea2e6df5c37b489262f6ca9b8d4edd3d636f4169cd4448d85e0ac513962611a7b4be936976 SHA512 a1972288de7428427235d9dbc4b24fb833f45277804eec16ca6acd0831ef6f8e54a2e1e9ed3acc44d20aada6c3e95745fae0562278542dc478c5e1711ddef7d4 -EBUILD git-2.30.1.ebuild 18151 BLAKE2B 6ba45e94301a2afcca08655687cc6c4cb11952123ecde80fb4ae33d8531789252427644487cc0e7d5a131661681bb939ceb3a9534ffbd4519809f1fcc48d09a7 SHA512 4185e7e4daa69b3c92a6760b27eec108589276a9aa73b376212f4b5d194999c07927acb5312b2eac20d8e6fb9b25006d02c3bb2e43909b5d9ca8fc7942b14f45 EBUILD git-2.30.2.ebuild 18151 BLAKE2B 6ba45e94301a2afcca08655687cc6c4cb11952123ecde80fb4ae33d8531789252427644487cc0e7d5a131661681bb939ceb3a9534ffbd4519809f1fcc48d09a7 SHA512 4185e7e4daa69b3c92a6760b27eec108589276a9aa73b376212f4b5d194999c07927acb5312b2eac20d8e6fb9b25006d02c3bb2e43909b5d9ca8fc7942b14f45 -EBUILD git-2.31.0_rc2.ebuild 18161 BLAKE2B 795c3728012f6ad96dcedbe8e3c2e03e31626f22d2e45ca45c9eda10d2fb216967fbde702df46f93c782ca0952dd5dc0ca9764d206b9f7e5478c2bdaa85c96d1 SHA512 fffa13f1250eaf7939d0f76c9880ff1a96798c4f7baaf554dc34a61b0f6b71a6fe4ca202241eaa05e424bc95721230791731b2d483c11e48a32ae9ecb79b1bd1 -EBUILD git-9999-r1.ebuild 18131 BLAKE2B c147b3e77564daae7663cce91e149e857f48d98c58c831e7008810f1329b28f42ba2a5f652590679b8ac02b201355aadfcbbcd61569db161ba1baceca27ab29f SHA512 b6c8ccd2c2fb7e711fa5b1c99e0971e7e4f3af59e2ca9a8746a8b4ce13edda3de31a020897098adea6f7a4022d7879740ba8a100befec8801da061fd114e56eb -EBUILD git-9999-r2.ebuild 18131 BLAKE2B c147b3e77564daae7663cce91e149e857f48d98c58c831e7008810f1329b28f42ba2a5f652590679b8ac02b201355aadfcbbcd61569db161ba1baceca27ab29f SHA512 b6c8ccd2c2fb7e711fa5b1c99e0971e7e4f3af59e2ca9a8746a8b4ce13edda3de31a020897098adea6f7a4022d7879740ba8a100befec8801da061fd114e56eb -EBUILD git-9999-r3.ebuild 18161 BLAKE2B 795c3728012f6ad96dcedbe8e3c2e03e31626f22d2e45ca45c9eda10d2fb216967fbde702df46f93c782ca0952dd5dc0ca9764d206b9f7e5478c2bdaa85c96d1 SHA512 fffa13f1250eaf7939d0f76c9880ff1a96798c4f7baaf554dc34a61b0f6b71a6fe4ca202241eaa05e424bc95721230791731b2d483c11e48a32ae9ecb79b1bd1 -EBUILD git-9999.ebuild 18131 BLAKE2B 90df186adba58af90be02856622c7b29bdc6263674ae44450e0ba8975d0440c3e611c442129edb144c155065fbb16d7e9f2d97786e4dc49fd9de4c795a7c469d SHA512 0708239ad240da7f73ce182a74cd6e4b2ed3c74e0e4bd6b610863e55f56661b39f3b2ad151a4d47773ab6f53f233288570b37e5ee83ba07ef2e04986bd51c62e +EBUILD git-2.31.0-r1.ebuild 18041 BLAKE2B 1fbaf00be28d7487b9ae0cf842b485db87435c0b1ba7002911a292f9f8ff78fa66add40e4d485e5baf44ba974834047dee8e491f64edbd300a1746a5bef37331 SHA512 08ad3f2e7e778757847cff4db3be86f9095b1d7b008768a643d79c9d5ace9252112fcb765d0eae1ef0a9017f8a5e9f263c8edc23ccb669040959dba6c76437ad +EBUILD git-9999-r1.ebuild 18013 BLAKE2B 8e5ad64667e2051d02d65a93d61ca60cadae69c692172bd9f63749282f3f3ab87d586bd259b9a4fa1f337b7deda1b45c613b54d32d8778ed98ef9e9e6cb3933d SHA512 9f42152357ac8bbdee6667887e891cc911e598f4686d8f2fdf3577ba6567bcd118c3d197297dde5965e7338d75fbbf3c23cd126f3dccec798b00f8e4d8334a4e +EBUILD git-9999-r2.ebuild 18013 BLAKE2B 8e5ad64667e2051d02d65a93d61ca60cadae69c692172bd9f63749282f3f3ab87d586bd259b9a4fa1f337b7deda1b45c613b54d32d8778ed98ef9e9e6cb3933d SHA512 9f42152357ac8bbdee6667887e891cc911e598f4686d8f2fdf3577ba6567bcd118c3d197297dde5965e7338d75fbbf3c23cd126f3dccec798b00f8e4d8334a4e +EBUILD git-9999-r3.ebuild 18043 BLAKE2B 535ca9bdeca810b85d662ac42542ea9aa6ef0b4fb0d86a09ae17945e29455d4e5d0d80c4576e884419a70122b27172dc5f4dac7af85c35b451127f8f1898fd2d SHA512 74ae37c1b42d70922e320a94847e43f2e78a0cd5c2aab0bbce3b29024cbbbd5153ac2fc6a566ac51ce72c5f15d2c01773d15a6d86fa8a9a27c5163e450a96e74 +EBUILD git-9999.ebuild 18013 BLAKE2B f83705958b6840a071dcbeba4fae1b80b90f0abbf031c2919e31908bbbe4eb06a607a924ad84fe5f41d525f6c99000b8ebb3a68ab189efe0721826b071da0e9d SHA512 8b8b019f6d187ded2cc178627ef5415e88aa48dc2bbcf2869cda9a4b643fdedffde3a8fe58a7986db2d462a6f2ace3f991b3d82393dddfa8c0694e0d9403237b MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb diff --git a/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch new file mode 100644 index 000000000000..df87def6073d --- /dev/null +++ b/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch @@ -0,0 +1,22 @@ +Don't examine outside of the prefix for gettext on macOS/Darwin. +https://bugs.gentoo.org/757309 +--- a/config.mak.uname ++++ b/config.mak.uname +@@ -136,17 +136,6 @@ ifeq ($(uname_S),Darwin) + HAVE_BSD_SYSCTL = YesPlease + FREAD_READS_DIRECTORIES = UnfortunatelyYes + HAVE_NS_GET_EXECUTABLE_PATH = YesPlease +- +- # Workaround for `gettext` being keg-only and not even being linked via +- # `brew link --force gettext`, should be obsolete as of +- # https://github.com/Homebrew/homebrew-core/pull/53489 +- ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y) +- BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include +- BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib +- ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y) +- MSGFMT = /usr/local/opt/gettext/bin/msgfmt +- endif +- endif + endif + ifeq ($(uname_S),SunOS) + NEEDS_SOCKET = YesPlease diff --git a/dev-vcs/git/git-2.26.3.ebuild b/dev-vcs/git/git-2.26.3.ebuild index d725b8e79c39..90969c232b98 100644 --- a/dev-vcs/git/git-2.26.3.ebuild +++ b/dev-vcs/git/git-2.26.3.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/dev-vcs/git/git-2.28.0.ebuild b/dev-vcs/git/git-2.28.0.ebuild deleted file mode 100644 index d725b8e79c39..000000000000 --- a/dev-vcs/git/git-2.28.0.ebuild +++ /dev/null @@ -1,711 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) - webdav? ( curl ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # For svn-fe - extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv=() - use nls && use !elibc_glibc && nlsiconv+=( -lintl ) - use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ - || die "emake svn-fe failed" - if use doc ; then - # svn-fe.1 requires the full USE=doc dependency stack - git_emake svn-fe.1 \ - || die "emake svn-fe.1 failed" - git_emake svn-fe.html \ - || die "svn-fe.html failed" - fi - popd &>/dev/null || die - fi - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - # Do not move svn-fe.1 outside USE=doc! - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild deleted file mode 100644 index d73a1120a380..000000000000 --- a/dev-vcs/git/git-2.29.2.ebuild +++ /dev/null @@ -1,676 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - >=virtual/perl-libnet-3.110.0-r4[ssl] - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) - subversion? ( perl ) - webdav? ( curl ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]" ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.30.0.ebuild b/dev-vcs/git/git-2.30.0.ebuild deleted file mode 100644 index d73a1120a380..000000000000 --- a/dev-vcs/git/git-2.30.0.ebuild +++ /dev/null @@ -1,676 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - >=virtual/perl-libnet-3.110.0-r4[ssl] - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) - subversion? ( perl ) - webdav? ( curl ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]" ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.30.1.ebuild b/dev-vcs/git/git-2.30.1.ebuild deleted file mode 100644 index f6a6fb30a9e9..000000000000 --- a/dev-vcs/git/git-2.30.1.ebuild +++ /dev/null @@ -1,676 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7..9} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - >=virtual/perl-libnet-3.110.0-r4[ssl] - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) - subversion? ( perl ) - webdav? ( curl ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]" ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.31.0_rc2.ebuild b/dev-vcs/git/git-2.31.0-r1.ebuild index d27d54e5bd79..bfb176d4710e 100644 --- a/dev-vcs/git/git-2.31.0_rc2.ebuild +++ b/dev-vcs/git/git-2.31.0-r1.ebuild @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -59,10 +59,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) + pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -132,7 +129,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) @@ -206,16 +202,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=( @@ -272,6 +260,11 @@ src_prepare() { default + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + fi + sed -i \ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index ed601ab85537..ff37be69674c 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python- PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation # In order of stability: @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -59,10 +59,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) + pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -132,7 +129,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) @@ -206,16 +202,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=( @@ -272,6 +260,11 @@ src_prepare() { default + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + fi + sed -i \ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index ed601ab85537..ff37be69674c 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python- PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation # In order of stability: @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -59,10 +59,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) + pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -132,7 +129,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) @@ -206,16 +202,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=( @@ -272,6 +260,11 @@ src_prepare() { default + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + fi + sed -i \ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index d27d54e5bd79..c60eee31d41d 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python- PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation # In order of stability: @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -59,10 +59,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) + pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -132,7 +129,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) @@ -206,16 +202,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=( @@ -272,6 +260,11 @@ src_prepare() { default + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + fi + sed -i \ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 564bb8b7b751..ef8a11391cf3 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python- PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation # In order of stability: @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -59,10 +59,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) + pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -132,7 +129,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) @@ -206,16 +202,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=( @@ -272,6 +260,11 @@ src_prepare() { default + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + fi + sed -i \ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest index 21c87dd7e0ba..997e83d28931 100644 --- a/dev-vcs/hg-evolve/Manifest +++ b/dev-vcs/hg-evolve/Manifest @@ -1,3 +1,3 @@ -DIST hg-evolve-10.2.0.post1.tar.gz 822791 BLAKE2B a6d33b7afe4aa366d3d9f4bf69aa3512a7e1d4f70a6a0fc600b97dbb6bb99be437a2c7ec75b78fffe4be9f42f1d2e2c3acbda79d82852ae83885bb206863b0ae SHA512 474f3cc8812b0dda368118c1f3b86be55191ddd876e7b457fa8c8b62c06496a903e551c2692daebef8374d7edfb8c298657a62d52a43e684e22a45b1ccc3307b -EBUILD hg-evolve-10.2.0.ebuild 814 BLAKE2B 3ea1ce5c29b9a3413b4ced3a4e8fc1143755fbea5ada0fba277100ff8b79e2f3246374c0ea999e964c048060c5e191f4a199b260e6dd30b30c48f25b747fd524 SHA512 dd2b6aee1576d6a5764295c4c7549ec6ed85bfb9c078b8ef5f54b60a3db9ac463cf37682a51e34841e69ba8504f596983293dc08eadd452c356f0ffbea8ccfaf +DIST hg-evolve-10.3.0.tar.gz 831866 BLAKE2B 5c56d214be9cbf31adbf41fd35f020e196f009435d1afffe61e24353dd1d5ecbc245a6525e1dbdbe54bc71d59f365d8a8a6aa860797d979f0c65b88f3623d3bb SHA512 212bf88bd5b5841a17c5cfa77a6ccb4a1e314e16d4ed19f54653f56f108c1640179b67331d6fe365b09e38ce51f3b0abfbecaebd1e0a0ed2de34c81d79110f87 +EBUILD hg-evolve-10.3.0.ebuild 782 BLAKE2B 8e1792d9dc8bb45640a380d035d4ecadee72bae319e866fb49ffd97a5829005fcbce3cc3dbed2ed586b9b8d5ff4df2cdf785c9b8a8556a498bdfe1db86288c01 SHA512 0f329a03e2d0e30fb6433ac10698d9cf5fc556783271558c6eb1b1bc0a9b741685c24201ed6f2d5d194a40c0e682aa0f5b61fa546139038353daafff7921e81f MISC metadata.xml 287 BLAKE2B 62f44642d7581105c39d8f7ce9a9e7463e14605c8b9229074ed1d9537448d07999bdc8f29ed6d635625d628d54b4656e12ca9c5f0e9c61a9cad999ba3f1cb432 SHA512 51c3ee1aeeaa5bdb8d990cbec310842a8f7901087a99384a87cedcf764cc813cbec83d822d6dfe62803cff9792aef1d718dbb8eb8537eae46c5eb5bdad119fbf diff --git a/dev-vcs/hg-evolve/hg-evolve-10.2.0.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.3.0.ebuild index 362e472bb405..0aeb1aa086bf 100644 --- a/dev-vcs/hg-evolve/hg-evolve-10.2.0.ebuild +++ b/dev-vcs/hg-evolve/hg-evolve-10.3.0.ebuild @@ -9,7 +9,7 @@ inherit distutils-r1 DESCRIPTION="enables the changeset evolution feature of Mercurial" HOMEPAGE="https://www.mercurial-scm.org/doc/evolution/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.post1.tar.gz" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" @@ -20,7 +20,6 @@ RDEPEND=" >=dev-vcs/mercurial-4.6[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} doc? ( dev-python/sphinx )" -S="${WORKDIR}/${P}.post1" python_prepare_all() { rm hgext3rd/__init__.py || die diff --git a/dev-vcs/qgit/Manifest b/dev-vcs/qgit/Manifest index 14635fc0fd9c..5717e527bd1d 100644 --- a/dev-vcs/qgit/Manifest +++ b/dev-vcs/qgit/Manifest @@ -1,3 +1,3 @@ DIST qgit-2.9.tar.gz 263875 BLAKE2B 8ec1235c760f2473a0700e7033ab99f3e72f019dee47761b86999a7de173132cf6592e9f5652b68285cd126adc4efffb5688944f34be2686683727354ab041c5 SHA512 2c91e02d0a7ea1e4620882520c77b47ff9b28fb9c9f9d178bf98b3e728e600e8d86a9e6e4cd60c33dbe63ced3636934fb7cdd6b0d5fa58182873675e3f97cc33 EBUILD qgit-2.9.ebuild 516 BLAKE2B 6e728ec47366a0a43c2132067add508df8ffff37a2d698390b3b2ea6090e835595617f808cf88af66da6d7441fc0f49d1ba327e93e7e039be21a3b23b9099ed3 SHA512 3e345192c98f852f106fa60da99c9f00cdaa258f1840289042ce174fae985ba2fdc3c27c01c7662a4b1d00f5331975923eae0c277532668b39f36a11efa3e1de -MISC metadata.xml 324 BLAKE2B 1046f76dc321a6155b49edb4972d9d353d47e4103a0356cc83f459faac05985e201daef4197420cadb19f50c37eb528b990c8d9d93537822fbf0698501b3fb5c SHA512 e4e0bbc60b8af9512584b93e60d29ac47a4150691ea46bb3281c6d99acf119d0c6717497286c324a9ccc91624bbd56211a513c1fd675ec89603d431b9b052248 +MISC metadata.xml 324 BLAKE2B be472a1102e269eee7f3e7d17dcc683fdff451c68671065344be0eb70629ac66291c83445c70dfc29ccecdddaaad3e0d14190487a55fce44aa6f491277f9e298 SHA512 c70e55b0d4e3faf311575ab077a16d84ba35616365b8ff07a0bda3c17199c55211972d1decae1f29238184be73a81eca51b45242aa79c71098f6cf4b5440a79a diff --git a/dev-vcs/qgit/metadata.xml b/dev-vcs/qgit/metadata.xml index 241d7194c1ea..37e6df0171a1 100644 --- a/dev-vcs/qgit/metadata.xml +++ b/dev-vcs/qgit/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest index 025d6db14f1e..37537244ceb1 100644 --- a/dev-vcs/repo/Manifest +++ b/dev-vcs/repo/Manifest @@ -1,7 +1,7 @@ DIST repo-2.11 39791 BLAKE2B 535de238d934eb2717af7bddd960c158501a56dd400ae02f3665e30c34bd68a1973de4c84e2ea76f48aa027249dfd4270153f1a7d4c4a2d5d883b580f02664e9 SHA512 1889ee9c782a6dc90b782c8ca9c5411b97c4495e0d27add62b9661a5961a782096037e081e984c965e44d33459e8fe4428528b5ebfff9fe356ce401cb610480a DIST repo-2.12 43035 BLAKE2B 3a3b1997a09f08093aa2d5cf6c7a3747d6a9a6c29e6c199574757d4d87fdd57b7cc8b18bb1ddfa7c47392f73a22211f996f6ba8175448162e305106c9ac6cafe SHA512 409525040ec8fe6c6a6d923c4e23ab93f5ccc62d01d310ad6b56d55f45d88c2bf469e9b46943e799b8d5238cbc0a9610d0f64f35cf0f3a68b79cbd8c92f044a3 -DIST repo-2.8 39134 BLAKE2B af52a2c06e09de83100cb297d585f89bcbe85d6e9e5c358024a371ee4d47c59992745d1088b164fc670cdd9db7394a5f3521967e3eb80840c53993af8b0172b1 SHA512 6d577fce34eb298035a7b98c24fc21521c8c9efbdf02abc37af8a54552893ecf8cdce2db5efbc5398d7f99226408f6cc9ce2f81c2961d9d5dd21fb0264194431 +DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d EBUILD repo-2.11.ebuild 853 BLAKE2B 02d2c11fdfb03642c325252295a25563eb38b0db77814fe32ab05e7b794efa53cc7d5a3659791d7966d50099a29632a5d1bf12541d04ad2133a78cd07e21d3f0 SHA512 8d186e9c36945e862826923a0edc092098b6134594719d87e3c5fb634b6e6d2c26679a7f56bb7712f21b37826205bd58939b96c150006a27fd9bbd466c21fac6 +EBUILD repo-2.12-r1.ebuild 1257 BLAKE2B ba3e9e8ec3699b84ccd81269089cd2b1ac1e6fa9b5aed9b41646fb92d6928563a34222619029a0a77a87d8a98feff2542618bdb83e0a52b8a1ab1a6e9f7ca012 SHA512 60ccc355c32c50e37b7c8d53083e86de4c89ca1cc05598c48c3b5768a4c175e19be7ca57c7c953079b9e819f5c706651be4ea63fd3a8fb40610b41c957dd7002 EBUILD repo-2.12.ebuild 880 BLAKE2B 5998a5fb74829aa6844f57a59131607e7f0a439195d523ca5c80e5a8be6369b66907f1b1807c2e271879a68b61be5cbc54595da8cfed2b2178addcca3a4e922b SHA512 6bb194d147b0a0ba8757bc61bab1368b547f7135040f22d6f516672b28d73575e3aaa1c3542325fab5c615e704e3dab2a363b6ae9d63476d47476c4ea670393b -EBUILD repo-2.8.ebuild 853 BLAKE2B 02d2c11fdfb03642c325252295a25563eb38b0db77814fe32ab05e7b794efa53cc7d5a3659791d7966d50099a29632a5d1bf12541d04ad2133a78cd07e21d3f0 SHA512 8d186e9c36945e862826923a0edc092098b6134594719d87e3c5fb634b6e6d2c26679a7f56bb7712f21b37826205bd58939b96c150006a27fd9bbd466c21fac6 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd diff --git a/dev-vcs/repo/repo-2.8.ebuild b/dev-vcs/repo/repo-2.12-r1.ebuild index 2922a68a5816..4190dab38e90 100644 --- a/dev-vcs/repo/repo-2.8.ebuild +++ b/dev-vcs/repo/repo-2.12-r1.ebuild @@ -9,15 +9,20 @@ EAPI="7" PYTHON_COMPAT=( python3_{7..9} ) -inherit python-r1 +inherit bash-completion-r1 python-r1 + +# This file rarely changes, so track it independently. +COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10" +COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64" DESCRIPTION="Google tool for managing git, particularly multiple repos" HOMEPAGE="https://gerrit.googlesource.com/git-repo" -SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}" +SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P} + https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -27,6 +32,11 @@ RDEPEND="${PYTHON_DEPS} S=${WORKDIR} +src_unpack() { + base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die +} + src_install() { python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} + newbashcomp completion.bash ${PN} } diff --git a/dev-vcs/svn2cl/Manifest b/dev-vcs/svn2cl/Manifest index 51f0063cd696..7293c2d5076b 100644 --- a/dev-vcs/svn2cl/Manifest +++ b/dev-vcs/svn2cl/Manifest @@ -3,4 +3,4 @@ DIST svn2cl-0.12.tar.gz 18171 BLAKE2B 88e66d4bcc3e05132462d1c9794846a644f121876d DIST svn2cl-0.14.tar.gz 19399 BLAKE2B 2a726a593521d40bd7a125607c2841bbca8d5915e420b2757da1a17a9bf65e784fdb8fbb5b377567e0c54ce7c8d8407c26a66dda677fb84807d07001032f87b4 SHA512 68d5ad00c5359d86979e2cdce349191bb1c64e132887e2a5222d5d9e24e901ff9e15627fd3de3884f8ad319172051c92ce18e337797ff2237096a6396b814b19 EBUILD svn2cl-0.12.ebuild 779 BLAKE2B ff44f25a86e56ed04375e532b5ea368f78a0443f1c166f12975673ed49ed3ef058c5d0bbb354e7d576cb4b7aa70432cd050bb05e6e79b8a47f5227a5a6ec6f45 SHA512 4c6820c7feb49874deb2441376466e0c9ad7803ae3739074c1bcb703626ced7fdd4b81cc15548c26ed1c08e5ec2d2cb5f38c3f7543eb90fcf5d75c3a3715350c EBUILD svn2cl-0.14.ebuild 768 BLAKE2B a72e3d7611d932f641743c6f05652c57ca7e963e77eac30c36a581029b9ff91737c88413208fb15346c710287cd7a5a7537f2c59730b2c5bb4bcd0bcab284e1a SHA512 b51026d0b0482c03513bcb89dddcd5b84e3b01a80941a650ae5095eb3ab7b09c91a6d1cbb7608f7518100e65a90cb3b04a80335309c82a1e2761d02446abbb67 -MISC metadata.xml 366 BLAKE2B 2dfc36224a99a053e04ce8888b2fa2a03c3a7649fe62ac7f66f7a5ac8829a913457ed767d2fa4fc6503628a747594de5d89a028f41f09f6c4ede6cc109b8e922 SHA512 1bef34b0f7835d77fb56fe12149dc3f10a3695c8303118420065ccb48607d6a90da2ff999747778f251e4a0ee1525a30df49df1d60699cb32b00dd357e8a99c5 +MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32 diff --git a/dev-vcs/svn2cl/metadata.xml b/dev-vcs/svn2cl/metadata.xml index 16853472f6b4..d095ed4b8f81 100644 --- a/dev-vcs/svn2cl/metadata.xml +++ b/dev-vcs/svn2cl/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>hlein@korelogic.com</email> <name>Hank Leininger</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest index d9fde3f1c32f..38ca9ba63439 100644 --- a/dev-vcs/topgit/Manifest +++ b/dev-vcs/topgit/Manifest @@ -3,4 +3,4 @@ DIST topgit-0.19.12.tar.gz 302492 BLAKE2B 5691823e58774883d33bc96e5d10b871a40224 DIST topgit-0.9.tar.gz 37025 BLAKE2B e28b0fd4cdf4cf063bad939c712fc9354ffc2d9c5e431f637e8306454d7a871268902253a1d2c59afa94406223b1fdc1627f3dda04586c88c0b609a72a1eaa87 SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c EBUILD topgit-0.19.12.ebuild 846 BLAKE2B cff23a51c81250e59d2b9f1bd62da9ad8737bf4adb2368ce058ebe83f83a18ba8101fc7c8e0440e20e5ba89da948abfd16e05133896835d0b6d7d6254a6f0cd4 SHA512 8ed16a345ad0bb066366d0cc6fb0e442dcfc8c40bfe1816db7b7de0343e9b2e0a0ce44bac061cfc8b6a5f53fb079c03a6c47f4d50662f99ef2fb334da90d6575 EBUILD topgit-0.9-r1.ebuild 692 BLAKE2B d604f1d2800d5953d2d7f296b5596fee898b95d51eedb80dda8d121dbad3c3611f4ecb40a2e5f22e8143981961639f68d5086539fe08a9d0e8e67940fc5df08d SHA512 2984e19bb3c22e8d83b0c8ad85b8c9939c3dddec3844ffeffd5e5cb6b2d857c3da9e214a3e89fe16acaede8aecf20c820b68c5793080d87476bb3bf40d90f996 -MISC metadata.xml 455 BLAKE2B 6928af22b505988592f48120217cf6c8a9e5f4fd0a0d2040126bb730f3a4dc7b1a5d428d00ffe6fcf0abc5b00cf5c4eb847e5d4ff3288f38b79483708980aa08 SHA512 12408a1b03499ee4718189bec87eb725462c8e2d279bcaef81b18f411f86d0588bffb145dbc793fb9fb9419f7644ff2529a03db636443b157f55b2d7a9c6594e +MISC metadata.xml 485 BLAKE2B 5541d871698c181943ee71d1d8e88ed597e9e6b53ca03f969581b29c166f7a2bc83dc1f236bec1a1cc295895543783d5404724e7c4f8f7339d51608258979124 SHA512 84c1340089eb1a904fa2f6c8d51f6f12ededda5f137d3a80cba1652c4f66d446d1c8c68a052a09c8488dc01720635a75e68276be3a36f40ccac61cfad5405fc5 diff --git a/dev-vcs/topgit/metadata.xml b/dev-vcs/topgit/metadata.xml index 1c551510bec0..a7497a2fdb26 100644 --- a/dev-vcs/topgit/metadata.xml +++ b/dev-vcs/topgit/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>azamat.hackimov@gmail.com</email> <name>Azamat H. Hackimov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index 84257ae32b45..9c1c35f3e4de 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,12 +1,4 @@ -DIST tortoisehg-5.5.1.tar.gz 8918085 BLAKE2B 33aef61d97a34f45b10b291eb3a71bc46b70a1f24006fda0e651e88c61b0351701a3abdf6c1b0277fd81a0c5c9ff225b742215103c280eb11976a86e6bf2a47c SHA512 ca2d3833e379620b1a467b5a6016c8dbd54837d6ac5267063eb6768675dcb0c020a9b4ca2b2b8924a57c9e7d117668347e23762e8ff46c87825290071783aaa8 -DIST tortoisehg-5.5.2.tar.gz 8919653 BLAKE2B 33842e0df31efd4302e210119b098b9debcf1003d320f4b0d5d0c29796ae2149a4aca70871e5f5a82c635fb8e5a12eb56572b23f691152860a386ff8dde20ade SHA512 eaac888f1171d3e4bc1de49ccb5cff550ea859d702b65548040072e3805b54c93d38afdd1a132f6340275172cb456461d76bb4e53a477d0a6e180ac85783a1f4 -DIST tortoisehg-5.6.1.tar.gz 8904309 BLAKE2B 7faad055560560eeeb776349889b45ae8b1de72614f794de9a124b6293a549eeeed1276e9b8308e077f2d171efdfa695660ad7010edd2d8ab2804f28687715b2 SHA512 21a410277469803e1af45103bc5c7196bc7128e66ab297399b98731c32caa517da46bd06389f08ad740b78c22e58244757dbad4207b71d5643b9d1284ed9c936 -DIST tortoisehg-5.6.tar.gz 8920111 BLAKE2B 3779ea89f196bbf49c5efdc957983ff674d3c70c6ef04d758b2946851300bb115173a82d3ee9d0a51df6db51ed30acfa33abdfb2e6b3c08177d9dd5416741a10 SHA512 30013a776ea7e8b1167280350b64a993ebccbf82486f93164a1eaa42e98587719503c3dd939f9ea682d4302532216575ad7a20e9e2122315f63af7d002d08b03 DIST tortoisehg-5.7.tar.gz 8910721 BLAKE2B ebca9526fc39c94c26f28db6dd70527c528308d9003fca0d9cfb61f984a9a5d80f910d68d0d1449221bbb4e040d2919ed34fec1e0aee4d9f5ed55cbcdb8ba714 SHA512 d143c9e83d3b0771ffd4a3bd9cd50e8bc169e5d29e33a0681c3234898a7566427f070ff3ad8668709b5e4d63be92fd700211dee03e98ff16c7c23fc0870c9e4c -EBUILD tortoisehg-5.5.1.ebuild 1597 BLAKE2B 9e54f7bfa4262f12067472327c7f314a26b1bcfddd2f02d75448101d8f0f24f1d48f074dbe494dcbd209f763517652158c34b227712339cae6b0cb028f993be5 SHA512 9b0619c45380551d89340ddb0ee87e6fdf45eb0fc30e076dcfb69b0c46840812d5f445b3f6f9d00921083dc331501bf12d49a4021745a470bd134b2a8af9ac68 -EBUILD tortoisehg-5.5.2.ebuild 1627 BLAKE2B 5701cb65f6cc0fd1df712beb56256469be11ce59e0d060b02c0718b686a8172f692a2c75cf4c073b2f278f8e4674b43799f5ecb9228e27247a47c304ba869d1b SHA512 1a9a0d8a1821f225015d0b943c2d88ada6ab01bf06d619f6e2d248fe339f27954c32b914aa45c19b3e834e73efc1e6d171f546fc45cef049cee2d85981375600 -EBUILD tortoisehg-5.6.1.ebuild 1681 BLAKE2B be33d2db298c7de97da9ac2755f1af603b5cadc73215d2f6162eb7d33564a3360db6b9e334c249a69c57f73ee565d8dbb53b82ddb3e0f2724e8a143aeb0889ef SHA512 3f0e112ce2551fad78af3a5bb2cfb1bc960216a832c3eaf32108124d7aecc48ab5aa86b3fde77235cc0aab408b849fb5f879e155b37296a58dee72f213711828 -EBUILD tortoisehg-5.6.ebuild 1627 BLAKE2B 759a34f14a3ec58a18d7edd3bfe15b2648741a21f856d54cba175553b37a7f37743f9fe366a5f0173932593a5d3cd95ac27a1498010a624bceb1eeb374b02c7d SHA512 149e92393a56c02aad140d302d8778fbe096112df5246eeb85dab122269f4b346a193aa95d8e83d93ef8acc786280d27b7ad74d1f14bc5c99256498c6a05a12c EBUILD tortoisehg-5.7.ebuild 1682 BLAKE2B 3bdc3dd99e369ef0260bfd0342373ebd56bf5f1ad2d51e5dd10d50e797886cd3b07010106229ef68cef92b490efc6543be14078855530754ce434246493ca942 SHA512 d64d18cc3f2b827bc997886a7114b9cb2aad77acda7a7dbcc19a65fcfd359924e78b33650f43effbe9e4a429a506715aa414f703f8f48f60b42fa354b3f91447 EBUILD tortoisehg-9999.ebuild 1682 BLAKE2B 3bdc3dd99e369ef0260bfd0342373ebd56bf5f1ad2d51e5dd10d50e797886cd3b07010106229ef68cef92b490efc6543be14078855530754ce434246493ca942 SHA512 d64d18cc3f2b827bc997886a7114b9cb2aad77acda7a7dbcc19a65fcfd359924e78b33650f43effbe9e4a429a506715aa414f703f8f48f60b42fa354b3f91447 -MISC metadata.xml 774 BLAKE2B b03f2b762867838c9870f1ccc744ae17a866759efb26690e05e666f77635042d637c901905060c203f178beee3f44034d3af4813f8ec915f4af9cab928fa957b SHA512 1a4492a7f467cb8e2eadc760064768bd3bcd55deca269d643a0c07c9486b3a59c8be66ca8243efc76c65642e9b794ad334511c5ee9b6fdbbfd3b9dc7f5a64df1 +MISC metadata.xml 804 BLAKE2B 23d41703f9bdd446ac385fae5919c21684a73c4bfd468f7a0a18c9dc728964e71ee9724dfa4eacb544da54e79c2b9a5f4009ba8318d1e97f2314826cbe4429a9 SHA512 14fcda893984839424b6bcc6d6b0b966edb862fdd3b483f909c552da2775dba413b2155915480526780afec05a5ad7e3652391ccdbe5e76f7daa265fdfd6ef75 diff --git a/dev-vcs/tortoisehg/metadata.xml b/dev-vcs/tortoisehg/metadata.xml index 4edc402c7d1b..f12c72305212 100644 --- a/dev-vcs/tortoisehg/metadata.xml +++ b/dev-vcs/tortoisehg/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>torokhov-s-a@yandex.ru</email> <name>Sergey Torokhov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild deleted file mode 100644 index 5743fd52386d..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-5.5.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -inherit desktop distutils-r1 xdg-utils - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" - SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-5.4 - <dev-vcs/mercurial-5.6" -else - inherit mercurial - EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg" - EHG_REVISION="stable" - HG_DEPEND=">=dev-vcs/mercurial-5.4" -fi - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="https://tortoisehg.bitbucket.io/" - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - ${HG_DEPEND} - dev-python/iniparse[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -distutils_enable_sphinx doc/source - -python_prepare_all() { - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg - domenu contrib/thg.desktop -} - -pkg_postinst() { - xdg_icon_cache_update - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/dev-vcs/tortoisehg/tortoisehg-5.5.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.5.2.ebuild deleted file mode 100644 index b5bdb7fe6a1c..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-5.5.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -DISTUTILS_USE_SETUPTOOLS=no - -inherit desktop distutils-r1 xdg-utils - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" - SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-5.4 - <dev-vcs/mercurial-5.6" -else - inherit mercurial - EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg" - EHG_REVISION="stable" - HG_DEPEND=">=dev-vcs/mercurial-5.4" -fi - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="https://tortoisehg.bitbucket.io/" - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - ${HG_DEPEND} - dev-python/iniparse[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -distutils_enable_sphinx doc/source - -python_prepare_all() { - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg - domenu contrib/thg.desktop -} - -pkg_postinst() { - xdg_icon_cache_update - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild deleted file mode 100644 index 7655deb4a47f..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-5.6.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -DISTUTILS_USE_SETUPTOOLS=no - -inherit desktop distutils-r1 xdg-utils - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" - SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}] - <dev-vcs/mercurial-5.7[${PYTHON_USEDEP}]" -else - inherit mercurial - EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg" - EHG_REVISION="stable" - HG_DEPEND=">=dev-vcs/mercurial-5.5[${PYTHON_USEDEP}]" -fi - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="https://tortoisehg.bitbucket.io/" - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - ${HG_DEPEND} - dev-python/iniparse[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -distutils_enable_sphinx doc/source - -python_prepare_all() { - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg - domenu contrib/thg.desktop -} - -pkg_postinst() { - xdg_icon_cache_update - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/dev-vcs/tortoisehg/tortoisehg-5.6.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.6.ebuild deleted file mode 100644 index fa93e7d11ef7..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-5.6.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) - -DISTUTILS_USE_SETUPTOOLS=no - -inherit desktop distutils-r1 xdg-utils - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" - SRC_URI="https://www.mercurial-scm.org/release/tortoisehg/targz/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-5.5 - <dev-vcs/mercurial-5.7" -else - inherit mercurial - EHG_REPO_URI="https://foss.heptapod.net/mercurial/tortoisehg/thg" - EHG_REVISION="stable" - HG_DEPEND=">=dev-vcs/mercurial-5.5" -fi - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="https://tortoisehg.bitbucket.io/" - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - ${HG_DEPEND} - dev-python/iniparse[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.9.4[qt5(+),${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -distutils_enable_sphinx doc/source - -python_prepare_all() { - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg - domenu contrib/thg.desktop -} - -pkg_postinst() { - xdg_icon_cache_update - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} - -pkg_postrm() { - xdg_icon_cache_update -} |