From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC56C158064 for ; Wed, 8 May 2024 03:15:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02CA0E29BD; Wed, 8 May 2024 03:15:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 AD07DE29BA for ; Wed, 8 May 2024 03:15:18 +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 A2A2E335CB9 for ; Wed, 8 May 2024 03:15:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE69511CA for ; Wed, 8 May 2024 03:15:15 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1715138113.328c2af92299ca33e642543ca64884402f8bcc56.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/cgit/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/cgit/cgit-1.2.3-r203.ebuild www-apps/cgit/cgit-9999-r1.ebuild www-apps/cgit/cgit-9999.ebuild X-VCS-Directories: www-apps/cgit/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 328c2af92299ca33e642543ca64884402f8bcc56 X-VCS-Branch: master Date: Wed, 8 May 2024 03:15:15 +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: 55683cf1-eb2d-4100-822a-479f07cf2b8d X-Archives-Hash: e4c3f279069ea2f274ad779207762a5a commit: 328c2af92299ca33e642543ca64884402f8bcc56 Author: Robin H. Johnson gentoo org> AuthorDate: Wed May 8 03:11:46 2024 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed May 8 03:15:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328c2af9 www-apps/cgit: re-add 9999 series to support much newer Git Upstream has not made an official release since 2020, but master is more up to date, and trusted contributers have a branch with the latest Git support. This is important because Git v2.45.0 adds support for Bloom Filters in commit graphs, providing 10x performance in web displays. Reference: https://lore.kernel.org/git/robbat2-20240507T053331-859497691Z orbis-terrarum.net/T/#t Signed-off-by: Robin H. Johnson gentoo.org> www-apps/cgit/cgit-1.2.3-r203.ebuild | 6 ++++-- ...{cgit-1.2.3-r203.ebuild => cgit-9999-r1.ebuild} | 25 +++++++++++++++------- .../{cgit-1.2.3-r203.ebuild => cgit-9999.ebuild} | 22 ++++++++++++------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-1.2.3-r203.ebuild index 8499426633d8..805171058e89 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit-1.2.3-r203.ebuild @@ -56,8 +56,10 @@ pkg_setup() { } src_configure() { - rmdir git || die - mv "${WORKDIR}"/git-"${GIT_V}" git || die + if ! [[ ${PV} =~ 9999* ]]; then + rmdir git || die + mv "${WORKDIR}"/git-"${GIT_V}" git || die + fi echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-9999-r1.ebuild similarity index 85% copy from www-apps/cgit/cgit-1.2.3-r203.ebuild copy to www-apps/cgit/cgit-9999-r1.ebuild index 8499426633d8..8b6fded5c051 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit-9999-r1.ebuild @@ -9,20 +9,28 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" -GIT_V="2.25.1" +GIT_V="2.45.0" DESCRIPTION="a fast web-interface for git repositories" HOMEPAGE="https://git.zx2c4.com/cgit/about" -SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz - https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz" +if [[ ${PV} =~ 9999* ]]; then + SRC_URI="" + EGIT_REPO_URI="https://git.zx2c4.com/cgit" + # v2.45.0 updates in this branch series + EGIT_COMMIT=dbadd856ba0537110338cfe58256b152d01388c0 + EGIT_BRANCH=ch/for-jason +else + SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz + https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" +KEYWORDS="" IUSE="doc +highlight +lua test" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -56,9 +64,10 @@ pkg_setup() { } src_configure() { - rmdir git || die - mv "${WORKDIR}"/git-"${GIT_V}" git || die - + if ! [[ ${PV} =~ 9999* ]]; then + rmdir git || die + mv "${WORKDIR}"/git-"${GIT_V}" git || die + fi echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-9999.ebuild similarity index 88% copy from www-apps/cgit/cgit-1.2.3-r203.ebuild copy to www-apps/cgit/cgit-9999.ebuild index 8499426633d8..1fab1a1e34a9 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit-9999.ebuild @@ -9,20 +9,25 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" -GIT_V="2.25.1" +GIT_V="2.39.0" DESCRIPTION="a fast web-interface for git repositories" HOMEPAGE="https://git.zx2c4.com/cgit/about" -SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz - https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz" +if [[ ${PV} =~ 9999* ]]; then + SRC_URI="" + EGIT_REPO_URI="https://git.zx2c4.com/cgit" +else + SRC_URI="https://www.kernel.org/pub/software/scm/git/git-${GIT_V}.tar.xz + https://git.zx2c4.com/cgit/snapshot/${P}.tar.xz" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" +KEYWORDS="" IUSE="doc +highlight +lua test" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -56,9 +61,10 @@ pkg_setup() { } src_configure() { - rmdir git || die - mv "${WORKDIR}"/git-"${GIT_V}" git || die - + if ! [[ ${PV} =~ 9999* ]]; then + rmdir git || die + mv "${WORKDIR}"/git-"${GIT_V}" git || die + fi echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed"