Version bump couchdb to 1.4.0.

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

3 files changed, 86 insertions, 5 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index e19ca2a2e5ec..5f3ce7d7a6fa 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.79 2013/09/09 07:23:52 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.80 2013/09/09 07:32:02 djc Exp $
+
+*couchdb-1.4.0 (09 Sep 2013)
+
+  09 Sep 2013; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.4.0.ebuild:
+  Version bump couchdb to 1.4.0.
 
   09 Sep 2013; Dirkjan Ochtman <djc@gentoo.org> -couchdb-1.2.1.ebuild,
   -couchdb-1.3.0.ebuild:
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index ab548d4862be..2a242cce593c 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -9,14 +9,16 @@ AUX couchdb.init-3 434 SHA256 41302b877863f8b32f68bdf55b43e6968a924fa7b6d02d97d3
 AUX couchdb.init-4 438 SHA256 7f191b22d82b5e430b0c1d29a7e9e791a69a0867e96d2a643e2bf45e2f251060 SHA512 922ff66130819de9dac5d8df45b685f05287756f235a989e1b8179a4c54d8769f3e189b7797fbc03db5828b50c49f87ebd1a74cdf045027c5aed99a627753cb7 WHIRLPOOL 01528de2fa13e6eeb09465b4824cbb8c846e4fe67857b93501b15b4994c8db70eae539c7566a3c7380392f241906e60e02d0cab2a798852001cac93d5f765902
 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
+DIST apache-couchdb-1.4.0.tar.gz 3422107 SHA256 bdbb9c35c2738ae0fe63280bd818a50443253f3db2184f8b9c386e5615ae02b5 SHA512 558009ec11befbb8b18541f19d3e31b1321e4c6413b66c7142bf67cd40feea33a3c32347a91ab3bf30cdd455931831794c6dd21085fff9370e3317780279c877 WHIRLPOOL 517fe6d14b1fd8e83c9b9e75b3c85c1730defe03f51f5ce6edb0138460f02bd6002509209d1cc0186d021f2c8b307b320814dbe82965e7271a472cce4671ed7c
 EBUILD couchdb-1.3.0-r1.ebuild 1709 SHA256 87da5272e1a520731d9d52dc7f937404af8964377549cb2f12f44b3db47a382a SHA512 25c4a22711995f693f541f86a1f4e3754df5853b895c03b0d3e4bdc4e7df7e644510bc498c5d5c7971c11293bedd8c2009100bfd86b8a3722e7b0f489020939a WHIRLPOOL 4d18ef73d918ee346090745f3aec5df40d957350e22e5b96e343ec83cc5d47c162d83e7c5a597fdf5553709272d1c53bf4ae93030d0b3bbc49f5f75a7d9f93ef
 EBUILD couchdb-1.3.1.ebuild 1727 SHA256 6d5202d0022c27323f2e9ac762e667a16a3e423fcf20ba29f964e8fa05bf0034 SHA512 429eb2251acf1691e7f504a9871a1cb2b17a0bdf51d327217f55751dd29d49455c966eb0cd8fe3f684054b3ee75cb156d0c663480c1fe9050f7531c13c52fa18 WHIRLPOOL b9be4cfc09cef4225517adc5e810ef740304fd8da010895105072a0632b16a801fea151510117185f0c68b4d7ccb2eab500170ad790111c95c6f2837f471ff15
-MISC ChangeLog 10474 SHA256 35b24217b83d840c658cff068ed185907b5e5c05a1a943c9852ff49cc886e45d SHA512 6975068958e4d09c2abbe43edaa6586592359e644977c2932c8c010bdab2c8b494a6b43d6a6d02e7829adf538029e1468db6a2e2f2aecc8e564d2364f5a121c7 WHIRLPOOL 32061116637e0d3ce8a4fc64bfdf0533a2d4e01429a43c9b452e2a4bf6b697ad2d58f83983a701b375eaa641bfd79c3524c53599bfd7ee8c211bed0d4543048c
+EBUILD couchdb-1.4.0.ebuild 1723 SHA256 0c8d2c445366ba94bea30b8e3a2de0d707c8cd4ce139a5fbd20bf5100dae4da6 SHA512 d6d72d548af66552ea4e9445e00868099cb30c6beba99cc13cfb7db92d4805ca610a9f46035e5e375d857916f08393a70a4c87d66af1d3247a6d87a0ebb9077f WHIRLPOOL 936a1d817617aab43a8e2394246fff7db26783e7e3c7b94b282f6c255ab939f46f80736f441f52079c6589818152a2b05b21958126c3d039646f0c14554b4a4f
+MISC ChangeLog 10609 SHA256 e991cec19e0b29cc886187316deb68ca5153c69ed151bb1f775a5dd2362a1857 SHA512 9403285d6187b4cbad9e762d144cd0e2ce2d4283d2abc9ecc593a501b67b088dcaf48d48d942189936a818112bcc69283905bc6d293c0d28cc28cded146259f0 WHIRLPOOL df4fedd7ad1dad093e0e62e85d94a16a506d2c542360244cb9b5aa5019ae7fcf71660285a28cd40b7031f4ba57ef5e7b0f6943e4554450d577d4c88d77403c02
 MISC metadata.xml 198 SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8 SHA512 ce42b56d5a9225aa9cbf7ddc4f92285df0ceb9eadf9befe0787837f40c6f86dce0b3a9de2b29e14a6c224ce25e6038d7e1bfe5e56ebedd2cb5be87fc9a216d89 WHIRLPOOL 9ce3e5ec80ac4302b609914f7a821fba1bbcead615d535c0d17b9b1e37892c4a9b2cbcbe6a46406e99bb3eb4f5b634277913b34f1f1b3b39d2d51e2c2dcda24e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlItd5QACgkQxeMuLWsGW/uRGQCcCgvASn5ISeBRg+Y0Vtce0d8s
-p7QAn2jL9tyfT0ZO09zCvSLw9UeUIAS5
-=Dgg7
+iEYEAREIAAYFAlIteXYACgkQxeMuLWsGW/tEkwCfWEJh0HrA8V6KiV6E8YuzchMJ
+PC8An3v62gF1mMymRo06A9e4VUK7Ur6W
+=zjmR
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.4.0.ebuild b/dev-db/couchdb/couchdb-1.4.0.ebuild
new file mode 100644
index 000000000000..087f53ff23e9
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.4.0.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.4.0.ebuild,v 1.1 2013/09/09 07:32:02 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[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"
+}