From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1708867-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A2CDF15813A
for <garchives@archives.gentoo.org>; Sun, 12 Jan 2025 16:55:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E243FE0827;
Sun, 12 Jan 2025 16:55:24 +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 pigeon.gentoo.org (Postfix) with ESMTPS id C8C0AE0827
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jan 2025 16:55:24 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0016B33BEB9
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jan 2025 16:55:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8843A18FC
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jan 2025 16:55:22 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1736700844.de507853de11a25486bc95aeeafc2cd86e7e92b4.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-2.48.0-r1.ebuild dev-vcs/git/git-2.48.0.ebuild dev-vcs/git/git-9999-r1.ebuild dev-vcs/git/git-9999-r2.ebuild 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: de507853de11a25486bc95aeeafc2cd86e7e92b4
X-VCS-Branch: master
Date: Sun, 12 Jan 2025 16:55:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 602859b7-9642-4401-8b2e-db89ebcdddcb
X-Archives-Hash: aa3ca6f824f687b7bb058e40cc3020e3
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