From ce83e81750ab4f281252f786ac37a879d3a3a91c Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Sat, 23 Feb 2019 05:31:19 +0100
Subject: [PATCH] www-apps/pleroma: Version bump 0.9.9-r1

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07
---
 www-apps/pleroma/Manifest                     | 10 ++++----
 ...a-0.9.9.ebuild => pleroma-0.9.9-r1.ebuild} | 23 +++++++++++++++++--
 2 files changed, 26 insertions(+), 7 deletions(-)
 rename www-apps/pleroma/{pleroma-0.9.9.ebuild => pleroma-0.9.9-r1.ebuild} (74%)

diff --git a/www-apps/pleroma/Manifest b/www-apps/pleroma/Manifest
index 0b1e34ee6..4276b4dca 100644
--- a/www-apps/pleroma/Manifest
+++ b/www-apps/pleroma/Manifest
@@ -2,12 +2,12 @@
 Hash: SHA256
 
 DIST pleroma-0.9.9.tar.bz2 29447938 BLAKE2B 94092b3583043a7737511959610ee81b4525a9b7f77a7743ec865adcb0f44c1287f10f07b6da8529113aa0f7f0533d9aae425aba295a560ca7523ddbf1c23aec SHA512 48df04a20d2891c9ace26bafac7e3ee07abd6b7d189e1b6bdd85143188745262995c56030c38d22c8125ee78a691bdf5b0e8eb8d8065fe9ff94a73e0638d4955
-EBUILD pleroma-0.9.9.ebuild 3183 BLAKE2B b13b57afc823b67a1b6897d8334d2dab6f3e3f926d94554c32407030b4c4dfa34170b2482123c159353c97db6a6f8537bd95531bc45f2c9c7dc1c6d3e490792c SHA512 4b05aa0d266bd3b0f341b58ee8a00fda775994f000c51c3b3862380cedf362b25a73b5d7a5a6b57c3e938857407f4271dd322614a69bb680e5761f8f9397d5a6
+EBUILD pleroma-0.9.9-r1.ebuild 4181 BLAKE2B 304bc5711dc44acb1fb92ba43928da3ce2837069eee66d08d845a7287a90b93805c9e4541158a7cf8c96ebdfb6df5b4445782ef32adfcfe4069a7d4fa61ef3d3 SHA512 25c123d547254292caf24c8fe7cabe88ef431b8b21ccca5076533cb42c0913f12acc1b70635ea741d0cb0ab4213aee1c97deb998672396b15e5f191a19b447ac
 MISC metadata.xml 993 BLAKE2B adc5c72fe12b6fdb4eb20c1d79dde227b088b437ffd21d16cc5775fa5bb7fa6363890dd5017fbe7f5a00a794a38fb298ce17e6402f6d3d5441985effd0d7e1db SHA512 6ff23fa60c0f22ef7a433e3d1b4919d074508898504b7168c925da8840f542afcdc891a9f4df69dc8eb6c44b7d9c41e6b94fdecd404ca738169124bcdab0af0d
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXHCueQAKCRDPw5SX8bJu
-B5eHAP46hsiW6IDU+r7StNoezBj7jubqPYDY979vf6JwPz4sRAD+OBSi+vq5wK64
-IYadMjh1hdRb9ZrzQh16FkUVovwmui8=
-=xtdF
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXHDMlwAKCRDPw5SX8bJu
+B/g2AP48Y4JDslfympmA+q7H2z8y3pKcYaVICNFoLLjjV11mOwD+LIWaBQKnOj5o
+dW9VLmzscoJCIZ0In+XdWZNWOm3jct8=
+=+aG+
 -----END PGP SIGNATURE-----
diff --git a/www-apps/pleroma/pleroma-0.9.9.ebuild b/www-apps/pleroma/pleroma-0.9.9-r1.ebuild
similarity index 74%
rename from www-apps/pleroma/pleroma-0.9.9.ebuild
rename to www-apps/pleroma/pleroma-0.9.9-r1.ebuild
index 336e3fc30..be0bf66e5 100644
--- a/www-apps/pleroma/pleroma-0.9.9.ebuild
+++ b/www-apps/pleroma/pleroma-0.9.9-r1.ebuild
@@ -13,7 +13,6 @@ SRC_URI="https://git.pleroma.social/pleroma/pleroma/-/archive/v0.9.9/${MY_P}.tar
 
 LICENSE="AGPL-3"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86 ~arm"
 KEYWORDS=""
 IUSE="apache +nginx syslog systemd"
 
@@ -31,16 +30,28 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_preinst() {
 	elog "This ebuild comes with a lot of bundles libraries."
+	ewarn "This ebuild may overwrite files you have edited. Waiting 10 seconds ..."
+	sleep 10 || die
+
+	# Backup user-modified files
+	if [ -f "${EROOT}/opt/pleroma/priv/static/instance/panel.html" ]; then
+		einfo "Backing up panel.html, terms-of-service.html and thumbnail.jpeg ..."
+		mv "${EROOT}/opt/pleroma/priv/static/instance/panel.html"{,~} || die
+		mv "${EROOT}/opt/pleroma/priv/static/static/terms-of-service.html"{,~} || die
+		mv "${EROOT}/opt/pleroma/priv/static/instance/thumbnail.jpeg"{,~} || die
+	fi
 }
 
 pkg_setup() {
 	enewgroup pleroma
-	enewuser pleroma -1 - /opt/pleroma pleroma
+	enewuser pleroma -1 -1 /opt/pleroma pleroma
 }
 
 src_prepare() {
 	default
 
+	sed -i 's|directory=~pleroma/pleroma|directory=~pleroma|' \
+		"${S}/installation/init.d/pleroma" || die
 	if use syslog; then
 		# Log to syslog
 		sed -i 's/command_background=1/command_background=1\nerror_logger="logger"\noutput_logger="logger"/' \
@@ -79,6 +90,14 @@ pkg_postinst() {
 	if use apache; then
 		einfo "An example config for apache has been installed in the doc directory."
 	fi
+
+	# Restore user-modified files
+	if [ -f "${EROOT}/opt/pleroma/priv/static/instance/panel.html~" ]; then
+		einfo "Restoring panel.html, terms-of-service.html and thumbnail.jpeg ..."
+		mv "${EROOT}/opt/pleroma/priv/static/instance/panel.html"{~,} || die
+		mv "${EROOT}/opt/pleroma/priv/static/static/terms-of-service.html"{~,} || die
+		mv "${EROOT}/opt/pleroma/priv/static/instance/thumbnail.jpeg"{~,} || die
+	fi
 }
 
 pkg_config() {