gentoo resync : 29.12.2022

6 files changed, 28 insertions, 231 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 9f0a1120d27e..014292608600 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,11 +1,8 @@
 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.16.5.tar.gz 53178954 BLAKE2B 67c378a46eab8e374b1a5b91d86e558c6ae06e24a23cb0d670f112573e0606c3ee7f700047f703a73b19f39b216597e3a05c3602e01ecfb09f146515545d3687 SHA512 3c367155a97809d587879b023979ad198106040c362e6d5e6df26cad384c614aaac1c47d84bcac0177a5b5546c4a76e95cfff9cf76b411226c0b1aa618d4d4b3
-DIST gitea-1.16.6.tar.gz 53649707 BLAKE2B 118d77f82d2037d2d3f3a3fa9f8548af9af6fd9a8bf4797b005de9e98772899fcd73af91f135999db9136d850fc5e0283da9fc2868058e58c6f68d231e4affec SHA512 3f14aaf9fdcd21180995717c7dfebe70966073e4228520963313379f124d383192f600690c276b0a9e1d6b442e8ad053f24ffac795c13fdc6321b9200d8223ea
 DIST gitea-1.16.7.tar.gz 53657579 BLAKE2B ae9d67fa633bcc5156036f033a4ed084b5b6ac0d71ec6a1ec0d0c88848233f3f0f0c22ca1c33289dc0e9950a8b299e26a88417e03643972f6721f94097b37d85 SHA512 7a31330e46078e215eecfbb2ec28373be1a176790720afbcf9674f3530d66f300d8ef9e47b9b9124cda9ce585d26d40c975e4897e5a3477dcec28b6f2b16735c
-EBUILD gitea-1.16.5.ebuild 2967 BLAKE2B b315270f9a456ca7043a60bd00254d4b69913dac08421d0a0d1c0ff6b6aa43f4f86200972b1cc70670026e900519fc6a928aaa1f1b57a31dc10edbfa107eea66 SHA512 3e2cab8768a70394fc61317460f1151a82d2c6b44fa6a680976ee6198e0226e92004f4e15980322ee5664ba01043e114b61dfc86da9ab7c96a027bd8433fa960
-EBUILD gitea-1.16.6-r1.ebuild 3177 BLAKE2B 14e26efbc4c3218d3937023755a5f83a8c13c74bc4a918c8339c864aaaa78f00f2a37010a1567375c71c43780ea9b58469160619bc5d80ff01a2c17cb2dd3a4f SHA512 69d1609cef00b20a4dfb880cf9c85b69715e7f915bf1184d82e4a7c0fe287f7b730c816b3ce99f85db7347f604986c674ae9810b27c28bed3a36ca91fd3efd3c
-EBUILD gitea-1.16.6.ebuild 2968 BLAKE2B fad3a0806c1a9f035fbf1e35e8226d5f92ba8437e1ca1f6cfb0465a0b6178e0c1a6d6c11a5574944370d4c5481f8bb545e463f90ce76148a00ffd30e28d0019c SHA512 ae5963ae218d7d68682dac4cb25bb9ffc6751ad4aa3a00438e7728798bba2ad8e1c74c8f05e095536a20136d3db598d43bf2bbe35f66b8ec7e80f5ceba96d03c
-EBUILD gitea-1.16.7.ebuild 3176 BLAKE2B ca0c1c6304f65462ed54022c43b5a3688a9dfec26c1b5f9e2d4ed43dc273065aca37b0963fdccee443a7a35ae4a7733002abd5c60780d4bacf63650036c50cd4 SHA512 8612865a06fb84aaf2ca749214b32faf1750541060b0e2b146d303d14a0b5a5673e7887444da12913bf09ebdeb51ffc9ce0fde6aaf92c418c84fb2993daa353f
-MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
+DIST gitea-1.16.8.tar.gz 53659731 BLAKE2B ee35388d9fc5ba202d9b013e36b12771e55bc3d26256ec11ab1f1441b1db62e5b4e9972970b3f926d714edc40ac3b2e5daae47a16e2d76e4e49a1c367490cb02 SHA512 f502a07c886cc2f15615693a90eda128478d0de833cbe18993ed1f5a1a81f45591b2c00791f8024eda97d948991838b2dc95fab189695179631df47e4d587419
+EBUILD gitea-1.16.7.ebuild 3181 BLAKE2B aaf07de11af3784fc352f787542e09604950292704cb283d9474d6cec568f91a5df5104c5aa2da29f22d1324f8d4d29357ea3880a8c9d2ee29dbc685f5b83086 SHA512 a2e84529629afc73aa6649bdf3d97f5e356a97c13262dab767e1c8aaadf7c7d26ca35f201f1ae999c50d39d8ca39f62fba00e59fbcb25f01cdc52b8e08b261aa
+EBUILD gitea-1.16.8.ebuild 3295 BLAKE2B 5fb0180173ca060612256e2f2c73dcd30014a2466dc2ca65cb8e6a560af1e91888b0bb578d037aa920c8747bcce5a6035032549e3cb98fb73aac176a5da4ad7a SHA512 aa94734deb9bb13e27c831d917f848c61ab040894f2dbb6f903b1f35f5e2a67cf430d87413d347705763fcc563d0da31202147eefbb34c0b84bcc1ac5b15200c
+MISC metadata.xml 590 BLAKE2B 2313d3d6632d9d5cd758acabb539be21fed1603279719587143a96803cd89c8bf5c963d15303237130704ecf47759ea6e7e5b42ffa44bbd51c880eee6f535a20 SHA512 aec006efcfe71689dcbc5d37abfb6e566b8b637e3a3bc849cc12cddeb02d568fbfa21f55e97712b413730c2705ebc10ed7a7dc7bec4ec8c7a536457347185135
diff --git a/www-apps/gitea/gitea-1.16.5.ebuild b/www-apps/gitea/gitea-1.16.5.ebuild
deleted file mode 100644
index c213d90dc38d..000000000000
--- a/www-apps/gitea/gitea-1.16.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-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"
-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"
-
-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
-}
-
-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=(
-		DRONE_TAG="${PV}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
-		TAGS="${gitea_tags[*]}"
-	)
-
-	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-1.16.6.ebuild b/www-apps/gitea/gitea-1.16.6.ebuild
deleted file mode 100644
index eaeda1a3f382..000000000000
--- a/www-apps/gitea/gitea-1.16.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module tmpfiles systemd
-
-DESCRIPTION="A painless self-hosted Git service"
-HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-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"
-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"
-
-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
-}
-
-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=(
-		DRONE_TAG="${PV}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
-		TAGS="${gitea_tags[*]}"
-	)
-
-	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-1.16.7.ebuild b/www-apps/gitea/gitea-1.16.7.ebuild
index f81eddf452ee..eda894a4cb53 100644
--- a/www-apps/gitea/gitea-1.16.7.ebuild
+++ b/www-apps/gitea/gitea-1.16.7.ebuild
@@ -8,7 +8,7 @@ inherit fcaps go-module tmpfiles systemd flag-o-matic
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
 SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
diff --git a/www-apps/gitea/gitea-1.16.6-r1.ebuild b/www-apps/gitea/gitea-1.16.8.ebuild
index 249baa6f0eb7..a816c920b1b9 100644
--- a/www-apps/gitea/gitea-1.16.6-r1.ebuild
+++ b/www-apps/gitea/gitea-1.16.8.ebuild
@@ -7,8 +7,15 @@ inherit fcaps go-module tmpfiles systemd flag-o-matic
 
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
-SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
+else
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
 S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
diff --git a/www-apps/gitea/metadata.xml b/www-apps/gitea/metadata.xml
index c5a8b29fd81a..0dd2a021ac95 100644
--- a/www-apps/gitea/metadata.xml
+++ b/www-apps/gitea/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">go-gitea/gitea</remote-id>
-	</upstream>
-	<use>
-		<flag name="acct">User and group management via acct-*/git packages</flag>
-	</use>
+  <maintainer type="person" proxied="yes">
+    <name>Thamognya Kodi</name>
+    <email>contact@thamognya.com</email>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">go-gitea/gitea</remote-id>
+  </upstream>
+  <use>
+    <flag name="acct">User and group management via acct-*/git packages</flag>
+  </use>
 </pkgmetadata>