gentoo auto-resync : 25:04:2023 - 06:11:52

7 files changed, 118 insertions, 206 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f10a6bd95398..61a368df7c53 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index e5475a8c6a8e..9f3b78f22fd4 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -4,4 +4,5 @@ DIST cgit-1.2.3.tar.xz 90632 BLAKE2B 594a9b2ae0b449e0ef090f428f955cc02833f5f5b1e
 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-r201.ebuild 2795 BLAKE2B dd4a3d42ec50c8a28a3449f0942e619180f59f61640f99b7d995d72330d3cd33fd8d45e7176d6a9783c2c63d5a2bddab4b2001cb6f3e03c6977061ad5afe87f7 SHA512 5ab9b5beb7225f36b1948630891f51ed8d39dfa01a2db277ffde4abdda90a2020be6b55f697d79c8b4deae4f1a8abf90aa080dd354340827e7243b93c0d7750d
+EBUILD cgit-1.2.3-r202.ebuild 3156 BLAKE2B 34c384d9e9c0cf01bd986d72d779e3b9fbaf208c8312ea40a86ff247bc9c9f898cd9dafb94034b2b3f1f2ed114af7510e9f0fecdbfcc4fa88f41c1c08d7f93d0 SHA512 62337fc1372606f001d087c078e9bd4caef858dbff5a4597430bd17bca66a0dcb7ee23376f19953ce07caf6ef4fc05a3e0abcdd9092b6cae4895ab5338328a8f
 MISC metadata.xml 582 BLAKE2B 581c8c3d61029e5857f51951bff4df8b71f0a01964a5bb822c06969d219b852f74bc56ced4f7434356cdf67b4c6dba6cb3ad1732875a7a1e62b36880c83d94c7 SHA512 bbc7e8dbd323908b9b03597a884a20a7d6d820b757fa912951bdc700ef2072880ff2412c5dcb724420e7d288e772e9f88aded81b981c47b72be4e9fa8c23cd9a
diff --git a/www-apps/cgit/cgit-1.2.3-r202.ebuild b/www-apps/cgit/cgit-1.2.3-r202.ebuild
new file mode 100644
index 000000000000..dc581d8b548c
--- /dev/null
+++ b/www-apps/cgit/cgit-1.2.3-r202.ebuild
@@ -0,0 +1,115 @@
+# 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/miniflux/Manifest b/www-apps/miniflux/Manifest
index 09463eb10759..f73f5838baad 100644
--- a/www-apps/miniflux/Manifest
+++ b/www-apps/miniflux/Manifest
@@ -3,13 +3,7 @@ AUX miniflux.conf 809 BLAKE2B 4465c338fa13d3465731fcb98616d08d4fbcfdad6e10eb3f08
 AUX miniflux.confd 171 BLAKE2B 2d38a12678c7873ac31473a2160d1416d168e384c519fe48feebf4ea3d4e6c734ff198e652df8b0af7da5c3543eff5321a02b6991de131d746b89e3b5fb7db08 SHA512 13b43595e7a5bca01b9fbff9fc6979d408b32109bafc23cfae29a9470b5333a244ee1f1bc94ba436d93e2d2c55640690202ac1201884f9ea5499fa0161af059a
 AUX miniflux.initd-r1 611 BLAKE2B 74d84f8f24a672c2fd4adedf6dc8629307638bed4a04e7c2948beabb0a7f1710a78f0054b23cc906caa08d27310473d5f45766ef9a6d04dfdef4ba7c1199a682 SHA512 7dbc37b56b8d099d3a95c5707c1666d177c03dc46d42dcc3827b771fc9cee34d489c7f240049a14b6784a4434183c70e0ba9679e982608121a8e4098e1a45a9e
 AUX miniflux.service 463 BLAKE2B e6f1a3717e985f3ddae4224472b753f293a73ab015acbe80ddf20d2d9e505aa9fd47e2fca2c86749067288a1f10787e16179a41e5c30d3f37f53e83f798719b8 SHA512 c38fe3f19162be02a44a353281690d40e90cb8ac8126ea4f9aab1218e128da0be3d1152cf260fdfd19ecfed2ea4396ae4a6c645088a1b212b58a3cba8387ce60
-DIST miniflux-2.0.41-deps.tar.xz 38330216 BLAKE2B 8be2a3b08de3dc56d384080268bb42c9a2cbb3304e387794e35530722ef8a0d13b765051c5e75577f6305953761124042844e5d13261d9b7ddcaf2a980196fd8 SHA512 de7dc72d18d75df8dd027eeb4c3517e02f9bbf8e1f321ea2661629514ba7671cb1d9f4c565d241d09d9e01ecfa7b3395080b47054ba4200f6cb4cda738430f79
-DIST miniflux-2.0.41.tar.gz 575768 BLAKE2B 8ba7207da6e627def71830c182ee7c95ed979873dae012dea4f76ac5ac10e036c0ef7ba1290af871b294f813fc8ddd978f169179b93e6b938d319b4b4102e41c SHA512 eb1be19d04f29e12a0aef3eca2f8494d46742bea5679b09dfcd43d10e4dc00bc4408fa0e52c71a744afcfb5fb22cf8f7fe2d352ab26c3a16fb2ffbdd0f4f9fb4
-DIST miniflux-2.0.42-deps.tar.xz 38701596 BLAKE2B e73cdadd9c3b507d2bf3c361317d7cae5913865e5548d85e01746e49c5f17e87b1a1e688aee651711f6cd586ffe071b203f65a625842e7139f83d50c595c90f3 SHA512 a6299ccdf1192097150e366cf1bb9a5374ed980822d1ff124ae85defa7c017cb66e7c9f2d4a8ebcf28ac3c72ad36db133f85936471392450446457520346cb22
-DIST miniflux-2.0.42.tar.gz 577188 BLAKE2B 48f361fecc0d6e540c3987362bce6704d5eb83ad8cc4886a700b9eedf60e5b0b6f45494406ecf54675edd7778c1c4ed660bc5eb54b118eb05c19a006130cdd2b SHA512 8e3cee177e737d6777b37c632239e7100beb961e82842735b495eda1d39104c642047bd12806c110ff0d9cd76f1bb3475740063a34211a75d94fafd0e9cc9926
 DIST miniflux-2.0.43-deps.tar.xz 38360844 BLAKE2B 4b3a51acf0f319a99ab5b8a03dd32cae54d73ad7c35de6659cc77b1e227551f444280f670eddb4f7580685dd44bce7fedc0af31f5a5dafbbf0f7bc4c17077910 SHA512 e41a9a112ab0dfe0b7cd3670ceecf88aed77b1a908413af09e56e48f0570a34a0f0055e13fc5244b2052db4e79b28f6ce27564f29273d0a333fbbce18fd6d7ec
 DIST miniflux-2.0.43.tar.gz 586624 BLAKE2B 33245f2da209c7cb7a647b3bc2f571e9596467c28779038384e6501e8c966b95f087cd0da4feb78cec254b1efbcd3a8dcdfaeb089fc440d1bab1c5ca086db9b6 SHA512 fd09a2ecb00173a6b2f0f7438ff677af5b5c1b616f1a44b138478452a78e0a925f802eeda0e8072211ed2dbbc59eeeee7079b13fbb086663ceebd3d2e06dceca
-EBUILD miniflux-2.0.41-r1.ebuild 2599 BLAKE2B a27a012bcb041358e59b8405f62f256db3a0c761673e734b4a91710339ad6571c8dc54d917dd650943f6c0050e14a30d4ad276be722e56a5ff8662ab1c7353fe SHA512 77e489dae5f18e287a6065369de827e693a550686e98df5800334a6b2bbeab3d84f9a6871d187cf0caa9d26262444697755ea2f849e4510df129257d247a1605
-EBUILD miniflux-2.0.42-r1.ebuild 2599 BLAKE2B a27a012bcb041358e59b8405f62f256db3a0c761673e734b4a91710339ad6571c8dc54d917dd650943f6c0050e14a30d4ad276be722e56a5ff8662ab1c7353fe SHA512 77e489dae5f18e287a6065369de827e693a550686e98df5800334a6b2bbeab3d84f9a6871d187cf0caa9d26262444697755ea2f849e4510df129257d247a1605
-EBUILD miniflux-2.0.43-r1.ebuild 2601 BLAKE2B 0c5bd831e378fb16e31a7e22893cea9264d1ce7068d6ae229481476e1e52dd2edc880d224fb8f6dceb15a775d3cac9fd02ab8816adbf0c9ec7d65a725437827a SHA512 c3a9d0ab4ad6263c9da3c086edf9b2c234730bb39920197a581fc8e708f1588323c9b3e50f1dd8fac5c01b142f655199536bf464da0b121db7fbe4534be77941
+EBUILD miniflux-2.0.43-r1.ebuild 2599 BLAKE2B a27a012bcb041358e59b8405f62f256db3a0c761673e734b4a91710339ad6571c8dc54d917dd650943f6c0050e14a30d4ad276be722e56a5ff8662ab1c7353fe SHA512 77e489dae5f18e287a6065369de827e693a550686e98df5800334a6b2bbeab3d84f9a6871d187cf0caa9d26262444697755ea2f849e4510df129257d247a1605
 MISC metadata.xml 329 BLAKE2B 50e914926db603f0d6e89f009847cab4ed7e771c33779da94e71d78dd4322457a19c8b1f4d9a27670fcde68ffd4480582c8def09973b84cc69bcf670fabfae19 SHA512 c00ceaf0e7d32f4395cdba01ce2af24ce7ab2d50baa250abe035f78d905b864fc1e0947226fce655adb5b0355030b30adabd6c64d306b83a5b8f6aae70dcdbcf
diff --git a/www-apps/miniflux/miniflux-2.0.41-r1.ebuild b/www-apps/miniflux/miniflux-2.0.41-r1.ebuild
deleted file mode 100644
index b5c188d0c586..000000000000
--- a/www-apps/miniflux/miniflux-2.0.41-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Minimalist and opinionated feed reader"
-HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
-SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 ~riscv"
-
-RESTRICT="test" # requires network access
-
-DEPEND="acct-user/miniflux"
-RDEPEND="${DEPEND}
-	>=dev-db/postgresql-9.5
-"
-
-S="${WORKDIR}/v2-${PV}"
-
-src_compile() {
-	ego build -ldflags="-s -w -X 'miniflux.app/version.Version=${PV}' " -o miniflux main.go
-}
-
-src_install() {
-	dobin miniflux
-
-	insinto /etc
-	doins "${FILESDIR}/${PN}.conf"
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	fowners miniflux:root /etc/${PN}.conf
-	fperms o-rwx /etc/${PN}.conf
-
-	local DOCS=(
-		ChangeLog
-		README.md
-		"${FILESDIR}"/README.gentoo
-	)
-
-	# Makefile has no install target, so call einstalldocs directly
-	einstalldocs
-
-	doman "${PN}".1
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		echo
-		elog "Before using miniflux, you must first create and initialize the database"
-		elog "and enable the hstore extension for it."
-		elog ""
-		elog "Afterwards, create your first admin user by running:"
-		elog "  miniflux -create-admin"
-	else
-		# This is an existing installation
-
-		echo
-		elog "If you are upgrading from a previous version, schema migrations must be performed."
-		elog "To perform the migrations, stop the daemon, backup your database, and run:"
-		elog "  emerge --config =${PF}"
-	fi
-
-	echo
-	elog "Please read"
-	elog ""
-	elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-	elog ""
-	elog "for more information."
-}
-
-pkg_config() {
-	# To be safe, avoid doing migrations if miniflux is running
-	if pgrep miniflux; then
-		die "miniflux appears to be running, refusing to continue."
-	fi
-
-	# Extract the database URL variable instead of just sourcing the config file
-	# because miniflux itself may interpret quotes as part of the URL
-	local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' "${EROOT}/etc/${PN}.conf")"
-	[[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
-
-	DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate \
-		|| die "miniflux -migrate failed. Please check the above output for errors."
-
-	echo
-	elog "Database migrations complete."
-}
diff --git a/www-apps/miniflux/miniflux-2.0.42-r1.ebuild b/www-apps/miniflux/miniflux-2.0.42-r1.ebuild
deleted file mode 100644
index b5c188d0c586..000000000000
--- a/www-apps/miniflux/miniflux-2.0.42-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="Minimalist and opinionated feed reader"
-HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
-SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 ~riscv"
-
-RESTRICT="test" # requires network access
-
-DEPEND="acct-user/miniflux"
-RDEPEND="${DEPEND}
-	>=dev-db/postgresql-9.5
-"
-
-S="${WORKDIR}/v2-${PV}"
-
-src_compile() {
-	ego build -ldflags="-s -w -X 'miniflux.app/version.Version=${PV}' " -o miniflux main.go
-}
-
-src_install() {
-	dobin miniflux
-
-	insinto /etc
-	doins "${FILESDIR}/${PN}.conf"
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	fowners miniflux:root /etc/${PN}.conf
-	fperms o-rwx /etc/${PN}.conf
-
-	local DOCS=(
-		ChangeLog
-		README.md
-		"${FILESDIR}"/README.gentoo
-	)
-
-	# Makefile has no install target, so call einstalldocs directly
-	einstalldocs
-
-	doman "${PN}".1
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		echo
-		elog "Before using miniflux, you must first create and initialize the database"
-		elog "and enable the hstore extension for it."
-		elog ""
-		elog "Afterwards, create your first admin user by running:"
-		elog "  miniflux -create-admin"
-	else
-		# This is an existing installation
-
-		echo
-		elog "If you are upgrading from a previous version, schema migrations must be performed."
-		elog "To perform the migrations, stop the daemon, backup your database, and run:"
-		elog "  emerge --config =${PF}"
-	fi
-
-	echo
-	elog "Please read"
-	elog ""
-	elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-	elog ""
-	elog "for more information."
-}
-
-pkg_config() {
-	# To be safe, avoid doing migrations if miniflux is running
-	if pgrep miniflux; then
-		die "miniflux appears to be running, refusing to continue."
-	fi
-
-	# Extract the database URL variable instead of just sourcing the config file
-	# because miniflux itself may interpret quotes as part of the URL
-	local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' "${EROOT}/etc/${PN}.conf")"
-	[[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
-
-	DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate \
-		|| die "miniflux -migrate failed. Please check the above output for errors."
-
-	echo
-	elog "Database migrations complete."
-}
diff --git a/www-apps/miniflux/miniflux-2.0.43-r1.ebuild b/www-apps/miniflux/miniflux-2.0.43-r1.ebuild
index a3c0ff7ef4e8..b5c188d0c586 100644
--- a/www-apps/miniflux/miniflux-2.0.43-r1.ebuild
+++ b/www-apps/miniflux/miniflux-2.0.43-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ppc64 ~riscv"
 
 RESTRICT="test" # requires network access