commit: de507853de11a25486bc95aeeafc2cd86e7e92b4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 12 16:54:04 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 12 16:54:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de507853
dev-vcs/git: restore USE=tk functionality Closes: https://bugs.gentoo.org/947918 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/git/{git-2.48.0.ebuild => git-2.48.0-r1.ebuild} | 9 ++++++++- dev-vcs/git/git-9999-r1.ebuild | 13 ++++++++++++- dev-vcs/git/git-9999-r2.ebuild | 13 ++++++++++++- dev-vcs/git/git-9999-r3.ebuild | 13 ++++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dev-vcs/git/git-2.48.0.ebuild b/dev-vcs/git/git-2.48.0-r1.ebuild similarity index 98% rename from dev-vcs/git/git-2.48.0.ebuild rename to dev-vcs/git/git-2.48.0-r1.ebuild index 9aea3ab17bb8..2097a69cfdab 100644 --- a/dev-vcs/git/git-2.48.0.ebuild +++ b/dev-vcs/git/git-2.48.0-r1.ebuild @@ -61,7 +61,6 @@ SLOT="0" IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND -# TODO: what purpose does USE=tk serve w/ meson port? DEPEND=" dev-libs/openssl:= sys-libs/zlib @@ -252,6 +251,10 @@ src_compile() { git_emake -C contrib/mw-to-git fi + if use tk ; then + git_emake -C gitk-git + fi + if use doc ; then # Workaround fragments that still use the Makefile and can't # find the bits from Meson's out-of-source build @@ -427,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 6e9f44d049fa..2097a69cfdab 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -61,7 +61,6 @@ SLOT="0" IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND -# TODO: what purpose does USE=tk serve w/ meson port? DEPEND=" dev-libs/openssl:= sys-libs/zlib @@ -148,6 +147,10 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch +) + pkg_setup() { if use subversion && has_version "dev-vcs/subversion[dso]" ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" @@ -248,6 +251,10 @@ src_compile() { git_emake -C contrib/mw-to-git fi + if use tk ; then + git_emake -C gitk-git + fi + if use doc ; then # Workaround fragments that still use the Makefile and can't # find the bits from Meson's out-of-source build @@ -423,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 6e9f44d049fa..2097a69cfdab 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -61,7 +61,6 @@ SLOT="0" IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND -# TODO: what purpose does USE=tk serve w/ meson port? DEPEND=" dev-libs/openssl:= sys-libs/zlib @@ -148,6 +147,10 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch +) + pkg_setup() { if use subversion && has_version "dev-vcs/subversion[dso]" ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" @@ -248,6 +251,10 @@ src_compile() { git_emake -C contrib/mw-to-git fi + if use tk ; then + git_emake -C gitk-git + fi + if use doc ; then # Workaround fragments that still use the Makefile and can't # find the bits from Meson's out-of-source build @@ -423,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 6e9f44d049fa..2097a69cfdab 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -61,7 +61,6 @@ SLOT="0" IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND -# TODO: what purpose does USE=tk serve w/ meson port? DEPEND=" dev-libs/openssl:= sys-libs/zlib @@ -148,6 +147,10 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch +) + pkg_setup() { if use subversion && has_version "dev-vcs/subversion[dso]" ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" @@ -248,6 +251,10 @@ src_compile() { git_emake -C contrib/mw-to-git fi + if use tk ; then + git_emake -C gitk-git + fi + if use doc ; then # Workaround fragments that still use the Makefile and can't # find the bits from Meson's out-of-source build @@ -423,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas
