From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2125515807A for ; Sun, 08 Jun 2025 01:40:12 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0F3A13430D2 for ; Sun, 08 Jun 2025 01:40:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0914B1102BE; Sun, 08 Jun 2025 01:40:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id F21101102BE for ; Sun, 08 Jun 2025 01:40:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD8A23430D2 for ; Sun, 08 Jun 2025 01:40:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 262C827BD for ; Sun, 08 Jun 2025 01:40:09 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1749346556.f88c44053ae8d8cf8183fb1bc202bce43232a14f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/git-9999-r3.ebuild X-VCS-Directories: dev-vcs/git/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f88c44053ae8d8cf8183fb1bc202bce43232a14f X-VCS-Branch: master Date: Sun, 08 Jun 2025 01:40:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f06cac64-4576-4d3b-bb7c-6aa3533d84db X-Archives-Hash: 76dca90cc985454a014ef4dcd83afc3a commit: f88c44053ae8d8cf8183fb1bc202bce43232a14f Author: Sam James gentoo org> AuthorDate: Sun Jun 8 01:35:56 2025 +0000 Commit: Sam James gentoo 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 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*