Version bump to 1.0.1, bug 331811.

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

3 files changed, 68 insertions, 2 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index c32843a82ad1..d1c5bb73ff4f 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.32 2010/07/18 21:36:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.33 2010/08/17 06:30:51 djc Exp $
+
+*couchdb-1.0.1 (17 Aug 2010)
+
+  17 Aug 2010; Dirkjan Ochtman <djc@gentoo.org> +couchdb-1.0.1.ebuild:
+  Version bump to 1.0.1, doesn't have data loss bug (bug 331811).
 
   18 Jul 2010; Jeroen Roovers <jer@gentoo.org> couchdb-0.11.0-r1.ebuild:
   Stable for PPC (bug #327877).
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 7b8c225eaf5a..ef1123284771 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -3,8 +3,10 @@ AUX couchdb.init-0.10 1171 RMD160 9fde8951adc9098d8e842227565d1a5b118a4401 SHA1
 DIST apache-couchdb-0.10.2.tar.gz 844850 RMD160 c002cc60d260deaea4df3bf4864eb735377f4108 SHA1 c803a73d91321c3f7712059101312aac52e13b91 SHA256 f31abb8f215c062e580da2922c2abcd46defc08129b0dadb107048f01773566a
 DIST apache-couchdb-0.11.0.tar.gz 925354 RMD160 cd52e0f41a67b1cba9792e2ac11c74cad5c6a1a9 SHA1 b5b84e1d8a082960df09df7e4eda664b5e6c59d7 SHA256 8190262c27a0704f8f91854908a8473a797ef7e3176ec9ae13c0ab3f0d4cb049
 DIST apache-couchdb-1.0.0.tar.gz 951979 RMD160 d32a5e16f505cb428ac573bad2c842409ea86244 SHA1 72fd5a4679f73f9e55414caf0fab696b320f0ec3 SHA256 ca38de6823a51dbfa521f65089683b5ff3aa405e78c807aaf1e1ad24b83c2f57
+DIST apache-couchdb-1.0.1.tar.gz 986352 RMD160 d5e6616c71472a7f6769774dc13fc07ccbf33350 SHA1 470c88bca6a157e8a40b0713192a7a169bb0395e SHA256 b74a5bfe13e3457798107509cb533d0e7df276adad526ccd5a381c1271108b1f
 EBUILD couchdb-0.10.2.ebuild 1442 RMD160 5e095be1671e64d66c5b781c0ba4a8a8ab55f7f5 SHA1 1fa66f6a6e9bde9d93b45e3c672ad919903bd90b SHA256 8cabc9207fcf881718a82808cbf6db539535d24f2cc50fcbcb1eb1ac54274051
 EBUILD couchdb-0.11.0-r1.ebuild 1515 RMD160 8decc785199266c2a32185689ca009735021a383 SHA1 746e6fe0e2ad3ea47ef7a83b4541ad886fe44e5e SHA256 229df4693ef98c542fd39d7111f2c06dd9a9fd7f8c1a76081802f2972cf1e293
 EBUILD couchdb-1.0.0.ebuild 1522 RMD160 8fd4ff8d11a2e6cb3794acc395abda7fa046801f SHA1 c1e311d5a9f10d1a083b301c572f64f02e19aaf9 SHA256 fa1dab7edc8643d422aeaf296189eeb46c83558ad5ff9cc680beec467b14e5e9
-MISC ChangeLog 4141 RMD160 7218c9a042124f87c693f5699fa26ce3fcb0de42 SHA1 beec93c2271d806d2ecc4adf76a491d207085f86 SHA256 dc25cf48281b75cab1d517befc3f7b81d182390eeab99299f95b95a08d243b97
+EBUILD couchdb-1.0.1.ebuild 1522 RMD160 c3af67ca7dd9479f8616083e3bc7772b512d2c3d SHA1 b601a1d278e4122df73e1c8dbff3757738d3a27c SHA256 f6ffcce882b6d01265b9c2c3bde0d63a325237ec52ca575a2b030392f099cbd1
+MISC ChangeLog 4309 RMD160 c2af8612db94568f70156dc715c6739c16d6d855 SHA1 977f84c8bcd46d25a92719f3ae0771b894fe1189 SHA256 7277cfe2e440a9ce1249c9e67c24d5c4c8585d87ba6d2bd8c4c21b76d62a26a4
 MISC metadata.xml 219 RMD160 84ac36be916d1cef4315abd9dfb372ffc86ed02e SHA1 8dd63bcbce8e553e52a7531c87a447d714c411c6 SHA256 cac8b11bbe818b516ed590fce447a2e57fd339d66bbaa9d324278381b2f9f146
diff --git a/dev-db/couchdb/couchdb-1.0.1.ebuild b/dev-db/couchdb/couchdb-1.0.1.ebuild
new file mode 100644
index 000000000000..54c89a601b08
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.0.1.ebuild,v 1.1 2010/08/17 06:30:51 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 /bin/bash /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/couchdb-0.10.1#" -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
+
+	fowners root:couchdb /etc/couchdb/*.ini
+	fperms 660 /etc/couchdb/*.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"
+}