commit: f88c44053ae8d8cf8183fb1bc202bce43232a14f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 8 01:35:56 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 8 01:35:56 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f88c4405
dev-vcs/git: handle various contrib/ removals in 'seen'
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/git/git-9999-r3.ebuild | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 13162bb7c1af..d58c9a5df44c 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre
perforce +perl +safe-directory selinux subversion test tk +webdav xinetd"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl +safe-directory selinux subversion test tk +webdav xinetd"
# Common to both DEPEND and RDEPEND
DEPEND="
@@ -94,11 +94,6 @@ RDEPEND="
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
@@ -139,7 +134,6 @@ SITEFILE="50${PN}-gentoo.el"
REQUIRED_USE="
cgi? ( perl )
cvs? ( perl )
- mediawiki? ( perl )
perforce? ( ${PYTHON_REQUIRED_USE} )
subversion? ( perl )
webdav? ( curl )
@@ -310,10 +304,6 @@ git_emake() {
src_compile() {
meson_src_compile
- if use mediawiki ; then
- git_emake -C contrib/mw-to-git
- fi
-
if use tk ; then
local tkdir
for tkdir in git-gui gitk-git ; do
@@ -372,8 +362,6 @@ src_install() {
#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
# diff-highlight
dobin contrib/diff-highlight/diff-highlight
@@ -388,22 +376,16 @@ src_install() {
# 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 - built seperately
# svnimport - use git-svn
# thunderbird-patch-inline - fixes thunderbird
local contrib_objects=(
buildsystems
fast-import
- hooks
- remotes2config.sh
rerere-train.sh
stats
workdir
@@ -440,10 +422,6 @@ src_install() {
mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" ||
die
fi
- if use mediawiki ; then
- git_emake -C contrib/mw-to-git DESTDIR="${D}" install
- fi
-
if ! use subversion ; then
rm -f "${ED}"/usr/libexec/git-core/git-svn \
"${ED}"/usr/share/man/man1/git-svn.1*
