www-apps/gitea: Updated ebuild and files.

Signed-off-by: tastytea <tastytea@tastytea.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07

www-apps/gitea/Manifest

@@ -3,18 +3,16 @@ Hash: SHA256
 
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
-AUX gitea.initd 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
+AUX gitea.initd-r2 757 BLAKE2B 7f55ec1e8a052e6789a9df92ffe5cd04b3c96bf67c35481b1364087a2f8580584a43b13838da3682decad92ee72ed403af67227469fc16adc2c0584658816c3b SHA512 c92a1853f3138882876d854293fa05d710d549af03423fe1c430fe465d005282328898860ff0f381297e10ec8ea00a782295cf47c82ba42b4424b7e453135f85
-AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
-AUX gitea.initd-r2 595 BLAKE2B 507d3c6eeba7bbd91497fe0886c960b0b7fed474e42edc91fb31bc8d0cf1cce55d770801f19b53b9f11ad624eebb7ff8a688c610d2b490c9959c8c6ca8e81a44 SHA512 da46bf6d858ed4d41633aef6eab5cb2e48a263d569bf364c78857bec859ae8774bbe33eca0be997af7f6a6c8033bde574aac7da50cac17918ace0ea0fc2a953e
 AUX gitea.logrotated 87 BLAKE2B 373830ddd6eed0ce2f0f7b1dab14e4a253e5a56a73f477cfadbc6deec373846d4df2d697735391581771699d5a6513acb0e14a446873de01eba10d19e3a6bd88 SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4
-AUX gitea.service 472 BLAKE2B 4c728e2987d0c0a86e65d4b9c1a59f6193ff8a3f9b066991a06f495ad1c5586b3497c71fca1cce5b65f167af09343e7bf3215ee5e8fdefa539e384198d2d88d6 SHA512 6666fe3b4cdbb78a58db4a6bf47a15e6be9ab30b666c6eb77a9e8a002d8c0abd510fc75ef463a11ee6892ab12c98943774616072cb64fd9f2fa42ff8f676aa95
+AUX gitea.service 553 BLAKE2B d5081600bd7a9d8446029f7c40186b064ce6af29eb93e1e360e1523c460d8a8d3b409a54383434cf5b55fa77a0706b8e30f137fe734c6345ce59b996e8b2c195 SHA512 e2535cefaef4e890dc2a99ef204e6fb375f59c849df64f1be18d4dbf29abd7679c8cfc197c1124c9094f8b866d029b778f73a8d27554a0ab1870600f5d6420a5
 DIST gitea-1.7.5.tar.gz 20855842 BLAKE2B 0455b1a467c9323ee0b5f2bb572cd3388bbf9462a28b6b8d1c87f2baab7da15b1be033d43a6c9cade34cb0c03b841fcb3f5fe42d16fb6bf3ce5c6bea72b0983f SHA512 baa917570bdfb4db86e3a2a666ba5e1e3d6fec245ece675f80a2949d15356534a8b82e29ade7c9f5add99d9a132ebf5dbf7405fec6cb07ca8ba83debb846233f
-EBUILD gitea-1.7.5.ebuild 2025 BLAKE2B 770125219bf0b197657381f47e4868aef2cc843ba7faa7c5b15562c75b6b37f0b90c5be9215d0bebc7ea97d3232eec817dd0eebfac420f2291b952da2608b348 SHA512 0739bebd2dff95b24bd23eda59d1284e91a3a908f086345ab08481a6d39c517b22d61719c882124c06d82530fa3d73e58808b27ee9b39d39e9ffcf7794ef3421
+EBUILD gitea-1.7.5.ebuild 2114 BLAKE2B d9ac137416e4374e70210ea6ab66b4d4717fbf9ad238dedcc944a0f1d25599c4a0c0134b8ca4da25ffe84a44fa68106e1c8bb3d250971e1275b72187032a0390 SHA512 ca6d2611fb05e1b585c920e943ad8c9cbda1dccde55f7b29136da552471a7c52620ddb812985fab4b1d6c71f0757a15cfe6aca3cad833980c0abc0f895a6de14
 MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXJvYogAKCRDPw5SX8bJu
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXKNSOgAKCRDPw5SX8bJu
-ByZdAP0RuCsqdzIqsMv3OlmTTwHQ1aVi+KhwSOMwvhQ0nI33eQEAg3P1AcKrJtnE
+B1PeAP9MDiKCCy4rMQqT4Ip+VXZv0PUZOCP1QS3B/g1NfJ0hcwD+KRfZVYPuH+qn
-Jmh2G6SbskwLQlW3M+t+SrERtmPsiPQ=
+DkAvTi3bq4wb1ZH8xHYoGPyRaiSBkfM=
-=fyVk
+=9XDE
 -----END PGP SIGNATURE-----

www-apps/gitea/files/gitea.initd

@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gitea, a self-hosted Git service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-git}
-group=${group:-git}
-
-command="/usr/bin/gitea web"
-command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	-e GITEA_WORK_DIR=/var/lib/gitea
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
-	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}

www-apps/gitea/files/gitea.initd-r1

@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gitea, a self-hosted Git service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-git}
-group=${group:-git}
-
-command="/usr/bin/gitea web"
-command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	-e GITEA_WORK_DIR=/var/lib/gitea
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
-	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}

www-apps/gitea/files/gitea.initd-r2

@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Authors
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Gitea, a self-hosted Git service"
-pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
 user=${user:-git}
 group=${group:-git}
 
@@ -11,7 +11,8 @@ command="/usr/bin/gitea web"
 command_args="${command_args:--config /var/lib/gitea/conf/app.ini}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
-	-e GITEA_WORK_DIR=/var/lib/gitea
+	-e GITEA_WORK_DIR=${GITEA_WORK_DIR:-/var/lib/gitea} \
+	-e GITEA_CUSTOM=${GITEA_CUSTOM:-/var/lib/gitea} \
 	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
 	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
 
@@ -19,3 +20,7 @@ depend() {
 	need net
 	after net
 }
+
+start_pre() {
+	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
+}

www-apps/gitea/files/gitea.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Gitea service
-Documentation=https://gitea.io
+Documentation=https://docs.gitea.io/
 
 AssertPathIsDirectory=/var/lib/gitea
 AssertPathIsReadWrite=/var/lib/gitea
@@ -8,13 +8,15 @@ AssertPathIsReadWrite=/var/lib/gitea
 After=network.target
 Requires=network.target
 After=mysqld.service
-Requires=mysqld.service
+After=postgresql.service
+After=memcached.service
+After=redis.service
 
 [Service]
 User=git
 Group=git
 
-Environment="GITEA_CUSTOM=/var/lib/gitea"
+Environment="GITEA_WORK_DIR=/var/lib/gitea GITEA_CUSTOM=/var/lib/gitea"
 WorkingDirectory=/var/lib/gitea
 ExecStart=/usr/bin/gitea web -c /var/lib/gitea/conf/app.ini
 

www-apps/gitea/gitea-1.7.5.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
-inherit user systemd golang-build golang-vcs-snapshot fcaps
+inherit fcaps golang-build golang-vcs-snapshot systemd user
 
 EGO_PN="code.gitea.io/gitea"
 KEYWORDS="~amd64 ~arm"
@@ -61,6 +61,7 @@ pkg_postinst() {
 		elog "No app.ini found, copying initial config over"
 		cp "${FILESDIR}"/app.ini "${EROOT}"/var/lib/gitea/conf/ || die
 		chown git:git /var/lib/gitea/conf/app.ini
+		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitea)."
 	else
 		elog "app.ini found, please check example file for possible changes"
 		ewarn "Please note that environment variables have been changed:"