From d9d8cf759bfbb7727bcb4fb5daa9ad6c21a54a5e Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 15 Apr 2024 20:32:56 +0300 Subject: www-apps/cgit: enable py3.12 Enable python 3.12 Enable lua 5.3, 5.4 Fix VariableScope Closes: https://bugs.gentoo.org/929871 Closes: https://bugs.gentoo.org/836118 Signed-off-by: Viorel Munteanu --- www-apps/cgit/cgit-1.2.3-r202.ebuild | 115 ----------------------------------- www-apps/cgit/cgit-1.2.3-r203.ebuild | 114 ++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 115 deletions(-) delete mode 100644 www-apps/cgit/cgit-1.2.3-r202.ebuild create mode 100644 www-apps/cgit/cgit-1.2.3-r203.ebuild (limited to 'www-apps/cgit') diff --git a/www-apps/cgit/cgit-1.2.3-r202.ebuild b/www-apps/cgit/cgit-1.2.3-r202.ebuild deleted file mode 100644 index dc581d8b548c..000000000000 --- a/www-apps/cgit/cgit-1.2.3-r202.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..2} luajit ) - -PYTHON_COMPAT=( python3_{9..11} ) - -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.25.1" - -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" - -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() { - rmdir git || die - mv "${WORKDIR}"/git-"${GIT_V}" git || die - - 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" - echo "DESTDIR = ${D}" >> cgit.conf || die "echo DESTDIR 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}" 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." -} diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-1.2.3-r203.ebuild new file mode 100644 index 000000000000..8499426633d8 --- /dev/null +++ b/www-apps/cgit/cgit-1.2.3-r203.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 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..12} ) + +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.25.1" + +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" + +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() { + rmdir git || die + mv "${WORKDIR}"/git-"${GIT_V}" git || die + + 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." +} -- cgit v1.2.3-65-gdbad