commit: 6b89cd8e5d9d999510537488f41d676b6967d738 Author: Zurab Kvachadze <zurabid2016 <AT> gmail <DOT> com> AuthorDate: Tue Mar 18 01:18:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 18 13:57:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b89cd8e
www-apps/cgit: add 1.2.3_p20240802 There has not been any release of cgit since 2020. This commit adds the newest version of cgit which contains fixes for two bugs. The bug 919779 is a compilation failure with GCC 15 in bundled Git. This bug is probably fixed, as the bundled Git's version is bumped from 2.25 to 2.46. Bug: https://bugs.gentoo.org/919779 Closes: https://bugs.gentoo.org/919779 Closes: https://bugs.gentoo.org/861209 Signed-off-by: Zurab Kvachadze <zurabid2016 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> www-apps/cgit/Manifest | 2 + www-apps/cgit/cgit-1.2.3_p20240802.ebuild | 121 ++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest index bb3450fe0966..32a6b08d69af 100644 --- a/www-apps/cgit/Manifest +++ b/www-apps/cgit/Manifest @@ -1,2 +1,4 @@ +DIST cgit-09d24d7cd0b7e85633f2f43808b12871bb209d69.tar.xz 91940 BLAKE2B edba9ce9fe67f45a569cbefd8803281505b74885094d8c955e9b422dbdc1d253392ecb55dec5330da8096136a10fc833fe9fd7faf9aea1cc8a0e89473f3378dd SHA512 1847f06c9e695ca61967730fa8aef3ab68fb538d1b5d15c3f97afbd878d9ee993cf8d1400d48ec369a94b20e1a76368ee229b40d64ebfbc833f5e75d2b513a62 DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380 SHA512 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 +DIST git-2.46.0.tar.xz 7577180 BLAKE2B 11fd88faea8cca0982945320c0a1ff949d2abedca9ffde34d40a739349e2a7ae6ceb51a23e8c21f7985cd494d9d17abcec4769e766c3c5188162b906eb1b96bc SHA512 3afae7a094da070c627f68ceb54c2345e3a49e04e455197527b732eb220e8c3249f5d09655a59bf4280dd0c0a3e305abc1380693e0a7fb0b8138b741c4708184 diff --git a/www-apps/cgit/cgit-1.2.3_p20240802.ebuild b/www-apps/cgit/cgit-1.2.3_p20240802.ebuild new file mode 100644 index 000000000000..08904a7083db --- /dev/null +++ b/www-apps/cgit/cgit-1.2.3_p20240802.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +PYTHON_COMPAT=( python3_{10..13} ) + +WEBAPP_MANUAL_SLOT="yes" + +inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp + +[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" + +GIT_V="2.46.0" +MY_COMMIT="09d24d7cd0b7e85633f2f43808b12871bb209d69" + +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/cgit-${MY_COMMIT}.tar.xz"; + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" + +IUSE="doc +highlight +lua test" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + acct-group/cgit + acct-user/cgit + dev-libs/openssl:0= + dev-vcs/git + highlight? ( + $(python_gen_cond_dep 'dev-python/pygments[${PYTHON_USEDEP}]' ) + ) + lua? ( ${LUA_DEPS} ) + sys-libs/zlib + virtual/httpd-cgi +" +# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/docbook-xsl-stylesheets + >=app-text/asciidoc-8.5.1 + ) +" + +pkg_setup() { + python_setup + webapp_pkg_setup + use lua && lua-single_pkg_setup +} + +src_configure() { + 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" + echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf || die "echo CGIT_DATA_PATH failed" + echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf || die "echo CACHE_ROOT failed" + if use lua; then + echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo LUA_PKGCONFIG failed" + else + echo "NO_LUA = 1" >> cgit.conf || die "echo NO_LUA failed" + fi +} + +src_compile() { + emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + use doc && emake V=1 doc-man +} + +src_install() { + webapp_src_preinst + + emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" DESTDIR="${D}" install + + insinto /etc + doins "${FILESDIR}"/cgitrc + + dodoc README + use doc && doman cgitrc.5 + + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_src_install + + cat > cgit.conf <<-EOT || die + d ${CGIT_CACHEDIR} 0700 cgit cgit - + EOT + dotmpfiles cgit.conf + + python_fix_shebang . +} + +src_test() { + emake V=1 AR="$(tc-getAR)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" test +} + +pkg_postinst() { + webapp_pkg_postinst + tmpfiles_process cgit.conf + ewarn "The cgit cache is enabled using the cache-size setting in cgitrc." + ewarn "If enabling the cache and running cgit using the web server's user" + ewarn "you should copy ${EROOT}/usr/lib/tmpfiles.d/cgit.conf" + ewarn "to ${EROOT}/etc/tmpfiles.d/ and edit, changing the ownership fields." + ewarn "If you use the cache-root setting in cgitrc to specify a cache directory" + ewarn "other than ${CGIT_CACHEDIR} edit the path in cgit.conf." +}
