From a9aa0a08564c1600e88ce17cbf12416fcea3344f Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Mon, 18 Mar 2019 20:02:18 +0100
Subject: [PATCH] www-apps/gitea: fix rootdir + keepdir

---
 www-apps/gitea/Manifest           | 16 +---------------
 www-apps/gitea/gitea-1.7.4.ebuild | 10 +++++-----
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index c62e4f3..cc72b08 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
 AUX gitea.confd-r2 168 BLAKE2B ce8af102f8f8a22429a780d7cac5336fd0cce7508948faab5871903ec7ac10d4de6da3c76d565c38233595803c669f941e41975899c6a04d3f081aa78efe2836 SHA512 ec0a9761eb13fcf82bb3aab48e22fb0a28ba0775b2469427f805ea8fae0f23003edfa0bf695b5228f638a738a908935a3094446b70a04d102b75c3a3a3ec921f
 AUX gitea.initd-r1 764 BLAKE2B 5162535625a926d9d94ea50fd892bc423170913d38cb00a2782a04e5dc2b096689ee4b5bce8ced48fd5ecd0e7b5900c4346aeb3ec93e6405ebd17416f9d5f316 SHA512 9acfcc7fbb63feac97d5e9da0d629ef82473bc840097fd1d496f716e49746c14d999915a124d99defb6c4b62c108251fad78e5ff738d8119f2d9f4bbb1cd311f
@@ -10,16 +7,5 @@ AUX gitea.service 525 BLAKE2B c6c7e9b0dc5822182757e6071c75821242da3435e31385dc51
 DIST gitea-1.7.2.tar.gz 20841049 BLAKE2B 1f39cf039dec3a76d3df8cf75905ab03bcde83b74bdd1f3c2249065633bd8b3de52ae8adb543b68d65dca35dfb16659120d04b0472ed11798551889851df1dab SHA512 8472effb58cc0c416b229ae3724c4e914afd81f058b06ce0c6ea68667a77eaa122a78b928fd5d4cb2e1b00eac15ec76825cd800c769fdc88796a535206a4dff6
 DIST gitea-1.7.4.tar.gz 20858340 BLAKE2B 81d896d313abe25bc1a5becd16249c2ce39ab45d9f40ccf3a565b6777847c7256d5b131f597be237df57513a207978e23480ad3c6087bbc588afe8bbcd46d5c9 SHA512 eede6d410529b1facf65061256e48fee7d459aa12d8c55346d3ad78004a45b7bf667536979fe92270a85901102fd9cddb8183490e16f912b742e799ca912e370
 EBUILD gitea-1.7.2.ebuild 2489 BLAKE2B f70b77afa52c325001bb17a3611f5abc62e65fb3a2767db979643fce0ac624c9bec479b6d9ac0ac63449b96025bfea7513cd6212f05a9e762ff659367b735f4b SHA512 20fac1c03557493cf0865b5c085dd55a4e4649f3716a49ed090486efd13595019099d628c447ac5671b62c33f94c844f6e68498a3ebae4313c0467b590de6151
-EBUILD gitea-1.7.4.ebuild 3427 BLAKE2B 9de91b0309989ffc6d896b8a5d94e0ad5b092060bd9c1d3078ce0ba97205114cb2abdfd2ef225cb7bebb0c26b3698833b725d226e1d44a202aa84ecb19b45412 SHA512 72fcda3ee85950d2ebc251361786f7c63e4eddd068a8b47276f448a6d94cd6d44938a12a7d615a0deb7425b72e3eda9f19e31b328681b89701bdb98d06193fe5
+EBUILD gitea-1.7.4.ebuild 3485 BLAKE2B 9e2142985c844d19840cbb8e1d24e7000cdfcc88855e3f88ce4b090201091695c58c027a48b9668ea00fbb88f90ae0f8cbe6b40a90a0f98f7138966559a91b46 SHA512 5faa61c6dd0418227ecd0e3525489ed7e301a52c7a4305c22681596f93fce1e99a2bb81192e226c676f9dd6b1ad83a0b3e5635650d59dbde5179dd4c5243e980
 MISC metadata.xml 258 BLAKE2B 56a930f47b1b24a142aa53c18ff04027c0d01a123c41953c1138c773d8aac67e9a193787bbd980fd2d16482f04e99365bd8538550dd3df3d1959935a7cc378e5 SHA512 bae5e9eb659f7355c95800c2231976b3f91dd6a1c9215d8c5865f3e710109c9442477d374a4e70f70ac73f52fd8ce357dfa937f7b7aababaeaea310677dc143d
------BEGIN PGP SIGNATURE-----
-
-iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlyMwacACgkQPcxEeC7Q
-fhykMQgAsAWsPuHEquoqvmyisViFKY5M6fErZR18eHj3uOl/9hpRpCQTdd+Pqc0e
-FQghGwlavWhSEdrqhIflQDqdI9fsI2+aPrGsT8T+M/CwaFD02LJilbvDJM4JZaU2
-YQ2hi42b2n3BTZ/Le21U3zjBWlWp+UT+psO639u12aS7sV+4hZUeLhkNvPh8IhM2
-TFp5uEaVjmZ/7xhgIYlTtRbimbINVY0tE4i4Iu3MbAdrlVtTA8EIi2k4PkvhNfRA
-1ptmBin02GVHIxMZcHlvrq8kY3EqtALHVyavbklgti19l9pIQdyEpJK9RjW5xpiz
-GrKDYeGMawcizOBXqU4rkFz1AUNgzw==
-=OqIc
------END PGP SIGNATURE-----
diff --git a/www-apps/gitea/gitea-1.7.4.ebuild b/www-apps/gitea/gitea-1.7.4.ebuild
index 8ce5f8f..04b0314 100644
--- a/www-apps/gitea/gitea-1.7.4.ebuild
+++ b/www-apps/gitea/gitea-1.7.4.ebuild
@@ -87,7 +87,7 @@ src_install() {
 	dobin gitea
 
 	diropts -m0750 -o ${GITEA_USER} -g ${GITEA_GROUP}
-	keepdir /var/log/gitea /var/lib/gitea /var/lib/gitea/data
+	keepdir /etc/gitea /var/log/gitea /var/lib/gitea /var/lib/gitea/data
 	newinitd "${FILESDIR}/gitea.initd-r2" gitea
 	newconfd "${FILESDIR}/gitea.confd-r2" gitea
 	systemd_dounit "${FILESDIR}/gitea.service"
@@ -99,11 +99,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -e "${EROOT}var/lib/gitea/conf/app.ini" ]] ; then
-		ewarn "The default path for the gitea configuration has been changed to ${EROOT}var/lib/gitea/conf/app.ini."
+	if [[ -e "${EROOT}/var/lib/gitea/conf/app.ini" ]] ; then
+		ewarn "The default path for the gitea configuration has been changed to ${EROOT}/var/lib/gitea/conf/app.ini."
 		ewarn "In order to migrate the path in the gitea-repositories hooks and ssh authorized_keys have to be adapted."
 		ewarn "Depending on your configuration you should run something like:"
-		ewarn "  sed -i -e 's#/var/lib/gitea/conf/app.ini#/etc/gitea/app.ini#' /var/lib/gitea/gitea-repositories/**/**/hooks/**/*"
-		ewarn "  sed -i -e 's#/var/lib/gitea/conf/app.ini#/etc/gitea/app.ini#' /var/lib/gitea/.ssh/authorized_keys"
+		ewarn "  sed -i -e 's#${EROOT}/var/lib/gitea/conf/app.ini#${EROOT}/etc/gitea/app.ini#' ${EROOT}/var/lib/gitea/gitea-repositories/*/*/hooks/*/*"
+		ewarn "  sed -i -e 's#${EROOT}/var/lib/gitea/conf/app.ini#${EROOT}/etc/gitea/app.ini#' ${EROOT}/var/lib/gitea/.ssh/authorized_keys"
 	fi
 }