Version bump couchdb to 1.3.1.

Package-Manager: portage-2.1.12.9/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

3 files changed, 87 insertions, 16 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 0567580f59ee..aa0d9a196162 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.77 2013/06/25 13:01:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.78 2013/06/28 14:06:16 djc Exp $
+
+*couchdb-1.3.1 (28 Jun 2013)
+
+  28 Jun 2013; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.3.1.ebuild:
+  Version bump couchdb to 1.3.1.
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> couchdb-1.3.0-r1.ebuild:
   Stable for amd64, wrt bug #473562
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 939aa088bf6a..aa9d1dcfd2fc 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX couchdb.conf-0.10 338 SHA256 4fa2dafadedb5eb6c6afbca5e8aca04f75a954e35491ddece3daebc496a534b8 SHA512 55a22f63691ee7bc74ad1445cc052299fa915a9d4e95662ca9df4debb0a9d5b325274164913cafacbd19860a3051b6feaeec45c629effbaaa37c0b8efd6be64b WHIRLPOOL 33e5eece8fa8fb9c9000af1bfbdde36319cc43fbbc5ef83ae71fd0c06662c26a3f237dcfeae4c45757abfcb31d02ab5ac3d6f8d5bc661465731d6ca669696169
 AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec847315d9c0156f700a SHA512 5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836 WHIRLPOOL 694a6ad4d948a56903ea8c628506325bcac181b827c8000aad1032014668da19d571ecee6f37bc1ecaec06c7783ea2918685aa107ff3786f5909cfbf3356fd5c
@@ -9,25 +9,17 @@ AUX couchdb.init-3 434 SHA256 41302b877863f8b32f68bdf55b43e6968a924fa7b6d02d97d3
 AUX couchdb.init-4 438 SHA256 7f191b22d82b5e430b0c1d29a7e9e791a69a0867e96d2a643e2bf45e2f251060 SHA512 922ff66130819de9dac5d8df45b685f05287756f235a989e1b8179a4c54d8769f3e189b7797fbc03db5828b50c49f87ebd1a74cdf045027c5aed99a627753cb7 WHIRLPOOL 01528de2fa13e6eeb09465b4824cbb8c846e4fe67857b93501b15b4994c8db70eae539c7566a3c7380392f241906e60e02d0cab2a798852001cac93d5f765902
 DIST apache-couchdb-1.2.1.tar.gz 1372433 SHA256 b54e643f3ca5f046cfd2f329a001efeaae8a3094365fa6c1cb5dcf68c1b25ccd SHA512 f98ec79f67a26f9d745f4ef14f33830b0103dc41aeb00e237b69ca94691c5b2203b3cf33afe0de744cb74b127f3aff491b18e89602dd843b4a1cd111658f4f97 WHIRLPOOL f8d6492c8214861756c96d5f6841bbe77c04ad372044f7c4117e9bd1d1b3508ffc5dd2cb3c9c9bbce8d24f0df911a831d0212cb4d5df3d19b5dbbd9dbfc9a2af
 DIST apache-couchdb-1.3.0.tar.gz 3420515 SHA256 591a2a5b92941cee1bba1e16e5a4978df8a81079a8b2efa766c36540b66a37f7 SHA512 8e44fd9e585abf50e3a0ddeb76a2f4045c881b3097114d0ed2356466d6b00ea78cd6fd57c5cf3ffb17ddeccdc53d0ab060047b442f4e9f9e1daece11372dd46f WHIRLPOOL 0c42a27e045a5b7fcb0b9217bf1ec5a1ee51f6b87663220deb015fb1047e9d67bda421bf5ffeb9c548225e29cf2512607b3dc2d39661d6da106f29c8e80800df
+DIST apache-couchdb-1.3.1.tar.gz 3381522 SHA256 e3051cb0be560513e0cb2d4fcb03a4cad4eda5bf381a115375d1067875ec8a6a SHA512 55134f090e036eb81a2176376c479172793c9f35377fb171788a5ee8b2d093446c375bda861ed642f6a6d0e5cdc405b0f00453d5086f174646b21c85327e5413 WHIRLPOOL 106ae37f405802344ade5168bae42b293a003dd36b088f692657eb661671e96c8892e9689c422b6601633226b69e8a72df2b070138934244c8ea0a2ed4f57457
 EBUILD couchdb-1.2.1.ebuild 1588 SHA256 9d4a9230214bee3933a6f9209f5d56d16d3d01e440376dc4bec3580c817e0268 SHA512 47a6c395b874d8fedb2f076b1181cd9162a5c916fb780666f4e243a7c3a5d89d642a2e56e375b27134ac28480426c179919768c225345ec7f308e9c77b7b2336 WHIRLPOOL 4faaf88a06ab012df4ac9354823f8cfa8d31cd96aff4bde7fded712a36a8c5f836998ab1107f2ad69b496289e0a49589a5db209d4e7d5136f010d6b9e9bf81de
 EBUILD couchdb-1.3.0-r1.ebuild 1709 SHA256 87da5272e1a520731d9d52dc7f937404af8964377549cb2f12f44b3db47a382a SHA512 25c4a22711995f693f541f86a1f4e3754df5853b895c03b0d3e4bdc4e7df7e644510bc498c5d5c7971c11293bedd8c2009100bfd86b8a3722e7b0f489020939a WHIRLPOOL 4d18ef73d918ee346090745f3aec5df40d957350e22e5b96e343ec83cc5d47c162d83e7c5a597fdf5553709272d1c53bf4ae93030d0b3bbc49f5f75a7d9f93ef
 EBUILD couchdb-1.3.0.ebuild 1703 SHA256 450efbd9503e53e5398dc15042f2fa8101cd807662ebf2bd1303979383ffba21 SHA512 f682b1eefb93c1b01efe7572a79016e8e95219d7a27b5dcd4016b29e65a68abf12dda06a360788549dd3fcca94af57c2d53abff66a0e7c8b6da970df2327f7dd WHIRLPOOL 9e8bab5d11548d142340c897c0d638ee34b91c6012e6a31fb8cd4f8da8ac29ff6019f3a2a7535a529890d4f675e42871f1fde1c1c15cd01ae7e9ae4fbb0b9b04
-MISC ChangeLog 10219 SHA256 188af2e3770b6a84a2f542d7d638cf560ba15f0e0a02b38de934d902896d1bad SHA512 2db6ae70d5ee31a552cdf5b765711c0d9ec8001450ccd1e619e4e8297d05e257d0970fd5122bdd0fe7bc023a4dcc762e157f8283d236eb4d8be0a6c7f880564b WHIRLPOOL 8b5291ecf0eff6d65004cb6baa4a17358b8c96c4cfff76632373159886d56b3c2ad4bf86ecae8b364ad2824fa0382bd9c78dbc536a36ff4bd132c3410191a9a9
+EBUILD couchdb-1.3.1.ebuild 1727 SHA256 6d5202d0022c27323f2e9ac762e667a16a3e423fcf20ba29f964e8fa05bf0034 SHA512 429eb2251acf1691e7f504a9871a1cb2b17a0bdf51d327217f55751dd29d49455c966eb0cd8fe3f684054b3ee75cb156d0c663480c1fe9050f7531c13c52fa18 WHIRLPOOL b9be4cfc09cef4225517adc5e810ef740304fd8da010895105072a0632b16a801fea151510117185f0c68b4d7ccb2eab500170ad790111c95c6f2837f471ff15
+MISC ChangeLog 10354 SHA256 1a8194380b4279dbd515bd4c2a45ae8ceff44d0046ef117a813fcf87c7231370 SHA512 4ae09c0e0fbee54a138f7eb8fe398b7cac7c43cab6ca87cf6b516074e3a718e0ba5e7f4bb5fb1f776390a45265d4e6a4bd965e24144467c7bc2d750add9fa894 WHIRLPOOL ace41b94b9242757debf6e4cc31d51bf3ee061459259c713856e28d027d3ac5b6d9ae19cd56231d97645a205f25b6e072b9e8a2390763525b2e29c53e00dc9d7
 MISC metadata.xml 198 SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8 SHA512 ce42b56d5a9225aa9cbf7ddc4f92285df0ceb9eadf9befe0787837f40c6f86dce0b3a9de2b29e14a6c224ce25e6038d7e1bfe5e56ebedd2cb5be87fc9a216d89 WHIRLPOOL 9ce3e5ec80ac4302b609914f7a821fba1bbcead615d535c0d17b9b1e37892c4a9b2cbcbe6a46406e99bb3eb4f5b634277913b34f1f1b3b39d2d51e2c2dcda24e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZSjAAoJELp701BxlEWffIwP+wU0ndWWv/mdvHDRDWXoK82S
-pEqzJnTc05/Qyxs5tDbocartnIHc6Y1CoYUPex3jCfgTfGZ1HOoGHCu4su0cuv39
-t1e4Gm+k1l1pG08EJGdxQ/fNsw9iXZpPKRborY1eTulGaRmD3T2fwFuDyLHV+5+m
-5GRY/4Oh8cixNNKZ4SRgGgBxI6SmBwXGUGDmjsqumOHx3Nu5L94UrYWrjVKzAPq6
-p/Vw8ROH+M8xKbvStx/Iamn0jhYKNh8ZQVyOjDbE8yTnETsZpc9C6ftzM7PcvXMX
-RpJnzqkKwO/Ua2buwyl37WCyPsOZQx7Brb1bYi2+s7/ctuz0aiQ7iTh+kETqyTnq
-ehGEvHHEbbRjGry5OmMb3wIXmdIeit4a5Kr+/zRZDKPbNGoyfdUeASDoxjCei9EB
-GZoNmyZk3ZlXbhSJ+mQEbuUuRZMG1hQBCi34IOdrXsf+mQ6D95B7XdUVCqaL4rFF
-ZKGcNL6sXilK2erYuwO7xQuu83Dw8C9jPKccwCyiLxAd52SirK0WzwlihzIgHyAE
-3W6gM6YU/Tl0KVLyow+XN7PFukvAX0ek8QFnVo7qMHrPyiUr0d+2RaF+VPupUECZ
-0mkmAYgebQnhAI3WJrkG0AUs5UyuehMJabnJ/aHJKJG580/LMAbUV/ia96nYXeab
-e4hpq0NBXEo9MJNwZBxK
-=BgCL
+iEYEAREIAAYFAlHNmF4ACgkQxeMuLWsGW/urLgCfZZ2xyZMNy0Ql9wjwgBAOsReZ
+U3AAnRls7MPz5erH3aK3wtRINNTeWSCU
+=Pt88
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.3.1.ebuild b/dev-db/couchdb/couchdb-1.3.1.ebuild
new file mode 100644
index 000000000000..8d1732c0319d
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.3.1.ebuild,v 1.1 2013/06/28 14:06:16 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="test"
+
+RDEPEND=">=dev-libs/icu-4.3.1
+		<dev-lang/erlang-16[ssl]
+		>=dev-libs/openssl-0.9.8j:0
+		>=net-misc/curl-7.18.2
+		<dev-lang/spidermonkey-1.8.7"
+
+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=/usr/lib/erlang/usr/include \
+		--localstatedir=/var \
+		--with-js-lib=/usr/lib
+	# bug 296609, upstream bug #COUCHDB-621
+	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = /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 "${D}"/etc/couchdb/*.ini ; do
+		fowners root:couchdb "${f#${D}}"
+		fperms 660 "${f#${D}}"
+	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):" "${D}/etc/conf.d/couchdb"
+}