From 709de052cc7acbb014feca3193929f898b55203a Mon Sep 17 00:00:00 2001
From: Marc Schiffbauer <mschiff@gentoo.org>
Date: Wed, 1 Nov 2017 18:19:40 +0100
Subject: dev-db/couchdb: pax-mark fix and make local.ini writable

Package-Manager: Portage-2.3.13, Repoman-2.3.4
Manifest-Sign-Key: 0xCA3E7BF67F979BE5
---
 dev-db/couchdb/Manifest             | 28 ++++++++++++++--------------
 dev-db/couchdb/couchdb-2.1.0.ebuild |  8 ++++++--
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 0065668..344d450 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -5,21 +5,21 @@ AUX 10_gentoo.ini 131 SHA256 ee6f0151c2cba3bb7ae473c184e50e8160edcc6984a30d77959
 AUX couchdb.conf-2.1.0 208 SHA256 3d9b56a025cd0fe4599465e0a611a37b836f1ecf0cd767a19fcb7907d9f6956a SHA512 e665fb29ee3f8bf2966dd407a0f918a9e61a46a5ef0e5e14150d829f517653ab7693287278f3e621439d1b8baf80428f785b3270d470702a3bb2986fa3044771 WHIRLPOOL d6e8fc0e50904feab6c1d96ff4edb9d3f1fa2d8203502c92ae24b7bc76b1821d52cec013c6d112df8870f1a498816934b39e0b7630bcb1ade53a8f9e9996be84
 AUX couchdb.init-2.1.0 484 SHA256 81e325c9bdd060f7a2ecb780ed7d023fd6d8511972e2c6540cf00c49b7a870ba SHA512 2d98f7aa0f718c3e7bae523d3a97c2bb61c5064a82b78e779bb562abad60fcd1f277bb160754a8af6b5dce7d6a8b0390bfcd880b97da874b6a7a63874a22e4b2 WHIRLPOOL 679a52a5af08509ede6f33611c554fd68ba0d8f970940e7c55f6a92e5c57d2f43d0a80969f9920047a66ae4abf77e817899c8117a8f7a6a9279eb3c03987aba5
 DIST apache-couchdb-2.1.0.tar.gz 12276350 SHA256 eb1fbf746cd4bce2322389983e4d174c78e1520435578bff1507bb51c96a8825 SHA512 8c5f9fea852ae59bf5d6d23b1eaa68df5554660e4cfe918e9465772e964e2e5e24a7db1ee803adf7af16549b8c6445127ce4a7a65b7ee85510661ae1582ca8da WHIRLPOOL 7ee6dcbfdeda1d4926b24c1d093a7b9e9988e683ec49725446196b71c083c7df24b6f48b21ce8d5b1d02d4e772c0df3541d90f850d5f89acb7d780d66cd18169
-EBUILD couchdb-2.1.0.ebuild 1998 SHA256 e660130fa9561643ee06496bd82479bc85a45c4783ead7878f53f34dbdab3387 SHA512 e44a2dae3e52e061e7d77c9736fd3b60a6cf489c6efd6a25349a71f645b1447d0b1b96b6e57f71e8368e302ae4be090935e48d495eaff604ef11003eb6ac9d6e WHIRLPOOL ccf60de38dabb9400687036e71d8cb804ade17224b7b640e6e99c786da478837545b5eb25f530182790dec939082178a518a091f50200158ec5ec04767e80ee8
+EBUILD couchdb-2.1.0.ebuild 2168 SHA256 60d8f0bf6fb08843cb4872b2a969dfb426d4f40ab7b109710fe4c00f01869391 SHA512 87ab52690595bc8cb04bdfdf628a6d2d4747802fc32e91634507074956af89b76196db01387ec7376c0f0098d90953010969b62ef5f0cdddd199e174ade8f444 WHIRLPOOL 960424f12c9a9d5c81a4456b34c578a3b01b807e756f189d01d4f11a4210fbfafaf580d0246134926b790608f416165b9de1d5d4a9ab844294610324b49fd47f
 MISC metadata.xml 212 SHA256 061538b4837ab7b95b652299476a75942b769652dbd569225713fdf1166b1d37 SHA512 e4f4b6dbbf6bf039ff5c19bb6a209ad4e0b1286f8cf7cc0cbafcc04fcf93fb92766c8cae06ff19f980a069c7fe9a1686437ab215f84ce10e301275ae107d00bd WHIRLPOOL bb35c86572b2ad56bf93b52f6eca6bea0f5591c1a9ebd608833dea63c89d4bd36cd402a8ffc2d5fdc1d7e1d5466782d1e37dfcac14fae0bbb181029799728fa5
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAEBCAAdFiEE7ERu+XFCdT2IzYy5nVnT9oiR5F8FAln55lQACgkQnVnT9oiR
-5F/SWw/7BzVxwJiLUPF8nDl+eQ9gRQTFkR4Y14qCNiY1Ani2hC8nsjN1EX1v8EMk
-Vn6J1Q6Zsp1tuJWPS7hMSdVjT5L90oY+vs7avKWwXwUDfdVaJucWU4KaSu7TqSXk
-O47VHCpEm0WYy9ZR8ceIDHWM01y4BG/JL2Vcll+L/kKNTKgYK0eUfJVeUWDJzL7R
-pb9hFCy6ty2eid3jzop6Uk0e++m5pAzA2oypnRVy5dJAgOx0v9FF5RBkOcIF0D6B
-70RVBGZqEwYbrUkx/Km7JMS2VPLets9FaXA0CPAuPy1FNpDBuLcxJf3XhDt7IkL/
-MC1VUbS6FEUxq0yb1k3J0/031QlMFqtmiif6pkumHFpodThLcrxzY9zKBeE8Dhvh
-XlitKZHL3HyIlYf+ymqa1B3GfWv2bteSXdbFpXv5KziYz4GZ/3rGgQ5Y4QhjLOZD
-kCzEbs90Ohmi5dSV0CTqbCpGJdPucJf6f1x14h0cWk1RZipdTQnvZSNsWOXzBI+u
-P2l4i4k4r1OdShXp5ubzGwfVqfbzD8SCQzg/MXeSQz1caq4dE+0zrwB3X5SRxmo8
-oRCMysRk0ZWc5tTRoHp0PJmV26tDPIu3alORXDJWUl9ZO5rBeYtkMTPVLwKYZPgF
-o1/SET/ibS+J1tCHxkLZ9HyUiAr+4T8CvEMwtMqmXyIToqsp6Ts=
-=Vdhk
+iQIzBAEBCAAdFiEE7ERu+XFCdT2IzYy5nVnT9oiR5F8FAln6AigACgkQnVnT9oiR
+5F+qEBAAlHTuGvjaHfnVfgrj6jPTGJM1vV5JeD9mACEAVqwOq8zc6WbSwKvk6Vgn
+lVmlWa7MajMqOS9t1XolC7wVUXlYTZyaVy11c+YfLH8HIwrnAK9916M0tKabukLH
+UwaIel64iM16MtBUT5wNtYA4JYckvv/aNOL1kJHcjEh1yW9ai+r9ByYtmzdZQHr+
+/LxDxss2xphE/fVA1/sKD2CtF4oIzUjespM/8Iu6tZ55uEi6LAHW8SfBONxaRFRC
+XNRy56/9WCaSCx2vK5By29fyOeX1FGaHLkmuvFsBsjq73DsMdPwmvy+HiksWXij4
+2KzBLYg2crEJzW08gbJzgFRb1hxoA+XcllffA7UJvOz+4AtFw2U5d3L4fFFhNj6Z
+Y6UkG6srlaXtlxNqoppxTKHjr1e90j5uPZMOko4dfLITivQYw3RdLhVIjyJ5Wc8H
+dD6YBIAEV5/YKnanGq2cANAwPwkO6u0hkhBJMUWklx3AaOOlMKdnwhD0X0h5GwqI
+giEv8vOrCpi5Xdia0jms7GPmDIKcSnrIM+AAYyMPud2IqMBq5pESrwFbVFDPNuun
+53LrhPZWCCnsfqSfMhxiHgcFjeSMlUy/3yLp0i1aKEICRRnvHgJr2qZiJJCygPYb
+5EVGxVTjW6oqtoU3tvxG9+ZKYD6Cb81WRBpESmSo9m13OioazV4=
+=0vwO
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-2.1.0.ebuild b/dev-db/couchdb/couchdb-2.1.0.ebuild
index ae012a4..3f95b9b 100644
--- a/dev-db/couchdb/couchdb-2.1.0.ebuild
+++ b/dev-db/couchdb/couchdb-2.1.0.ebuild
@@ -73,6 +73,10 @@ src_install() {
 		fowners root:couchdb "${f#${ED}}"
 		fperms 0440 "${f#${ED}}"
 	done
+	# couchdb needs to write to local.ini on first start
+	fowners couchdb:couchdb "${ED}/opt/couchdb/etc/local.ini"
+	fowners 0640 "${ED}/opt/couchdb/etc/local.ini"
+
 	insinto /opt/couchdb/etc/default.d
 	insopts -m0640 -oroot -gcouchdb
 	doins "${FILESDIR}/10_gentoo.ini"
@@ -86,6 +90,6 @@ src_install() {
 	rm "${ED}/opt/couchdb/bin/couchdb.cmd"
 
 	# bug 442616
-	pax-mark mr "/opt/couchdb/bin/couchjs"
-	pax-mark mr "/opt/couchdb/lib/couch-${PV}/priv/couchjs"
+	pax-mark mr "${D}/opt/couchdb/bin/couchjs"
+	pax-mark mr "${D}/opt/couchdb/lib/couch-${PV}/priv/couchjs"
 }
-- 
cgit v1.2.3-65-gdbad