gentoo resync : 18.12.2020

4 files changed, 20 insertions, 34 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index fdea72e44bd1..5bee3a538223 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,8 +1,7 @@
-AUX 1.12-fix-vendoring.patch 430 BLAKE2B 897214736e27f49023c8de9da5e7caa3612947f381d10e1bfd9fca2a6f4cfdcefb7fd6a70fb972e9db1c8a84deb592f585d0c6beda66b551b6e65cdce33e73d6 SHA512 9b2678c373dfb18e53be53b99e2cebdb656f777f850c6f9b67e29d52011edc320fb7d14045fef08b0b3b70959784070264f1cdfae70937097977b2865c8c71b5
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-1.12.6.tar.gz 135134376 BLAKE2B 762f5403a9c5524182c717d6d028ad7fae2ce01d66960635d5e3d1e0ad9027c431efb3604a89061d5354ac126eea8e412b52d9c9d1243b1dc56b9ecbabd2e7db SHA512 c581f84ffe793b80e445c70f3e60ed54a663ef2b2579959b4f1bd4ce5aa0f470ef6d6b13476cc920e615e18ef79ff461896c75ce8282f9b774e939dbbe1f2a49
-EBUILD gitea-1.12.6.ebuild 3625 BLAKE2B e7f8ffd05f79982a5b8a7e2d44e1a25c702e1b32ab7993a083ade16b06be5723920014adace64212e96f43a93108b5f6c8b6524351c2f35de5c63e9395bbd461 SHA512 840e3737d07ee8be438e22bb1b4781715ed439fcd9eeda598d06c4793505b6caacf58e49bccdf1677a9d363b63aedc78705541238ac386175a76b657dd7f6909
-EBUILD gitea-9999.ebuild 3235 BLAKE2B 893edb722e2f4de3054d8bc3744414a0dca088ecb9b1cfd25bd24a839f0da9653df401db84dfd46221d3d60b3a1010f48d1ff9a3528c5b8035717faf1be8d262 SHA512 5fbfdd2d1ee6bedbb70fd23180d0473d6ddee629ad06225298c4a170a5c3198896f663033cfc0db84b02098b181a2f0f29d120799e3c7cf222de175b29888e4a
+DIST gitea-1.13.0.tar.gz 150897624 BLAKE2B b09d3a695a399bfff813f45faf7435eb0b512d448e8329142d8131be786e0dee822a8491c58c8537545350162c89db39cbaaa0ba58c467f2494137f1313a9fec SHA512 bdcc1d3f53ba2b8a6c9964bc15449d3ea237853dfeb2f1da1e4c9f68fb5f09188b3fcef9a1c004ea774003181a85758eb95cff909cc39f6caa611b0505628739
+EBUILD gitea-1.13.0.ebuild 3459 BLAKE2B 97f83d95d87b47f368eb6545483ac1603e4ae6b98fe119680b4dfcec309ff7906df5a20a1df8575a7dfa746fa692c89a2c8855e455a6edf4c32049fba40f9580 SHA512 c7a7fd93a7d01b266ebb1a97397f5b13c02eaae28ac920735762d7bcfaeb3949162ad7abb0485169f8d08a1be52da299795bc3e036761b5d6d761ef88be5681d
+EBUILD gitea-9999.ebuild 3262 BLAKE2B 9dfea3dc2ed67430e81fc38df9ac0643188dba9a6e29bca2c692c221885ed5a8536f6f51e3d53d60b9f956a2c7219b4236edeff5941ea08fe5125ea0cd1d1b8b SHA512 e591905d1bf58ff36456b5ebddac50cc0145de4164031903a8b549dc1ed1dacd2d6b84653ad97710166bd79d44e1fa0a7df90700224cadeb05299d17be665fd3
 MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/files/1.12-fix-vendoring.patch b/www-apps/gitea/files/1.12-fix-vendoring.patch
deleted file mode 100644
index 9baff97307a0..000000000000
--- a/www-apps/gitea/files/1.12-fix-vendoring.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index efbc866..1c34104 100644
---- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
- # mvdan.cc/xurls/v2 v2.1.0
- ## explicit
- mvdan.cc/xurls/v2
-+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
-+## explicit
- # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
- ## explicit
- strk.kbt.io/projects/go/libravatar
diff --git a/www-apps/gitea/gitea-1.12.6.ebuild b/www-apps/gitea/gitea-1.13.0.ebuild
index f4f0af94aa84..7bb52ed548ee 100644
--- a/www-apps/gitea/gitea-1.12.6.ebuild
+++ b/www-apps/gitea/gitea-1.13.0.ebuild
@@ -33,14 +33,11 @@ RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
 DOCS=(
-	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
 )
 FILECAPS=(
 	cap_net_bind_service+ep usr/bin/gitea
 )
-PATCHES=(
-	"${FILESDIR}/1.12-fix-vendoring.patch"
-)
 
 RESTRICT="test"
 QA_PRESTRIPPED="usr/bin/gitea"
@@ -49,7 +46,6 @@ src_prepare() {
 	default
 
 	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
 		-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#"
@@ -58,13 +54,11 @@ src_prepare() {
 		-e "s#^LEVEL = Trace#LEVEL = Info#"
 		-e "s#^LOG_SQL = true#LOG_SQL = false#"
 		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
 	)
 
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	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.ini.sample || die
+		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."
@@ -117,7 +111,7 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
 
 	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
+	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}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
index 672af6461ca6..d6f5cfcf5a8e 100644
--- a/www-apps/gitea/gitea-9999.ebuild
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -33,17 +33,19 @@ RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
 DOCS=(
-	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
 )
 FILECAPS=(
 	cap_net_bind_service+ep usr/bin/gitea
 )
 
+RESTRICT="test"
+QA_PRESTRIPPED="usr/bin/gitea"
+
 src_prepare() {
 	default
 
 	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
 		-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#"
@@ -52,13 +54,11 @@ src_prepare() {
 		-e "s#^LEVEL = Trace#LEVEL = Info#"
 		-e "s#^LOG_SQL = true#LOG_SQL = false#"
 		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
 	)
 
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	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.ini.sample || die
+		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."
@@ -104,7 +104,7 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
 
 	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
+	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}
@@ -114,3 +114,9 @@ src_install() {
 		keepdir /var/log/gitea
 	fi
 }
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+	tmpfiles_process gitea.conf
+}