commit:     78b6e8c6e689cfd14ff04bdfd460dc1a4fa92b10
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  8 18:35:35 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 18:36:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b6e8c6

dev-vcs/git: drop 2.46.0, 2.46.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git/Manifest          |   6 -
 dev-vcs/git/git-2.46.0.ebuild | 667 ------------------------------------------
 dev-vcs/git/git-2.46.1.ebuild | 667 ------------------------------------------
 3 files changed, 1340 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 6812c06afb7c..3c63b01aab31 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,8 +4,6 @@ DIST git-2.43.2.tar.xz 7388636 BLAKE2B 
3c0d59d361b928efedfc06426f4c2c0f3852b3501
 DIST git-2.43.5.tar.xz 7394400 BLAKE2B 
8c3e6dd1c64469ebc11adb6e3c4156ba0a9dd8fa9f73770b3c26a19ce3a9840561b52d67c07e37e19ad9d09c5ce74e14cf6248c15a37ff7d474cce7a594c3948
 SHA512 
7c507e29d102d3597ae867c0bfb1befc4facdfb1934b2361ee390c4cd9f68753aef1542a955a0684441f4ccad2b3a7fa560677466ccab4ee457499b0968d41b0
 DIST git-2.44.2.tar.xz 7435020 BLAKE2B 
625071528e6575af86aa51d7d5baeaa9b1b8be0e9f2b13f9f1c948a6dc0e9e03e227462c6ed9e8b80c413f02840f4f6b5d73487e0722d30835233480ea93caf3
 SHA512 
4dc70065fb1f47678cbed0d055f7734fce5cc26eeb627bda928056a80253053b230200db4b2936319df5b5b577eaaa1186a8bb041a205ac600d691e5663117ed
 DIST git-2.45.2.tar.xz 7487680 BLAKE2B 
477acc786c26e0b04843ad6d07333607b2274d587263d72c6d036cade725e6f62f8c773903f401c799de71527d0473589afc507eec02f445e0c148dd7cbf407c
 SHA512 
dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73
-DIST git-2.46.0.tar.xz 7577180 BLAKE2B 
11fd88faea8cca0982945320c0a1ff949d2abedca9ffde34d40a739349e2a7ae6ceb51a23e8c21f7985cd494d9d17abcec4769e766c3c5188162b906eb1b96bc
 SHA512 
3afae7a094da070c627f68ceb54c2345e3a49e04e455197527b732eb220e8c3249f5d09655a59bf4280dd0c0a3e305abc1380693e0a7fb0b8138b741c4708184
-DIST git-2.46.1.tar.xz 7582036 BLAKE2B 
8b0c698b3423484c11d8ec12d3a3de82c2e865b81ecfb36f55c830ed9a12438002288a72194fb6301c7ebd506cbc0930406d13b9a1b663167aae24a2d6dc0c96
 SHA512 
ce1bb12cb8a320e4ef261d4715dc2144207f31cfe13b2b62cebfc9e61880db79876a634e29cf42992d4f472ce0af709f48f14c7ba800f157876f19982720fc6d
 DIST git-2.46.2.tar.xz 7581344 BLAKE2B 
1ea2a166bd2717d581020a9921cf7e82dc2c77e2a9bd6bc70f4b6396c214c74b30e8ae6815eba33bd2995f7a6e2570b96c51acbfce25ab85e05d5fdbd09d870c
 SHA512 
d8d1cec9a4ddc7b1892b7f5b3c808d235bcd4bfb1714ce0ce0e721242acc94f9ae7c2ae3181311feb5b458b04e89cd32acd3e9c90adbc4e86e05e7d5589d8a00
 DIST git-2.47.0.tar.xz 7652728 BLAKE2B 
f1d767aad6a917efe0c2e7f52163daca796640fb7f7ac8c1d6ead91ce3019f9a5ddd7ce8890ff37aaff1320d1b0b59399469fc9cb0f66cfc6893d2b3bbeee56e
 SHA512 
58683aa59dba25ffec9fe2c185267c77b34d573e9738c133a15d25071e37095e99486c231c35b8f71aabe3c1e305238b56d2c10039318bfc08f137919bad66ec
 DIST git-htmldocs-2.39.5.tar.xz 1508480 BLAKE2B 
028d37c16a14e588b73783a5a7f8b6b95bd5864f83e9ec69855967f4188366c34d71d4fcdccaa55929d9c451b9822674d681c786c662ad5812c73d4663343345
 SHA512 
d486d2cfea1a1f84e64da85f22c153fad5110cf89523aa0618de21f331aee0c53a3269e92b883eee391312e5a33166f9f10abbcffde44732531cf80120671e2f
@@ -14,8 +12,6 @@ DIST git-htmldocs-2.43.2.tar.xz 1545440 BLAKE2B 
8e6943ed5c5ab13ee7f8f2e124a3dc1e
 DIST git-htmldocs-2.43.5.tar.xz 1547732 BLAKE2B 
eabdbdf4c5eeeee7c10cb809043b0b3741f2e05c481662358c0dca94a059fd3ec1f022553d2bf67a7a06df2cb28c472fe8f581d47e7b018cb9b7a99ef2acfe08
 SHA512 
fe8b67df639d9960f974728ddad89c2c37bcdaf594ca45cc903a74436138613fe7789e63c5043bca956fa55a5ec14f5658a6c8eef9b242d22408110346a062d0
 DIST git-htmldocs-2.44.2.tar.xz 1559412 BLAKE2B 
9a62ab1d70b009a9bc29250c49ca835a46928703a73ec004ea57e7dc74212c5a29d7e0784cd752c8d2c1e23b70702e2c2f280904dfedefb3d4a687002a950596
 SHA512 
2a82e3c37aaca91643976d21fac3bd82b23fe2374856d73b0ba726339450ea6f8a5e8e38326546292f83923e28da280ca3bed549afff1aad684ebfb3926e4992
 DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 
5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45
 SHA512 
272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440
-DIST git-htmldocs-2.46.0.tar.xz 1594172 BLAKE2B 
f59b8796a19a73e983ec56bfd3cb623a887b8e4d4d4767f90029fffffd874567020d1ea6b0fa923708721a34a5ccc0fb496d12126bb30a851865991983cc2e32
 SHA512 
af6f6bfbbae58dc60fd821e90f034d36a4a554b239ea60ab38f9ce9611cff44e5fd59366905b71c9363444a28aeadcaecac87a8596a8cd16c313921f6826c798
-DIST git-htmldocs-2.46.1.tar.xz 1552632 BLAKE2B 
19a4d4e88a3be1b4ed2487003b16a6d52b8759247e53ba22b8f274a083d970c744e17c3326122c6e0383e91113d8fb17ab5fba0d1d03bf49a16687778c93c0cd
 SHA512 
6720d732ce72d61e7e4aa7159f59c3677e442180f5b89bb95e5454856fd2b37e1f650bf711b2e1eb0d379544c72f5ae838863cbf479e008c72410396fcf3a419
 DIST git-htmldocs-2.46.2.tar.xz 1553104 BLAKE2B 
9a7b784c1a01153dc660b4fe6eaa3ceac2d30eeb96015ab4ec73296811d27cc84715abd19f723ad16c64028114c2aceee2727380e7c9f8ff220ae4538dcc9c62
 SHA512 
51c5363ac48f04118071218ea095dae97676ac299a482511ef55e9267724f08e7c021ffa15418d9e32e676333ba31643c9049860f154f58a67d9604e141376c3
 DIST git-htmldocs-2.47.0.tar.xz 1564012 BLAKE2B 
9d9d234ac8c7eb6861a2ee1bd9000ae7150b33346adf8e830712c0fa2c068e5173a52ff0f937f64a2f2a2270853ca7d62965361d124a98bfe4e39d63a8e0aae6
 SHA512 
4e8cfabfcdfaa12d23ba21ee3612a841e1731c174cb1d73c9fee12a345e5ee792c1ad0f5c15b4f73ad6eb4496a1e3450aaacdd65e5f875e60c9eb355cc4134fe
 DIST git-manpages-2.39.5.tar.xz 558188 BLAKE2B 
062cc26c5ed5b955422c3c2c927eb666b7f141c20a52e85cc2910b657267a853a6cb971c61030fe266762ade37fdd830fc9fb0cef622e625d95ca359188a9720
 SHA512 
5cd07eff2ff90c0ffc7f0606cd35f44856a30febf53f7f8c5ab0438614f20459b2b96d4b140118c2c0c9c5e83ee66aaa1443aa64e9e4f2a78f5990d122fe1e74
@@ -24,7 +20,5 @@ DIST git-manpages-2.43.2.tar.xz 570496 BLAKE2B 
5d0be8f51edddf5b6a0c18d21a1ee8c23
 DIST git-manpages-2.43.5.tar.xz 571176 BLAKE2B 
077b74f8436da64116d173459b21aeef7faf4de47f16f2fa3b5d4ee721d373b4d2d26978626525b60ccc4ad1c5fa343e80d0a0f3baff3ad0d41e284abb2cf04a
 SHA512 
31075102a42655574431fc0e25c415fab853d2d7a8104a729229056c22ff30909928a92e9469650b23abd0f7941a213bd59302bb67b9170c3474fa4fbe044b4b
 DIST git-manpages-2.44.2.tar.xz 574316 BLAKE2B 
ecfca8e05ca682097376ce6a1e8b9de8fcc36472860321987be12291a53d1a92befb950fd856775df65f28300b267b80975775cba046cfb89159887e8cba5516
 SHA512 
2ad6d922acf46028b3b7dd5a686c0396e5452e4d50b32ba9af0cc51cc3431003524b91279e2a795065a179af3d760ce72530580295ed09a53673274cf9567cc6
 DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B 
c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734
 SHA512 
d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b
-DIST git-manpages-2.46.0.tar.xz 585072 BLAKE2B 
8a7dbd9ac4d7e26c24f38baba0e2e639377ec56e23beef8123a4e28dd0c3cae26abd7a8491db9fd69c5ad58767617aadb4dec8649223a5db6520d383521fd142
 SHA512 
7bcc47107f9f06a42dafc7dfe3788a9fbacc550546cd6f1c481835749ad78e8b447e179cbb80e2a01ab765154562edbb64d94b244530bafdfb94c4a127c4068e
-DIST git-manpages-2.46.1.tar.xz 584836 BLAKE2B 
fa1836bb4eedeb184948fff372b742f1a9317899506cbef6bd44730a34ffd27c344e03c65d9c2a813f7428406f86b23f8546a38becfd63041372f39f30ec20c4
 SHA512 
a00cd09f968670ec229f2b82d3120fbeeb0cbcf73b6c2d15668faff225b6d899ac8f10d1385fd1d6e636988317b919dd495fddb53b7063d6f20edbd8d38e6c51
 DIST git-manpages-2.46.2.tar.xz 584812 BLAKE2B 
dd5592a1fd61b6eda0afa4f9292ce86dd14bca6a88016f96c53617f6505f27cc9a2ba9437c6330bb8003b3f57cd1e75bf441bf2a2168554bbda9c26db37db4cb
 SHA512 
ce7a2a1fbb9376182b8ce3ed772fbeeef2cf338bc06bf9bcf3c07a65419e41b3754d6851a44886d0b07dfd82f8eefe7b8b1d9f5c28ed6b6a0ea4168ed457e121
 DIST git-manpages-2.47.0.tar.xz 586352 BLAKE2B 
87a1de077672e3246df26d2603221bcd06ed1844bf43a092afb630335a7da62866f497144b97106aec8565fd847010aa20e64ee24a87fc05d3e24884047e9a89
 SHA512 
898bf91b88910a8046fc4eefc1bfb98910d38db28846e4e04c44664f34723e406566622fd443ff332556545ca90c6519557389b75f159bbaf07044ab0cc83ac5

diff --git a/dev-vcs/git/git-2.46.0.ebuild b/dev-vcs/git/git-2.46.0.ebuild
deleted file mode 100644
index 6112d2fa6228..000000000000
--- a/dev-vcs/git/git-2.46.0.ebuild
+++ /dev/null
@@ -1,667 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale 
python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-
-if [[ ${PV} == *9999 ]]; then
-       EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git";
-
-       inherit git-r3
-       # 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+=" 
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
-       SRC_URI+=" doc? ( 
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
-
-       if [[ ${PV} != *_rc* ]] ; then
-               KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-       fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls 
+pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs 
test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-       dev-libs/openssl:=
-       sys-libs/zlib
-       curl? (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       keyring? (
-               app-crypt/libsecret
-               dev-libs/glib:2
-       )
-       iconv? ( virtual/libiconv )
-       pcre? ( dev-libs/libpcre2:= )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:= )
-"
-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} )
-       selinux? ( sec-policy/selinux-git )
-"
-
-# 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
-       )
-       keyring? ( virtual/pkgconfig )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       BDEPEND+=" app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-
-REQUIRED_USE="
-       cgi? ( perl )
-       cvs? ( perl )
-       mediawiki? ( perl )
-       perforce? ( ${PYTHON_REQUIRED_USE} )
-       subversion? ( perl )
-       webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-       # Avoid automagic CVS, bug #350330
-       "${FILESDIR}"/git-2.37.0_rc1-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 perl 'INSTALLDIRS=vendor 
NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-               $(usev elibc_musl NO_REGEX=NeedsStartEnd)
-               $(usev !cvs NO_CVS=YesPlease)
-               $(usev !iconv NO_ICONV=YesPlease)
-               $(usev !nls NO_GETTEXT=YesPlease)
-               $(usev !perforce NO_PYTHON=YesPlease)
-               $(usev !subversion NO_SVN_TESTS=YesPlease)
-               $(usev !tk NO_TCLTK=YesPlease)
-       )
-
-       if use blksha1 ; then
-               myopts+=( BLK_SHA1=YesPlease )
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=( NO_EXPAT=YesPlease )
-       else
-               myopts+=( NO_CURL=YesPlease )
-       fi
-
-       # Broken assumptions because of static build system
-       myopts+=(
-               NO_FINK=YesPlease
-               NO_DARWIN_PORTS=YesPlease
-               INSTALL=install
-               TAR=tar
-               SHELL_PATH="${EPREFIX}/bin/sh"
-               SANE_TOOL_PATH=
-               OLD_ICONV=
-               NO_EXTERNAL_GREP=
-       )
-
-       # Can't define this to null, since the entire makefile depends on it
-       sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-       if use pcre; then
-               myopts+=( USE_LIBPCRE2=YesPlease )
-               extlibs+=( -lpcre2-8 )
-       fi
-
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=(
-                       NEEDS_LIBICONV=YesPlease
-                       HAVE_CLOCK_MONOTONIC=1
-               )
-
-               if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-                       myopts+=( HAVE_GETDELIM=1 )
-               fi
-       fi
-
-       myopts+=( ASCIIDOC8=YesPlease )
-
-       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 . || die
-       fi
-
-}
-
-src_prepare() {
-       if ! use safe-directory ; then
-               # This patch neuters the "safe directory" detection.
-               # bugs #838271, #838223
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.37.2-unsafe-directory.patch
-               )
-       fi
-
-       default
-
-       if use prefix ; then
-               # bug #757309
-               sed -i \
-                       -e 
's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-                       -e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-                       config.mak.uname || die
-       fi
-
-       sed -i \
-               -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-               -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-               -e 
"s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               -e 
"s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               Makefile || die
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die
-}
-
-git_emake() {
-       # bug #320647: PYTHON_PATH
-       local PYTHON_PATH=""
-       use perforce && PYTHON_PATH="${PYTHON}"
-
-       local mymakeargs=(
-               ${MY_MAKEOPTS}
-
-               prefix="${EPREFIX}"/usr
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-               perllibdir="$(use perl && perl_get_raw_vendorlib)"
-               sysconfdir="${EPREFIX}"/etc
-
-               CC="$(tc-getCC)"
-               CFLAGS="${CFLAGS}"
-               PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-               # TODO: --verbose?
-               GIT_TEST_OPTS="--no-color"
-
-               OPTAR="$(tc-getAR)"
-               OPTCC="$(tc-getCC)"
-               OPTCFLAGS="${CFLAGS}"
-               OPTLDFLAGS="${LDFLAGS}"
-
-               CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-               CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-               CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
-               PERL_PATH="${EPREFIX}/usr/bin/perl"
-               PERL_MM_OPT=""
-
-               PYTHON_PATH="${PYTHON_PATH}"
-
-               V=1
-               "$@"
-       )
-
-       emake "${mymakeargs[@]}"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       git_emake
-
-       if use perl && use cgi ; then
-               git_emake gitweb
-       fi
-
-       if use perl ; then
-               git_emake -C contrib/credential/netrc
-       fi
-
-       if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-               git_emake -C contrib/credential/osxkeychain
-       fi
-
-       pushd Documentation &>/dev/null || die
-       if [[ ${PV} == *9999 ]] ; then
-               git_emake man
-               if use doc ; then
-                       git_emake info html
-               fi
-       else
-               if use doc ; then
-                       git_emake info
-               fi
-       fi
-       popd &>/dev/null || die
-
-       if use keyring ; then
-               git_emake -C contrib/credential/libsecret
-       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
-
-       git_emake -C contrib/diff-highlight
-
-       if use mediawiki ; then
-               git_emake -C contrib/mw-to-git
-       fi
-}
-
-src_test() {
-       local disabled=(
-               # We make safe-directory optional
-               t0033-safe-directory.sh
-       )
-
-       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
-               if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-                       let cvs=${cvs}+1
-               fi
-
-               if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; 
then
-                       let cvs=${cvs}+1
-               fi
-
-               if [[ ${cvs} -lt 3 ]] ; then
-                       einfo "Disabling CVS tests (needs 
dev-vcs/cvs[USE=server])"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled+=( ${tests_perl[@]} )
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled+=( ${test_svn[@]} )
-
-       # Reset all previously disabled tests
-       pushd t &>/dev/null || die
-       local i
-       for i in *.sh.DISABLED ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-       done
-       einfo "Disabled tests:"
-       for i in ${disabled[@]} ; do
-               if [[ -f "${i}" ]] ; then
-                       mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-               fi
-       done
-
-       # Avoid the test system removing the results because we want them 
ourselves
-       sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-       # Clean old results first, must always run
-       nonfatal git_emake clean
-       popd &>/dev/null || die
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       local rc
-       # t0610-reftable-basics.sh uses $A
-       local -x A=
-       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!"
-
-       popd &>/dev/null || die
-       if use perl ; then
-               emake -C contrib/credential/netrc testverbose
-       fi
-}
-
-src_install() {
-       git_emake DESTDIR="${D}" install
-
-       if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; 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
-
-       #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 DESTDIR="${D}" install
-       if use doc ; then
-               # Do not move git subtree install-man outside USE=doc!
-               git_emake DESTDIR="${D}" install-man install-html
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-       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 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 - removed upstream
-       # 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
-               hooks
-               remotes2config.sh
-               rerere-train.sh
-               stats
-               workdir
-       )
-       local i
-       for i in "${contrib_objects[@]}" ; do
-               cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || 
die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               # We used to install in /usr/share/${PN}/gitweb
-               # but upstream installs in /usr/share/gitweb
-               # so we will install a symlink and use their location for 
compat with other
-               # distros
-               dosym ../gitweb /usr/share/${PN}/gitweb
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-                       if [[ -d "${d}" ]] ; then
-                               find "${d}" -name .packlist -delete || die
-                       fi
-               done
-       else
-               rm -rf "${ED}"/usr/share/gitweb
-       fi
-
-       if use perl ; then
-               pushd contrib/credential/netrc &>/dev/null || die
-               dobin git-credential-netrc
-               popd &>/dev/null || die
-       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-r2.initd git-daemon
-               newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-               systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-
-       # Remove disabled linguas
-       # we could remove sources in src_prepare, but install does not
-       # handle missing locale dir well
-       rm_loc() {
-               if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-                       rm -r "${ED}/usr/share/locale/${1}" || die
-               fi
-       }
-       plocale_for_each_disabled_locale rm_loc
-}
-
-pkg_postinst() {
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               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"
-       fi
-
-       optfeature_header "Some scripts require additional dependencies:"
-       optfeature git-quiltimport dev-util/quilt
-       optfeature git-instaweb www-servers/lighttpd www-servers/apache 
www-servers/nginx
-}

diff --git a/dev-vcs/git/git-2.46.1.ebuild b/dev-vcs/git/git-2.46.1.ebuild
deleted file mode 100644
index 6112d2fa6228..000000000000
--- a/dev-vcs/git/git-2.46.1.ebuild
+++ /dev/null
@@ -1,667 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale 
python-single-r1 systemd
-
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-
-if [[ ${PV} == *9999 ]]; then
-       EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git";
-
-       inherit git-r3
-       # 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+=" 
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
-       SRC_URI+=" doc? ( 
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
-
-       if [[ ${PV} != *_rc* ]] ; then
-               KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-       fi
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls 
+pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs 
test"
-
-# Common to both DEPEND and RDEPEND
-DEPEND="
-       dev-libs/openssl:=
-       sys-libs/zlib
-       curl? (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       keyring? (
-               app-crypt/libsecret
-               dev-libs/glib:2
-       )
-       iconv? ( virtual/libiconv )
-       pcre? ( dev-libs/libpcre2:= )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:= )
-"
-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} )
-       selinux? ( sec-policy/selinux-git )
-"
-
-# 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
-       )
-       keyring? ( virtual/pkgconfig )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )
-"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       BDEPEND+=" app-text/asciidoc"
-fi
-
-SITEFILE="50${PN}-gentoo.el"
-
-REQUIRED_USE="
-       cgi? ( perl )
-       cvs? ( perl )
-       mediawiki? ( perl )
-       perforce? ( ${PYTHON_REQUIRED_USE} )
-       subversion? ( perl )
-       webdav? ( curl )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-       # Avoid automagic CVS, bug #350330
-       "${FILESDIR}"/git-2.37.0_rc1-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 perl 'INSTALLDIRS=vendor 
NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
-
-               $(usev elibc_musl NO_REGEX=NeedsStartEnd)
-               $(usev !cvs NO_CVS=YesPlease)
-               $(usev !iconv NO_ICONV=YesPlease)
-               $(usev !nls NO_GETTEXT=YesPlease)
-               $(usev !perforce NO_PYTHON=YesPlease)
-               $(usev !subversion NO_SVN_TESTS=YesPlease)
-               $(usev !tk NO_TCLTK=YesPlease)
-       )
-
-       if use blksha1 ; then
-               myopts+=( BLK_SHA1=YesPlease )
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=( NO_EXPAT=YesPlease )
-       else
-               myopts+=( NO_CURL=YesPlease )
-       fi
-
-       # Broken assumptions because of static build system
-       myopts+=(
-               NO_FINK=YesPlease
-               NO_DARWIN_PORTS=YesPlease
-               INSTALL=install
-               TAR=tar
-               SHELL_PATH="${EPREFIX}/bin/sh"
-               SANE_TOOL_PATH=
-               OLD_ICONV=
-               NO_EXTERNAL_GREP=
-       )
-
-       # Can't define this to null, since the entire makefile depends on it
-       sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
-
-       if use pcre; then
-               myopts+=( USE_LIBPCRE2=YesPlease )
-               extlibs+=( -lpcre2-8 )
-       fi
-
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=(
-                       NEEDS_LIBICONV=YesPlease
-                       HAVE_CLOCK_MONOTONIC=1
-               )
-
-               if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
-                       myopts+=( HAVE_GETDELIM=1 )
-               fi
-       fi
-
-       myopts+=( ASCIIDOC8=YesPlease )
-
-       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 . || die
-       fi
-
-}
-
-src_prepare() {
-       if ! use safe-directory ; then
-               # This patch neuters the "safe directory" detection.
-               # bugs #838271, #838223
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.37.2-unsafe-directory.patch
-               )
-       fi
-
-       default
-
-       if use prefix ; then
-               # bug #757309
-               sed -i \
-                       -e 
's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
-                       -e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
-                       config.mak.uname || die
-       fi
-
-       sed -i \
-               -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-               -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-               -e 
"s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               -e 
"s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-               Makefile || die
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die
-}
-
-git_emake() {
-       # bug #320647: PYTHON_PATH
-       local PYTHON_PATH=""
-       use perforce && PYTHON_PATH="${PYTHON}"
-
-       local mymakeargs=(
-               ${MY_MAKEOPTS}
-
-               prefix="${EPREFIX}"/usr
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-               perllibdir="$(use perl && perl_get_raw_vendorlib)"
-               sysconfdir="${EPREFIX}"/etc
-
-               CC="$(tc-getCC)"
-               CFLAGS="${CFLAGS}"
-               PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-               # TODO: --verbose?
-               GIT_TEST_OPTS="--no-color"
-
-               OPTAR="$(tc-getAR)"
-               OPTCC="$(tc-getCC)"
-               OPTCFLAGS="${CFLAGS}"
-               OPTLDFLAGS="${LDFLAGS}"
-
-               CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config"
-               CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)"
-               CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)"
-
-               PERL_PATH="${EPREFIX}/usr/bin/perl"
-               PERL_MM_OPT=""
-
-               PYTHON_PATH="${PYTHON_PATH}"
-
-               V=1
-               "$@"
-       )
-
-       emake "${mymakeargs[@]}"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       git_emake
-
-       if use perl && use cgi ; then
-               git_emake gitweb
-       fi
-
-       if use perl ; then
-               git_emake -C contrib/credential/netrc
-       fi
-
-       if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
-               git_emake -C contrib/credential/osxkeychain
-       fi
-
-       pushd Documentation &>/dev/null || die
-       if [[ ${PV} == *9999 ]] ; then
-               git_emake man
-               if use doc ; then
-                       git_emake info html
-               fi
-       else
-               if use doc ; then
-                       git_emake info
-               fi
-       fi
-       popd &>/dev/null || die
-
-       if use keyring ; then
-               git_emake -C contrib/credential/libsecret
-       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
-
-       git_emake -C contrib/diff-highlight
-
-       if use mediawiki ; then
-               git_emake -C contrib/mw-to-git
-       fi
-}
-
-src_test() {
-       local disabled=(
-               # We make safe-directory optional
-               t0033-safe-directory.sh
-       )
-
-       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
-               if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
-                       let cvs=${cvs}+1
-               fi
-
-               if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; 
then
-                       let cvs=${cvs}+1
-               fi
-
-               if [[ ${cvs} -lt 3 ]] ; then
-                       einfo "Disabling CVS tests (needs 
dev-vcs/cvs[USE=server])"
-                       disabled+=( ${tests_cvs[@]} )
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled+=( ${tests_perl[@]} )
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled+=( ${test_svn[@]} )
-
-       # Reset all previously disabled tests
-       pushd t &>/dev/null || die
-       local i
-       for i in *.sh.DISABLED ; do
-               [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-       done
-       einfo "Disabled tests:"
-       for i in ${disabled[@]} ; do
-               if [[ -f "${i}" ]] ; then
-                       mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
-               fi
-       done
-
-       # Avoid the test system removing the results because we want them 
ourselves
-       sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
-
-       # Clean old results first, must always run
-       nonfatal git_emake clean
-       popd &>/dev/null || die
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       local rc
-       # t0610-reftable-basics.sh uses $A
-       local -x A=
-       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!"
-
-       popd &>/dev/null || die
-       if use perl ; then
-               emake -C contrib/credential/netrc testverbose
-       fi
-}
-
-src_install() {
-       git_emake DESTDIR="${D}" install
-
-       if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; 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
-
-       #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 DESTDIR="${D}" install
-       if use doc ; then
-               # Do not move git subtree install-man outside USE=doc!
-               git_emake DESTDIR="${D}" install-man install-html
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       popd &>/dev/null || die
-
-       if use mediawiki ; then
-               git_emake -C contrib/mw-to-git DESTDIR="${D}" install
-       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 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 - removed upstream
-       # 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
-               hooks
-               remotes2config.sh
-               rerere-train.sh
-               stats
-               workdir
-       )
-       local i
-       for i in "${contrib_objects[@]}" ; do
-               cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || 
die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               # We used to install in /usr/share/${PN}/gitweb
-               # but upstream installs in /usr/share/gitweb
-               # so we will install a symlink and use their location for 
compat with other
-               # distros
-               dosym ../gitweb /usr/share/${PN}/gitweb
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               for d in "${ED}"/usr/lib{,64}/perl5/ ; do
-                       if [[ -d "${d}" ]] ; then
-                               find "${d}" -name .packlist -delete || die
-                       fi
-               done
-       else
-               rm -rf "${ED}"/usr/share/gitweb
-       fi
-
-       if use perl ; then
-               pushd contrib/credential/netrc &>/dev/null || die
-               dobin git-credential-netrc
-               popd &>/dev/null || die
-       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-r2.initd git-daemon
-               newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-               systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-
-       # Remove disabled linguas
-       # we could remove sources in src_prepare, but install does not
-       # handle missing locale dir well
-       rm_loc() {
-               if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
-                       rm -r "${ED}/usr/share/locale/${1}" || die
-               fi
-       }
-       plocale_for_each_disabled_locale rm_loc
-}
-
-pkg_postinst() {
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               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"
-       fi
-
-       optfeature_header "Some scripts require additional dependencies:"
-       optfeature git-quiltimport dev-util/quilt
-       optfeature git-instaweb www-servers/lighttpd www-servers/apache 
www-servers/nginx
-}


Reply via email to