Merge updates from master

2026-04-07 03:10:15 -04:00 · 2026-03-16 13:46:13 +00:00
parent b9219249df 0b86fdc7ca
commit 9a8a5c1c4e
7 changed files with 281 additions and 4 deletions
--- a/dev-ml/ocaml-containers/Manifest
+++ b/dev-ml/ocaml-containers/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-containers-3.16.gh.tar.gz 444432 BLAKE2B 9a07632075aea29e910456a050c64e6a64a017965b99624466efd517523d93778b7c22f0ae77d6bff8ce7993b4c54167fb539b2ab1aaf48df928d61292c0496f SHA512 856f73350e8a6da41ecd60d1c9d32c43aa0a7085a164fe27f695606d24b56a04672c6d5c99efa7e1cac416b21046b6996d0a9de82c2eba6cba7b6e82db93db43
 DIST ocaml-containers-3.17.gh.tar.gz 446317 BLAKE2B 07dea6fe4d8eb7bde93af09585d5cbbccc6fd09d50e505430e3b13d3229f3db9ba538f55e37b8dc001beb99c587878956aef5a9b152b59b4624469668cb21eed SHA512 9c3347de235d39ac07130a48657e8be65d7f8dd4db7d5eb037e3ecfa4ce781430684de9af332d7a8e3dbef7508d4ccf5f3e91868e4afb52c01d0092582a9f5c2
-DIST ocaml-containers-3.18.gh.tar.gz 443206 BLAKE2B 02cc516c927188f4b18d34a97e3f651647ba1672145646cdc3ec24a017d394db5a0e2a712bd25ffb531aeff31b58e076e7fb80301fae63a7ede00e0f950bc8fa SHA512 53bc47b28054a9a2df083bfdd3fca7f167036b36ad6f0067b8e4fbba665bce529207282c8bf2c2d12e503bb5d5cb2328910da8a3cbebc3e0d8d83c8b946687d1
+DIST ocaml-containers-3.18.gh.tbz 363939 BLAKE2B 646257abbb952db2dad48e088ec64646f896089a0f2811d08e235ee705f57a7879cd67e6c121ffc786220e8805cfdc24b8bae516b92a63766329be5e82266602 SHA512 dc7337e6cbc9850542c7c9228d3bcb4e4add57a55e2a2992f21fb4761b3e10a68ef1d57ca37a7f5b303fc875fe3df5ecb69dbf2930bfcd1561ce03f7ae83e24b
--- a/dev-ml/ocaml-containers/ocaml-containers-3.18.ebuild
+++ b/dev-ml/ocaml-containers/ocaml-containers-3.18.ebuild
@@ -8,7 +8,8 @@ inherit dune

 DESCRIPTION="Modular, clean and powerful extension of the OCaml standard library"
 HOMEPAGE="https://github.com/c-cube/ocaml-containers"
-SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="https://github.com/c-cube/${PN}/releases/download/v${PV}/containers-${PV}.tbz -> ${P}.gh.tbz"
+S="${WORKDIR}/${DUNE_PKG_NAME}-${PV}"

 LICENSE="BSD"
 SLOT="0/${PV}"
--- a/media-sound/subtui/Manifest
+++ b/media-sound/subtui/Manifest
@@ -1,2 +1,2 @@
-DIST subtui-2.11.2-deps.tar.xz 34464636 BLAKE2B 3ab5d804627fdba30ef5faeb905599ddc49fbfcb471f0c186bb933bff1e4e477943c2c4607ebc0264ed3140acb65c391b043efeb7f5dbe2ba4c7fbd2c8f39d7f SHA512 bb3672359d9d4ce819f3b502112761f5706a716365921da35100b1586d802ec259b5405cf02e1f035c7693fa5f1be8c011d7354ca78d2f87851ce9b036550184
-DIST subtui-2.11.2.tar.gz 329916 BLAKE2B 9c99fbe770c2fe0ff2564d2ba659134343129d03cd49f332caa70e9f3ae29ecbb98733b3949e7586e1341bdcf1a15cf9a67de28dcf4253a227be593efcd05b6b SHA512 fde184fb6c55f17a7411ed46e8d35093b96290c715b267ecb690c32489e4db28d30539284d65221e8d50558ffeeaf267972009b8179adbbff8b045c2891eef6a
+DIST subtui-2.11.3-deps.tar.xz 34561980 BLAKE2B 877a107bbc740ad7610b9dd15cbbdb6e8854fce96f1dcc8244c6f67e0a4f11c3f96631bdec441e449aab31436c0d08216450d993374a31cdd27e065e97619422 SHA512 16d90b06abdab4a08b221f61c159a58e632de515a8c0b90d5d0cfeec537aeea6f94ed8558f1a074e34fa36e34fcb310593b21481b33a9a7b9be033b23f1e3a8e
+DIST subtui-2.11.3.tar.gz 330097 BLAKE2B 6c04271eb1f9df22d314cd249585ee9a698de1816eb839b33d41ee99b4080bcf3682539c02e356e113486e7893e195d268cd753f53da8dd0456370847b74b22a SHA512 027fa78718ae0470a39a12ffaa39ca867c7ba4aadefc8b97570227a542a2f97c4955c0e98963fa83893cf6140f5056c546c825d30acae66575ec8bb80c3eb16d
--- a/media-sound/subtui/subtui-2.11.3.ebuild
+++ b/media-sound/subtui/subtui-2.11.3.ebuild
--- a/www-apps/forgejo/Manifest
+++ b/www-apps/forgejo/Manifest
@@ -1,3 +1,5 @@
+DIST forgejo-11.0.11.tar.gz 54845004 BLAKE2B dd6b6d0a609b83c89835cb2740ac9f86d0458f7752ad261010b60d0eca4069dc898a9419511b3d2426f3fc6103783b78769ca7da9a702180c3ca2279b137c77d SHA512 a3f23f736d49971a6e1ed058ce54cd50466d2c6d841f197acc1cb3b975e2ff851511b4b5f0a4d023177fb46b60baa418640495ac636f04935644ee0472f80bd7
 DIST forgejo-11.0.7.tar.gz 55672879 BLAKE2B 794e15a406612ef08e325820f60548c9181cf1766459fea41f793537bd454281c475b14a4e262e4f5a4b486ad1d8db677dd7f199f1ebe497de6e5a8e51ed4d46 SHA512 dcd97e15b2b556160442742ae76954eadece51ab0e561f7de83346960aeb9f51608f8e4f90c1110b7c01136861a5114d39c66d52507668e0945798e2d63543cd
 DIST forgejo-12.0.4.tar.gz 54124346 BLAKE2B 5aa50c5af5c58513ccfd628631c43004a269e13190b0e82dad934141fed8554e8fe1ee0b61d1795d45434cffa23a2a791921eff9b61e6a8a71b901e827c060d8 SHA512 16fd7e0c1b3c329641f74158a7a733d337bb83dbd9b81032392681eb20c6f7e435dd0cbe42fb35c223de3127ef618f975b72cf5eb5e24603178da44aadb6af88
 DIST forgejo-13.0.2.tar.gz 55481937 BLAKE2B 39824b59730d957f20c8d0aa30f5e7a08b89ba6d215c66a01caff66ad082ca542300e192be7366aba5dee78ae29ab349150bfa6b0b919aba2db3dd87f0efb38a SHA512 51c044a04568bd14f826a334c02e11689326b27f3cf4aaac99d652ae93b5a35f9ee1529b235ea894832b39ea012bcfd996419b4d666927ca3e74dd889a867161
+DIST forgejo-14.0.3.tar.gz 47866153 BLAKE2B 7270c756d667e63eeeef691a1e0f7718b33f721c4f3898a14d039505e8af32259b17b993ba06fae84645ec47dd36ab436aa722d4dfd8bb51c265ec570d3abf17 SHA512 a02277e5fb41b8f66866eb7f793df7e97b56aedd148077ff6643d690d5bf2a2de3ad9b144ef0b60f782e531c5729fc2d9b965b31a48ba2eeba7f1d4ed57f51ab
--- a/www-apps/forgejo/forgejo-11.0.11.ebuild
+++ b/www-apps/forgejo/forgejo-11.0.11.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2016-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd flag-o-matic
+
+DESCRIPTION="A self-hosted lightweight software forge"
+HOMEPAGE="https://forgejo.org/ https://codeberg.org/forgejo/forgejo"
+
+SRC_URI="https://codeberg.org/forgejo/forgejo/releases/download/v${PV}/forgejo-src-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-src-${PV}"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+IUSE="+acct pam sqlite pie"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	dev-vcs/git
+	!www-apps/gitea" # until acct-user/git[forgejo]
+
+BDEPEND="
+>=dev-lang/go-1.25.8"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/forgejo
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/forgejo#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+}
+
+src_configure() {
+	# bug 832756 - PIE build issues
+	filter-flags -fPIE
+	filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+	local forgejo_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local forgejo_settings=(
+		"-X forgejo.org/modules/setting.CustomConf=${EPREFIX}/etc/forgejo/app.ini"
+		"-X forgejo.org/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X forgejo.org/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		DRONE_TAG="${PV}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${forgejo_settings[*]}"
+		TAGS="${forgejo_tags[*]}"
+	)
+
+	GOFLAGS=""
+	if use pie ; then
+		GOFLAGS+="-buildmode=pie"
+	fi
+
+	# need to set -j1 or build fails due to a race condition between MAKE jobs.
+	# this does not actually impact build parallelism, because the go compiler
+	# will still build everything in parallel when it's invoked.
+	env "${makeenv[@]}" emake -j1 EXTRA_GOFLAGS="${GOFLAGS}" backend
+}
+
+src_install() {
+	cp gitea forgejo
+	dobin forgejo
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/forgejo.confd-r1" forgejo
+	newinitd "${FILESDIR}/forgejo.initd-r3" forgejo
+	newtmpfiles - forgejo.conf <<-EOF
+		d /run/forgejo 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/forgejo.service-r3 forgejo.service
+
+	insinto /etc/forgejo
+	newins custom/conf/app.example.ini app.ini
+	if use acct; then
+		fowners root:git /etc/forgejo/{,app.ini}
+		fperms g+w,o-rwx /etc/forgejo/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/forgejo
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process forgejo.conf
+
+	ewarn "${PN} ${PV} will continue to use /var/lib/gitea as the default home,"
+	ewarn "as acct-user/git[gitea] depends on it, and acct-user[forgejo] does not"
+	ewarn "exist yet."
+}
--- a/www-apps/forgejo/forgejo-14.0.3.ebuild
+++ b/www-apps/forgejo/forgejo-14.0.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2016-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd flag-o-matic eapi9-ver
+
+DESCRIPTION="A self-hosted lightweight software forge"
+HOMEPAGE="https://forgejo.org/ https://codeberg.org/forgejo/forgejo"
+
+SRC_URI="https://codeberg.org/forgejo/forgejo/releases/download/v${PV}/forgejo-src-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-src-${PV}"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+IUSE="+acct pam sqlite pie"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	>=dev-vcs/git-2.34.1
+	!www-apps/gitea" # until acct-user/git[forgejo]
+
+BDEPEND="
+>=dev-lang/go-1.25.7"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/forgejo
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/forgejo#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+}
+
+src_configure() {
+	# bug 832756 - PIE build issues
+	filter-flags -fPIE
+	filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+	local forgejo_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local forgejo_settings=(
+		"-X forgejo.org/modules/setting.CustomConf=${EPREFIX}/etc/forgejo/app.ini"
+		"-X forgejo.org/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X forgejo.org/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		DRONE_TAG="${PV}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${forgejo_settings[*]}"
+		TAGS="${forgejo_tags[*]}"
+	)
+
+	GOFLAGS=""
+	if use pie ; then
+		GOFLAGS+="-buildmode=pie"
+	fi
+
+	# need to set -j1 or build fails due to a race condition between MAKE jobs.
+	# this does not actually impact build parallelism, because the go compiler
+	# will still build everything in parallel when it's invoked.
+	env "${makeenv[@]}" emake -j1 EXTRA_GOFLAGS="${GOFLAGS}" backend
+}
+
+src_install() {
+	cp gitea forgejo
+	dobin forgejo
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/forgejo.confd-r1" forgejo
+	newinitd "${FILESDIR}/forgejo.initd-r3" forgejo
+	newtmpfiles - forgejo.conf <<-EOF
+		d /run/forgejo 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/forgejo.service-r3 forgejo.service
+
+	insinto /etc/forgejo
+	newins custom/conf/app.example.ini app.ini
+	if use acct; then
+		fowners root:git /etc/forgejo/{,app.ini}
+		fperms g+w,o-rwx /etc/forgejo/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/forgejo
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process forgejo.conf
+
+	ewarn "${PN} ${PV} will continue to use /var/lib/gitea as the default home,"
+	ewarn "as acct-user/git[gitea] depends on it, and acct-user[forgejo] does not"
+	ewarn "exist yet."
+
+	if ver_replacing -lt 14.0.0; then
+		ewarn "If SSH is enabled and Forgejo manages an authorized_keys file, the server may fail to start"
+		ewarn "Fixes can be found at https://codeberg.org/forgejo/forgejo/milestone/27583"
+		ewarn "Users of the Forgejo CLI should also check the release notes, as there are changes to flag formatting"
+	fi
+
+	if ver_replacing -lt 13.0.0; then
+		ewarn "Make sure your runners are verified before migrating to Forgejo 13"
+		ewarn "More information at: https://code.forgejo.org/forgejo/runner/releases/tag/v9.0.0"
+		ewarn "Warning: the migration will invalidate existing actions artifacts"
+		ewarn "More information at: https://codeberg.org/forgejo/forgejo/pulls/9023"
+	fi
+
+	if ver_replacing -lt 12.0.0; then
+		ewarn "Warning: upgrade from 11.0.x LTS detected, carefully consider this nontrivial migration!"
+		ewarn "Once upgraded a database cannot be downgraded!"
+		ewarn "11.0.x to 12.0.0 release notes can be found at"
+		ewarn "https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/12.0.0.md"
+	fi
+}