From 6aaa44fde773c7c19462b03820c602f85d017b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Mon, 18 Nov 2019 19:41:43 +0100
Subject: [PATCH] [www-apps/gitea] sync with latest PR

---
 www-apps/gitea/Manifest                       |  2 +-
 ...-1.10.0_rc2.ebuild => gitea-1.10.0.ebuild} | 21 ++-----------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 rename www-apps/gitea/{gitea-1.10.0_rc2.ebuild => gitea-1.10.0.ebuild} (77%)

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 36f9a2b..76d6156 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1 +1 @@
-DIST gitea-1.10.0_rc2.tar.gz 28905169 BLAKE2B d34025875e344247968f43d03ee1b7fa2c41bb1c65169b6b206d3a60bd22dc09205a3e4a1b08d206c4fd2b0bb8075d2e4615a22aef8039b57f6dba7cabc222c6 SHA512 512af3bc2aa5c5caf188cb06fc6279d6fc2950e6f984a29d5e83a7c6e153d2c75edcf4a6536615e9bbe3ba948d3abf867687aa75032f2bbf1b62723fe86d1b55
+DIST gitea-1.10.0.tar.gz 28905929 BLAKE2B ddf45483784ebf2d300d7f957e355f20c56e0e31825b3a290935ef9d8b7a2b0b154769b44eb270c9bb3165b8297cc1d8b51e9e660828eb95ab019b4857f8c37a SHA512 3bd99ee7289b6a0035d0a6da868562692fa9941a4f14d7555044c06efc7165615dc95547713e352d5cfcd7817596a9f4b24c5fa28c90066f4586ccb44a637d08
diff --git a/www-apps/gitea/gitea-1.10.0_rc2.ebuild b/www-apps/gitea/gitea-1.10.0.ebuild
similarity index 77%
rename from www-apps/gitea/gitea-1.10.0_rc2.ebuild
rename to www-apps/gitea/gitea-1.10.0.ebuild
index 2a539b4..82b508c 100644
--- a/www-apps/gitea/gitea-1.10.0_rc2.ebuild
+++ b/www-apps/gitea/gitea-1.10.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="+acct pam sqlite"
 
-BDEPEND=">=dev-lang/go-1.11"
+BDEPEND="dev-lang/go"
 COMMON_DEPEND="
 	acct? (
 		acct-group/git
@@ -26,12 +26,7 @@ COMMON_DEPEND="
 	pam? ( sys-libs/pam )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
-	dev-vcs/git
-	acct? (
-		!dev-vcs/gitolite
-		!dev-vcs/gitolite-gentoo
-	)
-	"
+	dev-vcs/git"
 
 DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
 S="${WORKDIR}/${P}/src/${EGO_PN}"
@@ -104,15 +99,3 @@ src_install() {
 		keepdir /var/log/gitea
 	fi
 }
-
-pkg_postinst() {
-	if [[ -e "${EROOT}/var/lib/gitea/conf/app.ini" ]]; then
-		ewarn "The configuration path has been changed to ${EROOT}/etc/gitea/app.ini."
-		ewarn "Please move your configuration from ${EROOT}/var/lib/gitea/conf/app.ini"
-		ewarn "and adapt the gitea-repositories hooks and ssh authorized_keys."
-		ewarn "Depending on your configuration you should run something like:"
-		ewarn "sed -i -e 's#${EROOT}/var/lib/gitea/conf/app.ini#${EROOT}/etc/gitea/app.ini#' \\"
-		ewarn "  /var/lib/gitea/gitea-repositories/*/*/hooks/*/* \\"
-		ewarn "  /var/lib/gitea/.ssh/authorized_keys"
-	fi
-}