gentoo resync : 02.02.2022

3 files changed, 9 insertions, 142 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 2fc10fea5629..638f24becda2 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,8 +1,6 @@
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
-DIST gitea-1.15.7.tar.gz 48716399 BLAKE2B 4238dad8ce64f205bc18fb35a395b18f6da9f34e5bc0dd9d9bb33d5b8413895fb11f85e8514aca62485ce70f0af5091cb8dfeaccecd146fe5e37ca250227847d SHA512 9488776bb39d15a7390e6734e05c6ee9e092a52055575bc784660d6815125f29498d16a7807dac71ecbabc3f08c407c2da1514c36cce72855a17a9ed7b52fbb9
-DIST gitea-1.15.8.tar.gz 48705540 BLAKE2B fe51af1ac573958e615e600925a3e2a8f1bdfe44333304571198de58fa989e8f8c9ebc4f4714d7700c24f28cba60170a2e34c4416ed28ec201577af92d557a82 SHA512 026f8006fa5f51f6bd753228290f1f3714cd5b23c35e2041b309fc4d0d66be9f84fdaf4c7bd5759248fa26e3d3b9fe628fd5ee4c96e13ff6c99fa7facef4ab06
-EBUILD gitea-1.15.7.ebuild 3451 BLAKE2B 9d9e81b4ef935c56fdb69d922c0a7821abde6a519c6050efe183f567b862efe8d1f7f98ceb69a2bd3c9afa73d4cb2c6ff72c536feb1a8307a7f4f721ba75ec38 SHA512 fff50b409182d7a46d7443c8afcfab40840ed0f8712b44f39669fce379debfc9a6f306ece19bbbcf721839b4541e80a2bded4ea7f5766e0b20c8a4e093df5d35
-EBUILD gitea-1.15.8.ebuild 3165 BLAKE2B 40b75f8a4d209b0bb9b41bf4b8f0a1863866f8db4ceeb3dc0cb0fbad8ddb19b6e338742f0c713f8681e528f9cc3c05c08ba17e8ef63470c5c0346535a1d6fc10 SHA512 fc94e45b26153c92360198352ababa9b8041644f53354e8a056a18cbb6f4fd0de4d9c0be1632b0953678a4008481683e44a52acc6e540acef1f584ab248ae4ce
+DIST gitea-1.15.10.tar.gz 48818877 BLAKE2B 00e2fc8fb0ca5952d96de1b4ed53d0bd6d17b22fc0d7c2aacc313ed74d0a2d268ad714a363c5408daca9b57beaa0305b369d9400019f9c60e133a976f0731076 SHA512 6598e2b8cb84e03370b704f57783612bb4bb938527bbcfcaaf0607035e73e3b480e40ca6fa196ae641ec91483af54688c5acf8dcce59d4ee8c6de9f393a8f531
+EBUILD gitea-1.15.10.ebuild 2968 BLAKE2B fad3a0806c1a9f035fbf1e35e8226d5f92ba8437e1ca1f6cfb0465a0b6178e0c1a6d6c11a5574944370d4c5481f8bb545e463f90ce76148a00ffd30e28d0019c SHA512 ae5963ae218d7d68682dac4cb25bb9ffc6751ad4aa3a00438e7728798bba2ad8e1c74c8f05e095536a20136d3db598d43bf2bbe35f66b8ec7e80f5ceba96d03c
 MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
diff --git a/www-apps/gitea/gitea-1.15.8.ebuild b/www-apps/gitea/gitea-1.15.10.ebuild
index 2bacf5e333f4..eaeda1a3f382 100644
--- a/www-apps/gitea/gitea-1.15.8.ebuild
+++ b/www-apps/gitea/gitea-1.15.10.ebuild
@@ -1,23 +1,15 @@
-# Copyright 2016-2021 Gentoo Authors
+# Copyright 2016-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 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
+SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
@@ -72,10 +64,10 @@ src_compile() {
 		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
 	)
 	local makeenv=(
-		TAGS="${gitea_tags[*]}"
+		DRONE_TAG="${PV}"
 		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+		TAGS="${gitea_tags[*]}"
 	)
-	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
 
 	env "${makeenv[@]}" emake backend
 }
@@ -94,7 +86,7 @@ src_install() {
 
 	insinto /etc/gitea
 	newins custom/conf/app.example.ini app.ini
-	if use acct ; then
+	if use acct; then
 		fowners root:git /etc/gitea/{,app.ini}
 		fperms g+w,o-rwx /etc/gitea/{,app.ini}
 
diff --git a/www-apps/gitea/gitea-1.15.7.ebuild b/www-apps/gitea/gitea-1.15.7.ebuild
deleted file mode 100644
index e8b862eb67e5..000000000000
--- a/www-apps/gitea/gitea-1.15.7.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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>."
-}