gentoo resync : 05.12.2021

3 files changed, 130 insertions, 5 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 24baa1474cca..b9c8eb6e3cf7 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,6 +2,8 @@ AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
 DIST gitea-1.15.5.tar.gz 48677702 BLAKE2B fe46e16041861a477cd91e66e741d35cd43264f8e8c6bfeac5a858fd4aeac9e5e92e308608d6fe74a86a69f21a7c036c8e3409aacb8e5841cbf60ae67009574a SHA512 85522113f389d0a26d4f4b78c05a5454095da5f9f9a030c7392143588f985dc7711368d40194bdc6ea286f3ec15b1f9db428f1401f29aa4c46800d0431696a85
+DIST gitea-1.15.6.tar.gz 48675768 BLAKE2B e7952cc981925ec36ab6576456266e3582ea88098a2ad83da161c875b3621be586ddbe63fe0d0ce7c62a0fa1e46663f20ce24ce998f3318645667bd92236ade1 SHA512 9492a3628c5b300a1322893ffdfffa42e904d1b94917c058ad339e0d9ca21155c834b11d55808cbc89e08533de5340fbf858b87487ad307713c4dc12f5e810c8
 EBUILD gitea-1.15.5.ebuild 3456 BLAKE2B da9561891a37beb208e52e5688f2a4ffe0a67f733197919563a5174edc4c38f0662d443da210fbbcc86994edf868922610a9447e4367fbee6255645af9c5b9a9 SHA512 71ff213c8aa3cb7364160e1524bcdecb4cdbc25cff641a46b18f298503254713aa28610f568cef153be23c04e388c37652b2aae490238fc6b54280f04c1fe1a4
-EBUILD gitea-9999.ebuild 3456 BLAKE2B da9561891a37beb208e52e5688f2a4ffe0a67f733197919563a5174edc4c38f0662d443da210fbbcc86994edf868922610a9447e4367fbee6255645af9c5b9a9 SHA512 71ff213c8aa3cb7364160e1524bcdecb4cdbc25cff641a46b18f298503254713aa28610f568cef153be23c04e388c37652b2aae490238fc6b54280f04c1fe1a4
+EBUILD gitea-1.15.6.ebuild 3451 BLAKE2B f4a7b0b0189b11976194317e58772f739ae6de2ac6a1cfea4fdb8d05ed3a9438884ea676ad4197d606353a48867a8d58f5b5d513be28861d25dea165971054fa SHA512 8accb318c19717cc8465c9c7bae88f810e4d2a5e2f39e7ddc3fdcb7ff8cd7db0c52377b676c97bc52984a8f2604a83ce4e5a040d80457e703c59842a76f24d8e
+EBUILD gitea-9999.ebuild 3451 BLAKE2B f4a7b0b0189b11976194317e58772f739ae6de2ac6a1cfea4fdb8d05ed3a9438884ea676ad4197d606353a48867a8d58f5b5d513be28861d25dea165971054fa SHA512 8accb318c19717cc8465c9c7bae88f810e4d2a5e2f39e7ddc3fdcb7ff8cd7db0c52377b676c97bc52984a8f2604a83ce4e5a040d80457e703c59842a76f24d8e
 MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
diff --git a/www-apps/gitea/gitea-1.15.6.ebuild b/www-apps/gitea/gitea-1.15.6.ebuild
new file mode 100644
index 000000000000..4da3155a2589
--- /dev/null
+++ b/www-apps/gitea/gitea-1.15.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module tmpfiles systemd
+MY_PV="${PV/_rc/-rc}"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	S="${WORKDIR}"
+else
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/gitea
+)
+
+RESTRICT="test"
+QA_PRESTRIPPED="usr/bin/gitea"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-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
+
+	einfo "Remove tests which are known to fail with network-sandbox enabled."
+	rm ./modules/migrations/github_test.go || die
+
+	einfo "Remove tests which depend on gitea git-repo."
+	rm ./modules/git/blob_test.go || die
+	rm ./modules/git/repo_test.go || die
+}
+
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[*]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
+
+	env "${makeenv[@]}" emake backend
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini app.ini
+	if use acct ; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process gitea.conf
+
+	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
+	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
+}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
index a5eec77f6034..4da3155a2589 100644
--- a/www-apps/gitea/gitea-9999.ebuild
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit fcaps go-module tmpfiles systemd
 MY_PV="${PV/_rc/-rc}"
 
 DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io"
+HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
 
 if [[ ${PV} != 9999* ]] ; then
 	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -22,13 +23,12 @@ LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="+acct pam sqlite"
 
-COMMON_DEPEND="
+DEPEND="
 	acct? (
 		acct-group/git
 		acct-user/git[gitea] )
 	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	dev-vcs/git"
 
 DOCS=(