Version bump couchdb to 1.1.0.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

3 files changed, 75 insertions, 16 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 92176ed492f8..0612538874b3 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.47 2011/02/10 23:44:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.48 2011/06/06 12:53:05 djc Exp $
+
+*couchdb-1.1.0 (06 Jun 2011)
+
+  06 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.1.0.ebuild:
+  Version bump to 1.1.0.
 
   10 Feb 2011; Markos Chandras <hwoarang@gentoo.org> couchdb-1.0.2.ebuild:
   Stable on amd64 wrt bug #353243
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 0f0caa3f9a72..0955380fc810 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX couchdb.conf-0.10 338 RMD160 6c30117e43d3ac4e3749079d860ab0ef3565f12f SHA1 c1ef3459b572c9101c63ea94099aafa36e054be6 SHA256 4fa2dafadedb5eb6c6afbca5e8aca04f75a954e35491ddece3daebc496a534b8
 AUX couchdb.init-0.10 1171 RMD160 9fde8951adc9098d8e842227565d1a5b118a4401 SHA1 2699fd798a432e7434ce899291e74b5acd1e432d SHA256 f4e65387c2155938a0e74051eac1e4c610229dc79e3f83f18bee082afcde2680
 DIST apache-couchdb-1.0.1.tar.gz 986352 RMD160 d5e6616c71472a7f6769774dc13fc07ccbf33350 SHA1 470c88bca6a157e8a40b0713192a7a169bb0395e SHA256 b74a5bfe13e3457798107509cb533d0e7df276adad526ccd5a381c1271108b1f
 DIST apache-couchdb-1.0.2.tar.gz 1031474 RMD160 9737a9ebfae7b97654f721c0ab2f42a0bf5d9905 SHA1 6352a2640ae7255a470f79a200cd5111aff017ea SHA256 6ef82a7ba0f132d55af7cc78b30658d5b3a4f7be3f449308c8d7fa2ad473677c
+DIST apache-couchdb-1.1.0.tar.gz 1088226 RMD160 4dcb5c520b0402366e82a1c195fc4404bc7bd37d SHA1 7cb6a12f3becaae4eeb8ee75b15fbe6395fa7a98 SHA256 08432165e72fa55e128e90d34b5b5e2d3b9af228fa2b30d3a3fa70a88a3c6498
 EBUILD couchdb-1.0.1-r2.ebuild 1546 RMD160 485dc05a5a292730aa224edfd2b75f56b10a49e0 SHA1 6dc0a002f5ea8b362e0b2c6f5e52aa61c6283f05 SHA256 4b5ce2bd5ea9ae32445ca1b2b7eae6add1e42ba1748a7abce3521c9ee2307db4
 EBUILD couchdb-1.0.1.ebuild 1522 RMD160 29cf881751c153bec6459fca1a4e3b0429c5af3d SHA1 a3b86c3fac3807bdda13a7b6d9928c02a7c6dc37 SHA256 483aa3776dc7c426899c5b87192e67df698ea96be97a21eba1072cf20e8e3a61
 EBUILD couchdb-1.0.2.ebuild 1582 RMD160 a826e24941cad12170c950cdeac7c7d66912c265 SHA1 61d4a9cb6b7b56a348f442ed5daa635896b01297 SHA256 83fa677495703a039d6bd2487a9d53b4024447e74e62b26e82c1bb8cefc88a6b
-MISC ChangeLog 6025 RMD160 1653f9417f72e6b79bf2b85c22662165f900314c SHA1 4d62ebd684c5d82964077dca8e1b1a5d6dd6bf50 SHA256 9f7357dac3b98da18c0a5ea99ccac106b4f594c4d3a2de9a19c8a5cc6dcd8fd2
+EBUILD couchdb-1.1.0.ebuild 1571 RMD160 8763d41d053e258f9363e7174331050aeb2bc636 SHA1 fa422b1eaae2bac648d879f0744a6108f40b8423 SHA256 d29d1be2b5cd2754ad22ca8c9411fe1f482536a14c25fb648abd201ec589f9d9
+MISC ChangeLog 6147 RMD160 bf2fb35f5d6a992e79561a57818415a5dfcdb558 SHA1 facf891680b403b72f15aedd5cb3681646e3fba0 SHA256 23b15f7b5b65373e02db09826c32d8fa91db290823ec91b947a1bd9c34c28b78
 MISC metadata.xml 219 RMD160 84ac36be916d1cef4315abd9dfb372ffc86ed02e SHA1 8dd63bcbce8e553e52a7531c87a447d714c411c6 SHA256 cac8b11bbe818b516ed590fce447a2e57fd339d66bbaa9d324278381b2f9f146
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNVHf3AAoJEPqDWhW0r/LCC/kQAJnQeIf7OU6r7h90SytWwI1D
-/FZ0OFfLf2C+nzHm7oelLebs7VaJC/QJjd1vruR/nWKLxWKW1/sDDvJrhJIK1igO
-CFgJ2OqNS3Cj8JmIm056m+y5a69SBkT56lM/sS3MSBYnrkYPITKebn9fAX6mNpxy
-bKXvavmFjA7k7JdcLbqLsKawbLg/UQ89/4wut2bnATtIh+2BNVGrC1Nb26F956Uk
-YT+RDmRasfBqYBLUCST+idztlxLpL5b9ZJpEGFlEm9SXS366tTs7Q/JxOpkxaOz6
-4BmhQZkeY18P2cAnXZTZ5sAHG/SR3LZsv4VflTb9dKtR7+YkI4OMyQDTI7Fc3JQJ
-v0FmEjVcCmDa0MZP96DobST2+pRVP17ecW6N8n0NhjkD1LOPK7Q5QcKV97e9a7gy
-D+MmxRijw4iP3n2H1FTTVt0dtXk+nO4b15TjK83GBf7gj6cu93uW6agY7PMIa0l6
-qHUWwzM+qbMCWF8ek2ojFd93Ez7J2RgL+nstKqpmWfx1qoqlo5S1RRVrd5hmQTvJ
-cf8JwoklrzrIaY/TkwAhLO6CjpSsvSE/M1L+FStD0bIR09V0X68n8eawZBGUSUQq
-2dHHZIPbhno8T9nVYpIwqbgUHKPqMfQEA5zeGoxoslqhTFdJeBJMlpSw1eEQCDc1
-B3llXpj7YuVPx5NiegKh
-=BeGs
+iEYEARECAAYFAk3szboACgkQxeMuLWsGW/s8PgCgkhwkLzTD2l8VueI/7RM8Ckkc
+5o0AoK64eA43xcxhPA0+P0RvCuycuVMH
+=Cv/G
 -----END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.1.0.ebuild b/dev-db/couchdb/couchdb-1.1.0.ebuild
new file mode 100644
index 000000000000..b023f22dd43e
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.1.0.ebuild,v 1.1 2011/06/06 12:53:05 djc Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
+HOMEPAGE="http://couchdb.apache.org/"
+SRC_URI="mirror://apache/couchdb/${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
+		>=net-misc/curl-7.18.2
+		dev-lang/spidermonkey"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/apache-${P}"
+
+pkg_setup() {
+	enewgroup couchdb
+	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
+}
+
+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_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	insinto /var/run/couchdb
+
+	fowners couchdb:couchdb \
+		/var/run/couchdb \
+		/var/lib/couchdb \
+		/var/log/couchdb
+
+	for f in /etc/couchdb/*.ini ; do
+		fowners root:couchdb ${f#"${D}"}
+		fperms 660 ${f#"${D}"}
+	done
+	fperms 664 /etc/couchdb/default.ini
+
+	newinitd "${FILESDIR}/couchdb.init-0.10" couchdb || die
+	newconfd "${FILESDIR}/couchdb.conf-0.10" couchdb || die
+
+	sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb"
+}