diff --git a/acct-group/pleroma/Manifest b/acct-group/pleroma/Manifest
new file mode 100644
index 0000000..ff83369
--- /dev/null
+++ b/acct-group/pleroma/Manifest
@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD pleroma-0.ebuild 145 BLAKE2B 09f27a3fe9169f4f64c46fe7d07242e753bcc565921d80126b1230accbad1f6324ca621431dc24f598ebcc6e137fde2c7139f040f4d14f89610fbe57c08db6ba SHA512 3218c27d0ab6562ce825fe85704d893d875bf917a98830c021fd852c577f04d1f1963b5adad0e10a659fe7a2e6893c14c3cc1deee7d9688476d4576b94addc7e
+MISC metadata.xml 243 BLAKE2B b891e897dafb3669e465e88cce332ad9f074a012a40c5ba247b25f4a3fa6ebdcb285f18a079363f0a709250a8f439048ed4bfd374c798089879ae4c41e22abdc SHA512 f384aba00871410e3a4a626528a79e3e7bc7018a1fb1b00a22d7b9a4e5d8d75fd5a990a4ca12010ab140486189fadf46d6797cbd34a3dbea496338c174aff982
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXo40fAAKCRDPw5SX8bJu
+ByLoAQCAvxeBkwzGgm6AsDtCy1j8wqsbZYaoy58iriaFZ/8g3AD/QHXL62Rx2zHf
+CBGy6IDkRwkxKYtEX3yYCSJS5dw2t+U=
+=8iY+
+-----END PGP SIGNATURE-----
diff --git a/acct-group/pleroma/metadata.xml b/acct-group/pleroma/metadata.xml
new file mode 100644
index 0000000..74d29d3
--- /dev/null
+++ b/acct-group/pleroma/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gentoo@tastytea.de
+ tastytea
+
+
diff --git a/acct-group/pleroma/pleroma-0.ebuild b/acct-group/pleroma/pleroma-0.ebuild
new file mode 100644
index 0000000..f730cec
--- /dev/null
+++ b/acct-group/pleroma/pleroma-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=-1
diff --git a/acct-user/pleroma/Manifest b/acct-user/pleroma/Manifest
new file mode 100644
index 0000000..ff05bb9
--- /dev/null
+++ b/acct-user/pleroma/Manifest
@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD pleroma-0.ebuild 263 BLAKE2B cc4bb775236b59797b169338768fbc779b6a75772d320b96753dc55502a101009244f52938021990c2d513b8b7f4a9b77be301d733c14a9c467a741840bd3aae SHA512 986e0399657a6ca2c66507e3b208ce90467e74075b1a72a21385d935a37fe1b45416a6f0ad23848587c0c8f5b6dfd3de53b1f40a8081a13755c4a5768b1a0d6c
+MISC metadata.xml 243 BLAKE2B b891e897dafb3669e465e88cce332ad9f074a012a40c5ba247b25f4a3fa6ebdcb285f18a079363f0a709250a8f439048ed4bfd374c798089879ae4c41e22abdc SHA512 f384aba00871410e3a4a626528a79e3e7bc7018a1fb1b00a22d7b9a4e5d8d75fd5a990a4ca12010ab140486189fadf46d6797cbd34a3dbea496338c174aff982
+-----BEGIN PGP SIGNATURE-----
+
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXo40fQAKCRDPw5SX8bJu
+B4ZsAP42/kmXwe0xoaZWQ2KViGkP+e6hZY+CrmMmhgAX+OXZ1QD/XtyetZZHx3DZ
+/h9/BAxcZLhGy1zxeO0dYeR0chF8cgI=
+=HPzR
+-----END PGP SIGNATURE-----
diff --git a/acct-user/pleroma/metadata.xml b/acct-user/pleroma/metadata.xml
new file mode 100644
index 0000000..74d29d3
--- /dev/null
+++ b/acct-user/pleroma/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gentoo@tastytea.de
+ tastytea
+
+
diff --git a/acct-user/pleroma/pleroma-0.ebuild b/acct-user/pleroma/pleroma-0.ebuild
new file mode 100644
index 0000000..245c381
--- /dev/null
+++ b/acct-user/pleroma/pleroma-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/pleroma"
+
+ACCT_USER_ID=-1
+ACCT_USER_HOME="/opt/pleroma"
+ACCT_USER_GROUPS=( pleroma )
+
+acct-user_add_deps
diff --git a/www-apps/pleroma/Manifest b/www-apps/pleroma/Manifest
index d03abd7..768005c 100644
--- a/www-apps/pleroma/Manifest
+++ b/www-apps/pleroma/Manifest
@@ -5,12 +5,12 @@ AUX syslog.exs 193 BLAKE2B 63ec05041a10b7f3a5c7fbd8bf454819eafbd98efd635a2888d7d
EBUILD pleroma-1.1.8.ebuild 3372 BLAKE2B 37173e0ddbca3dfbe5e37ae370c5d9e5e9f9e47a2f7fea36f7da2f4d8cd945711597871f1a2bd09c733994a5211c08596dce1d8b238cd7d59ab14eb909030da8 SHA512 bdbf8490668d1ca5917f3708f6f41a295b321efc958b4cff25fdb7baeff366e3a1f084524d7e09bbed8865cefe41d0c23cc6ff12636cff1ea48688e2bfe571d0
EBUILD pleroma-1.1.9.ebuild 3372 BLAKE2B 37173e0ddbca3dfbe5e37ae370c5d9e5e9f9e47a2f7fea36f7da2f4d8cd945711597871f1a2bd09c733994a5211c08596dce1d8b238cd7d59ab14eb909030da8 SHA512 bdbf8490668d1ca5917f3708f6f41a295b321efc958b4cff25fdb7baeff366e3a1f084524d7e09bbed8865cefe41d0c23cc6ff12636cff1ea48688e2bfe571d0
EBUILD pleroma-2.0.0.ebuild 3366 BLAKE2B 8bced6f6c08f2175cbdb04810ade6149b2bdb1f058f963649130011682841b43f55de743ddfe0a518af430b901a3bddfb8c858b7f769bdd7011245bdcada1d1c SHA512 2a4b91f7c039c6fbdccecee6291b5de4b7c3236e8f6e04b4a11491ef800f6b8fc2179140ce91d502eacad1cbb77e578dd74335a46c3fe4eae95090023e8129ce
-EBUILD pleroma-2.0.1.ebuild 3547 BLAKE2B 03616c3001a1006f2749194ae26e5ac57c56fc7f63df2d0e78accb98212711a71cca01ec35d5f69160991d33da83d37d26ab09ff6ec66cd9801b686f368377aa SHA512 1083c4411b0681a7556f4ae08f78547ff64f0ddbfbefa9a4a5dc878c110b44a5ff5d0065a5e006726cfc56dd1832c3a29e4d215162b5b8a7afa653657566b958
+EBUILD pleroma-2.0.1.ebuild 3461 BLAKE2B d5f350885def997f67cab26758b29b77dca22a46d04ba2dbb79fd66f161d8b8be3a6229398274d598be9ba2e865c499076c5736605f003fdb3b6c0eff1923eda SHA512 0fb87b0521f8807e33ebb282360c67a73028b5bbfcc05616c3b63ade97e4a09c84b1b678685c87e880e76c368a7589b36677a67984fe9b764d0b0c33bdd25515
MISC metadata.xml 993 BLAKE2B adc5c72fe12b6fdb4eb20c1d79dde227b088b437ffd21d16cc5775fa5bb7fa6363890dd5017fbe7f5a00a794a38fb298ce17e6402f6d3d5441985effd0d7e1db SHA512 6ff23fa60c0f22ef7a433e3d1b4919d074508898504b7168c925da8840f542afcdc891a9f4df69dc8eb6c44b7d9c41e6b94fdecd404ca738169124bcdab0af0d
-----BEGIN PGP SIGNATURE-----
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXm9UgQAKCRDPw5SX8bJu
-B2eWAP9bCYv/326GwdGnpoaKKLsOtgo0Y3FPBQTP4nmzQj7zngD+OmTvbOBYtDwf
-t1nM/W3FJwFsk+te9Fy6hxrq0029Vcc=
-=0BZ9
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXo40fgAKCRDPw5SX8bJu
+B0H6AP0XmBdbCGOEwJgk/GO15X72R0YvK+DFH7WEwZ/sykn/0wD/QyCpDeoAZK07
+gY4sci/x6Lf2bYMJjyFVzyBEjdm2vEM=
+=XP9T
-----END PGP SIGNATURE-----
diff --git a/www-apps/pleroma/pleroma-2.0.1.ebuild b/www-apps/pleroma/pleroma-2.0.1.ebuild
index 9033d3d..fa41012 100644
--- a/www-apps/pleroma/pleroma-2.0.1.ebuild
+++ b/www-apps/pleroma/pleroma-2.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit git-r3 user systemd
+inherit git-r3 systemd
DESCRIPTION="Microblogging server software that can federate with other servers."
HOMEPAGE="https://pleroma.social/ https://git.pleroma.social/pleroma/pleroma/"
@@ -27,11 +27,6 @@ pkg_preinst() {
ewarn "This ebuild will overwrite modified files in /opt/pleroma/priv/static/"
}
-pkg_setup() {
- enewgroup pleroma
- enewuser pleroma -1 -1 /opt/pleroma pleroma
-}
-
src_install() {
insinto "/opt/pleroma"
insopts -o pleroma -g pleroma -m 0664