From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- dev-vcs/Manifest.gz | Bin 13145 -> 13309 bytes dev-vcs/cvs-fast-export/Manifest | 2 + .../cvs-fast-export/cvs-fast-export-1.51.ebuild | 48 ++ dev-vcs/cvsgraph/Manifest | 2 +- dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild | 4 +- dev-vcs/git-mailz/Manifest | 2 +- dev-vcs/git-mailz/git-mailz-0.14.ebuild | 4 +- dev-vcs/git-pimp/Manifest | 2 +- dev-vcs/git-pimp/git-pimp-0.8.ebuild | 4 +- dev-vcs/git/Manifest | 9 +- .../git/files/git-2.18.0_rc1-optional-cvs.patch | 460 ------------- dev-vcs/git/git-2.21.1.ebuild | 715 -------------------- dev-vcs/git/git-2.25.1.ebuild | 728 +++++++++++++++++++++ dev-vcs/gitg/Manifest | 2 +- dev-vcs/gitg/gitg-3.32.1-r1.ebuild | 89 +++ dev-vcs/gitg/gitg-3.32.1.ebuild | 89 --- dev-vcs/hub/Manifest | 2 + dev-vcs/hub/hub-2.14.1.ebuild | 37 ++ dev-vcs/kdesvn/Manifest | 2 +- dev-vcs/kdesvn/kdesvn-2.1.0.ebuild | 2 +- dev-vcs/lab/Manifest | 40 ++ dev-vcs/lab/lab-0.17.2.ebuild | 76 +++ dev-vcs/lab/metadata.xml | 15 + dev-vcs/qgit/Manifest | 2 + dev-vcs/qgit/qgit-2.9.ebuild | 29 + dev-vcs/repo/Manifest | 6 +- dev-vcs/repo/repo-1.27.ebuild | 31 + dev-vcs/repo/repo-2.3.ebuild | 32 - dev-vcs/repo/repo-2.4.ebuild | 32 + 29 files changed, 1151 insertions(+), 1315 deletions(-) create mode 100644 dev-vcs/cvs-fast-export/cvs-fast-export-1.51.ebuild delete mode 100644 dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch delete mode 100644 dev-vcs/git/git-2.21.1.ebuild create mode 100644 dev-vcs/git/git-2.25.1.ebuild create mode 100644 dev-vcs/gitg/gitg-3.32.1-r1.ebuild delete mode 100644 dev-vcs/gitg/gitg-3.32.1.ebuild create mode 100644 dev-vcs/hub/hub-2.14.1.ebuild create mode 100644 dev-vcs/lab/Manifest create mode 100644 dev-vcs/lab/lab-0.17.2.ebuild create mode 100644 dev-vcs/lab/metadata.xml create mode 100644 dev-vcs/qgit/qgit-2.9.ebuild create mode 100644 dev-vcs/repo/repo-1.27.ebuild delete mode 100644 dev-vcs/repo/repo-2.3.ebuild create mode 100644 dev-vcs/repo/repo-2.4.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 84dedb1913a3..3376263b8066 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest index d4d1eb943d80..1cd2d6dbc6a2 100644 --- a/dev-vcs/cvs-fast-export/Manifest +++ b/dev-vcs/cvs-fast-export/Manifest @@ -1,4 +1,6 @@ AUX cvs-fast-export-1.49-man-prefix.patch 201 BLAKE2B adf4cda892bd23628c032cc78390e9fc1e16128c1ed7f9520ad44771d48629d68b4438f824e0c062652b87eaf3ca8a85a80360987d2ac02b4f4c291e373262bb SHA512 e6c814b089ee352306651b26a4490dcfc7727c989f7fde02120bb6423d2862a362f57c31e7d4e359fdca382d76f66dbed57e49b7642349bc2248867d7f9fa997 DIST cvs-fast-export-1.50.tar.gz 440789 BLAKE2B 86c9f582090601fe97c98eaadf927902dbc8b0351a02bed3b1eca77c75641495bf2e457db3d75f058ccfc7f36c8800d59d53c3bd4abccf46fffbe324626273c5 SHA512 29c0e3e87917e5f11a7be318240bf80327a5f46b796d9fcbb6a6fd4fadc91fac924d60a74de80559d4c2713021b8a8a518e2dcae7594928e1d040f2c8614065b +DIST cvs-fast-export-1.51.tar.gz 459647 BLAKE2B ebaa1aeedee5de2b7d76cdb0d91897bc779b2cff9b6ae9ddc5b3872f36792e0e1c3f152e340d50c25c5bbef3c7be4af5a0cc4d7f2fd5f12c722c45c43510afcc SHA512 3b004ad1a295722b7610444be2ff67097e7099fb17fdd1ebd2d237a30ffc2a31e8a90b5344a9488f3ea3abd4e104bdc0cff2d28dd56321df76ae9bf6f25e90f4 EBUILD cvs-fast-export-1.50.ebuild 941 BLAKE2B 7846d1876e2f4de3a485e05ce5ba8aa428fb01f3bb12f864708e7f16d7a3d60f4259ae2cff50cd9c9dfcb38f2fa1e62f3276950939517d7139fdda46ec818449 SHA512 26074bc3d5969211f61b0089913b257f62522a6c37e99d4d1559f8bc84d9010a7536ffdb36dc0704f814ba2cb8e5f89a04571f1df2072be0786524dc28d44403 +EBUILD cvs-fast-export-1.51.ebuild 953 BLAKE2B c541dfce6a9a418f755544d3cb598c710deba189eb2c15255d03dcb5b7494e1461f08dd0fb7e6ef015ca2ee02c9ad7921c921092604952a82feb9ae50303199a SHA512 5002f8a963404df7d5fc5be8044fa8fdf37f936fced273fa996cc7463e00713cf050ae3c76ef06f6d0c2583c0ac642c3849291422fe2a1e8ceaae4e06a483d3f MISC metadata.xml 333 BLAKE2B abc76cd8de16656f7017b18c9119941bc5ae73cef7381c664f5580584c1e8e27b4833d6f8e7e514fa0c80470c81b4ae11957fc75dbf735d83fba0307321b3a73 SHA512 d33f6487d5ec4d5b76132cb761ddbba1db898f72502ae8afaf011090bc1bc53ae26f4c8bd335b9faa146dbb703f816c949cdcd35a3384ba03b03069d654b6955 diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.51.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-1.51.ebuild new file mode 100644 index 000000000000..976b11d8e920 --- /dev/null +++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.51.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="fast-export history from a CVS repository or RCS collection" +HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/" +SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + app-text/asciidoc" + +RESTRICT=test # upstream does not ship some tests in tarball + +src_prepare() { + default + + tc-export CC + export prefix="${EPREFIX}"/usr + + # respect CC, CFLAGS and LDFLAGS + sed \ + -e 's/cc /$(CC) $(LDFLAGS) /' \ + -e 's/^CFLAGS += -O/#&/' \ + -e 's/CFLAGS=/CFLAGS+=/' \ + -i Makefile || die +} + +src_compile() { + # '.adoc.html' rules can't be executed in parallel + # as they reuse the same 'docbook-xsl.css' file name. + emake -j1 html + # Allow full parallelism for the rest + emake +} + +src_install() { + default + dodoc README.adoc +} diff --git a/dev-vcs/cvsgraph/Manifest b/dev-vcs/cvsgraph/Manifest index d7494208cf46..9a4b7e0b1133 100644 --- a/dev-vcs/cvsgraph/Manifest +++ b/dev-vcs/cvsgraph/Manifest @@ -1,3 +1,3 @@ DIST cvsgraph-1.7.0.tar.gz 202678 BLAKE2B 589195f3642b0bc181a581a8f832eded3e6add44b2c9ee5c76a1a4f347384fbd59cd1f7f22c37d56810636dc13bad900bbe7973f9bfa061c37baa8becdaf35d5 SHA512 b2a5bec073e7fbba2a2b1975bb4583c8fa87d29a985b7bcedcaf556c744b822ea5ff65b5ca3c4bd6da6bb6697f5e023a7ce35cf5084f2d59fdd15297790e7aab -EBUILD cvsgraph-1.7.0.ebuild 894 BLAKE2B 26ce2f01b973cd970b3ac474a1756dd94b0e483eecffce73a7c1675a28f8f8b40cf94ba5001763bb32e3f587b902bb55711855f30cd04e96ee3fec8c18d4668b SHA512 786e4bbb007acbd9cd88546ad02b9062a9aed7a62128566ce39eac969af96b1b274c97d7b9b187f7863d0fe1a9014739b22fa844866b3f0fc6690e6c7cf6c814 +EBUILD cvsgraph-1.7.0.ebuild 893 BLAKE2B 6534a598a7079ccbddec6caca1583980bc12f01e922583acc5c65590122f24f1bb76dc6060d97b41b3cddb20166ffb1d9e0679b87f6041430d700b2bb3a61d47 SHA512 5d978f74674f17049299efd1e538e4b6f366240336d5a2e85814b3bf0cf4bc4082aa836a124a2faf4fc9049a33dea78105a8cfd951c6e39be9dccd14c1a235fb MISC metadata.xml 493 BLAKE2B 0e09276d91cc147bcb1b5eef8b13d9941cc1940a24e98413a9a5ba6d76bb98183fe55594bdfda4cb3787a73a32d893169a46924d61ea4b9030046005927d4a71 SHA512 8f12f7ce3e9039383476cb5802de8ab3e8ac01cb61ad25510e2c4e4ff3f075da0373197745365074c33fcafb33b680f121dc07a77499075e98896f8b4f5d26ba diff --git a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild index b844f9cff8ea..dd740865ae50 100644 --- a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild +++ b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,7 @@ src_configure() { $(use_enable truetype) } -src_install () { +src_install() { dobin cvsgraph insinto /etc doins cvsgraph.conf diff --git a/dev-vcs/git-mailz/Manifest b/dev-vcs/git-mailz/Manifest index 223e4da4e157..5dbebb8e5675 100644 --- a/dev-vcs/git-mailz/Manifest +++ b/dev-vcs/git-mailz/Manifest @@ -1,3 +1,3 @@ DIST git-mailz-0.14.tar.gz 8204 BLAKE2B e008216319b2ec39eed132e4c2792afabc75066b390d04f3a9e645aab234391f9d07c0fea3d965a4fe67b39f87536c2f2b3ee0959ecfdfabc7fb2e1a3c10c2de SHA512 fd6c518de135113482f2f3a4e9d89b41b1797c8219e1ed9f424a5c4ae575400e7ccd9f835b40be5d74a5eb4e1bc7d3dfedd2412a317baea7e20494169399b70c -EBUILD git-mailz-0.14.ebuild 458 BLAKE2B 3319b486b783fb96a98fc49cdf01ee107da9c58839e7713983c5c5ffd925d9c384d603574372b4545e7674a35bf0555395ebe9a3e7f224bdbbedd3375a5e93b1 SHA512 a113564a83df0d2369458354015501b10b19d51c305621a1a9a37ad95526a8a3812f2b3936b6dd117ccea504174d212b2acc93712920a05b6d115a6ffc49b9c3 +EBUILD git-mailz-0.14.ebuild 459 BLAKE2B f31e3c25f541ba8992b479aff8df3f04a238ff94b71ef3d6db8ebe1d226b682164514c479f42d6c007da449b11bea49650fbcc6c6c32be66a4afcf437c54c0b5 SHA512 22437475f0aea8d83abf5dfbc968c8f7d1bfa53488dc57890753635c861dc92fb55a0636f3e957376d632d749e50b917dfc0382952f131cc840afbd4df50c452 MISC metadata.xml 255 BLAKE2B f8c0e4254a2e06ac72445e5f911320f562b42f04def6bfcda25a04a5041332523032da6ea62d298b95142b92f67c3b4089916bff4e7276403d17485ed0b58c19 SHA512 d3ab8986894d0c5b99042ede02c5ac9101f976400a70a30b1735734825f856b34eb1060c6e23b16029db478a871e12b46550d0b4f4de6aa55e1fe8e096078a2f diff --git a/dev-vcs/git-mailz/git-mailz-0.14.ebuild b/dev-vcs/git-mailz/git-mailz-0.14.ebuild index fa497e490bf4..aee97820b015 100644 --- a/dev-vcs/git-mailz/git-mailz-0.14.ebuild +++ b/dev-vcs/git-mailz/git-mailz-0.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,6 +23,6 @@ RDEPEND=" app-shells/zsh " -src_install(){ +src_install() { emake PREFIX="${ED}/usr" install } diff --git a/dev-vcs/git-pimp/Manifest b/dev-vcs/git-pimp/Manifest index 45cb40a870f6..00e2dac863c0 100644 --- a/dev-vcs/git-pimp/Manifest +++ b/dev-vcs/git-pimp/Manifest @@ -1,3 +1,3 @@ DIST git-pimp-0.8.tar.gz 10555 BLAKE2B d6fa64b4cff6734661b22fe8b69d552dc405c702e36abd3b7fb309ad489602facd099828b021bc813dca88b8e29c258b5be56abceebcb9d5f85c035af6d93c86 SHA512 124b61001c088685d5d9d6f848d37ca170413fda08074a273a4c1bccd233fe606028d8de82c66ae7847f42008b82a6030fa47a493ddc47b65d02b69a1acbd7df -EBUILD git-pimp-0.8.ebuild 587 BLAKE2B a610a42288f8920f8ebc458d7da61ae8d48277c8fe5325bc6c148450056f19581b26ea5402f4d306efc9660988f56c4f1656a82024290c1c880c25b882cda131 SHA512 897cd552ecf6538a04e14138b18a5ab25fc651103cfde69b6bea368d5165080dccbbebae825b73f0ad297267618de1bd19af3388cf9597f414af7e5d9e1ea27a +EBUILD git-pimp-0.8.ebuild 588 BLAKE2B ac6c912878030641516884014bad72414d61feac866826b3555cb705dc93aa4eb6f1aec1ae535d540b9e8634f7e5549345086a0efcfac8d5c9ac4ef38b05d7d9 SHA512 810141e02d65efdcba94624254386ad66327010799a9c05f89bbce82f1f84908042e3ec820b0a0a6689739799e2a6525f94a37f1f40925f8e860191493dd1901 MISC metadata.xml 255 BLAKE2B f8c0e4254a2e06ac72445e5f911320f562b42f04def6bfcda25a04a5041332523032da6ea62d298b95142b92f67c3b4089916bff4e7276403d17485ed0b58c19 SHA512 d3ab8986894d0c5b99042ede02c5ac9101f976400a70a30b1735734825f856b34eb1060c6e23b16029db478a871e12b46550d0b4f4de6aa55e1fe8e096078a2f diff --git a/dev-vcs/git-pimp/git-pimp-0.8.ebuild b/dev-vcs/git-pimp/git-pimp-0.8.ebuild index 9e46d70afc0b..8e86e781023d 100644 --- a/dev-vcs/git-pimp/git-pimp-0.8.ebuild +++ b/dev-vcs/git-pimp/git-pimp-0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ RDEPEND=" dev-vcs/git-mantle " -src_install(){ +src_install() { # Do not install in /usr/local emake PREFIX="${ED}/usr" install einstalldocs diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 7063bd623588..bc16aad1067d 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,5 +1,4 @@ AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a181ec9af6740033b0446f76b9620c97db582e85eff9aee0e3f88749981a135382c7a8d3187da921a5 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 -AUX git-2.18.0_rc1-optional-cvs.patch 14471 BLAKE2B 0fcd6693bdcb7ef1fb843a19eb3802edb96e0f4820cc56338de6e0042a768d14a72eb4c02dd680bf4a9e536935529dcb5b1f25bd6f7980e46ca0ea0059f2d643 SHA512 d5cafb3c52b0cade0550492b4d52d96a912f9d721eb02677390b6edc7154f171c84b9b225baf42fa328b3ee0a7feaae75b4a4426b73db3deebe878ce62adf9d6 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 @@ -12,22 +11,22 @@ AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101a AUX git-daemon.socket 116 BLAKE2B 0fbf31de87810ac737adfab21acf87b0d95f62df5208fea3d79ebe010a4971b731ba1684852f3b926ecc7e23bcb9a386b2e612801701299c64d4c6390ed4befe SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42359b6134af0a4c03a30a9464db5e19c6027645d9084550743e397af2d6566b7543a2b509e025aeb1e1 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 -DIST git-2.21.1.tar.xz 5496840 BLAKE2B 8b61c5ca8940422238e48931b502f2a876e20181e66232fbd8a7311969c27c862524b384792d4a35a61c33ba3297c90e6df5febf3a820281eaab00233f48b02c SHA512 c4f1930effe4b7cddbdc3a5ea0f1503683089d5dfdae491dd7f752f35b655b31fbef569a993ef412962cf9c74a225eafe095f792d493f37b20789e5c643261a1 DIST git-2.23.1.tar.xz 5713672 BLAKE2B 50db7bafbadcefbc5a56db478ea0464d289c45190a0454e0b8f3d99d48e6251071482df0240ee1ee8a1f733c91e9e46d34794bca8ca70d3c4ecc3b5da6d5d529 SHA512 708f8b9a7c65c1c9d3117b1b7ee9383044b66fe8a5c168a52ba561985670f659d514aa34988ea8ba85c127da6a23c39c511919a6d661bffc9cf782e30fd62373 DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 DIST git-2.25.0.tar.xz 5873532 BLAKE2B 7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660 SHA512 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 -DIST git-htmldocs-2.21.1.tar.xz 1236408 BLAKE2B 173892327d27d918cc0a15e982145d5f0f638deeda56be1cbf16c953b7b3454555ecf3e708c6117b1d4e781ca332199457d9c5b619c91735e0c6e85449be528f SHA512 41819a75656afab0fd56407e7141c8176b708099546cdc7cdc5e765a35401e1148a7165c41bc12a68e124335532450748b27cc3f8c0e372d596f27a992e23e95 +DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 DIST git-htmldocs-2.23.1.tar.xz 1296144 BLAKE2B 5be4a8afdd79234d220c119b8a4239e640486dc52236d980d08e6b3cad1be61b683c0e3dff6bdd67035a1e23f1d07858d3344f9f2ae90b44188395f34c22fea4 SHA512 c005be3baf129c9320893270d1d3b69e01546a29d482d29e5bc7baefbaab33e45d877c5c09e47312bbdb8b3dfcff27735c2427dcae9eb21fd3500ec30e214ae1 DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a DIST git-htmldocs-2.25.0.tar.xz 1293644 BLAKE2B 8966e7d57701543770a589aef4a4bb8e673c22987330095431da6cc6cff023f8e288ba13a43d388d9b6e4fb92bed5baaa983c72124f440ef9e6c966b03d920a4 SHA512 67e8c2cc458d81870c901b720800a49cf605b3815c63af91328419a1e543e296b348bd8f7126a4a3cefcb8e2e2c7b713bcfc38ee945c224bd34bbd1c3e4f45b2 -DIST git-manpages-2.21.1.tar.xz 440316 BLAKE2B 658232d29bbca3b55a6797d5008f2f6f82d0c04d22ae5af8c689d8cb00e35bfbbccf658d269b96dd868cf3e1cf8f3304eb97cfee428ff8c762f914d1cde4e4f4 SHA512 1a687e4cb2dc90854067b164d6142b88205ba40dbc283432296afafde4370afc900096c5aedc9a7a959b8aa910196d42c399c5c4eed7e2f1ce0f98d8005f3581 +DIST git-htmldocs-2.25.1.tar.xz 1295708 BLAKE2B 18a274e5eb48030f50c0f38cbcc81b0e65c55ea6b702a9cc4f231c274faf0247c4fdaccde2d348717826d1bd914fe62b387946ae63aba64ba032c43898529f7a SHA512 f261cf72a7b59277666c543d2b40cc9e37ae6d4925616dcb448325e69c59efdee9db151a0d509545d5b366d82fe1196ece289197c02c65ae5f8c91526d49b0fb DIST git-manpages-2.23.1.tar.xz 448432 BLAKE2B 0de4b2c0dcc3a70188a66d8aa6e16aeaad84a9f16b764934b06f61773db2d5141cc0b1091780d126f29a1f50c767a54fbb7d01a36f86d387d8ccb4060f48156e SHA512 16145c0c2215ce6a3aa9045f35f670258f6823a765ed2feec680ed980420d1bb008fc39d8f379c81cd0b259fc582d15e42395d4f954171b20bcf214ab25e41d7 DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90 DIST git-manpages-2.25.0.tar.xz 456636 BLAKE2B 672557d167b7d2ff48089bc5be1fa446f25eed4412d6e48549d5907f7addab9f721a03a8bcb7ca3fb1804220021566ebac549d9878df9f1030f283ed5e44ddf3 SHA512 3ad1756b1f12898823a8981e3b650f588c6c1fb2d51371739c754108e67c2cd13e4d2bcb8291534523eac60e7a05253d4ddf2f3528e28d4e1b50eafa42168847 -EBUILD git-2.21.1.ebuild 19094 BLAKE2B b8cae80c578a1706d6630b0de4507b03849aca4fd52736919aaba4484953d504afbf9824d033030ca8299de90985c11c6dae3cf6b06d0c6ea8bfeb30bd885fee SHA512 acdb6312f1190cd01c898f6e112b7238e9de23e4ee0d738068ba287f4471d1987720380dfdceb492d02ebacd051728bec4165c6d12a008d3c8b949091b656539 +DIST git-manpages-2.25.1.tar.xz 457408 BLAKE2B 6b9d7074bc690156e7d4a14b04d8e82c9441c8b9330bdf40de215fc48ee7bbfaf410b57bbf48bd6127a60f0d6daa0adf7194fc8eb43b3d8e2a9b5d054cb7d5ea SHA512 c36afa05f641c6e1d909cbe0e3292a10f35c0a05867e2782e6770857714b152de839f1e9b2c2ff2efea0b50b19cfdf3022d8617a299f4aa3940533eb891fa6ba EBUILD git-2.23.1-r1.ebuild 19574 BLAKE2B 7a0d11136a9affa4b8f778ca030bc29a4f209a89bc07bbf2290ae5887eef0b8bee7caffed97e14315a1ffc414f9d8b0bb511b12879709afa36599530ece65072 SHA512 2af3a45ea705d11b9925f1b74c0b465e84ceb5d82d95c1fc45fc4f301185ef77de18fe59b4c84488abbc780098aba910b27bc9ec95b726af26634b32f1e31e33 EBUILD git-2.24.1.ebuild 19523 BLAKE2B 7c7fb815ec6e0b7bcbe080825336c56a3c99c912b636ce198046989e1462b0b8daafa28ee74c8351d6d717f2220d944da62ff65698f2eae905bb91ea0cc8984d SHA512 82036fa080e5bdf5afb7629f7ee83f76a0c37b0793efafca8996dbf1053ae73307823117eebee91a990615737c0de37cd0a3892542f9519ded3b5096a26849ff EBUILD git-2.25.0.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342 +EBUILD git-2.25.1.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342 EBUILD git-9999-r1.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342 EBUILD git-9999-r2.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342 EBUILD git-9999-r3.ebuild 19533 BLAKE2B 20b73ab9cce220ca44b43849d52435985e5b7d5b1e875656e4c308fa88439fa75bb91acf74cdb2382c5b4eef78d3773dd2f69a08bacb9c28e26fc4b6c1282e1e SHA512 be6efd87c38ca46e289e3dd2bb49b0d77cb7e97f37a6e2ab3ac5e0dff34b701bafee56ca0ef632d8351d7e10a1f39763a2273185a38a8c211b4c502b798c7342 diff --git a/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch b/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch deleted file mode 100644 index 2e213c00522a..000000000000 --- a/dev-vcs/git/files/git-2.18.0_rc1-optional-cvs.patch +++ /dev/null @@ -1,460 +0,0 @@ -From 7b0d0d066a5f869f86f2be125d63ae98c1451feb Mon Sep 17 00:00:00 2001 -From: Robin Johnson -Date: Wed, 6 Jun 2018 16:25:13 +0200 -Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface - utilities - -Forward-ported from 1.7.12 to current git.git v1.8.4 -Forward-ported from v1.8.4 to v1.8.5.1 -Forward-ported from v1.8.5.3 to v1.9.0_rc3 -Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 -Forward-ported from v2.0.0_rc0 to v2.0.0 -Forward-ported from v2.0.0 to v2.2.2 -Forward-ported from v2.2.2 to v2.8.4 -Forward-ported from v2.8.4 to v2.10.0 -Forward-ported from v2.10.0 to v2.12.0 -Forward-ported from v2.12.0 to v2.17.0-rc1 -Forward-ported from v2.17.0-rc1 to v2.18.0-rc1 - -Signed-off-by: Lars Wendler ---- - Makefile | 49 ++++++++++++++++++++++-------- - t/t9200-git-cvsexportcommit.sh | 5 +++ - t/t9400-git-cvsserver-server.sh | 8 ++++- - t/t9401-git-cvsserver-crlf.sh | 15 ++++++--- - t/t9600-cvsimport.sh | 41 ++++++++++++++++--------- - t/t9601-cvsimport-vendor-branch.sh | 11 +++++++ - t/t9602-cvsimport-branches-tags.sh | 11 +++++++ - t/t9603-cvsimport-patchsets.sh | 11 +++++++ - t/test-lib.sh | 1 + - 9 files changed, 119 insertions(+), 33 deletions(-) - -diff --git a/Makefile b/Makefile -index 1d27f36365..b30a14e263 100644 ---- a/Makefile -+++ b/Makefile -@@ -312,6 +312,8 @@ all:: - # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep - # and egrep that are pickier when their input contains non-ASCII data. - # -+# Define NO_CVS if you do not want any CVS interface utilities. -+# - # The TCL_PATH variable governs the location of the Tcl interpreter - # used to optimize git-gui for your system. Only used if NO_TCLTK - # is not set. Defaults to the bare 'tclsh'. -@@ -589,6 +591,7 @@ LIB_OBJS = - PROGRAM_OBJS = - PROGRAMS = - SCRIPT_PERL = -+SCRIPT_PERL_CVS = - SCRIPT_PYTHON = - SCRIPT_SH = - SCRIPT_LIB = -@@ -626,12 +629,13 @@ SCRIPT_LIB += git-sh-i18n - - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-archimport.perl --SCRIPT_PERL += git-cvsexportcommit.perl --SCRIPT_PERL += git-cvsimport.perl --SCRIPT_PERL += git-cvsserver.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl - -+SCRIPT_PERL_CVS += git-cvsexportcommit.perl -+SCRIPT_PERL_CVS += git-cvsimport.perl -+SCRIPT_PERL_CVS += git-cvsserver.perl -+ - SCRIPT_PYTHON += git-p4.py - - NO_INSTALL += git-remote-testgit -@@ -639,24 +643,26 @@ NO_INSTALL += git-remote-testgit - # Generated files for scripts - SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) - SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) -+SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS)) - SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) - - SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) - SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN)) -+SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN)) - SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN)) - - # Individual rules to allow e.g. - # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" - # from subdirectories like contrib/*/ - .PHONY: build-perl-script build-sh-script build-python-script --build-perl-script: $(SCRIPT_PERL_GEN) -+build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) - build-sh-script: $(SCRIPT_SH_GEN) - build-python-script: $(SCRIPT_PYTHON_GEN) - - .PHONY: install-perl-script install-sh-script install-python-script - install-sh-script: $(SCRIPT_SH_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' --install-perl-script: $(SCRIPT_PERL_INS) -+install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - install-python-script: $(SCRIPT_PYTHON_INS) - $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' -@@ -665,12 +671,13 @@ install-python-script: $(SCRIPT_PYTHON_INS) - clean-sh-script: - $(RM) $(SCRIPT_SH_GEN) - clean-perl-script: -- $(RM) $(SCRIPT_PERL_GEN) -+ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) - clean-python-script: - $(RM) $(SCRIPT_PYTHON_GEN) - - SCRIPTS = $(SCRIPT_SH_INS) \ - $(SCRIPT_PERL_INS) \ -+ $(SCRIPT_PERL_CVS_INS) \ - $(SCRIPT_PYTHON_INS) \ - git-instaweb - -@@ -2076,13 +2083,27 @@ git.res: git.rc GIT-VERSION-FILE - -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ - - # This makes sure we depend on the NO_PERL setting itself. --$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS -+$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS -+ -+_SCRIPT_PERL_GEN = -+_SCRIPT_PERL_NOGEN = - - # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX - # since the locale directory is injected. - perl_localedir_SQ = $(localedir_SQ) - - ifndef NO_PERL -+_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) -+ -+ifndef NO_CVS -+_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN) -+else -+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN) -+_REASON = NO_CVS -+_REASON_CONTENT = $(NO_CVS) -+endif # NO_CVS -+ -+$(_SCRIPT_PERL_GEN): - PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl - PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ) - -@@ -2103,7 +2124,7 @@ endif - - PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir) - --$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE -+$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1{' \ - -e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \ -@@ -2149,14 +2170,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES - chmod +x $@+ && \ - mv $@+ $@ - else # NO_PERL --$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh -+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb -+_REASON = NO_PERL -+_REASON_CONTENT = $(NO_PERL) -+endif # NO_PERL -+ -+$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ -+ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \ - unimplemented.sh >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ --endif # NO_PERL - - # This makes sure we depend on the NO_PYTHON setting itself. - $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS -@@ -2396,7 +2421,7 @@ LOCALIZED_SH = $(SCRIPT_SH) - LOCALIZED_SH += git-parse-remote.sh - LOCALIZED_SH += git-rebase--interactive.sh - LOCALIZED_SH += git-sh-setup.sh --LOCALIZED_PERL = $(SCRIPT_PERL) -+LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) - - ifdef XGETTEXT_INCLUDE_TESTS - LOCALIZED_C += t/t0200/test.c -diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh -index 1319415ba8..34ac8e28e2 100755 ---- a/t/t9200-git-cvsexportcommit.sh -+++ b/t/t9200-git-cvsexportcommit.sh -@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then - test_done - fi - -+if ! test_have_prereq CVS; then -+ skip_all='skipping git cvsexportcommit tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh -index 06742748e9..51d474d94b 100755 ---- a/t/t9400-git-cvsserver-server.sh -+++ b/t/t9400-git-cvsserver-server.sh -@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server' - . ./test-lib.sh - - if ! test_have_prereq PERL; then -- skip_all='skipping git cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi -+ -+if ! test_have_prereq CVS; then -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh -index 84787eee9a..eecba88527 100755 ---- a/t/t9401-git-cvsserver-crlf.sh -+++ b/t/t9401-git-cvsserver-crlf.sh -@@ -57,15 +57,20 @@ check_status_options() { - return $stat - } - --cvs >/dev/null 2>&1 --if test $? -ne 1 -+if ! test_have_prereq PERL - then -- skip_all='skipping git-cvsserver tests, cvs not found' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi --if ! test_have_prereq PERL -+if ! test_have_prereq CVS - then -- skip_all='skipping git-cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+cvs >/dev/null 2>&1 -+if test $? -ne 1 -+then -+ skip_all='skipping git-cvsserver tests, cvs not found' - test_done - fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { -diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh -index 804ce3850f..c53c50e432 100755 ---- a/t/t9600-cvsimport.sh -+++ b/t/t9600-cvsimport.sh -@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then - test_done - fi - --test_expect_success PERL 'setup cvsroot environment' ' -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ -+test_expect_success 'setup cvsroot environment' ' - CVSROOT=$(pwd)/cvsroot && - export CVSROOT - ' - --test_expect_success PERL 'setup cvsroot' '$CVS init' -+test_expect_success 'setup cvsroot' '$CVS init' - --test_expect_success PERL 'setup a cvs module' ' -+test_expect_success 'setup a cvs module' ' - - mkdir "$CVSROOT/module" && - $CVS co -d module-cvs module && -@@ -47,23 +58,23 @@ EOF - ) - ' - --test_expect_success PERL 'import a trivial module' ' -+test_expect_success 'import a trivial module' ' - - git cvsimport -a -R -z 0 -C module-git module && - test_cmp module-cvs/o_fortuna module-git/o_fortuna - - ' - --test_expect_success PERL 'pack refs' '(cd module-git && git gc)' -+test_expect_success 'pack refs' '(cd module-git && git gc)' - --test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' -+test_expect_success 'initial import has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1) > expected && - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - (cd module-cvs && - cat <o_fortuna && - O Fortune, -@@ -91,7 +102,7 @@ EOF - ) - ' - --test_expect_success PERL 'update git module' ' -+test_expect_success 'update git module' ' - - (cd module-git && - git config cvsimport.trackRevisions true && -@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' ' - - ' - --test_expect_success PERL 'update has correct .git/cvs-revisions' ' -+test_expect_success 'update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^ && -@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - - (cd module-cvs && - echo 1 >tick && -@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' ' - ) - ' - --test_expect_success PERL 'cvsimport.module config works' ' -+test_expect_success 'cvsimport.module config works' ' - - (cd module-git && - git config cvsimport.module module && -@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' ' - - ' - --test_expect_success PERL 'second update has correct .git/cvs-revisions' ' -+test_expect_success 'second update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && -@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'import from a CVS working tree' ' -+test_expect_success 'import from a CVS working tree' ' - - $CVS co -d import-from-wt module && - (cd import-from-wt && -@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' ' - - ' - --test_expect_success PERL 'no .git/cvs-revisions created by default' ' -+test_expect_success 'no .git/cvs-revisions created by default' ' - - ! test -e import-from-wt/.git/cvs-revisions - - ' - --test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' -+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' - - test_done -diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh -index 827d39f5bf..d730a41f67 100755 ---- a/t/t9601-cvsimport-vendor-branch.sh -+++ b/t/t9601-cvsimport-vendor-branch.sh -@@ -34,6 +34,17 @@ - test_description='git cvsimport handling of vendor branches' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9601 - - test_expect_success PERL 'import a module with a vendor branch' ' -diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh -index e1db323f54..68f097401f 100755 ---- a/t/t9602-cvsimport-branches-tags.sh -+++ b/t/t9602-cvsimport-branches-tags.sh -@@ -6,6 +6,17 @@ - test_description='git cvsimport handling of branches and tags' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9602 - - test_expect_success PERL 'import module' ' -diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh -index c4c3c49546..9b2957d4f0 100755 ---- a/t/t9603-cvsimport-patchsets.sh -+++ b/t/t9603-cvsimport-patchsets.sh -@@ -14,6 +14,17 @@ - test_description='git cvsimport testing for correct patchset estimation' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9603 - - test_expect_failure PERL 'import with criss cross times on revisions' ' -diff --git a/t/test-lib.sh b/t/test-lib.sh -index 28315706be..6e2f99cdbb 100644 ---- a/t/test-lib.sh -+++ b/t/test-lib.sh -@@ -1064,6 +1064,7 @@ case $uname_s in - esac - - ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 -+test -z "$NO_CVS" && test_set_prereq CVS - test -z "$NO_PERL" && test_set_prereq PERL - test -z "$NO_PTHREADS" && test_set_prereq PTHREADS - test -z "$NO_PYTHON" && test_set_prereq PYTHON --- -2.17.1 - diff --git a/dev-vcs/git/git-2.21.1.ebuild b/dev-vcs/git/git-2.21.1.ebuild deleted file mode 100644 index 5302c78a7fa8..000000000000 --- a/dev-vcs/git/git-2.21.1.ebuild +++ /dev/null @@ -1,715 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - SCM="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: pu - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=pu ;; - esac -fi - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 +perl +python +ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - 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="${CDEPEND} - 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 - ) - ) - python? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - 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 ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch - - "${FILESDIR}"/git-2.2.0-svn-fe-linking.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 python ; 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 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 python '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREAD=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 -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=( -# NO_MMAP=YesPlease -# NO_IPV6=YesPlease -# NO_STRLCPY=YesPlease -# NO_MEMMEM=YesPlease -# NO_MKDTEMP=YesPlease -# NO_MKSTEMPS=YesPlease -# ) -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=( NO_NSEC=YesPlease ) - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=( NO_FNMATCH_CASEFOLD=YesPlease ) - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ - myopts+=( HAVE_GETDELIM=1 ) - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) - - # 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 python && 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 - git_emake svn-fe.{1,html} \ - || die "emake svn-fe.1 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 - use doc && git_emake doc - 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 git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-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 - 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.25.1.ebuild b/dev-vcs/git/git-2.25.1.ebuild new file mode 100644 index 000000000000..d256228c484b --- /dev/null +++ b/dev-vcs/git/git-2.25.1.ebuild @@ -0,0 +1,728 @@ +# Copyright 1999-2020 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=( python{2_7,3_{6,7}} ) + +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: pu + case "${PVR}" in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=pu ;; + 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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_PTHREAD=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 +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=( +# NO_MMAP=YesPlease +# NO_IPV6=YesPlease +# NO_STRLCPY=YesPlease +# NO_MEMMEM=YesPlease +# NO_MKDTEMP=YesPlease +# NO_MKSTEMPS=YesPlease +# ) +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts+=( NO_NSEC=YesPlease ) + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts+=( NO_FNMATCH_CASEFOLD=YesPlease ) + 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/gitg/Manifest b/dev-vcs/gitg/Manifest index a347adaddd64..257bef2095e1 100644 --- a/dev-vcs/gitg/Manifest +++ b/dev-vcs/gitg/Manifest @@ -1,3 +1,3 @@ DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4 -EBUILD gitg-3.32.1.ebuild 1954 BLAKE2B 427141193d45b543ff5217e8e2bf4835656c752db9d7e88fa204906819462ca619d92a1803db31f29b258b693c20584b74429f819e0554847d9450366735fb37 SHA512 2af3c222979d7a40d6ccf84d6a6ed9aad73b68516456f27ff74e8c9802290be81ae0146edef2c4fe00c746ac073dd90a635aa9ac094bee6b529e0ac9c2ab5988 +EBUILD gitg-3.32.1-r1.ebuild 1951 BLAKE2B 932fe93ea8b80ade6e2174b817c14528011f57dd8768e84909041f31b45f21ca7d5f33f014250968d92f500a9cbebb786a999213f3ef826bcc4bfbda9f39d8be SHA512 1557a5552336791d8582910981d4abc098d15676e1f301f075d8c7d5803ca3eeaeddba3e933af7f88675f81c1daf77ce57e1647db4dede0dd0b9a9605eed9a76 MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30 diff --git a/dev-vcs/gitg/gitg-3.32.1-r1.ebuild b/dev-vcs/gitg/gitg-3.32.1-r1.ebuild new file mode 100644 index 000000000000..360f3b8e0baf --- /dev/null +++ b/dev-vcs/gitg/gitg-3.32.1-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) +# vala-0.36 fails to build, https://bugs.gentoo.org/692538 +VALA_MIN_API_VERSION="0.40" + +inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils + +DESCRIPTION="git repository viewer for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Gitg" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +IUSE="glade +python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# test if unbundling of libgd is possible +# Currently it seems not to be (unstable API/ABI) +RDEPEND=" + app-crypt/libsecret[vala] + >=app-text/gtkspell-3.0.3:3[vala] + >=dev-libs/glib-2.38:2[dbus] + >=dev-libs/gobject-introspection-0.10.1:= + dev-libs/libdazzle[vala] + dev-libs/libgee:0.8[introspection] + dev-libs/libgit2:=[threads] + + >=dev-libs/libgit2-glib-0.27[ssh] + =dev-libs/libpeas-1.5.0[gtk] + >=dev-libs/libxml2-2.9.0:2 + >=gnome-base/gsettings-desktop-schemas-0.1.1 + net-libs/libsoup:2.4 + >=x11-libs/gtk+-3.20.0:3 + >=x11-libs/gtksourceview-3.10:3.0 + x11-themes/adwaita-icon-theme + glade? ( >=dev-util/glade-3.2:3.10 ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND} + $(vala_depend) + >=dev-libs/libgit2-glib-0.24.4[vala] + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig +" + +src_prepare() { + default + vala_src_prepare + xdg_environment_reset +} + +src_configure() { + local emesonargs=( + $(meson_use glade glade_catalog) + # we install the module manually anyway + -Dpython=false + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + if use python ; then + python_moduleinto gi.overrides + python_foreach_impl python_domodule libgitg-ext/GitgExt.py + fi +} + +pkg_postinst() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/dev-vcs/gitg/gitg-3.32.1.ebuild b/dev-vcs/gitg/gitg-3.32.1.ebuild deleted file mode 100644 index de0af18668d8..000000000000 --- a/dev-vcs/gitg/gitg-3.32.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -# vala-0.36 fails to build, https://bugs.gentoo.org/692538 -VALA_MIN_API_VERSION="0.40" - -inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils - -DESCRIPTION="git repository viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Gitg" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="glade +python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# test if unbundling of libgd is possible -# Currently it seems not to be (unstable API/ABI) -RDEPEND=" - app-crypt/libsecret[vala] - >=app-text/gtkspell-3.0.3:3[vala] - >=dev-libs/glib-2.38:2[dbus] - >=dev-libs/gobject-introspection-0.10.1:= - dev-libs/libdazzle[vala] - dev-libs/libgee:0.8[introspection] - dev-libs/libgit2:=[threads] - - >=dev-libs/libgit2-glib-0.27[ssh] - =dev-libs/libpeas-1.5.0[gtk] - >=dev-libs/libxml2-2.9.0:2 - >=gnome-base/gsettings-desktop-schemas-0.1.1 - net-libs/libsoup:2.4 - >=x11-libs/gtk+-3.20.0:3 - >=x11-libs/gtksourceview-3.10:3.0 - x11-themes/adwaita-icon-theme - glade? ( >=dev-util/glade-3.2:3.10 ) - python? ( - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - ) -" -DEPEND="${RDEPEND} - $(vala_depend) - >=dev-libs/libgit2-glib-0.24.4[vala] - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig -" - -src_prepare() { - default - vala_src_prepare - xdg_environment_reset -} - -src_configure() { - local emesonargs=( - $(meson_use glade glade_catalog) - # we install the module manually anyway - -Dpython=false - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - if use python ; then - python_moduleinto gi.overrides - python_foreach_impl python_domodule libgitg-ext/GitgExt.py - fi -} - -pkg_postinst() { - gnome2_schemas_update - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - gnome2_schemas_update - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest index 3d78ae09bb8d..a5b53914d356 100644 --- a/dev-vcs/hub/Manifest +++ b/dev-vcs/hub/Manifest @@ -1,3 +1,5 @@ DIST hub-2.13.0.tar.gz 2074748 BLAKE2B e790c13cfab9070699b3995c91c3adfad89b438d70b4f0683dcf2f487349c785d97f1aa845620cf0ccabf93f6738a3a1d45410bd1155c861d55f3d2568312235 SHA512 77cc86948a4725a56b09eacdecb3227b46022de93f6ca8eb298441e32bda83cd8e6bb7874e029caae06852c6edcedfaa19382599d6f6ad9760663ff2573d2342 +DIST hub-2.14.1.tar.gz 2077137 BLAKE2B 35e209766e73979c6629c4542d405d0a724b2ec77d89ef14c50b7630118e55b8d4afc96d1dd7daadf6d790b55dae45b33a855ec49ac9ff87d347849874078ef0 SHA512 dc4fc1ea27c4338ace1233089eea45fe4b636d6b000ef49b2ae44481d508b76c4c2035573acb0654efb2a3986ebdeb7b57dee9e77bbbdedc319c6dbba4ea6f8c EBUILD hub-2.13.0.ebuild 787 BLAKE2B c026240918aad6dc9b418e8f70bd2237cd771d52032b1001ce7ae1e62be25e58d3af0e7577bf0ef88f5d5e241c397476b8996f226d6b4445fb554f37ab5c7908 SHA512 5f81216e6e0c8623f81178f0c45b774b4af97f870f0e8b327d1f69e68f69231148aa35ce7c5b9f9401e9df80506be798c21f0867a9b53729a0c25fb5825d61b1 +EBUILD hub-2.14.1.ebuild 787 BLAKE2B c026240918aad6dc9b418e8f70bd2237cd771d52032b1001ce7ae1e62be25e58d3af0e7577bf0ef88f5d5e241c397476b8996f226d6b4445fb554f37ab5c7908 SHA512 5f81216e6e0c8623f81178f0c45b774b4af97f870f0e8b327d1f69e68f69231148aa35ce7c5b9f9401e9df80506be798c21f0867a9b53729a0c25fb5825d61b1 MISC metadata.xml 334 BLAKE2B c10c297b5f493184b2191daf7c8c8df963054d3bd682aec7c9768784171f2eacb267fec32b817ea93a85d57e1bc248f5454ab8984270b94c997287b4ab983cfd SHA512 448ebf7bab89832d682b7e99a2fde5e04f242c7cca13272f5827f680077a310d670ff1f201073d07d779b8fb1905e066cd0de7b4f82879233ea6f366b0992f7a diff --git a/dev-vcs/hub/hub-2.14.1.ebuild b/dev-vcs/hub/hub-2.14.1.ebuild new file mode 100644 index 000000000000..02a51219754b --- /dev/null +++ b/dev-vcs/hub/hub-2.14.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 go-module + +DESCRIPTION="Command-line wrapper for git that makes you better at GitHub" +HOMEPAGE="https://github.com/github/hub" +SRC_URI="https://github.com/github/hub/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=">=dev-vcs/git-1.7.3" + +src_compile() { + emake bin/hub man-pages +} + +src_test() { + emake test +} + +src_install() { + dobin bin/${PN} + dodoc README.md + doman share/man/man1/*.1 + + newbashcomp etc/${PN}.bash_completion.sh ${PN} + + insinto /usr/share/vim/vimfiles +doins -r share/vim/vimfiles/* + insinto /usr/share/zsh/site-functions + newins etc/hub.zsh_completion _${PN} +} diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest index 5483d8b1c036..4aef8efbdf07 100644 --- a/dev-vcs/kdesvn/Manifest +++ b/dev-vcs/kdesvn/Manifest @@ -1,3 +1,3 @@ DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d -EBUILD kdesvn-2.1.0.ebuild 1679 BLAKE2B af57aa6ae93d225878ff3c9f1ce2f62693b7b2156c1f4b9d659977129ac3dda77c64e81e4161e96b9d53d8f7dd2872ce61730eb2a3547d8e17f442e27ce1ff99 SHA512 43cb104fd007b4267ce337729d089eb924962a5c83fbde3780e30811ab5a8f032850920e18b6597a33915388e20c4bdbf18d536f989375c410514cc29172d82d +EBUILD kdesvn-2.1.0.ebuild 1680 BLAKE2B 5586cd42b2b15ec27b764a4b6885c04434a0258891f794b8d622d982118550dac9b2bb64f8c8e1ac407aff467ae04ef3641a11bd07abc8bd672f368addf8be86 SHA512 84ee943d42b52cf2ceb65bb60bfc7c14133e979f5090981918313ba16ebf407674545ccd5cc0759d813eff4db0b088c2cae8f2bafe1be403ba4e561eecf39f2b MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337 diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild index 251a929b7516..2fd22ae15ba8 100644 --- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild +++ b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild @@ -56,7 +56,7 @@ RDEPEND="${DEPEND} !kde-apps/kdesdk-kioslaves:4[subversion(-)] " -src_prepare(){ +src_prepare() { ecm_src_prepare if ! use man ; then diff --git a/dev-vcs/lab/Manifest b/dev-vcs/lab/Manifest new file mode 100644 index 000000000000..69117a4f7b52 --- /dev/null +++ b/dev-vcs/lab/Manifest @@ -0,0 +1,40 @@ +DIST github.com-avast-retry-go-5469272a8171.tar.gz 6362 BLAKE2B 91e31932e8927d16fc10efdf4b712bf960f8eb367ef7ac2496f4b7393c197d9d2e0004607b07ec0b72ac86ca5db0aa6a6d5ca46878a52680285a95c7a9a619e6 SHA512 b9114a153be4f71236f3968319cd811dcf83a43092d45175826e18b38954b98bded010f45c5977997628402dbdd9b8eaf295788ed6c0f240b4684f27bdb87d1c +DIST github.com-cpuguy83-go-md2man-v1.0.8.tar.gz 79284 BLAKE2B c6bf5c1507f0e7e6393c08592bf56e6423157f265a2f26b10f262c00b15c855e99c022d9e4b465247997b0c9d667ed71c727d03735af6214ec20ca30583235aa SHA512 4c52e01c9b07582b5d55d1e94935378a676bd284a3e8230a8a191d4678b1b6ae92b704a249117c542832170069a70c649e58a1752fb2973709259b5bc108db91 +DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e +DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf +DIST github.com-gdamore-encoding-v1.0.0.tar.gz 10886 BLAKE2B da5f463291cec9714b3212848d442f533fcc34dc587637b54dc89b12f0b026121e7571619e3713cea7c94ec4de7c94060d83a4ca658d0cb34e4b770c68a07318 SHA512 7ddfa1f796a32e7c69185e862a633513f1ff8a53dfb9333d4c4902a4f545ad570aa37e9faf473206465a487ae243d6003583d56c932ed99230f0ee5f87e6d49e +DIST github.com-gdamore-tcell-v1.3.0.tar.gz 148627 BLAKE2B 771792b78de6dab693ae3af45612472c4a0452eff5a48df036fd1abc5f4c09874d309a38b55ed276b103e9146f0338f84fab4ebf25482bdb17334190e07e0fe0 SHA512 9e5b941df504e9687922249e41d00545b6719b06f077030870e0685ea8301dff596b49a56704d1c14b223d1e5b67fb0ef5af424061b3e3dc0fe5b6621ff775c0 +DIST github.com-go-yaml-yaml-v2.2.1.tar.gz 70217 BLAKE2B 4ba34bd9432699ec60348d13d8b95498abf751a922f782bf177695e6854faf907c1728d1dc13ad1cb63215fe3a86366cd99068247d15c726ba77bd0cf434b9c6 SHA512 d49267ee361196b0a1e1b9ad6f6cfa903627ccf7925fc3acc8d1bd214b64d362a9dcee10ba524fb8887226235c5baa2c8812a9f62adc7e6719d4ed84baa4ce4b +DIST github.com-golang-appengine-v1.3.0.tar.gz 323617 BLAKE2B 509ac37ea966a82827284481c6da9a0980150b8b7579f19a9ac66f54fc9ddb8f21a28c594faf7923bf94b73164d2dfbfb9985e19a47b5f304c81a952a7e82534 SHA512 20151fc10208a4c48295bd80d401f04416ba5444e5b5d0ad5663445fb909c04be5b8157b88ab63ffea53b0cc8d94f2207c1f320d438191782a4e222c2101aee7 +DIST github.com-golang-crypto-c2843e01d9a2.tar.gz 1649461 BLAKE2B ae4f728aea64c97518fccb5fb87847d1f3b1ed19d3acaca34f314a15a4016d39c7190994dcd2e005d93d4c77de7b32b65d5ba2ba7b90edd7c5dade67af9ca2cb SHA512 13f98d44191f29936a9bd838b6e8c8ccfbdf03e364a561cb0a27a552168645d30ae69707d152a76a20208da5ac5a79725bb31fa0601c5d50d417b6d74a7b2530 +DIST github.com-golang-net-3b0461eec859.tar.gz 1099680 BLAKE2B 989a8d6c9166696bef1aff398acc8cd1e41e1240c5c113be030c80355cdf96eaa6d5f231c99f2c44d8eacf199579804c59fc45f999862bc4bf057b694841c8dc SHA512 5e42e26ac17f52d6408b63eebd740bedc5a78b8023b675688d7b39b20afa53b34ffde764b693828143483c8f5450180f6a00e9eb28b8f3f6e14303cc4cd7c62b +DIST github.com-golang-oauth2-f42d05182288.tar.gz 43219 BLAKE2B 2bf52405f32181b372997feb2c569a6fbc4fe61fc82f154f79fad1378206fdd20fe28be87278c8c773d6ed301dd0a6b5c0e2e6d726eb18c5284c16a725854a8d SHA512 e7f0ac2aca5607b02fa3a6e69d0d4570d62ba42e87e991b00279038fc04135d6e418f61e70ccdf801e867f2b58e25bb7044d653fb3050ce189828116d485f24a +DIST github.com-golang-protobuf-v1.2.0.tar.gz 332565 BLAKE2B 6916341aaa30f593c9a27363d4d73c548d0f7a629adffeab927078bb3ebc64f59a5c568b7bb7999c7505d526ce0ead0c9163908080f24ecd6c7b94ed2db28335 SHA512 a0f596ee96f7501ee47da75ea234c1e29c0abb2c3fda731acd601a55880502ae90d70f6d3da9c9a35e493fd1bcb69971c062e16b1e49a0996137950dac2effac +DIST github.com-golang-sys-ac6580df4449.tar.gz 1535134 BLAKE2B a4aa8a913e0b031f8986735094e83fa2d3fa1a570474dd4ec472144218e1f3e42e04db4a7e4a3c20b0d022b4ed0e3ebb21a5cb804a10cacbeb9f91b65b855789 SHA512 04694885729ba407504280b2b1e276c5f7fb6e33058bf6a27929223a5d95f800c3f773bbcd2c1721ff8778ab4a22cb80ee2455dbd70b6a96b2a148a6bbe746c3 +DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58 +DIST github.com-google-go-querystring-v1.0.0.tar.gz 7529 BLAKE2B 0d1b806655046080f932c25083d169fa568a6d13673002ff03bab5546ef4ff6545f9c16f563a5a19c4001203390ee1af5388cd18cc642b5d9cdd07b1f7f5bae5 SHA512 b980a4e4bf446654950349e0ff1a5870b7f9d60a5e55656888cebce6d51441f96b39448422ee56e77aee992475238737dcb9133b7176aaadbd6eb0c9c0020ebc +DIST github.com-hashicorp-hcl-ef8a98b0bbce.tar.gz 70427 BLAKE2B 3b699fd5923ce6c823bed429fdbaecd0ea3f1a7518e37d7b4698b2b112e24c049a90994c1651fc66f0def3958865b88374ebb39e03618c09a49a5795661d3498 SHA512 d56f15b28e89c638d2d5c4f7859d3612ae7c7f981a6950ea59bb87987ac4db6a3582b00680ccd4f9e579b3d2c5e53958d89941270366e159772959a4c5b1e96f +DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9 +DIST github.com-lucasb-eyer-go-colorful-v1.0.3.tar.gz 430208 BLAKE2B 3fc0e9ae9092e76203d2bce447997966652ff2912083d062198196a30a7e49d66db67f82a626b6abace658109b9b71398b44a241d9e66eb160f21b24774d1f8b SHA512 876315f886a9cd39adf592b3c68ef8ff21ef7b1f543df5c7c28534e9443cb2d0f72fcd79404ac87643ee2232f150b92ffb6dc1fe2e2130c602679c8d8ca85609 +DIST github.com-lunixbochs-vtclean-2d01aacdc34a.tar.gz 4190 BLAKE2B 628cefd5d82fa55a61103f4e06bcb509ededd77ec2a69bf1c33a89c21d4245b702a0069686626d5c4185aad9e220a468ed57d192b081d04866f70c4a90219f4e SHA512 ea589cefdecaf32fafc7a7fec513d8c576ee9fbbca53c1770c54504a83c386197e711ddaf347e11910edb15794629fae238e91f5c795d00b468ca99cca8f4860 +DIST github.com-magiconair-properties-v1.7.6.tar.gz 28717 BLAKE2B 88208371dc330cfd9f2c8e14d60b6f623008670ebdad8b52de6fc0182a0e3be0dbd6d5ddfd6632b14fe172d595f6a5939ea36d69faf64bfc42e46dc46f11e34f SHA512 ed7ff0f87eafc0c312c70a05c8eaa68a9e257792c92124d619e8fc379f4773a5d20b1ad89f34cd773a32c380b4c75d56f06ce1195f09f98c1ac73f02cd455647 +DIST github.com-mattn-go-runewidth-v0.0.7.tar.gz 16089 BLAKE2B b0cf8111050a3d42ea57e5efc9cbc2a4774d41f158b786b037bde9f6113e4643eb0f7bf3b0baa38b70936c1f8364c0a3ae4cf8d3285e33dadf927b422558c5fe SHA512 b3fd49c73f045b8da0d6c1a909d724b9a3e51214d67ccdc57f4fb0ad9889ebb561c3a6782e1065656684d1a6686574fbafb1a1ce25a2f7c608aa81203ece4dce +DIST github.com-mitchellh-mapstructure-00c29f56e238.tar.gz 18394 BLAKE2B 928baf92d3af36498a4fd74f23086dd4d759f72ebcfa18b49cda23e7fff719ae9fdba9576869ddf5e220f8f6cce61a9c5c772d34a0fba1cb96eb6e05dd9b916a SHA512 2b74b167940018f95f1e4767d44ff66d94b4bc8ccd97f98364e06bd1f6bc46006c0acfcd470567b6de8e357009f42e96b9058315cdbaa3254743480d2cbfd35b +DIST github.com-pelletier-go-toml-v1.1.0.tar.gz 56991 BLAKE2B 68f401ac0e450753a9434989193ac5fae81de9dc187f62d34196d2ba6ae9f853588573345878c93f0d6973ffaff18adf82ee5b5af397898dd2e0dc9a32297e58 SHA512 b7e9713e9c7c0e88631c03688d99ec48d98f0d8a5f490197f242ae3b01847bf108c39bdf564ea8d7d2a99133b9753168c7f103b863deb4144b070a91c21401d1 +DIST github.com-pkg-errors-v0.8.0.tar.gz 11344 BLAKE2B 50fd44e65872bc2c365f649b79784f1f88adf5101c9654f632fc0f96cde67ce0a839dd799b7f195f056f8cb12bbdcfa3167a54b6ffc107575d32f97e6705eb5b SHA512 82055b10c02f13a8ce497388729568ddde7ae61e9fb2592b9acb11c61dfe94d5554432aee168e7c7adbd8345511c3e4ce0ba4c1b23cf253480e199a95316c443 +DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045 +DIST github.com-rivo-tview-82b05c9fb329.tar.gz 2861558 BLAKE2B 77e21f6aca619ce6cc6fbabd37d13d523768fd331cd52ec23600dfb0cf8041960a75f9240c967623025ce38b2387342044f64650fb850dae847ebdc9d9a9e7f9 SHA512 e1dd08e7ca3b04f4714f3d4ca498871bf9bed6ce25bb074bc02cf11a66c6132a76d537db9df19867466331ec73494441e92f6850dfd4082318f2896d62e5653d +DIST github.com-rivo-uniseg-v0.1.0.tar.gz 43971 BLAKE2B 12e8febeeca74f7a2c8e5d1d7b518e547dbfd2a56c2325a069f56322f58e80ebed70cfb2297519f0af85b81906ce54c28cac4fc281aaae86cd46beb248b9bbad SHA512 8a00cc6d66794b6c1a10308e1fe9d6590da54a761f3e528b3442e06877070f2f0af837499c4d557f93568c2377850aab28b26eb574a9e3f6130f520e2ac4bd8e +DIST github.com-rsteube-cobra-v0.0.1-zsh-completion-custom.tar.gz 107058 BLAKE2B a2d3837991aa27390a0f6b236ebd94f0e2e0c773fe4143f3d50a020423ec645589a55aa2133cf29978a4b5c40adfada83a8fe45cb4631f7a14297015dfe5436b SHA512 81ba5db3b69d03d650237598397dad59ce8fd355ff79c4e173bce4f49d65bab485869bf8add13602c6ffb2ece1ac553086bb7ab43c82141c9404ffa39a451055 +DIST github.com-russross-blackfriday-v1.5.1.tar.gz 75044 BLAKE2B 093aa822fd1b7a4a6e9eb11e6a987913b5659e6b491fb7c6a76868b15b1ec6afd1cc5b28c7598e1402d16dd4853f0a99c4b79eb0712658085c5357026522ed33 SHA512 97589691599322db93619d0dfe3c02357f2eef1b00c94f38f99fe72429cc7a2e2f39fd37cf2d6a25474b21a649932e840fbae782fe2d3f9b7856782bad3d8f19 +DIST github.com-spf13-afero-v1.1.0.tar.gz 45189 BLAKE2B 11708d0fd8ffbae6f1609146947303c0de4538efff984f75a8dcbe5fb4be2f82e858dde99394179ec6b88fbf474c85de300f15b4e078cc675e0b501c8fec16d5 SHA512 c846a1ee5f129c4b28761184a52e15a3bba962860d86ad035f1b50c5a698226e47ee32c91af0eedddd3df9a0617f82c75cccbd65a181330c38d5eea693e589e3 +DIST github.com-spf13-cast-v1.2.0.tar.gz 9856 BLAKE2B 0d765d33ae72e7f9849decd8ef1b5ee38a891bdcb3aa0e3f8e52fc025bb73dd461b53967beca334c71c743d8ea33e17c842bcb48108108db6ecd6e05127c3a5e SHA512 9ccc59e67196a7b67b0fedc3165fbf0f991ec911d55b3f8a489cac4fcc26551af82ba4582a9f9913127b52ceffd496dc8b627d6e21385ab31bd99281c8da1689 +DIST github.com-spf13-jwalterweatherman-7c0cea34c8ec.tar.gz 6342 BLAKE2B a89b58b3d5878f917228f7975d34cc8a0b080802a73916f6843361db5e82b3387fbeddb4fddd2c881a0add6b010d211cb668e29b0536c575e185d88d7d22515f SHA512 7b7c88ba725384f6e125f98c6e99295dc6d9a71863c827df501d0856d35621b68dbd449d7a2a6e2983260e1bdfefdbf88ef79bfd42ad19a6866adb6b58fc00c0 +DIST github.com-spf13-pflag-v1.0.1.tar.gz 43244 BLAKE2B 7391fc9b28285d28fec041634ece2cad5ee54a2b46979772fb3d1b42888fbdea1624444c3618938083539b0af05eb5985b74881f37ff81baca99881ba3ca0226 SHA512 e09066442bd7c98b3a3c2de815d89ce27d97ccec242e1e47ff38e4f8ece442657573bddab5bd560f644f62304ca6bdca3b4e002ebc330b78e69a96eccd8e778b +DIST github.com-spf13-viper-15738813a09d.tar.gz 32109 BLAKE2B 3d1f8c8d943766a7b7402f30ce80fe78a96b8455f901b6c3dab786682c84ba3a7515e62b1f62f5124564f6ea664abea1e2f77685e259f5e31db3241aeb89c826 SHA512 18fd5063350bec742ec85d7299c678d825be9f6745990264fe98c6b874ab3abe9bc478fb97059b2e675b78dc5bc3f12fc9ae65ce9e7c170f8abf9498b6e78071 +DIST github.com-stretchr-testify-v1.2.2.tar.gz 101698 BLAKE2B 8280ff92a5005f9862ebfb80c6904b61105315189b6f56f087ba891dba47eaa5789a055e63c602b355c6c0c6ad68eefe3c26de9f1fac7a6dc44f9715bbbd86f8 SHA512 d925fe6c118f212868967cf1985aa70ca460bf4e3486d58be689e05ff6368485b42cc9a4ae1d5ce40eed38be45678b11d399a26000ce35d6e5ad218fc7d022ed +DIST github.com-tcnksm-go-gitconfig-v0.1.2.tar.gz 4468 BLAKE2B 98400dac784df5a1b02e281f1c263c3f9b53ad00cebeab40dfa055e83cd64aa5d1b86f63532f49945af9c5861dbfb7efe6ef184dc425a432bbeeac658df13718 SHA512 5c6affce4b93cacb008926f81205c86708313ef5ddd7d9f546b0df699a8a8523a8dca68839ae8aeaf09f81f7586273a9bd372d840d414ed581d8f2cebcbb5db1 +DIST github.com-xanzy-go-gitlab-7bc4155e8bf8.tar.gz 108466 BLAKE2B d9b2e1e85899264cc68d59fa30ebd1b3b270bcdfa8ded8a471531c8fb221cd199488afbda85ff138a6b359cbf0ada725ed83ec3c1cfab2bf1697c116f0c06b0c SHA512 ef5b3f489dc11ab3c759090033e395eeb1a4866739eceafd6d95aacb23534a57d2ef59ddeed12833a087f40745f4e9c3bd50752c7433f60ebf9f175ae1a4d748 +DIST lab-0.17.2.tar.gz 95006 BLAKE2B c7315603db5a12c070e8a769504e268224e9300a9dad6eabdc300a182dd8272f0cbccc6826fd04ca5a6843af48bde8349b02b763f6b3f6a5a297f5316cbd0a0c SHA512 a35dc286b3eca61f2bed8bdea485181a428d50e6584f209a74d92267956e104cb8d37844cb43d5c2422845630db2fea6d37cb99884a705bdfeba88b29ecb195e +EBUILD lab-0.17.2.ebuild 2489 BLAKE2B 44fdbf0423ec19df67aae0b718faa21872d1d2e3cfd468b91d89404d41981241d2a3075d2598fcf0b2a339d51bcb3c3bfc1bc02bc489755c9aa9785988d32dfd SHA512 5a1e86600a9c665af0dc7a669fb52282fccb2c9ad79b51a0ff87fb70c803236c19da795a11fa7ed879ea54d8c146806c1df14c88aea9e3d02c7cb063120fd3ff +MISC metadata.xml 549 BLAKE2B b580de410fd79e7db134ec614ab770597578de9501af4b3782e3e2a1e30766259c73b07f3bf96cf49734c7fc2e8fe5dc1bf19cefbfc3574fb238a7994087cdad SHA512 6b309d852b224ff67e47f9ddb65e8a3eeeddd18a8b03b72c8fea0b7e9e947bfafb20787b20643536a312b98d7cf306d8a6068286891266797c7bd7a43bc89355 diff --git a/dev-vcs/lab/lab-0.17.2.ebuild b/dev-vcs/lab/lab-0.17.2.ebuild new file mode 100644 index 000000000000..9188a449769e --- /dev/null +++ b/dev-vcs/lab/lab-0.17.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 go-module + +DESCRIPTION="Lab wraps Git or Hub, making it simple to interact with repositories on GitLab" +HOMEPAGE="https://zaquestion.github.io/lab" + +EGO_VENDOR=( +"github.com/avast/retry-go 5469272a8171" +"github.com/cpuguy83/go-md2man v1.0.8" +"github.com/davecgh/go-spew v1.1.1" +"github.com/fsnotify/fsnotify v1.4.7" +"github.com/gdamore/encoding v1.0.0" +"github.com/gdamore/tcell v1.3.0" +"github.com/golang/protobuf v1.2.0" +"github.com/google/go-querystring v1.0.0" +"github.com/hashicorp/hcl ef8a98b0bbce" +"github.com/inconshreveable/mousetrap v1.0.0" +"github.com/lucasb-eyer/go-colorful v1.0.3" +"github.com/lunixbochs/vtclean 2d01aacdc34a" +"github.com/magiconair/properties v1.7.6" +"github.com/mattn/go-runewidth v0.0.7" +"github.com/mitchellh/mapstructure 00c29f56e238" +"github.com/pelletier/go-toml v1.1.0" +"github.com/pkg/errors v0.8.0" +"github.com/pmezard/go-difflib v1.0.0" +"github.com/rivo/tview 82b05c9fb329" +"github.com/rivo/uniseg v0.1.0" +"github.com/russross/blackfriday v1.5.1" +"github.com/spf13/afero v1.1.0" +"github.com/spf13/cast v1.2.0" +"github.com/spf13/cobra v0.0.1-zsh-completion-custom github.com/rsteube/cobra" #fork +"github.com/spf13/jwalterweatherman 7c0cea34c8ec" +"github.com/spf13/pflag v1.0.1" +"github.com/spf13/viper 15738813a09d" +"github.com/stretchr/testify v1.2.2" +"github.com/tcnksm/go-gitconfig v0.1.2" +"github.com/xanzy/go-gitlab 7bc4155e8bf8" +"golang.org/x/crypto c2843e01d9a2 github.com/golang/crypto" +"golang.org/x/net 3b0461eec859 github.com/golang/net" +"golang.org/x/oauth2 f42d05182288 github.com/golang/oauth2" +"golang.org/x/sys ac6580df4449 github.com/golang/sys" +"golang.org/x/text v0.3.2 github.com/golang/text" +"google.golang.org/appengine v1.3.0 github.com/golang/appengine" +"gopkg.in/yaml.v2 v2.2.1 github.com/go-yaml/yaml" +) + +SRC_URI="https://github.com/zaquestion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + $(go-module_vendor_uris)" + +LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="" + +RDEPEND="dev-vcs/git" + +RESTRICT="test" #tries to write to /src and fetch from gitlab + +src_compile() { + emake VERSION="${PV}" + mkdir -v "${T}/comp" || die + ./lab completion bash > "${T}/comp/lab" || die + ./lab completion zsh > "${T}/comp/_lab" || die +} + +src_install() { + dobin lab + einstalldocs + dobashcomp "${T}/comp/lab" + insinto /usr/share/zsh/site-functions + doins "${T}/comp/_lab" +} diff --git a/dev-vcs/lab/metadata.xml b/dev-vcs/lab/metadata.xml new file mode 100644 index 000000000000..9a4e5cd3521b --- /dev/null +++ b/dev-vcs/lab/metadata.xml @@ -0,0 +1,15 @@ + + + + + gyakovlev@gentoo.org + Georgy Yakovlev + + + Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab, + including seamless workflows for creating merge requests, issues and snippets. + + + zaquestion/lab + + diff --git a/dev-vcs/qgit/Manifest b/dev-vcs/qgit/Manifest index f8f9892f2e3a..3d5e278ececa 100644 --- a/dev-vcs/qgit/Manifest +++ b/dev-vcs/qgit/Manifest @@ -1,3 +1,5 @@ DIST qgit-2.8.tar.gz 260236 BLAKE2B eb6dfc83891a8598c31c4711dfcfca1952abfdd8d2e54ce295260674b63bb90ec84fc582f8b045342640e3aed1aab0f000ec89e47a9147e98d1274540a744b2e SHA512 9845064a3f0b2e48b7bb1cbe8f252eaa4e4174cfd2e270ba6c746f0200847ee4d3cdded7f9550849743781669bd7f6f1afe1e83a918b2863a915876b27a3e42a +DIST qgit-2.9.tar.gz 263875 BLAKE2B 8ec1235c760f2473a0700e7033ab99f3e72f019dee47761b86999a7de173132cf6592e9f5652b68285cd126adc4efffb5688944f34be2686683727354ab041c5 SHA512 2c91e02d0a7ea1e4620882520c77b47ff9b28fb9c9f9d178bf98b3e728e600e8d86a9e6e4cd60c33dbe63ced3636934fb7cdd6b0d5fa58182873675e3f97cc33 EBUILD qgit-2.8.ebuild 497 BLAKE2B 172e0b528fb09725d91d583d7e448c1190a70c3520616bcdf16c42ed47d527ac6ba910a1457d4fc363245b944ee846abccdd7fe82c0a8f8c56b6a55fab3277c3 SHA512 4690a884bdd5b5abf605c1c76e242437b6477c9323ccfeda5c0c295959832b19dd251f0085027e28b3753b259bd48d8413de50c93b3d115b1ba5b098aa4a5154 +EBUILD qgit-2.9.ebuild 514 BLAKE2B 0d907ba970625a8a5957143be2c3e7f94d6b46d358794666bb5c6101040d0212fc222b611efbfe1aa6b9245de95b9a67e8f3fe301a0cb03698aa6b53513b640d SHA512 b79069191b980d600cf5d467fa6bb5e295d2728a26165bf7767e0eacfd924e7e99e45bac7caaac6914638925e754f794c8a729ce72e7bbb6e2b5fca27752a986 MISC metadata.xml 324 BLAKE2B 1046f76dc321a6155b49edb4972d9d353d47e4103a0356cc83f459faac05985e201daef4197420cadb19f50c37eb528b990c8d9d93537822fbf0698501b3fb5c SHA512 e4e0bbc60b8af9512584b93e60d29ac47a4150691ea46bb3281c6d99acf119d0c6717497286c324a9ccc91624bbd56211a513c1fd675ec89603d431b9b052248 diff --git a/dev-vcs/qgit/qgit-2.9.ebuild b/dev-vcs/qgit/qgit-2.9.ebuild new file mode 100644 index 000000000000..e0301f093c7f --- /dev/null +++ b/dev-vcs/qgit/qgit-2.9.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Qt GUI for git repositories" +HOMEPAGE="https://github.com/tibirna/qgit" +SRC_URI="https://github.com/tibirna/qgit/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 +" +RDEPEND="${DEPEND} + dev-vcs/git + !dev-vcs/qgit:2 +" + +S="${WORKDIR}/${PN}-${P}" + +DOCS=( README.adoc ) diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest index c6e7925f1377..ee0a4cff7f73 100644 --- a/dev-vcs/repo/Manifest +++ b/dev-vcs/repo/Manifest @@ -1,5 +1,7 @@ DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4 -DIST repo-2.3 31280 BLAKE2B b637a226c19bd04350f25c27924b8c4951be1ae09c3ee3f12643d5e2d983e51ee181b22c553ad7fbf6cc0457e0621fe083e21d8e577cd2b87c74d3cfd107ee69 SHA512 3c83799fbc1846730c085a43c603938b8daa8bb7792e130a55cd508cf416b67fa025e77f20770c6b65f9ee3fa1aa7240d47bfb8e9a3835ac5ea11e1fce9112e2 +DIST repo-1.27 29945 BLAKE2B 930fa876b8889d64c8d12444f4cd59bebbdf9848d455e114fc9306922d931aa721320db65a07c38f705c39950538a1d5ae5ca66e359d2f2e38061d144ac11cb2 SHA512 a9f651e5fd1da1c74b31aebf32d03cf868183fa529eaf2b079015f9e778a2bb7c1ef49e06564703534c45fa1bd7bc5bd3d91a91477c336e549c1208afa74ace6 +DIST repo-2.4 35152 BLAKE2B a069c095524574ee4a7d18cc5cd023f6d71b9ed9b57941180a6ec3ab3c33b2ed18b5dfc7d225a7bc849b7ebfd28bc0e672f7796eb2bb37af0685539c850cfe34 SHA512 46d7b8f699246ad625d5eb714791c29b949c40793343ba56681554040dc1d6a0a5f049e8d96f1e12ca93d77291e95ffd756f76554ebc1062f9cf6fc014aa116a EBUILD repo-1.26.ebuild 837 BLAKE2B ee0ba38586eab9a0b1975feae84bb7db0ac6998c096f1cdd7fb401ec0154afac92f5641a9cb39007f1cb0bfdf72c1a77a94b6e29a9ddd8e83e950ad669ea8de9 SHA512 d1123ba89621e87e6d65eec5120809890744a9073278d407d0f320cb1123c9897acac924de4dd2c2b0c7fc2a3263cceb276716c71af2db69f460e354115438ea -EBUILD repo-2.3.ebuild 868 BLAKE2B 979642b6415c18093ad405a459dcc4431c3758e9d16e1c5e0fe12e88106680f57957975a5ffd8eae5f681d5f0e4c85ffd478c0f3df68cdd0d90f712102e2d01a SHA512 11fe9e4b77479d136d0b0f85751da243fa0bbc419a9ea3caacfb4e8eb55d8503b6019b822504c034debf715c64f9701297500d8415eb42f54ef9d1c886cebbd9 +EBUILD repo-1.27.ebuild 833 BLAKE2B a4b8829e53ccd70e211a21e481776f8ad4aa961943e00a9abeb03486f78400c23b3083a4a63fbe806814bde0af0bcc32e38b5cb75c825ff1ba8d4d942ff69d69 SHA512 0d7645ae1054a82e17cdd552a6fec0b41d09dd4dc55ce364e52384052227c7c8c879dbbd057265eb4a3b6c2f865daf32046524ac303f2d8e4417a1b7cda71023 +EBUILD repo-2.4.ebuild 863 BLAKE2B eb31d955abf262426bc7cbbd4a22d54bac251b0589ef4733b2b004f7eaa2977bb593915cb8fd38572308688187fb75c24e2d559fb29e7d40426571fbe0dffbea SHA512 6683b51aeb6123eadadbeb5649e23c1de8c23e242ce35cf84153854b622e17ecf1b6081adea78f45e360c2a82acf9837cc9f4b5190c32f0c1e12436658951b0b MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4 diff --git a/dev-vcs/repo/repo-1.27.ebuild b/dev-vcs/repo/repo-1.27.ebuild new file mode 100644 index 000000000000..280f73384ee7 --- /dev/null +++ b/dev-vcs/repo/repo-1.27.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NB: The $PV tracks the *repo launcher version*, not the last signed release +# of the repo project. They are confusingly different currently. + +EAPI="7" + +PYTHON_COMPAT=( python2_7 ) + +inherit python-r1 + +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}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + !app-admin/radmind + !dev-util/repo" + +S=${WORKDIR} + +src_install() { + python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} +} diff --git a/dev-vcs/repo/repo-2.3.ebuild b/dev-vcs/repo/repo-2.3.ebuild deleted file mode 100644 index 1632716eecc8..000000000000 --- a/dev-vcs/repo/repo-2.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# NB: The $PV tracks the *repo launcher version*, not the last signed release -# of the repo project. The launcher only gets a new update when changes are -# made in it. - -EAPI="7" - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) - -inherit python-r1 - -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}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - !app-admin/radmind - !dev-util/repo" - -S=${WORKDIR} - -src_install() { - python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} -} diff --git a/dev-vcs/repo/repo-2.4.ebuild b/dev-vcs/repo/repo-2.4.ebuild new file mode 100644 index 000000000000..681273f3560e --- /dev/null +++ b/dev-vcs/repo/repo-2.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NB: The $PV tracks the *repo launcher version*, not the last signed release +# of the repo project. The launcher only gets a new update when changes are +# made in it. + +EAPI="7" + +PYTHON_COMPAT=( python3_{6..8} ) + +inherit python-r1 + +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}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + !app-admin/radmind + !dev-util/repo" + +S=${WORKDIR} + +src_install() { + python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} +} -- cgit v1.2.3