gentoo resync : 19.03.2019

4 files changed, 15 insertions, 11 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 16e85cfea07c..1a2150de8c85 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,7 +1,7 @@
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
-AUX gitea.initd-r1 688 BLAKE2B eb2341dee53f3fd92c49137855615d9ae7ca77efc396e2d2ed8b624ed2776c7522455a469c00172ecbbe2151ccab476baa0c779baf8a39f63348bdc7ebbd29c2 SHA512 4a6bba463c9abafcb6fc9f3854efd1a69fb3b213c2b34ff6a233f90db535c2ab0f375a0809e4c4be6651ed60d7696a54148a5ee9192567d70ca6a5203a8d3266
-AUX gitea.service 472 BLAKE2B 4c728e2987d0c0a86e65d4b9c1a59f6193ff8a3f9b066991a06f495ad1c5586b3497c71fca1cce5b65f167af09343e7bf3215ee5e8fdefa539e384198d2d88d6 SHA512 6666fe3b4cdbb78a58db4a6bf47a15e6be9ab30b666c6eb77a9e8a002d8c0abd510fc75ef463a11ee6892ab12c98943774616072cb64fd9f2fa42ff8f676aa95
-DIST gitea-1.5.2.tar.gz 18866286 BLAKE2B a9a31fa6a310dcb6debd9399f234262214021d72adda52af959e6d9d692d5902ff6955a9802bf60212cecb2a0146c4905952d44643aa83e49c645d32541907c2 SHA512 ef91c881b3cb81d79d182b78c95624f24d63e21daa2d6e561fca79edba0ad588fae7c55503f900a8f05c566ed3bff92a9c4385fc7e5c701a80749d2a8c58b599
-EBUILD gitea-1.5.2.ebuild 1923 BLAKE2B 5267d3a75c41ba874b4db011de06ec14aa1356358104bb2d715b10d47ecd1e862ce1852ee04289842b00c99c4f22b307ee18db5d4b830d20231e358f8952f248 SHA512 d5601d742af950ae69e00f2800caea64196f34626eefeba9910cc049ce82265ce6a9572c52ae74b7a48fbf863fbdc6a05edeb10235f468c39d66039e6e8e89f3
+AUX gitea.initd-r1 757 BLAKE2B 7f55ec1e8a052e6789a9df92ffe5cd04b3c96bf67c35481b1364087a2f8580584a43b13838da3682decad92ee72ed403af67227469fc16adc2c0584658816c3b SHA512 c92a1853f3138882876d854293fa05d710d549af03423fe1c430fe465d005282328898860ff0f381297e10ec8ea00a782295cf47c82ba42b4424b7e453135f85
+AUX gitea.service 553 BLAKE2B d5081600bd7a9d8446029f7c40186b064ce6af29eb93e1e360e1523c460d8a8d3b409a54383434cf5b55fa77a0706b8e30f137fe734c6345ce59b996e8b2c195 SHA512 e2535cefaef4e890dc2a99ef204e6fb375f59c849df64f1be18d4dbf29abd7679c8cfc197c1124c9094f8b866d029b778f73a8d27554a0ab1870600f5d6420a5
+DIST gitea-1.7.4.tar.gz 20858340 BLAKE2B 81d896d313abe25bc1a5becd16249c2ce39ab45d9f40ccf3a565b6777847c7256d5b131f597be237df57513a207978e23480ad3c6087bbc588afe8bbcd46d5c9 SHA512 eede6d410529b1facf65061256e48fee7d459aa12d8c55346d3ad78004a45b7bf667536979fe92270a85901102fd9cddb8183490e16f912b742e799ca912e370
+EBUILD gitea-1.7.4.ebuild 2012 BLAKE2B 362f2e876cb489cef8f30bd6587f194be57c985159f53df4ea9273f9e764377b35c1173089a1f1b26dcc2eea6931b1fadb594717eda1980d93b88d5c4a2835a6 SHA512 c7ec4ba8b929327a7503ec47f95a3ee6ab4a802e04d545e6dfcfe2f56d8bcfd82bb9dc50e4c121833a97dc98b9f141243f857227e3dba8a79d80a95fe4cc8615
 MISC metadata.xml 246 BLAKE2B 291057fd61e77f8d99f9518e3f709d79ab79ac5ac5ce1387d27a26cec6272698fe6bda7cfacaeb203411413ed003c71cdaead8316cd9e5a2c1ce1056637eaee4 SHA512 9af718c7e0ca960324b9fc168e85824099a5434a322d7da78dabc90b8cd3be2201a3eb321facd0df575fa1d0865c1f80280d290589f0ff1d27bdef575297abb7
diff --git a/www-apps/gitea/files/gitea.initd-r1 b/www-apps/gitea/files/gitea.initd-r1
index 837164aa0140..6f957d426c08 100644
--- a/www-apps/gitea/files/gitea.initd-r1
+++ b/www-apps/gitea/files/gitea.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2016-2018 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Gitea, a self-hosted Git service"
@@ -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"
 
diff --git a/www-apps/gitea/files/gitea.service b/www-apps/gitea/files/gitea.service
index 3fdbc1fd0c3d..733e05ea1ed3 100644
--- a/www-apps/gitea/files/gitea.service
+++ b/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
 
diff --git a/www-apps/gitea/gitea-1.5.2.ebuild b/www-apps/gitea/gitea-1.7.4.ebuild
index 49bba0eddfbc..6508562a68bb 100644
--- a/www-apps/gitea/gitea-1.5.2.ebuild
+++ b/www-apps/gitea/gitea-1.7.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit golang-build golang-vcs-snapshot systemd user
 
 EGO_PN="code.gitea.io/gitea"
@@ -57,6 +57,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:"