Version bump couchdb to 1.6.1 (fix bug 501332, bug 529826, bug 520372)

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 98 insertions, 16 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index c415e8691167..e9dabcd76966 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.103 2014/11/02 08:12:10 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.104 2014/12/29 10:51:33 djc Exp $
+
+*couchdb-1.6.1 (29 Dec 2014)
+
+  29 Dec 2014; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.6.1.ebuild:
+  Version bump couchdb to 1.6.1 (fix bug 501332, bug 529826, bug 520372)
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> couchdb-1.5.1.ebuild,
   couchdb-1.6.0.ebuild:
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 51eaf0f6db1e..e057d3f5e1a5 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -5,24 +5,26 @@ AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec8473
 AUX couchdb.init-4 438 SHA256 7f191b22d82b5e430b0c1d29a7e9e791a69a0867e96d2a643e2bf45e2f251060 SHA512 922ff66130819de9dac5d8df45b685f05287756f235a989e1b8179a4c54d8769f3e189b7797fbc03db5828b50c49f87ebd1a74cdf045027c5aed99a627753cb7 WHIRLPOOL 01528de2fa13e6eeb09465b4824cbb8c846e4fe67857b93501b15b4994c8db70eae539c7566a3c7380392f241906e60e02d0cab2a798852001cac93d5f765902
 DIST apache-couchdb-1.5.1.tar.gz 11601057 SHA256 d9d5dcc1c16633cef45f94d3f04ae72eb08390c75c2bc95f8be2c09fc46d4d47 SHA512 0837bc95da6b0cd6784915133c07d1dc1c965bf23f5e768794e7a46ae70d0947b9fc008b03c48a79893dfb7b0de0ea5e580f59617399c623618ceac6b1106da6 WHIRLPOOL 025058bcc3b08fd1b318b4a6952394a7334313ce6ba2d9a285a2a27129638103d2dc1c03d7be4e2b0a7f848b210eb7172257196c3613c1ff430a59e2d3b0d63b
 DIST apache-couchdb-1.6.0.tar.gz 12095192 SHA256 bdf6d71b9ffc3d09722fe61876afaf09e556b3205b7bad9762ffaff8463c9354 SHA512 70c7490256bb50b5f7385d44080ebf63da2745f30c7c3d84bab9fe39acd6da86c4c20a4c65659562168105be9998c1d10740fa279f49d32be705605c0e2b318f WHIRLPOOL ded40ffb74e7e3aafdf936b540a9029773b986e9ee87511c8ce2467175e083748a51666ef8d34306d569080b29f90d0b6a94d5308f15b4393f2fc293310696a8
+DIST apache-couchdb-1.6.1.tar.gz 12085350 SHA256 5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627 SHA512 70630a27dec7281fa5bdca0601796baa28fba1d7c9975d8f38b9623bbeedd62b26081118357886c7be00b7769360238b2c99695234e13cecb15a210eb986eadc WHIRLPOOL 5776fe139db54e5ec285ef9882f5164a42a499bab312d66c0edd5314dd1915827a7cf7df02cd5df85c437bf3f70096cb101748956d639e8e80ffd0bb0b79197a
 EBUILD couchdb-1.5.1.ebuild 1797 SHA256 5a919f47bc24fff753bc7b02063188d50d6c61346ee7a12f4112ef6c20c20494 SHA512 3a85b62c65d74a8fc5dedcc9b424a3adee6f5f5051e0cd79f30bb1ea8a049517370776b3fb907574f6778db35a3a1510403cd0fc0ac7fc9e39693a53d6dc926d WHIRLPOOL 43f15c7a7e8bfdb74a65a53e3f2b6760d9d598fa57a153a0582f2555dafe6b05e6296a3ebafa8cdc726078f87e246db5c463162dc4896469b161ac2423d204e4
 EBUILD couchdb-1.6.0.ebuild 1796 SHA256 772d91d8bf4d8a8dcc88eb4d6ce8074e92eadc7da150113a819f990144cc204f SHA512 0dbf6255e2e91c44da51078ce25f0fd8db2843961cc8fd84e28fa975a08e1af37f2f6e0f41f51d0d77408dc368f053d0211e6969d080213be21a30ede38d95d7 WHIRLPOOL 9c3d2e31fe0931c34a491ed58c0cf80c5bb8b53249b568d623eccb25d9b680578e71ac1e15ea89a08bd341df9044500f8086527ef33df2d3c367b319e9405ff8
-MISC ChangeLog 13499 SHA256 fd7bc191f215163a3d4bd1ac2705829da3f1bcf7be362e4bea6a5061101d72b5 SHA512 8785a69976869f344834e1185436e8698eba2a023d054f532a9af94b84d010e0a80de441c341d20194fa26cf8c9e6ffd76006e959e4d093370a1f16d6a9e1142 WHIRLPOOL 20900837f7768542305c299f28dbcb3852debeeafc047473ae13548a24e951e82627b84d872b11f9dbb2b7eab7c65064e61e74153039d10f6fda0e6eae4231b1
+EBUILD couchdb-1.6.1.ebuild 1847 SHA256 c3e5495a5f3ecdc6b302d91f0412c68dc9d82fa64b4cde374312dd27fe6262e9 SHA512 a74e4c7307a484eb1df949c254f8c7b90dbc88449848c9d1c8d6c172f037964fa3ec521efc38d587b9a831934d2d187735dfa019beed930d5d1430788cdaf747 WHIRLPOOL 55771d159c4297ff40e626e03dcd1ddb6d7066f42d49b498b786a012b806c66b0af0b185deda9a4b41c2c82ebdd377341c0ca77486eeade09ef30b3e78bdc94f
+MISC ChangeLog 13672 SHA256 e7108747b348c91d9fcd725eadb44801c4b318b5587c48a2ed71369b82cc4c11 SHA512 6f1f9cc94a7e0f0105befabb433b8b885879f9986645d4ea46a8cd203ceb1e10f262658084c8e5a7cdb58a85b1b524d540cf4fdafbed26946790557a0ceff88f WHIRLPOOL 4cd91440dc9bb4e38916757eb0c3dc26e46ba3359c6a071956d1fd7116e1889499875073ab44312b6c34372652f33d41142f9b5ae7fc7ed289c18f8f2dea9711
 MISC metadata.xml 198 SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8 SHA512 ce42b56d5a9225aa9cbf7ddc4f92285df0ceb9eadf9befe0787837f40c6f86dce0b3a9de2b29e14a6c224ce25e6038d7e1bfe5e56ebedd2cb5be87fc9a216d89 WHIRLPOOL 9ce3e5ec80ac4302b609914f7a821fba1bbcead615d535c0d17b9b1e37892c4a9b2cbcbe6a46406e99bb3eb4f5b634277913b34f1f1b3b39d2d51e2c2dcda24e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVebSAAoJEC7dUkA7aK9HIagP/3xU0xZc19w5l6M4M8iw7nAu
-cRj0N4cyuVERN0PdM9AIA3p075/tsSJCvY2rtc/WhMN3iDl0WVQK5zaE97oqIClx
-+jNYLGwZFsE/pgi6pE/YAgsdpdiqgk/4QKjlvYWORzkht9UdffQClf5GpRr9rrNU
-U0pPveTnBwIXQFN/favhRkwKwOxsaTmE3ECtNouIYnnUToY1AinX4aW1kwSkc3jT
-GpwSxVuiWbK2MoOF8+ihUh7cuGONm4tKI8rBb3TbVvsOUTGlilARMweUIFHOrewy
-ivUjUn1GYuk0t+gmPx2EE2aNxGNvhy4OhReDBd+mcoq41khuvmkP4gX3fx/Gax15
-EUnma9tPBniy8y3lWwHgAqzIiRSqbKDK9DAn02ClqGD+U95rB3urBI7OqdW2AMD6
-Ki2BqyieLT8xgk9muwQqnQTZMiWbA7iBJb0xzBcXCGr9ORRvwrT1voyvrlh5nCNQ
-KQJoTXr76gyerxf+rBiN/u3nzvAU+7K+Zq2zDLfoN0B1L8MuGWOJf7oEwPMmbkF8
-hUeaYDKyOGBoAxPfb6+hEWPoSo4NisTa05gtOtuPyfo0bkt5ar2ayUtkJL5HQtBQ
-mAEeDdQWKLDOhGJAn40pLy+4L95sytzVMziriNvFZSgV/At7hBcjBrEDTstDqui0
-ZKae6PUNV0M5nKzqNtv2
-=UaFQ
+iQIcBAEBCAAGBQJUoTNsAAoJEJ+WuSkwOAOB2N8QAKAErDUu4WxAUlI0TmVcja28
+0njLZPgdoIDfh71WK5Dn46oKzDuc72DgaouaGECYg+xsB1qLeHM2TkdK43wGOXGM
+fDUNKpy7lH4zOxADm/++KMK8oQGvp1LTvoU9mbnSvcYTgkEUPikjm5XUfhp8PRLH
+iVJDI3jjq8hHUa+w63TiMTffNGIZ3Zv71f8v4zq5JZ67M0FmQSCDTI2X1swVhlvj
+/1s6suC+65q1zPWRRknAPHKUL2z202+6C4UViWsxep38BI2S7I6eNXLaSg/L/dt2
+qQyUOibpSo6K9K32OuehmFSwXpTlusUccjU0uAMGkPgkXa4le0quN6cH+BLVMBqS
+io/LC0eoymdgVsPpCgzp1VpFGqi9Eb+9bgb0fCXa7Yl56wGPx1qZpeC62hzwNaCF
+HM4GgAm4Nwndq7pvwVVQht0qQ25mBbTz6smx3XCKieJYFrkWdxxxlYp+0WmRLFwo
+k9dtvf7/GrDAOkZ4SyFAsDBsuvFlyKvd9b3OTuIlBrf/KAlwUH/u+nE5SMPfpzhx
+1M0jn1HZ7TxuhUe6os7HEjcUyS94t7Mv2zANKAqjo2NTVdERA3QLzQKJVRvKAj0z
+1kzdslaaO7cjnAcTp1DU3oTdo9vXZ7Kx4aIpW6OPEVrICyn6t+bdakdg9IFJBXl0
+yl4bqVwvEgaKI8uNS1Gz
+=oHeU
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.6.1.ebuild b/dev-db/couchdb/couchdb-1.6.1.ebuild
new file mode 100644
index 000000000000..e62d3eb66b8f
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.6.1.ebuild,v 1.1 2014/12/29 10:51:33 djc Exp $
+
+EAPI=5
+
+inherit eutils multilib pax-utils user
+
+DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
+HOMEPAGE="http://couchdb.apache.org/"
+SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="selinux test"
+
+RDEPEND=">=dev-libs/icu-4.3.1:=
+		dev-lang/erlang[ssl]
+		>=dev-libs/openssl-0.9.8j:0
+		>=net-misc/curl-7.18.2
+		<dev-lang/spidermonkey-1.8.7
+		selinux? ( sec-policy/selinux-couchdb )"
+
+DEPEND="${RDEPEND}"
+RESTRICT=test
+
+S="${WORKDIR}/apache-${P}"
+
+pkg_setup() {
+	enewgroup couchdb
+	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
+}
+
+src_prepare() {
+	sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
+}
+
+src_configure() {
+	econf \
+		--with-erlang="${EPREFIX}"/usr/$(get_libdir)/erlang/usr/include \
+		--localstatedir="${EPREFIX}"/var \
+		--with-js-lib="${EPREFIX}"/usr/$(get_libdir)
+	# bug 296609, upstream bug #COUCHDB-621
+	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = "${EPREFIX}"/usr/share/doc/${PF}#" -i Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake
+	# bug 442616
+	pax-mark mr src/couchdb/priv/couchjs
+}
+
+src_test() {
+	emake distcheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	fowners couchdb:couchdb \
+		/var/lib/couchdb \
+		/var/log/couchdb
+
+	for f in "${ED}"/etc/couchdb/*.ini ; do
+		fowners root:couchdb "${f#${ED}}"
+		fperms 660 "${f#${ED}}"
+	done
+	fperms 664 /etc/couchdb/default.ini
+
+	newinitd "${FILESDIR}/couchdb.init-4" couchdb
+	newconfd "${FILESDIR}/couchdb.conf-2" couchdb
+
+	sed -i -e "s:LIBDIR:$(get_libdir):" "${ED}/etc/conf.d/couchdb"
+}