diff options
Diffstat (limited to 'dev-vcs/git')
-rw-r--r-- | dev-vcs/git/Manifest | 12 | ||||
-rw-r--r-- | dev-vcs/git/git-2.33.1.ebuild | 668 | ||||
-rw-r--r-- | dev-vcs/git/git-9999-r1.ebuild | 10 | ||||
-rw-r--r-- | dev-vcs/git/git-9999-r2.ebuild | 10 | ||||
-rw-r--r-- | dev-vcs/git/git-9999-r3.ebuild | 6 | ||||
-rw-r--r-- | dev-vcs/git/git-9999.ebuild | 10 |
6 files changed, 694 insertions, 22 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index ae41e0c172af..5820fa913f2d 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -21,6 +21,7 @@ DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83 DIST git-2.31.1.tar.xz 6413368 BLAKE2B 2d40aa3e5336e57b3cab42c36dd07698be7a811e2890f4c9ecaaa375f985313bb8e14fe7a70c1beff3009a9102b935e4a6065019ab3b2520f09339e2a0fcdb93 SHA512 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c DIST git-2.33.0.tar.xz 6548308 BLAKE2B 52310a54a059ca1926ed14326bad5430f0bc8b19601c640fcaf6be58e2f9e9b2c0b7b34c4a3b80e84bb52cbd7c8c6a1b8b53c977af11f6714d32c34121221a63 SHA512 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd +DIST git-2.33.1.tar.xz 6558636 BLAKE2B f4959d5309f85e063448673a3f06f1d3cdd65ced5f5173cfe5a38df3b5547cae1c08275bda02e48307e8290628735e2ea1ff49222262e7cd29b252a6aa4d4a15 SHA512 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2 @@ -28,6 +29,7 @@ DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d DIST git-htmldocs-2.31.1.tar.xz 1357592 BLAKE2B 54b48cfe2bb8e5dad9fdff862aa91e5805b0cd331b459d51a71ed913ca68d1aea6c6c69cfadbe8b6101b4d7be63c3811027a2ed42f9d2b0d3509664726b8ad78 SHA512 d243f4e3047c0e29bdd9127ff529c7fab5ebf40a4afaa04c3a9261ae398aa61c16a4413b7bf580c7f874d632b866908d92322ea0502141d811b78b7636c8d28b DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f DIST git-htmldocs-2.33.0.tar.xz 1393260 BLAKE2B 4a43ce9d184a9c69d27a4c80e93ed5e138bb9d043272fbbda5399af00e089e138bd6d68d3f77b1907ae5edfe4d8a83a33ce0b8c38e20e0b363f5ac6367d16f7f SHA512 8cb2210be8022f9152045f72d0be30eb45134ec78edb47f99c83fa47d9fe7247fa918692d30bdefb24b246c143f3f987930c14a0a06b45448bb230c12036e0bc +DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9 DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941 @@ -35,6 +37,7 @@ DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497b DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee8e609cbbae26bf1804c39b8bf5415e1069cb50162b75f9f8ec69bd6511f271d3116ac33016af2e57e65b88ad6c4b165 SHA512 a5fb8a1c3f08707d4d2d835a55b295677559856984ffeeb650827b433625a74f22ef4aac10e1b14eba5860e11567543b146d52dd055b2613e5a510e0f4f3c3fd DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e DIST git-manpages-2.33.0.tar.xz 492900 BLAKE2B 3f5e5cc8e9b493b272f2c9bd8b43a3bfd2f571bbcea8552471386cf8275d184d1559f61565bf33230cbba4ad9d36165173f016f53bf7240ca5e69bc5f5dd5cc3 SHA512 82b1e76cb457bd740dcc9614e0523064c1f6ef44654caa159efda555d201c8febf094f19cda0cdb3a828fefff30419a323976e64279eb361c1a6370e96245ed5 +DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62 EBUILD git-2.26.3.ebuild 19110 BLAKE2B ab185603ed965942ab60b3625386f13fa9d155b1c010e97704d77317ea568792667d8ad15c067fd5e4907e13b56aed636289fc2dbb68c486d3c139acd311630e SHA512 e13bf874a1518e669bfcfea73e87852bc2a9c568948d83b498d271948934b1a98e402bb18d8abe4ac8dd1f001312d89c9edf783f5ea8a35f2c07f337e4e8e20b EBUILD git-2.28.1.ebuild 19118 BLAKE2B c71bfb6eda842ceaf6e752e911e09c602997987d5374bda2408bcfb2cad24b3eaa69ab0c1fd5522ae224b87279727fcf2840c096a91f57696a2d2b32ff73c2ef SHA512 bdca277daae10c52f72e721a0680d5f4508b696566ecfc128ecc10049aefd857fbfe03148452a8b05e932d76ce7fa9e9dd339fa83c3ed3f8890df4a588604388 EBUILD git-2.29.3.ebuild 18175 BLAKE2B badfec96e42d4cfbf8327298313c381ae526efbaff3b145abe8c8aa4afdab824175b6db015f28f8f9bd8d3bf4cad99c46a3594901ebaf3859df367dc73804c62 SHA512 825c386bfbae0b51358924c7ee1d232a59e45155e792c485b543e9ecde77fea6870de66f2144d0787c5a084166756e01666db27cbc1055de10a093c781a8f1a5 @@ -42,8 +45,9 @@ EBUILD git-2.30.2.ebuild 18176 BLAKE2B 693b6d1f83be107234f2922a55993b66b41fb987c EBUILD git-2.31.1.ebuild 18058 BLAKE2B 9c9c7530527ace419f1191e6aa671dfb0d4dcf25760ad30658ebd83889ac0df396021030d0e0499b497340c47a1a3e8b7b12575f2817fb9231c11dd5652d7bc6 SHA512 e5ae923aed189506a97512be5e87492098cdd876645f837f28035875c46745a2b2a03e7374e8d05276b7d0a76a9d47df117329dbae175386cb5ce5d0d96e4c51 EBUILD git-2.32.0-r1.ebuild 18175 BLAKE2B d1ad748f2352b377dadad657fc7259df0e14829949e76975cd85264ceaf8cacca56298401346719d4848204489909e47d26f03034add34aefeccea3ffe46f87e SHA512 afe87968de6d6956a265ae693a2ebe6ff91d2cdf5fa0486b7735a8feb39b8eb4126e9d87fd1a0cee1fb9784ad43875913eff9494d3075d5c9070dd5ffd30e494 EBUILD git-2.33.0-r1.ebuild 18188 BLAKE2B d919e980b85e905b7c593a3946f992e7125a294e42481af2601fc8b64a0d3ba9b4f0d17b1a7a0dc6addcb6bd851251ad71fae35c3ec5800930ef328e6c87e87d SHA512 8bd82321e7aeeb46eccd55ba0c8ca229b8b41434d2d5500f8bc3a5a453225f6485ce15897b95aa9626a04f655d7f344ea2bc45284bb36ebd66fae7d9080f2e65 -EBUILD git-9999-r1.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43 -EBUILD git-9999-r2.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43 -EBUILD git-9999-r3.ebuild 18071 BLAKE2B 4f7571d39e8cd836fd71117a34df82a092417f9543f6d165121359230e1f2b6fce8b925345d205512d372e56459c7ad4983a79da2785139b99dacba6bbac0a3f SHA512 901412cd7d3d71e67f66e0a37d2e5f9032cede4c944a04455de962fb6f681cad941839d0e60a77dc6959fbd616aac7afa556a2aab24aaaf9cd7f95802c5dcbd3 -EBUILD git-9999.ebuild 18041 BLAKE2B 4a70bb78ff763c56aa807d7eb48d7a32e0e582535d9c85702aea795d4b4510edd00b98302a1e0a291551dfc3c4fe7c76b3cedb9997923e7ca39ae8a26653af11 SHA512 d725ee00065414aad03132045b933de85840288a4ac415614dbdafc1a141ef4b45dded1bfa7d1f751bebaecf4bb91b40942c5d21888c6d6c162b42b6b7433fdd +EBUILD git-2.33.1.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8 +EBUILD git-9999-r1.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8 +EBUILD git-9999-r2.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8 +EBUILD git-9999-r3.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8 +EBUILD git-9999.ebuild 18077 BLAKE2B d694efa1cf729cf370184fdb3bf9725bcb1fb2e0ed2679ab06c26a3e819ffacd055d49550dcf8ef34b4654bd67c3158525666a3426fb5e9df83041c745fa097a SHA512 79c60936b9d4ed040cbdf0c8a830a27967160579b5cab8515622170b10af6d1784647784c4c5b0d2a960e105a60ca40e532e6d9b06b50f43f6b8d1061af9d6e8 MISC metadata.xml 2278 BLAKE2B d92ca2ae6012ff68dbe6478421e057d977b5a5c35ee8910fb022f7acb742cc30134d1842fe99fd18ba451eca160a8cf1aa594469568b792ec5bcadf01c314f58 SHA512 297031af669235f9a5e9845c1e3874accd26583efce65312bdb9f98c340d5c547da2eedd95fb16e6fa9614e3a56e70a84b5563a01398ee071141637c6ab3fa46 diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild new file mode 100644 index 000000000000..6af4b971bc56 --- /dev/null +++ b/dev-vcs/git/git-2.33.1.ebuild @@ -0,0 +1,668 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python3_{8..10} ) + +inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale 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="https://git.kernel.org/pub/scm/git/git.git" + # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. + # See https://git-scm.com/docs/gitworkflows#_graduation + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: seen + case "${PVR}" in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=seen ;; + esac +fi + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER="${MY_PV}" + +DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" +HOMEPAGE="https://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" + [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" + +# Common to both DEPEND and RDEPEND +DEPEND=" + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) + dev-libs/openssl:0= + sys-libs/zlib + pcre? ( dev-libs/libpcre2:= ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:0= ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + iconv? ( virtual/libiconv ) +" + +RDEPEND="${DEPEND} + gpg? ( app-crypt/gnupg ) + perl? ( + dev-perl/Error + dev-perl/MailTools + dev-perl/Authen-SASL + >=virtual/perl-libnet-3.110.0-r4[ssl] + cgi? ( + dev-perl/CGI + highlight? ( app-text/highlight ) + ) + cvs? ( + >=dev-vcs/cvsps-2.1:0 + dev-perl/DBI + dev-perl/DBD-SQLite + ) + mediawiki? ( + dev-perl/DateTime-Format-ISO8601 + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) + ) + perforce? ( ${PYTHON_DEPS} ) +" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/docbook2X + app-text/xmlto + sys-apps/texinfo + ) + emacs? ( >=app-editors/emacs-23.1:* ) + gnome-keyring? ( virtual/pkgconfig ) + 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 ) + perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + # bug #350330 - automagic CVS when we don't want it is bad. + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch +) + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + + if use perforce ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local extlibs myopts + + myopts=( + ASCIIDOC_NO_ROFF=YesPlease + $(usex cvs '' NO_CVS=YesPlease) + $(usex elibc_musl NO_REGEX=YesPlease '') + $(usex iconv '' NO_ICONV=YesPlease) + $(usex nls '' NO_GETTEXT=YesPlease) + $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) + $(usex subversion '' NO_SVN_TESTS=YesPlease) + $(usex threads '' NO_PTHREADS=YesPlease) + $(usex tk '' NO_TCLTK=YesPlease) + ) + + if use blksha1 ; then + myopts+=( BLK_SHA1=YesPlease ) + elif use ppcsha1 ; then + myopts+=( PPC_SHA1=YesPlease ) + fi + + if use curl ; then + use webdav || myopts+=( NO_EXPAT=YesPlease ) + else + myopts+=( NO_CURL=YesPlease ) + fi + + # broken assumptions, because of static build system ... + myopts+=( + NO_FINK=YesPlease + NO_DARWIN_PORTS=YesPlease + INSTALL=install + TAR=tar + SHELL_PATH="${EPREFIX}/bin/sh" + SANE_TOOL_PATH= + OLD_ICONV= + NO_EXTERNAL_GREP= + ) + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die + + if use pcre; then + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) + fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=( + NEEDS_LIBICONV=YesPlease + HAVE_CLOCK_MONOTONIC=1 + ) + if grep -Fq 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 + + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + fi + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die +} + +git_emake() { + # bug #320647: PYTHON_PATH + local PYTHON_PATH="" + use perforce && PYTHON_PATH="${PYTHON}" + emake ${MY_MAKEOPTS} \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ + sysconfdir="${EPREFIX}"/etc \ + DESTDIR="${D}" \ + GIT_TEST_OPTS="--no-color" \ + OPTAR="$(tc-getAR)" \ + OPTCC="$(tc-getCC)" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + PERL_PATH="${EPREFIX}/usr/bin/perl" \ + PERL_MM_OPT="" \ + PYTHON_PATH="${PYTHON_PATH}" \ + V=1 \ + "$@" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el + fi + + if use perl && use cgi ; then + git_emake gitweb || die "emake gitweb (cgi) failed" + fi + + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + pushd contrib/credential/osxkeychain &>/dev/null || die + git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ + || die "emake credential-osxkeychain" + popd &>/dev/null || die + fi + + pushd Documentation &>/dev/null || die + if [[ ${PV} == *9999 ]] ; then + git_emake man || die "emake man failed" + if use doc ; then + git_emake info html || die "emake info html failed" + fi + else + if use doc ; then + git_emake info || die "emake info html failed" + fi + fi + popd &>/dev/null || die + + if use gnome-keyring ; then + pushd contrib/credential/libsecret &>/dev/null || die + git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" + popd &>/dev/null || die + fi + + pushd contrib/subtree &>/dev/null || die + git_emake git-subtree || die + # 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 || die + popd &>/dev/null || die + + if use mediawiki ; then + pushd contrib/mw-to-git &>/dev/null || die + git_emake || die + popd &>/dev/null || die + + fi +} + +src_install() { + git_emake install || die "make install failed" + + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + local d + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + if use doc ; then + docinto ${d}/html + dodoc Documentation${d}*.html + fi + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + pushd contrib/subtree &>/dev/null || die + git_emake install || die "Failed to emake install for git-subtree" + if use doc ; then + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + popd &>/dev/null || die + + if use mediawiki ; then + pushd contrib/mw-to-git &>/dev/null || die + git_emake install + popd &>/dev/null || die + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + pushd contrib/credential/libsecret &>/dev/null || die + dobin git-credential-libsecret + popd &>/dev/null || die + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # diff-highlight - done above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + local contrib_objects=( + buildsystems + fast-import + hg-to-git + hooks + remotes2config.sh + rerere-train.sh + stats + workdir + ) + local i + for i in "${contrib_objects[@]}" ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym ../gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + for d in "${ED}"/usr/lib{,64}/perl5/ ; do + if [[ -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 + } + plocale_for_each_disabled_locale 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 + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi + 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-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 252c3e3bc1bb..6af4b971bc56 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 GENTOO_DEPEND_ON_PERL=no @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -141,7 +141,7 @@ RESTRICT="!test? ( test )" PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch @@ -319,7 +319,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* ]]; then + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -366,7 +366,7 @@ src_compile() { src_install() { git_emake install || die "make install failed" - if [[ ${CHOST} == *-darwin* ]]; then + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 252c3e3bc1bb..6af4b971bc56 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 GENTOO_DEPEND_ON_PERL=no @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -141,7 +141,7 @@ RESTRICT="!test? ( test )" PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch @@ -319,7 +319,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* ]]; then + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -366,7 +366,7 @@ src_compile() { src_install() { git_emake install || die "make install failed" - if [[ ${CHOST} == *-darwin* ]]; then + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 40a7dede3c1d..6af4b971bc56 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 GENTOO_DEPEND_ON_PERL=no @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -141,7 +141,7 @@ RESTRICT="!test? ( test )" PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch + "${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 4a1d6a07b908..6af4b971bc56 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 GENTOO_DEPEND_ON_PERL=no @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -141,7 +141,7 @@ 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.33.0_rc0-optional-cvs.patch # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch @@ -319,7 +319,7 @@ src_compile() { git_emake gitweb || die "emake gitweb (cgi) failed" fi - if [[ ${CHOST} == *-darwin* ]]; then + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then pushd contrib/credential/osxkeychain &>/dev/null || die git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ || die "emake credential-osxkeychain" @@ -366,7 +366,7 @@ src_compile() { src_install() { git_emake install || die "make install failed" - if [[ ${CHOST} == *-darwin* ]]; then + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi |