gentoo auto-resync : 30:07:2022 - 03:08:54

3 files changed, 40 insertions, 26 deletions

diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index b7a180494ecd..53d8e3660016 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -3,6 +3,6 @@ AUX postinstall-en.txt 1847 BLAKE2B 20dab86a97dc42b4b6c16db6d72a3bd74a2ad2d0948a
 DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e4d6dc8c737daa565d01ba6840933c0bdc53d4eb683b2f44e2fae885ddd020cfb2de38141a870a6eae2380 SHA512 58f9bb644b07be49dc51f3ef30a3d0e53699cede3c06b1d6920f3874fe846c83dd2589632aa84357b70ea2d60272448409aa1b892f405d14dd6745f5559b4504
 DIST git-2.25.1.tar.xz 5875548 BLAKE2B 582da3d4ac996d7b9ce6cf505661496ab1a2cd061f058745350498121956b33d79739b567fb5fea0b4e298303261256034aa0b8da0b842feab04ae67a7d5b142 SHA512 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
 EBUILD cgit-1.2.3-r100.ebuild 2383 BLAKE2B 900ad85af0923fb039dd32531370860a52717bb8ba77822e028ac8b664cd0673964425a7d086ad2eba28d873604147e6f0aa143ab729ce36ac5d8ce2de4f7590 SHA512 df5bdbdb0e7c27de5414685f836dab07df25c7723d57e827c874f482ce09ae0b9feb47cbb188eace40afdaaffec52730853df42a00bc3a5753904d63fbfe02da
-EBUILD cgit-1.2.3-r200.ebuild 2787 BLAKE2B dc80ff3dba679525445aced56eb0d50923dfe911c971a15ed36f1203eb3642663458c049fc66e8888316b2f6a753efc5f3ce96c752fb23b71edfcf1dc5944b4a SHA512 56657321a342d907733210fbec433682e41e67a337b7d21e8ec5f755a37c94c8fe7d726c81a0388f04c85b886c31cae29abf4970b410ba090c831c17d38430bc
-EBUILD cgit-9999.ebuild 2230 BLAKE2B 6afbc270e5f1eb4820acb92483e9f163042f0509bc3b150715cb6e7a728705b505eaa780d3c48c27022b203c869e439c77d4870d97c5dd131c7f78d88f954301 SHA512 3215784b5e1f576889d68d5f337bc45729dc23804e2c9856fc2ceb274dc02d6ad1b79eb4212b5e4c374eef148ea54683bbaea3ea04139815c797a06330195270
+EBUILD cgit-1.2.3-r200.ebuild 2788 BLAKE2B 4d8079bd3b492b05b0f8af6ccd462da17c262d5138626a7a4a11873587a179928b440be658c7e6620caddf6388e34cf2b26023b014e23e5176ef983d700cb4d7 SHA512 d5cd786ab3292f7605ef27993f9db40c19c3d1a89fef245314615c46f07f4dd9574eb8e410ba1133c75174b7c5a53c0ab8a25d934f168f097159b01143d47574
+EBUILD cgit-1.2.3-r201.ebuild 2791 BLAKE2B 47e23d820037599cf0c50c88ac18a9500e8db169ccff466d76f375768d1a425cd2ab20aefa7f6214fa59b0915ed2bc1c02e18b9b956d7126aa69b187f00c9e6c SHA512 f8c663e1cd97c20339c3c2bca59df19eb7c648d6cbc982eb737896abbf6870f0954b3b0c64eef1d87bb0bcaf73a0aaa8558ea7c48da01dc107d193c71e3faab9
 MISC metadata.xml 686 BLAKE2B e2a06875b848f1ae6a275fc8ef65a15cea8d93b9858d985bd96acc7e20bcf3e4fa9d402359fff08dc0bc98c28ddc385b605c0f10e30a309e0cedef9a338f87c3 SHA512 56235759deb83b598fb42b87dcc45e3c1d1730a06acfa791e2113659f9253b93fca5ab431326d4b2b3ecdefa94734e5fba2d1c540934680ece86b01eb77341f4
diff --git a/www-apps/cgit/cgit-1.2.3-r200.ebuild b/www-apps/cgit/cgit-1.2.3-r200.ebuild
index 3029f760db0f..2794730845ec 100644
--- a/www-apps/cgit/cgit-1.2.3-r200.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r200.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..2} luajit )
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 WEBAPP_MANUAL_SLOT="yes"
 
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-1.2.3-r201.ebuild
index 0efa5da905aa..f4b0c75060bc 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-1.2.3-r201.ebuild
@@ -1,62 +1,75 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} luajit )
+
+PYTHON_COMPAT=( python3_{8..11} )
+
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit git-r3 lua-single toolchain-funcs webapp
+inherit lua-single python-single-r1 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=""
-EGIT_REPO_URI="https://git.zx2c4.com/cgit"
+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=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc +highlight +lua test"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) ${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	${PYTHON_DEPS}
 	acct-group/cgit
 	acct-user/cgit
-	dev-vcs/git
-	highlight? ( || ( dev-python/pygments app-text/highlight ) )
 	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}
-	doc? ( app-text/docbook-xsl-stylesheets
-		>=app-text/asciidoc-8.5.1 )
+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_prepare() {
-	echo "prefix = ${EPREFIX}/usr" >> cgit.conf
-	echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf
-	echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf
-	echo "CGIT_DATA_PATH = ${MY_HTDOCSDIR}" >> cgit.conf
-	echo "CACHE_ROOT = ${CGIT_CACHEDIR}" >> cgit.conf
-	echo "DESTDIR = ${D}" >> cgit.conf
+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
+		echo "LUA_PKGCONFIG = ${ELUA}" >> cgit.conf || die "echo LUA_PKGCONFIG failed"
 	else
-		echo "NO_LUA = 1" >> cgit.conf
+		echo "NO_LUA = 1" >> cgit.conf || die "echo NO_LUA failed"
 	fi
-
-	eapply_user
 }
 
 src_compile() {
@@ -81,6 +94,7 @@ src_install() {
 	keepdir "${CGIT_CACHEDIR}"
 	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
 	fperms 700 "${CGIT_CACHEDIR}"
+	python_fix_shebang .
 }
 
 src_test() {