[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Lars Wendler]

commit:     4997b2b8eb3f9f5afe2ba51229b88cec817f1410
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 00:39:15 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 00:39:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4997b2b8

dev-vcs/git: Removed old

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/git/Manifest          |  12 -
 dev-vcs/git/git-2.28.0.ebuild | 711 ------------------------------------------
 dev-vcs/git/git-2.29.2.ebuild | 676 ---------------------------------------
 dev-vcs/git/git-2.30.0.ebuild | 676 ---------------------------------------
 dev-vcs/git/git-2.30.1.ebuild | 676 ---------------------------------------
 5 files changed, 2751 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 61e5e8babb6..d9dc1dd7954 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,30 +1,18 @@
 DIST git-2.26.2.tar.xz 6007864 BLAKE2B 
efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570
 SHA512 
5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
 DIST git-2.26.3.tar.xz 6009184 BLAKE2B 
12c0b8fb460024e7767919cac3e36ecb215e25566eb907e11495c086e1d43d790c2aa8edd178d53abc3f7eaee968a6c89e92a6575d4d11f9740567b357056aee
 SHA512 
a88f8ab156f12770590110b30da83631f19a349f3b7af25fd0a5e8f03c78daec0a4935e9a1a5637f100c147cc57fca4aa3386e18756a6382983e7baa7456e398
-DIST git-2.28.0.tar.xz 6117608 BLAKE2B 
81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a
 SHA512 
a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
 DIST git-2.28.1.tar.xz 6119248 BLAKE2B 
69999a39d1c5c1dc69b8c7721a594104b51d2af691e1f2ef6a2f2bee99bd5b319c856cfccc4166cfd3426cf8eb58b3b4aea5ed2ae15061fba0f0f3e44c7d24e4
 SHA512 
6acd7f42eeaf4fcb085fe2ab3d65f53a264fd38ef84321b77eb7c21bbb146e42ec9f27cc36cd9f3569f6d1758742119efd0af9bf6414fe7c577c434ed154fb8f
-DIST git-2.29.2.tar.xz 6187988 BLAKE2B 
15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa
 SHA512 
34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
 DIST git-2.29.3.tar.xz 6189996 BLAKE2B 
9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617
 SHA512 
3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd
-DIST git-2.30.0.tar.xz 6325652 BLAKE2B 
c5a67ccb7790f1747d714b402f22de6bd5cf783de8765fade7af0ad51ac780c80d43ab22b33431b57db246a11ef073dfd291961476a3c9414339f133221cbea6
 SHA512 
2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d
-DIST git-2.30.1.tar.xz 6327976 BLAKE2B 
3b459d10a2b8d601e0882da8346bba1c0fb9aa01823e9cf9f6d50557d7cd6b6b89eea17209a5b3bfb199c37ae8bf33b730784686a166d7ed9ef36dd0975d5624
 SHA512 
b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3
 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 
1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95
 SHA512 
4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
 DIST git-2.31.0.tar.xz 6414252 BLAKE2B 
c9186c0e212767956cbabc685989408860600a19ff56637453f9cd45e143b6fb5b7104b188726506481782fcdfe3e7b28d5c9cf374172b81e5bfedf249292793
 SHA512 
b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B 
e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2
 SHA512 
b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B 
d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953
 SHA512 
ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
-DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 
9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde
 SHA512 
bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 
6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c
 SHA512 
9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909
-DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 
76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa
 SHA512 
d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445
 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B 
b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd
 SHA512 
217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2
-DIST git-htmldocs-2.30.0.tar.xz 1340536 BLAKE2B 
2204b276b941497e0ff5f1710c55b42f573b4eebd96619041db7afabb5a5d36252b2582b29e3d083abaf5da478810d056df83bdfa1d08c5396ffe03d0d858820
 SHA512 
3fc53a508497621c8af5ea26337407ed9489e768160c7063cfcc4bb53f51631ef968057f1498e37a901313aa08b4153533ca15a9bdfcbd04d2ed11256007db3e
-DIST git-htmldocs-2.30.1.tar.xz 1341796 BLAKE2B 
b282d16af234256ccb4e1099d42800d674b5ff4ea1e365557aa6672aac573b4e98e43ddbeb02291cd6925bfd217d2e8e99aae47e9f46fd06ad013fec87b8d3fe
 SHA512 
e2debb0dde49f1e6a5944ed35dfa62d6d2e6f71d745e6f6adfb477513f21004f04cd5de8e8444d4a24d9818c3cb85f5720848991a763fbc3541e89cfdf21dd49
 DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B 
a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237
 SHA512 
7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297
 DIST git-htmldocs-2.31.0.tar.xz 1357332 BLAKE2B 
06fe5fdde4193ffccf243eae8c112b6bf74b3a554283e0f688a47275a47de4c1c4dce9fe6dfa550885786ab8df46fa83fadd22746bc64e430af42785eda30583
 SHA512 
31a7d715454060bbc260a6001d971df0eea16c819de96a9316bb465a67661ebe805a8ea2f5f223c070b6aa1affd1e72970b223474e6221bf87ac3b233d229fdd
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 
27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1
 SHA512 
9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 
3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d
 SHA512 
8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9
-DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 
84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8
 SHA512 
ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
 DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B 
d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669
 SHA512 
b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd
-DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B 
d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf
 SHA512 
f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8
 DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B 
e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb
 SHA512 
5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941
-DIST git-manpages-2.30.0.tar.xz 481792 BLAKE2B 
9f6273e36e06a0296506d43b25a826cef9e459fdd25ad2f844de323b998fe9b5a7e5181b21257e7b297ea4ce2e16cfaacf7f1c7486ce26b59e39e643361d4745
 SHA512 
9593d9bef8b3bdcd5645cf89e0f0c53989342414363ce85cfd46da181750c92e8f6dbd860c6badc9d871b383bb9cf273b4fb3af7f6d46a8df6b95fddeab578ae
-DIST git-manpages-2.30.1.tar.xz 482128 BLAKE2B 
2e7f3943b5e95a3b00dda95f74c519889218e908aa3872f5ae93d88ac9602ad389e9be9df99ec7daafb0a324c03a3a50c7f3c697a1a7e9f35f795682ba85fb4c
 SHA512 
1cd535fff2a658d9ecb99c1f26663e2b37df429dfcff417c298e00fb5de107ef54848447ad63c2f78d8621f431f8f8b92bc871474a701db48deff04a0b595d07
 DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 
97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9
 SHA512 
fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7
 DIST git-manpages-2.31.0.tar.xz 487764 BLAKE2B 
e5acc25fe28c666afd017d29a9cce7b0e37d2b1dee93f911683c5e54972fe4def59964409bd232666963b4509d4ca30fb9b95757e2fdfe308559e455bf8160d3
 SHA512 
9bf426d5aadd4ac011f9b3694547da795bf5e8bc77a79ef69de56d6f39c3a0fdc039db25d4671810a5320a6c057f2364ec096413eebbbeabc26a7d3b65c9c787

diff --git a/dev-vcs/git/git-2.28.0.ebuild b/dev-vcs/git/git-2.28.0.ebuild
deleted file mode 100644
index d725b8e79c3..00000000000
--- a/dev-vcs/git/git-2.28.0.ebuild
+++ /dev/null
@@ -1,711 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 
python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # Please ensure that all _four_ 9999 ebuilds get updated; they track 
the 4 upstream branches.
-       # See https://git-scm.com/docs/gitworkflows#_graduation
-       # In order of stability:
-       # 9999-r0: maint
-       # 9999-r1: master
-       # 9999-r2: next
-       # 9999-r3: seen
-       case "${PVR}" in
-               9999) EGIT_BRANCH=maint ;;
-               9999-r1) EGIT_BRANCH=master ;;
-               9999-r2) EGIT_BRANCH=next;;
-               9999-r3) EGIT_BRANCH=seen ;;
-       esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and 
efficiency"
-HOMEPAGE="https://www.git-scm.com/";
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI_SUFFIX="xz"
-       SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git";
-       [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       doc? (
-                       
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       )"
-       [[ "${PV}" == *_rc* ]] || \
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv 
libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl 
+ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-       gnome-keyring? ( app-crypt/libsecret )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? (
-               pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-               !pcre-jit? ( dev-libs/libpcre )
-       )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       curl? (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs? ( >=app-editors/emacs-23.1:* )
-       iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-       gpg? ( app-crypt/gnupg )
-       perl? (
-               dev-perl/Error
-               dev-perl/MailTools
-               dev-perl/Authen-SASL
-               cgi? (
-                       dev-perl/CGI
-                       highlight? ( app-text/highlight )
-               )
-               cvs? (
-                       >=dev-vcs/cvsps-2.1:0
-                       dev-perl/DBI
-                       dev-perl/DBD-SQLite
-               )
-               mediawiki? (
-                       dev-perl/DateTime-Format-ISO8601
-                       dev-perl/HTML-Tree
-                       dev-perl/MediaWiki-API
-               )
-               subversion? (
-                       dev-vcs/subversion[-dso(-),perl]
-                       dev-perl/libwww-perl
-                       dev-perl/TermReadKey
-               )
-       )
-       perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-       doc? (
-               app-text/asciidoc
-               app-text/docbook2X
-               app-text/xmlto
-               sys-apps/texinfo
-       )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       BDEPEND="${BDEPEND}
-               app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-       cgi? ( perl )
-       cvs? ( perl )
-       mediawiki? ( perl )
-       mediawiki-experimental? ( mediawiki )
-       subversion? ( perl )
-       webdav? ( curl )
-       pcre-jit? ( pcre )
-       perforce? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-       "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Make submodule output quiet
-       "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-       if use subversion && has_version "dev-vcs/subversion[dso]"; then
-               ewarn "Per Gentoo bugs #223747, #238586, when subversion is 
built"
-               ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-               ewarn "have been warned."
-       fi
-       if use perforce ; then
-               python-single-r1_pkg_setup
-       fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-       local extlibs myopts
-
-       myopts=(
-               ASCIIDOC_NO_ROFF=YesPlease
-               $(usex cvs '' NO_CVS=YesPlease)
-               $(usex elibc_musl NO_REGEX=YesPlease '')
-               $(usex iconv '' NO_ICONV=YesPlease)
-               $(usex nls '' NO_GETTEXT=YesPlease)
-               $(usex perl 'INSTALLDIRS=vendor 
NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-               $(usex perforce '' NO_PYTHON=YesPlease)
-               $(usex subversion '' NO_SVN_TESTS=YesPlease)
-               $(usex threads '' NO_PTHREADS=YesPlease)
-               $(usex tk '' NO_TCLTK=YesPlease)
-       )
-
-       if use blksha1 ; then
-               myopts+=( BLK_SHA1=YesPlease )
-       elif use ppcsha1 ; then
-               myopts+=( PPC_SHA1=YesPlease )
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=( NO_EXPAT=YesPlease )
-       else
-               myopts+=( NO_CURL=YesPlease )
-       fi
-
-       # broken assumptions, because of static build system ...
-       myopts+=(
-               NO_FINK=YesPlease
-               NO_DARWIN_PORTS=YesPlease
-               INSTALL=install
-               TAR=tar
-               SHELL_PATH="${EPREFIX}/bin/sh"
-               SANE_TOOL_PATH=
-               OLD_ICONV=
-               NO_EXTERNAL_GREP=
-       )
-
-       # For svn-fe
-       extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
-
-       # can't define this to null, since the entire makefile depends on it
-       sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-       if use pcre; then
-               if use pcre-jit; then
-                       myopts+=( USE_LIBPCRE2=YesPlease )
-                       extlibs+=( -lpcre2-8 )
-               else
-                       myopts+=(
-                               USE_LIBPCRE1=YesPlease
-                               NO_LIBPCRE1_JIT=YesPlease
-                       )
-                       extlibs+=( -lpcre )
-               fi
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=(
-                       NEEDS_LIBICONV=YesPlease
-                       HAVE_CLOCK_MONOTONIC=1
-               )
-               if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-                       myopts+=( HAVE_GETDELIM=1 )
-               fi
-       fi
-
-       if has_version '>=app-text/asciidoc-8.0' ; then
-               myopts+=( ASCIIDOC8=YesPlease )
-       fi
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       if [[ "${CHOST}" == *-uclibc* ]] ; then
-               myopts+=( NO_NSEC=YesPlease )
-               use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-       fi
-
-       export MY_MAKEOPTS="${myopts[@]}"
-       export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-               cd "${S}" || die
-               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               if use doc ; then
-                       pushd "${S}"/Documentation &>/dev/null || die
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       popd &>/dev/null || die
-               fi
-       else
-               git-r3_src_unpack
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # add experimental patches to improve mediawiki support
-       # see patches for origin
-       if use mediawiki-experimental ; then
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-               )
-       fi
-
-       default
-
-       sed -i \
-               -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-               -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-               -e 
"s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               -e 
"s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               Makefile contrib/svn-fe/Makefile || die
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die
-}
-
-git_emake() {
-       # bug #320647: PYTHON_PATH
-       local PYTHON_PATH=""
-       use perforce && PYTHON_PATH="${PYTHON}"
-       emake ${MY_MAKEOPTS} \
-               prefix="${EPREFIX}"/usr \
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-               sysconfdir="${EPREFIX}"/etc \
-               DESTDIR="${D}" \
-               GIT_TEST_OPTS="--no-color" \
-               OPTAR="$(tc-getAR)" \
-               OPTCC="$(tc-getCC)" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               PERL_PATH="${EPREFIX}/usr/bin/perl" \
-               PERL_MM_OPT="" \
-               PYTHON_PATH="${PYTHON_PATH}" \
-               V=1 \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       git_emake || die "emake failed"
-
-       if use emacs ; then
-               elisp-compile contrib/emacs/git{,-blame}.el
-       fi
-
-       if use perl && use cgi ; then
-               git_emake \
-                       gitweb \
-                       || die "emake gitweb (cgi) failed"
-       fi
-
-       if [[ ${CHOST} == *-darwin* ]]; then
-               pushd contrib/credential/osxkeychain &>/dev/null || die
-               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-                       || die "emake credential-osxkeychain"
-               popd &>/dev/null || die
-       fi
-
-       pushd Documentation &>/dev/null || die
-       if [[ ${PV} == *9999 ]] ; then
-               git_emake man \
-                       || die "emake man failed"
-               if use doc ; then
-                       git_emake info html \
-                               || die "emake info html failed"
-               fi
-       else
-               if use doc ; then
-                       git_emake info \
-                               || die "emake info html failed"
-               fi
-       fi
-       popd &>/dev/null || die
-
-       if use subversion ; then
-               pushd contrib/svn-fe &>/dev/null || die
-               # by defining EXTLIBS we override the detection for libintl and
-               # libiconv, bug #516168
-               local nlsiconv=()
-               use nls && use !elibc_glibc && nlsiconv+=( -lintl )
-               use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
-               git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
-                       || die "emake svn-fe failed"
-               if use doc ; then
-                       # svn-fe.1 requires the full USE=doc dependency stack
-                       git_emake svn-fe.1 \
-                               || die "emake svn-fe.1 failed"
-                       git_emake svn-fe.html \
-                               || die "svn-fe.html failed"
-               fi
-               popd &>/dev/null || die
-       fi
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               git_emake || die "emake git-credential-libsecret failed"
-               popd &>/dev/null || die
-       fi
-
-       pushd contrib/subtree &>/dev/null || die
-       git_emake git-subtree
-       # git-subtree.1 requires the full USE=doc dependency stack
-       use doc && git_emake git-subtree.html git-subtree.1
-       popd &>/dev/null || die
-
-       pushd contrib/diff-highlight &>/dev/null || die
-       git_emake
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake
-               popd &>/dev/null || die
-
-       fi
-}
-
-src_install() {
-       git_emake install || die "make install failed"
-
-       if [[ ${CHOST} == *-darwin* ]]; then
-               dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-       fi
-
-       # Depending on the tarball and manual rebuild of the documentation, the
-       # manpages may exist in either OR both of these directories.
-       find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-       find Documentation/*.[157] >/dev/null 2>&1 && doman 
Documentation/*.[157]
-       dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-       use doc && dodir /usr/share/doc/${PF}/html
-       local d
-       for d in / /howto/ /technical/ ; do
-               docinto ${d}
-               dodoc Documentation${d}*.txt
-               if use doc ; then
-                       docinto ${d}/html
-                       dodoc Documentation${d}*.html
-               fi
-       done
-       docinto /
-       # Upstream does not ship this pre-built :-(
-       use doc && doinfo Documentation/{git,gitman}.info
-
-       newbashcomp contrib/completion/git-completion.bash ${PN}
-       bashcomp_alias git gitk
-       # Not really a bash-completion file (bug #477920)
-       # but still needed uncompressed (bug #507480)
-       insinto /usr/share/${PN}
-       doins contrib/completion/git-prompt.sh
-
-       if use emacs ; then
-               elisp-install ${PN} contrib/emacs/git.{el,elc}
-               elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-               #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-               # don't add automatically to the load-path, so the sitefile
-               # can do a conditional loading
-               touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-       fi
-
-       #dobin contrib/fast-import/git-p4 # Moved upstream
-       #dodoc contrib/fast-import/git-p4.txt # Moved upstream
-       newbin contrib/fast-import/import-tars.perl import-tars
-       exeinto /usr/libexec/git-core/
-       newexe contrib/git-resurrect.sh git-resurrect
-
-       # git-subtree
-       pushd contrib/subtree &>/dev/null || die
-       git_emake install || die "Failed to emake install for git-subtree"
-       if use doc ; then
-               # Do not move git subtree install-man outside USE=doc!
-               git_emake install-man install-html || die "Failed to emake 
install-html install-man for git-subtree"
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake install
-               popd &>/dev/null || die
-       fi
-
-       # diff-highlight
-       dobin contrib/diff-highlight/diff-highlight
-       newdoc contrib/diff-highlight/README README.diff-highlight
-
-       # git-jump
-       exeinto /usr/libexec/git-core/
-       doexe contrib/git-jump/git-jump
-       newdoc contrib/git-jump/README git-jump.txt
-
-       # git-contacts
-       exeinto /usr/libexec/git-core/
-       doexe contrib/contacts/git-contacts
-       dodoc contrib/contacts/git-contacts.txt
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               dobin git-credential-libsecret
-               popd &>/dev/null || die
-       fi
-
-       if use subversion ; then
-               pushd contrib/svn-fe &>/dev/null || die
-               dobin svn-fe
-               dodoc svn-fe.txt
-               if use doc ; then
-                       # Do not move svn-fe.1 outside USE=doc!
-                       doman svn-fe.1
-                       docinto html
-                       dodoc svn-fe.html
-               fi
-               popd &>/dev/null || die
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # diff-highlight - done above
-       # emacs - installed above
-       # examples - these are stuff that is not used in Git anymore actually
-       # git-jump - done above
-       # gitview - installed above
-       # p4import - excluded because fast-import has a better one
-       # patches - stuff the Git guys made to go upstream to other places
-       # persistent-https - TODO
-       # mw-to-git - TODO
-       # subtree - build  seperately
-       # svnimport - use git-svn
-       # thunderbird-patch-inline - fixes thunderbird
-       local contrib_objects=(
-               buildsystems
-               fast-import
-               hg-to-git
-               hooks
-               remotes2config.sh
-               rerere-train.sh
-               stats
-               workdir
-       )
-       local i
-       for i in "${contrib_objects[@]}" ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${ED}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               # We used to install in /usr/share/${PN}/gitweb
-               # but upstream installs in /usr/share/gitweb
-               # so we will install a symlink and use their location for 
compat with other
-               # distros
-               dosym ../gitweb /usr/share/${PN}/gitweb
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-                       if test -d "${d}" ; then find "${d}" \
-                               -name .packlist \
-                               -delete || die
-                       fi
-               done
-       else
-               rm -rf "${ED}"/usr/share/gitweb
-       fi
-
-       if ! use subversion ; then
-               rm -f "${ED}"/usr/libexec/git-core/git-svn \
-                       "${ED}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       if use !prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-               newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-               systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-
-       # Remove disabled linguas
-       # we could remove sources in src_prepare, but install does not
-       # handle missing locale dir well
-       rm_loc() {
-               if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-                       rm -r "${ED}/usr/share/locale/${1}" || die
-               fi
-       }
-       l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-       local disabled=()
-       local tests_cvs=(
-               t9200-git-cvsexportcommit.sh
-               t9400-git-cvsserver-server.sh
-               t9401-git-cvsserver-crlf.sh
-               t9402-git-cvsserver-refs.sh
-               t9600-cvsimport.sh
-               t9601-cvsimport-vendor-branch.sh
-               t9602-cvsimport-branches-tags.sh
-               t9603-cvsimport-patchsets.sh
-               t9604-cvsimport-timestamps.sh
-       )
-       local tests_perl=(
-               t3701-add-interactive.sh
-               t5502-quickfetch.sh
-               t5512-ls-remote.sh
-               t5520-pull.sh
-               t7106-reset-unborn-branch.sh
-               t7501-commit.sh
-       )
-       # Bug #225601 - t0004 is not suitable for root perm
-       # Bug #219839 - t1004 is not suitable for root perm
-       # t0001-init.sh - check for init notices EPERM*  fails
-       local tests_nonroot=(
-               t0001-init.sh
-               t0004-unwritable.sh
-               t0070-fundamental.sh
-               t1004-read-tree-m-u-wf.sh
-               t3700-add.sh
-               t7300-clean.sh
-       )
-       # t9100 still fails with symlinks in SVN 1.7
-       local test_svn=( t9100-git-svn-basic.sh )
-
-       # Unzip is used only for the testcase code, not by any normal parts of 
Git.
-       if ! has_version app-arch/unzip ; then
-               einfo "Disabling tar-tree tests"
-               disabled+=( t5000-tar-tree.sh )
-       fi
-
-       local cvs=0
-       use cvs && let cvs=${cvs}+1
-       if [[ ${EUID} -eq 0 ]]; then
-               if [[ ${cvs} -eq 1 ]]; then
-                       ewarn "Skipping CVS tests because CVS does not work as 
root!"
-                       ewarn "You should retest with FEATURES=userpriv!"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-               einfo "Skipping other tests that require being non-root"
-               disabled+=( ${tests_nonroot[@]} )
-       else
-               [[ ${cvs} -gt 0 ]] && \
-                       has_version dev-vcs/cvs && \
-                       let cvs=${cvs}+1
-               [[ ${cvs} -gt 1 ]] && \
-                       has_version "dev-vcs/cvs[server]" && \
-                       let cvs=${cvs}+1
-               if [[ ${cvs} -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs 
dev-vcs/cvs[USE=server])"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled+=( ${tests_perl[@]} )
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled+=( ${test_svn[@]} )
-
-       # Reset all previously disabled tests
-       pushd t &>/dev/null || die
-       local i
-       for i in *.sh.DISABLED ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-       done
-       einfo "Disabled tests:"
-       for i in ${disabled[@]} ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo 
"Disabled ${i}"
-       done
-
-       # Avoid the test system removing the results because we want them 
ourselves
-       sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-               -i Makefile || die
-
-       # Clean old results first, must always run
-       nonfatal git_emake clean
-       popd &>/dev/null || die
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       local rc
-       einfo "Start test run"
-       #MAKEOPTS=-j1
-       nonfatal git_emake --keep-going test
-       rc=$?
-
-       # Display nice results, now print the results
-       pushd t &>/dev/null || die
-       nonfatal git_emake aggregate-results
-
-       # And bail if there was a problem
-       [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       elog "Please read /usr/share/bash-completion/completions/git for Git 
bash command"
-       elog "completion."
-       elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-       elog "Note that the prompt bash code is now in that separate script"
-       elog "These additional scripts need some dependencies:"
-       echo
-       showpkgdeps git-quiltimport "dev-util/quilt"
-       showpkgdeps git-instaweb \
-               "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx 
)"
-       echo
-       use mediawiki-experimental && ewarn "Using experimental git-mediawiki 
patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
deleted file mode 100644
index d73a1120a38..00000000000
--- a/dev-vcs/git/git-2.29.2.ebuild
+++ /dev/null
@@ -1,676 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 
python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # Please ensure that all _four_ 9999 ebuilds get updated; they track 
the 4 upstream branches.
-       # See https://git-scm.com/docs/gitworkflows#_graduation
-       # In order of stability:
-       # 9999-r0: maint
-       # 9999-r1: master
-       # 9999-r2: next
-       # 9999-r3: seen
-       case "${PVR}" in
-               9999) EGIT_BRANCH=maint ;;
-               9999-r1) EGIT_BRANCH=master ;;
-               9999-r2) EGIT_BRANCH=next;;
-               9999-r3) EGIT_BRANCH=seen ;;
-       esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and 
efficiency"
-HOMEPAGE="https://www.git-scm.com/";
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI_SUFFIX="xz"
-       SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git";
-       [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       doc? (
-                       
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       )"
-       [[ "${PV}" == *_rc* ]] || \
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv 
libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl 
+ppcsha1 subversion tk +threads +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-       gnome-keyring? ( app-crypt/libsecret )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? (
-               pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-               !pcre-jit? ( dev-libs/libpcre )
-       )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       curl? (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs? ( >=app-editors/emacs-23.1:* )
-       iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-       gpg? ( app-crypt/gnupg )
-       perl? (
-               dev-perl/Error
-               dev-perl/MailTools
-               dev-perl/Authen-SASL
-               >=virtual/perl-libnet-3.110.0-r4[ssl]
-               cgi? (
-                       dev-perl/CGI
-                       highlight? ( app-text/highlight )
-               )
-               cvs? (
-                       >=dev-vcs/cvsps-2.1:0
-                       dev-perl/DBI
-                       dev-perl/DBD-SQLite
-               )
-               mediawiki? (
-                       dev-perl/DateTime-Format-ISO8601
-                       dev-perl/HTML-Tree
-                       dev-perl/MediaWiki-API
-               )
-               subversion? (
-                       dev-vcs/subversion[-dso(-),perl]
-                       dev-perl/libwww-perl
-                       dev-perl/TermReadKey
-               )
-       )
-       perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-       doc? (
-               app-text/asciidoc
-               app-text/docbook2X
-               app-text/xmlto
-               sys-apps/texinfo
-       )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       BDEPEND="${BDEPEND}
-               app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-       cgi? ( perl )
-       cvs? ( perl )
-       mediawiki? ( perl )
-       mediawiki-experimental? ( mediawiki )
-       pcre-jit? ( pcre )
-       perforce? ( ${PYTHON_REQUIRED_USE} )
-       subversion? ( perl )
-       webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-       # Make submodule output quiet
-       "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-       if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-               ewarn "Per Gentoo bugs #223747, #238586, when subversion is 
built"
-               ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-               ewarn "have been warned."
-       fi
-
-       if use perforce ; then
-               python-single-r1_pkg_setup
-       fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-       local extlibs myopts
-
-       myopts=(
-               ASCIIDOC_NO_ROFF=YesPlease
-               $(usex cvs '' NO_CVS=YesPlease)
-               $(usex elibc_musl NO_REGEX=YesPlease '')
-               $(usex iconv '' NO_ICONV=YesPlease)
-               $(usex nls '' NO_GETTEXT=YesPlease)
-               $(usex perl 'INSTALLDIRS=vendor 
NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-               $(usex perforce '' NO_PYTHON=YesPlease)
-               $(usex subversion '' NO_SVN_TESTS=YesPlease)
-               $(usex threads '' NO_PTHREADS=YesPlease)
-               $(usex tk '' NO_TCLTK=YesPlease)
-       )
-
-       if use blksha1 ; then
-               myopts+=( BLK_SHA1=YesPlease )
-       elif use ppcsha1 ; then
-               myopts+=( PPC_SHA1=YesPlease )
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=( NO_EXPAT=YesPlease )
-       else
-               myopts+=( NO_CURL=YesPlease )
-       fi
-
-       # broken assumptions, because of static build system ...
-       myopts+=(
-               NO_FINK=YesPlease
-               NO_DARWIN_PORTS=YesPlease
-               INSTALL=install
-               TAR=tar
-               SHELL_PATH="${EPREFIX}/bin/sh"
-               SANE_TOOL_PATH=
-               OLD_ICONV=
-               NO_EXTERNAL_GREP=
-       )
-
-       # can't define this to null, since the entire makefile depends on it
-       sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-       if use pcre; then
-               if use pcre-jit; then
-                       myopts+=( USE_LIBPCRE2=YesPlease )
-                       extlibs+=( -lpcre2-8 )
-               else
-                       myopts+=(
-                               USE_LIBPCRE1=YesPlease
-                               NO_LIBPCRE1_JIT=YesPlease
-                       )
-                       extlibs+=( -lpcre )
-               fi
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=(
-                       NEEDS_LIBICONV=YesPlease
-                       HAVE_CLOCK_MONOTONIC=1
-               )
-               if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-                       myopts+=( HAVE_GETDELIM=1 )
-               fi
-       fi
-
-       if has_version '>=app-text/asciidoc-8.0' ; then
-               myopts+=( ASCIIDOC8=YesPlease )
-       fi
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       if [[ "${CHOST}" == *-uclibc* ]] ; then
-               myopts+=( NO_NSEC=YesPlease )
-               use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-       fi
-
-       export MY_MAKEOPTS="${myopts[@]}"
-       export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-               cd "${S}" || die
-               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               if use doc ; then
-                       pushd "${S}"/Documentation &>/dev/null || die
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       popd &>/dev/null || die
-               fi
-       else
-               git-r3_src_unpack
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # add experimental patches to improve mediawiki support
-       # see patches for origin
-       if use mediawiki-experimental ; then
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-               )
-       fi
-
-       default
-
-       sed -i \
-               -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-               -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-               -e 
"s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               -e 
"s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               Makefile || die
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die
-}
-
-git_emake() {
-       # bug #320647: PYTHON_PATH
-       local PYTHON_PATH=""
-       use perforce && PYTHON_PATH="${PYTHON}"
-       emake ${MY_MAKEOPTS} \
-               prefix="${EPREFIX}"/usr \
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-               sysconfdir="${EPREFIX}"/etc \
-               DESTDIR="${D}" \
-               GIT_TEST_OPTS="--no-color" \
-               OPTAR="$(tc-getAR)" \
-               OPTCC="$(tc-getCC)" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               PERL_PATH="${EPREFIX}/usr/bin/perl" \
-               PERL_MM_OPT="" \
-               PYTHON_PATH="${PYTHON_PATH}" \
-               V=1 \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       git_emake || die "emake failed"
-
-       if use emacs ; then
-               elisp-compile contrib/emacs/git{,-blame}.el
-       fi
-
-       if use perl && use cgi ; then
-               git_emake \
-                       gitweb \
-                       || die "emake gitweb (cgi) failed"
-       fi
-
-       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-               pushd contrib/credential/osxkeychain &>/dev/null || die
-               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-                       || die "emake credential-osxkeychain"
-               popd &>/dev/null || die
-       fi
-
-       pushd Documentation &>/dev/null || die
-       if [[ ${PV} == *9999 ]] ; then
-               git_emake man \
-                       || die "emake man failed"
-               if use doc ; then
-                       git_emake info html \
-                               || die "emake info html failed"
-               fi
-       else
-               if use doc ; then
-                       git_emake info \
-                               || die "emake info html failed"
-               fi
-       fi
-       popd &>/dev/null || die
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               git_emake || die "emake git-credential-libsecret failed"
-               popd &>/dev/null || die
-       fi
-
-       pushd contrib/subtree &>/dev/null || die
-       git_emake git-subtree
-       # git-subtree.1 requires the full USE=doc dependency stack
-       use doc && git_emake git-subtree.html git-subtree.1
-       popd &>/dev/null || die
-
-       pushd contrib/diff-highlight &>/dev/null || die
-       git_emake
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake
-               popd &>/dev/null || die
-
-       fi
-}
-
-src_install() {
-       git_emake install || die "make install failed"
-
-       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-               dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-       fi
-
-       # Depending on the tarball and manual rebuild of the documentation, the
-       # manpages may exist in either OR both of these directories.
-       find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-       find Documentation/*.[157] >/dev/null 2>&1 && doman 
Documentation/*.[157]
-       dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-       use doc && dodir /usr/share/doc/${PF}/html
-       local d
-       for d in / /howto/ /technical/ ; do
-               docinto ${d}
-               dodoc Documentation${d}*.txt
-               if use doc ; then
-                       docinto ${d}/html
-                       dodoc Documentation${d}*.html
-               fi
-       done
-       docinto /
-       # Upstream does not ship this pre-built :-(
-       use doc && doinfo Documentation/{git,gitman}.info
-
-       newbashcomp contrib/completion/git-completion.bash ${PN}
-       bashcomp_alias git gitk
-       # Not really a bash-completion file (bug #477920)
-       # but still needed uncompressed (bug #507480)
-       insinto /usr/share/${PN}
-       doins contrib/completion/git-prompt.sh
-
-       if use emacs ; then
-               elisp-install ${PN} contrib/emacs/git.{el,elc}
-               elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-               #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-               # don't add automatically to the load-path, so the sitefile
-               # can do a conditional loading
-               touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-       fi
-
-       #dobin contrib/fast-import/git-p4 # Moved upstream
-       #dodoc contrib/fast-import/git-p4.txt # Moved upstream
-       newbin contrib/fast-import/import-tars.perl import-tars
-       exeinto /usr/libexec/git-core/
-       newexe contrib/git-resurrect.sh git-resurrect
-
-       # git-subtree
-       pushd contrib/subtree &>/dev/null || die
-       git_emake install || die "Failed to emake install for git-subtree"
-       if use doc ; then
-               # Do not move git subtree install-man outside USE=doc!
-               git_emake install-man install-html || die "Failed to emake 
install-html install-man for git-subtree"
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake install
-               popd &>/dev/null || die
-       fi
-
-       # diff-highlight
-       dobin contrib/diff-highlight/diff-highlight
-       newdoc contrib/diff-highlight/README README.diff-highlight
-
-       # git-jump
-       exeinto /usr/libexec/git-core/
-       doexe contrib/git-jump/git-jump
-       newdoc contrib/git-jump/README git-jump.txt
-
-       # git-contacts
-       exeinto /usr/libexec/git-core/
-       doexe contrib/contacts/git-contacts
-       dodoc contrib/contacts/git-contacts.txt
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               dobin git-credential-libsecret
-               popd &>/dev/null || die
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # diff-highlight - done above
-       # emacs - installed above
-       # examples - these are stuff that is not used in Git anymore actually
-       # git-jump - done above
-       # gitview - installed above
-       # p4import - excluded because fast-import has a better one
-       # patches - stuff the Git guys made to go upstream to other places
-       # persistent-https - TODO
-       # mw-to-git - TODO
-       # subtree - build  seperately
-       # svnimport - use git-svn
-       # thunderbird-patch-inline - fixes thunderbird
-       local contrib_objects=(
-               buildsystems
-               fast-import
-               hg-to-git
-               hooks
-               remotes2config.sh
-               rerere-train.sh
-               stats
-               workdir
-       )
-       local i
-       for i in "${contrib_objects[@]}" ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${ED}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               # We used to install in /usr/share/${PN}/gitweb
-               # but upstream installs in /usr/share/gitweb
-               # so we will install a symlink and use their location for 
compat with other
-               # distros
-               dosym ../gitweb /usr/share/${PN}/gitweb
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-                       if test -d "${d}" ; then find "${d}" \
-                               -name .packlist \
-                               -delete || die
-                       fi
-               done
-       else
-               rm -rf "${ED}"/usr/share/gitweb
-       fi
-
-       if ! use subversion ; then
-               rm -f "${ED}"/usr/libexec/git-core/git-svn \
-                       "${ED}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       if use !prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-               newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-               systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-
-       # Remove disabled linguas
-       # we could remove sources in src_prepare, but install does not
-       # handle missing locale dir well
-       rm_loc() {
-               if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-                       rm -r "${ED}/usr/share/locale/${1}" || die
-               fi
-       }
-       l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-       local disabled=()
-       local tests_cvs=(
-               t9200-git-cvsexportcommit.sh
-               t9400-git-cvsserver-server.sh
-               t9401-git-cvsserver-crlf.sh
-               t9402-git-cvsserver-refs.sh
-               t9600-cvsimport.sh
-               t9601-cvsimport-vendor-branch.sh
-               t9602-cvsimport-branches-tags.sh
-               t9603-cvsimport-patchsets.sh
-               t9604-cvsimport-timestamps.sh
-       )
-       local tests_perl=(
-               t3701-add-interactive.sh
-               t5502-quickfetch.sh
-               t5512-ls-remote.sh
-               t5520-pull.sh
-               t7106-reset-unborn-branch.sh
-               t7501-commit.sh
-       )
-       # Bug #225601 - t0004 is not suitable for root perm
-       # Bug #219839 - t1004 is not suitable for root perm
-       # t0001-init.sh - check for init notices EPERM*  fails
-       local tests_nonroot=(
-               t0001-init.sh
-               t0004-unwritable.sh
-               t0070-fundamental.sh
-               t1004-read-tree-m-u-wf.sh
-               t3700-add.sh
-               t7300-clean.sh
-       )
-       # t9100 still fails with symlinks in SVN 1.7
-       local test_svn=( t9100-git-svn-basic.sh )
-
-       # Unzip is used only for the testcase code, not by any normal parts of 
Git.
-       if ! has_version app-arch/unzip ; then
-               einfo "Disabling tar-tree tests"
-               disabled+=( t5000-tar-tree.sh )
-       fi
-
-       local cvs=0
-       use cvs && let cvs=${cvs}+1
-       if [[ ${EUID} -eq 0 ]]; then
-               if [[ ${cvs} -eq 1 ]]; then
-                       ewarn "Skipping CVS tests because CVS does not work as 
root!"
-                       ewarn "You should retest with FEATURES=userpriv!"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-               einfo "Skipping other tests that require being non-root"
-               disabled+=( ${tests_nonroot[@]} )
-       else
-               [[ ${cvs} -gt 0 ]] && \
-                       has_version dev-vcs/cvs && \
-                       let cvs=${cvs}+1
-               [[ ${cvs} -gt 1 ]] && \
-                       has_version "dev-vcs/cvs[server]" && \
-                       let cvs=${cvs}+1
-               if [[ ${cvs} -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs 
dev-vcs/cvs[USE=server])"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled+=( ${tests_perl[@]} )
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled+=( ${test_svn[@]} )
-
-       # Reset all previously disabled tests
-       pushd t &>/dev/null || die
-       local i
-       for i in *.sh.DISABLED ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-       done
-       einfo "Disabled tests:"
-       for i in ${disabled[@]} ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo 
"Disabled ${i}"
-       done
-
-       # Avoid the test system removing the results because we want them 
ourselves
-       sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-               -i Makefile || die
-
-       # Clean old results first, must always run
-       nonfatal git_emake clean
-       popd &>/dev/null || die
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       local rc
-       einfo "Start test run"
-       #MAKEOPTS=-j1
-       nonfatal git_emake --keep-going test
-       rc=$?
-
-       # Display nice results, now print the results
-       pushd t &>/dev/null || die
-       nonfatal git_emake aggregate-results
-
-       # And bail if there was a problem
-       [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       elog "Please read /usr/share/bash-completion/completions/git for Git 
bash command"
-       elog "completion."
-       elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-       elog "Note that the prompt bash code is now in that separate script"
-       elog "These additional scripts need some dependencies:"
-       echo
-       showpkgdeps git-quiltimport "dev-util/quilt"
-       showpkgdeps git-instaweb \
-               "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx 
)"
-       echo
-       use mediawiki-experimental && ewarn "Using experimental git-mediawiki 
patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-vcs/git/git-2.30.0.ebuild b/dev-vcs/git/git-2.30.0.ebuild
deleted file mode 100644
index d73a1120a38..00000000000
--- a/dev-vcs/git/git-2.30.0.ebuild
+++ /dev/null
@@ -1,676 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 
python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # Please ensure that all _four_ 9999 ebuilds get updated; they track 
the 4 upstream branches.
-       # See https://git-scm.com/docs/gitworkflows#_graduation
-       # In order of stability:
-       # 9999-r0: maint
-       # 9999-r1: master
-       # 9999-r2: next
-       # 9999-r3: seen
-       case "${PVR}" in
-               9999) EGIT_BRANCH=maint ;;
-               9999-r1) EGIT_BRANCH=master ;;
-               9999-r2) EGIT_BRANCH=next;;
-               9999-r3) EGIT_BRANCH=seen ;;
-       esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and 
efficiency"
-HOMEPAGE="https://www.git-scm.com/";
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI_SUFFIX="xz"
-       SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git";
-       [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       doc? (
-                       
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       )"
-       [[ "${PV}" == *_rc* ]] || \
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv 
libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl 
+ppcsha1 subversion tk +threads +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-       gnome-keyring? ( app-crypt/libsecret )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? (
-               pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-               !pcre-jit? ( dev-libs/libpcre )
-       )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       curl? (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs? ( >=app-editors/emacs-23.1:* )
-       iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-       gpg? ( app-crypt/gnupg )
-       perl? (
-               dev-perl/Error
-               dev-perl/MailTools
-               dev-perl/Authen-SASL
-               >=virtual/perl-libnet-3.110.0-r4[ssl]
-               cgi? (
-                       dev-perl/CGI
-                       highlight? ( app-text/highlight )
-               )
-               cvs? (
-                       >=dev-vcs/cvsps-2.1:0
-                       dev-perl/DBI
-                       dev-perl/DBD-SQLite
-               )
-               mediawiki? (
-                       dev-perl/DateTime-Format-ISO8601
-                       dev-perl/HTML-Tree
-                       dev-perl/MediaWiki-API
-               )
-               subversion? (
-                       dev-vcs/subversion[-dso(-),perl]
-                       dev-perl/libwww-perl
-                       dev-perl/TermReadKey
-               )
-       )
-       perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-       doc? (
-               app-text/asciidoc
-               app-text/docbook2X
-               app-text/xmlto
-               sys-apps/texinfo
-       )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       BDEPEND="${BDEPEND}
-               app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-       cgi? ( perl )
-       cvs? ( perl )
-       mediawiki? ( perl )
-       mediawiki-experimental? ( mediawiki )
-       pcre-jit? ( pcre )
-       perforce? ( ${PYTHON_REQUIRED_USE} )
-       subversion? ( perl )
-       webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-       # Make submodule output quiet
-       "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-       if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-               ewarn "Per Gentoo bugs #223747, #238586, when subversion is 
built"
-               ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-               ewarn "have been warned."
-       fi
-
-       if use perforce ; then
-               python-single-r1_pkg_setup
-       fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-       local extlibs myopts
-
-       myopts=(
-               ASCIIDOC_NO_ROFF=YesPlease
-               $(usex cvs '' NO_CVS=YesPlease)
-               $(usex elibc_musl NO_REGEX=YesPlease '')
-               $(usex iconv '' NO_ICONV=YesPlease)
-               $(usex nls '' NO_GETTEXT=YesPlease)
-               $(usex perl 'INSTALLDIRS=vendor 
NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-               $(usex perforce '' NO_PYTHON=YesPlease)
-               $(usex subversion '' NO_SVN_TESTS=YesPlease)
-               $(usex threads '' NO_PTHREADS=YesPlease)
-               $(usex tk '' NO_TCLTK=YesPlease)
-       )
-
-       if use blksha1 ; then
-               myopts+=( BLK_SHA1=YesPlease )
-       elif use ppcsha1 ; then
-               myopts+=( PPC_SHA1=YesPlease )
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=( NO_EXPAT=YesPlease )
-       else
-               myopts+=( NO_CURL=YesPlease )
-       fi
-
-       # broken assumptions, because of static build system ...
-       myopts+=(
-               NO_FINK=YesPlease
-               NO_DARWIN_PORTS=YesPlease
-               INSTALL=install
-               TAR=tar
-               SHELL_PATH="${EPREFIX}/bin/sh"
-               SANE_TOOL_PATH=
-               OLD_ICONV=
-               NO_EXTERNAL_GREP=
-       )
-
-       # can't define this to null, since the entire makefile depends on it
-       sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-       if use pcre; then
-               if use pcre-jit; then
-                       myopts+=( USE_LIBPCRE2=YesPlease )
-                       extlibs+=( -lpcre2-8 )
-               else
-                       myopts+=(
-                               USE_LIBPCRE1=YesPlease
-                               NO_LIBPCRE1_JIT=YesPlease
-                       )
-                       extlibs+=( -lpcre )
-               fi
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=(
-                       NEEDS_LIBICONV=YesPlease
-                       HAVE_CLOCK_MONOTONIC=1
-               )
-               if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-                       myopts+=( HAVE_GETDELIM=1 )
-               fi
-       fi
-
-       if has_version '>=app-text/asciidoc-8.0' ; then
-               myopts+=( ASCIIDOC8=YesPlease )
-       fi
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       if [[ "${CHOST}" == *-uclibc* ]] ; then
-               myopts+=( NO_NSEC=YesPlease )
-               use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-       fi
-
-       export MY_MAKEOPTS="${myopts[@]}"
-       export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-               cd "${S}" || die
-               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               if use doc ; then
-                       pushd "${S}"/Documentation &>/dev/null || die
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       popd &>/dev/null || die
-               fi
-       else
-               git-r3_src_unpack
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # add experimental patches to improve mediawiki support
-       # see patches for origin
-       if use mediawiki-experimental ; then
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-               )
-       fi
-
-       default
-
-       sed -i \
-               -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-               -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-               -e 
"s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               -e 
"s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               Makefile || die
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die
-}
-
-git_emake() {
-       # bug #320647: PYTHON_PATH
-       local PYTHON_PATH=""
-       use perforce && PYTHON_PATH="${PYTHON}"
-       emake ${MY_MAKEOPTS} \
-               prefix="${EPREFIX}"/usr \
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-               sysconfdir="${EPREFIX}"/etc \
-               DESTDIR="${D}" \
-               GIT_TEST_OPTS="--no-color" \
-               OPTAR="$(tc-getAR)" \
-               OPTCC="$(tc-getCC)" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               PERL_PATH="${EPREFIX}/usr/bin/perl" \
-               PERL_MM_OPT="" \
-               PYTHON_PATH="${PYTHON_PATH}" \
-               V=1 \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       git_emake || die "emake failed"
-
-       if use emacs ; then
-               elisp-compile contrib/emacs/git{,-blame}.el
-       fi
-
-       if use perl && use cgi ; then
-               git_emake \
-                       gitweb \
-                       || die "emake gitweb (cgi) failed"
-       fi
-
-       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-               pushd contrib/credential/osxkeychain &>/dev/null || die
-               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-                       || die "emake credential-osxkeychain"
-               popd &>/dev/null || die
-       fi
-
-       pushd Documentation &>/dev/null || die
-       if [[ ${PV} == *9999 ]] ; then
-               git_emake man \
-                       || die "emake man failed"
-               if use doc ; then
-                       git_emake info html \
-                               || die "emake info html failed"
-               fi
-       else
-               if use doc ; then
-                       git_emake info \
-                               || die "emake info html failed"
-               fi
-       fi
-       popd &>/dev/null || die
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               git_emake || die "emake git-credential-libsecret failed"
-               popd &>/dev/null || die
-       fi
-
-       pushd contrib/subtree &>/dev/null || die
-       git_emake git-subtree
-       # git-subtree.1 requires the full USE=doc dependency stack
-       use doc && git_emake git-subtree.html git-subtree.1
-       popd &>/dev/null || die
-
-       pushd contrib/diff-highlight &>/dev/null || die
-       git_emake
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake
-               popd &>/dev/null || die
-
-       fi
-}
-
-src_install() {
-       git_emake install || die "make install failed"
-
-       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-               dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-       fi
-
-       # Depending on the tarball and manual rebuild of the documentation, the
-       # manpages may exist in either OR both of these directories.
-       find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-       find Documentation/*.[157] >/dev/null 2>&1 && doman 
Documentation/*.[157]
-       dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-       use doc && dodir /usr/share/doc/${PF}/html
-       local d
-       for d in / /howto/ /technical/ ; do
-               docinto ${d}
-               dodoc Documentation${d}*.txt
-               if use doc ; then
-                       docinto ${d}/html
-                       dodoc Documentation${d}*.html
-               fi
-       done
-       docinto /
-       # Upstream does not ship this pre-built :-(
-       use doc && doinfo Documentation/{git,gitman}.info
-
-       newbashcomp contrib/completion/git-completion.bash ${PN}
-       bashcomp_alias git gitk
-       # Not really a bash-completion file (bug #477920)
-       # but still needed uncompressed (bug #507480)
-       insinto /usr/share/${PN}
-       doins contrib/completion/git-prompt.sh
-
-       if use emacs ; then
-               elisp-install ${PN} contrib/emacs/git.{el,elc}
-               elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-               #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-               # don't add automatically to the load-path, so the sitefile
-               # can do a conditional loading
-               touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-       fi
-
-       #dobin contrib/fast-import/git-p4 # Moved upstream
-       #dodoc contrib/fast-import/git-p4.txt # Moved upstream
-       newbin contrib/fast-import/import-tars.perl import-tars
-       exeinto /usr/libexec/git-core/
-       newexe contrib/git-resurrect.sh git-resurrect
-
-       # git-subtree
-       pushd contrib/subtree &>/dev/null || die
-       git_emake install || die "Failed to emake install for git-subtree"
-       if use doc ; then
-               # Do not move git subtree install-man outside USE=doc!
-               git_emake install-man install-html || die "Failed to emake 
install-html install-man for git-subtree"
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake install
-               popd &>/dev/null || die
-       fi
-
-       # diff-highlight
-       dobin contrib/diff-highlight/diff-highlight
-       newdoc contrib/diff-highlight/README README.diff-highlight
-
-       # git-jump
-       exeinto /usr/libexec/git-core/
-       doexe contrib/git-jump/git-jump
-       newdoc contrib/git-jump/README git-jump.txt
-
-       # git-contacts
-       exeinto /usr/libexec/git-core/
-       doexe contrib/contacts/git-contacts
-       dodoc contrib/contacts/git-contacts.txt
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               dobin git-credential-libsecret
-               popd &>/dev/null || die
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # diff-highlight - done above
-       # emacs - installed above
-       # examples - these are stuff that is not used in Git anymore actually
-       # git-jump - done above
-       # gitview - installed above
-       # p4import - excluded because fast-import has a better one
-       # patches - stuff the Git guys made to go upstream to other places
-       # persistent-https - TODO
-       # mw-to-git - TODO
-       # subtree - build  seperately
-       # svnimport - use git-svn
-       # thunderbird-patch-inline - fixes thunderbird
-       local contrib_objects=(
-               buildsystems
-               fast-import
-               hg-to-git
-               hooks
-               remotes2config.sh
-               rerere-train.sh
-               stats
-               workdir
-       )
-       local i
-       for i in "${contrib_objects[@]}" ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${ED}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               # We used to install in /usr/share/${PN}/gitweb
-               # but upstream installs in /usr/share/gitweb
-               # so we will install a symlink and use their location for 
compat with other
-               # distros
-               dosym ../gitweb /usr/share/${PN}/gitweb
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-                       if test -d "${d}" ; then find "${d}" \
-                               -name .packlist \
-                               -delete || die
-                       fi
-               done
-       else
-               rm -rf "${ED}"/usr/share/gitweb
-       fi
-
-       if ! use subversion ; then
-               rm -f "${ED}"/usr/libexec/git-core/git-svn \
-                       "${ED}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       if use !prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-               newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-               systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-
-       # Remove disabled linguas
-       # we could remove sources in src_prepare, but install does not
-       # handle missing locale dir well
-       rm_loc() {
-               if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-                       rm -r "${ED}/usr/share/locale/${1}" || die
-               fi
-       }
-       l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-       local disabled=()
-       local tests_cvs=(
-               t9200-git-cvsexportcommit.sh
-               t9400-git-cvsserver-server.sh
-               t9401-git-cvsserver-crlf.sh
-               t9402-git-cvsserver-refs.sh
-               t9600-cvsimport.sh
-               t9601-cvsimport-vendor-branch.sh
-               t9602-cvsimport-branches-tags.sh
-               t9603-cvsimport-patchsets.sh
-               t9604-cvsimport-timestamps.sh
-       )
-       local tests_perl=(
-               t3701-add-interactive.sh
-               t5502-quickfetch.sh
-               t5512-ls-remote.sh
-               t5520-pull.sh
-               t7106-reset-unborn-branch.sh
-               t7501-commit.sh
-       )
-       # Bug #225601 - t0004 is not suitable for root perm
-       # Bug #219839 - t1004 is not suitable for root perm
-       # t0001-init.sh - check for init notices EPERM*  fails
-       local tests_nonroot=(
-               t0001-init.sh
-               t0004-unwritable.sh
-               t0070-fundamental.sh
-               t1004-read-tree-m-u-wf.sh
-               t3700-add.sh
-               t7300-clean.sh
-       )
-       # t9100 still fails with symlinks in SVN 1.7
-       local test_svn=( t9100-git-svn-basic.sh )
-
-       # Unzip is used only for the testcase code, not by any normal parts of 
Git.
-       if ! has_version app-arch/unzip ; then
-               einfo "Disabling tar-tree tests"
-               disabled+=( t5000-tar-tree.sh )
-       fi
-
-       local cvs=0
-       use cvs && let cvs=${cvs}+1
-       if [[ ${EUID} -eq 0 ]]; then
-               if [[ ${cvs} -eq 1 ]]; then
-                       ewarn "Skipping CVS tests because CVS does not work as 
root!"
-                       ewarn "You should retest with FEATURES=userpriv!"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-               einfo "Skipping other tests that require being non-root"
-               disabled+=( ${tests_nonroot[@]} )
-       else
-               [[ ${cvs} -gt 0 ]] && \
-                       has_version dev-vcs/cvs && \
-                       let cvs=${cvs}+1
-               [[ ${cvs} -gt 1 ]] && \
-                       has_version "dev-vcs/cvs[server]" && \
-                       let cvs=${cvs}+1
-               if [[ ${cvs} -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs 
dev-vcs/cvs[USE=server])"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled+=( ${tests_perl[@]} )
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled+=( ${test_svn[@]} )
-
-       # Reset all previously disabled tests
-       pushd t &>/dev/null || die
-       local i
-       for i in *.sh.DISABLED ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-       done
-       einfo "Disabled tests:"
-       for i in ${disabled[@]} ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo 
"Disabled ${i}"
-       done
-
-       # Avoid the test system removing the results because we want them 
ourselves
-       sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-               -i Makefile || die
-
-       # Clean old results first, must always run
-       nonfatal git_emake clean
-       popd &>/dev/null || die
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       local rc
-       einfo "Start test run"
-       #MAKEOPTS=-j1
-       nonfatal git_emake --keep-going test
-       rc=$?
-
-       # Display nice results, now print the results
-       pushd t &>/dev/null || die
-       nonfatal git_emake aggregate-results
-
-       # And bail if there was a problem
-       [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       elog "Please read /usr/share/bash-completion/completions/git for Git 
bash command"
-       elog "completion."
-       elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-       elog "Note that the prompt bash code is now in that separate script"
-       elog "These additional scripts need some dependencies:"
-       echo
-       showpkgdeps git-quiltimport "dev-util/quilt"
-       showpkgdeps git-instaweb \
-               "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx 
)"
-       echo
-       use mediawiki-experimental && ewarn "Using experimental git-mediawiki 
patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-vcs/git/git-2.30.1.ebuild b/dev-vcs/git/git-2.30.1.ebuild
deleted file mode 100644
index f6a6fb30a9e..00000000000
--- a/dev-vcs/git/git-2.30.1.ebuild
+++ /dev/null
@@ -1,676 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 
python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # Please ensure that all _four_ 9999 ebuilds get updated; they track 
the 4 upstream branches.
-       # See https://git-scm.com/docs/gitworkflows#_graduation
-       # In order of stability:
-       # 9999-r0: maint
-       # 9999-r1: master
-       # 9999-r2: next
-       # 9999-r3: seen
-       case "${PVR}" in
-               9999) EGIT_BRANCH=maint ;;
-               9999-r1) EGIT_BRANCH=master ;;
-               9999-r2) EGIT_BRANCH=next;;
-               9999-r3) EGIT_BRANCH=seen ;;
-       esac
-fi
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER="${MY_PV}"
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and 
efficiency"
-HOMEPAGE="https://www.git-scm.com/";
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI_SUFFIX="xz"
-       SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git";
-       [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-       SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       doc? (
-                       
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       )"
-       [[ "${PV}" == *_rc* ]] || \
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv 
libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl 
+ppcsha1 subversion tk +threads +webdav xinetd cvs test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-       gnome-keyring? ( app-crypt/libsecret )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? (
-               pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-               !pcre-jit? ( dev-libs/libpcre )
-       )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       curl? (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs? ( >=app-editors/emacs-23.1:* )
-       iconv? ( virtual/libiconv )
-"
-
-RDEPEND="${DEPEND}
-       gpg? ( app-crypt/gnupg )
-       perl? (
-               dev-perl/Error
-               dev-perl/MailTools
-               dev-perl/Authen-SASL
-               >=virtual/perl-libnet-3.110.0-r4[ssl]
-               cgi? (
-                       dev-perl/CGI
-                       highlight? ( app-text/highlight )
-               )
-               cvs? (
-                       >=dev-vcs/cvsps-2.1:0
-                       dev-perl/DBI
-                       dev-perl/DBD-SQLite
-               )
-               mediawiki? (
-                       dev-perl/DateTime-Format-ISO8601
-                       dev-perl/HTML-Tree
-                       dev-perl/MediaWiki-API
-               )
-               subversion? (
-                       dev-vcs/subversion[-dso(-),perl]
-                       dev-perl/libwww-perl
-                       dev-perl/TermReadKey
-               )
-       )
-       perforce? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-BDEPEND="
-       doc? (
-               app-text/asciidoc
-               app-text/docbook2X
-               app-text/xmlto
-               sys-apps/texinfo
-       )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       BDEPEND="${BDEPEND}
-               app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-       cgi? ( perl )
-       cvs? ( perl )
-       mediawiki? ( perl )
-       mediawiki-experimental? ( mediawiki )
-       pcre-jit? ( pcre )
-       perforce? ( ${PYTHON_REQUIRED_USE} )
-       subversion? ( perl )
-       webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
-
-       # Make submodule output quiet
-       "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
-)
-
-pkg_setup() {
-       if use subversion && has_version "dev-vcs/subversion[dso]" ; then
-               ewarn "Per Gentoo bugs #223747, #238586, when subversion is 
built"
-               ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-               ewarn "have been warned."
-       fi
-
-       if use perforce ; then
-               python-single-r1_pkg_setup
-       fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-       local extlibs myopts
-
-       myopts=(
-               ASCIIDOC_NO_ROFF=YesPlease
-               $(usex cvs '' NO_CVS=YesPlease)
-               $(usex elibc_musl NO_REGEX=YesPlease '')
-               $(usex iconv '' NO_ICONV=YesPlease)
-               $(usex nls '' NO_GETTEXT=YesPlease)
-               $(usex perl 'INSTALLDIRS=vendor 
NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-               $(usex perforce '' NO_PYTHON=YesPlease)
-               $(usex subversion '' NO_SVN_TESTS=YesPlease)
-               $(usex threads '' NO_PTHREADS=YesPlease)
-               $(usex tk '' NO_TCLTK=YesPlease)
-       )
-
-       if use blksha1 ; then
-               myopts+=( BLK_SHA1=YesPlease )
-       elif use ppcsha1 ; then
-               myopts+=( PPC_SHA1=YesPlease )
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=( NO_EXPAT=YesPlease )
-       else
-               myopts+=( NO_CURL=YesPlease )
-       fi
-
-       # broken assumptions, because of static build system ...
-       myopts+=(
-               NO_FINK=YesPlease
-               NO_DARWIN_PORTS=YesPlease
-               INSTALL=install
-               TAR=tar
-               SHELL_PATH="${EPREFIX}/bin/sh"
-               SANE_TOOL_PATH=
-               OLD_ICONV=
-               NO_EXTERNAL_GREP=
-       )
-
-       # can't define this to null, since the entire makefile depends on it
-       sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-       if use pcre; then
-               if use pcre-jit; then
-                       myopts+=( USE_LIBPCRE2=YesPlease )
-                       extlibs+=( -lpcre2-8 )
-               else
-                       myopts+=(
-                               USE_LIBPCRE1=YesPlease
-                               NO_LIBPCRE1_JIT=YesPlease
-                       )
-                       extlibs+=( -lpcre )
-               fi
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=(
-                       NEEDS_LIBICONV=YesPlease
-                       HAVE_CLOCK_MONOTONIC=1
-               )
-               if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
-                       myopts+=( HAVE_GETDELIM=1 )
-               fi
-       fi
-
-       if has_version '>=app-text/asciidoc-8.0' ; then
-               myopts+=( ASCIIDOC8=YesPlease )
-       fi
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       if [[ "${CHOST}" == *-uclibc* ]] ; then
-               myopts+=( NO_NSEC=YesPlease )
-               use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-       fi
-
-       export MY_MAKEOPTS="${myopts[@]}"
-       export EXTLIBS="${extlibs[@]}"
-}
-
-src_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-               cd "${S}" || die
-               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               if use doc ; then
-                       pushd "${S}"/Documentation &>/dev/null || die
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       popd &>/dev/null || die
-               fi
-       else
-               git-r3_src_unpack
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # add experimental patches to improve mediawiki support
-       # see patches for origin
-       if use mediawiki-experimental ; then
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-               )
-       fi
-
-       default
-
-       sed -i \
-               -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-               -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-               -e 
"s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               -e 
"s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               Makefile || die
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die
-}
-
-git_emake() {
-       # bug #320647: PYTHON_PATH
-       local PYTHON_PATH=""
-       use perforce && PYTHON_PATH="${PYTHON}"
-       emake ${MY_MAKEOPTS} \
-               prefix="${EPREFIX}"/usr \
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               perllibdir="$(use perl && perl_get_raw_vendorlib)" \
-               sysconfdir="${EPREFIX}"/etc \
-               DESTDIR="${D}" \
-               GIT_TEST_OPTS="--no-color" \
-               OPTAR="$(tc-getAR)" \
-               OPTCC="$(tc-getCC)" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               PERL_PATH="${EPREFIX}/usr/bin/perl" \
-               PERL_MM_OPT="" \
-               PYTHON_PATH="${PYTHON_PATH}" \
-               V=1 \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       git_emake || die "emake failed"
-
-       if use emacs ; then
-               elisp-compile contrib/emacs/git{,-blame}.el
-       fi
-
-       if use perl && use cgi ; then
-               git_emake \
-                       gitweb \
-                       || die "emake gitweb (cgi) failed"
-       fi
-
-       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-               pushd contrib/credential/osxkeychain &>/dev/null || die
-               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-                       || die "emake credential-osxkeychain"
-               popd &>/dev/null || die
-       fi
-
-       pushd Documentation &>/dev/null || die
-       if [[ ${PV} == *9999 ]] ; then
-               git_emake man \
-                       || die "emake man failed"
-               if use doc ; then
-                       git_emake info html \
-                               || die "emake info html failed"
-               fi
-       else
-               if use doc ; then
-                       git_emake info \
-                               || die "emake info html failed"
-               fi
-       fi
-       popd &>/dev/null || die
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               git_emake || die "emake git-credential-libsecret failed"
-               popd &>/dev/null || die
-       fi
-
-       pushd contrib/subtree &>/dev/null || die
-       git_emake git-subtree
-       # git-subtree.1 requires the full USE=doc dependency stack
-       use doc && git_emake git-subtree.html git-subtree.1
-       popd &>/dev/null || die
-
-       pushd contrib/diff-highlight &>/dev/null || die
-       git_emake
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake
-               popd &>/dev/null || die
-
-       fi
-}
-
-src_install() {
-       git_emake install || die "make install failed"
-
-       if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
-               dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-       fi
-
-       # Depending on the tarball and manual rebuild of the documentation, the
-       # manpages may exist in either OR both of these directories.
-       find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-       find Documentation/*.[157] >/dev/null 2>&1 && doman 
Documentation/*.[157]
-       dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-       use doc && dodir /usr/share/doc/${PF}/html
-       local d
-       for d in / /howto/ /technical/ ; do
-               docinto ${d}
-               dodoc Documentation${d}*.txt
-               if use doc ; then
-                       docinto ${d}/html
-                       dodoc Documentation${d}*.html
-               fi
-       done
-       docinto /
-       # Upstream does not ship this pre-built :-(
-       use doc && doinfo Documentation/{git,gitman}.info
-
-       newbashcomp contrib/completion/git-completion.bash ${PN}
-       bashcomp_alias git gitk
-       # Not really a bash-completion file (bug #477920)
-       # but still needed uncompressed (bug #507480)
-       insinto /usr/share/${PN}
-       doins contrib/completion/git-prompt.sh
-
-       if use emacs ; then
-               elisp-install ${PN} contrib/emacs/git.{el,elc}
-               elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-               #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-               # don't add automatically to the load-path, so the sitefile
-               # can do a conditional loading
-               touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-       fi
-
-       #dobin contrib/fast-import/git-p4 # Moved upstream
-       #dodoc contrib/fast-import/git-p4.txt # Moved upstream
-       newbin contrib/fast-import/import-tars.perl import-tars
-       exeinto /usr/libexec/git-core/
-       newexe contrib/git-resurrect.sh git-resurrect
-
-       # git-subtree
-       pushd contrib/subtree &>/dev/null || die
-       git_emake install || die "Failed to emake install for git-subtree"
-       if use doc ; then
-               # Do not move git subtree install-man outside USE=doc!
-               git_emake install-man install-html || die "Failed to emake 
install-html install-man for git-subtree"
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               pushd contrib/mw-to-git &>/dev/null || die
-               git_emake install
-               popd &>/dev/null || die
-       fi
-
-       # diff-highlight
-       dobin contrib/diff-highlight/diff-highlight
-       newdoc contrib/diff-highlight/README README.diff-highlight
-
-       # git-jump
-       exeinto /usr/libexec/git-core/
-       doexe contrib/git-jump/git-jump
-       newdoc contrib/git-jump/README git-jump.txt
-
-       # git-contacts
-       exeinto /usr/libexec/git-core/
-       doexe contrib/contacts/git-contacts
-       dodoc contrib/contacts/git-contacts.txt
-
-       if use gnome-keyring ; then
-               pushd contrib/credential/libsecret &>/dev/null || die
-               dobin git-credential-libsecret
-               popd &>/dev/null || die
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # diff-highlight - done above
-       # emacs - installed above
-       # examples - these are stuff that is not used in Git anymore actually
-       # git-jump - done above
-       # gitview - installed above
-       # p4import - excluded because fast-import has a better one
-       # patches - stuff the Git guys made to go upstream to other places
-       # persistent-https - TODO
-       # mw-to-git - TODO
-       # subtree - build  seperately
-       # svnimport - use git-svn
-       # thunderbird-patch-inline - fixes thunderbird
-       local contrib_objects=(
-               buildsystems
-               fast-import
-               hg-to-git
-               hooks
-               remotes2config.sh
-               rerere-train.sh
-               stats
-               workdir
-       )
-       local i
-       for i in "${contrib_objects[@]}" ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${ED}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               # We used to install in /usr/share/${PN}/gitweb
-               # but upstream installs in /usr/share/gitweb
-               # so we will install a symlink and use their location for 
compat with other
-               # distros
-               dosym ../gitweb /usr/share/${PN}/gitweb
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-                       if test -d "${d}" ; then find "${d}" \
-                               -name .packlist \
-                               -delete || die
-                       fi
-               done
-       else
-               rm -rf "${ED}"/usr/share/gitweb
-       fi
-
-       if ! use subversion ; then
-               rm -f "${ED}"/usr/libexec/git-core/git-svn \
-                       "${ED}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       if use !prefix ; then
-               newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-               newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-               systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-
-       # Remove disabled linguas
-       # we could remove sources in src_prepare, but install does not
-       # handle missing locale dir well
-       rm_loc() {
-               if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-                       rm -r "${ED}/usr/share/locale/${1}" || die
-               fi
-       }
-       l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-       local disabled=()
-       local tests_cvs=(
-               t9200-git-cvsexportcommit.sh
-               t9400-git-cvsserver-server.sh
-               t9401-git-cvsserver-crlf.sh
-               t9402-git-cvsserver-refs.sh
-               t9600-cvsimport.sh
-               t9601-cvsimport-vendor-branch.sh
-               t9602-cvsimport-branches-tags.sh
-               t9603-cvsimport-patchsets.sh
-               t9604-cvsimport-timestamps.sh
-       )
-       local tests_perl=(
-               t3701-add-interactive.sh
-               t5502-quickfetch.sh
-               t5512-ls-remote.sh
-               t5520-pull.sh
-               t7106-reset-unborn-branch.sh
-               t7501-commit.sh
-       )
-       # Bug #225601 - t0004 is not suitable for root perm
-       # Bug #219839 - t1004 is not suitable for root perm
-       # t0001-init.sh - check for init notices EPERM*  fails
-       local tests_nonroot=(
-               t0001-init.sh
-               t0004-unwritable.sh
-               t0070-fundamental.sh
-               t1004-read-tree-m-u-wf.sh
-               t3700-add.sh
-               t7300-clean.sh
-       )
-       # t9100 still fails with symlinks in SVN 1.7
-       local test_svn=( t9100-git-svn-basic.sh )
-
-       # Unzip is used only for the testcase code, not by any normal parts of 
Git.
-       if ! has_version app-arch/unzip ; then
-               einfo "Disabling tar-tree tests"
-               disabled+=( t5000-tar-tree.sh )
-       fi
-
-       local cvs=0
-       use cvs && let cvs=${cvs}+1
-       if [[ ${EUID} -eq 0 ]]; then
-               if [[ ${cvs} -eq 1 ]]; then
-                       ewarn "Skipping CVS tests because CVS does not work as 
root!"
-                       ewarn "You should retest with FEATURES=userpriv!"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-               einfo "Skipping other tests that require being non-root"
-               disabled+=( ${tests_nonroot[@]} )
-       else
-               [[ ${cvs} -gt 0 ]] && \
-                       has_version dev-vcs/cvs && \
-                       let cvs=${cvs}+1
-               [[ ${cvs} -gt 1 ]] && \
-                       has_version "dev-vcs/cvs[server]" && \
-                       let cvs=${cvs}+1
-               if [[ ${cvs} -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs 
dev-vcs/cvs[USE=server])"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled+=( ${tests_perl[@]} )
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled+=( ${test_svn[@]} )
-
-       # Reset all previously disabled tests
-       pushd t &>/dev/null || die
-       local i
-       for i in *.sh.DISABLED ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-       done
-       einfo "Disabled tests:"
-       for i in ${disabled[@]} ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo 
"Disabled ${i}"
-       done
-
-       # Avoid the test system removing the results because we want them 
ourselves
-       sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-               -i Makefile || die
-
-       # Clean old results first, must always run
-       nonfatal git_emake clean
-       popd &>/dev/null || die
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       local rc
-       einfo "Start test run"
-       #MAKEOPTS=-j1
-       nonfatal git_emake --keep-going test
-       rc=$?
-
-       # Display nice results, now print the results
-       pushd t &>/dev/null || die
-       nonfatal git_emake aggregate-results
-
-       # And bail if there was a problem
-       [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       elog "Please read /usr/share/bash-completion/completions/git for Git 
bash command"
-       elog "completion."
-       elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-       elog "Note that the prompt bash code is now in that separate script"
-       elog "These additional scripts need some dependencies:"
-       echo
-       showpkgdeps git-quiltimport "dev-util/quilt"
-       showpkgdeps git-instaweb \
-               "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx 
)"
-       echo
-       use mediawiki-experimental && ewarn "Using experimental git-mediawiki 
patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}