From 7f40f060a013fd90b267a7065160a6f0741a185d Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Mon, 20 Apr 2020 03:23:17 +0200
Subject: [PATCH] www-apps/gitea: Migrate from user.eclass to GLEP 81.

---
 www-apps/gitea/Manifest            | 12 ++++++------
 www-apps/gitea/gitea-1.10.6.ebuild | 17 +++++------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index c63964d..65d07fc 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX app.ini 67 BLAKE2B 4ec7b8217486047b419202b3a8a7172ac21ae0e5ad9224cd4f010be730ac5cda9d05bf06dcba2d06f8809900094b3b007ef98dd4ea20a125fb7d3db279f53e4a SHA512 93f6f7cf49dd1ece56f7da711adbb58cc38a503527aeea140837d74456ee6f550a089e897d9cb94382e1eb3f5a5cbe4a61362534463eada08a91f314da0f2108
 AUX gitea-mod-vendor.patch 1273 BLAKE2B 3067b17a972b92d0c402af4336ee41daa2f09d389a6e8bf218d33b103230bf8bb4b7003977447cc00293f8941f5002676398d4d755548e114e59cbb3840af8cc SHA512 12d8e0d2cb0998d31f8077f1498205bfee07e0df74926251f1ca38b9824c11246c07e413fc20beaed9ae49cac3d329468432f3fd2d5b25292c5bd656a88c7cc8
@@ -17,12 +17,12 @@ DIST gitea_laughing.png 904 BLAKE2B 79ec681f5a302d7c679a0c2f3b7fec8657f08789a42d
 DIST gitea_tada.png 1376 BLAKE2B a838ff5dfa1f03f8b274a708efd8f1d351934b05b3b7266adddaaf4cd1e457cf7bdeadc882b9d5d89b0fddfb866d9969e2ebf9e68d9c0077cae1a1e3d2ae74f8 SHA512 e7ae63347cc0e225a1fdab8b2feacb6a364dc6a4d6d5091e894a96bd895e56485944c9489af20d94161f4f157414aee07c62daa5d6daf91f06a1e2a5be710f00
 DIST gitea_thumbsdown.png 786 BLAKE2B 0ee2b9bd3d8e655cf3bc6ba7426f1c219c08716dcba9281845e03ee5f2f24b70e035b051a9b67c8dd95dcffff7b28261a97090f906c4e1159dfdc1285115356d SHA512 689710a3f18933b919c8eef7ec855244cd1d9fc43005b246de7961c38702cbd9d937364ee11d67024439b2de3156aa41bf870279a5d0afd3cc1111492edcaa6e
 DIST gitea_thumbsup.png 778 BLAKE2B 1457327be43b7d0dbcb10dfbb043c11c1ed02536c2215f3b3931402711fa97642d265dcafc5353c05c499459d3c0ee5aeafff50cec108b14932b10ea755db4c8 SHA512 e3ab812f9d4c0cccd05feb12958a93aec0dec90ae393f4bdb28cbc30d88d2daebb46534f2879f8a445bacb997cac01eb3193355835535f277a3cd34391449a0e
-EBUILD gitea-1.10.6.ebuild 4949 BLAKE2B 5bff5e7573f5ea078a2158063500b5125971be1c8eb8c14636d142e616d15e9a403a40500c0d8d7654c336060bbc2f8c0044651ae89c5168abf08c4200822b2f SHA512 9149631fc43ace109e83d65c43c1f7e4a1639e47b1d78f45d9804e9ccf9a14896647e3cbfccae9cd7e454b09385f03e5c45427090c3b7254be08c6d55e6ecea5
+EBUILD gitea-1.10.6.ebuild 4854 BLAKE2B 66e71163717bee09adce3331803b85cdee0f740a0eb6cfbbfb8e62dc84bfaa40f5b2eed98acadf06f24ac39d63b8922a924d327d62a189a2f12d5c1d186e1fc0 SHA512 b2e71467e145472c2f43fec78a44c33c05934d2e67116a8b3f8a0f078fb6f45650b6913a0964eb9bd2babb2d6c1f7da5acf2991f8f496af7112c0f269edf7072
 MISC metadata.xml 335 BLAKE2B 921ed4b1499e6b51bf11f3bad9a6a9e5049290ce11f769c428874f47389ccf847bf0a23d646f7433bd566343d397cfc1591a7b377d8cbbfb76421cd633bc4b9a SHA512 780c20386fac75f14e043030107dbefdca130e0b98cc6dd0d6b9a18e2f8793ed194488487dc2fd562b78cae00bc35cc1deddf446c7dec15464cdfa823559552a
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXmiUowAKCRDPw5SX8bJu
-BxCfAP4hBAyV8XxDtAK04WdXH/yv/8qYxclv4Je7WUO//H5WpwD/TpEhdNTH1iBS
-p86VvGgoGzKBx07WtYnksvjbDyehMTw=
-=0Rbc
+iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXpz5hgAKCRDPw5SX8bJu
+B//BAP9zL0B4kbvYJfVdFntdZKFiT3bcu60uD/EFHj19ctH3dAD9Hh5D+/vk2X/S
+IazZ2PdriCZj6/EqmxRNnC6VRN+BXtI=
+=Dbxk
 -----END PGP SIGNATURE-----
diff --git a/www-apps/gitea/gitea-1.10.6.ebuild b/www-apps/gitea/gitea-1.10.6.ebuild
index edca184..59b5c99 100644
--- a/www-apps/gitea/gitea-1.10.6.ebuild
+++ b/www-apps/gitea/gitea-1.10.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit fcaps golang-vcs-snapshot systemd user
+inherit fcaps golang-vcs-snapshot systemd
 
 EGO_PN="code.gitea.io/gitea"
 
@@ -23,13 +23,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="emoji-hotfix pam sqlite"
 
-COMMON_DEPEND="pam? ( sys-libs/pam )"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-bindata
-"
+BDEPEND="dev-go/go-bindata"
+DEPEND="pam? ( sys-libs/pam )"
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
+	acct-user/git[gitea]
 	dev-vcs/git[curl,threads]
 "
 
@@ -37,11 +35,6 @@ FILECAPS=( cap_net_bind_service+ep usr/bin/gitea )
 DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
 gitea_make() {
 	local my_tags=(
 		bindata