commit: 29c9ecae53fee8a725497ab2ec07af470972ec2e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 18 20:21:51 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 18 20:22:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c9ecae
dev-vcs/git: sync removals previously in 'seen' into 2.51.0 I didn't realise these had all landed. Also, a bonus one, for 'workdir'. Closes: https://bugs.gentoo.org/961723 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/git/git-2.51.0.ebuild | 20 +------------------- dev-vcs/git/git-9999-r1.ebuild | 25 +------------------------ dev-vcs/git/git-9999-r2.ebuild | 25 +------------------------ dev-vcs/git/git-9999-r3.ebuild | 1 - dev-vcs/git/git-9999.ebuild | 20 +------------------- 5 files changed, 4 insertions(+), 87 deletions(-) diff --git a/dev-vcs/git/git-2.51.0.ebuild b/dev-vcs/git/git-2.51.0.ebuild index f16eea1e49fa..9288f91c0ca4 100644 --- a/dev-vcs/git/git-2.51.0.ebuild +++ b/dev-vcs/git/git-2.51.0.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 @@ -386,14 +376,10 @@ 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 @@ -435,10 +421,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* diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index c890d821700f..9288f91c0ca4 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.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,25 +376,18 @@ 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 ) local i for i in "${contrib_objects[@]}" ; do @@ -440,10 +421,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* diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index c890d821700f..9288f91c0ca4 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.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,25 +376,18 @@ 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 ) local i for i in "${contrib_objects[@]}" ; do @@ -440,10 +421,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* diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index b84ecdb0dfa2..9288f91c0ca4 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -388,7 +388,6 @@ src_install() { fast-import rerere-train.sh stats - workdir ) local i for i in "${contrib_objects[@]}" ; do diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index f16eea1e49fa..9288f91c0ca4 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.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 @@ -386,14 +376,10 @@ 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 @@ -435,10 +421,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*
