diff options
| author |   Sam James <sam@gentoo.org> | 2025-01-12 16:54:04 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-01-12 16:54:04 +0000 |
| commit | de507853de11a25486bc95aeeafc2cd86e7e92b4 (patch) | |
| tree | 088834ea92639d438dce6b9c0bef65070b0c94df /dev-vcs | |
| parent | sys-apps/moar: add 1.31.2 (diff) | |
| download | gentoo-de507853de11a25486bc95aeeafc2cd86e7e92b4.tar.gz gentoo-de507853de11a25486bc95aeeafc2cd86e7e92b4.tar.bz2 gentoo-de507853de11a25486bc95aeeafc2cd86e7e92b4.zip | |
dev-vcs/git: restore USE=tk functionality
Closes: https://bugs.gentoo.org/947918
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/git-2.48.0-r1.ebuild (renamed from dev-vcs/git/git-2.48.0.ebuild) | 9 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r1.ebuild | 13 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r2.ebuild | 13 | ||||
| -rw-r--r-- | 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 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 |